From 15238e13918a019bdc020c3eeafa5e01c810bbf1 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 11 Jun 2009 11:59:20 +0000
Subject: Fake v2 production branch

---
diff --git a/.gitignore b/.gitignore
index 35df78d..3d7607e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,3 @@ site/app/webroot/js/__utm.min.js
 site/app/webroot/js/jquery.addons.min.js
 
 site/vendors/product-details
-
-site/app/messages.po
diff --git a/aslo/config-local.php b/aslo/config-local.php
index dbf5d80..c67035c 100644
--- a/aslo/config-local.php
+++ b/aslo/config-local.php
@@ -1,5 +1,6 @@
 <?php
 define('DEBUG', 1);
 define('DEV', true);
+define('LOG_ERROR', 10);
 define('QUERY_CACHE', false);
 ?>
diff --git a/aslo/config.php b/aslo/config.php
index 59f5083..8cd816a 100644
--- a/aslo/config.php
+++ b/aslo/config.php
@@ -245,6 +245,10 @@ define('SITE_IRC', '#sugar on chat.freenode.net');
 
 define('SITE_RELEASE_EMAIL', 'sugar-devel@lists.sugarlabs.org');
 
+define('SITE_RELEASE_EMAIL', 'sugar-devel@lists.sugarlabs.org');
+
+define('SITE_RELEASE_EMAIL', 'sugar-devel@lists.sugarlabs.org');
+
 define('ADMIN_EMAIL', 'aslo-admins@sugarlabs.org');
 define('EDITOR_EMAIL', 'aslo-editors@sugarlabs.org');
 define('NOBODY_EMAIL', 'addons@sugarlabs.org');
@@ -256,4 +260,15 @@ define('SITE_APP', 19); // 1
 
 define('ADDON_ACTIVITY', '1');
 define('ADDON_CONTENT', '2');
+
+// backward compatibility with AMO
+define('ADDON_EXTENSION', '100');
+define('ADDON_THEME', '200');
+define('ADDON_DICT', '300');
+define('ADDON_SEARCH', '400');
+define('ADDON_LPAPP', '500');
+define('ADDON_LPADDON', '600');
+define('ADDON_PLUGIN', '700');
+define('ADDON_API', '800'); // not actually a type but used to identify extensions + themes
+
 ?>
diff --git a/aslo/po/aslo.pot b/aslo/po/aslo.pot
index ea6f8c1..15a1d7b 100644
--- a/aslo/po/aslo.pot
+++ b/aslo/po/aslo.pot
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "<img alt=\"Add-ons\" src=\"%1$s\" /> Activities"
-
 #: controllers/developers_controller.php:445
 msgid "devcp_error_mktmp_failed"
 msgstr "Internal problem while unpackaging bundle"
@@ -1581,11 +1576,21 @@ msgstr ""
 "must be directed to the appropriate software vendor."
 
 #: models/addontype.php:85
-msgid "general_addontype_extension"
+msgid "general_addontype_activity"
 msgstr "Activity"
 
-msgid "general_addontype_extension_plural"
-msgstr "Activities"
+#: models/addontype.php:87
+msgid "general_addontype_content"
+msgstr "Content"
+
+#: models/addontype.php:99
+msgid "general_addontype_lpaddon"
+msgstr "Language Pack (Activity)"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:125
+msgid "general_addontype_lpaddon_plural"
+msgstr "Language Packs (Activity)"
 
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
diff --git a/aslo/po/en.po b/aslo/po/en.po
index ea6f8c1..15a1d7b 100644
--- a/aslo/po/en.po
+++ b/aslo/po/en.po
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "<img alt=\"Add-ons\" src=\"%1$s\" /> Activities"
-
 #: controllers/developers_controller.php:445
 msgid "devcp_error_mktmp_failed"
 msgstr "Internal problem while unpackaging bundle"
@@ -1581,11 +1576,21 @@ msgstr ""
 "must be directed to the appropriate software vendor."
 
 #: models/addontype.php:85
-msgid "general_addontype_extension"
+msgid "general_addontype_activity"
 msgstr "Activity"
 
-msgid "general_addontype_extension_plural"
-msgstr "Activities"
+#: models/addontype.php:87
+msgid "general_addontype_content"
+msgstr "Content"
+
+#: models/addontype.php:99
+msgid "general_addontype_lpaddon"
+msgstr "Language Pack (Activity)"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:125
+msgid "general_addontype_lpaddon_plural"
+msgstr "Language Packs (Activity)"
 
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
diff --git a/aslo/sql/sugar-stub-data.sql b/aslo/sql/sugar-stub-data.sql
index 749b4ba..5c13fd4 100644
--- a/aslo/sql/sugar-stub-data.sql
+++ b/aslo/sql/sugar-stub-data.sql
@@ -20,23 +20,22 @@ INSERT INTO `users` (`id`, `email`, `password`, `firstname`, `lastname`, `nickna
 (2, 'editor@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'editor', 'editor', 'editor', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL),
 (3, 'developer@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'developer', 'developer', 'developer', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL);
 
--- Create Sugar application, 1
-DELETE from applications;
+-- Create Sugar application, 19
 insert into applications values
-(1, '{3ca105e0-2280-4897-99a0-c277d1b733d2}', 50000, NULL, '', 50001, 1, now(), now())
+(19, '{3ca105e0-2280-4897-99a0-c277d1b733d2}', 50000, NULL, '', 50001, 1, now(), now())
 ;
 
 INSERT INTO tags (id, name, description, addontype_id, application_id, created, modified, weight) VALUES
-(100, 50002, 50003, 1, 1, now(), now(), 0),
-(101, 50004, 50005, 1, 1, now(), now(), 0),
-(102, 50006, 50007, 1, 1, now(), now(), 0),
-(103, 50008, 50009, 1, 1, now(), now(), 0),
-(104, 50010, 50011, 1, 1, now(), now(), 0)
+(100, 50002, 50003, 1, 19, now(), now(), 0),
+(101, 50004, 50005, 1, 19, now(), now(), 0),
+(102, 50006, 50007, 1, 19, now(), now(), 0),
+(103, 50008, 50009, 1, 19, now(), now(), 0),
+(104, 50010, 50011, 1, 19, now(), now(), 0)
 ;
 
 INSERT INTO `appversions` (`id`, `application_id`, `version`, `created`, `modified`) VALUES
-(100, 1, '0.82', now(), now()),
-(101, 1, '0.84', now(), now())
+(100, 19, '0.82', now(), now()),
+(101, 19, '0.84', now(), now())
 ;
 
 INSERT INTO `platforms` (`id`, `name`, `shortname`, `icondata`, `icontype`, `created`, `modified`) VALUES 
@@ -54,7 +53,7 @@ INSERT INTO `translations` (`id`, `locale`, `localized_string`, `created`, `modi
 (119, 'en-US', 'mips', now(), now()),
 (120, 'en-US', 'ARM', now(), now()),
 (121, 'en-US', 'arm', now(), now()),
-(50000, 'en-US', 'Sugar Platform', now(), now()),
+(50000, 'en-US', 'Sugar', now(), now()),
 (50001, 'en-US', 'sugar', now(), now()),
 (50002, 'en-US', 'Games', now(), now()),
 (50003, 'en-US', 'games', now(), now()),
diff --git a/bandwagon/build.sh b/bandwagon/build.sh
index e76a01a..3846059 100755
--- a/bandwagon/build.sh
+++ b/bandwagon/build.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-mkdir -p chrome;
 [ -f bandwagon.xpi ] && rm bandwagon.xpi;
-[ -f chrome/bandwagon.jar ] && rm chrome/bandwagon.jar;
+[ -f bandwagon.jar ] && rm bandwagon.jar;
 zip -r0 bandwagon.jar content locale skin -x \*.svn/* -x \*.zip -x \*.db -x \*.xcf -x \*.\*~ -x \*.DS_Store;
-mv bandwagon.jar chrome/
-zip -r9 bandwagon.xpi chrome.manifest install.rdf defaults/ chrome/ components/ -x \*.svn/* -x \*.DS_Store;
+zip -r9 bandwagon.xpi chrome.manifest install.rdf defaults/ bandwagon.jar components/ -x \*.svn/* -x \*.DS_Store;
 printf "build finished.\n";
diff --git a/bandwagon/chrome.manifest b/bandwagon/chrome.manifest
index 1567fdf..99d2cf5 100644
--- a/bandwagon/chrome.manifest
+++ b/bandwagon/chrome.manifest
@@ -1,35 +1,6 @@
-content bandwagon   jar:chrome/bandwagon.jar!/content/
-
-#locale  bandwagon   ar   	jar:chrome/bandwagon.jar!/locale/ar/
-locale  bandwagon   ca   	jar:chrome/bandwagon.jar!/locale/ca/
-locale  bandwagon   cs   	jar:chrome/bandwagon.jar!/locale/cs/
-locale  bandwagon   da   	jar:chrome/bandwagon.jar!/locale/da/
-locale  bandwagon   de   	jar:chrome/bandwagon.jar!/locale/de/
-locale  bandwagon   el-GR       jar:chrome/bandwagon.jar!/locale/el-GR/
-locale  bandwagon   en-US	jar:chrome/bandwagon.jar!/locale/en-US/
-locale  bandwagon   es-ES       jar:chrome/bandwagon.jar!/locale/es-ES/
-locale  bandwagon   fa   	jar:chrome/bandwagon.jar!/locale/fa/
-locale  bandwagon   fr   	jar:chrome/bandwagon.jar!/locale/fr/
-locale  bandwagon   fy-NL       jar:chrome/bandwagon.jar!/locale/fy-NL/
-locale  bandwagon   he   	jar:chrome/bandwagon.jar!/locale/he/
-locale  bandwagon   id          jar:chrome/bandwagon.jar!/locale/id/
-locale  bandwagon   it          jar:chrome/bandwagon.jar!/locale/it/
-#locale  bandwagon   ja   	jar:chrome/bandwagon.jar!/locale/ja/
-locale  bandwagon   nl          jar:chrome/bandwagon.jar!/locale/nl/
-locale	bandwagon   pl		jar:chrome/bandwagon.jar!/locale/pl/
-locale  bandwagon   pt-BR   	jar:chrome/bandwagon.jar!/locale/pt-BR/
-locale  bandwagon   pt-PT   	jar:chrome/bandwagon.jar!/locale/pt-PT/
-locale  bandwagon   ro   	jar:chrome/bandwagon.jar!/locale/ro/
-locale  bandwagon   ru   	jar:chrome/bandwagon.jar!/locale/ru/
-locale  bandwagon   sk          jar:chrome/bandwagon.jar!/locale/sk/
-locale  bandwagon   sq   	jar:chrome/bandwagon.jar!/locale/sq/
-locale  bandwagon   sv-SE   	jar:chrome/bandwagon.jar!/locale/sv-SE/
-#locale  bandwagon   uk   	jar:chrome/bandwagon.jar!/locale/uk/
-locale  bandwagon   vi          jar:chrome/bandwagon.jar!/locale/vi/
-locale  bandwagon   zh-CN       jar:chrome/bandwagon.jar!/locale/zh-CN/
-locale  bandwagon   zh-TW       jar:chrome/bandwagon.jar!/locale/zh-TW/
-
-skin    bandwagon   classic/1.0 jar:chrome/bandwagon.jar!/skin/
+content bandwagon   jar:bandwagon.jar!/content/
+locale  bandwagon   en-US   jar:bandwagon.jar!/locale/en-US/
+skin    bandwagon   classic/1.0 jar:bandwagon.jar!/skin/
 
 overlay chrome://browser/content/browser.xul    chrome://bandwagon/content/ui/overlays/browserOverlay.xul
 overlay chrome://mozapps/content/extensions/extensions.xul chrome://bandwagon/content/ui/overlays/extensionsOverlay.xul
@@ -39,13 +10,3 @@ override  chrome://bandwagon/skin/browserOverlay.css   chrome://bandwagon/skin/p
 override  chrome://bandwagon/skin/browserOverlay.css   chrome://bandwagon/skin/platform/mac/browserOverlay.css os=Darwin
 override  chrome://bandwagon/skin/browserOverlay.css   chrome://bandwagon/skin/platform/xp/browserOverlay.css os=WINNT osversion<=5.1
 override  chrome://bandwagon/skin/browserOverlay.css   chrome://bandwagon/skin/platform/vista/browserOverlay.css os=WINNT osversion>=6
-
-override  chrome://bandwagon/skin/settingsIcons.css   chrome://bandwagon/skin/platform/linux/settingsIcons.css os=Linux
-override  chrome://bandwagon/skin/settingsIcons.css    chrome://bandwagon/skin/platform/mac/settingsIcons.css os=Darwin
-override  chrome://bandwagon/skin/settingsIcons.css   chrome://bandwagon/skin/platform/xp/settingsIcons.css os=WINNT osversion<=5.1
-override  chrome://bandwagon/skin/settingsIcons.css   chrome://bandwagon/skin/platform/vista/settingsIcons.css os=WINNT osversion>=6
-
-override  chrome://bandwagon/skin/extensionsOverlayIcons.css   chrome://bandwagon/skin/platform/linux/extensionsOverlayIcons.css os=Linux
-override  chrome://bandwagon/skin/extensionsOverlayIcons.css    chrome://bandwagon/skin/platform/mac/extensionsOverlayIcons.css os=Darwin
-override  chrome://bandwagon/skin/extensionsOverlayIcons.css   chrome://bandwagon/skin/platform/xp/extensionsOverlayIcons.css os=WINNT osversion<=5.1
-override  chrome://bandwagon/skin/extensionsOverlayIcons.css   chrome://bandwagon/skin/platform/vista/extensionsOverlayIcons.css os=WINNT osversion>=6
diff --git a/bandwagon/components/bandwagon-service.js b/bandwagon/components/bandwagon-service.js
index 3e22c3b..8c484cd 100644
--- a/bandwagon/components/bandwagon-service.js
+++ b/bandwagon/components/bandwagon-service.js
@@ -59,31 +59,13 @@ const nsIFile = Ci.nsIFile;
 const nsIObserverService = Ci.nsIObserverService;
 const nsICookieManager = Ci.nsICookieManager;
 
+
 var Bandwagon;
 var bandwagonService;
 
-var gEmGUID;
-var gUninstallObserverInited = false;
-
-/* Restore settings added or changed by the extension:
- *  - extension preferences
- *  - logins stored in the Login Manager?
- */
-function cleanupSettings()
-{
-  // Cleanup preferences
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                        .getService(Components.interfaces.nsIPrefBranch);
-  try {
-    prefs.deleteBranch("extensions.bandwagon");
-  }
-  catch(e) {}
-}
-
 function BandwagonService()
 {
     this.wrappedJSObject = this;
-    gEmGUID = "sharing@addons.mozilla.org";
 }
 
 BandwagonService.prototype = {
@@ -94,7 +76,6 @@ BandwagonService.prototype = {
     _service: null,
     _collectionUpdateObservers: [],
     _collectionListChangeObservers: [],
-    _authenticationStatusChangeObservers: [],
     _storageConnection: null,
     _collectionFactory: null, 
     _collectionUpdateTimer: null,
@@ -121,8 +102,6 @@ BandwagonService.prototype = {
 
         Bandwagon.Logger.info("Initializing Bandwagon");
 
-        this._initAMOHost();
-
         // init rpc service
 
         this._service = new Bandwagon.RPC.Service();
@@ -131,6 +110,7 @@ BandwagonService.prototype = {
         this._service.registerObserver(this._getServiceDocumentObserver);
 
         this.registerCollectionUpdateObserver(this._collectionUpdateObserver);
+
         // init sqlite storage (also creating tables in sqlite if needed). create factory objects.
 
         this._initStorage();
@@ -143,60 +123,14 @@ BandwagonService.prototype = {
             this.firstrun();
         }
 
-        // storage initialized, tables created - open the collections and service document
-        
-        this._initCollections();
-
-        // start the update timer
+        // storage initialized, tables created - open the collections
 
-        this._initUpdateTimer();
-
-        // observe when the app shuts down so we can uninit
-
-        ObserverService.getService(nsIObserverService).addObserver(this._bwObserver, "quit-application", false);
-
-        // kick off the auto-publish functionality
-
-        this.autopublishExtensions();
-
-        this._initialized = true;
-
-        Bandwagon.Logger.info("Bandwagon has been initialized");
-    },
-
-    /** 
-     * Update "constants" to reflect amo_host in preferences
-     */
-    _initAMOHost: function()
-    {
-        var amoHost = Bandwagon.Preferences.getPreference("amo_host");
-
-        Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_DOCUMENT = Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_DOCUMENT.replace("%%AMO_HOST%%", amoHost);
-        Bandwagon.LOGINPANE_DO_NEW_ACCOUNT = Bandwagon.LOGINPANE_DO_NEW_ACCOUNT.replace("%%AMO_HOST%%", amoHost);
-        Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL = Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL.replace("%%AMO_HOST%%", amoHost);
-        Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL = Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL.replace("%%AMO_HOST%%", amoHost);
-        Bandwagon.FIRSTRUN_LANDING_PAGE = Bandwagon.FIRSTRUN_LANDING_PAGE.replace("%%AMO_HOST%%", amoHost);
-        Bandwagon.AMO_AUTH_COOKIE_HOST = Bandwagon.AMO_AUTH_COOKIE_HOST.replace("%%AMO_HOST%%", amoHost);
-    },
-
-    _initCollections: function()
-    {
         var storageCollections = this._collectionFactory.openCollections();
 
         for (var id in storageCollections)
         {
             this.collections[id] = storageCollections[id];
             this.collections[id].setAllNotified();
-
-            if (this.collections[id].isLocalAutoPublisher())
-            {
-                this.collections[id].autoPublishExtensions = Bandwagon.Preferences.getPreference("local.autopublisher.publish.extensions");
-                this.collections[id].autoPublishThemes = Bandwagon.Preferences.getPreference("local.autopublisher.publish.themes");
-                this.collections[id].autoPublishDicts = Bandwagon.Preferences.getPreference("local.autopublisher.publish.dictionaries");
-                this.collections[id].autoPublishLangPacks = Bandwagon.Preferences.getPreference("local.autopublisher.publish.language.packs");
-                this.collections[id].autoPublishDisabled = !Bandwagon.Preferences.getPreference("local.autopublisher.only.publish.enabled");
-            }
-
             Bandwagon.Logger.debug("opened collection from storage: " + id);
         }
 
@@ -208,10 +142,9 @@ BandwagonService.prototype = {
             // no service document in storage, we never had it or we've lost it - go fetch it
             this.updateCollectionsList();
         }
-    },
 
-    _initUpdateTimer: function()
-    {
+        // start the update timer
+
         this._bwObserver = 
         {
             observe: function(aSubject, aTopic, aData)
@@ -230,19 +163,27 @@ BandwagonService.prototype = {
         this._collectionUpdateTimer = Timer.createInstance(nsITimer);
         this._collectionUpdateTimer.init(
             this._bwObserver,
-            (Bandwagon.Preferences.getPreference("debug")?120*1000:Bandwagon.COLLECTION_UPDATE_TIMER_DELAY*1000),
+            (Bandwagon.Preferences.getPreference("debug")?30*1000:Bandwagon.COLLECTION_UPDATE_TIMER_DELAY*1000),
             nsITimer.TYPE_REPEATING_SLACK
             );
+
+        // observe when the app shuts down so we can uninit
+
+        ObserverService.getService(nsIObserverService).addObserver(this._bwObserver, "quit-application", false);
+
+        // kick off the auto-publish functionality
+
+        this._autopublishExtensions();
+
+        this._initialized = true;
+
+        Bandwagon.Logger.info("Bandwagon has been initialized");
     },
 
     uninit: function()
     {
         this._collectionUpdateTimer = null;
         this.commitAll();
-        this._service = null;
-        this._collectionFactory = null;
-        Bandwagon = null;
-        bandwagonService = null;
     },
 
     getLocalAutoPublisher: function()
@@ -258,10 +199,8 @@ BandwagonService.prototype = {
         return null;
     },
 
-    autopublishExtensions: function(callback)
+    _autopublishExtensions: function()
     {
-        Bandwagon.Logger.debug("in autopublishExtensions()");
-
         var localAutoPublisher = bandwagonService.getLocalAutoPublisher();
 
         if (localAutoPublisher == null)
@@ -270,74 +209,12 @@ BandwagonService.prototype = {
             return;
         }
 
-        var internalCallback = function(event)
-        {
-            if (!event.isError())
-            {
-                bandwagonService._notifyCollectionUpdateObservers(localAutoPublisher);
-            }
-
-            if (callback)
-            {
-                callback(event);
-            }
-        }
-
         var installedExtensions = Bandwagon.Util.getInstalledExtensions();
         var autopublishedExtensions = Bandwagon.Preferences.getPreferenceList("autopublished.extensions");
         var willAutopublishExtensions = [];
 
         for (var i=0; i<installedExtensions.length; i++)
         {
-            //Bandwagon.Logger.debug("checking addon '" + installedExtensions[i].id + "' against user auto pub prefs (type=" +  installedExtensions[i].type + ")");
-
-            // check if user wants to publish this extension (enabled, type)
-            
-            if ((
-                Bandwagon.Util.getExtensionProperty(installedExtensions[i].id, "isDisabled") == "true"
-                ||
-                Bandwagon.Util.getExtensionProperty(installedExtensions[i].id, "appDisabled") == "true"
-                ||
-                Bandwagon.Util.getExtensionProperty(installedExtensions[i].id, "userDisabled") == "true"
-                )
-                && !localAutoPublisher.autoPublishDisabled)
-            {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' is disabled, so won't publish");
-                continue;
-            }
-
-            if (installedExtensions[i].type & installedExtensions[i].TYPE_EXTENSION 
-                && !localAutoPublisher.autoPublishExtensions)
-            {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' is an extension, so won't publish");
-                continue;
-            }
-
-            if (installedExtensions[i].type & installedExtensions[i].TYPE_THEME 
-                && !localAutoPublisher.autoPublishThemes)
-            {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' is a theme, so won't publish");
-                continue;
-            }
-
-            if (installedExtensions[i].type & installedExtensions[i].TYPE_LOCALE 
-                && !localAutoPublisher.autoPublishLangPacks)
-            {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' is a locale, so won't publish");
-                continue;
-            }
-
-            /** TODO
-            if (installedExtensions[i].type & installedExtensions[i].TYPE_DICT 
-                && !localAutoPublisher.autoPublishDicts)
-            {
-                Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' is a dict, so won't publish");
-                continue;
-            }
-            */
-
-            // check if we have already published this extension
-            
             var hasPublished = false;
 
             for (var j=0; j<autopublishedExtensions.length; j++)
@@ -351,20 +228,15 @@ BandwagonService.prototype = {
 
             if (hasPublished == false)
             {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' added to auto-publish queue");
                 willAutopublishExtensions.push(installedExtensions[i]);
             }
-            else
-            {
-                //Bandwagon.Logger.debug("addon '" + installedExtensions[i].id + "' has already been published");
-            }
         }
 
         if (willAutopublishExtensions.length > 0)
         {
             for (var i=0; i<willAutopublishExtensions.length; i++)
             {
-                //Bandwagon.Logger.debug("Will autopublish extension '" + willAutopublishExtensions[i].id + "' to collection '" + localAutoPublisher.resourceURL + "'");
+                Bandwagon.Logger.debug("Will autopublish extension '" + willAutopublishExtensions[i].id + "' to collection '" + localAutoPublisher.resourceURL + "'");
 
                 var extension =
                 {
@@ -372,7 +244,7 @@ BandwagonService.prototype = {
                     name: willAutopublishExtensions[i].name
                 }
 
-                bandwagonService.publishToCollection(extension, localAutoPublisher, "", internalCallback);
+                bandwagonService.publishToCollection(extension, localAutoPublisher, "", null);
 
                 // add to autopublish
                 autopublishedExtensions.push(willAutopublishExtensions[i].id);
@@ -393,12 +265,6 @@ BandwagonService.prototype = {
             if (event.isError())
             {
                 Bandwagon.Logger.error("RPC error: '" + event.getError().getMessage() + "'");
-    
-                if (event.getError().getCode() == Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNAUTHORIZED)
-                {
-                    bandwagonService.deauthenticate();
-                }
-
                 // otherwise ignore for now
             }
             else
@@ -425,11 +291,6 @@ BandwagonService.prototype = {
             if (event.isError())
             {
                 Bandwagon.Logger.error("Could not update collections list: " + event.getError().toString());
-
-                if (event.getError().getCode() == Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNAUTHORIZED)
-                {
-                    bandwagonService.deauthenticate();
-                }
             }
             else
             {
@@ -520,38 +381,6 @@ BandwagonService.prototype = {
         }
     },
 
-    _notifyAuthenticationStatusChangeObservers: function()
-    {
-        Bandwagon.Logger.debug("Notifying authentication status change observers");
-
-        for (var i=0; i<bandwagonService._authenticationStatusChangeObservers.length; i++)
-        {
-            if (bandwagonService._authenticationStatusChangeObservers[i])
-            {
-                bandwagonService._authenticationStatusChangeObservers[i]();
-            }
-        }
-    },
-
-    registerAuthenticationStatusChangeObserver: function(observer)
-    {
-        Bandwagon.Logger.debug("Registering authentication status change observer");
-        this._authenticationStatusChangeObservers.push(observer);
-    },
-
-    unregisterAuthenticationStatusChangeObserver: function(observer)
-    {
-        Bandwagon.Logger.debug("Unregistering authentication status change observer");
-
-        for (var i=0; i<this._authenticationStatusChangeObservers.length; i++)
-        {
-            if (this._authenticationStatusChangeObservers[i] == observer)
-            {
-                delete this._authenticationStatusChangeObservers[i];
-            }
-        }
-    },
-
     _notifyListChangeObservers: function()
     {
         Bandwagon.Logger.debug("Notifying collection list change observers");
@@ -584,72 +413,27 @@ BandwagonService.prototype = {
         }
     },
 
-    authenticate: function(login, password, callback)
-    {
-        Bandwagon.Logger.debug("in authenticate()");
-
-        var service = this;
-
-        Bandwagon.Preferences.setPreference(Bandwagon.PREF_AUTH_TOKEN, "");
-        Bandwagon.Preferences.setPreference("login", "");
-
-        // The following is a workaround to allow auth-token based
-        // authentication to work when an AMO cookie is also present. Full
-        // description in bug 496612.
-        // XXX. Comment out when bug 496612 is addressed.
-        //this.deleteAMOCookie();
-
-        var internalCallback = function(event)
-        {
-            if (!event.isError())
-            {
-                Bandwagon.Preferences.setPreference("login", login);
-
-                service._notifyAuthenticationStatusChangeObservers();
-            }
-
-            if (callback)
-                callback(event);
-        }
-
-        this._service.authenticate(login, password, internalCallback);
-    },
-
-    deauthenticate: function(callback)
-    {
-        Bandwagon.Preferences.setPreference(Bandwagon.PREF_AUTH_TOKEN, "");
-        Bandwagon.Preferences.setPreference("login", "");
-
-        this._notifyAuthenticationStatusChangeObservers();
-
-        if (callback)
-            callback();
-    },
-
-    updateCollectionsList: function(callback)
+    updateCollectionsList: function()
     {
         Bandwagon.Logger.debug("Updating collections list...");
 
-        this.updateServiceDocument(callback);
+        this.updateServiceDocument();
     },
 
-    updateServiceDocument: function(callback)
+    updateServiceDocument: function()
     {
-        if (!this.isAuthenticated())
+        if (!this.isAMOAuthenticated())
+        {
+            Bandwagon.Logger.debug("Not authenticated in AMO");
             return;
-
-        this._service.getServiceDocument(callback);
+        }
+        
+        this._service.getServiceDocument();
     },
 
     checkForUpdates: function(collection)
     {
-        if (!this.isAuthenticated())
-            return;
-
         this._service.getCollection(collection);
-
-        var now = new Date();
-
         collection.dateLastCheck = now;
     },
 
@@ -712,9 +496,6 @@ BandwagonService.prototype = {
 
     forceCheckForUpdates: function(collection)
     {
-        if (!this.isAuthenticated())
-            return;
-
         this._service.getCollection(collection);
         collection.dateLastCheck = new Date();
     },
@@ -730,19 +511,54 @@ BandwagonService.prototype = {
         }
     },
 
-    forceCheckAllForUpdatesAndUpdateCollectionsList: function(callback)
+    forceCheckAllForUpdatesAndUpdateCollectionsList: function()
     {
         // All updates to the collections list are forced, i.e. they are always
         // caused by *some* user interaction, never in the background.
         // Updating the collections list also forces the collections to be updated.
         
-        this.updateCollectionsList(callback);
+        this.updateCollectionsList();
+    },
+
+    /** OBSOLETE
+    subscribe: function(collection)
+    {
+        collection.preview = false;
+        collection.setAllNotified();
+
+        this._service.subscribeCollection(collection);
     },
+    */
+
+    /** OBSOLETE
+    unsubscribe: function(collection)
+    {
+        this._service.unsubscribeCollection(collection);
+    },
+    */
 
     firstrun: function()
     {
         Bandwagon.Logger.info("This is bandwagon's firstrun. Welcome!");
 
+        // set up and save default collections
+
+        // FIXME temporarily disabling this
+        //this._addDefaultCollection(Bandwagon.DEFAULT_COLLECTION1_URL, Bandwagon.DEFAULT_COLLECTION1_NAME);
+        //this._addDefaultCollection("http://www.33eels.com/clients/briks/bandwagon/testcollection.xml", "test collection");
+        
+        /** OBSOLETE
+        // check for cookie to see if we have to add a collection like that
+        var addCollectionCookieValue = Bandwagon.Util.getCookie(Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_HOST, Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_NAME);
+        if (addCollectionCookieValue)
+        {
+            Bandwagon.Logger.info("Found magic 'add collection' cookie. Adding the collection '" + addCollectionCookieValue + "'.");
+            this.addPreviewCollection(addCollectionCookieValue);
+
+            // TODO we don't have to because we're in firstrun, but should we delete cookie to be neat?
+        }
+        */
+
         // the last check date is now
 
         var now = new Date();
@@ -769,6 +585,22 @@ BandwagonService.prototype = {
         this.subscribe(collection);
     },
 
+    /** OBSOLETE
+    addPreviewCollection: function(url)
+    {
+        var collection = this._collectionFactory.newCollection();
+        collection.resourceURL = url;
+        collection.preview = true;
+        this.collections[collection.resourceURL] = collection;
+
+        this.forceCheckForUpdates(collection);
+
+        bandwagonService._notifyListChangeObservers();
+
+        return collection;
+    },
+    */
+
     uninstall: function()
     {
         // TODO
@@ -779,6 +611,11 @@ BandwagonService.prototype = {
         if (!bandwagonService._collectionFactory)
             return;
 
+        /** OBSOLETE
+        if (collection.preview)
+            return;
+        */
+
         Bandwagon.Logger.debug("In commit() with collection: " + collection.resourceURL);
 
         bandwagonService._collectionFactory.commitCollection(collection);
@@ -799,23 +636,18 @@ BandwagonService.prototype = {
             bandwagonService._collectionFactory.commitServiceDocument(bandwagonService._serviceDocument);
     },
 
-    removeAddonFromCollection: function(guid, collection, callback)
+    removeAddonFromCollection: function(guid, collection)
     {
         Bandwagon.Logger.debug("In removeAddonFromCollection()");
 
-        if (!this.isAuthenticated())
-            return;
-
-        this._service.removeAddonFromCollection(guid, collection, callback);
+        this._service.removeAddonFromCollection(guid, collection);
     },
 
     newCollection: function(collection, callback)
     {
         Bandwagon.Logger.debug("In newCollection()");
 
-        if (!this.isAuthenticated())
-            return;
-
+        /*
         var internalCallback = function(event)
         {
             if (!event.isError())
@@ -834,6 +666,9 @@ BandwagonService.prototype = {
         }
 
         this._service.newCollection(collection, internalCallback);
+        */
+
+        this._service.newCollection(collection, callback);
     },
 
     unlinkCollection: function(collection)
@@ -855,114 +690,9 @@ BandwagonService.prototype = {
 
     deleteCollection: function(collection, callback)
     {
-        if (!this.isAuthenticated())
-            return;
-
         this._service.deleteCollection(collection, callback);
     },
 
-    subscribeToCollection: function(collection, callback)
-    {
-        if (!this.isAuthenticated())
-            return;
-
-        var internalCallback = function(event)
-        {
-            if (!event.isError())
-            {
-                collection.subscribed = true;
-                bandwagonService._notifyListChangeObservers();
-            }
-
-            if (callback)
-            {
-                callback(event);
-            }
-        }
-
-        this._service.subscribeToCollection(collection, internalCallback);
-    },
-
-    unsubscribeFromCollection: function(collection, callback)
-    {
-        if (!this.isAuthenticated())
-            return;
-
-        var internalCallback = function(event)
-        {
-            if (!event.isError())
-            {
-                bandwagonService.unlinkCollection(collection);
-            }
-
-            if (callback)
-            {
-                callback(event);
-            }
-        }
-
-        this._service.unsubscribeFromCollection(collection, internalCallback);
-    },
-
-    updateCollectionDetails: function(collection, callback)
-    {
-        if (!this.isAuthenticated())
-            return;
-
-        this._service.updateCollectionDetails(collection, callback);
-    },
-
-    /** This function is called when a 3rd party extension is uninstalled by
-     * the user.  If this extension is part of a local auto publisher, we
-     * remove it from that autopublisher.
-     */
-    processOtherExtensionUninstall: function(guid, callback)
-    {
-        Bandwagon.Logger.debug("In processOtherExtensionUninstall() with guid = " + guid);
-
-        var localAutoPublisher = bandwagonService.getLocalAutoPublisher();
-
-        if (!localAutoPublisher)
-            return;
-
-        var internalCallback = function(event)
-        {
-            if (!event.isError())
-            {
-                // update list of autopublished extensions to remove this one
-                var autopublishedExtensions = Bandwagon.Preferences.getPreferenceList("autopublished.extensions");
-
-                for (var j=0; j<autopublishedExtensions.length; j++)
-                {
-                    if (autopublishedExtensions[j] == guid)
-                    {
-                        delete autopublishedExtensions[j];
-                        break;
-                    }
-                }
-
-                Bandwagon.Preferences.setPreferenceList("autopublished.extensions", autopublishedExtensions);
-
-                bandwagonService.forceCheckForUpdates(localAutoPublisher);
-
-                if (callback)
-                    callback(event);
-            }
-        }
-
-        for (var id in localAutoPublisher.addons)
-        {
-            if (localAutoPublisher.addons[id].guid == guid)
-            {
-                Bandwagon.Logger.debug("Found this extension in local auto publisher: '" + localAutoPublisher.addons[id].guid + "' vs '" + guid + "', will remove.");
-
-                this.removeAddonFromCollection(guid, localAutoPublisher, internalCallback);
-
-                break;
-            }
-        }
-    },
-
     getAddonsPerPage: function(collection)
     {
         // returns this collection's custom items per page, or else the global value
@@ -1000,8 +730,6 @@ BandwagonService.prototype = {
     {
         emailAddress = emailAddress.replace(/^\s+/, "");
         emailAddress = emailAddress.replace(/\s+$/, "");
-        emailAddress = emailAddress.replace(/^,/, "");
-        emailAddress = emailAddress.replace(/,$/, "");
 
         var previouslySharedEmailAddresses = this.getPreviouslySharedEmailAddresses();
 
@@ -1024,44 +752,21 @@ BandwagonService.prototype = {
 
         for (var i=0; i<bits.length; i++)
         {
-            if (bits[i].match(/.*@.*/))
-            {
-                this.addPreviouslySharedEmailAddress(bits[i]);
-            }
+            this.addPreviouslySharedEmailAddress(bits[i]);
         }
     },
 
     publishToCollection: function(extension, collection, personalNote, callback)
     {
-        if (!this.isAuthenticated())
-            return;
-
         this._service.publishToCollection(extension, collection, personalNote, callback);
     },
 
     shareToEmail: function(extension, emailAddress, personalNote, callback)
     {
-        if (!this.isAuthenticated())
-            return;
-
-        // trim any commas from a multi-email string
-
-        emailAddress = emailAddress.replace(/^,/, "");
-        emailAddress = emailAddress.replace(/,$/, "");
-
         this._service.shareToEmail(extension, emailAddress, personalNote, callback);
     },
 
-    /**
-     * Performs a 'soft' check for authenication. I.e. do we have a token from a previous auth. This method doesn't
-     * check if that token is still valid on the server.
-     */
-    isAuthenticated: function()
-    {
-        return (Bandwagon.Preferences.getPreference(Bandwagon.PREF_AUTH_TOKEN) != "");
-    },
-
-    deleteAMOCookie: function()
+    isAMOAuthenticated: function()
     {
         var cm = CookieManager.getService(nsICookieManager);
 
@@ -1074,12 +779,11 @@ BandwagonService.prototype = {
             if (cookie instanceof Ci.nsICookie)
             {
                 if (cookie.host == Bandwagon.AMO_AUTH_COOKIE_HOST && cookie.name == Bandwagon.AMO_AUTH_COOKIE_NAME)
-                {
-                    // KILL!
-                    cm.remove(cookie.host, cookie.name, cookie.path, false);
-                }
+                    return true;
             }
         }
+
+        return false;
     },
 
     _collectionUpdateObserver: function(collection)
@@ -1139,7 +843,7 @@ BandwagonService.prototype = {
 
         try
         {
-            this._storageConnection = storageService.openUnsharedDatabase(file);
+            this._storageConnection = storageService.openDatabase(file);
         }
         catch (e)
         {
@@ -1159,8 +863,6 @@ BandwagonService.prototype = {
 
         // create tables (if they're not already created)
 
-        this._storageConnection.beginTransaction();
-
         try
         {
             this._storageConnection.executeSimpleSQL(
@@ -1257,93 +959,6 @@ BandwagonService.prototype = {
         catch (e)
         {
             Bandwagon.Logger.error("Error creating sqlite table: " + e);
-            this._storageConnection.rollbackTransaction();
-            return;
-        }
-
-        this._storageConnection.commitTransaction();
-    },
-
-    startUninstallObserver : function ()
-    {
-        if (gUninstallObserverInited) return;
-
-        var extService = Components.classes["@mozilla.org/extensions/manager;1"]
-            .getService(Components.interfaces.nsIExtensionManager);
-
-        if (extService && ("uninstallItem" in extService))
-        {
-            var observerService = Components.classes["@mozilla.org/observer-service;1"]
-                .getService(Components.interfaces.nsIObserverService);
-            observerService.addObserver(this.addonsAction, "em-action-requested", false);
-            gUninstallObserverInited = true;
-        }
-        else
-        {
-            try
-            {
-                extService.datasource.AddObserver(this.addonsObserver);
-                gUninstallObserverInited = true;
-            }
-            catch (e) { }
-        }
-    },
-
-    addonsObserver:
-    {
-        onAssert: function (ds, subject, predicate, target)
-        {
-            if ((predicate.Value == "http://www.mozilla.org/2004/em-rdf#toBeUninstalled")
-                    &&
-                    (target instanceof Components.interfaces.nsIRDFLiteral)
-                    &&
-                    (target.Value == "true"))
-            {
-                if (subject.Value == "urn:mozilla:extension:" + gEmGUID)
-                {
-                    // This is case where bandwagon is being uninstalled - clean up
-
-                    cleanupSettings();
-                }
-                else
-                {
-                    // This is case where some other extension is being uninstalled
-
-                    var val = subject.Value;
-                    val = val.replace(/urn:mozilla:extension:/, "");
-
-                    bandwagonService.processOtherExtensionUninstall(val);
-                }
-            }
-        },
-
-        onUnassert: function (ds, subject, predicate, target) {},
-        onChange: function (ds, subject, predicate, oldtarget, newtarget) {},
-        onMove: function (ds, oldsubject, newsubject, predicate, target) {},
-        onBeginUpdateBatch: function() {},
-        onEndUpdateBatch: function() {}
-    },
-
-    addonsAction:
-    {
-        observe: function (subject, topic, data)
-        {
-            if ((data == "item-uninstalled") &&
-                (subject instanceof Components.interfaces.nsIUpdateItem))
-            {
-                if (subject.id == gEmGUID)
-                {
-                    // This is case where bandwagon is being uninstalled - clean up
-
-                    cleanupSettings();
-                }
-                else
-                {
-                    // This is case where some other extension is being uninstalled
-
-                    bandwagonService.processOtherExtensionUninstall(subject.id);
-                }
-            }
         }
     },
 
diff --git a/bandwagon/content/scripts/bandwagon.js b/bandwagon/content/scripts/bandwagon.js
index 76fede1..a02ada5 100644
--- a/bandwagon/content/scripts/bandwagon.js
+++ b/bandwagon/content/scripts/bandwagon.js
@@ -44,26 +44,32 @@ Bandwagon.EMID = "sharing@addons.mozilla.org";
 Bandwagon.SQLITE_FILENAME = "bandwagon.sqlite";
 
 // This is the interval between checking if the collections need updating (in
-// seconds) (this will always be 120 seconds in debug mode).  Note, this is not
+// seconds) (this will always be 30 seconds in debug mode).  Note, this is not
 // the delay between instances of when the feeds are pulled down (this is
 // decided by "extensions.bandwagon.global.update.*" or per-collection
 // settings), but rather the minimum delay.
 
 Bandwagon.COLLECTION_UPDATE_TIMER_DELAY = 10 * 60;
 
-// Note: %%AMO_HOST%% replacement done in bandwagonService._initAMOHost()
-// XX Brian - this should really be done on the fly to avoid repitition of urls throughtout the code
-//   and to lessen maintenance.
+// REMEMBER: when changing AMO_HOST, the service document url in
+// scripts/rpc/constants.js also has to be changed.
 
-Bandwagon.LOGINPANE_DO_NEW_ACCOUNT = "https://%%AMO_HOST%%/users/register";
-Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL = "https://%%AMO_HOST%%/collections";
-Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL = "https://%%AMO_HOST%%/collections/add";
-Bandwagon.FIRSTRUN_LANDING_PAGE = "https://%%AMO_HOST%%/pages/collector_firstrun";
-Bandwagon.AMO_AUTH_COOKIE_HOST = "%%AMO_HOST%%";
+Bandwagon.AMO_HOST = "bandwagon.stage.mozilla.com";
+
+Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL = "https://" + Bandwagon.AMO_HOST + "/en-US/collections";
+Bandwagon.COLLECTIONSPANE_DO_LOGIN_URL = "https://" + Bandwagon.AMO_HOST + "/en-US/firefox/users/login?to=en-US%2Ffirefox%2Fcollections";
+Bandwagon.COLLECTIONSPANE_DO_LOGOUT_URL = "https://" + Bandwagon.AMO_HOST + "/en-US/firefox/users/logout";
+Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL = "https://" + Bandwagon.AMO_HOST + "/en-US/firefox/collections/add";
+Bandwagon.FIRSTRUN_LANDING_PAGE = "https://" + Bandwagon.AMO_HOST + "/en-US/collections"; // TODO
+Bandwagon.AMO_AUTH_COOKIE_HOST = Bandwagon.AMO_HOST;
 Bandwagon.AMO_AUTH_COOKIE_NAME = "AMOv3";
-Bandwagon.PREF_AUTH_TOKEN = "authtoken";
 
-Bandwagon.COMMIT_NOW = 0; // 1=commit on the fly. 0=commit when browser exit.
-Bandwagon.ENABLE_PAGINATION = 0; // 1=enable "add-ons per page" settings, limit number of add-ons displayed in EM. 0=disable these settings, show all add-ons in EM.
+/* ** OBSOLETE
+//Bandwagon.DEFAULT_COLLECTION1_URL = "https://services.addons.mozilla.org/en-US/firefox/api/1.1/list/featured/all/10/";
+//Bandwagon.DEFAULT_COLLECTION1_NAME = "Featured Add-ons";
+//Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_HOST = "www.33eels.com"; 
+//Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_NAME = "bandwagon_addcollection";
+*/
 
+Bandwagon.COMMIT_NOW = 0; // 1=commit on the fly. 0=commit when browser exit.
 
diff --git a/bandwagon/content/scripts/factory/collectionFactory.js b/bandwagon/content/scripts/factory/collectionFactory.js
index 0c32dc4..6adfee8 100644
--- a/bandwagon/content/scripts/factory/collectionFactory.js
+++ b/bandwagon/content/scripts/factory/collectionFactory.js
@@ -38,8 +38,6 @@ Bandwagon.Factory.CollectionFactory = function(connection)
 {
     this.Bandwagon = Bandwagon;
     this.connection = connection;
-
-    this.connection.executeSimpleSQL("PRAGMA locking_mode = EXCLUSIVE");
 }
 
 Bandwagon.Factory.CollectionFactory.prototype.openServiceDocument = function()
@@ -53,6 +51,8 @@ Bandwagon.Factory.CollectionFactory.prototype.openServiceDocument = function()
 
     try
     {
+        statement.execute();
+
         while (statement.executeStep())
         {
             serviceDocument = new this.Bandwagon.Model.ServiceDocument();
@@ -71,9 +71,7 @@ Bandwagon.Factory.CollectionFactory.prototype.openServiceDocument = function()
 Bandwagon.Factory.CollectionFactory.prototype.commitServiceDocument = function(serviceDocument)
 {
     if (!this.connection)
-        return;
-
-    this.connection.beginTransaction();
+        return null;
 
     var statement1 = this.connection.createStatement("DELETE FROM serviceDocument");
 
@@ -81,11 +79,6 @@ Bandwagon.Factory.CollectionFactory.prototype.commitServiceDocument = function(s
     {
         statement1.execute();
     }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
     finally
     {
         statement1.reset();
@@ -99,17 +92,10 @@ Bandwagon.Factory.CollectionFactory.prototype.commitServiceDocument = function(s
         statement2.bindUTF8StringParameter(1, serviceDocument.collectionListResourceURL);
         statement2.execute();
     }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
     finally
     {
         statement2.reset();
     }
-
-    this.connection.commitTransaction();
 }
 
 Bandwagon.Factory.CollectionFactory.prototype.newCollection = function()
@@ -186,8 +172,6 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collec
     if (!this.connection)
         return;
 
-    this.connection.beginTransaction();
-
     var statement = this.connection.createStatement("REPLACE INTO collections VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18)");
 
     try
@@ -213,11 +197,6 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collec
         
         statement.execute();
     }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
     finally
     {
         statement.reset();
@@ -228,34 +207,9 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collec
         collection.storageID = this.connection.lastInsertRowID;
     }
 
-    var statement3 = this.connection.createStatement("DELETE FROM collectionsAddons where collection = ?1");
-
-    try
-    {
-        statement3.bindInt32Parameter(0, collection.storageID);
-        statement3.execute();
-    }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
-    finally
-    {
-        statement3.reset();
-    }
-
     for (var id in collection.addons)
     {
-        try
-        {
-            this._commitAddon(collection, collection.addons[id]);
-        }
-        catch (e)
-        {
-            this.connection.rollbackTransaction();
-            throw e;
-        }
+        this._commitAddon(collection, collection.addons[id]);
     }
 
     var statement2 = this.connection.createStatement("DELETE FROM collectionsLinks WHERE collection = ?1");
@@ -265,11 +219,6 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collec
         statement2.bindInt32Parameter(0, collection.storageID);
         statement2.execute();
     }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
     finally
     {
         statement2.reset();
@@ -277,19 +226,9 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollection = function(collec
 
     for (var id in collection.links)
     {
-        try
-        {
-            this._commitCollectionLink(collection, id);
-        }
-        catch (e)
-        {
-            this.connection.rollbackTransaction();
-            throw e;
-        }
+        this._commitCollectionLink(collection, id);
     }
 
-    this.connection.commitTransaction();
-
     return true;
 }
 
@@ -304,34 +243,27 @@ Bandwagon.Factory.CollectionFactory.prototype.commitCollections = function(colle
 Bandwagon.Factory.CollectionFactory.prototype.deleteCollection = function(collection)
 {
     if (!this.connection)
-        return;
-
-    this.connection.beginTransaction();
+        return null;
 
     var statement1 = this.connection.createStatement("DELETE FROM collections where id = ?1");
     var statement2 = this.connection.createStatement("DELETE FROM collectionsAddons where collection = ?1");
 
     try
     {
+        // TODO transaction here?
+
         statement1.bindInt32Parameter(0, collection.storageID);
         statement1.execute();
 
         statement2.bindInt32Parameter(0, collection.storageID);
         statement2.execute();
     }
-    catch (e)
-    {
-        this.connection.rollbackTransaction();
-        throw e;
-    }
     finally
     {
         statement1.reset();
         statement2.reset();
     }
 
-    this.connection.commitTransaction();
-
     return (statement2.lastError>0?false:true);
 }
 
@@ -602,6 +534,8 @@ Bandwagon.Factory.CollectionFactory.prototype._commitCollectionLink = function(c
     {
         statement.reset();
     }
+
+
 }
 
 Bandwagon.Factory.CollectionFactory.prototype._commitAddon = function(collection, addon)
diff --git a/bandwagon/content/scripts/model/addon.js b/bandwagon/content/scripts/model/addon.js
index abf4634..5ef72b9 100644
--- a/bandwagon/content/scripts/model/addon.js
+++ b/bandwagon/content/scripts/model/addon.js
@@ -83,27 +83,10 @@ Bandwagon.Model.Addon.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION = 2;
 Bandwagon.Model.Addon.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION = 3;
 Bandwagon.Model.Addon.INSTALL_NO_MUST_DOWNLOAD_BETA = 4;
 Bandwagon.Model.Addon.INSTALL_NO_NOT_COMPATIBLE_OS = 5;
-Bandwagon.Model.Addon.INSTALL_NO_IS_EXPERIMENTAL = 6;
-
-Bandwagon.Model.Addon.STATUS_PUBLIC = 4;
-Bandwagon.Model.Addon.STATUS_SANDBOX = 1;
 
 Bandwagon.Model.Addon.prototype.canInstall = function(env)
 {
-    // chec is the extension experimental
-
-    if (this.status == Bandwagon.Model.Addon.STATUS_SANDBOX)
-    {
-        var details =
-        {
-            type: Bandwagon.Model.Addon.INSTALL_NO_IS_EXPERIMENTAL,
-            requiredVersion: ""
-        };
-
-        return details;
-    }
-
-    // check is the extension compatible with this os
+     // check is the extension compatible with this os
 
     if (!this.getInstaller(env.os))
     {
@@ -298,8 +281,8 @@ Bandwagon.Model.Addon.prototype.unserialize = function(xaddon)
     if (!comment0Author.match(/\w/))
         comment0Author = "Unknown";
 
-    //if (comment0Comment.match(/\w/))
-    this.comments.push({comment: comment0Comment, author: comment0Author});
+    if (comment0Comment.match(/\w/))
+        this.comments.push({comment: comment0Comment, author: comment0Author});
 
 }
 
diff --git a/bandwagon/content/scripts/model/collection.js b/bandwagon/content/scripts/model/collection.js
index c156198..27a20e7 100644
--- a/bandwagon/content/scripts/model/collection.js
+++ b/bandwagon/content/scripts/model/collection.js
@@ -59,11 +59,7 @@ Bandwagon.Model.Collection = function()
     this.showNotifications = -1; // default is to use global setting
     this.addonsPerPage = -1; // default is to use global setting
 
-    this.autoPublishExtensions = true;
-    this.autoPublishThemes = true;
-    this.autoPublishDicts = true;
-    this.autoPublishLangPacks = true;
-    this.autoPublishDisabled = false;
+    //this.preview = false;
 
     this.status = this.STATUS_NEW;
     this.type = this.TYPE_NORMAL;
@@ -175,7 +171,7 @@ Bandwagon.Model.Collection.prototype.isLocalAutoPublisher = function()
     if (this.name == "")
         return false;
 
-    return (this.Bandwagon.Preferences.getPreference("local.autopublisher") == this.resourceURL);
+    return (this.Bandwagon.Preferences.getPreference("local.autopublisher") == this.name);
 }
 
 Bandwagon.Model.Collection.prototype.toString = function()
@@ -193,7 +189,8 @@ Bandwagon.Model.Collection.prototype.equals = function(other)
 
 Bandwagon.Model.Collection.prototype.unserialize = function(xcollection)
 {
-    var baseURL = xcollection.@xmlbase.toString();
+    var xmlns = new Namespace('http://www.w3.org/XML/1998/namespace');
+    var baseURL = xcollection.@xmlns::base.toString();
 
     //this.resourceURL = baseURL + "/" + xcollection.attribute("href").toString();
 
@@ -226,23 +223,10 @@ Bandwagon.Model.Collection.prototype.unserialize = function(xcollection)
             {
                 this.addons[addon.guid] = addon;
             }
-
-            this.addons[addon.guid].seen = true;
-        }
-    }
-
-    for (var id in this.addons)
-    {
-        if (this.addons[id].seen != true)
-        {
-            delete this.addons[id];
-            continue;
         }
-
-        this.addons[id].seen = false;
     }
 
-    var linkBaseURL = xcollection.links.@xmlbase.toString();
+    var linkBaseURL = xcollection.links.@xmlns::base.toString();
 
     for each (var xlink in xcollection.links.link)
     {
diff --git a/bandwagon/content/scripts/model/serviceDocument.js b/bandwagon/content/scripts/model/serviceDocument.js
index fc29a50..9d96780 100644
--- a/bandwagon/content/scripts/model/serviceDocument.js
+++ b/bandwagon/content/scripts/model/serviceDocument.js
@@ -46,7 +46,8 @@ Bandwagon.Model.ServiceDocument = function()
 
 Bandwagon.Model.ServiceDocument.prototype.unserialize = function(xsharing)
 {
-    var baseURL = xsharing.@xmlbase.toString();
+    var xmlns = new Namespace('http://www.w3.org/XML/1998/namespace');
+    var baseURL = xsharing.@xmlns::base.toString();
 
     // resource urls
     
@@ -73,7 +74,6 @@ Bandwagon.Model.ServiceDocument.prototype.unserialize = function(xsharing)
 
         collection.addonsResourceURL = baseURL + "/" + xcollection.addons.attribute("href").toString();
 
-        if (collection.subscribed)
-            this.collections.push(collection);
+        this.collections.push(collection);
     }
 }
diff --git a/bandwagon/content/scripts/prefs.js b/bandwagon/content/scripts/prefs.js
index 85862db..9485753 100644
--- a/bandwagon/content/scripts/prefs.js
+++ b/bandwagon/content/scripts/prefs.js
@@ -139,7 +139,7 @@ Bandwagon.Preferences.notifyObservers = function(data)
               .notifyObservers(null, "nsPref:changed", data);
 }
 
-Bandwagon.Preferences.getGlobalPreference = function(name, failSilently)
+Bandwagon.Preferences.getGlobalPreference = function(name)
 {
     var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
         getService(Components.interfaces.nsIPrefService);
@@ -162,42 +162,19 @@ Bandwagon.Preferences.getGlobalPreference = function(name, failSilently)
         {
             val = prefSvc.getCharPref(name);
         }
-        else if (failSilently == undefined || failSilently == false)
+        else
         {
-                Bandwagon.Logger.error("Invalid pref: " + name);
+            Bandwagon.Logger.error("Invalid pref: " + name);
         }
     }
     catch (e)
     {
-        if (failSilently == undefined || failSilently == false)
-            Bandwagon.Logger.error(e);
-
+        Bandwagon.Logger.error(e);
         return null;
     }
 
     return val;
-}
-
-Bandwagon.Preferences.addGlobalObserver = function(observer, branchName)
-{
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-        .getService(Components.interfaces.nsIPrefService);
-
-    var branch = prefService.getBranch(branchName);
-    branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
-    branch.addObserver("", observer, false);
-}
-
-Bandwagon.Preferences.removeGlobalObserver = function(observer, branchName)
-{
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-        .getService(Components.interfaces.nsIPrefService);
-
-    var branch = prefService.getBranch(branchName);
-    branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
 
-    branch.removeObserver("", observer);
 }
 
 Bandwagon.Preferences._getPrefService = function()
diff --git a/bandwagon/content/scripts/rpc/constants.js b/bandwagon/content/scripts/rpc/constants.js
index 3676bed..37b1836 100644
--- a/bandwagon/content/scripts/rpc/constants.js
+++ b/bandwagon/content/scripts/rpc/constants.js
@@ -37,7 +37,7 @@
 
 Bandwagon.RPC.Constants = new function()
 {
-    this.BANDWAGON_RPC_SERVICE_DOCUMENT = "https://%%AMO_HOST%%/en-US/firefox/api/1.3/sharing/";
+    this.BANDWAGON_RPC_SERVICE_DOCUMENT = "https://bandwagon.stage.mozilla.com/en-US/firefox/api/1.3/sharing";
     
     this.BANDWAGON_RPC_ENABLE_CACHE_BUSTER = 1;
 
@@ -48,10 +48,6 @@ Bandwagon.RPC.Constants = new function()
     this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_REMOVE_ADDON_FROM_COLLECTION_COMPLETE  = 500;
     this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_NEW_COLLECTION_COMPLETE  = 600;
     this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_DELETE_COLLECTION_COMPLETE  = 700;
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_AUTH_DOCUMENT_COMPLETE  = 800;
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_UNSUBSCRIBE_FROM_COLLECTION_COMPLETE  = 900;
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SUBSCRIBE_TO_COLLECTION_COMPLETE  = 1000;
-    this.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_UPDATE_COLLECTION_COMPLETE  = 1100;
 
     // xhr layer constants
 
diff --git a/bandwagon/content/scripts/rpc/event.js b/bandwagon/content/scripts/rpc/event.js
index ae8e165..a388f3a 100644
--- a/bandwagon/content/scripts/rpc/event.js
+++ b/bandwagon/content/scripts/rpc/event.js
@@ -39,16 +39,16 @@ Bandwagon.RPC.Event = function(type, result, response)
 {
     this.Bandwagon = Bandwagon;
 
-    // public instance variables
+	// public instance variables
     this._type = type;
-    this._result = result;
-    this._response = response;
+	this._result = result;
+	this._response = response;
     this.error = null;
 }
 
 Bandwagon.RPC.Event.prototype.isError = function()
 {
-    return this._result != this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_SUCCESS;
+	return this._result != this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_SUCCESS;
 }
 
 Bandwagon.RPC.Event.prototype.setError = function(error)
diff --git a/bandwagon/content/scripts/rpc/net.js b/bandwagon/content/scripts/rpc/net.js
index 7a2c2a8..21b7475 100644
--- a/bandwagon/content/scripts/rpc/net.js
+++ b/bandwagon/content/scripts/rpc/net.js
@@ -53,11 +53,18 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
     this._queryString = '';
     this._postData = '';
     this._type = null;
-    this._headers = {};
 
     this._request = null;
     this._logger = null;
 
+    /*
+       this.release = function() {
+       this._request = null;
+       this.onComplete = null;
+       this.logger = null;
+       }
+     */
+
     this.finished = function(result, response, request)
     {
         this._logger.debug('Bandwagon.RPC.Net.finished: ' + this.id + ': finished');
@@ -65,11 +72,11 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
         this.onComplete(this, result, response, this._type, request);
     };
 
-    this.failed = function(errorCode, errorMessage, data)
+    this.failed = function(errorCode, errorMessage)
     {
         this._logger.debug('Bandwagon.RPC.Net.failed: ' + this.id + ': failed');
         this.status = this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_FINISHED;
-        var response = {errorCode: errorCode, errorMessage: errorMessage, data: data};
+        var response = {errorCode: errorCode, errorMessage: errorMessage};
         this.onComplete(this, this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_FAILURE, response, this._type, null);
     };
 
@@ -107,15 +114,14 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
 
         try
         {
+            // parse xml here instead, put in response var
             var xmlStr = rpcnetrequest.responseText;
 
-            // dave@briks: The following hacks are workarounds for E4X
-            // bugs/features. If anyone knows the dark secrets of namespace
-            // support in e4x please let me know!
-
+            // workaround for E4X bugs/features
             xmlStr = xmlStr.replace(/^<\?xml\s+version\s*=\s*(["'])[^\1]+\1[^?]*\?>/, ""); // bug 336551
-            xmlStr = xmlStr.replace(/xmlns="http:\/\/addons.mozilla.org\/"/gi, "");
-            xmlStr = xmlStr.replace(/xml:base=/gi, "xmlbase=");
+
+            //default xml namespace = 'http://addons.mozilla.org/';
+            xmlStr = xmlStr.replace(/xmlns="http:\/\/addons.mozilla.org\/"/, "");
 
             response = new XML(xmlStr);
 
@@ -145,7 +151,7 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
             else
             {
                 // application error (bad xml)
-                rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_XML, lastErr, response);
+                rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_XML, lastErr);
                 return;
             }
         }
@@ -154,53 +160,54 @@ Bandwagon.RPC.Net = function(Bandwagon, Components)
 
         try 
         {
-            lastErr = (response.attribute("reason")?response.attribute("reason"):"?");
+            // TODO what form does bandwagon rpc error take?
+            lastErr = response.message;
             rpcnet._logger.debug('Bandwagon.RPC.Net.send.onreadystatechange: ' + rpcnet.id + ": completed, response error message = '" + lastErr + "'");
         }
         catch (e)
         {
-            rpcnet._logger.debug('Bandwagon.RPC.Net.send.onreadystatechange: ' + rpcnet.id + ": have an error status code (" + status + "), but there is no error message in the XML response");
+            rpcnet._logger.debug('Bandwagon.RPC.Net.send.onreadystatechange: ' + rpcnet.id + ": have an error status code, but there is no error message in the XML response");
             lastErr = null;
         }
 
         if (status == 400)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_REQUEST, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_REQUEST, lastErr);
             return;
         }
         else if (status == 401)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNAUTHORIZED, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNAUTHORIZED, lastErr);
             return;
         }
-        else if (status == 403)
+         else if (status == 403)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_FORBIDDEN, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_FORBIDDEN, lastErr);
             return;
         }
          else if (status == 404)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_NOT_FOUND, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_NOT_FOUND, lastErr);
             return;
         }
          else if (status == 409)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_CONFLICT, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_CONFLICT, lastErr);
             return;
         }
          else if (status == 422)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_CONTEXT, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_BAD_CONTEXT, lastErr);
             return;
         }
          else if (status == 500)
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_INTERNAL_SERVER_ERROR, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_INTERNAL_SERVER_ERROR, lastErr);
             return;
         }
         else
         {
-            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_CRITICAL_ERROR, lastErr, response);
+            rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_CRITICAL_ERROR, lastErr);
             return;
         }
     };
@@ -227,7 +234,7 @@ Bandwagon.RPC.Net.prototype.setPostData = function(args)
 
     for (var i in args)
     {
-        this._postData += this.Bandwagon.Util.encodeURL(i) + '=' + this.Bandwagon.Util.encodeURL(args[i]) + '&';
+        this._postData += encodeURIComponent(i) + '=' + encodeURIComponent(args[i]) + '&';
     }
 
     if ('&' == this._postData.charAt(this._postData.length-1))
@@ -242,7 +249,7 @@ Bandwagon.RPC.Net.prototype.setArguments = function(args)
 
     for (var i in args)
     {
-        this._queryString += this.Bandwagon.Util.encodeURL(i) + '=' + this.Bandwagon.Util.encodeURL(args[i]) + '&';
+        this._queryString += encodeURIComponent(i) + '=' + encodeURIComponent(args[i]) + '&';
     }
 
     if ('&' == this._queryString.charAt(this._queryString.length-1))
@@ -261,10 +268,6 @@ Bandwagon.RPC.Net.prototype.setMethod = function(method)
     {
         this._method = 'DELETE';
     }
-    else if (method == 'PUT')
-    {
-        this._method = 'PUT';
-    }
     else 
     {
         this._method = 'GET';
@@ -273,11 +276,6 @@ Bandwagon.RPC.Net.prototype.setMethod = function(method)
     this._method = method;
 }
 
-Bandwagon.RPC.Net.prototype.setHeader = function(header, value)
-{
-    this._headers[header] = value;
-}
-
 Bandwagon.RPC.Net.prototype.setCredentials = function(username, password)
 {
     this._basicAuthUsername = username;
@@ -296,18 +294,12 @@ Bandwagon.RPC.Net.prototype.send = function()
 
     if (!rpcnetrequest) { rpcnet.failed(rpcnet.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_ERROR_XHR_CREATE); }
 
-    rpcnetrequest.mozBackgroundRequest = true;
-
     var postData = null;
     var url = rpcnet._url;
 
-    if (('POST' == rpcnet._method || 'PUT' == rpcnet._method)
-        && rpcnet._postData.length > 0)
-    {
+    if ('POST' == rpcnet._method && rpcnet._postData.length > 0) {
         postData = rpcnet._postData;
-    }
-    else if (rpcnet._queryString && (rpcnet._queryString.length > 0))
-    {
+    } else if (rpcnet._queryString && (rpcnet._queryString.length > 0)) {
         url += "?" + rpcnet._queryString;
     }
 
@@ -329,16 +321,11 @@ Bandwagon.RPC.Net.prototype.send = function()
         rpcnetrequest.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
     }
 
-    for (var header in rpcnet._headers)
-    {
-        //rpcnet._logger.debug('Bandwagon.RPC.Net.send: ' + rpcnet.id + ': adding custom header ' + header + ': ' + rpcnet._headers[header]);
-        rpcnetrequest.setRequestHeader(header, rpcnet._headers[header]);
-    }
-
+    /* not needed for now
     if ('' != rpcnet._basicAuthUsername) {
-        rpcnet._logger.debug('Bandwagon.RPC.Net.send: using credentials for ' + rpcnet._basicAuthUsername);
         rpcnetrequest.setRequestHeader('Authorization', 'Basic ' + btoa(rpcnet._basicAuthUsername + ':' + rpcnet._basicAuthPassword));
     }
+    */
 
     rpcnetrequest.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2005 00:00:00 GMT");
 
diff --git a/bandwagon/content/scripts/rpc/service.js b/bandwagon/content/scripts/rpc/service.js
index 83c562e..9251f59 100644
--- a/bandwagon/content/scripts/rpc/service.js
+++ b/bandwagon/content/scripts/rpc/service.js
@@ -61,9 +61,8 @@ Bandwagon.RPC.Service = function()
         if (result == service.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_FAILURE)
         {
             // response is error code
-            service._logger.debug("Bandwagon.RPC.Service: complete is error with error code: " + response.errorCode + ", message: " + response.errorMessage);
+            service._logger.debug("Bandwagon.RPC.Service: complete is error with error code: " + response.errorCode + ", message: " + response.errorMessage)
             event.error = new service.Bandwagon.RPC.Error(response.errorCode, response.errorMessage);
-            event._response = response.data;
         }
         
         // CALLBACK TYPE 1: if we have a callback, call it
@@ -101,9 +100,9 @@ Bandwagon.RPC.Service = function()
                 }
             }
         }
-    };
+   };
 
-    this.rpcSend = function(type, callback, action, method, data, url, credentials)
+    this.rpcSend = function(type, callback, action, method, data, url)
     {
         var service = this;
 
@@ -125,11 +124,6 @@ Bandwagon.RPC.Service = function()
         {
             rpcnet.setMethod("DELETE");
         }
-        else if (method == "PUT")
-        {
-            rpcnet.setMethod("PUT");
-            rpcnet.setPostData(data);
-        }
         else
         {
             rpcnet.setMethod("GET");
@@ -143,13 +137,7 @@ Bandwagon.RPC.Service = function()
             }
 
             rpcnet.setArguments(data);
-        }
-
-        rpcnet.setHeader("X-API-Auth", service.Bandwagon.Preferences.getPreference(service.Bandwagon.PREF_AUTH_TOKEN));
 
-        if (credentials)
-        {
-            rpcnet.setCredentials(credentials.login, credentials.password);
         }
 
         rpcnet.onComplete = function(rpc, result, response, type) { service.rpcComplete(rpc, result, response, type, callback); };
@@ -216,70 +204,9 @@ Bandwagon.RPC.Service.prototype.unregisterObserver = function(observerId)
  * Bandwagon Protocol Methods Below Here
  */
 
-Bandwagon.RPC.Service.prototype.authenticate = function(login, password, callback)
-{
-    var service = this;
-
-    this._logger.debug("Bandwagon.RPC.Service.authenticate: getting auth token for user '" + login + "'");
-
-    var internalCallback2 = function(event)
-    {
-        if (event.isError())
-        {
-            service._logger.info("Bandwagon.RPC.Service.authenticate: authentication failed");
-        }
-        else
-        {
-            event.authToken = event.getData().attribute("value");
-
-            if (!event.authToken.match(/.*\w.*/))
-            {
-                // invalid auth token (bug 496612)
-                service._logger.error("Bandwagon.RPC.Service.authenticate: invalid auth token: '" + event.authToken + "'");
-
-                event._result = service.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNEXPECTED_XML;
-            }
-            else
-            {
-                service._logger.debug("Bandwagon.RPC.Service.authenticate: have an auth token: " + event.authToken);
-
-                service.Bandwagon.Preferences.setPreference(service.Bandwagon.PREF_AUTH_TOKEN, event.authToken);
-            }
-        }
-
-        if (callback)
-        {
-            callback(event);
-        }
-    }
-
-    var internalCallback1 = function(event)
-    {
-        if (event && event.authURL)
-        {
-            service._logger.debug("Bandwagon.RPC.Service.authenticate: using authURL = " + event.authURL);
-
-            service.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_GET_AUTH_DOCUMENT_COMPLETE, 
-                         internalCallback2, 
-                         event.authURL,
-                         "POST",
-                         null,
-                         null,
-                         {login: login, password: password}
-                         );
-        }
-        else if (callback)
-        {
-            callback(event);
-        }
-    }
-
-    this.getServiceDocument(internalCallback1);
-}
-
 Bandwagon.RPC.Service.prototype.getServiceDocument = function(callback)
 {
-    var service = this;
+	var service = this;
 
     this._logger.debug("Bandwagon.RPC.Service.getServiceDocument: getting service document for logged in user");
 
@@ -287,23 +214,6 @@ Bandwagon.RPC.Service.prototype.getServiceDocument = function(callback)
     {
         if (event.isError())
         {
-            // in the case of unauthorized access, we are given the href to the auth resource
-            event.authURL = "";
-
-            try
-            {
-                event.authURL = event.getData().attribute("href");
-            }
-            catch (e) {}
-
-            if (event.authURL != "")
-            {
-                service._logger.debug("Bandwagon.RPC.Service.getServiceDocument: is error, but have an authURL = " + event.authURL);
-            }
-            else
-            {
-                service._logger.debug("Bandwagon.RPC.Service.getServiceDocument: is error and there is no authURL");
-            }
         }
         else
         {
@@ -391,12 +301,6 @@ Bandwagon.RPC.Service.prototype.newCollection = function(collection, callback)
         else
         {
             collection.unserialize(event.getData());
-
-            collection.resourceURL = event.getData().@xmlbase.toString();
-            collection.addonsResourceURL = event.getData().@xmlbase.toString() + event.getData().addons.attribute("href").toString();
-
-            service._logger.debug("Bandwagon.RPC.Service.newCollection: create new autopub collection with resourceURL = " + collection.resourceURL);
-
             collection.status = collection.STATUS_LOADED;
         }
 
@@ -436,110 +340,39 @@ Bandwagon.RPC.Service.prototype.deleteCollection = function(collection, callback
                  null);
 }
 
-Bandwagon.RPC.Service.prototype.unsubscribeFromCollection = function(collection, callback)
+/** OBSOLETE
+Bandwagon.RPC.Service.prototype.subscribeCollection = function(collection, callback)
 {
-    var service = this;
-
-    this._logger.debug("Bandwagon.RPC.Service.unsubscribeFromCollection: unsubscribing from collection '" + collection.toString() +  "' ...");
-
-    if (collection == null)
-    {
-        if (callback)
-            callback(new this.Bandwagon.RPC.Event());
-
-        return;
-    }
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.subscribeCollection: TBD");
 
-    var data = {
-        "subscribed": "no"
-    };
+    // TODO
 
-    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_UNSUBSCRIBE_FROM_COLLECTION_COMPLETE, 
-                 callback, 
-                 collection.resourceURL,
-                 "PUT",
-                 data);
+    if (callback)
+        callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
-Bandwagon.RPC.Service.prototype.subscribeToCollection = function(collection, callback)
+/** OBSOLETE
+Bandwagon.RPC.Service.prototype.unsubscribeCollection = function(collection, callback)
 {
-    var service = this;
-
-    this._logger.debug("Bandwagon.RPC.Service.subscribeToCollection: subscribing to collection '" + collection.toString() +  "' ...");
-
-    if (collection == null)
-    {
-        if (callback)
-            callback(new this.Bandwagon.RPC.Event());
-
-        return;
-    }
+    Bandwagon.Logger.debug("Bandwagon.RPC.Service.unsubscribeCollection: TBD");
 
-    var data = {
-        "subscribed": "yes"
-    };
+    // TODO
 
-    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_SUBSCRIBE_TO_COLLECTION_COMPLETE, 
-                 callback, 
-                 collection.resourceURL,
-                 "PUT",
-                 data);
+    if (callback)
+        callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
-Bandwagon.RPC.Service.prototype.updateCollectionDetails = function(collection, callback)
+Bandwagon.RPC.Service.prototype.removeAddonFromCollection = function(guid, collection, callback)
 {
     var service = this;
 
-    this._logger.debug("Bandwagon.RPC.Service.updateCollectionDetails: updating collection details for '" + collection.toString() +  "' ...");
-
-    if (collection == null)
+    if (guid.substring(0,1) == "{")
     {
-        if (callback)
-            callback(new this.Bandwagon.RPC.Event());
-
-        return;
+        guid = guid.substring(1, guid.length-2);
     }
 
-    collection.status = collection.STATUS_LOADING;
-
-    var data = {
-        "name": collection.name,
-        "description": collection.description,
-        "listed": (collection.listed?"1":"0"),
-        "subscribed": (collection.subscribed?"yes":"no")
-    };
-
-    var internalCallback = function(event)
-    {
-        if (event.isError())
-        {
-            collection.status = collection.STATUS_LOADERROR;
-        }
-        else
-        {
-            collection.unserialize(event.getData());
-            collection.status = collection.STATUS_LOADED;
-        }
-
-        event.collection = collection;
-
-        if (callback)
-        {
-            callback(event);
-        }
-    }
-
-    this.rpcSend(service.Bandwagon.RPC.Constants.BANDWAGON_RPC_EVENT_TYPE_BANDWAGON_RPC_UPDATE_COLLECTION_COMPLETE, 
-                 internalCallback, 
-                 collection.resourceURL,
-                 "PUT",
-                 data);
-}
-
-Bandwagon.RPC.Service.prototype.removeAddonFromCollection = function(guid, collection, callback)
-{
-    var service = this;
-
     Bandwagon.Logger.debug("Bandwagon.RPC.Service.removeAddonFromCollection: extension.guid = '" + guid + "', collection = '" + collection.resourceURL);
 
     var internalCallback = function(event)
@@ -595,8 +428,6 @@ Bandwagon.RPC.Service.prototype.shareToEmail = function(extension, emailAddress,
         return;
     }
 
-    personalNote = personalNote.replace("\n", "\r", "gi");
-
     var data = {
         "guid": extension.guid,
         "to": emailAddress,
diff --git a/bandwagon/content/scripts/util.js b/bandwagon/content/scripts/util.js
index 58b41f8..8044f31 100644
--- a/bandwagon/content/scripts/util.js
+++ b/bandwagon/content/scripts/util.js
@@ -37,10 +37,6 @@
 
 Bandwagon.Util = new function() {}
 
-Bandwagon.Util._extensionManager = null;
-Bandwagon.Util._rdfService = null;
-Bandwagon.Util._extensionsDataSource == null;
-
 Bandwagon.Util.getMainWindow = function()
 {
     return window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
@@ -243,101 +239,16 @@ Bandwagon.Util.getCookie = function(host, name)
     return null;
 }
 
-Bandwagon.Util._initExtensionServices = function()
-{
-    if (Bandwagon.Util._extensionManager == null)
-    {
-        this._extensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
-            .getService(Components.interfaces.nsIExtensionManager);
-    }
-
-    if (Bandwagon.Util._rdfService == null)
-    {
-        this._rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-            .getService(Components.interfaces.nsIRDFService);
-    }
-
-    var getURLSpecFromFile = function(file)
-    {
-        var ioServ = Components.classes["@mozilla.org/network/io-service;1"]
-            .getService(Components.interfaces.nsIIOService);
-        var fph = ioServ.getProtocolHandler("file")
-            .QueryInterface(Components.interfaces.nsIFileProtocolHandler);
-        return fph.getURLSpecFromFile(file);
-    }
-
-    var getDir = function(key, pathArray)
-    {
-        var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
-            .getService(Components.interfaces.nsIProperties);
-        var dir = fileLocator.get(key, Components.interfaces.nsILocalFile);
-        for (var i=0; i<pathArray.length; ++i)
-        {
-            dir.append(pathArray[i]);
-        }
-        dir.followLinks = false;
-        return dir;
-    }
-
-    var getFile = function(key, pathArray)
-    {
-        var file = getDir(key, pathArray.slice(0, -1));
-        file.append(pathArray[pathArray.length - 1]);
-        return file;
-    }
-
-    if (Bandwagon.Util._extensionsDataSource == null)
-    {
-        Bandwagon.Util._extensionsDataSource = this._rdfService.GetDataSourceBlocking(getURLSpecFromFile(getFile("ProfD", ["extensions.rdf"])));
-    }
-}
-
 Bandwagon.Util.getInstalledExtensions = function()
 {
-    Bandwagon.Util._initExtensionServices();
+    var extensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
+        .getService(Components.interfaces.nsIExtensionManager);
 
-    var items = this._extensionManager.getItemList(Components.interfaces.nsIUpdateItem.TYPE_ANY, { });
+    var items = extensionManager.getItemList(Components.interfaces.nsIUpdateItem.TYPE_ANY, { });
 
     return items;
 }
 
-Bandwagon.Util.getExtensionProperty = function(id, propertyName)
-{
-    Bandwagon.Util._initExtensionServices();
-
-    var value;
-
-    try
-    {
-        var target = Bandwagon.Util._extensionsDataSource.GetTarget
-        (
-            this._rdfService.GetResource("urn:mozilla:item:" + id),
-            this._rdfService.GetResource("http://www.mozilla.org/2004/em-rdf#" + propertyName),
-            true
-        );
-
-        var stringData = function(literalOrResource)
-        {
-            if (literalOrResource instanceof Components.interfaces.nsIRDFLiteral)
-                return literalOrResource.Value;
-            if (literalOrResource instanceof Components.interfaces.nsIRDFResource)
-                return literalOrResource.Value;
-            return undefined;
-        }
-
-        value = stringData(target);
-    }
-    catch (e)
-    {
-        Bandwagon.Logger.error("Error getting extension property: " + e);
-        return "";
-    }
-
-    //Bandwagon.Logger.debug("Extension '" + id + "' has property '" + propertyName + "=" + value + "'");
-
-    return value === undefined ? "" : value;
-}
-
 Bandwagon.Util.ISO8601toDate = function(dString)
 {
     var x = new Date();
@@ -375,50 +286,10 @@ Bandwagon.Util.ISO8601toDate = function(dString)
 
 Bandwagon.Util.getBrowserLocale = function()
 {
-    var gmyextensionBundle = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
-    var bundle = gmyextensionBundle.createBundle("chrome://global/locale/intl.properties");
-
-    return bundle.GetStringFromName("general.useragent.locale");
+    var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
+                getService(Components.interfaces.nsIPrefService);
+    
+    return prefSvc.getCharPref("general.useragent.locale");
 };
 
-Bandwagon.Util.encodeURL = function(str)
-{
-    str = encodeURIComponent(str);
-
-    //str = str.replace(/'/g, "%27");
-
-    return str;
-}
-
-Bandwagon.Util.getUserFacingOSName = function(str)
-{
-    if (str.match(/.*Darwin.*/i))
-    {
-        return "Mac OS X";
-    }
-    else if (str.match(/.*Linux.*/i))
-    {
-        return "Linux";
-    }
-    else if (str.match(/.*BSD.*/i))
-    {
-        return "BSD";
-    }
-    else if (str.match(/.*sunos.*/i))
-    {
-        return "Solaris";
-    }
-    else if (str.match(/.*solaris.*/i))
-    {
-        return "Solaris";
-    }
-    else if (str.match(/.*Win.*/i))
-    {
-        return "Windows";
-    }
-    else
-    {
-        return str;
-    }
-}
 
diff --git a/bandwagon/content/ui/bindings/bandwagon.xml b/bandwagon/content/ui/bindings/bandwagon.xml
index 3a3a628..90a0e73 100644
--- a/bandwagon/content/ui/bindings/bandwagon.xml
+++ b/bandwagon/content/ui/bindings/bandwagon.xml
@@ -48,18 +48,15 @@
 
         <resources>
             <stylesheet src="chrome://bandwagon/skin/extensionsOverlay.css"/>
-            <stylesheet src="chrome://bandwagon/skin/extensionsOverlayIcons.css"/>
         </resources>
 
-        <content orient="vertical">
-            <xul:vbox flex="1"> <!-- Needed to constrain the list so that it does not horizontally scroll - Bug 488403-->
-                <xul:hbox align="center">
-                    <xul:image anonid="star" src="chrome://bandwagon/skin/images/star.png" style="width: 1em; height: 1em;" collapsed="true"/>
-                    <xul:label anonid="name" crop="center" flex="1"/>
-                    <xul:label anonid="unread" collapsed="true"/>
-                    <xul:image anonid="localautopub" class="autopubimg" collapsed="true"/>
-                </xul:hbox>
-            </xul:vbox>
+        <content>
+            <xul:hbox flex="1" align="center">
+                <xul:image anonid="star" src="chrome://bandwagon/skin/images/star.png" style="width: 1em; height: 1em;" collapsed="true"/>
+                <xul:label anonid="name"/>
+                <xul:label anonid="unread" collapsed="true"/>
+                <xul:image anonid="localautopub" src="chrome://bandwagon/skin/images/localautopub.png" style="width: 1em; height: 1em;" collapsed="true"/>
+            </xul:hbox>
         </content>
 
         <implementation>
@@ -137,7 +134,6 @@
 
         <resources>
             <stylesheet src="chrome://bandwagon/skin/extensionsOverlay.css"/>
-            <stylesheet src="chrome://bandwagon/skin/extensionsOverlayIcons.css"/>
         </resources>
 
         <content>
@@ -154,10 +150,7 @@
                             <xul:hbox flex="1">
                                 <xul:label anonid="name" class="name"/>
                                 <xul:spacer flex="1"/>
-                                <xul:hbox align="center">
-                                    <xul:image anonid="commenticon" class="comment-icon"/>
-                                    <xul:label anonid="dateadded"/>
-                                </xul:hbox>
+                                <xul:label anonid="dateadded"/>
                             </xul:hbox>
                             <xul:label anonid="summary" crop="end"/>
                         </xul:vbox>
@@ -251,6 +244,13 @@
                 </setter>
             </property>
 
+            <!--
+            <property name="category"
+                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'category')?document.getAnonymousElementByAttribute(this, 'anonid', 'category').value:'')"
+                onset="if (document.getAnonymousElementByAttribute(this, 'anonid', 'category')) document.getAnonymousElementByAttribute(this, 'anonid', 'category').value = this._stringBundle.getFormattedString('bandwagon.addon.category', [val])"
+                />
+            -->
+
             <property name="read"
                 onget="return this.getAttribute('read')"
                 onset="this.setAttribute('read', val);"
@@ -292,7 +292,7 @@
                         sbString = "bandwagon.addon.added.week";
                         sbVal = Math.floor(diff/60/60/24/7);
                     }
-                    else if (diff < 60 * 60 * 24 * 365)
+                    else if (diff < 60 * 60 * 24 * 356)
                     {
                         sbString = "bandwagon.addon.added.month";
                         sbVal = Math.floor(diff/60/60/24/30);
@@ -300,12 +300,23 @@
                     else
                     {
                         sbString = "bandwagon.addon.added.year";
-                        sbVal = Math.floor(diff/60/60/24/365);
+                        sbVal = Math.floor(diff/60/60/24/356);
                     }
 
-                    Components.utils.import("resource://gre/modules/PluralForm.jsm");
-                    let [get, numForms] = PluralForm.makeGetter(this._stringBundle.getString("bandwagon.addon.pluralRule"));
-                    var datestr = get(sbVal, this._stringBundle.getFormattedString(sbString, [sbVal]));
+                    var datestr = "";
+
+                    if (sbVal == 0)
+                    {
+                        datestr = this._stringBundle.getString(sbString);
+                    }
+                    else if (sbVal == 1)
+                    {
+                        datestr = this._stringBundle.getString(sbString);
+                    }
+                    else
+                    {
+                        datestr = this._stringBundle.getFormattedString(sbString + "s", [sbVal]);
+                    }
 
                     document.getAnonymousElementByAttribute(this, 'anonid', 'dateadded').value = datestr;
                 ]]>
@@ -313,24 +324,12 @@
             </property>
 
             <property name="comment"
-                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc')?document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').textContent : '')"
+                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc')?document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').value:'')"
                 >
                 <setter>
                 <![CDATA[
-                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc'))
-                        document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').textContent = this._stringBundle.getFormattedString('bandwagon.addon.comment.description', [val.comment]);
-                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor'))
-                        document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor').value = this._stringBundle.getFormattedString('bandwagon.addon.comment.author', [val.author]);
-                ]]>
-                </setter>
-            </property>
-
-            <property name="addedBy"
-                onget="return (document.getAnonymousElementByAttribute(this, 'anonid', 'addedby')?document.getAnonymousElementByAttribute(this, 'anonid', 'addedby').value:'')"
-                >
-                <setter>
-                <![CDATA[
-                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'addedby')) document.getAnonymousElementByAttribute(this, 'anonid', 'addedby').value = this._stringBundle.getFormattedString('bandwagon.addon.addedby', [val]);
+                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc')) document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').firstChild.nodeValue = this._stringBundle.getFormattedString('bandwagon.addon.comment.description', [val.comment]);
+                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor')) document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor').value = this._stringBundle.getFormattedString('bandwagon.addon.comment.author', [val.author]);
                 ]]>
                 </setter>
             </property>
@@ -347,47 +346,31 @@
                     this.iconURL = addon.icon;
                     this.thumbnailURL = addon.thumbnail;
                     this.authors = addon.authors;
+                    //this.category = (addon.category?addon.category:"Unknown");
                     this.dateAdded = addon.dateAdded;
                     this.read = addon.read;
 
                     if (addon.comments.length > 0)
                     {
-                        if (addon.comments[0].comment.match(/\w/))
-                        {
-                            this.comment = addon.comments[0];
-                        }
-
-                        this.addedBy = addon.comments[0].author;
-                        if (addon.comments[0].comment == "")  // it seems each addon will have an empty comment if none was made
-                        {
-                            document.getAnonymousElementByAttribute(this, 'anonid', 'commenticon').setAttribute("collapsed", true);
-                            if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentbox')) // expanded only
-                                document.getAnonymousElementByAttribute(this, 'anonid', 'commentbox').setAttribute("collapsed", true);
-                        }
+                        this.comment = addon.comments[0];
                     }
                     else
                     {
-                        document.getAnonymousElementByAttribute(this, 'anonid', 'commenticon').setAttribute("collapsed", true);
-                        if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentbox')) // expanded only
-                            document.getAnonymousElementByAttribute(this, 'anonid', 'commentbox').setAttribute("collapsed", true);
+                        if (document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc'))
+                        {
+                            document.getAnonymousElementByAttribute(this, 'anonid', 'commentdesc').style.collapsed = true;
+                            document.getAnonymousElementByAttribute(this, 'anonid', 'commentauthor').style.collapsed = true;
+                        }
                     }
 
-                    this.invalidateCompatibilityCheck();
-                    this.invalidatePublishButton();
-                ]]>
-                </body>
-            </method>
+                    var canInstall = addon.canInstall(Bandwagon.Util.getHostEnvironmentInfo());
+                    this.showVersionHelper(canInstall.type, canInstall.requiredVersion);
 
-            <method name="invalidateCompatibilityCheck">
-                <body>
-                <![CDATA[
-                    if (this.addon)
+                    if (document.getAnonymousElementByAttribute(this, 'anonid', 'publish'))
                     {
-                        var canInstall = this.addon.canInstall(Bandwagon.Util.getHostEnvironmentInfo());
-                        var requiredVersion = Bandwagon.Util.getUserFacingOSName(canInstall.requiredVersion);
-
-                        this.showVersionHelper(canInstall.type, requiredVersion);
+                        this.invalidatePublishButton();
                     }
+
                 ]]>
                 </body>
             </method>
@@ -415,13 +398,6 @@
                     if (document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox')
                         && document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning'))
                     {
-                        var container = document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning');
-
-                        while (container.hasChildNodes())
-                        {
-                            container.removeChild(container.firstChild);
-                        }
-
                         if (type == Bandwagon.Model.Addon.INSTALL_YES)
                         {
                             document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox').disabled = false;
@@ -429,34 +405,17 @@
                         }
                         else
                         {
-                            if (type == Bandwagon.Model.Addon.INSTALL_NO_IS_EXPERIMENTAL)
-                            {
-                                var msg;
-
-                                try
-                                {
-                                    msg = this._stringBundle.getString("bandwagon.addon.isexperimental");
-                                }
-                                catch (e)
-                                {
-                                    msg = this._stringBundle.getString("bandwagon.addon.olderversionsoffirefox");
-                                }
-
-                                document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
-                                    document.createTextNode(msg));
-                            }
-                            else if (type == Bandwagon.Model.Addon.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION)
+                            if (type == Bandwagon.Model.Addon.INSTALL_NO_ADDON_IS_FOR_OLDER_VERSION)
                             {
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
                                     document.createTextNode(this._stringBundle.getString("bandwagon.addon.olderversionsoffirefox")));
                             }
                             else if (type == Bandwagon.Model.Addon.INSTALL_NO_UPGRADE_TO_USE_THIS_VERSION)
                             {
-                                var atffwl = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "xul:label");
-                                atffwl.className = "text-link";
-                                atffwl.setAttribute("value", this._stringBundle.getFormattedString("bandwagon.addon.upgradetofirefoxn1", [version]));
+                                var atffwl = document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarninglink');
+                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.addon.upgradetofirefoxn1", [version]);
+                                atffwl.collapsed = false;
                                 atffwl.addEventListener("click", function() { Bandwagon.Controller.CollectionsPane.doUpgradeToFirefoxN(version); }, true);
-                                document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(atffwl);
 
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
                                     document.createTextNode(this._stringBundle.getString("bandwagon.addon.upgradetofirefoxn2")));
@@ -466,9 +425,9 @@
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(
                                     document.createTextNode(this._stringBundle.getFormattedString("bandwagon.addon.requiresfirefoxbeta1", [version])));
 
-                                var atffwl = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "xul:label");
-                                atffwl.className = "text-link";
-                                atffwl.setAttribute("value", this._stringBundle.getFormattedString("bandwagon.addon.requiresfirefoxbeta2", [version]));
+                                var atffwl = document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarninglink');
+                                atffwl.value = this._stringBundle.getFormattedString("bandwagon.addon.requiresfirefoxbeta2", [version]);
+                                atffwl.collapsed = false;
                                 atffwl.addEventListener("click", function() { Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta(version); }, true);
 
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').appendChild(atffwl);
@@ -481,13 +440,11 @@
 
                             document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefoxwarning').collapsed = false;
 
-                            var isExtensionsCheckCompatibility = Bandwagon.Preferences.getGlobalPreference("extensions.checkCompatibility", true);
+                            var isExtensionsCheckCompatibility = Bandwagon.Preferences.getGlobalPreference("extensions.checkCompatibility");
                             var isAllowIncompatibleInstall = Bandwagon.Preferences.getPreference("allow.incompatible.install");
 
                             if ((isExtensionsCheckCompatibility != null && isExtensionsCheckCompatibility == false)
-                                && (isAllowIncompatibleInstall != null && isAllowIncompatibleInstall == true)
-                                && (this.addon.getInstaller(Bandwagon.Util.getHostEnvironmentInfo().os))
-                                )
+                                && (isAllowIncompatibleInstall != null && isAllowIncompatibleInstall == true))
                             {
                                 document.getAnonymousElementByAttribute(this, 'anonid', 'addtofirefox').disabled = false;
                             }
@@ -559,32 +516,23 @@
                 <xul:vbox flex="1" class="addonTextBox">
                     <xul:hbox flex="1">
                         <xul:vbox flex="1">
-                            <xul:hbox flex="1" align="center">
+                            <xul:hbox flex="1">
                                 <xul:label anonid="name" class="name"/>
                                 <xul:spacer flex="1"/>
-                                <xul:vbox align="end">
-                                    <xul:hbox align="center">
-                                        <xul:image anonid="commenticon" class="comment-icon"/>
-                                        <xul:label anonid="dateadded"/>
-                                    </xul:hbox>
-                                    <xul:label anonid="addedby"/>
-                                </xul:vbox>
+                                <xul:label anonid="dateadded"/>
                             </xul:hbox>
                             <xul:hbox anonid="byline" flex="1">
                                 <xul:label anonid="authors"/>
                                 <xul:spacer flex="1"/>
+                                <!--<xul:label anonid="category"/>-->
                             </xul:hbox>
+                            <xul:label anonid="commentauthor" flex="1"/>
+                            <xul:description anonid="commentdesc"> </xul:description>
                         </xul:vbox>
                     </xul:hbox>
-                    <xul:vbox anonid="commentbox" flex="1" class="comments unindent">
-                        <xul:hbox align="center">
-                            <xul:label anonid="commentauthor" flex="1"/>
-                        </xul:hbox>
-                        <xul:description anonid="commentdesc" flex="1"/>
-                    </xul:vbox>
                     <xul:hbox align="stretch"
                               anonid="fulldesc"
-                              class="collection-item-details unindent"
+                              class="collection-item-details"
                               flex="1">
                         <xul:vbox pack="start">
                             <xul:hbox anonid="bandwagonThumbnailContainer"
@@ -604,6 +552,7 @@
                                 <xul:button anonid="addtofirefox" label="&addon.addtofirefox;" oncommand="Bandwagon.Controller.CollectionsPane.doAddToFirefox()"/>
                             </xul:hbox>
                             <xul:description anonid="addtofirefoxwarning" class="right">
+                                <xul:label anonid="addtofirefoxwarninglink" class="text-link" collapsed="true"/>
                             </xul:description>
                         </xul:vbox>
                     </xul:hbox>
@@ -632,7 +581,6 @@
 
         <resources>
             <stylesheet src="chrome://bandwagon/skin/extensionsOverlay.css"/>
-            <stylesheet src="chrome://bandwagon/skin/extensionsOverlayIcons.css"/>
         </resources>
 
         <content>
@@ -743,7 +691,6 @@
 
                         if (collection.__containsCurrentlySelectedExtension)
                         {
-                            elemWritableCollection.setAttribute("type", "checkbox");
                             elemWritableCollection.setAttribute("checked", "true");
                             elemWritableCollection.setAttribute("autocheck", "false");
                             elemWritableCollection.addEventListener("command", callbackRemove, true);
diff --git a/bandwagon/content/ui/collectionsPaneController.js b/bandwagon/content/ui/collectionsPaneController.js
index af2933f..b145aae 100644
--- a/bandwagon/content/ui/collectionsPaneController.js
+++ b/bandwagon/content/ui/collectionsPaneController.js
@@ -50,8 +50,8 @@ Bandwagon.Controller.CollectionsPane = new function()
     this.elemBandwagonCollectionDescription = null;
     this.elemBandwagonCollectionsNotification = null;
     this.elemBandwagonCollectionDeck = null;
+    this.elemBandwagonCollectionHeader = null;
     this.stringBundle = null;
-    this.loginInProcess = false;
 
     //this.previewNotificationVal = "bandwagon-collection-preview";
 }
@@ -72,6 +72,7 @@ Bandwagon.Controller.CollectionsPane.init = function()
     this.elemBandwagonCollectionDescription = document.getElementById("bandwagon-collection-description");
     this.elemBandwagonCollectionsNotification = document.getElementById("bandwagon-collections-notification");
     this.elemBandwagonCollectionDeck = document.getElementById("bandwagon-collection-deck");
+    this.elemBandwagonCollectionHeader = document.getElementById("bandwagon-collection-header");
 
     Bandwagon.Controller.CollectionsPane._repopulateCollectionsList();
     Bandwagon.Controller.CollectionsPane.invalidate();
@@ -81,11 +82,8 @@ Bandwagon.Controller.CollectionsPane.init = function()
 
     bandwagonService.registerCollectionUpdateObserver(Bandwagon.Controller.CollectionsPane.collectionUpdateObserver);
     bandwagonService.registerCollectionListChangeObserver(Bandwagon.Controller.CollectionsPane.collectionListChangeObserver);
-    bandwagonService.registerAuthenticationStatusChangeObserver(Bandwagon.Controller.CollectionsPane.authenticationStatusChangeObserver);
 
     Bandwagon.Preferences.addObserver(Bandwagon.Controller.CollectionsPane.prefObserver);
-    Bandwagon.Preferences.addGlobalObserver(Bandwagon.Controller.CollectionsPane.prefObserver, "extensions.bandwagon.allow.incompatible.");
-
     Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService).addObserver(Bandwagon.Controller.CollectionsPane.prefObserver, "nsPref:changed", false);
 }
 
@@ -103,10 +101,7 @@ Bandwagon.Controller.CollectionsPane.onViewSelect = function()
 
         if (elemsAddonExpanded && elemsAddonExpanded[0])
         {
-            try
-            {
-                Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.ensureElementIsVisible(elemsAddonExpanded[0]);
-            } catch (e) {}
+            Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.ensureElementIsVisible(elemsAddonExpanded[0]);
         }
     }
 }
@@ -134,10 +129,8 @@ Bandwagon.Controller.CollectionsPane.uninit = function()
 
     bandwagonService.unregisterCollectionUpdateObserver(Bandwagon.Controller.CollectionsPane.collectionUpdateObserver);
     bandwagonService.unregisterCollectionListChangeObserver(Bandwagon.Controller.CollectionsPane.collectionListChangeObserver);
-    bandwagonService.unregisterAuthenticationStatusChangeObserver(Bandwagon.Controller.CollectionsPane.authenticationStatusChangeObserver);
 
     Bandwagon.Preferences.removeObserver(Bandwagon.Controller.CollectionsPane.prefObserver);
-    Bandwagon.Preferences.removeGlobalObserver(Bandwagon.Controller.CollectionsPane.prefObserver, "extensions.bandwagon.allow.incompatible.");
 
     // now is a good time to save collections to storage
     if (Bandwagon.COMMIT_NOW)
@@ -154,8 +147,7 @@ Bandwagon.Controller.CollectionsPane.invalidate = function()
         Bandwagon.Controller.CollectionsPane.elemBandwagonButtonViewSite.disabled = true;
         //Bandwagon.Controller.CollectionsPane.elemBandwagonButtonUpdate.disabled = true;
         Bandwagon.Controller.CollectionsPane.elemBandwagonButtonRemove.disabled = true;
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionTitle.collapsed = true;
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.collapsed = true;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionHeader.collapsed = true;
 
         Bandwagon.Controller.CollectionsPane._repopulateAddonsList(null);
 
@@ -166,8 +158,7 @@ Bandwagon.Controller.CollectionsPane.invalidate = function()
         Bandwagon.Controller.CollectionsPane.elemBandwagonButtonViewSite.disabled = false;
         //Bandwagon.Controller.CollectionsPane.elemBandwagonButtonUpdate.disabled = false;
         Bandwagon.Controller.CollectionsPane.elemBandwagonButtonRemove.disabled = false;
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionTitle.collapsed = false;
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.collapsed = false;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionHeader.collapsed = false;
 
         var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
 
@@ -194,14 +185,16 @@ Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck = function()
 {
     var elemsBandwagonCollection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.getElementsByTagName("bandwagonCollection");
 
-    if (!bandwagonService.isAuthenticated() || this.loginInProcess == true)
-    {
-        Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 2;
-        window.setTimeout(function() { document.getElementById("login").focus(); }, 200);
-    }
-    else if (elemsBandwagonCollection.length == 0)
+    if (elemsBandwagonCollection.length == 0)
     {
-        Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 1;
+        if (!bandwagonService.isAMOAuthenticated())
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 2;
+        }
+        else
+        {
+            Bandwagon.Controller.CollectionsPane.elemBandwagonExtensionsDeck.selectedIndex = 1;
+        }
     }
     else
     {
@@ -265,17 +258,21 @@ Bandwagon.Controller.CollectionsPane.collectionUpdateObserver = function(collect
         if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem && collection.equals(Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection))
         {
             Bandwagon.Controller.CollectionsPane._repopulateAddonsList(collection);
+
+            /* OBSOLETE
+            // if this is a just arrived collection preview, show the notification box
+            if (collection.preview)
+            {
+                Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = false;
+                setTimeout(Bandwagon.Controller.CollectionsPane._createPreviewNotification, 200);
+            }
+            */
         }
     }
 
     Bandwagon.Controller.CollectionsPane.invalidate();
 }
 
-Bandwagon.Controller.CollectionsPane.authenticationStatusChangeObserver = function()
-{
-    Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck();
-}
-
 Bandwagon.Controller.CollectionsPane.doUpdateAll = function(event)
 {
     Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDeck.selectedIndex = 1;
@@ -290,52 +287,10 @@ Bandwagon.Controller.CollectionsPane.doSubscribe = function(event)
 
 Bandwagon.Controller.CollectionsPane.doLogin = function(event)
 {
-    var uname = document.getElementById("login").value;
-    var pwd = document.getElementById("password").value;
-
-    // Some client side checking for blank login details
-    if (!uname || uname == "" || !uname.match(/.*\w.*/) ||
-        !pwd || pwd == "" || !pwd.match(/.*\w.*/))
-    {
-        document.getElementById("auth-error").textContent = Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("login.error");
-        document.getElementById("auth-error").collapsed = false;
-        return;
-    }
-
-    this.loginInProcess = true;
-
-    document.getElementById("auth-button").disabled = true;
-    document.getElementById("auth-spinner").style.visibility = "visible";
-    document.getElementById("auth-error").collapsed = true;
-
-    var callback2 = function(event)
-    {
-        document.getElementById("auth-button").disabled = false;
-        document.getElementById("auth-spinner").style.visibility = "hidden";
-        document.getElementById("password").value = ""; 
-        Bandwagon.Controller.CollectionsPane.loginInProcess = false;
-        Bandwagon.Controller.CollectionsPane._invalidateExtensionsDeck();
-    }
-
-    var callback1 = function(event)
-    {
-        if (event.isError())
-        { 
-            // show err
-            document.getElementById("auth-error").textContent = Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("login.error");
-            document.getElementById("auth-error").collapsed = false;
-            document.getElementById("auth-button").disabled = false;
-            document.getElementById("auth-spinner").style.visibility = "hidden";
-        }
-        else
-        {
-            bandwagonService.updateCollectionsList(callback2);
-        }
-    }
-
-    bandwagonService.authenticate(uname, pwd, callback1);
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_LOGIN_URL);
 }
 
+
 Bandwagon.Controller.CollectionsPane.doSettings = function(event)
 {
     var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
@@ -395,36 +350,29 @@ Bandwagon.Controller.CollectionsPane.doUnsubscribe = function(event)
 
     var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
 
+    if (collection == null || !collection.links["unsubscribe"])
+        return;
+
+    Bandwagon.Controller.CollectionsPane._openURL(collection.links["unsubscribe"]);
+}
+
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane.doRemove = function(event)
+{
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem == null)
+        return;
+
+    var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
+
     if (collection == null)
         return;
 
-    var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
-    var check = {value: false};
-    var flags = promptService.BUTTON_POS_0 * promptService.BUTTON_TITLE_IS_STRING + promptService.BUTTON_POS_1 * promptService.BUTTON_TITLE_IS_STRING;
-    var button = promptService.confirmEx(
-        window,
-        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("unsubscribe.confirm.title"),
-        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("unsubscribe.confirm.label"),
-        flags,
-        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("unsubscribe.confirm.button0"),
-        Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("unsubscribe.confirm.button1"),
-        null,
-        null,
-        check);
-
-    if (button == 0)
-    {
-        var callback = function(event)
-        {
-            if (event.isError())
-            {
-                window.alert(Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("unsubscribe.error"));
-            }
-        }
+    bandwagonService.unlinkCollection(collection);
 
-        bandwagonService.unsubscribeFromCollection(collection, callback);
-    }
+    if (!collection.preview)
+        bandwagonService.unsubscribe(collection);
 }
+*/
 
 Bandwagon.Controller.CollectionsPane.doShowCollection = function()
 {
@@ -441,11 +389,11 @@ Bandwagon.Controller.CollectionsPane.doShowCollection = function()
 
     // misc. ui 
 
-    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionTitle.textContent = (collection?(collection.name?collection.name:collection.resourceURL):"");
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionTitle.setAttribute("value", (collection?(collection.name?collection.name:collection.resourceURL):""));
 
     if (collection && collection.description != "")
     {
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.textContent = collection.description;
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.setAttribute("value", collection.description);
         Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.removeAttribute("collsaped");
     }
     else
@@ -453,7 +401,20 @@ Bandwagon.Controller.CollectionsPane.doShowCollection = function()
         Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.setAttribute("collapsed", true);
     }
 
-    Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = true;
+    /** OBSOLETE
+    // collection preview notification box
+    if (collection && collection.preview && collection.status != collection.STATUS_LOADING)
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = false;
+
+        // this needs to be in a seperate thread
+        setTimeout(Bandwagon.Controller.CollectionsPane._createPreviewNotification, 500);
+    }
+    else
+    */
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = true;
+    }
 
     // show items
 
@@ -584,13 +545,13 @@ Bandwagon.Controller.CollectionsPane.doAddToFirefox = function()
     var params = [];
     params[addon.name] = installer;
 
-    // TODO do some user feedback here?
+    // TODO do some user collectionback here?
 
     var callback = function(url, status)
     {
         Bandwagon.Logger.info("Finished installing '" + url + "'; status = " + status);
 
-        // TODO some user feedback here?
+        // TODO some user collectionback here?
     }
 
     InstallTrigger.install(params, callback);
@@ -610,6 +571,99 @@ Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta = function(version)
     Bandwagon.Controller.CollectionsPane._openURL("http://www.mozilla.com/en-US/firefox/all-beta.html");
 }
 
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane.doShowCollectionPreview = function(collectionURL)
+{
+    // this is executed when the browser overlay controller opens the EM window to subscribe to a new collection.
+    // i.e. after a custom bandwagonSubscribe is detected and handled
+
+    Bandwagon.Logger.debug("In Bandwagon.Controller.CollectionsPane.doShowCollectionPreview() with collectionURL = " + collectionURL);
+
+    // check if we already have this collection
+
+    if (bandwagonService.collections[collectionURL])
+    {
+        var collection = bandwagonService.collections[collectionURL];
+        Bandwagon.Controller.CollectionsPane.preferredCollection = collection;
+        //Bandwagon.Controller.CollectionsPane._selectCollection(collection);
+        setTimeout(function() { Bandwagon.Controller.CollectionsPane._selectCollection(collection); }, 500);
+        return;
+    }
+
+    // add and select the collection
+
+    var collection = bandwagonService.addPreviewCollection(collectionURL);
+    //collection.status = collection.STATUS_LOADING;
+
+    Bandwagon.Controller.CollectionsPane.preferredCollection = collection;
+    setTimeout(function() { Bandwagon.Controller.CollectionsPane._selectCollection(collection); }, 500);
+}
+*/
+
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane._createPreviewNotification = function()
+{
+    if (!Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.getNotificationWithValue(Bandwagon.Controller.CollectionsPane.previewNotificationVal))
+    {
+        Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.appendNotification
+        (
+            Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("collectionspane.this.is.only.a.preview"),
+            Bandwagon.Controller.CollectionsPane.previewNotificationVal,
+            null,
+            Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.PRIORITY_WARNING_MEDIUM,
+            [
+                {
+                    accessKey: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("collectionspane.dont.subscribe.accesskey"),
+                    callback: Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe,
+                    label: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("collectionspane.dont.subscribe"),
+                    popup: null
+                },
+                {
+                    accessKey: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("collectionspane.subscribe.accesskey"),
+                    callback: Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe,
+                    label: Bandwagon.Controller.ExtensionsOverlay.stringBundle.getString("collectionspane.subscribe"),
+                    popup: null
+                }
+            ]
+        );
+    }
+}
+*/
+
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe = function()
+{
+    Bandwagon.Logger.debug("in Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe()");
+
+    Bandwagon.Controller.CollectionsPane.preferredCollection = null;
+
+    Bandwagon.Controller.CollectionsPane.doRemove();
+}
+*/
+
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe = function()
+{
+    Bandwagon.Logger.debug("in Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe()");
+
+    if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem == null)
+        return;
+
+    var collection = Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.collection;
+
+    if (collection == null)
+        return;
+
+    bandwagonService.subscribe(collection);
+
+    if (Bandwagon.COMMIT_NOW)
+        bandwagonService.commit(collection);
+
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.preview = false;
+    Bandwagon.Controller.CollectionsPane.doShowCollection();
+} 
+*/
+
 /**
  * Refreshes the collection pane
  */
@@ -635,24 +689,8 @@ Bandwagon.Controller.CollectionsPane.prefObserver =
 
         if (data.match(/addonsperpage/))
         {
-            Bandwagon.Logger.debug("In prefObserver; addonsperpage has changed");
-
             Bandwagon.Controller.CollectionsPane.refresh();
         }
-        else if (data.match(/checkCompatibility/) || data.match(/install/))
-        {
-            Bandwagon.Logger.debug("In prefObserver; checkCompatibility has changed");
-
-            if (Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.selectedItem != null)
-            {
-                var elemsAddonExpanded = Bandwagon.Controller.CollectionsPane.elemBandwagonAddons.getElementsByTagName("bandwagonAddonExpanded");
-
-                if (elemsAddonExpanded && elemsAddonExpanded[0])
-                {
-                    elemsAddonExpanded[0].invalidateCompatibilityCheck();
-                }
-            }
-        }
     }
 }
 
@@ -692,12 +730,9 @@ Bandwagon.Controller.CollectionsPane._selectCollection = function(collection)
         return false;
     }
 
-    try
-    {
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectItem(elemBandwagonCollection);
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.ensureElementIsVisible(elemBandwagonCollection);
-        Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.focus();
-    } catch (e) {}
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectItem(elemBandwagonCollection);
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.ensureElementIsVisible(elemBandwagonCollection);
+    Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.focus();
 
     return true;
 }
@@ -802,20 +837,10 @@ Bandwagon.Controller.CollectionsPane._repopulateAddonsList = function(collection
 
     // repopulate with collection items
 
+    var addonsPerPage = bandwagonService.getAddonsPerPage(collection);
     const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-    var addonsToDisplay;
-
-    if (Bandwagon.ENABLE_PAGINATION)
-    {
-        addonsToDisplay = Math.max(bandwagonService.getAddonsPerPage(collection), addonsSorted.length);
-    }
-    else
-    {
-        addonsToDisplay = addonsSorted.length;
-    }
-
-    for (var i=0; i<addonsToDisplay; i++)
+    for (var i=0; (i<addonsSorted.length&&i<addonsPerPage); i++)
     {
         var addon = collection.addons[addonsSorted[i].guid];
 
@@ -831,8 +856,6 @@ Bandwagon.Controller.CollectionsPane._repopulateAddonsList = function(collection
 
 Bandwagon.Controller.CollectionsPane._openURL = function(url)
 {
-    Bandwagon.Logger.debug("Opening URL " + url);
-
     var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                        .getService(Components.interfaces.nsIWindowMediator);
     var mainWindow = wm.getMostRecentWindow("navigator:browser");
@@ -853,8 +876,6 @@ Bandwagon.Controller.CollectionsPane._openLocalizedURL = function(url)
 {
     var locale = Bandwagon.Util.getBrowserLocale();
 
-    Bandwagon.Logger.debug("locale = " + locale);
-
     if (locale && locale != "")
         url = url.replace(/en-US/, locale, "g");
 
diff --git a/bandwagon/content/ui/overlays/browserOverlayController.js b/bandwagon/content/ui/overlays/browserOverlayController.js
index 0e17c2a..868ac37 100644
--- a/bandwagon/content/ui/overlays/browserOverlayController.js
+++ b/bandwagon/content/ui/overlays/browserOverlayController.js
@@ -56,28 +56,22 @@ Bandwagon.Controller.BrowserOverlay.initBandwagon = function()
 
         bandwagonService.init();
 
-        // Set up uninstall observer
-        bandwagonService.startUninstallObserver();
     }
     catch (e)
     {
         Bandwagon.Logger.error("Error initializing bandwagon: " + e);
     }
 
-    try
-    {
-        gBrowser.addEventListener("DOMContentLoaded", Bandwagon.Controller.BrowserOverlay.addSubscriptionRefreshEventListenerToDocument, true);
-    }
-    catch (e)
-    {
-        Bandwagon.Logger.debug("Error adding subscription refresh event listener to document (probably harmless): " + e);
-    }
+    /** OBSOLETE
+    // add listener to every page loaded in the browser - listen for our custom bandwagonSubscribe event
+    gBrowser.addEventListener("load", Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument, true);
+    */
+
+    gBrowser.addEventListener("load", Bandwagon.Controller.BrowserOverlay.addSubscriptionRefreshEventListenerToDocument, true);
 }
 
 Bandwagon.Controller.BrowserOverlay.addSubscriptionRefreshEventListenerToDocument = function(event)
 {
-    Bandwagon.Logger.debug("In Bandwagon.Controller.BrowserOverlay.addSubscriptionRefreshEventListenerToDocument()");
-
     if (event.originalTarget instanceof HTMLDocument)
     {
         var doc = event.originalTarget;
@@ -89,18 +83,12 @@ Bandwagon.Controller.BrowserOverlay.addSubscriptionRefreshEventListenerToDocumen
                 doc=doc.defaultView.frameElement.ownerDocument;
             }
         }
+        
+        // TODO only add to AMO
 
-        if (doc && doc.defaultView && doc.defaultView.location && doc.defaultView.location.host)
-        {
-            var docHost = doc.defaultView.location.host;
+        doc.addEventListener("bandwagonRefresh", Bandwagon.Controller.BrowserOverlay.handleSubscriptionRefreshEvent, true);
 
-            if (docHost == Bandwagon.Preferences.getPreference("amo_host"))
-            {
-                Bandwagon.Logger.debug("This document is on $amo_host, will add bandwagonRefresh listener");
-
-                doc.addEventListener("bandwagonRefresh", Bandwagon.Controller.BrowserOverlay.handleSubscriptionRefreshEvent, true);
-            }
-        }
+        Bandwagon.Logger.debug("added bandwagonRefresh listener");
     }
 }
 
@@ -111,6 +99,75 @@ Bandwagon.Controller.BrowserOverlay.handleSubscriptionRefreshEvent = function(ev
     bandwagonService.updateCollectionsList();
 }
 
+/** OBSOLETE
+Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument = function(event)
+{
+    if (event.originalTarget instanceof HTMLDocument)
+    {
+        var doc = event.originalTarget;
+
+        if (event.originalTarget.defaultView.frameElement)
+        {
+            while (doc.defaultView.frameElement)
+            {
+                doc=doc.defaultView.frameElement.ownerDocument;
+            }
+        }
+
+        doc.addEventListener("bandwagonSubscribe", Bandwagon.Controller.BrowserOverlay.handleSubscribeEvent, true);
+
+        //Bandwagon.Logger.debug("added bandwagonSubscribe listener");
+    }
+}
+*/
+
+/** OBSOLETE
+Bandwagon.Controller.BrowserOverlay.handleSubscribeEvent = function(event)
+{
+    if (event.target && event.target.getAttribute("href"))
+    {
+        var collectionURL = event.target.getAttribute("href");
+
+        Bandwagon.Logger.info("Received subscribe event for collection: " + collectionURL);
+
+        Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubscribe(collectionURL);
+    }
+    else
+    {
+        Bandwagon.Logger.error("Missing data payload in bandwagonSubscribe event");
+    }
+}
+*/
+
+/** OBSOLETE
+Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubscribe = function(collectionURL)
+{
+    const EMTYPE = "Extension:Manager";
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+        .getService(Components.interfaces.nsIWindowMediator);
+    var theEM = wm.getMostRecentWindow(EMTYPE);
+
+    if (theEM)
+    {
+        // extensions manager window already open - focus, show collections pane, call doShowCollectionPreview
+
+        theEM.focus();
+        theEM.showView('bandwagon-collections');
+
+        setTimeout(function() { Bandwagon.Controller.CollectionsPane.doShowCollectionPreview(collectionURL); }, 500);
+    }
+    else
+    {
+        // extensions manager window NOT already open - open with 'subscribe' argument (this will show collection pane, call doShowCollectionPreview)
+
+        const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
+        const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
+
+        window.openDialog(EMURL, "", EMFEATURES, {subscribe: collectionURL});
+    }
+}
+*/
+
 Bandwagon.Controller.BrowserOverlay._removeLoadListener = function()
 {
     window.removeEventListener("load", Bandwagon.init, true);
@@ -131,18 +188,9 @@ Bandwagon.Controller.BrowserOverlay.openFirstRunLandingPage = function()
 /* Toolbar button action - Open add-ons window with Subscriptions tab focused */
 Bandwagon.Controller.BrowserOverlay.openAddons = function()
 {
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                   .getService(Components.interfaces.nsIWindowMediator);
-    var win = wm.getMostRecentWindow("Extension:Manager");
-    if (win) {
-        win.focus();
-    }
-    else
-    {
-        const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
-        const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
-        window.openDialog(EMURL, "", EMFEATURES, "bandwagon-collections");
-    }
+    const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
+    const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
+    window.openDialog(EMURL, "", EMFEATURES, "bandwagon-collections");
 }
 
 Bandwagon.Controller.BrowserOverlay.showNewAddonsAlert = function(collection)
@@ -151,18 +199,8 @@ Bandwagon.Controller.BrowserOverlay.showNewAddonsAlert = function(collection)
 
     var bandwagonStrings = document.getElementById("bandwagon-strings");
 
-    var alertsService;
-    
-    try 
-    {
-        alertsService = Components.classes["@mozilla.org/alerts-service;1"]
-            .getService(Components.interfaces.nsIAlertsService);
-    }
-    catch (e)
-    {
-        Bandwagon.Logger.warn("Can't get a reference to the alerts service on this platform: " + e);
-        return;
-    }
+    var alertsService = Components.classes["@mozilla.org/alerts-service;1"]
+        .getService(Components.interfaces.nsIAlertsService);
 
     var unnotifiedCount = collection.getUnnotifiedAddons().length;
     var collectionName = (collection.name?collection.name:collection.resourceURL);
@@ -221,7 +259,7 @@ Bandwagon.Controller.BrowserOverlay.showNewAddonsAlert = function(collection)
     }
     catch (e)
     {
-        Bandwagon.Logger.warn("Error showing alert notification on this platform: " + e);
+        Bandwagon.Logger.debug(e);
     }
 }
 
diff --git a/bandwagon/content/ui/overlays/extensionsOverlay.xul b/bandwagon/content/ui/overlays/extensionsOverlay.xul
index 5e1ddf2..19407be 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlay.xul
+++ b/bandwagon/content/ui/overlays/extensionsOverlay.xul
@@ -41,7 +41,6 @@
 
 <?xml-stylesheet href="chrome://bandwagon/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bandwagon/skin/extensionsOverlay.css" type="text/css"?>
-<?xml-stylesheet href="chrome://bandwagon/skin/extensionsOverlayIcons.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bandwagon/content/ui/bindings/bandwagon.css" type="text/css"?>
 
 <overlay id="bandwagon-extensions-overlay"
@@ -97,35 +96,26 @@
                     </vbox>
                     <splitter id="bandwagon-sidebar-splitter" />
                     <notificationbox flex="1" id="bandwagon-collections-notification">
-                        <hbox align="center">
-                            <vbox>
-                                <description id="bandwagon-collection-title"/>
-                            </vbox>
-                            <spacer flex="1"/>
-                            <hbox pack="end">
-                                <label id="bandwagon-button-viewsite"
-                                       value="&view.label;"
-                                       class="text-link"
-                                       onclick="Bandwagon.Controller.CollectionsPane.doViewSite();"/>
-                                <separator id="bandwagon-link-splitter"/>
-                                <label id="bandwagon-button-remove"
-                                       value="&unsubscribe.label;"
-                                       class="text-link"
-                                       onclick="Bandwagon.Controller.CollectionsPane.doUnsubscribe();"/>
-                            </hbox>
+                        <hbox pack="end">
+                            <label id="bandwagon-button-viewsite"
+                                   value="&view.label;"
+                                   class="text-link"
+                                   onclick="Bandwagon.Controller.CollectionsPane.doViewSite();"/>
+                            <separator id="bandwagon-link-splitter"/>
+                            <label id="bandwagon-button-remove"
+                                   value="&unsubscribe.label;"
+                                   class="text-link"
+                                   onclick="Bandwagon.Controller.CollectionsPane.doUnsubscribe();"/>
                         </hbox>
-                        <vbox>
-                            <description id="bandwagon-collection-description"/>
+                        <vbox id="bandwagon-collection-header">
+                            <label id="bandwagon-collection-title"/>
+                            <label id="bandwagon-collection-description"/>
                         </vbox>
                         <deck id="bandwagon-collection-deck" selectedIndex="0" flex="1">
                             <hbox flex="1">
                                 <richlistbox id="bandwagon-addons-list"
                                              seltype="single"
-                                             flex="1"
-                                             ondragenter="nsDragAndDrop.dragEnter(event, gExtensionsDNDObserver);"
-                                             ondragover="nsDragAndDrop.dragOver(event, gExtensionsDNDObserver);"
-                                             ondragdrop="nsDragAndDrop.drop(event, gExtensionsDNDObserver);"
-                                             />
+                                             flex="1"/>
                             </hbox>
                             <vbox flex="1" align="center" pack="center">
                                 <label class="usercollectionback" value="&collectionisloading.label;"/>
@@ -152,66 +142,15 @@
                                 oncommand="Bandwagon.Controller.CollectionsPane.doSubscribe();"/>
                     </hbox>
                 </vbox>
-                <vbox id="no-amo-auth-box" class="fs-info-panel" flex="1">
-                    <vbox align="start">
-                        <label id="no-amo-auth-header" class="fs-info-panel-header" value="&nocollectionstitle.label;"/>
-                        <separator/>
-                        <description class="fs-info-panel-text">&noamoauth.label;</description>
-                        <separator/>
-                    </vbox>
-
-                    <hbox>
-                        <hbox align="start" pack="center">
-                            <image src="chrome://bandwagon/skin/images/logo-login.png"/>
-                        </hbox>
-                        <vbox align="center">
-                            <description class="bold-text">
-                                &loginheading.label;
-                            </description>
-                            <separator class="thin"/>
-                            <grid>
-                                <columns>
-                                    <column/>
-                                    <column/>
-                                </columns>
-        
-                                <rows>
-                                    <row align="center">
-                                        <label value="&username.label;" style="text-align:right;"/>
-                                            <textbox id="login"
-                                                     onkeypress="if ((event.keyCode == KeyEvent.DOM_VK_RETURN) ||
-                                                            (event.keyCode == KeyEvent.DOM_VK_ENTER)) Bandwagon.Controller.CollectionsPane.doLogin();"/>
-                                    </row>
-                                    <row align="center">
-                                        <label value="&password.label;" style="text-align:right;"/>
-                                            <textbox id="password"
-                                                     type="password"
-                                                     onkeypress="if ((event.keyCode == KeyEvent.DOM_VK_RETURN) ||
-                                                            (event.keyCode == KeyEvent.DOM_VK_ENTER)) Bandwagon.Controller.CollectionsPane.doLogin();"/>
-                                    </row>
-                                    <row>
-                                        <hbox/>
-                                        <hbox>
-                                            <button id="auth-button" label="&clicktologin.label;"
-                                                    oncommand="Bandwagon.Controller.CollectionsPane.doLogin();"/>
-                                            <vbox pack="center">
-                                                <image id="auth-spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" style="visibility: hidden"/>
-                                            </vbox>
-                                        </hbox>
-                                    </row>
-                                </rows>
-                            </grid>
-                            <separator class="thin"/>
-                            <label value="&createaccount.label;"
-                                   class="text-link"
-                                   onclick="Bandwagon.Controller.ExtensionsOverlay.doCreateAccount();"/>
-                            <separator class="thin"/>
-                            <hbox pack="center" align="start">
-                                <description id="auth-error" class="error-text" collapsed="true"/>
-                            </hbox>
-                        </vbox>
+                <vbox id="no-amo-auth-box" class="fs-info-panel" flex="1" >
+                    <label id="no-amo-auth-header" class="fs-info-panel-header" value="&nocollectionstitle.label;"/>
+                    <separator/>
+                    <description class="fs-info-panel-text">&noamoauth.label;</description>
+                    <separator/>
+                    <hbox pack="center">
+                        <button label="&clicktologin.label;"
+                                oncommand="Bandwagon.Controller.CollectionsPane.doLogin();"/>
                     </hbox>
-
                 </vbox>
             </deck>
         </vbox>
diff --git a/bandwagon/content/ui/overlays/extensionsOverlayController.js b/bandwagon/content/ui/overlays/extensionsOverlayController.js
index 092feac..a1faac0 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlayController.js
+++ b/bandwagon/content/ui/overlays/extensionsOverlayController.js
@@ -67,32 +67,13 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
     }
 
     // Move Get Add-ons/Search to after Themes
+
     Bandwagon.Controller.ExtensionsOverlay._moveSearchTab();
- 
-    try
-    {
-        // If we don't do the next call, the Search tab still thinks it is at the start and it causes some display glitches
-        // dmcnamara - this is failing on linux
-        updateVisibilityFlags();
-    } catch (e) {}
 
     // Add publish button to extension binding when selected
 
     document.getElementById("extensionsView").addEventListener("select", Bandwagon.Controller.ExtensionsOverlay._stuffPublishUI, true);
 
-    // Bug 470268 - the Add-ons window is too narrow by default, enforce a minimum size
-    // This is a one time only deal, so get/set the pref
-
-    var w = document.documentElement.getAttribute("width");
-    var sized = Bandwagon.Preferences.getPreference("addonswindow.resized");
-
-    if (w < 700 && !sized)
-    {
-        document.documentElement.setAttribute("width", 700);
-    }
-
-    Bandwagon.Preferences.setPreference("addonswindow.resized", true);
-
     // Handle window arguments
 
     if (window.arguments)
@@ -101,6 +82,20 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
 
         if (inArgs)
         {
+            /** OBSOLETE
+            if (inArgs.subscribe)
+            {
+                Bandwagon.Logger.debug("Have window argument subscribe = " + inArgs.subscribe);
+
+                setTimeout(function()
+                {
+                    Bandwagon.Controller.ExtensionsOverlay._showCollectionsPaneView();
+                    Bandwagon.Controller.CollectionsPane.doShowCollectionPreview(inArgs.subscribe);
+                },
+                500);
+            }
+            else
+            */
             if (inArgs.selectCollection)
             {
                 Bandwagon.Logger.debug("Have window argument selectCollection = " + inArgs.selectCollection);
@@ -156,17 +151,9 @@ Bandwagon.Controller.ExtensionsOverlay.doRemoveFromCollection = function(collect
         null,
         check);
 
-    var callback = function(event)
-    {
-        if (!event.isError())
-        {
-            bandwagonService.forceCheckForUpdates(collection);
-        }
-    }
-
     if (button == 0)
     {
-        bandwagonService.removeAddonFromCollection(extension.guid, collection, callback);
+        bandwagonService.removeAddonFromCollection(extension.guid, collection);
     }
 }
 
@@ -214,16 +201,7 @@ Bandwagon.Controller.ExtensionsOverlay.doNewCollection = function()
 {
     Bandwagon.Logger.debug("In Bandwagon.Controller.ExtensionsOverlay.doNewCollection()");
 
-    var extension = Bandwagon.Controller.ExtensionsOverlay._getSelectedExtension();
-
-    if (extension && extension.guid)
-    {
-        Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL + "?guid=" + extension.guid);
-    }
-    else
-    {
-        Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL);
-    }
+    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_NEW_COLLECTION_URL);
 }
 
 Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail = function()
@@ -244,11 +222,6 @@ Bandwagon.Controller.ExtensionsOverlay.doAddNewShareEmail = function()
     Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton();
 }
 
-Bandwagon.Controller.ExtensionsOverlay.doCreateAccount = function()
-{
-    Bandwagon.Controller.CollectionsPane._openLocalizedURL(Bandwagon.LOGINPANE_DO_NEW_ACCOUNT);
-}
-
 Bandwagon.Controller.ExtensionsOverlay._openPublishDialog = function(params)
 {
     window.openDialog("chrome://bandwagon/content/ui/publish.xul", "",
@@ -260,7 +233,7 @@ Bandwagon.Controller.ExtensionsOverlay._moveSearchTab = function()
     var parNode = document.getElementById("viewGroup");
     var newNode = document.getElementById("search-view").cloneNode(false);
     var refNode = document.getElementById("updates-view");
-    var insertedNode = parNode.insertBefore(newNode, refNode);
+    var insertedNode = parNode.insertBefore(newNode, refNode)
     parNode.removeChild(parNode.firstChild);
 }
 
@@ -280,11 +253,6 @@ Bandwagon.Controller.ExtensionsOverlay._stuffPublishUI = function()
     if (elemExtension.getAttribute("plugin") == "true" || elemExtension.getAttribute("updateable") == "false")
         return;
 
-    if (Bandwagon.Controller.ExtensionsOverlay._publishButton && Bandwagon.Controller.ExtensionsOverlay._publishButton.parentNode)
-    {
-        Bandwagon.Controller.ExtensionsOverlay._publishButton.parentNode.removeChild(Bandwagon.Controller.ExtensionsOverlay._publishButton);
-    }
-
     Bandwagon.Controller.ExtensionsOverlay._invalidatePublishButton();
 
     for (var i=0; i<elemSelectedButtons.childNodes.length; i++)
@@ -418,3 +386,4 @@ Bandwagon.Controller.ExtensionsOverlay._showView = function(aView)
 showView = Bandwagon.Controller.ExtensionsOverlay._showView;
 
 window.addEventListener("load", Bandwagon.Controller.ExtensionsOverlay.init, true);
+
diff --git a/bandwagon/content/ui/publish.xul b/bandwagon/content/ui/publish.xul
index 5718eb3..380a4c2 100644
--- a/bandwagon/content/ui/publish.xul
+++ b/bandwagon/content/ui/publish.xul
@@ -75,20 +75,19 @@
                 <textbox id="email-address"/>
                 <checkbox id="remember-email" label="&remember.this.email.label;" checked="true"/>
             </groupbox>
-        </deck>
+       </deck>
 
         <separator class="thin"/>
 
-        <description flex="1" id="personal-email-note-label">&enter.a.personal.note.label;</description>
-        <description flex="1" id="personal-publish-note-label" collapsed="true"/>
+        <description flex="1">&enter.a.personal.note.label;</description>
 
         <textbox id="personal-note" multiline="true"/>
 
         <description id="sharing-with-new" flex="1"/>
 
-        <hbox pack="start" align="center">
+        <hbox>
             <image id="spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
-            <description id="error" style="color: red; visibility: hidden; height: 2em;" flex="1"/>
+            <label id="error" style="color: red; visibility: hidden;" value=" "/>
         </hbox>
 
     </vbox>
diff --git a/bandwagon/content/ui/publishController.js b/bandwagon/content/ui/publishController.js
index f8c805e..1ff0d27 100644
--- a/bandwagon/content/ui/publishController.js
+++ b/bandwagon/content/ui/publishController.js
@@ -67,16 +67,6 @@ Bandwagon.Controller.Publish.init = function()
     //document.getElementById("dialog-desc").value = Bandwagon.Controller.Publish.stringBundle.getFormattedString("you.are.sharing.the.add.on", [Bandwagon.Controller.Publish.publishExtension.name]);
     document.getElementById("type-deck").selectedIndex = Bandwagon.Controller.Publish.publishType-1;
 
-    // l10n fallback (bug 493654)
-    try 
-    {
-        document.getElementById("personal-publish-note-label").textContent = Bandwagon.Controller.Publish.stringBundle.getString("enter.a.personal.publish.note.label");
-    }
-    catch (e)
-    {
-        document.getElementById("personal-publish-note-label").textContent = document.getElementById("personal-email-note-label").textContent;
-    }
-
     switch (Bandwagon.Controller.Publish.publishType)
     {
         case Bandwagon.Controller.Publish.TYPE_COLLECTION:
@@ -85,8 +75,6 @@ Bandwagon.Controller.Publish.init = function()
             document.getElementById("sharing-with-box").collapsed = true;
             document.getElementById("publishing-to-box").collapsed = false;
             document.getElementById("sharing-with-new").collapsed = true;
-            document.getElementById("personal-email-note-label").collapsed = true;
-            document.getElementById("personal-publish-note-label").collapsed = false;
             break;
         case Bandwagon.Controller.Publish.TYPE_EXISTING_EMAIL:
             document.getElementById("sharing-with").textContent = Bandwagon.Controller.Publish.stringBundle.getFormattedString("sharing.with", [Bandwagon.Controller.Publish.publishDestination, Bandwagon.Controller.Publish.publishExtension.name]);
@@ -195,26 +183,7 @@ Bandwagon.Controller.Publish.finished = function(event)
         Bandwagon.Controller.Publish.hasSubmitted = false;
         Bandwagon.Controller.Publish.invalidate();
 
-        if (event.getError().getMessage() == "unknown_addon_guid")
-        {
-            Bandwagon.Controller.Publish._showError(Bandwagon.Controller.Publish.stringBundle.getString("error.unknown_addon_guid"));
-        }
-        else if (event.getError().getMessage() == "invalid_parameters")
-        {
-            // L10n fallback (bug 493656)
-            try
-            {
-                Bandwagon.Controller.Publish._showError(Bandwagon.Controller.Publish.stringBundle.getString("error.invalid_parameters"));
-            }
-            catch (e)
-            {
-                Bandwagon.Controller.Publish._showError(event.getError());
-            }
-        }
-        else
-        {
-            Bandwagon.Controller.Publish._showError(event.getError());
-        }
+        Bandwagon.Controller.Publish._showError(event.getError());
 
         return;
     }
@@ -231,11 +200,11 @@ Bandwagon.Controller.Publish.finished = function(event)
     {
         bandwagonService.forceCheckForUpdates(Bandwagon.Controller.Publish.publishDestination);
 
-        document.getElementById("error").textContent = Bandwagon.Controller.Publish.stringBundle.getString("the.addon.has.been.published");
+        document.getElementById("error").value = Bandwagon.Controller.Publish.stringBundle.getString("the.addon.has.been.published");
     }
     else
     {
-        document.getElementById("error").textContent = Bandwagon.Controller.Publish.stringBundle.getString("the.email.has.been.sent");
+        document.getElementById("error").value = Bandwagon.Controller.Publish.stringBundle.getString("the.email.has.been.sent");
     }
 
     document.getElementById("error").style.visibility = "visible";
@@ -254,7 +223,7 @@ Bandwagon.Controller.Publish.finished = function(event)
 Bandwagon.Controller.Publish._showError = function(message)
 {
     document.getElementById("error").style.visibility = "visible";
-    document.getElementById("error").textContent = message;
+    document.getElementById("error").value = message;
 }
 
 window.addEventListener("load", Bandwagon.Controller.Publish.init, true);
diff --git a/bandwagon/content/ui/settings.xul b/bandwagon/content/ui/settings.xul
index 53b1934..194d858 100644
--- a/bandwagon/content/ui/settings.xul
+++ b/bandwagon/content/ui/settings.xul
@@ -40,7 +40,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://bandwagon/skin/settings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://bandwagon/skin/settingsIcons.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bandwagon/content/ui/bindings/bandwagon.css" type="text/css"?>
 
 <!DOCTYPE prefwindow SYSTEM "chrome://bandwagon/locale/settings.dtd">
@@ -55,7 +54,7 @@
     <prefpane id="paneManage"
               label="&manage.label;"
               flex="1">
-        <hbox flex="1">
+        <hbox>
             <vbox>
                 <label id="collections-list-header" crop="end" value="&subscriptions.header;"/>
                 <richlistbox id="collections-list" flex="1"/>
@@ -105,7 +104,7 @@
                 </groupbox>
 
                 <!-- Add-ons Per Page Settings -->
-                <groupbox id="pagination-box">
+                <groupbox>
                     <caption label="&perpage.label;"/>
                     <radiogroup id="perpage-group">
                         <radio id="perpage-default" label="&default.label;"/>
@@ -119,7 +118,6 @@
                         </hbox>
                     </radiogroup>
                 </groupbox>
-
                 <hbox align="center" pack="end">
                     <button id="remove-button"
                             label="&remove.label;"
@@ -177,7 +175,7 @@
                     <radio id="notify-all-off" label="&off.label;" value="false"/>
                 </radiogroup>
             </hbox>
-            <hbox align="center" id="global-pagination-box">
+            <hbox align="center">
                 <label id="label-addonsshow"> &addonsleadin.label;</label>
                 <textbox id="textbox-addonsperpage-global"
                          type="number"
@@ -215,23 +213,10 @@
 
     <prefpane id="paneAuto"
               label="&pub.label;">
-        <preferences>
-            <preference id="extensions.bandwagon.local.autopublisher.publish.extensions"
-                        name="extensions.bandwagon.local.autopublisher.publish.extensions"
-                        type="bool"/>
-            <preference id="extensions.bandwagon.local.autopublisher.publish.themes"
-                        name="extensions.bandwagon.local.autopublisher.publish.themes"
-                        type="bool"/>
-            <preference id="extensions.bandwagon.local.autopublisher.publish.dictionaries"
-                        name="extensions.bandwagon.local.autopublisher.publish.dictionaries"
-                        type="bool"/>
-            <preference id="extensions.bandwagon.local.autopublisher.publish.language.packs"
-                        name="extensions.bandwagon.local.autopublisher.publish.language.packs"
-                        type="bool"/>
-            <preference id="extensions.bandwagon.local.autopublisher.only.publish.enabled"
-                        name="extensions.bandwagon.local.autopublisher.only.publish.enabled"
-                        type="bool"/>
-        </preferences>
+                <!-- Auto-publish Settings -->
+                <!--
+                <checkbox id="checkbox-autopublish-percollection" label="&autopublish.label;"/>
+                -->
         <groupbox>
             <caption label="&auto.label;"/>
             <description>&autoleadin.label;</description>
@@ -248,7 +233,7 @@
                 </row>
                 <row align="center">
                   <spacer/>
-                  <checkbox id="auto-list" label="&list.label;" checked="true"/>
+                  <checkbox id="auto-list" label="&list.label;"/>
                 </row>
               </rows>
             </grid>
@@ -262,42 +247,33 @@
               <rows>
                 <row align="center">
                   <label value="&types.label;"/>
-                  <checkbox id="auto-type-extensions" label="&type.extensions.label;" preference="extensions.bandwagon.local.autopublisher.publish.extensions"/>
-                  <checkbox id="auto-type-themes" label="&type.themes.label;" preference="extensions.bandwagon.local.autopublisher.publish.themes"/>
+                  <checkbox id="auto-type-extensions" label="&type.extensions.label;"/>
+                  <checkbox id="auto-type-themes" label="&type.themes.label;"/>
                 </row>
                 <row align="center">
                   <spacer/>
-                  <checkbox id="auto-type-dicts" label="&type.dicts.label;" preference="extensions.bandwagon.local.autopublisher.publish.dictionaries"/>
-                  <checkbox id="auto-type-langpacks" label="&type.langpacks.label;" preference="extensions.bandwagon.local.autopublisher.publish.language.packs"/>
+                  <checkbox id="auto-type-dicts" label="&type.dicts.label;"/>
+                  <checkbox id="auto-type-langpacks" label="&type.langpacks.label;"/>
                 </row>
               </rows>
             </grid>
-            <separator class="thin"/>
-            <checkbox id="auto-only-publish-enabled" label="&onlypublishenabledaddons.label;" preference="extensions.bandwagon.local.autopublisher.only.publish.enabled"/>
         </groupbox>
         <hbox class="bottomBox" pack="center">
             <groupbox id="auto-groupbox" orient="horizontal">
                 <button id="auto-create-button"
                         label="&createauto.label;"
                         oncommand="Bandwagon.Controller.Settings.doCreateAutoPublisher();"/>
-                <button id="auto-update-button"
-                        label="&updateauto.label;"
-                        oncommand="Bandwagon.Controller.Settings.doUpdateAutoPublisher();"
-                        collapsed="true"/>
                 <button id="auto-delete-button"
                         label="&deleteauto.label;"
                         oncommand="Bandwagon.Controller.Settings.doDeleteAutoPublisher();"
                         collapsed="true"/>
-                <vbox pack="center">
-                    <image id="auto-spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
-                </vbox>
+                <image id="auto-spinner" src="chrome://bandwagon/skin/images/spinner-small.gif" collapsed="true"/>
             </groupbox>
         </hbox>
-        <label id="auto-error" style="color: red;" value=""/>
+        <label id="auto-error" style="color: red;" value=" " collapsed="true"/>
     </prefpane>
 
     <stringbundle id="bandwagon-strings" src="chrome://bandwagon/locale/settings.properties"/>
-    <stringbundle id="bandwagon-strings2" src="chrome://bandwagon/locale/extensionOverlay.properties"/>
 
     <script type="application/x-javascript" src="chrome://bandwagon/content/ui/dialog.js"/>
     <script type="application/x-javascript" src="chrome://bandwagon/content/ui/settingsController.js"/>
diff --git a/bandwagon/content/ui/settingsController.js b/bandwagon/content/ui/settingsController.js
index 7e3525a..0af3dcc 100644
--- a/bandwagon/content/ui/settingsController.js
+++ b/bandwagon/content/ui/settingsController.js
@@ -42,7 +42,6 @@ Bandwagon.Controller.Settings = new function()
     this.elemBandwagonCollections = null;
 
     this.stringBundle = null;
-    this.stringBundle2 = null;
 }
 
 Bandwagon.Controller.Settings.init = function()
@@ -50,7 +49,6 @@ Bandwagon.Controller.Settings.init = function()
     Bandwagon.Logger.debug("Initializing Bandwagon.Controller.Settings");
 
     Bandwagon.Controller.Settings.stringBundle = document.getElementById("bandwagon-strings");
-    Bandwagon.Controller.Settings.stringBundle2 = document.getElementById("bandwagon-strings2");
 
     Bandwagon.Controller.Settings.elemBandwagonCollections = document.getElementById("collections-list");
     Bandwagon.Controller.Settings.elemBandwagonCollections.addEventListener("select", Bandwagon.Controller.Settings.doShowCollection, true);
@@ -75,7 +73,6 @@ Bandwagon.Controller.Settings.init = function()
     //document.getElementById("perpage-group").addEventListener("command", Bandwagon.Controller.Settings.doSaveCollection, true);
 
     bandwagonService.registerCollectionListChangeObserver(Bandwagon.Controller.Settings.collectionListChangeObserver);
-    bandwagonService.registerAuthenticationStatusChangeObserver(Bandwagon.Controller.Settings.authenticationStatusChangeObserver);
 
     setTimeout(function() 
     {
@@ -93,7 +90,6 @@ Bandwagon.Controller.Settings._delayedInit = function()
     Bandwagon.Controller.Settings.invalidateAutoPublisher();
     Bandwagon.Controller.Settings.invalidateAllowIncompatibleInstall();
     Bandwagon.Controller.Settings.invalidateCustomizeCollectionUI();
-    Bandwagon.Controller.Settings.invalidatePaginationSettings();
     Bandwagon.Controller.Settings.invalidate();
 }
 
@@ -111,7 +107,6 @@ Bandwagon.Controller.Settings.bindingsReady = function()
 Bandwagon.Controller.Settings.uninit = function()
 {
     bandwagonService.unregisterCollectionListChangeObserver(Bandwagon.Controller.Settings.collectionListChangeObserver);
-    bandwagonService.unregisterAuthenticationStatusChangeObserver(Bandwagon.Controller.Settings.authenticationStatusChangeObserver);
 
     // now is a good time to save collections to storage
     if (Bandwagon.COMMIT_NOW)
@@ -137,12 +132,6 @@ Bandwagon.Controller.Settings.collectionListChangeObserver = function()
     Bandwagon.Controller.Settings.invalidate();
 }
 
-Bandwagon.Controller.Settings.authenticationStatusChangeObserver = function()
-{
-    Bandwagon.Controller.Settings.invalidateLogin();
-    Bandwagon.Controller.Settings.invalidate();
-}
-
 Bandwagon.Controller.Settings.invalidate = function()
 {
     var collectionCount = Bandwagon.Controller.Settings.elemBandwagonCollections.getElementsByTagName("bandwagonCollection").length;
@@ -150,7 +139,8 @@ Bandwagon.Controller.Settings.invalidate = function()
 
     var disabled = (!collectionSelection || collectionCount == 0);
 
-    document.getElementById("remove-button").disabled = disabled;
+    // XXTODO Disable more controls
+    //document.getElementById("remove-collection-button").disabled = disabled;
     document.getElementById("updates-group").disabled = disabled;
     document.getElementById("textbox-updateinterval-quantity-percollection").disabled = disabled;
     document.getElementById("menulist-updateinterval-units-percollection").disabled = disabled;
@@ -158,14 +148,7 @@ Bandwagon.Controller.Settings.invalidate = function()
     document.getElementById("label-addonsshow-percollection").disabled = disabled;
     document.getElementById("label-addonsperpage-percollection").disabled = disabled;
     document.getElementById("textbox-addonsperpage-percollection").disabled = disabled;
-    document.getElementById("perpage-default").disabled = disabled;
-    document.getElementById("perpage-custom").disabled = disabled;
-}
-
-Bandwagon.Controller.Settings.invalidatePaginationSettings = function()
-{
-    document.getElementById("pagination-box").collapsed = (Bandwagon.ENABLE_PAGINATION?false:true);
-    document.getElementById("global-pagination-box").collapsed = (Bandwagon.ENABLE_PAGINATION?false:true);
+    //document.getElementById("checkbox-autopublish-percollection").disabled = disabled;
 }
 
 Bandwagon.Controller.Settings.invalidateCustomizeCollectionUI = function()
@@ -183,13 +166,14 @@ Bandwagon.Controller.Settings.invalidateCustomizeCollectionUI = function()
 
 Bandwagon.Controller.Settings.invalidateLogin = function()
 {
-    var isLoggedIn = bandwagonService.isAuthenticated();
+    var isLoggedIn = bandwagonService.isAMOAuthenticated();
 
     if (isLoggedIn)
     {
-        var loginEmail = Bandwagon.Preferences.getPreference("login");
-        document.getElementById("login-status-text").value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("login.status.with.email", [loginEmail]);
+        //var loginEmail = "???"; // TODO the client doesn't know what this is
+        //document.getElementById("login-status-text").value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("login.status.with.email", [loginEmail]);
         
+        document.getElementById("login-status-text").value = Bandwagon.Controller.Settings.stringBundle.getString("login.status");
         document.getElementById("login-button").collapsed = true;
         document.getElementById("logout-button").removeAttribute("collapsed");
     }
@@ -198,23 +182,7 @@ Bandwagon.Controller.Settings.invalidateLogin = function()
         document.getElementById("login-status-text").value = Bandwagon.Controller.Settings.stringBundle.getString("logout.status");
         document.getElementById("login-button").removeAttribute("collapsed");
         document.getElementById("logout-button").collapsed = true;
-
-        while (Bandwagon.Controller.Settings.elemBandwagonCollections.hasChildNodes())
-        {
-            Bandwagon.Controller.Settings.elemBandwagonCollections.removeChild(Bandwagon.Controller.Settings.elemBandwagonCollections.firstChild);
-        }
     }
-
-    document.getElementById("auto-name").disabled = !isLoggedIn;
-    document.getElementById("auto-create-button").disabled = !isLoggedIn;
-    document.getElementById("auto-delete-button").disabled = !isLoggedIn;
-    document.getElementById("auto-update-button").disabled = !isLoggedIn;
-    document.getElementById("auto-list").disabled = !isLoggedIn;
-    document.getElementById("auto-only-publish-enabled").disabled = !isLoggedIn;
-    document.getElementById("auto-type-extensions").disabled = !isLoggedIn;
-    document.getElementById("auto-type-themes").disabled = !isLoggedIn;
-    document.getElementById("auto-type-dicts").disabled = !isLoggedIn;
-    document.getElementById("auto-type-langpacks").disabled = !isLoggedIn;
 }
 
 Bandwagon.Controller.Settings.invalidateAutoPublisher = function()
@@ -223,18 +191,18 @@ Bandwagon.Controller.Settings.invalidateAutoPublisher = function()
 
     if (localAutoPublisher != null)
     {
+        Bandwagon.Controller.Settings._autoCreateToggleUIEnabledState(true);
+
         document.getElementById("auto-spinner").collapsed = true;
         document.getElementById("auto-create-button").collapsed = true;
         document.getElementById("auto-delete-button").removeAttribute("collapsed");
-        document.getElementById("auto-update-button").removeAttribute("collapsed");
         document.getElementById("auto-name").value = localAutoPublisher.name;
-        document.getElementById("auto-list").checked = localAutoPublisher.listed;
     }
 }
 
 Bandwagon.Controller.Settings.invalidateAllowIncompatibleInstall = function()
 {
-    var isExtensionsCheckCompatibility = Bandwagon.Preferences.getGlobalPreference("extensions.checkCompatibility", true);
+    var isExtensionsCheckCompatibility = Bandwagon.Preferences.getGlobalPreference("extensions.checkCompatibility");
 
     if (isExtensionsCheckCompatibility == null || isExtensionsCheckCompatibility == true)
     {
@@ -434,29 +402,12 @@ Bandwagon.Controller.Settings._repopulateCollectionsList = function()
 
 Bandwagon.Controller.Settings.doLogin = function()
 {
-    // open the extensions manager window.
-    
-    const EMTYPE = "Extension:Manager";
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-        .getService(Components.interfaces.nsIWindowMediator);
-    var theEM = wm.getMostRecentWindow(EMTYPE);
-
-    if (theEM)
-    {
-        theEM.focus();
-        theEM.showView('bandwagon-collections');
-    }
-    else
-    {
-        const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
-        const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
-        window.openDialog(EMURL, "", EMFEATURES);
-    }
+    Bandwagon.Controller.Settings._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_LOGIN_URL);
 }
 
 Bandwagon.Controller.Settings.doLogout = function()
 {
-    bandwagonService.deauthenticate();
+    Bandwagon.Controller.Settings._openLocalizedURL(Bandwagon.COLLECTIONSPANE_DO_LOGOUT_URL);
 }
 
 Bandwagon.Controller.Settings._openLocalizedURL = function(url)
@@ -498,13 +449,14 @@ Bandwagon.Controller.Settings.doCreateAutoPublisher = function()
 {
     // check form
     document.getElementById("auto-error").value = "";
-    document.getElementById("auto-error").style.color = 'red';
+    document.getElementById("auto-error").collapsed = true;
 
     var collectionName =  document.getElementById("auto-name").value;
 
-    if (!collectionName || collectionName == "" || !collectionName.match(/.*\w.*/))
+    if (!collectionName || collectionName == "")
     {
         document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("auto.invalid.name", [collectionName]);
+        document.getElementById("auto-error").collapsed = false;
         return;
     }
 
@@ -512,11 +464,11 @@ Bandwagon.Controller.Settings.doCreateAutoPublisher = function()
     var autoPublishThemes = document.getElementById("auto-type-themes").checked;
     var autoPublishDicts = document.getElementById("auto-type-dicts").checked;
     var autoPublishLangPacks = document.getElementById("auto-type-langpacks").checked;
-    var autoPublishDisabled = !document.getElementById("auto-only-publish-enabled").checked;
 
     if (!autoPublishExtensions && !autoPublishThemes && !autoPublishDicts && !autoPublishLangPacks)
     {
         document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.please.select.type");
+        document.getElementById("auto-error").collapsed = false;
         return;
     }
 
@@ -525,13 +477,11 @@ Bandwagon.Controller.Settings.doCreateAutoPublisher = function()
     Bandwagon.Controller.Settings._autoCreateToggleUIEnabledState(true);
 
     // create the collection object
-    //
-    // TODO this logic should not be in the UI controller
 
     var collection = new Bandwagon.Model.Collection();
 
     collection.name = collectionName;
-    collection.description = Bandwagon.Controller.Settings.stringBundle.getString("auto.create.description");
+    collection.description = collectionName; // nothing better to put here - api demands it
     collection.listed = document.getElementById("auto-list").checked;
     collection.writable = true;
     collection.showNotifications = false;
@@ -543,46 +493,33 @@ Bandwagon.Controller.Settings.doCreateAutoPublisher = function()
     collection.autoPublishThemes = autoPublishThemes;
     collection.autoPublishDicts = autoPublishDicts;
     collection.autoPublishLangPacks = autoPublishLangPacks;
-    collection.autoPublishDisabled = autoPublishDisabled;
     
-    Bandwagon.Preferences.setPreferenceList("autopublished.extensions", []);
-
     // send the api call
-       
+    
     var newCollectionCallback = function(event)
     {
         if (event.isError())
         {
-            if (event.getError().getMessage() == "invalid_parameters")
-            {
-                // this happens when the api doesn't like the collection name or description. TODO do we need a better error her?
-                document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.create.internal.error");
-            }
-            else
-            {
-                document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.create.internal.error");
-            }
-
-            Bandwagon.Controller.Settings._autoCreateToggleUIEnabledState(false);
+            document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.create.internal.error");
+            document.getElementById("auto-error").collapsed = false;
+             Bandwagon.Controller.Settings._autoCreateToggleUIEnabledState(false);
         }
         else
         {
-            Bandwagon.Preferences.setPreference("local.autopublisher", collection.resourceURL);
-
-            // we also need to subscribe to this collection
-            bandwagonService.subscribeToCollection(collection);
+            // FIXME, we should really be using the guid here, but the api call doesn't give it to us :(
+            Bandwagon.Preferences.setPreference("local.autopublisher", collectionName);
 
-            // publish extensions to this collection
-            bandwagonService.autopublishExtensions();
+            // on callback of above, refresh collection list
+            bandwagonService.forceCheckAllForUpdatesAndUpdateCollectionsList();
 
             // on callback of above, tell user we're done
             document.getElementById("auto-error").style.color = 'green';
             document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.create.done");
+            document.getElementById("auto-error").collapsed = false;
 
             // clean-up
             document.getElementById("auto-create-button").collapsed = true;
             document.getElementById("auto-delete-button").collapsed = false;
-            document.getElementById("auto-update-button").collapsed = false;
             document.getElementById("auto-spinner").collapsed = true;
         }
     }
@@ -590,88 +527,9 @@ Bandwagon.Controller.Settings.doCreateAutoPublisher = function()
     bandwagonService.newCollection(collection, newCollectionCallback);
 }
 
-Bandwagon.Controller.Settings.doUpdateAutoPublisher = function()
-{
-    document.getElementById("auto-error").value = "";
-    document.getElementById("auto-error").style.color = 'red';
-
-    var collectionName =  document.getElementById("auto-name").value;
-
-    if (!collectionName || collectionName == "" || !collectionName.match(/.*\w.*/))
-    {
-        document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getFormattedString("auto.invalid.name", [collectionName]);
-        return;
-    }
-
-    var promptService;
-
-    try
-    {
-        promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
-        promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
-    } catch (e) { return; }
-
-    var promptTitle = document.getElementById("auto-update-button").label;
-    var promptMsg = Bandwagon.Controller.Settings.stringBundle.getString("auto.update.confirm.message");
-    var proceed = promptService.confirm(
-            window,
-            promptTitle,
-            promptMsg
-    );
-
-    if (!proceed)
-    {
-        return;
-    }
-
-    document.getElementById("auto-spinner").collapsed = false;
-
-    var collection = bandwagonService.getLocalAutoPublisher();
-
-    collection.name = document.getElementById("auto-name").value;
-    collection.listed = document.getElementById("auto-list").checked;
-    collection.autoPublishExtensions = document.getElementById("auto-type-extensions").checked;
-    collection.autoPublishThemes = document.getElementById("auto-type-themes").checked;
-    collection.autoPublishDicts = document.getElementById("auto-type-dicts").checked;
-    collection.autoPublishLangPacks = document.getElementById("auto-type-langpacks").checked;
-    collection.autoPublishDisabled = !document.getElementById("auto-only-publish-enabled").checked;
- 
-    var callback = function(event)
-    {
-        document.getElementById("auto-spinner").collapsed = true;
-
-        if (event.isError())
-        {
-            document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.update.internal.error");
-        }
-        else
-        {
-            Bandwagon.Preferences.setPreference("local.autopublisher", collection.resourceURL);
-
-            // on callback of above, refresh collection list
-            bandwagonService.forceCheckAllForUpdatesAndUpdateCollectionsList();
-
-            Bandwagon.Controller.Settings._autoCreateToggleUIEnabledState(false);
-
-            // on callback of above, tell user we're done
-            document.getElementById("auto-error").style.color = 'green';
-            document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.update.done");
-
-            // clean-up
-            document.getElementById("auto-create-button").collapsed = true;
-            document.getElementById("auto-update-button").collapsed = false;
-            document.getElementById("auto-delete-button").collapsed = false;
-            document.getElementById("auto-spinner").collapsed = true;
-        }
-    }
-
-    bandwagonService.updateCollectionDetails(collection, callback);
-}
-
 Bandwagon.Controller.Settings.doDeleteAutoPublisher = function()
 {
     document.getElementById("auto-spinner").collapsed = false;
-    document.getElementById("auto-error").style.color = 'red';
 
     var localAutoPublisher = bandwagonService.getLocalAutoPublisher();
 
@@ -682,6 +540,7 @@ Bandwagon.Controller.Settings.doDeleteAutoPublisher = function()
         if (event.isError())
         {
             document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.delete.internal.error");
+            document.getElementById("auto-error").collapsed = false;
         }
         else
         {
@@ -695,10 +554,10 @@ Bandwagon.Controller.Settings.doDeleteAutoPublisher = function()
             // on callback of above, tell user we're done
             document.getElementById("auto-error").style.color = 'green';
             document.getElementById("auto-error").value = Bandwagon.Controller.Settings.stringBundle.getString("auto.delete.done");
+            document.getElementById("auto-error").collapsed = false;
 
             // clean-up
             document.getElementById("auto-create-button").collapsed = false;
-            document.getElementById("auto-update-button").collapsed = true;
             document.getElementById("auto-delete-button").collapsed = true;
             document.getElementById("auto-spinner").collapsed = true;
         }
@@ -748,40 +607,71 @@ Bandwagon.Controller.Settings.doCancel = function()
     // nothing
 }
 
-Bandwagon.Controller.Settings.doUnsubscribe = function()
+/** OBSOLETE
+Bandwagon.Controller.Settings.doAdd = function()
+{
+    var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+        .getService(Components.interfaces.nsIPromptService);
+
+    var promptTitle = Bandwagon.Controller.Settings.stringBundle.getString("add.collection");
+    var promptMsg = Bandwagon.Controller.Settings.stringBundle.getString("enter.url.to.add.collection");
+    var input = {value: "http://"};
+    var check = {value: false};
+    var proceed = prompts.prompt(window, promptTitle, promptMsg, input, null, check);
+
+    if (proceed)
+    {
+        bandwagonService.addPreviewCollection(input.value);
+    }
+}
+*/
+
+/** OBSOLETE XX Brian, er, I think not, see Remove Subscription button
+ * XX Dave, remove != unsubscribe
+Bandwagon.Controller.Settings.doRemove = function()
 {
     var collection = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection;
 
     if (collection == null)
         return;
 
-    var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
-    var check = {value: false};
-    var flags = promptService.BUTTON_POS_0 * promptService.BUTTON_TITLE_IS_STRING + promptService.BUTTON_POS_1 * promptService.BUTTON_TITLE_IS_STRING;
-    var button = promptService.confirmEx(
-        window,
-        Bandwagon.Controller.Settings.stringBundle2.getString("unsubscribe.confirm.title"),
-        Bandwagon.Controller.Settings.stringBundle2.getString("unsubscribe.confirm.label"),
-        flags,
-        Bandwagon.Controller.Settings.stringBundle2.getString("unsubscribe.confirm.button0"),
-        Bandwagon.Controller.Settings.stringBundle2.getString("unsubscribe.confirm.button1"),
-        null,
-        null,
-        check);
-
-    if (button == 0)
-    {
-        var callback = function(event)
-        {
-            if (event.isError())
-            {
-                window.alert(Bandwagon.Controller.Settings.stringBundle2.getString("unsubscribe.error"));
-            }
-        }
+    var promptService;
+
+    try
+    {
+        promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
+        promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
+    } catch (e) { return; }
+
+    var promptTitle = Bandwagon.Controller.Settings.stringBundle.getString("remove.collection");
+    var promptMsg = Bandwagon.Controller.Settings.stringBundle.getFormattedString("are.you.sure.you.want.to.remove", [(collection.name?collection.name:collection.resourceURL)]);
+    var proceed = promptService.confirm(
+            window,
+            promptTitle,
+            promptMsg
+    );
 
-        bandwagonService.unsubscribeFromCollection(collection, callback);
+    if (proceed)
+    {
+        // TODO for non-instant-apply dialogs, should we wait until 'Ok' is clicked before removal?
+    
+        bandwagonService.unlinkCollection(collection);
+
+        if (!collection.preview)
+            bandwagonService.unsubscribe(collection);
     }
 }
+*/
+
+Bandwagon.Controller.Settings.doUnsubscribe = function()
+{
+    var collection = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection;
+
+    if (collection == null || !collection.links["unsubscribe"])
+        return;
+
+    Bandwagon.Controller.Settings._openLocalizedURL(collection.links["unsubscribe"]);
+}
 
 Bandwagon.Controller.Settings.doUpdateIntervalScopeChange = function(event)
 {
diff --git a/bandwagon/defaults/preferences/bandwagon.js b/bandwagon/defaults/preferences/bandwagon.js
index 57b9a57..f9f1a30 100644
--- a/bandwagon/defaults/preferences/bandwagon.js
+++ b/bandwagon/defaults/preferences/bandwagon.js
@@ -35,9 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-pref("extensions.sharing@addons.mozilla.org.description", "chrome://bandwagon/locale/bandwagon.properties");
 pref("extensions.bandwagon.currentversion", "0.0");
-pref("extensions.bandwagon.addonswindow.resized", false);
 pref("extensions.bandwagon.debug", false);
 pref("extensions.bandwagon.firstrun", true);
 pref("extensions.bandwagon.verbose", false);
@@ -45,16 +43,8 @@ pref("extensions.bandwagon.updateall.datelastcheck", 0);
 pref("extensions.bandwagon.publish.shared.emails", "");
 pref("extensions.bandwagon.autopublished.extensions", "");
 pref("extensions.bandwagon.local.autopublisher", "");
-pref("extensions.bandwagon.local.autopublisher.publish.extensions", true);
-pref("extensions.bandwagon.local.autopublisher.publish.themes", true);
-pref("extensions.bandwagon.local.autopublisher.publish.dictionaries", true);
-pref("extensions.bandwagon.local.autopublisher.publish.language.packs", true);
-pref("extensions.bandwagon.local.autopublisher.only.publish.enabled", true);
-pref("extensions.bandwagon.global.update.interval", 8);
-pref("extensions.bandwagon.global.update.units", 2);
+pref("extensions.bandwagon.global.update.interval", 2);
+pref("extensions.bandwagon.global.update.units", 1);
 pref("extensions.bandwagon.global.addonsperpage", 20);
 pref("extensions.bandwagon.global.notify.enabled", true);
 pref("extensions.bandwagon.allow.incompatible.install", false);
-pref("extensions.bandwagon.authtoken", "");
-pref("extensions.bandwagon.login", "");
-pref("extensions.bandwagon.amo_host", "addons.mozilla.org");
diff --git a/bandwagon/install.rdf b/bandwagon/install.rdf
index 336d903..9c005fe 100644
--- a/bandwagon/install.rdf
+++ b/bandwagon/install.rdf
@@ -6,11 +6,10 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>sharing@addons.mozilla.org</em:id>
     <em:name>Add-on Collector</em:name>
-    <em:version>1.0.2</em:version>
+    <em:version>0.2</em:version>
+    <em:description>Share and discover add-ons.</em:description>
     <em:creator>Mozilla Corporation</em:creator>
     <em:contributor>BRIKS Software (http://briks.si)</em:contributor>
-    <em:translator>Mozilla Localization Teams</em:translator>
-    <em:translator>https://addons.mozilla.org/pages/credits</em:translator>
     <em:homepageURL>https://addons.mozilla.org/collections</em:homepageURL>
     <em:optionsURL>chrome://bandwagon/content/ui/settings.xul</em:optionsURL>
     <em:iconURL>chrome://bandwagon/skin/images/icon32.png</em:iconURL>
@@ -19,160 +18,9 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
         <em:minVersion>3.0</em:minVersion>
-        <em:maxVersion>3.5.*</em:maxVersion>
+        <em:maxVersion>3.5b4pre</em:maxVersion>
       </Description>
     </em:targetApplication>
-
-    <em:localized>
-      <Description>
-        <em:locale>ca</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>cs</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>da</em:locale>
-        <em:name>Tilføjelsessamleren</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>de</em:locale>
-        <em:name>Add-on-Sammler</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>el-GR</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>en-US</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>es-ES</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>fa</em:locale>
-        <em:name>جمع‌کنندهٔ ا�زودنی‌ها</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>fr</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>fy-NL</em:locale>
-        <em:name>Tafoegingssamler</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>he</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>id</em:locale>
-        <em:name>Kolektor Pengaya</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>it</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>nl</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>pl-PL</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>pt-BR</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>pt-PT</em:locale>
-        <em:name>Coleccionador de extras</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>ro</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>ru</em:locale>
-        <em:name>Собиратель Дополнений</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>sk</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>sq</em:locale>
-        <em:name>Grumbullues Shtesash</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>sv-SE</em:locale>
-        <em:name>Add-on-samlaren</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>vi</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>zh-CN</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
-    <em:localized>
-      <Description>
-        <em:locale>zh-TW</em:locale>
-        <em:name>Add-on Collector</em:name>
-      </Description>
-    </em:localized>
   </Description>
 
 </RDF>
diff --git a/bandwagon/locale/en-US/bandwagonAddon.properties b/bandwagon/locale/en-US/bandwagonAddon.properties
index 64ecdfc..134478b 100644
--- a/bandwagon/locale/en-US/bandwagonAddon.properties
+++ b/bandwagon/locale/en-US/bandwagonAddon.properties
@@ -1,39 +1,27 @@
-# LOCALIZATION NOTE (bandwagon.addon.pluralRule):
-# See https://developer.mozilla.org/En/Localization_and_Plurals
-bandwagon.addon.pluralRule=1
 bandwagon.category1=Extension
-# LOCALIZATION NOTE (bandwagon.addon.author):
-# %S will contain author's first and last name, or their nickname used on AMO
+
 bandwagon.addon.author=By %S
-# LOCALIZATION NOTE (bandwagon.addon.addedby):
-# %S will be a user's first and last name, or nickname
-bandwagon.addon.addedby=by %S
+bandwagon.addon.category=Category: %S
 bandwagon.addon.added.justnow=Added: Just now
-# LOCALIZATION NOTE:
-# %S will be a number of time units indicated
-bandwagon.addon.added.minute=Added: 1 minute ago;Added: %S minutes ago
-bandwagon.addon.added.hour=Added: 1 hour ago;Added: %S hours ago
-bandwagon.addon.added.day=Added: Yesterday;Added: %S days ago
-bandwagon.addon.added.week=Added: 1 week ago;Added: %S weeks ago
-bandwagon.addon.added.month=Added: 1 month ago;Added: %S months ago
-bandwagon.addon.added.year=Added: 1 year ago;Added: %S years ago
+bandwagon.addon.added.minute=Added: 1 minute ago
+bandwagon.addon.added.minutes=Added: %S minutes ago
+bandwagon.addon.added.hour=Added: 1 hour ago
+bandwagon.addon.added.hours=Added: %S hours ago
+bandwagon.addon.added.day=Added: Yesterday
+bandwagon.addon.added.days=Added: %S days ago
+bandwagon.addon.added.week=Added: 1 week ago
+bandwagon.addon.added.weeks=Added: %S weeks ago
+bandwagon.addon.added.month=Added: 1 month ago
+bandwagon.addon.added.months=Added: %S months ago
+bandwagon.addon.added.year=Added: 1 year ago
+bandwagon.addon.added.years=Added: %S years ago
 bandwagon.addon.moreinfo=More info.
 bandwagon.addon.olderversionsoffirefox=This add-on is for older versions of Firefox.
-# LOCALIZATION NOTE (upgradetofirefoxn1):
-# %S will be a Firefox version number
 bandwagon.addon.upgradetofirefoxn1=Upgrade to Firefox %S
 bandwagon.addon.upgradetofirefoxn2=to use this add-on.
-# LOCALIZATION NOTE (bandwagon.addon.requiresfirefoxbeta1/requiresfirefoxbeta2):
-# %S will be a Firefox version number
 bandwagon.addon.requiresfirefoxbeta1=This add-on requires Firefox %S, which has not yet been released. To use this add-on, you may
 bandwagon.addon.requiresfirefoxbeta2=download Firefox %S beta.
-# LOCALIZATION NOTE (bandwagon.addon.notcompatible):
-# %S will be a platform name, such as "Windows"
 bandwagon.addon.notcompatible=This add-on is not compatible with %S.
-# LOCALIZATION NOTE (bandwagon.addon.comment.description):
-# %S will be a comment entered by the publisher of the add-on
 bandwagon.addon.comment.description=“%S�
-# LOCALIZATION NOTE (bandwagon.addon.comment.author):
-# %S will be the publisher's real name or nickname
 bandwagon.addon.comment.author=Comment from %S:
-bandwagon.addon.isexperimental=This add-on is experimental.
+
diff --git a/bandwagon/locale/en-US/browserOverlay.properties b/bandwagon/locale/en-US/browserOverlay.properties
index 5c3b7aa..217a947 100644
--- a/bandwagon/locale/en-US/browserOverlay.properties
+++ b/bandwagon/locale/en-US/browserOverlay.properties
@@ -1,4 +1,2 @@
 newaddons.alert.title=New Add-ons
-# LOCALIZATION NOTE (newaddons.alert.text):
-# %S will be the name of a collection
-newaddons.alert.text=There are new add-ons in your subscription "%S".
+newaddons.alert.text=There are new add-ons in your subscription '%S'.
diff --git a/bandwagon/locale/en-US/extensionOverlay.properties b/bandwagon/locale/en-US/extensionOverlay.properties
index 03d896c..4fa83e4 100644
--- a/bandwagon/locale/en-US/extensionOverlay.properties
+++ b/bandwagon/locale/en-US/extensionOverlay.properties
@@ -1,14 +1,12 @@
+collectionspane.this.is.only.a.preview=This is only a preview!
+collectionspane.if.you.do.not.subscribe=If you do not subscribe, this collection will disappear when you close Firefox.
+collectionspane.subscribe=Subscribe
+collectionspane.dont.subscribe=Don't Subscribe
+collectionspane.subscribe.accesskey=s
+collectionspane.dont.subscribe.accesskey=d
 publish.new.email.address.title=New E-mail Address
 publish.new.email.address.text=Enter a new e-mail address to share this add-on with:
 publish.remove.title=Confirmation
-# LOCALIZATION NOTE (publish.remove.label):
-# %1 is the name of an add-on. %2 is the name of a collection
-publish.remove.label=Are you sure you wish to remove %1$S from the "%2$S" collection?
+publish.remove.label=Are you sure you wish to remove %S from the "%S" collection?
 publish.remove.button1=No, cancel
 publish.remove.button0=Yes, remove the add-on
-login.error=There was an error logging in. Please check that your username and password are correct.
-unsubscribe.error=There was an error unsubscribing from this collection. Please try again later.
-unsubscribe.confirm.title=Confirm Unsubscribe
-unsubscribe.confirm.label=Unsubscribing from this collection will also remove it from your list of favorites. Are you sure you want to unsubscribe?
-unsubscribe.confirm.button1=No, cancel
-unsubscribe.confirm.button0=Yes, unsubscribe
diff --git a/bandwagon/locale/en-US/extensionsOverlay.dtd b/bandwagon/locale/en-US/extensionsOverlay.dtd
index 8621ff1..29d18ce 100644
--- a/bandwagon/locale/en-US/extensionsOverlay.dtd
+++ b/bandwagon/locale/en-US/extensionsOverlay.dtd
@@ -40,25 +40,19 @@
 
 <!ENTITY addon.moreinfo                   "More info.">
 <!ENTITY addon.addtofirefox               "Add to Firefox">
-<!ENTITY subscribe.label                  "Find Collections">
+<!ENTITY subscribe.label                  "Subscribe to more Add-ons">
 <!ENTITY reload.label                     "Reload All">
 <!ENTITY settings.label                   "Settings">
 
 <!ENTITY view.label                       "View Collection">
 <!ENTITY unsubscribe.label                "Unsubscribe">
 
-<!ENTITY nocollectionstitle.label         "Welcome to the Add-on Collector">
+<!ENTITY nocollectionstitle.label         "Welcome to the Add-ons Collector">
 <!ENTITY nocollectionssubscribed.label    "This is where collections you mark as a favorite on Mozilla Add-ons will appear so that you can easily keep track of them. It looks like you haven't yet added any favorites, so why not take a look around our Collection Directory?">
+<!ENTITY noamoauth.label    "This is where collections you mark as a favorite on Mozilla Add-ons will appear so that you can easily keep track of them. You must be logged in to addons.mozilla.org to use this feature.">
 <!ENTITY clicktosubscribe.label           "Find Collections">
-
-<!ENTITY noamoauth.label                  "This is where collections you mark as a favorite on Mozilla Add-ons will appear so that you can easily keep track of them. You must be logged in to addons.mozilla.org to use this feature.">
-<!ENTITY username.label                   "E-mail Address">
-<!ENTITY password.label                   "Password">
-<!ENTITY clicktologin.label               "Log in">
-<!ENTITY createaccount.label              "I don't have an account">
-<!ENTITY loginheading.label               "Enter your Mozilla Add-ons account information below:">
-
-<!ENTITY collectionisloading.label        "Retrieving subscription...">
+<!ENTITY clicktologin.label               "Login">
+<!ENTITY collectionisloading.label        "Retrieving subscription">
 <!ENTITY collectionhasnoitems.label       "This collection contains no add-ons.">
 <!ENTITY collectionhaserror.label         "This collection cannot be displayed because it contains errors.">
 
diff --git a/bandwagon/locale/en-US/publish.properties b/bandwagon/locale/en-US/publish.properties
index 2e39975..805b9ef 100644
--- a/bandwagon/locale/en-US/publish.properties
+++ b/bandwagon/locale/en-US/publish.properties
@@ -1,22 +1,9 @@
-# LOCALIZATION NOTE (you.are.sharing.the.add.on):
-# %S is the name of an add-on
 you.are.sharing.the.add.on=You are sharing the add-on '%S'
-# LOCALIZATION NOTE (publishing.to):
-# %1 is the name of an add-on. %2 is the name of a collection
-publishing.to=Clicking "Publish" will add %1$S to the "%2$S" collection.
-# LOCALIZATION NOTE (sharing.with):
-# %1 is a user's email address. $2 is the name of an add-on
-sharing.with=Clicking "Send E-mail" will send %1$S an e-mail with information about %2$S
-# LOCALIZATION NOTE (sharing.with.new):
-# %S is the name of an add-on
+publishing.to=Clicking "Publish" will add %S to the "%S" collection.
+sharing.with=Clicking "Send E-mail" will send %S an e-mail with information about %S
 sharing.with.new=Clicking "Send E-mail" will send the above recipients an e-mail with information about %S
 please.enter.an.email.address=Please enter an e-mail address.
 the.addon.has.been.published=The add-on has been published.
 the.email.has.been.sent=The email has been sent.
-# LOCALIZATION NOTE (closing.in):
-# %S is the number of seconds until a window closes, counting down
-closing.in=Closing in %S...
+closing.in=Closing in %S
 send.email=Send E-mail
-error.unknown_addon_guid=This add-on cannot be shared because it is not hosted on the Mozilla Add-ons website.
-error.invalid_parameters=There was a problem sharing this add-on. Please check that the e-mail address and personal note are valid.
-enter.a.personal.publish.note.label=Optional: Enter a personal note about this add-on to be displayed when published
diff --git a/bandwagon/locale/en-US/settings.dtd b/bandwagon/locale/en-US/settings.dtd
index b4cd2df..cb10754 100644
--- a/bandwagon/locale/en-US/settings.dtd
+++ b/bandwagon/locale/en-US/settings.dtd
@@ -38,7 +38,7 @@
 <!-- For localisers to change the width of the window -->
 <!ENTITY settings.style                   "width: 42em;">
 
-<!ENTITY window.title                     "Add-on Collector Settings">
+<!ENTITY window.title                     "Add-ons Collector Settings">
 
 <!-- Tabs -->
 <!ENTITY manage.label                     "Manage Subscriptions">
@@ -46,7 +46,7 @@
 <!ENTITY pub.label                        "Auto-publisher Settings">
 
 <!-- Manage Subscriptions -->
-<!ENTITY subscriptions.header             "Subscriptions:">
+<!ENTITY subscriptions.header             "Select a subscription:">
 
 <!-- Groupbox captions in Manage Subscriptions -->
 <!ENTITY frequency.label                  "Subscription Update Frequency">
@@ -59,9 +59,9 @@
 <!ENTITY addonsleadin.label               "Show">
 <!ENTITY addonsperpage.label              "add-ons per page">
 <!ENTITY updatesingle.label               "Update every:">
-<!ENTITY minutes.label                    "minute(s)">
-<!ENTITY hours.label                      "hour(s)">
-<!ENTITY days.label                       "day(s)">
+<!ENTITY minutes.label                    "Minute(s)">
+<!ENTITY hours.label                      "Hour(s)">
+<!ENTITY days.label                       "Day(s)">
 <!ENTITY autopublish.label                "Auto-publish installed add-ons to subscription">
 <!ENTITY notify.label                     "Show notifications">
 <!ENTITY applyall.label                   "Apply to all subscriptions">
@@ -75,12 +75,12 @@
 <!ENTITY subscriptions.label              "Default Subscription Settings">
 <!ENTITY data.label                       "Data Management">
 
-<!ENTITY updateall.label                  "Check subscriptions for updates every">
+<!ENTITY updateall.label                  "Check subscriptions for update every">
 <!ENTITY notifyglobal.label               "Notify me when my subscriptions have new add-ons">
 
 <!ENTITY clearemails.label                "Clear">
-<!ENTITY login.label                      "Log in">
-<!ENTITY logout.label                     "Log out">
+<!ENTITY login.label                      "Login">
+<!ENTITY logout.label                     "Logout">
 
 <!-- Auto-Publisher Settings -->
 
@@ -99,9 +99,6 @@
 
 <!ENTITY createauto.label                 "Create Auto-publisher">
 <!ENTITY deleteauto.label                 "Delete Auto-publisher">
-<!ENTITY updateauto.label                 "Update Auto-publisher">
-
-<!ENTITY onlypublishenabledaddons.label   "Only publish enabled add-ons">
 
 <!ENTITY misc.label                       "Miscellaneous">
 <!ENTITY allowincompatibleinstall.label   "Allow installation of incompatible add-ons from my subscriptions">
diff --git a/bandwagon/locale/en-US/settings.properties b/bandwagon/locale/en-US/settings.properties
index 3d53195..7d5f5cc 100644
--- a/bandwagon/locale/en-US/settings.properties
+++ b/bandwagon/locale/en-US/settings.properties
@@ -1,26 +1,14 @@
 add.collection=Add Subscription
 enter.url.to.add.collection=Enter the URL of the subscription you want to add.
 remove.collection=Remove Subscription
-# LOCALIZATION NOTE (are.you.sure.you.want.to.remove):
-# %S is the name of a collection
-are.you.sure.you.want.to.remove=Removing this subscription will also remove the collection from your favorites list. Are you sure you wish to remove '%S'?
-# LOCALIZATION NOTE (saved.emails.text):
-# %S is a number
+are.you.sure.you.want.to.remove=Are you sure you want to remove '%S' from your subscriptions?
 saved.emails.text=You have %S saved e-mail addresses
-# LOCALIZATION NOTE (login.status.with.email):
-# %S is a user's email address
 login.status.with.email=You are logged in as %S
 login.status=You are logged in
 logout.status=You are not logged in
-# LOCALIZATION NOTE (auto.invalid.name):
-# %S is the name of a collection
 auto.invalid.name=The collection name '%S' is not valid.
-auto.please.select.type=Please select at least one add-on type to automatically publish.
+auto.please.select.type=Please select at least one auto-publish type.
 auto.create.internal.error=The collection could not be created (an internal error occurred).
-auto.create.done=Your auto-publisher collection has been created.
+auto.create.done=Your auto-publish collection has been created.
 auto.delete.internal.error=The collection could not be deleted (an internal error occurred).
-auto.delete.done=Your auto-publisher collection has been deleted.
-auto.create.description=An automatically generated list of my installed add-ons
-auto.update.confirm.message=Your new settings will take effect immediately, but will not affect add-ons that have already been published.
-auto.update.internal.error=The collection could not be updated (an internal error occured).
-auto.update.done=Your auto-publisher collection has been updated.
+auto.delete.done=Your auto-publish collection has been deleted.
diff --git a/bandwagon/skin/extensionsOverlay.css b/bandwagon/skin/extensionsOverlay.css
index ece7f42..8294974 100644
--- a/bandwagon/skin/extensionsOverlay.css
+++ b/bandwagon/skin/extensionsOverlay.css
@@ -35,6 +35,20 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+radio#bandwagon-collections-view {
+  list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
+  -moz-image-region: rect(0px, 32px,  32px, 0px);
+}
+
+radio#bandwagon-collections-view:hover, radio#bandwagon-collections-view[selected="true"]  {
+  -moz-image-region: rect(0px, 32px,  32px, 0px);
+}
+
+radio[noimage="true"]#bandwagon-collections-view {
+  list-style-image: none;
+  -moz-image-region: rect(0 0 0 0);
+}
+
 #bandwagon-link-splitter {
   border-left: 1px solid #7A8490;
   border-right: 1px solid #FEFEFE;
@@ -69,18 +83,10 @@
   font-size: 150%;
 }
 
-#bandwagon-collections-notification {
-  padding-top: 0.5em;
-}
-
-#bandwagon-collection-description {
-  margin-bottom: 5px;
-}
-
 #bandwagon-collection-title,
-#bandwagon-collection-description {
-  margin-left: 10px;
-  margin-right: 10px;
+#bandwagon-collection-description,
+#bandwagon-collection-header {
+  background: -moz-dialog;
 }
 
 bandwagonCollection {
@@ -180,26 +186,7 @@ bandwagonAddonExpanded .icon {
 
 bandwagonAddon .name,
 bandwagonAddonExpanded .name {
-  font-size: 130%;
-}
-
-description[anonid="commentdesc"]
-{
-  font-style: italic;
-}
-
-label[anonid="dateadded"],
-label[anonid="addedby"]
-{
-  font-size: 90%;
-}
-
-bandwagonAddonExpanded .unindent {
-  margin-left: -1em;
-}
-
-bandwagonAddonExpanded .comments {
-  margin-top: 1em;
+  font-size: 110%;
 }
 
 .addonIcon {
@@ -233,6 +220,18 @@ bandwagonAddonExpanded .comments {
 }
 */
 
+#bandwagon-button-subscribe {
+  list-style-image: url("chrome://bandwagon/skin/images/plus.png");
+}
+
+#bandwagon-button-update-all {
+  list-style-image: url("chrome://bandwagon/skin/images/reload.png");
+}
+
+#bandwagon-button-settings {
+  list-style-image: url("chrome://bandwagon/skin/images/gear.png");
+}
+
 .publishButton,
 [anonid="addtofirefox"]
 {
@@ -251,7 +250,6 @@ bandwagonAddonExpanded .comments {
 .fs-info-panel
 {
   margin: 20px;
-  overflow: auto;
 }
 
 .fs-info-panel-header
@@ -266,11 +264,7 @@ bandwagonAddonExpanded .comments {
   margin-left: 0px;
 }
 
-.bold-text {
-  font-weight: bold;
-}
-
-.error-text {
-  color: red;
-  width: 20em;
+bandwagonCollection description[anonid="commentdesc"]
+{
+  font-style: italic;
 }
diff --git a/bandwagon/skin/images/icon32.png b/bandwagon/skin/images/icon32.png
index 6525a90..d2c471b 100644
--- a/bandwagon/skin/images/icon32.png
+++ b/bandwagon/skin/images/icon32.png
Binary files differ
diff --git a/bandwagon/skin/images/localautopub.png b/bandwagon/skin/images/localautopub.png
new file mode 100644
index 0000000..735104b
--- /dev/null
+++ b/bandwagon/skin/images/localautopub.png
Binary files differ
diff --git a/bandwagon/skin/images/star32.png b/bandwagon/skin/images/star32.png
new file mode 100644
index 0000000..378e27c
--- /dev/null
+++ b/bandwagon/skin/images/star32.png
Binary files differ
diff --git a/bandwagon/skin/settings.css b/bandwagon/skin/settings.css
index ae36c74..c9dc228 100644
--- a/bandwagon/skin/settings.css
+++ b/bandwagon/skin/settings.css
@@ -35,6 +35,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+radio[pane=paneManage] {
+  list-style-image: url("chrome://bandwagon/skin/images/star32.png");
+}
+
+radio[pane=paneGeneral] {
+  list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
+}
+
+radio[pane=paneAuto] {
+  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
+  -moz-image-region: rect(0px, 224px, 32px, 192px)
+}
+
 #collections-list {
   min-width: 10em;
   max-width: 10em;
@@ -53,10 +66,3 @@ prefwindow description {
 #auto-groupbox {
   border: none;
 }
-
-/* Hack so that bottom is not cut off for auto-pub error
-  https://bugzilla.mozilla.org/show_bug.cgi?id=394793
-*/
-prefpane > .content-box {
-  overflow: -moz-hidden-unscrollable;
-}
diff --git a/bin/build.py b/bin/build.py
index 7400d7f..b6ec82a 100755
--- a/bin/build.py
+++ b/bin/build.py
@@ -50,41 +50,6 @@ from subprocess import Popen, PIPE
 import xml.parsers.expat
 from tempfile import mkstemp
 
-MINIFY_PRODUCTS = {
-    'js': {
-        'js/__utm.min.js': [
-            { 'file':'js/__utm.js' }
-        ],
-        'js/jquery.addons.min.js': [
-            { 'file':'js/jquery-compressed.js' }, 
-            { 'file':'js/addons.js' }
-        ],
-        'js/amo2009/amo2009.min.js': [
-            # This list is repeated in site/app/views/layouts/amo2009.thtml
-            { 'file':'js/jquery-compressed.js' }, 
-            { 'file':'js/jquery.cookie.js' },
-            { 'file':'js/amo2009/global.js' },
-            { 'file':'js/amo2009/slimbox2.js' },
-            { 'file':'js/amo2009/addons.js' },
-            { 'file':'js/amo2009/global-mozilla.js' }
-        ]
-    },
-    'css': {
-        'css/style.min.css': [
-            { 'file':'css/type.css' },
-            { 'file':'css/color.css' },
-            { 'file':'css/screen.css', 'prefix':'@media screen, projection {', 'suffix':'}' },
-            { 'file':'css/print.css',  'prefix':'@media print {', 'suffix':'}' },
-        ],
-        'css/amo2009/style.min.css': [
-            { 'file':'css/amo2009/main.css' },
-            { 'file':'css/amo2009/slimbox2.css' },
-            { 'file':'css/amo2009/main-mozilla.css' },
-            { 'file':'css/amo2009/legacy.css' }
-        ]
-    }
-}
-
 # contants
 REVISIONS_PHP_TEMPLATE = """\
 <?php
@@ -153,19 +118,13 @@ class Minifier(object):
                 destName = tempfile[1]
             try:
                 for source in sourceNames:
-
-                    # source expected to be either a plain string, or a 
-                    # dict describing filename / prefix / suffix
-                    prefix = suffix = ''
-                    if type(source) != dict:
-                        sourceFileName = source
-                    else:
+                    try:
+                        prefix = source['prefix']
                         sourceFileName = source['file']
-                        if source.has_key('prefix'):
-                            prefix = source['prefix']
-                        if source.has_key('suffix'):
-                            suffix = source['suffix']
-
+                        suffix = source['suffix']
+                    except TypeError:
+                        prefix = suffix = ''
+                        sourceFileName = source
                     sourceFile = open(sourceFileName)
                     try:
                         destinationFile.write(prefix)
@@ -207,20 +166,20 @@ def updateRevisions():
     tree_rev = rp.getLatestRevision('https://svn.mozilla.org/addons/trunk/')
     print "Latest Tree Revision:", tree_rev
     
-    repo = 'https://svn.mozilla.org/addons/trunk/site/app/webroot/'
-    revs = {}
-    for rev_type in ('js', 'css'):
-        files = []
-        for fn, parts in MINIFY_PRODUCTS[rev_type].iteritems():
-            for part in parts:
-                files.append((type(part) == dict) and part['file'] or part)
-        revs[rev_type] = rp.getMaxRevision([ repo + file for file in files ])
-        print "%s Revision: %s" % (rev_type, revs[rev_type])
+    css_repo = 'https://svn.mozilla.org/addons/trunk/site/app/webroot/css/'
+    css_files = ['color.css', 'screen.css', 'type.css', 'print.css']
+    css_rev = rp.getMaxRevision([ css_repo + css_file for css_file in css_files ])
+    print "CSS Revision:", css_rev
+    
+    js_repo = 'https://svn.mozilla.org/addons/trunk/site/app/webroot/js/'
+    js_files = ['jquery-compressed.js', 'addons.js']
+    js_rev = rp.getMaxRevision([ js_repo + js_file for js_file in js_files ])
+    print "JS Revision:", js_rev
     
     revs_file = os.path.join(script_dir, '..', 'site', 'app', 'config', 'revisions.php')
     try:
         rf = open(revs_file, 'w')
-        rf.write(REVISIONS_PHP_TEMPLATE % (tree_rev, revs['css'], revs['js']))
+        rf.write(REVISIONS_PHP_TEMPLATE % (tree_rev, css_rev, js_rev))
         rf.close()
     except IOError, e:
         print "Error writing revision.php file:", e
@@ -231,31 +190,26 @@ def concatAndMinify():
     minifier = Minifier()
     
     webroot = os.path.join(script_dir, '..', 'site', 'app', 'webroot')
+    
+    print 'Concatenating JS'
+    js_files = ['jquery-compressed.js', 'addons.js']
+    js_concatenated = minifier.concatFiles(sourceNames=[ os.path.join(webroot, 'js', js_file) for js_file in js_files ])
+    print 'Minifying JS'
+    minifier.minify('js', os.path.join(webroot, 'js', '__utm.js'), os.path.join(webroot, 'js', '__utm.min.js'))
+    minifier.minify('js', js_concatenated, os.path.join(webroot, 'js', 'jquery.addons.min.js'))
+    os.remove(js_concatenated)
+    
+    print 'Concatenating CSS'
+    css_concatenated = minifier.concatFiles(sourceNames=[
+        os.path.join(webroot, 'css', 'type.css'),
+        os.path.join(webroot, 'css', 'color.css'),
+        {'prefix': "@media screen, projection {", 'file': os.path.join(webroot, 'css', 'screen.css'), 'suffix':'}'},
+        {'prefix': "@media print {", 'file': os.path.join(webroot, 'css', 'print.css'), 'suffix':'}'},
+        ])
+    print 'Minifying CSS'
+    minifier.minify('css', css_concatenated, os.path.join(webroot, 'css', 'style.min.css'))
+    os.remove(css_concatenated)
 
-    for product_type, products in MINIFY_PRODUCTS.iteritems():
-        for product_fn, product_parts in products.iteritems():
-
-            # Make the final product path absolute.
-            product_fn = os.path.join(webroot, *product_fn.split('/'))
-
-            # Make all product part file paths absolute.
-            abs_parts = []
-            for spec in product_parts:
-                spec['file'] = os.path.join(webroot, *spec['file'].split('/'))
-                abs_parts.append(spec)
-
-            # Concatenate all the product parts to a temp file.
-            print 'Concatenating %s (%s)' % (product_type, product_fn)
-            print "\n".join(["    * %s" % x['file'] for x in abs_parts])
-            concat_fn = minifier.concatFiles(sourceNames=abs_parts)
-
-            # Minify the temp file for product type, dump into final
-            # product path.
-            print 'Minifying %s (%s)' % (product_type, product_fn)
-            minifier.minify(product_type, concat_fn, product_fn)
-
-            # Clean up the intermediate temp file.
-            os.remove(concat_fn)
 
 def compilePo():
     """compile all .po files to Gettext .mo files"""
diff --git a/bin/check_stats.php b/bin/check_stats.php
index 0243c21..d3e1ea7 100644
--- a/bin/check_stats.php
+++ b/bin/check_stats.php
@@ -87,13 +87,13 @@ foreach ($addons as $addon_id => $addon_name) {
     // DOWNLOADS
     $date = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-2, date('Y')));
     // Does download count from 2 days ago exist?
-    $qry_2day = $db->read("SELECT count FROM download_counts WHERE date='{$date}' AND addon_id={$addon_id}");
+    $qry_2day = $db->query("SELECT count FROM download_counts WHERE date='{$date}' AND addon_id={$addon_id}");
     if (mysql_num_rows($qry_2day) > 0) {
         $count_2day = mysql_fetch_array($qry_2day);
         output('PASS', "[Downloads] Count from 2 days ago ({$date}) exists: {$count_2day['count']}", $addon_name);
         
         // Does that count have a 50% + or - difference from previous 2 counts?
-        $qry_last2 = $db->read("SELECT date, count FROM download_counts WHERE addon_id={$addon_id} AND date < '{$date}' ORDER BY date DESC LIMIT 2");
+        $qry_last2 = $db->query("SELECT date, count FROM download_counts WHERE addon_id={$addon_id} AND date < '{$date}' ORDER BY date DESC LIMIT 2");
         if (mysql_num_rows($qry_last2) > 0) {
             while ($row = mysql_fetch_array($qry_last2)) {
                 $change = ceil(abs(($count_2day['count'] - $row['count']) / $row['count']) * 100);
@@ -115,13 +115,13 @@ foreach ($addons as $addon_id => $addon_name) {
         $wed = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d')-3, date('Y')));
         
         // Does update ping count from wednesday exist?
-        $qry_wed = $db->read("SELECT count FROM update_counts WHERE date='{$wed}' AND addon_id={$addon_id}");
+        $qry_wed = $db->query("SELECT count FROM update_counts WHERE date='{$wed}' AND addon_id={$addon_id}");
         if (mysql_num_rows($qry_wed) > 0) {
             $count_wed = mysql_fetch_array($qry_wed);
             output('PASS', "[Update Pings] Count from Wednesday ({$wed}) exists: {$count_wed['count']}", $addon_name);
             
             // Does that count have a 50% + or - difference from previous 2 counts?
-            $qry_last2 = $db->read("SELECT date, count FROM update_counts WHERE addon_id={$addon_id} AND date < '{$wed}' ORDER BY date DESC LIMIT 2");
+            $qry_last2 = $db->query("SELECT date, count FROM update_counts WHERE addon_id={$addon_id} AND date < '{$wed}' ORDER BY date DESC LIMIT 2");
             if (mysql_num_rows($qry_last2) > 0) {
                 while ($row = mysql_fetch_array($qry_last2)) {
                     $change = ceil(abs(($count_wed['count'] - $row['count'])/ $row['count']) * 100);
diff --git a/bin/clean.sh b/bin/clean.sh
index a1ae6b3..8bcc058 100755
--- a/bin/clean.sh
+++ b/bin/clean.sh
@@ -13,11 +13,6 @@ rm -f webroot/js/jquery.addons.min.js
 
 rm -f webroot/css/style.min.css
 
-# Clean caches
-rm -rf tmp/cache/models/*
-rm -rf tmp/cache/persistent/*
-rm -rf tmp/cache/views/*
-
 # Remove all .mo files
 #   Not doing this probably wouldn't cause a conflict, but better to be safe
 find locale/ -name *.mo -exec rm -f {} \;
diff --git a/bin/compatibility_report.php b/bin/compatibility_report.php
index 3b6128f..90ed55c 100644
--- a/bin/compatibility_report.php
+++ b/bin/compatibility_report.php
@@ -67,12 +67,12 @@ function compatibleVersions($compatibility_version) {
 }
 
 // Get latest update pings date
-$date_qry = $db->read("SELECT date FROM update_counts ORDER BY date DESC LIMIT 1");
+$date_qry = $db->query("SELECT date FROM update_counts ORDER BY date DESC LIMIT 1");
 $date_array = mysql_fetch_assoc($date_qry);
 $latest_date = $date_array['date'];
 
 // Get all add-ons with Firefox compatibility ordered by active users descending
-$addon_qry = $db->read("
+$addon_qry = $db->query("
             SELECT
                 addons.id,
                 translations.localized_string AS name,
@@ -150,7 +150,7 @@ foreach ($compatibility_versions as $compatibility_version) {
         )
     );
 
-    $versions_qry = $db->read("SELECT id, version
+    $versions_qry = $db->query("SELECT id, version
                                 FROM appversions
                                 WHERE application_id = ".APP_FIREFOX." AND
                                       (".compatibleVersions($compatibility_version).")
diff --git a/bin/database.class.php b/bin/database.class.php
index c83e72c..a3cc442 100644
--- a/bin/database.class.php
+++ b/bin/database.class.php
@@ -93,20 +93,6 @@ class Database {
         mysql_select_db($database, $this->write) or die("Could not select writable database {$database}");
     }
 
-    /**
-     * Runs the query against the slave db, so you should only do reads here.
-     */
-    function read($q) {
-        return $this->query($q);
-    }
-
-    /**
-     * Runs the query against the master db, which is where we want our writes.
-     */
-    function write($q) {
-        return $this->query($q, true);
-    }
-
    /**
     * Performs query using read-only database by default
     * 
@@ -121,13 +107,13 @@ class Database {
         
         return $result;
     }
-
+    
    /**
     * Sets the stats_updating config value to prevent the Stats Dashboard from
     * showing inaccurate data while a script is running.
     */
     function lockStats() {
-        if ($this->write("UPDATE `config` SET `value`='1' WHERE `key`='stats_updating'"))
+        if ($this->query("UPDATE `config` SET `value`='1' WHERE `key`='stats_updating'", true))
             return true;
         else
             return false;
@@ -138,7 +124,7 @@ class Database {
     * again
     */
     function unlockStats() {
-        if ($this->write("UPDATE `config` SET `value`='0' WHERE `key`='stats_updating'"))
+        if ($this->query("UPDATE `config` SET `value`='0' WHERE `key`='stats_updating'", true))
             return true;
         else
             return false;
diff --git a/bin/maintenance.php b/bin/maintenance.php
index 293249d..674abe4 100755
--- a/bin/maintenance.php
+++ b/bin/maintenance.php
@@ -65,11 +65,6 @@ if (isset($_SERVER['HTTP_HOST'])) {
 
 require_once('database.class.php');
 
-/**
- * If you want to change some data, use $db->write.  It talks to the master db.
- * If you're just reading, use $db->read.  It talks to a slave.
- */
-
 
 /**
  *  * Get time as a float.
@@ -98,20 +93,11 @@ switch ($action) {
     case 'weekly':
         // Lock stats dashboard
         $db->lockStats();
-
-        $seven_day_counts = array();
-
-        $addons_sql = "SELECT id FROM addons";
-        echo "Retrieving all add-on ids...\n";
-        $addons_result = $db->read($addons_sql);
         
-        $affected_rows = mysql_num_rows($addons_result);
-    
-        if ($affected_rows > 0 ) {
-            while ($row = mysql_fetch_array($addons_result)) {
-                $seven_day_counts[$row['id']] = 0;
-            }
-        }
+        // Reset all weekly counts
+        $reset_sql = "UPDATE addons SET weeklydownloads = 0";
+        echo "Resetting all weekly add-on counts to 0...\n";
+        $reset_result = $db->query($reset_sql, true);
         
         // Get 7 day counts from the download table.
         $seven_day_count_sql = "
@@ -129,11 +115,12 @@ switch ($action) {
         ";
 
         echo 'Retrieving seven-day counts from `download_counts` ...'."\n";
-        $seven_day_count_result = $db->read($seven_day_count_sql);
+        $seven_day_count_result = $db->query($seven_day_count_sql);
 
         $affected_rows = mysql_num_rows($seven_day_count_result);
     
         if ($affected_rows > 0 ) {
+            $seven_day_counts = array();
             while ($row = mysql_fetch_array($seven_day_count_result)) {
                 $seven_day_counts[$row['addon_id']] = ($row['seven_day_count']>0) ? $row['seven_day_count'] : 0;
             }
@@ -146,7 +133,7 @@ switch ($action) {
                 ";
 
                 $seven_day_count_update_result =
-                $db->write($seven_day_count_update_sql);
+                $db->query($seven_day_count_update_sql, true);
             }
         }
         
@@ -175,7 +162,7 @@ switch ($action) {
         ";
 
         echo 'Retrieving total counts from `download_counts` ...'."\n";
-        $total_count_result = $db->read($total_count_sql);
+        $total_count_result = $db->query($total_count_sql);
 
         $affected_rows = mysql_num_rows($total_count_result);
     
@@ -191,7 +178,7 @@ switch ($action) {
                 ";
 
                 $total_count_update_result =
-                $db->write($total_count_update_sql);
+                $db->query($total_count_update_sql, true);
             }
         }
         
@@ -227,7 +214,7 @@ switch ($action) {
             WHERE
                 `expires` < DATE_SUB(CURDATE(), INTERVAL 2 DAY)
         ";
-        $session_result = $db->write($session_sql);
+        $session_result = $db->query($session_sql, true);
 
         $affected_rows += mysql_affected_rows($db->write);
 
@@ -255,7 +242,7 @@ switch ($action) {
         ";
 
         // Get file names and IDs of all files to copy.
-        $files_result = $db->read($files_sql);
+        $files_result = $db->query($files_sql);
     
         $affected_rows = 0;
 
@@ -292,9 +279,9 @@ switch ($action) {
             ) AS c ON (a.id = c.addon_id)
             SET a.totalreviews = c.count
         ";
-        $reviews_result = $db->write($reviews_sql);
+        $reviews_result = $db->query($reviews_sql);
 
-        $affected_rows = mysql_affected_rows();
+        $affected_rows = $reviews_result;
 
     break;
 
@@ -319,11 +306,11 @@ switch ($action) {
             ) AS c ON (a.id = c.addon_id)
             SET a.averagerating = ROUND(c.avg_rating, 2)
         ";
-        $rating_result = $db->write($rating_sql);
+        $rating_result = $db->query($rating_sql);
 
         echo 'Updating bayesian ratings...'."\n";
         // get average review count and average rating
-        $rows = $db->read("
+        $rows = $db->query("
             SELECT AVG(a.cnt) AS avg_cnt 
             FROM (
                 SELECT COUNT(*) AS cnt
@@ -337,7 +324,7 @@ switch ($action) {
         $row = mysql_fetch_array($rows);
         $avg_num_votes = $row['avg_cnt'];
         
-        $rows = $db->read("
+        $rows = $db->query("
             SELECT AVG(a.addon_rating) AS avg_rating 
             FROM (
                 SELECT AVG(rating) AS addon_rating
@@ -360,7 +347,7 @@ switch ($action) {
                     ({$avg_num_votes} + a.totalreviews)
                 ), 0)
         ";
-        $rating_result = $db->write($rating_sql);
+        $rating_result = $db->query($rating_sql);
 
         $affected_rows = mysql_affected_rows();
 
@@ -374,29 +361,13 @@ switch ($action) {
     case 'unconfirmed':
         echo "Removing user accounts that haven't been confirmed for two weeks...\n";
         $unconfirmed_sql = "
-            DELETE users
+            DELETE IGNORE 
             FROM users
-            LEFT JOIN addons_users on users.id = addons_users.user_id
             WHERE created < DATE_SUB(CURDATE(), INTERVAL 2 WEEK)
-            AND confirmationcode != ''
-            AND addons_users.user_id IS NULL
-        ";
-        $res = $db->write($unconfirmed_sql);
-
-        $affected_rows = mysql_affected_rows();
-    break;
-
+                AND confirmationcode != '';
+        "; // using IGNORE keyword in order to not delete users who are referenced anywhere
+        $res = $db->query($unconfirmed_sql);
 
-
-    /**
-     * Delete password reset codes that have expired.
-     */
-    case 'expired_resetcode':
-        echo "Removing reset codes that have expired...\n";
-        $db->write("UPDATE users
-                    SET resetcode=DEFAULT,
-                        resetcode_expires=DEFAULT
-                    WHERE resetcode_expires < NOW()");
         $affected_rows = mysql_affected_rows();
     break;
 
@@ -424,7 +395,7 @@ switch ($action) {
             SET
                 ac.downloads = j.sum
         ";
-        $db->write($addons_collections_total);
+        $db->query($addons_collections_sql);
         $affected_rows = mysql_affected_rows();
     break;
 
@@ -450,119 +421,12 @@ switch ($action) {
             SET
                 c.downloads = j.sum
         ";
-        $db->write($collections_sql);
+        $db->query($collections_sql);
         $affected_rows = mysql_affected_rows();
     break;
 
 
 
-
-    /**
-     * Update tag counts for sidebar navigation
-     */
-    case 'tag_totals':
-        echo "Starting tag counts update...\n";
-        // HACK: Wish I had $valid_status from constants.php
-        $valid_status = join(',', array(1, 2, 3, 4));
-        // Modified query inspired by countAddonsInAllCategories()
-        // in site/app/models/addon.php
-        $tag_counts_sql = "
-            UPDATE 
-                tags AS t 
-            INNER JOIN ( 
-                SELECT 
-                    at.tag_id, 
-                    COUNT(DISTINCT Addon.id) AS ct
-                FROM 
-                    addons AS Addon 
-                INNER JOIN versions AS Version 
-                    ON (Addon.id = Version.addon_id)
-                INNER JOIN applications_versions AS av 
-                    ON (av.version_id = Version.id)
-                INNER JOIN addons_tags AS at 
-                    ON (at.addon_id = Addon.id)
-                INNER JOIN files AS File 
-                    ON (Version.id = File.version_id 
-                        AND File.status IN ({$valid_status})) 
-                WHERE 
-                    Addon.status IN ({$valid_status}) 
-                        AND Addon.inactive = 0
-                GROUP BY at.tag_id
-            ) AS j ON (t.id = j.tag_id)
-            SET 
-                t.count = j.ct
-        ";
-        $db->write($tag_counts_sql);
-        $affected_rows = mysql_affected_rows();
-    break;
-
-        
-
-
-    /**
-     * Update global stats counters
-     */
-    case 'global_stats':
-        echo "Starting global stats update...\n";
-        $affected_rows = 0;
-        $db->write("
-            REPLACE INTO global_stats 
-                (name, count, modified) 
-                VALUES 
-                ('addons_downloaded', (
-                    SELECT SUM(count) 
-                    FROM download_counts 
-                ), now())
-        ");
-        $affected_rows += mysql_affected_rows();
-        $db->write("
-            REPLACE INTO global_stats 
-                (name, count, modified) 
-                VALUES 
-                ('addons_in_use', ( 
-                    SELECT SUM(count) 
-                    FROM update_counts 
-                    WHERE date > ((SELECT MAX(date) FROM update_counts) - INTERVAL 1 DAY)  
-                ), now())
-        ");
-        $affected_rows += mysql_affected_rows();
-    break;
-
-
-
-    /**
-     * Collection weekly and monthly subscriber counts
-     */
-    case 'collection_subscribers':
-        echo "Starting collection subscriber update...\n";
-        // Clear out existing data.
-        $db->write("UPDATE collections
-                    SET weekly_subscribers = 0, monthly_subscribers = 0");
-        $woohoo = "
-            UPDATE collections AS c
-            INNER JOIN (
-                SELECT
-                    COUNT(collection_id) AS count,
-                    collection_id
-                FROM collection_subscriptions
-                WHERE created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-                GROUP BY collection_id
-            ) AS weekly ON (c.id = weekly.collection_id)
-            INNER JOIN (
-                SELECT
-                    COUNT(collection_id) AS count,
-                    collection_id
-                FROM collection_subscriptions
-                WHERE created >= DATE_SUB(CURDATE(), INTERVAL 31 DAY)
-                GROUP BY collection_id
-            ) AS monthly ON (c.id = monthly.collection_id)
-            SET c.weekly_subscribers = weekly.count,
-                c.monthly_subscribers = monthly.count
-        ";
-        $result = $db->write($woohoo);
-        $affected_rows = mysql_affected_rows();
-    break;
-
     /**
      * Unknown command.
      */
diff --git a/bin/parse_logs/count_downloads.class.php b/bin/parse_logs/count_downloads.class.php
index 9274654..f1e43f1 100644
--- a/bin/parse_logs/count_downloads.class.php
+++ b/bin/parse_logs/count_downloads.class.php
@@ -86,7 +86,7 @@ class Count_Downloads {
             }
             $_addon_ids = $details['addon_ids'];
         } elseif (!empty($details['fileid'])) {
-            $addon_id_result = $this->db->read("SELECT versions.addon_id FROM files LEFT JOIN versions ON files.version_id = versions.id WHERE files.id={$details['fileid']}");
+            $addon_id_result = $this->db->query("SELECT versions.addon_id FROM files LEFT JOIN versions ON files.version_id = versions.id WHERE files.id={$details['fileid']}");
             $addon_id = mysql_fetch_array($addon_id_result);
 
             if (!empty($addon_id['addon_id'])) {
@@ -165,22 +165,22 @@ class Count_Downloads {
     function logfileParsedCallback() {
         // update total downloads
         foreach ( $this->counts['totdown'] as $id => $ct ) {
-            $this->db->write("UPDATE addons SET totaldownloads=totaldownloads+{$ct} WHERE id={$id}");
+            $this->db->query("UPDATE addons SET totaldownloads=totaldownloads+{$ct} WHERE id={$id}", true);
         }
 
         // now the dailies
         foreach ( $this->counts['perday'] as $id => $days ) {
             foreach ( $days as $day => $ct ) {
-                    $this->db->write("INSERT INTO download_counts(addon_id, count, date) VALUES({$id}, {$ct}, '{$day}') 
-                                      ON DUPLICATE KEY UPDATE count=count+{$ct}");
+                    $this->db->query("INSERT INTO download_counts(addon_id, count, date) VALUES({$id}, {$ct}, '{$day}') 
+                                      ON DUPLICATE KEY UPDATE count=count+{$ct}", true);
             }
         }
 
         // now the collections
         foreach ( $this->counts['collections_and_addons'] as $collection_id => $details) {
-            $this->db->write("UPDATE collections SET downloads = downloads + {$details['total']} WHERE id={$collection_id} LIMIT 1");
+            $this->db->query("UPDATE collections SET downloads = downloads + {$details['total']} WHERE id={$collection_id} LIMIT 1", true);
             foreach ($details['addon_ids'] as $addon_id => $count ) {
-                $this->db->write("UPDATE addons_collections SET downloads = downloads + {$count} WHERE addon_id={$addon_id} AND collection_id={$collection_id} LIMIT 1");
+                $this->db->query("UPDATE addons_collections SET downloads = downloads + {$count} WHERE addon_id={$addon_id} AND collection_id={$collection_id} LIMIT 1", true);
             }
         }
 
diff --git a/bin/parse_logs/count_update_pings.class.php b/bin/parse_logs/count_update_pings.class.php
index e7b1f66..b9dd642 100644
--- a/bin/parse_logs/count_update_pings.class.php
+++ b/bin/parse_logs/count_update_pings.class.php
@@ -62,7 +62,7 @@ class Count_Update_Pings {
     * Pulls all GUIDs and add-on IDs from database for quick lookup
     */
     function cacheGUIDs() {
-        $guid_query = $this->db->read("SELECT id, guid FROM addons");
+        $guid_query = $this->db->query("SELECT id, guid FROM addons");
         while ($guid_row = mysql_fetch_array($guid_query)) {
             $guids[$guid_row['guid']] = $guid_row['id'];
         }
@@ -148,14 +148,14 @@ class Count_Update_Pings {
             echo "\n[UpdatePingCounter] WRITING COUNTS TO DATABASE...\n";
             foreach ($this->counts as $date => $addons) {
                 foreach ($addons as $addon_id => $counts) {
-                    $existing_entry_qry = $this->db->read("SELECT * FROM update_counts WHERE addon_id='{$addon_id}' AND date='{$date}'");
+                    $existing_entry_qry = $this->db->query("SELECT * FROM update_counts WHERE addon_id='{$addon_id}' AND date='{$date}'", true);
                     $existing_result = mysql_fetch_array($existing_entry_qry);
                     
                     // If row does not exist for date and add-on, insert new row
                     if (empty($existing_result)) {
                         $counts = $this->serializeCounts($counts);
                         
-                        $this->db->write("
+                        $this->db->query("
                             INSERT INTO update_counts (
                                 addon_id,
                                 count,
@@ -172,7 +172,7 @@ class Count_Update_Pings {
                                 '{$counts['app']}',
                                 '{$counts['os']}',
                                 '{$date}'
-                            )");
+                            )", true);
                         
                         outputIfVerbose("[UpdatePingCounter] Created record for: {$date} / {$addon_id}");
                     }
@@ -180,7 +180,7 @@ class Count_Update_Pings {
                     else {
                         $counts = $this->unserializeAndTotalCounts($counts, $existing_result);
                         
-                        $this->db->write("
+                        $this->db->query("
                             UPDATE update_counts
                             SET
                                 count = {$counts['total']},
@@ -191,7 +191,7 @@ class Count_Update_Pings {
                             WHERE
                                 addon_id='{$addon_id}' AND
                                 date='{$date}'
-                            ");
+                            ", true);
                         
                         outputIfVerbose("[UpdatePingCounter] Updated record for: {$date} / {$addon_id}");
                     }
diff --git a/bin/parse_logs/log_parser.class.php b/bin/parse_logs/log_parser.class.php
index 271a6b9..b0845dd 100644
--- a/bin/parse_logs/log_parser.class.php
+++ b/bin/parse_logs/log_parser.class.php
@@ -89,7 +89,7 @@ class Log_Parser {
         
         $this->db =& new Database();
         
-        $this->db->write("SET wait_timeout=28800");
+        $this->db->query("SET wait_timeout=28800");
         
         if ($parseType == 'downloads' || $parseType == 'collections') {
             $this->counter =& new Count_Downloads($this->db);
@@ -116,14 +116,14 @@ class Log_Parser {
         if (!empty($loglist)) {
             foreach ($loglist as $logfile) {
                 if (!empty($logfile)) {
-                    $logfile_query = $this->db->read("SELECT * FROM logs_parsed WHERE name='".mysql_real_escape_string(basename($logfile))."' AND geo='".mysql_real_escape_string($this->geo)."'");
+                    $logfile_query = $this->db->query("SELECT * FROM logs_parsed WHERE name='".mysql_real_escape_string(basename($logfile))."' AND geo='".mysql_real_escape_string($this->geo)."'");
                     $logfile_result = mysql_fetch_array($logfile_query);
                     
                     if ($logfile_result["{$this->type}_done"] == 1)
                         echo basename($logfile)." has already been parsed for {$this->geo}!\n";
                     else {
                         if (empty($logfile_result))
-                            $this->db->write("INSERT INTO logs_parsed (name, geo) VALUES('".mysql_real_escape_string(basename($logfile))."', '".mysql_real_escape_string($this->geo)."')");
+                            $this->db->query("INSERT INTO logs_parsed (name, geo) VALUES('".mysql_real_escape_string(basename($logfile))."', '".mysql_real_escape_string($this->geo)."')", true);
                         
                         $this->parse($logfile);
                     }
@@ -184,7 +184,7 @@ class Log_Parser {
         $this->counter->logfileParsedCallback();
         
         // Mark file as finished parsing
-        $this->db->write("UPDATE logs_parsed SET {$this->type}_done=1 WHERE name='".mysql_real_escape_string(basename($logfile))."' AND geo='".mysql_real_escape_string($this->geo)."'");
+        $this->db->query("UPDATE logs_parsed SET {$this->type}_done=1 WHERE name='".mysql_real_escape_string(basename($logfile))."' AND geo='".mysql_real_escape_string($this->geo)."'", true);
         
         fclose($fp);
         
diff --git a/bin/run_once/calculate_undated_totals.php b/bin/run_once/calculate_undated_totals.php
index 8f33d8e..052d96a 100644
--- a/bin/run_once/calculate_undated_totals.php
+++ b/bin/run_once/calculate_undated_totals.php
@@ -47,17 +47,17 @@ require_once('../database.class.php');
 
 $db = new Database();
 
-$addon_qry = $db->read("SELECT id, totaldownloads FROM addons");
+$addon_qry = $db->query("SELECT id, totaldownloads FROM addons");
 
 while ($addon = mysql_fetch_array($addon_qry)) {
     echo "# [Add-on {$addon['id']}]";
-    $sum_qry = $db->read("SELECT SUM(count) FROM download_counts WHERE addon_id={$addon['id']} AND date != '0000-00-00'");
+    $sum_qry = $db->query("SELECT SUM(count) FROM download_counts WHERE addon_id={$addon['id']} AND date != '0000-00-00'");
     $sum = mysql_fetch_array($sum_qry);
     if ($sum[0] > 0) {
         $undated = $addon['totaldownloads'] - $sum[0];
         echo " {$addon['totaldownloads']} total - {$sum[0]} dated = {$undated} undated";
         if ($undated > 0) {
-            //$db->write("INSERT INTO download_counts (addon_id, count, date) VALUES({$addon['id']}, $undated, '0000-00-00')");
+            //$db->query("INSERT INTO download_counts (addon_id, count, date) VALUES({$addon['id']}, $undated, '0000-00-00')", true);
             echo "\nINSERT INTO download_counts (addon_id, count, date) VALUES({$addon['id']}, $undated, '0000-00-00');"; 
         }
     }
diff --git a/bin/run_once/combine_daily_downloads.php b/bin/run_once/combine_daily_downloads.php
index 34d9fa4..a66b0ea 100644
--- a/bin/run_once/combine_daily_downloads.php
+++ b/bin/run_once/combine_daily_downloads.php
@@ -47,19 +47,19 @@ require_once('../database.class.php');
 
 $db = new Database();
 
-$addon_qry = $db->read("SELECT id FROM addons");
+$addon_qry = $db->query("SELECT id FROM addons");
 
 while ($addon = mysql_fetch_array($addon_qry)) {
     echo "[Add-on {$addon['id']}]";
-    $count_qry = $db->read("SELECT COUNT(*), date FROM download_counts WHERE addon_id={$addon['id']} GROUP BY date");
+    $count_qry = $db->query("SELECT COUNT(*), date FROM download_counts WHERE addon_id={$addon['id']} GROUP BY date");
     while ($count = mysql_fetch_array($count_qry)) {
         if ($count[0] > 1) {
             echo " ... {$count['date']} has {$count[0]} rows";
-            $sum_qry = $db->read("SELECT SUM(count) FROM download_counts WHERE addon_id={$addon['id']} AND date='{$count['date']}'");
+            $sum_qry = $db->query("SELECT SUM(count) FROM download_counts WHERE addon_id={$addon['id']} AND date='{$count['date']}'");
             $sum = mysql_fetch_array($sum_qry);
             
-            $db->write("DELETE FROM download_counts WHERE addon_id={$addon['id']} AND date='{$count['date']}'");
-            $db->write("INSERT INTO download_counts (addon_id, count, date) VALUES({$addon['id']}, $sum[0], '{$count['date']}')");
+            $db->query("DELETE FROM download_counts WHERE addon_id={$addon['id']} AND date='{$count['date']}'", true);
+            $db->query("INSERT INTO download_counts (addon_id, count, date) VALUES({$addon['id']}, $sum[0], '{$count['date']}')", true);
             echo " - deleted rows and updated count to {$sum[0]}";
         }
     }
diff --git a/bin/run_once/delete_duplicate_daily_downloads.php b/bin/run_once/delete_duplicate_daily_downloads.php
index 136c8ea..5a8f771 100644
--- a/bin/run_once/delete_duplicate_daily_downloads.php
+++ b/bin/run_once/delete_duplicate_daily_downloads.php
@@ -48,7 +48,7 @@ require_once('../database.class.php');
 
 $db = new Database();
 
-$addon_qry = $db->read("SELECT id FROM addons");
+$addon_qry = $db->query("SELECT id FROM addons");
 
 $dates = array(
     '2008-09-23',
@@ -63,11 +63,11 @@ while ($addon = mysql_fetch_array($addon_qry)) {
 
     foreach ($dates as $date) {
         echo "[{$date} Add-on {$addon['id']}]";
-        $count_qry = $db->read("SELECT count(*), MIN(id) FROM download_counts WHERE addon_id={$addon['id']} AND date='{$date}'");
+        $count_qry = $db->query("SELECT count(*), MIN(id) FROM download_counts WHERE addon_id={$addon['id']} AND date='{$date}'");
         $count = mysql_fetch_array($count_qry);
         if ($count[0] > 1) {
             echo " ... {$date} has {$count[0]} rows on {$date}";
-            $db->write("DELETE FROM download_counts WHERE id > {$count[1]} AND addon_id={$addon['id']} AND date='{$date}'");
+            $db->query("DELETE FROM download_counts WHERE id > {$count[1]} AND addon_id={$addon['id']} AND date='{$date}'", true);
             echo " - deleted duplicate rows";
         } else {
             echo " - is OK"; 
diff --git a/bin/run_once/fix_entities.php b/bin/run_once/fix_entities.php
index 75e0e29..025ff3e 100644
--- a/bin/run_once/fix_entities.php
+++ b/bin/run_once/fix_entities.php
@@ -47,7 +47,7 @@ require_once('../database.class.php');
 
 $db = new Database();
 
-$_translations = $db->read("SELECT * FROM translations WHERE localized_string LIKE '%&amp;%'");
+$_translations = $db->query("SELECT * FROM translations WHERE localized_string LIKE '%&amp;%'");
 
 while ($translation = mysql_fetch_array($_translations)) {
     echo "[Translation {$translation['id']} ({$translation['locale']})]";
@@ -72,7 +72,7 @@ while ($translation = mysql_fetch_array($_translations)) {
         echo "Query would be: [{$qry}]";
     }
     else {
-        $db->write($qry);
+        $db->query($qry, true);
         echo "Query run.";
     }
 
diff --git a/bin/update-hashes.php b/bin/update-hashes.php
index f7300d5..5d05833 100644
--- a/bin/update-hashes.php
+++ b/bin/update-hashes.php
@@ -85,7 +85,7 @@ $fileQry_sql = "SELECT
                 WHERE
                    translations.locale='en-US'";
 
-$fileQry_result = $db->read($fileQry_sql);
+$fileQry_result = $db->query($fileQry_sql);
 
 while ($fileInfo = mysql_fetch_array($fileQry_result)) {
 
@@ -99,7 +99,7 @@ while ($fileInfo = mysql_fetch_array($fileQry_result)) {
         echo "{$fileInfo['name']} {$fileInfo['version']} (file {$fileInfo['file_id']}): ";
         if ('sha256:'.$hash != $fileInfo['hash'] || $size != $fileInfo['size']) {
             $hash_update_sql = "UPDATE files SET hash='sha256:{$hash}', size='{$size}' WHERE id={$fileInfo['file_id']}";
-            $hash_update_result = $db->write($hash_update_sql);
+            $hash_update_result = $db->query($hash_update_sql, true);
 
             if ('sha256:'.$hash != $fileInfo['hash']) {
                 echo "HASH - new: sha256:{$hash}; old: {$fileInfo['hash']}";
diff --git a/bin/update-search-views.php b/bin/update-search-views.php
index f1ef504..c867123 100644
--- a/bin/update-search-views.php
+++ b/bin/update-search-views.php
@@ -81,9 +81,9 @@ $sql_commands[] = "INSERT INTO `text_search_summary`
                        a.inactive AS inactive, 
                        a.averagerating AS averagerating, 
                        a.weeklydownloads AS weeklydownloads,
-                       `tr_name`.localized_string AS name, 
-                       `tr_summary`.localized_string AS summary, 
-                       `tr_description`.localized_string AS description
+                       CONCAT(`tr_name`.localized_string, '_') AS name, 
+                       CONCAT(`tr_summary`.localized_string, '_') AS summary, 
+                       CONCAT(`tr_description`.localized_string, '_') AS description
                    FROM addons AS a 
                    LEFT JOIN translations AS `tr_name` ON (`tr_name`.id = a.`name`) 
                    LEFT JOIN translations AS `tr_summary` ON (`tr_summary`.id = a.`summary` AND  `tr_name`.locale = `tr_summary`.locale) 
@@ -120,23 +120,6 @@ $sql_commands[] = "INSERT INTO `versions_summary`
 
 $sql_commands[] = "DROP TABLE  `most_recent_version`";
 
-$sql_commands[] = "DELETE FROM `collections_search_summary`";
-
-$sql_commands[] = "INSERT INTO `collections_search_summary`
-                   SELECT  `c`.`id` AS `id`, 
-                       `tr_name`.`locale` AS `locale`,  
-                       `tr_name`.`localized_string` AS `name`, 
-                       `tr_description`.`localized_string` AS `description`
-                   FROM `collections` AS `c` 
-                   LEFT JOIN `translations` AS `tr_name` ON (`tr_name`.`id` = `c`.`name`) 
-                   LEFT JOIN `translations` AS `tr_description` 
-	                       ON (`tr_description`.`id` = `c`.`description` AND  `tr_name`.`locale` = `tr_description`.`locale`)
-                   WHERE `tr_name`.`locale` IS NOT NULL AND (
-                       `tr_name`.`localized_string` IS NOT NULL 
-                       OR `tr_description`.`localized_string` IS NOT NULL
-                   ) 
-                   ORDER BY `c`.`id` ASC, `locale` DESC";
-
 $sql_commands[] = "COMMIT";
 
 // Connect to our database and execute the command list above.
diff --git a/site/app/app_controller.php b/site/app/app_controller.php
index 964e55b..8eb6d90 100644
--- a/site/app/app_controller.php
+++ b/site/app/app_controller.php
@@ -46,7 +46,7 @@ class AppController extends Controller
     // allow named arguments, default on
     var $namedArgs = true;
     var $argSeparator = ":";
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', 'checkAdvancedSearch');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs');
 
     /**
      * Used to determine the current security level for the class
@@ -70,11 +70,6 @@ class AppController extends Controller
             // if it actually helps.  voodoo++
             if (array_key_exists('X-Amo-Test', getallheaders())){
                 DATABASE_CONFIG::useTestConfig();
-                // In downloads_controller.test we check that the returned
-                // content matches a file on disk.  If we're appending query
-                // logs and microtime to the page, those aren't going to match.
-                Configure::getInstance()->debug = 0;
-                define('NO_MICROTIME', 1);
             }
         }
         $this->setSecurityLevel($this->securityLevel);
@@ -83,6 +78,7 @@ class AppController extends Controller
     function startup() {
         $this->SimpleAuth->startup($this);
         $this->SimpleAcl->startup($this);
+
     }
 
     /**
@@ -133,20 +129,6 @@ class AppController extends Controller
     }
     
     /**
-     * Checks for 'advancedsearch=true' in url to show advanced search (non-js fallback)
-     */
-    function checkAdvancedSearch() {
-        $advancedSearch = false;
-
-        if(isset($this->params['url']['advancedsearch']) && $this->params['url']['advancedsearch'] == 1) {
-            $advancedSearch = true;
-        }
-        
-        $this->set('advancedSearch', $advancedSearch);
-        return true;
-    }
-    
-    /**
      * locale-aware redirect function
      */
     function redirect($url, $status = null, $addLocale = true, $addApp = true) {
@@ -276,7 +258,6 @@ class AppController extends Controller
         if (!isset($_POST['sessionCheck']) ||
             ($_POST['sessionCheck'] != $currentMd5 && $_POST['sessionCheck'] != $previousMd5)) {
             
-            header('HTTP/1.1 400 Bad Request');
             $this->flash( _('error_formerrors'), '/' , 3); //error string is a little non-informative
             exit();
         } 
@@ -348,20 +329,6 @@ class AppController extends Controller
        $this->set('AmoVersions', $this->Amo->getApplicationVersions());
        $this->set('AmoPlatforms', $this->Platform->getNames());
        $this->set('AmoAddonTypes', $this->Addontype->getNames());
-        
-        // User name for Welcome message
-        if ($session = $this->Session->read('User')) {
-            if (!empty($session['firstname']))
-                $welcomeName = $session['firstname'];
-            elseif (!empty($session['nickname']))
-                $welcomeName = $session['nickname'];
-            elseif (!empty($session['lastname']))
-                $welcomeName = $session['lastname'];
-            else
-                $welcomeName = '';
-            
-            $this->publish('welcomeName', $welcomeName);
-        }
 
         if (isset($this->data))
             $this->_sanitizeArray($this->data, false);
diff --git a/site/app/app_model.php b/site/app/app_model.php
index 0ff9958..7375d5f 100644
--- a/site/app/app_model.php
+++ b/site/app/app_model.php
@@ -57,7 +57,7 @@ class AppModel extends Model
         }
         return parent::__construct($id, $table, $ds);
     }
-
+    
     /**
      * This function will dynamically join translations into the current find operation,
      * according to whichever fields it finds in $this->translated_fields.
@@ -70,29 +70,23 @@ class AppModel extends Model
 
         // Tell the user they are bad because they don't have a model name.
         if (!isset($this->name)) {
-            trigger_error('No model name was found for class: '.$get_class($this).'.', E_NOTICE);
+            trigger_error('No model name was found for class: '.$get_class($this).'.', E_NOTICE); 
         }
-
+    
         if (!$this->translate) return true; // don't do anything if translation was deactivated
-
+        
         // This will build a finderQuery for the translations, and bind our current model to the translations table on the fly
         if (isset($this->translated_fields) && is_array($this->translated_fields)) {
-
+            
             // Allow querying for a locale other than currently set
             $lang = $this->getLang();
 
-            // fallback language is usually English. Some models have special
-            // fallback options, however, so we are handling them here.
-            switch ($this->name) {
-            case 'Addon':
+            // fallback language is usually English. If we are selecting addons however,
+            // we fall back to what's defined for that addon.
+            if ($this->name == 'Addon') {
                 $fb_locale = '`Addon`.`defaultlocale`';
-                break;
-            case 'Collection':
-                $fb_locale = '`Collection`.`defaultlocale`';
-                break;
-            default:
+            } else {
                 $fb_locale = "'en-US'";
-                break;
             }
 
             // These parts are separated due to the way the query is built
@@ -102,15 +96,15 @@ class AppModel extends Model
             // Generate a field list just like Cake would do it, so that we
             // know which translations to join in.
             // If the user didn't give us a field list, we use the default field
-            // list set for this Model. We have to have cake
+            // list set for this Model. We have to have cake 
             // generate the list for us now, because once we set a fields
-            // array, Cake won't select any other fields anymore than the ones
+            // array, Cake won't select any other fields anymore than the ones 
             // we request.
             if (!empty($queryData['fields']))
                 $_fields = $queryData['fields'];
             else
                 $_fields = $this->default_fields;
-
+            
             // if it's a string only, wrap it into an array so all the
             // following array magic works with it as well
             if (is_string($_fields)) $_fields = array($_fields);
@@ -122,15 +116,15 @@ class AppModel extends Model
                 if (false === $pos = array_search("`{$this->name}`.`{$field}`", $_fields)) {
                     continue;
                 }
-
-                // for each translated field, we select the localized string,
+                
+                // for each translated field, we select the localized string, 
                 // automatically falling back to en-US if nothing is found.
-                // We also fetch the locale, which will be the requested
+                // We also fetch the locale, which will be the requested 
                 // locale if found and en-US in case of fallback.
                 // naming is {fieldname} and {fieldname}_locale resp., which
                 // means, fallback is transparent.
                 $_select = "IFNULL(`tr_{$field}`.localized_string, `fb_{$field}`.localized_string) AS `{$field}`";
-
+                
                 // replace the translation id with the translation unless explicitly opted out of
                 if ($this->translationReplace === false) {
                     // append the translation
@@ -143,12 +137,12 @@ class AppModel extends Model
                 // (that is: the requested locale if the localized string
                 // is not null, otherwise the fallback locale)
                 $_fields[] = "IF(!ISNULL(`tr_{$field}`.localized_string), `tr_{$field}`.locale, `fb_{$field}`.locale) AS `{$field}_locale`";
-
+                
 
                 // Our query design requires us to join on the same table repeatedly.
                 // Each join requires a different table name, so we're actually
                 // calling our tables the same things as the fields. We're also
-                // creating a string for the fallback versions (usually en-US).
+                // creating a string for the fallback versions (usually en-US). 
                 // The requested locale has the prefix "tr_" (as "translation")
                 // and the fallback has the prefix "fb_".
                 $_joins[] = "LEFT JOIN translations AS `tr_{$field}` ON (`{$this->name}`.`{$field}` = `tr_{$field}`.id AND `tr_{$field}`.locale='{$lang}')";
@@ -232,7 +226,7 @@ class AppModel extends Model
     /**
      * query(), checking for cached result objects (only on select queries,
      * of course).
-     * Note: If you execute multiple queries in one line with a select query
+     * Note: If you execute multiple queries in one line with a select query 
      * first, followed by some writing (insert or so), this *will* break.
      * Don't do this.
      */
@@ -241,11 +235,11 @@ class AppModel extends Model
             && is_string($query)
             && (0 === strpos(strtolower(ltrim($query)), 'select'))
             && isset($this->name)) {
-
+            
             $cachekey = $this->_cachekey('query:'.$query);
             if ($cached = $this->Cache->get($cachekey)) return $cached;
         }
-
+        
         if ($use_shadow_database && !defined('SHADOW_DISABLED')) {
             $this->useDbConfig = 'shadow';
             $result = parent::query($query, $cakeCaching);
@@ -253,9 +247,9 @@ class AppModel extends Model
         } else {
             $result = parent::query($query, $cakeCaching);
         }
-
+        
         if ($this->caching && !empty($cachekey) && $result !== false) {
-            // cache it (if it's a select query, otherwise $cachekey
+            // cache it (if it's a select query, otherwise $cachekey 
             // would be empty)
             $res = $this->Cache->set($cachekey, $result);
         }
@@ -280,7 +274,7 @@ class AppModel extends Model
 
         return MEMCACHE_PREFIX.md5($key);
     }
-
+    
 
    /**
     * Allowed querying for a locale other than currently set.
@@ -315,86 +309,76 @@ class AppModel extends Model
     }
 
     /**
-     * extended field validation: allow arbitrary validation functions
-     * to use, add 'fieldname' => VALID_NOT_EMPTY or similar to $this->$validate,
-     * then add a method clean_fieldname($input) which in the case of invalidity
-     * calls $this->invalidate('fieldname') or amends $this->validationErrors.
-     *
-     * @param array $data data to be validated, $this->data by default
-     * @return array validationError, array() if none
+     * Remora overwrites the default application model in order to implement
+     * more sophisticated validation methods as described in:
+     * http://wiki.cakephp.org/tutorials:advanced_validation
+     * http://bakery.cakephp.org/articles/view/55
      */
-    function invalidFields($data=array()) {
-        if (!$this->beforeValidate()) {
+    function invalidFields($data = array()) {
+        
+        if(!$this->beforeValidate()) {
             return false;
         }
-        parent::invalidFields($data);
-        if (empty($data)) {
+        
+        if (!isset($this->validate) || empty($this->validate)) {
+            if (!empty($this->validationErrors)) {
+                return $this->validationErrors;
+            } else {
+                return array();
+            } 
+        }
+        
+        
+        if (!isset($this->data)) {
+            
+            $this->set($data);
+        } elseif (!empty($data)) {
+            $data = array_merge($data, $this->data);
+            $this->set($data);
+        } else {
             $data = $this->data;
         }
-        foreach (array_keys($this->validate) as $field) {
-            $func = 'clean_'.$field;
-            if (method_exists($this, $func) && isset($data[$this->name][$field])) {
-                call_user_func(array($this, $func), $data[$this->name][$field]);
+        
+        $errors = array();
+        
+        foreach ($data as $table => $field) {
+            foreach ($this->validate as $field_name => $validators) {
+                if (!is_array($validators)) $validators = array(array($validators)); // wrap validator into array if it's only one
+                foreach($validators as $validator) {
+                    if (!is_array($validator)) $validator = array($validator); // wrap validator into array if it's only one
+                    if (isset($validator[0])) {
+                        if (method_exists($this, $validator[0])) {
+                            if (isset($data[$table][$field_name]) && !call_user_func(array(&$this, $validator[0]))) {
+                                if (!isset($errors[$field_name])) {
+                                    $errors[$field_name] = isset($validator[1]) ? $validator[1] : 1;
+                                }
+                            }
+                        } else {
+                            if (isset($data[$table][$field_name]) && is_string($data[$table][$field_name]) && !preg_match($validator[0], $data[$table][$field_name])) {
+                                if (!isset($errors[$field_name])) {
+                                    $errors[$field_name] = isset($validator[1]) ? $validator[1] : 1;
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
+        $this->validationErrors = array_merge($this->validationErrors, $errors);
+        
         return $this->validationErrors;
     }
-
-    /**
-     * validation shortcut: maximum field length
-     */
-    function maxLength($field, $input, $max, $msg) {
-        if (strlen($input) > $max) {
-            $this->validationErrors[$field] = $msg;
-        }
-    }
-
+    
     var $hasMany_full = array();
     var $hasAndBelongsToMany_full = array();
     var $belongsTo_full = array();
-
+    
     function bindFully() {
         $this->bindModel(array('hasMany' => $this->hasMany_full,
                                'hasAndBelongsToMany' => $this->hasAndBelongsToMany_full,
                                'belongsTo' => $this->belongsTo_full));
     }
-
-    /**
-     * Index associations by model name.
-     *
-     * @return array $model => ($association, $definition)
-     */
-    function _bindings() {
-        $assoc = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
-        $relations = array();
-        foreach ($assoc as $a) {
-            if (isset($this->$a)) {
-                foreach ($this->$a as $rel => $def) {
-                    $relations[$rel] = array($a, $def);
-                }
-            }
-        }
-        return $relations;
-    }
-
-    /**
-     * Unbinds all models, then rebinds only the models passed as arguments.
-     * >>> $this->Addon->bindOnly('Users', 'Framlings')
-     * @param mixed [Model,...]
-     */
-    function bindOnly() {
-        // Make sure all the associations are available before introspection.
-        $this->__resetAssociations();
-        $bindings = $this->_bindings();
-        $this->unbindFully();
-
-        $models = func_get_args();
-        foreach ($models as $model) {
-            list($assoc, $def) = $bindings[$model];
-            $this->bindModel(array($assoc => array($model => $def)));
-        }
-    }
-
+    
     function unbindFully() {
         $unbind = array();
         foreach ($this->belongsTo as $model=>$info) {
@@ -411,7 +395,7 @@ class AppModel extends Model
         }
         $this->unbindModel($unbind);
     }
-
+   
    /**
     * Updates a table without requiring a primary key
     * @param mixed $update Array of fields and values to update or the update string
@@ -423,9 +407,9 @@ class AppModel extends Model
         if (empty($update) || empty($where)) {
             return false;
         }
-
+        
         $db =& ConnectionManager::getDataSource($this->useDbConfig);
-
+        
         //Create update string from array
         if (is_array($update)) {
             foreach ($update as $field => $value) {
@@ -440,7 +424,7 @@ class AppModel extends Model
         elseif (is_string($update)) {
             $updateQry = $update;
         }
-
+        
         //Create where clause from array
         if (is_array($where)) {
             foreach ($where as $field => $value) {
@@ -455,9 +439,9 @@ class AppModel extends Model
         elseif (is_string($where)) {
             $whereQry = $where;
         }
-
+        
         $limitQry = empty($limit) ? '' : " LIMIT {$limit}";
-
+        
         return $db->execute("UPDATE ".$db->name($db->fullTableName($this))." SET {$updateQry} WHERE {$whereQry}{$limitQry}");
     }
 
@@ -473,16 +457,16 @@ class AppModel extends Model
             $_tr_fields_tobestored = array_intersect($this->translated_fields, array_keys($this->data[$this->name]));
             if (empty($_tr_fields_tobestored)) return true;
         }
-
+        
         // copy the data we intend to save
         $data = $this->data;
 
         // Allow querying for a locale other than currently set
         $lang = $this->getLang();
-
+        
         // Make sure translation ids are returned
         $this->translationReplace = false;
-
+        
         // start a transaction
         $db =& ConnectionManager::getDataSource($this->useDbConfig);
         $this->begin();
@@ -498,7 +482,7 @@ class AppModel extends Model
         $errors = false;
         foreach ($this->translated_fields as $tr_field) {
             if (!isset($data[$this->name][$tr_field])) continue;
-
+            
             // remove existing translation if empty
             $_remove = (empty($data[$this->name][$tr_field]));
 
@@ -513,7 +497,7 @@ class AppModel extends Model
                     unset($data[$this->name][$tr_field]);
                     continue;
                 }
-
+                
                 $_update = false;
                 // generate a new primary key id
                 $db->execute('UPDATE translations_seq SET id=LAST_INSERT_ID(id+1);');
@@ -548,17 +532,17 @@ class AppModel extends Model
                     ."({$_trans_id}, '{$lang}', '{$data[$this->name][$tr_field]}', NOW());";
                 $_res = $db->execute($sql);
             }
-
+            
             // errors? don't go on
             if ($_res === false) {
                 $errors = true;
                 break;
             }
-
+            
             // replace localized string by localization id in data to be saved
             $data[$this->name][$tr_field] = $_trans_id;
         }
-
+        
         // return to default
         $this->translationReplace = true;
         // if something went wrong, roll back
@@ -622,7 +606,7 @@ class AppModel extends Model
         }
         return false;
     }
-
+    
     /**
      * Gets translations for all locales for the specific record and fields
      * @param int $id the primary key to pull from
@@ -635,9 +619,9 @@ class AppModel extends Model
         if (empty($fields) || !is_array($fields)) {
             $fields = $this->translated_fields;
         }
-
+        
         $translations = array();
-
+        
         // Pull the translation ids for the selected fields
         $tableInfo = $this->query("SELECT ".implode($fields, ', ')." FROM {$this->table} AS {$this->name} WHERE {$this->name}.id={$id}", $cache, $cache);
         if (!empty($tableInfo)) {
@@ -646,11 +630,11 @@ class AppModel extends Model
                 if (!empty($translation_id)) {
                     $translation_ids[$field] = $translation_id;
                 }
-
+                
                 $translations[$field] = array();
             }
         }
-
+        
         // Pull translations for all ids
         if (!empty($translation_ids)) {
             $where = $includeNULL ? '' : ' AND Translation.localized_string IS NOT NULL';
@@ -671,7 +655,7 @@ class AppModel extends Model
                 return $translations;
             }
         }
-
+        
         if ($returnIDs) {
             return array($translations, $translation_ids);
         }
@@ -679,7 +663,7 @@ class AppModel extends Model
             return $translations;
         }
     }
-
+    
     /**
      * Save translations for new, updated, and deleted locales.
      * This should only be used for mass updating and is more efficient
@@ -692,7 +676,7 @@ class AppModel extends Model
         // Pull all existing translations for fields to save
         $fields = array_keys($data);
         list($existing, $translation_ids) = $this->getAllTranslations($id, $fields, true, true);
-
+        
         // Handle updated and deleted translations
         if (!empty($existing)) {
             foreach ($existing as $field => $translations) {
@@ -707,13 +691,13 @@ class AppModel extends Model
                             $this->execute("UPDATE translations SET localized_string='{$data[$field][$locale]}', modified=NOW() WHERE id={$translation_ids[$field]} AND locale='{$locale}'");
                         }
                         // Else, no changes
-
+                        
                         unset($data[$field][$locale]);
                     }
                 }
             }
         }
-
+        
         // Handle new translations
         if (!empty($data)) {
             foreach ($data as $field => $translations) {
@@ -741,30 +725,14 @@ class AppModel extends Model
             }
         }
     }
-
-    /**
-     * Validate localized fields from translation box
-     * @param array $data unescaped translation data
-     * @return bool all data validated
-     */
-    function validateTranslations($data) {
-        foreach ($data as $field => $translations) {
-            if (!in_array($field, $this->translated_fields)) continue;
-            foreach ($translations as $locale => $translation) {
-                $this->invalidFields(array($this->name => array($field => $translation)));
-                if (!empty($this->validationErrors)) return false;
-            }
-        }
-        return true;
-    }
-
+    
     /**
      * Separates an array of data into localized fields and unlocalized fields
      */
     function splitLocalizedFields($data) {
         $localizedFields = array();
         $unlocalizedFields = array();
-
+        
         if (!empty($data)) {
             foreach ($data as $field => $value) {
                 if (in_array($field, $this->translated_fields)) {
@@ -775,10 +743,10 @@ class AppModel extends Model
                 }
             }
         }
-
+        
         return array($localizedFields, $unlocalizedFields);
     }
-
+    
     /**
      * Strips fields that aren't in the specified whitelist
      */
@@ -791,9 +759,9 @@ class AppModel extends Model
                 }
             }
         }
-
+        
         return $safe;
     }
-
+    
 }
 ?>
diff --git a/site/app/config/bootstrap.php b/site/app/config/bootstrap.php
index ce43a70..04b7200 100644
--- a/site/app/config/bootstrap.php
+++ b/site/app/config/bootstrap.php
@@ -219,18 +219,8 @@ if (array_key_exists($buf[0],$valid_languages)) {
 
 // Now make sure that there's a known app/layout in the second position.
 if (count($buf) < 2 || !array_key_exists($buf[1], $valid_layouts)) {
-    // we are sugar
-    if (true)
-        array_splice($buf, 1, 0, "sugar");
-    else
-    // No app or unknown app, so we see if this is seamonkey, otherwise stick
-    // firefox in the place of honour and redirect.
-    if (array_key_exists('HTTP_USER_AGENT', $_SERVER) && 
-        strpos($_SERVER['HTTP_USER_AGENT'], 'SeaMonkey') !== false) {
-        array_splice($buf, 1, 0, "seamonkey");
-    } else {
-        array_splice($buf, 1, 0, "firefox");
-    }
+    // No app or unknown app, so make it Sugar.
+    array_splice($buf, 1, 0, "sugar");
     redirectWithNewLocaleAndExit($buf);
 }
 
@@ -245,7 +235,7 @@ if (array_key_exists(SITE_LAYOUT, $other_layouts)) {
     }
     else {
         // App wasn't set, so default to Firefox
-        define('APP_SHORTNAME', 'firefox');
+        define('APP_SHORTNAME', 'sugar');
     }
     define('LAYOUT_NAME', $other_layouts[SITE_LAYOUT]);
 }
@@ -275,11 +265,12 @@ if (in_array(LANG, $rtl_languages)) {
 
 global $app_prettynames;
 $app_prettynames = array(
-    'sugar' => ___('main_prettyname_sugar'),
+    'firefox' => ___('main_prettyname_firefox'),
     'thunderbird' => ___('main_prettyname_thunderbird'),
     'sunbird' => ___('main_prettyname_sunbird'),
     'seamonkey' => ___('main_prettyname_seamonkey'),
-    'fennec' => ___('main_prettyname_fennec')
+    'fennec' => ___('main_prettyname_fennec'),
+    'sugar' => ___('main_prettyname_sugar')
     );
 define('APP_PRETTYNAME', $app_prettynames[APP_SHORTNAME]);
 
@@ -293,18 +284,5 @@ unset($webpath, $buf, $lang, $language_config);
 global $flush_lists;
 $flush_lists = array();
 
-/**
- * We depend on the order of these licenses, so this list is append-only.
- */
-global $licenses;
-$licenses = array(
-    ___('licenses_mpl_1.1'),
-    ___('licenses_gpl_2.0'),
-    ___('licenses_gpl_3.0'),
-    ___('licenses_lgpl_2.1'),
-    ___('licenses_lgpl_3.0'),
-    ___('licenses_mit'),
-    ___('licenses_bsd')
-);
 //EOF
 ?>
diff --git a/site/app/config/constants.php b/site/app/config/constants.php
index dc4190a..9d90eb2 100644
--- a/site/app/config/constants.php
+++ b/site/app/config/constants.php
@@ -43,7 +43,13 @@
  * Site URL default
  */
 if (!defined('SITE_URL'))
-    define('SITE_URL', 'https://addons.mozilla.org');
+    define('SITE_URL', 'http://addons.mozilla.org');
+
+/**
+ * Secure Site URL default
+  */
+if (!defined('SSITE_URL'))
+    define('SSITE_URL', 'https://addons.mozilla.org');
 
 /**
  * Site State default
@@ -148,17 +154,19 @@ define('APP_THUNDERBIRD', 18);
 define('APP_SEAMONKEY', 59);
 define('APP_SUNBIRD', 52);
 define('APP_FENNEC', 60);
+define('APP_SUGAR', 19);
 global $app_shortnames; // shortnames are used in URLs
 $app_shortnames = array(
-    'sugar'         => APP_FIREFOX,
-    'thunderbird'   => APP_THUNDERBIRD,
-    'seamonkey'     => APP_SEAMONKEY,
-    'sunbird'       => APP_SUNBIRD,
-    'fennec'        => APP_FENNEC
+//    'firefox'       => APP_FIREFOX,
+//    'thunderbird'   => APP_THUNDERBIRD,
+//    'seamonkey'     => APP_SEAMONKEY,
+//    'sunbird'       => APP_SUNBIRD,
+//    'fennec'        => APP_FENNEC,
+    'sugar'         => APP_SUGAR
     );
 global $app_prettynames;
 $app_prettynames = array( // Overridden with L10n in bootstrap.php
-    'sugar' => "Sugar",
+    'firefox' => "Firefox",
     'thunderbird' => "Thunderbird",
     'seamonkey' => "SeaMonkey",
     'sunbird' => "Sunbird",
@@ -166,6 +174,8 @@ $app_prettynames = array( // Overridden with L10n in bootstrap.php
     );
 global $browser_apps; // browser applications; for non-browser apps, use !in_array()
 $browser_apps = array(
+    APP_FIREFOX,
+    APP_SEAMONKEY
 );
 global $other_layouts; // non-app top-level layouts in URLs
 // controller => header
@@ -183,16 +193,22 @@ $valid_layouts = array_merge($other_layouts, $app_shortnames);
  * Addontypes
  */
 define('ADDON_ANY', '-1'); // default of advanced search
-define('ADDON_EXTENSION', '1');
-define('ADDON_THEME', '2');
-define('ADDON_DICT', '3');
-define('ADDON_SEARCH', '4');
-define('ADDON_LPAPP', '5');
-define('ADDON_LPADDON', '6');
-define('ADDON_PLUGIN', '7');
-define('ADDON_API', '8'); // not actually a type but used to identify extensions + themes
-
-define('COUNT_ADDON_PLUGIN', 7); // Since the plugin page is static, define a static count here,
+if (!defined('ADDON_EXTENSION'))
+    define('ADDON_EXTENSION', '1');
+if (!defined('ADDON_THEME'))
+    define('ADDON_THEME', '2');
+if (!defined('ADDON_DICT'))
+    define('ADDON_DICT', '3');
+if (!defined('ADDON_SEARCH'))
+    define('ADDON_SEARCH', '4');
+if (!defined('ADDON_LPAPP'))
+    define('ADDON_LPAPP', '5');
+if (!defined('ADDON_LPADDON'))
+    define('ADDON_LPADDON', '6');
+if (!defined('ADDON_PLUGIN'))
+    define('ADDON_PLUGIN', '7');
+if (!defined('ADDON_API'))
+    define('ADDON_API', '8'); // not actually a type but used to identify extensions + themes
 
 /**
  * Add-on Author Roles
@@ -204,15 +220,6 @@ define('AUTHOR_ROLE_DEV', 4);
 define('AUTHOR_ROLE_VIEWER', 1);
 define('AUTHOR_ROLE_NONE', 0);
 
-/**
- * Collection Author Roles
- */
-define('COLLECTION_ROLE_OWNER', 2);
-define('COLLECTION_ROLE_ADMIN', 1);
-define('COLLECTION_ROLE_PUBLISHER', 0);
-
-define('COLLECTOR_ID', 11950);
-
 /* hybrid categories (extensions + other add-on types) */
 global $hybrid_categories;
 $hybrid_categories = array(
@@ -229,7 +236,11 @@ $hybrid_categories = array(
 // for very little gain.
 global $app_listedtypes;
 $app_listedtypes = array(
-    APP_FIREFOX => array(ADDON_EXTENSION)
+    APP_FIREFOX => array(ADDON_EXTENSION, ADDON_THEME, ADDON_DICT, ADDON_SEARCH, ADDON_PLUGIN),
+    APP_THUNDERBIRD => array(ADDON_EXTENSION, ADDON_THEME, ADDON_DICT),
+    APP_SEAMONKEY => array(ADDON_EXTENSION, ADDON_THEME, ADDON_DICT, ADDON_SEARCH, ADDON_PLUGIN),
+    APP_SUNBIRD => array(ADDON_EXTENSION, ADDON_THEME, ADDON_DICT),
+    APP_SUGAR => array(ADDON_ACTIVITY, ADDON_CONTENT),
     );
 
 /**
@@ -270,12 +281,8 @@ define('VALID_URL_REQ','/^https?:\/\/([a-z0-9][a-z0-9-]*\.)+([a-z]+)(:[0-9]+)?(\
 define('VALID_URL_OPT','/(^$)|(^https?:\/\/([a-z0-9][a-z0-9-]*\.)+([a-z]+)(:[0-9]+)?(\/|$))/i');
 // EMAIL optional validator
 define('VALID_EMAIL_OPT', '/(^$)|\\A(?:^([a-z0-9][a-z0-9_\\-\\.\\+]*)@([a-z0-9][a-z0-9\\.\\-]{0,63}\\.(com|org|net|biz|info|name|net|pro|aero|coop|museum|[a-z]{2,4}))$)\\z/i');
-// UUID required validator
-define('VALID_UUID_REQ','/^[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}$/');
 // regex to preg_replace() the bad characters in uploaded filenames
 define('INVALID_FILENAME_CHARS', '/[^\w\d\.\-_!+]/');
-// invalid collection nicknames
-define('INVALID_COLLECTION_NICKNAME_CHARS', INVALID_FILENAME_CHARS);
 
 /**
  * entities to be sanitized by publish()
@@ -297,8 +304,4 @@ if(defined('ROOT')) {
   include_once ROOT.DS.APP_DIR.DS.'config'.DS.'revisions.php';
 }
 
-/**
- * Password Reset Expires: the number of days before a resetcode expires.
- */
-define('PASSWORD_RESET_EXPIRES', 3);
 ?>
diff --git a/site/app/config/core.php b/site/app/config/core.php
index cdfe6ce..c283480 100644
--- a/site/app/config/core.php
+++ b/site/app/config/core.php
@@ -79,6 +79,7 @@ if (!defined('DEV'))
  * Error constant. Used for differentiating error logging and debugging.
  * Currently PHP supports LOG_DEBUG
  */
+if (!defined('LOG_ERROR'))
 	define('LOG_ERROR', 2);
 /**
  * CakePHP includes 3 types of session saves
diff --git a/site/app/config/database.php b/site/app/config/database.php
index 0d84c1e..a34d481 100644
--- a/site/app/config/database.php
+++ b/site/app/config/database.php
@@ -125,7 +125,6 @@ class DATABASE_CONFIG
 
     function useTestConfig() {
         self::$default = self::$test;
-        self::$shadow = self::$test;
     }
 }
 ?>
diff --git a/site/app/config/language.php b/site/app/config/language.php
index f21adcf..88ef4cf 100644
--- a/site/app/config/language.php
+++ b/site/app/config/language.php
@@ -342,38 +342,5 @@ class LANGUAGE_CONFIG
         // if we get here we are really out of luck: just return the default
         return $this->default_language;
     }
-
-    /**
-     * Return an array of all valid languages.  This is safe to set() instead of publish().
-     *
-     * @param string names either 'english' or 'native' - how to return the full names
-     * @param boolean includeAll whether to include an "All" option at the beginning of the array
-     */
-    static function getAllValidLanguages($names='english', $includeAll=false) {
-        global $valid_languages;
-
-        $localeDetails = new localeDetails();
-
-        $xx_YY = array_keys($valid_languages);
-
-        if ($includeAll) {
-            array_unshift($xx_YY, 'all');
-        }
-
-        $locales = array();
-
-        foreach ($xx_YY as $locale) {
-            if ($locale == 'all') {
-                $locales[$locale] = ___('general_languages_all_locales','All Locales');
-            } else if ($names == 'english') {
-                $locales[$locale] = $localeDetails->getEnglishNameForLocale($locale);
-            } else if ($names == 'native') {
-                $locales[$locale] = $localeDetails->getNativeNameForLocale($locale);
-            }
-        }
-
-        return $locales;
-        
-    }
 }
 ?>
diff --git a/site/app/config/revisions.php b/site/app/config/revisions.php
index 05842fd..77c72b0 100644
--- a/site/app/config/revisions.php
+++ b/site/app/config/revisions.php
@@ -1,5 +1,5 @@
 <?php
-define('REVISION', 27493);
-define('CSS_REVISION', 27396);
-define('JS_REVISION', 27226);
+define('REVISION', 23198);
+define('CSS_REVISION', 23067);
+define('JS_REVISION', 23044);
 ?>
\ No newline at end of file
diff --git a/site/app/config/routes.php b/site/app/config/routes.php
index 867e5ea..e629b76 100644
--- a/site/app/config/routes.php
+++ b/site/app/config/routes.php
@@ -91,11 +91,12 @@
         $Route->connect("/{$prefix}/addon/share/*", array('controller' => 'addons', 'action' => 'share'));
         $Route->connect("/{$prefix}/addon/*", array('controller' => 'addons', 'action' => 'display'));
         $Route->connect("/{$prefix}/blog/*", array('controller' => 'blog', 'action' => 'view'));
-        $Route->connect("/{$prefix}/collection/*", array('controller' => 'collections', 'action' => 'view'));
+        $Route->connect("/{$prefix}/collection/*", array('controller' => 'collections', 'action' => 'display'));
         
         // API hookup
         $Route->connect("/{$prefix}/api/addon/*", array('controller' => 'api', 'action'=>'addon')); 
         $Route->connect("/{$prefix}/api/list/*", array('controller' => 'api', 'action'=>'list_addons')); 
+        $Route->connect("/{$prefix}/api/[\d\.]*/feed/*", array('controller' => 'api', 'action'=>'collections_feed'));
 
         // Add API versioning support
         $Route->connect("/{$prefix}/api/[\d\.]*/addon/*", array('controller' => 'api', 'action'=>'addon'));
@@ -103,26 +104,9 @@
         $Route->connect("/{$prefix}/api/[\d\.]*/search/*", array('controller' => 'api', 'action'=>'search'));
         $Route->connect("/{$prefix}/api/[\d\.]*/get_language_packs/*", array('controller' => 'api', 'action'=>'get_language_packs'));
         
-        // Bandwagon sharing API
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/collections/*/addons/", array('controller' => 'sharing_api', 'action'=>'collection_addons'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/collections/*/addons/*", array('controller' => 'sharing_api', 'action'=>'collection_addon_detail'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/collections/", array('controller' => 'sharing_api', 'action'=>'collections'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/collections/*", array('controller' => 'sharing_api', 'action'=>'collection_detail'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/auth", array('controller' => 'sharing_api', 'action'=>'auth'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/auth/*", array('controller' => 'sharing_api', 'action'=>'auth_detail'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing/email", array('controller' => 'sharing_api', 'action'=>'email'));
-        $Route->connect("/{$prefix}/api/[\d\.]*/sharing", array('controller' => 'sharing_api', 'action'=>'service_doc'));
-
         // Bandwagon/collections
         $Route->connect("/{$prefix}/fashionyourfirefox/", array('controller' => 'collections', 'action' => 'interactive'));
-        
-        // Forward old DevCP links to new DevCP
-        $Route->connect("/{$prefix}/developers(/|/index)?", array('controller' => 'developers', 'action' => 'dashboard'));
-        $Route->connect("/{$prefix}/developers/details/*", array('controller' => 'developers', 'action' => 'dashboard'));
-        $Route->connect("/{$prefix}/developers/edit/*", array('controller' => 'developers', 'action' => 'addon', 'edit'));
-        $Route->connect("/{$prefix}/developers/add/*", array('controller' => 'developers', 'action' => 'versions' ,'add'));
-        $Route->connect("/{$prefix}/developers/editversion/*", array('controller' => 'developers', 'action' => 'versions', 'edit'));
-        
+
         // Magical undocumented routing syntax - if nothing has matched up till now, it'll hit this
         $Route->connect("/{$prefix}/:controller/:action/*", array('controller' => 'pages', 'action' => 'index'));
     }
diff --git a/site/app/config/sql/remora.sql b/site/app/config/sql/remora.sql
index f3eaac1..e3f73d4 100644
--- a/site/app/config/sql/remora.sql
+++ b/site/app/config/sql/remora.sql
@@ -40,7 +40,6 @@ CREATE TABLE `addons` (
   `totalreviews` int(11) unsigned NOT NULL default '0',
   `weeklydownloads` int(11) unsigned NOT NULL default '0',
   `totaldownloads` int(11) unsigned NOT NULL default '0',
-  `sharecount` int(11) unsigned NOT NULL,
   `developercomments` int(11) unsigned default NULL,
   `inactive` tinyint(1) unsigned NOT NULL default '0',
   `trusted` tinyint(1) unsigned NOT NULL default '0',
@@ -56,8 +55,6 @@ CREATE TABLE `addons` (
   `nominationmessage` text,
   `target_locale` varchar(25) default NULL,
   `locale_disambiguation` varchar(255) default NULL,
-  `nominationdate` datetime NOT NULL default '0000-00-00 00:00:00',
-  `dev_agreement` tinyint(1) unsigned NOT NULL default '0',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `modified` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`),
@@ -76,7 +73,6 @@ CREATE TABLE `addons` (
   KEY `inactive` (`inactive`),
   KEY `target_locale` (`target_locale`),
   KEY `bayesianrating` (`bayesianrating`),
-  KEY `sharecount` (`sharecount`),
   CONSTRAINT `addons_ibfk_1` FOREIGN KEY (`addontype_id`) REFERENCES `addontypes` (`id`),
   CONSTRAINT `addons_ibfk_2` FOREIGN KEY (`name`) REFERENCES `translations` (`id`),
   CONSTRAINT `addons_ibfk_3` FOREIGN KEY (`homepage`) REFERENCES `translations` (`id`),
@@ -224,25 +220,6 @@ CREATE TABLE `appversions` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Table structure for table `api_auth_tokens`
---
-
-DROP TABLE IF EXISTS `api_auth_tokens`;
-CREATE TABLE `api_auth_tokens` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `user_id` int(11) unsigned NOT NULL default '0',
-  `token` varchar(64) NOT NULL,
-  `user_agent_hash` varchar(64) NOT NULL,
-  `user_profile_hash` varchar(64) NOT NULL,
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  KEY `user_id` (`user_id`),
-  KEY `token` (`token`),
-  CONSTRAINT `api_auth_tokens_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
 -- Table structure for table `blapps`
 --
 
@@ -608,20 +585,6 @@ CREATE TABLE `files` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Table structure for table `global_stats`
---
-
-DROP TABLE IF EXISTS `global_stats`;
-CREATE TABLE `global_stats` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL default '',
-  `count` int(10) unsigned NOT NULL default '0',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  UNIQUE KEY `name` (`name`),
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
 -- Table structure for table `groups`
 --
 
@@ -650,22 +613,6 @@ CREATE TABLE `groups_users` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
--- Table structure for table `licenses`
---
-
-DROP TABLE IF EXISTS `licenses`;
-CREATE TABLE `licenses` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `name` int(1) NOT NULL default '-1',
-  `text` int(11) unsigned default NULL,
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY (`id`),
-  KEY `text` (`text`),
-  CONSTRAINT `licenses_ibfk_1` FOREIGN KEY (`text`) REFERENCES `translations` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
 -- Table structure for table `logs_parsed`
 --
 
@@ -824,7 +771,6 @@ CREATE TABLE `tags` (
   `application_id` int(11) unsigned default NULL,
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  `count` int(11) NOT NULL DEFAULT '0',  
   `weight` int(11) NOT NULL DEFAULT '0',  
   PRIMARY KEY  (`id`),
   KEY `addontype_id` (`addontype_id`),
@@ -894,15 +840,10 @@ CREATE TABLE `users` (
   `firstname` varchar(255) NOT NULL default '',
   `lastname` varchar(255) NOT NULL default '',
   `nickname` varchar(255) NOT NULL default '',
-  `bio` int(11) UNSIGNED default NULL,
   `emailhidden` tinyint(1) unsigned NOT NULL default '0',
   `sandboxshown` tinyint(1) unsigned NOT NULL default '0',
   `homepage` varchar(255) default NULL,
-  `display_collections` tinyint(1) unsigned NOT NULL default '0',
-  `display_collections_fav` tinyint(1) unsigned NOT NULL default '0',
   `confirmationcode` varchar(255) NOT NULL default '',
-  `resetcode` varchar(255) NOT NULL default '',
-  `resetcode_expires` datetime NOT NULL default '0000-00-00 00:00:00',
   `notifycompat` tinyint(1) unsigned NOT NULL default '1',
   `notifyevents` tinyint(1) unsigned NOT NULL default '1',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -912,9 +853,7 @@ CREATE TABLE `users` (
   UNIQUE KEY `email` (`email`),
   KEY `unconfirmed` (`created`,`confirmationcode`),
   KEY `notifycompat` (`notifycompat`),
-  KEY `notifyevents` (`notifyevents`),
-  KEY `bio` (`bio`),
-  CONSTRAINT `users_ibfk_1` FOREIGN KEY (`bio`) REFERENCES `translations` (`id`)
+  KEY `notifyevents` (`notifyevents`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -925,7 +864,6 @@ DROP TABLE IF EXISTS `versions`;
 CREATE TABLE `versions` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `addon_id` int(11) unsigned NOT NULL default '0',
-  `license_id` int(11) unsigned default NULL,
   `version` varchar(255) NOT NULL default '',
   `approvalnotes` text,
   `releasenotes` int(11) unsigned default NULL,
@@ -934,10 +872,8 @@ CREATE TABLE `versions` (
   PRIMARY KEY  (`id`),
   KEY `addon_id` (`addon_id`),
   KEY `versions_ibfk_2` (`releasenotes`),
-  KEY `license_id` (`license_id`),
   CONSTRAINT `versions_ibfk_1` FOREIGN KEY (`addon_id`) REFERENCES `addons` (`id`),
-  CONSTRAINT `versions_ibfk_2` FOREIGN KEY (`releasenotes`) REFERENCES `translations` (`id`),
-  CONSTRAINT `versions_ibfk_3` FOREIGN KEY (`license_id`) REFERENCES `licenses` (`id`)
+  CONSTRAINT `versions_ibfk_2` FOREIGN KEY (`releasenotes`) REFERENCES `translations` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -977,20 +913,6 @@ CREATE TABLE `versions_summary` (
   INDEX (addon_id) 
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `collections_search_summary`
--- This materialized view maintains a indexed summary of the text data in a collection to make search faster
---
-
-DROP TABLE IF EXISTS `collections_search_summary`;
-CREATE TABLE `collections_search_summary` (
-  `id` int(11) NOT NULL,
-  `locale` varchar(10) NOT NULL,
-  `name` text,
-  `description` text,
-  FULLTEXT KEY `name` (`name`,`description`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 -- 
 -- Table structure for table `tshirt_requests`
 -- Used to store addresses of developers who claimed a T-shirt in
@@ -1022,13 +944,7 @@ CREATE TABLE `tshirt_requests` (
 DROP TABLE IF EXISTS `collections`;
 CREATE TABLE `collections` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `uuid` char(36) NOT NULL default '',
   `name` int(11) unsigned NOT NULL,
-  `defaultlocale` varchar(10) NOT NULL default 'en-US',
-  `collection_type` int(11) unsigned NOT NULL DEFAULT '0',
-  `icondata` blob,
-  `icontype` varchar(25) NOT NULL default '',
-  `nickname` varchar(30) NULL,
   `description` int(11) unsigned NOT NULL,
   `access` tinyint(1) NOT NULL DEFAULT '0',
   `listed` tinyint(1) NOT NULL DEFAULT '1',
@@ -1036,62 +952,29 @@ CREATE TABLE `collections` (
   `subscribers` int(11) unsigned NOT NULL DEFAULT '0',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+  `addontype_id` int(11) unsigned NOT NULL,
   `downloads` int(11) unsigned NOT NULL DEFAULT '0',
-  `application_id` int(10) unsigned default NULL,
-  `weekly_subscribers` int(11) unsigned NOT NULL default '0',
-  `monthly_subscribers` int(11) unsigned NOT NULL default '0',
-  `addonCount` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY `id` (`id`),
-  UNIQUE KEY `uuid` (`uuid`),
-  UNIQUE KEY `nickname` (`nickname`),
-  KEY (`listed`),
-  KEY `application_id` (`application_id`),
-  KEY `name` (`name`),
-  KEY `description` (`description`),
-  CONSTRAINT `collections_ibfk_1` FOREIGN KEY (`application_id`) REFERENCES `applications` (`id`),
-  CONSTRAINT `collections_ibfk_2` FOREIGN KEY (`name`) REFERENCES `translations` (`id`),
-  CONSTRAINT `collections_ibfk_3` FOREIGN KEY (`description`) REFERENCES `translations` (`id`)
+  INDEX (`listed`),
+  CONSTRAINT `collections_addontype_ibfk_1` FOREIGN KEY (`addontype_id`) REFERENCES `addontypes`(`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
 
+
 DROP TABLE IF EXISTS `addons_collections`;
 CREATE TABLE `addons_collections` (
   `addon_id` int(11) unsigned NOT NULL ,
   `collection_id` int(11) unsigned NOT NULL ,
-  `user_id` int(11) unsigned default NULL,
   `added` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
   `category` tinyint(4) unsigned default NULL COMMENT 'for interactive collections template',
-  `comments` int(11) unsigned default NULL,
+  `comments` int(11) unsigned NOT NULL,
   `downloads` int(11) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY ( `addon_id` , `collection_id` ),
   KEY `addon_id` (`addon_id`),
-  KEY `user_id` (`user_id`),
   KEY `collection_id` (`collection_id`),
-  KEY `comments` (`comments`),
   CONSTRAINT `addons_collections_ibfk_1` FOREIGN KEY (`addon_id`) REFERENCES `addons` (`id`),
-  CONSTRAINT `addons_collections_ibfk_2` FOREIGN KEY (`collection_id`) REFERENCES `collections` (`id`),
-  CONSTRAINT `addons_collections_ibfk_3` FOREIGN KEY (`comments`) REFERENCES `translations` (`id`)
+  CONSTRAINT `addons_collections_ibfk_2` FOREIGN KEY (`collection_id`) REFERENCES `collections` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
 
---
--- Table structure for table `collection_promos`
--- Named that way because it's not actually a join.
---
-
-DROP TABLE IF EXISTS `collection_promos`;
-CREATE TABLE `collection_promos` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `collection_id` int(11) unsigned NOT NULL default '0',
-  `locale` varchar(10) default NULL,
-  `title_tagline` int(11) unsigned NOT NULL default '0',
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  KEY `collection_id` (`collection_id`),
-  UNIQUE KEY `one_collection_per_tagline_per_locale` (`collection_id`,`locale`,`title_tagline`),
-  CONSTRAINT `collection_features_ibfk_1` FOREIGN KEY (`collection_id`) REFERENCES `collections` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 DROP TABLE IF EXISTS `collections_tags`;
 CREATE TABLE `collections_tags` (
   `collection_id` int(11) unsigned NOT NULL ,
@@ -1103,29 +986,6 @@ CREATE TABLE `collections_tags` (
   CONSTRAINT `collections_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
 
-DROP TABLE IF EXISTS `collection_subscriptions`;
-CREATE TABLE `collection_subscriptions` (
-  `user_id` int(11) unsigned NOT NULL,
-  `collection_id` int(11) unsigned NOT NULL,
-  `created` datetime NOT NULL default '0000-00-00 00:00:00',
-  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY (`user_id`, `collection_id`),
-  CONSTRAINT `collections_subscriptions_ibfk_1` FOREIGN KEY (`collection_id`) REFERENCES `collections` (`id`),
-  CONSTRAINT `collections_subscriptions_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `collections_users`;
-CREATE TABLE `collections_users` (
-  `collection_id` int(11) unsigned NOT NULL default '0',
-  `user_id` int(11) unsigned NOT NULL default '0',
-  `role` tinyint(2) unsigned NOT NULL default '5',
-  PRIMARY KEY  (`collection_id`,`user_id`),
-  KEY `user_id` (`user_id`),
-  CONSTRAINT `collections_users_ibfk_1` FOREIGN KEY (`collection_id`) REFERENCES `collections` (`id`),
-  CONSTRAINT `collections_users_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
 DROP TABLE IF EXISTS `mimes`;
 CREATE TABLE `mimes` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -1220,32 +1080,3 @@ DROP TABLE IF EXISTS `userevents`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-/* These are my TRIGGERS. */
-
-CREATE TRIGGER collections_update_addon_count_insert
-  AFTER INSERT ON addons_collections
-  FOR EACH ROW
-    UPDATE collections AS c
-    SET c.addonCount = c.addonCount + 1
-    WHERE c.id=NEW.collection_id;
-
-CREATE TRIGGER collections_update_addon_count_delete
-  AFTER DELETE ON addons_collections
-  FOR EACH ROW
-    UPDATE collections AS c
-    SET c.addonCount = c.addonCount - 1
-    WHERE c.id=OLD.collection_id;
-
-CREATE TRIGGER collections_update_subscriber_count_insert
-  AFTER INSERT ON collection_subscriptions
-  FOR EACH ROW
-    UPDATE collections AS c
-    SET c.subscribers = c.subscribers + 1
-    WHERE c.id=NEW.collection_id;
-
-CREATE TRIGGER collections_update_subscriber_count_delete
-  AFTER DELETE ON collection_subscriptions
-  FOR EACH ROW
-    UPDATE collections AS c
-    SET c.subscribers = c.subscribers - 1
-    WHERE c.id=OLD.collection_id;
diff --git a/site/app/controllers/addons_controller.php b/site/app/controllers/addons_controller.php
index 5d7e1a3..385d231 100644
--- a/site/app/controllers/addons_controller.php
+++ b/site/app/controllers/addons_controller.php
@@ -46,10 +46,10 @@
 class AddonsController extends AppController
 {
     var $name = 'Addons';
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
-    var $uses = array('Addon', 'AddonCollection', 'AddonTag', 'Addontype', 'Application',
-        'Feature', 'File', 'GlobalStat', 'License', 'Platform', 'Preview', 'Tag', 'Translation',
-        'Review', 'Version', 'Collection', 'CollectionPromo');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
+    var $uses = array('Addon', 'AddonTag', 'Addontype', 'Application',
+        'Feature', 'File', 'Platform', 'Preview', 'Tag', 'Translation', 
+        'Review', 'Version');
     var $components = array('Amo', 'Image', 'Pagination', 'Session', 'Userfunc');
     var $helpers = array('Html', 'Link', 'Time', 'Localization', 'Ajax', 'Number', 'Pagination');
     var $namedArgs = true;
@@ -67,13 +67,13 @@ class AddonsController extends AppController
             redirectWithNewLocaleAndExit(array('addon',$this->params['url']['addons-author-addons-select']));
         }
 
-        // Set of available link sharing services with associated labels and
+        // Set of available link sharing services with associated labels and 
         // submission URL templates.
         // @TODO: Move this to a model class when share counts are enabled in DB
-        $this->link_sharing_services = array(
+        $this->link_sharing_services = array( 
 
             // see: http://digg.com/tools/integrate#3
-            'digg' => array(
+            'digg' => array( 
                 'label' => ___('addons_share_label_digg', 'Digg this!'),
                 'url' => 'http://digg.com/submit?url={URL}&title={TITLE}&bodytext={DESCRIPTION}&media=news&topic=tech_news'
             ),
@@ -112,14 +112,15 @@ class AddonsController extends AppController
      */
     function share($id = null) {
         global $valid_status;
-
+        global $app_listedtypes;
+        
         $_conditions = array(
             'Addon.id' => $id,
             'Addon.inactive' => 0,
-            'Addon.addontype_id' => array(
-                ADDON_EXTENSION, ADDON_THEME, ADDON_DICT,
+            'Addon.addontype_id' => array_merge(array(
+                ADDON_EXTENSION, ADDON_THEME, ADDON_DICT, 
                 ADDON_SEARCH, ADDON_LPAPP, ADDON_PLUGIN
-            ),
+            ), $app_listedtypes[APP_SUGAR]),
             'Addon.status' => $valid_status
         );
         $addon = $this->Addon->find($_conditions, null , null , 1);
@@ -134,17 +135,17 @@ class AddonsController extends AppController
 
         $this->publish('addon_id', $id);
 
-        // Build a suitable link title based on the addon name, version, and
+        // Build a suitable link title based on the addon name, version, and 
         // the site title.
-        $title =
+        $title = 
             sprintf(
-                _('addons_display_pagetitle'),
+                _('addons_display_pagetitle'), 
                 $addon['Translation']['name']['string'].' '.
                 $addon['Version'][0]['version']
-            ) .
+            ) . 
             ' :: '.
             sprintf(
-                _('addons_home_pagetitle'),
+                _('addons_home_pagetitle'), 
                 APP_PRETTYNAME
             );
 
@@ -157,24 +158,21 @@ class AddonsController extends AppController
 
         $this->layout = 'ajax';
     }
-
+    
     /**
     * Display an addon
     * @param int $id the id of the addon
     */
     function display($id = null) {
         global $valid_status;
-        $this->publish('jsAdd', array('jquery-ui/ui.lightbox'));
-        $this->publish('cssAdd', array('jquery-lightbox'));
-        $this->layout = 'amo2009';
-        $this->set('bodyclass', 'inverse');
-
-        $this->forceShadowDb();
+        
         $this->Amo->clean($id);
 
         $this->publish('bigHeader', true);
         $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
-
+    
+        $this->layout='mozilla';
+        
         $loggedIn = $this->Session->check('User')? true : false;
         $this->set('loggedIn', $loggedIn);
 
@@ -182,7 +180,7 @@ class AddonsController extends AppController
             $this->flash(sprintf(_('error_missing_argument'), 'addon_id'), '/', 3);
             return;
         }
-
+        
         $_conditions = array(
             'Addon.id' => $id,
             'Addon.inactive' => 0,
@@ -190,58 +188,23 @@ class AddonsController extends AppController
             'Addon.status' => $valid_status
             );
 
-        $this->Addon->bindOnly('User', 'Version', 'Tag', 'AddonTag');
-        $addon_data = $this->Addon->find($_conditions, null , null , 1);
+        global $app_listedtypes;
+        $_conditions['Addon.addontype_id'] = array_merge($_conditions['Addon.addontype_id'], $app_listedtypes[APP_SUGAR]);
 
+        $addon_data = $this->Addon->find($_conditions, null , null , 1);
+        
         if (empty($addon_data)) {
             $this->flash(_('error_addon_notfound'), '/', 3);
             return;
         }
 
-        // sandbox check
-        if ($addon_data['Addon']['status'] != STATUS_PUBLIC) {
-            $this->publish('addonStatus', STATUS_SANDBOX);
-            $this->status = $valid_status;
-        }
-
-        $_latest_version = $this->Version->getVersionByAddonId($addon_data['Addon']['id'], $this->status);
-        if ($_latest_version > 0) {
-            $version = $this->Version->findAllById($_latest_version, null, "Version.created DESC", 0);
-            $addon_data['Version'] = $version;
-            $this->publish('hasversion', true);
-            $compat_apps = $this->Version->getCompatibleApps($_latest_version);
-            $this->publish('compatible_apps', array_slice($compat_apps, 0, 1));
-            $addon_data['compatible_apps'] = $compat_apps;
-        } else {
-            $this->publish('hasversion', false);
-            $this->publish('compatible_apps', array());
-        }
-
-        // if the latest version is incompatible with the current app, redirect
-        // to a the first valid, compatible version.
-        if (!empty($compat_apps)) {
-            $is_compatible = false;
-            foreach ($compat_apps as $app) {
-                if ($app['Application']['application_id'] == APP_ID) {
-                    $is_compatible = true;
-                    break;
-                }
-            }
-            if (!$is_compatible) {
-                global $app_shortnames;
-                $targetapp = array_search($compat_apps[0]['Application']['application_id'], $app_shortnames);
-                $this->redirect("/{$targetapp}/addon/{$id}", null, true, false);
-                return;
-            }
-        }
-
         // TODO: Look up the current share totals for this addon.
         // $share_counts = $this->ShareCount->getTotalCountsForAddon(
         //     $addon_data['Addon']['id']
         // );
         // $this->set('link_sharing_counts', $share_counts);
 
-        // Not using publish() here because this will all be app constants,
+        // Not using publish() here because this will all be app constants, 
         // localized strings with placeholders, or counts from the DB.
         $this->set('link_sharing_services', $this->link_sharing_services);
 
@@ -252,7 +215,7 @@ class AddonsController extends AppController
         else {
           $this->publish('isAuthor', false);
         }
-
+        
         // get other addons for the author(s)
         foreach ($addon_data['User'] as $_user)
             $_userids[] = $_user['id'];
@@ -274,6 +237,24 @@ class AddonsController extends AppController
         if (in_array($addon_data['Addon']['addontype_id'], array(ADDON_PLUGIN))) {
             $this->redirect('/browse/type:' . $addon_data['Addon']['addontype_id']);
         }
+		
+        // sandbox check 
+        if ($addon_data['Addon']['status'] != STATUS_PUBLIC) {
+            $this->publish('addonStatus', STATUS_SANDBOX);
+            $this->status = $valid_status;
+        }
+        
+        $_latest_version = $this->Version->getVersionByAddonId($addon_data['Addon']['id'], $this->status);
+        if ($_latest_version > 0) {
+            $version = $this->Version->findAllById($_latest_version, null, "Version.created DESC", 0);
+            $addon_data['Version'] = $version;
+            $this->publish('hasversion', true);
+            $compat_apps = $this->Version->getCompatibleApps($_latest_version);
+            $this->publish('compatible_apps', array_slice($compat_apps, 0, 1));
+        } else {
+            $this->publish('hasversion', false);
+            $this->publish('compatible_apps', array());
+        }
 
         $this->publish('previews', $this->Preview->findAllByAddonId($id, array('id', 'addon_id', 'caption'), 'highlight desc'));
 
@@ -281,7 +262,7 @@ class AddonsController extends AppController
         $this->publish('addonIconPath', $this->Image->getAddonIconURL($id), false);
         $this->publish('addonPreviewPath', $this->Image->getHighlightedPreviewURL($id));
         $this->pageTitle = sprintf(_('addons_display_pagetitle'), $addon_data['Translation']['name']['string']). ' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-
+        
         // get the tags that are related to the addon, so that they have translation data
         $_related_tag_ids = array();
         foreach ($addon_data['Tag'] as $tagvalue){
@@ -300,12 +281,12 @@ class AddonsController extends AppController
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
         // Grab the latest 3 reviews by ID, one per user.
         $review_ids = array();
-        $_latest_reviews =
+        $_latest_reviews = 
             $this->Review->findLatestReviewsForAddon($addon_data['Addon']['id'], 3, 1);
-        foreach($_latest_reviews as $_r)
+        foreach($_latest_reviews as $_r) 
             $review_ids[] = $_r['id'];
 
         // Fetch the actual reviews from IDs
@@ -315,8 +296,9 @@ class AddonsController extends AppController
             $reviews = array();
 
         $this->publish('reviews', $reviews);
-        $this->publish('review_count', empty($reviews) ?  0 : $addon_data['Addon']['totalreviews']);
-
+        $this->publish('review_count', empty($reviews) ? 
+            0 : $this->Review->countLatestReviewsForAddon($addon_data['Addon']['id']));
+        
         // does user have a review already?
         $user = $this->Session->read('User');
         if (!empty($user) && $_latest_version > 0) {
@@ -325,253 +307,83 @@ class AddonsController extends AppController
         } else {
             $this->publish('hasreview', false);
         }
-
-        // find collections this add-on is in
-        $pop_collections = array();
-        $_pop_coll_ids = $this->AddonCollection->getPopularCollectionsForAddon($id, 3, APP_ID);
-        if (!empty($_pop_coll_ids)) {
-            $pop_collections = $this->Collection->findAllById($_pop_coll_ids,
-                array('id', 'uuid', 'nickname', 'name'),
-                'FIELD(Collection.id,'.implode(',', $_pop_coll_ids).')', null, null, -1);
-        }
-        $this->publish('pop_collections', $pop_collections);
-        $collection_count = $this->AddonCollection->getCollectionCountForAddon($id, APP_ID);
-        $this->publish('collection_count', $collection_count, false);
-
-        // Fetch user's collections if logged in
-        $userCollections = false;
-        if (!empty($user)) {
-            $userCollectionIds = $this->User->getCollections($user['id'], APP_ID, array($id));
-            $userCollections = $this->Collection->findAll(array(
-                'Collection.id' => $userCollectionIds,
-                'Collection.collection_type' => '<> '.Collection::COLLECTION_TYPE_AUTOPUBLISHER
-                ), array('id', 'name', 'uuid', 'nickname'));
-            $this->publish('userCollections', $userCollections);
-
-            // if an addon was just added to a collection, display a success message
-            if (false !== ($coll_uuid = $this->Session->read('collection_addon_added'))) {
-                $collection_id = $this->Collection->getIdForUUID($coll_uuid);
-                $coll_addon_added = $this->Collection->findById($collection_id, null, null, -1);
-                $this->Session->delete('collection_addon_added');
-                $this->publish('coll_addon_added', $coll_addon_added);
-            }
-        }
-
+        
         // Collapse categories menu
         $this->publish('collapse_categories', true);
     }
-
+    
+    
     /**
      * Display the home page for the entire site.
      */
     function home() {
         $this->forceShadowDb();
-
-        $this->layout='amo2009';
+        global $valid_status, $app_listedtypes;
+        
+        $this->layout='mozilla';
         $this->pageTitle = sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-
-        $this->publish('stats_downloaded',
-            $this->GlobalStat->getNamedCount('addons_downloaded'));
-        $this->publish('stats_inuse',
-            $this->GlobalStat->getNamedCount('addons_in_use'));
-
-        $this->publish('teaser_collection_promos', $this->_findTeaserCollections());
-        $this->publish('teaser_collections_categories', $this->CollectionPromo->titles_and_taglines);
-        $this->publish('popular_collections', $this->_findPopularCollections());
-        $this->publish('promoted_collections', $this->_findCollectionPromoList(true));
-
-        list($featured_type, $featured_addons) = $this->_getFeatured();
-        $this->publish('featured_type',   $featured_type);
-        $this->publish('featured_addons', $featured_addons);
-
+        
+        $feature_ids = $this->Addon->getRecommendedAddons(7);
+        $featureAddons = $this->Addon->getAddonList($feature_ids, array(
+            'all_tags', 'authors', 'compatible_apps', 'files', 'latest_version',
+            'list_details'));
+        $this->publish('featureAddons', $featureAddons);
+        unset($feature_ids, $featureAddons);
+        
+        // Get recommended and popular lists.
+        $list_num = 4;
+        $associations = array('single_tag');
+        
+        $rec_addon_ids = $this->Addon->getRecommendedAddons($list_num);
+        $rec_addons = $this->Addon->getAddonList($rec_addon_ids, $associations);
+        $pop_addon_ids = $this->Addon->getAddonsFromCategory(STATUS_PUBLIC,
+            $app_listedtypes[APP_ID], 'all', 'popular', 'DESC', $list_num, 1, '', false);
+        $pop_addons = $this->Addon->getAddonList($pop_addon_ids, $associations);
+        $new_addon_ids = $this->Addon->getAddonsFromCategory(STATUS_PUBLIC,
+            $app_listedtypes[APP_ID], 'all', 'newest', 'DESC', $list_num, 1, '', false);
+        $new_addons = $this->Addon->getAddonList($new_addon_ids, $associations);
+        $upd_addon_ids = $this->Addon->getAddonsFromCategory(STATUS_PUBLIC,
+            $app_listedtypes[APP_ID], 'all', 'updated', 'DESC', $list_num, 1, '', false);
+        $upd_addons = $this->Addon->getAddonList($upd_addon_ids, $associations);
+        unset($list_num, $rec_addon_ids, $pop_addon_ids, $new_addon_ids, $upd_addon_ids);
+        
+        $this->publish('recAddons', $rec_addons);
+        $this->publish('popAddons', $pop_addons);
+        $this->publish('newAddons', $new_addons);
+        $this->publish('updAddons', $upd_addons);
+		
         // The platforms section is necessary because of CakePHP bug #1183
         // (https://trac.cakephp.org/ticket/1183).  We need the translated
         // strings in the model to offer the right platform to users.
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
         $this->publish('baseurl', $this->base);
         $this->publish('bigHeader', true);
         $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
-
+        
         // add rss links to global feeds
+        // @partial translation fallback, 5/13/08
         $this->publish('rssAdd', array(
             array('/browse/type:1/cat:all/format:rss?sort=newest', _('rss_newestaddons')),
             array('/browse/type:1/cat:all/format:rss?sort=updated', ___('rss_updatedaddons', 'Updated Add-ons')),
-            array('/browse/type:1/cat:all/format:rss?sort=popular', ___('rss_popularaddons', 'Popular Add-ons')),
             array('/recommended/format:rss', _('rss_featuredaddons')),
-        ));
-    }
-
-    /* Used to populate the homepage addons by xhr. */
-    function ajaxy() {
-        list($featured_type, $featured_addons) = $this->_getFeatured();
-        $this->publish('featured_type',   $featured_type);
-        $this->publish('featured_addons', $featured_addons);
-        $this->Platform->unbindFully();
-        $platforms = $this->Platform->findAll();
-        $this->publish('platforms', $platforms);
-    }
-
-    function _getFeatured() {
-        global $app_listedtypes;
-
-        $associations = array(
-            'single_tag', 'all_tags', 'authors', 'compatible_apps', 'files',
-            'latest_version', 'list_details'
-        );
-        $list_num = 5;
-
-        $featured_type = isset($_GET['featured']) ?
-            $_GET['featured'] : 'recommended';
-        switch ($featured_type) {
-            case 'popular':
-                $featured_addon_ids = $this->Addon->getAddonsFromCategory(
-                    STATUS_PUBLIC, $app_listedtypes[APP_ID], 'all', 'popular',
-                    'DESC', $list_num, 1, '', false
-                );
-                break;
-            case 'added':
-                $featured_addon_ids = $this->Addon->getAddonsFromCategory(
-                    STATUS_PUBLIC, $app_listedtypes[APP_ID], 'all', 'newest',
-                    'DESC', $list_num, 1, '', false
-                );
-                break;
-            case 'updated':
-                $featured_addon_ids = $this->Addon->getAddonsFromCategory(
-                    STATUS_PUBLIC, $app_listedtypes[APP_ID], 'all', 'updated',
-                    'DESC', $list_num, 1, '', false
-                );
-                break;
-            case 'recommended':
-            default:
-                $featured_addon_ids = $this->Addon->getRecommendedAddons($list_num);
-                break;
-        }
-        $featured_addons = $this->Addon->getAddonList($featured_addon_ids, $associations);
-
-        return array($featured_type, $featured_addons);
-    }
-
-    /**
-     * Assemble collections for the teaser section of the home page.
-     *
-     * @return array
-     */
-    function _findTeaserCollections() {
-
-        if (APP_ID != APP_FIREFOX) {
-
-            // FYF collections for teaser are only appropriate for Firefox.
-            return array();
-
-        } else {
-            $promoCatList = $this->_findCollectionPromoList();
-            $teaser_collections = array();
-
-            $associations = array(
-                'single_tag', 'all_tags', 'authors', 'compatible_apps', 'files',
-                'latest_version', 'list_details'
-            );
-
-            foreach($promoCatList as $index => $collectionId) {
-                $addons = $this->Addon->getAddonsFromCollection($collectionId, 'RAND()', null, 3);
-                $teaser_collections[] = $this->Addon->getAddonList($addons, $associations);
-            }
-
-            return $teaser_collections;
-        }
-
-    }
-
-    /**
-     * Assemble list of collections promoted per promotion category
-     *
-     * @return array
-    **/
-    function _findCollectionPromoList($bindFully = false) {
-        $collectionPromos = $this->CollectionPromo->findAll();
-        $promoCats = $this->CollectionPromo->titles_and_taglines;
-        $promoCatList = array();
-
-        //Doing this to merge collection ids into promotion categories and allow locale-specific selections to override
-        for($i = 0; $i < count($promoCats); $i++) {
-            $collection = false;
-
-            if(isset($collectionPromos[LANG][$i])) {
-                $collection = $collectionPromos[LANG][$i];
-            } elseif(isset($collectionPromos['all'][$i])) {
-                $collection = $collectionPromos['all'][$i];
-            }
-
-            if($collection) {
-                $id = array_keys($collection);
-                $id = $id[0];
-
-                if($bindFully) {
-                    $promoCatList[] = $this->Collection->findById($id);
-                } else {
-                    $promoCatList[] = $id;
-                }
-            }
-        }
-
-        return $promoCatList;
-    }
-
-
-
-
-
-    /**
-     * Fetch top 5 popular collections by subscriber count, return a
-     * stripped-down data structure for use by view.
-     *
-     * @return array
-     */
-    function _findPopularCollections() {
-
-        // Unbind and re-bind with just users and addons, then look up top 5
-        // popular collections in descending order.
-        $this->Collection->unbindFully();
-        $this->Collection->bindModel(array(
-            'hasAndBelongsToMany' => array(
-                'Users' => $this->Collection->hasAndBelongsToMany_full['Users'],
-                'Addon' => $this->Collection->hasAndBelongsToMany_full['Addon']
-            )
-        ));
-        $collections = $this->Collection->findAll(array(
-            'Collection.listed' => 1,
-            'Collection.application_id' => APP_ID
-        ), null, 'Collection.subscribers DESC', 5);
-
-        // Reduce the results from the model to the minimal set needed
-        // by the view, because escaping is expensive.
-        $pop_collections = array();
-        foreach ($collections as $c) {
-            $authors = array();
-            foreach ($c['Users'] as $u) {
-                $authors[] = array(
-                    'id'        => $u['id'],
-                    'firstname' => $u['firstname'],
-                    'lastname'  => $u['lastname'],
-                    'nickname'  => $u['nickname']
-                );
-            }
-            $pop_collections[] = array(
-                'uuid'         => $c['Collection']['uuid'],
-                'nickname'     => $c['Collection']['nickname'],
-                'authors'      => $authors,
-                'icon_url'     => $this->Image->getCollectionIconURL($c['Collection']['id']),
-                'name'         => $c['Translation']['name']['string'],
-                'description'  => $c['Translation']['description']['string'],
-                'subscribers'  => $c['Collection']['subscribers'],
-                'addons_count' => count($c['Addon'])
-            );
+            ));
+        
+        // User name for Welcome message
+        if ($session = $this->Session->read('User')) {
+            if (!empty($session['firstname']))
+                $welcomeName = $session['firstname'];
+            elseif (!empty($session['nickname']))
+                $welcomeName = $session['nickname'];
+            elseif (!empty($session['lastname']))
+                $welcomeName = $session['lastname'];
+            else
+                $welcomeName = '';
+            
+            $this->publish('welcomeName', $welcomeName);
         }
-
-        return $pop_collections;
     }
 
     /**
@@ -581,7 +393,7 @@ class AddonsController extends AppController
         global $valid_status;
 
         // Get the type of addon, defaulting to themes
-        $addontype = isset($this->namedArgs['type']) ?
+        $addontype = isset($this->namedArgs['type']) ? 
             $this->namedArgs['type'] : ADDON_THEME;
 
         // Get the addon category, defaulting to 'all'
@@ -590,7 +402,7 @@ class AddonsController extends AppController
 
         $this->Tag->unbindFully();
         $this_tag = $this->Tag->findById($category);
-
+        
         // show experimental add-ons?
         if (isset($this->params['url']['exp'])) {
             /* experimental add-ons requested */
@@ -629,7 +441,7 @@ class AddonsController extends AppController
             $sort_by = $this->namedArgs['sort'];
         else
             $sort_by = '';
-
+        
         $allowed_sort_by = array(
             'name', 'updated', 'newest', 'popular', 'rated'
         );
@@ -657,7 +469,7 @@ class AddonsController extends AppController
         list($_order,$_limit,$_page) = $this->Pagination->init();
 
         $addons = $this->Addon->getAddonsByCategory(
-            null, $displaystatuses, $addontype, $category,
+            null, $displaystatuses, $addontype, $category, 
             $sort_by, $sort_dir, $_limit, $_page, '', true
         );
 
@@ -670,16 +482,16 @@ class AddonsController extends AppController
         $this->publish('subcats',       $subcats);
         $this->publish('all_total',     $all_total);
         $this->publish('subcat_totals', $subcat_totals);
-
+        
         $format = (isset($this->namedArgs['format']) ? $this->namedArgs['format'] : 'html');
-
+        
         $this->set('content_wide', true); // display 2 features next to each other
-
+        
         $this->publish('collapse_categories', true);
-
+       
         switch($addontype) {
-            case ADDON_THEME:
-                $this->pageTitle = sprintf(___('addons_browse_categories_header_theme'), $this_tag['Translation']['name']['string'], APP_PRETTYNAME);
+            case ADDON_THEME: 
+                $this->pageTitle = sprintf(___('addons_browse_categories_header_theme'), $this_tag['Translation']['name']['string'], APP_PRETTYNAME); 
                 break;
             default:
                 $this->pageTitle = sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
@@ -687,7 +499,7 @@ class AddonsController extends AppController
 
         $this->publish('bigHeader', true);
         $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
-
+        
         $this->layout = 'mozilla';
 
         $this->render('browse_thumbs');
@@ -698,8 +510,7 @@ class AddonsController extends AppController
      */
     function browse() {
         global $app_listedtypes, $hybrid_categories;
-
-        $this->forceShadowDb();
+        
         if (!isset($this->namedArgs['type'])) {
             // @TODO throw a 404 error
             $this->redirect('/');
@@ -717,7 +528,7 @@ class AddonsController extends AppController
             $this->redirect('/');
             break;
         }
-
+        
         if (!isset($this->namedArgs['cat'])) {
             switch ($this->namedArgs['type']) {
             case ADDON_SEARCH:
@@ -729,7 +540,7 @@ class AddonsController extends AppController
             case ADDON_PLUGIN: // undeleted this -cpollett
                 $this->_plugins();
                 break;
-
+            
             case ADDON_DICT:
                 $this->_dictionaries();
                 break;
@@ -743,7 +554,7 @@ class AddonsController extends AppController
             }
             return;
         }
-
+        
         /* redirect category hybrids to respective addontype page
          * (unless we have selected a full listing page (?sort=something)) */
         $cat = $this->namedArgs['cat'];
@@ -752,7 +563,7 @@ class AddonsController extends AppController
             $this->redirect("/browse/type:{$hybrid_categories[APP_ID][$cat]}");
             return;
         }
-
+        
         /* display generic cat landing page or full category listing page */
         if (isset($_GET['sort']) || isset($this->namedArgs['sort'])) {
 
@@ -769,47 +580,6 @@ class AddonsController extends AppController
         }
     }
 
-    function _buildMinimalAddonDetails($addons) {
-        $view_data = array();
-
-        foreach ($addons as $addon) {
-            $addon_id = $addon['Addon']['id'];
-
-            $r = array(
-                'icon_url' =>
-                    $this->Image->getAddonIconURL($addon_id),
-                'preview_url' =>
-                    $this->Image->getHighlightedPreviewURL($addon_id),
-                'version' =>
-                    $addon['Version'][0]['version']
-            );
-
-            $a_fields = array(
-                'id','guid','averagerating','created','modified',
-                'weeklydownloads','totaldownloads'
-            );
-            foreach ($a_fields as $field)
-                $r[$field] = $addon['Addon'][$field];
-
-            $t_fields = array('name','summary','description');
-            foreach ($t_fields as $field)
-                $r[$field] = $addon['Translation'][$field]['string'];
-
-            $u_fields = array('id', 'firstname', 'lastname', 'nickname');
-            $r['authors'] = array();
-            if (!empty($addon['User'])) foreach ($addon['User'] as $idx=>$user) {
-                foreach ($u_fields as $field)
-                    $r['authors'][$idx][$field] = $user[$field];
-            }
-
-            $r['latestversion'] = $addon['Version'][0]['version'];
-
-            $view_data[] = $r;
-        }
-
-        return $view_data;
-    }
-
     /**
      * Generic landing page for a specific add-on category
      *
@@ -818,85 +588,61 @@ class AddonsController extends AppController
      * @access private
      */
     function _categoryLanding() {
-        global $valid_status, $app_listedtypes;
-
+        global $valid_status;
+        
         $valid_status = array(STATUS_PUBLIC);
 
         $format = $this->setLayoutForFormat();
-
+        
         $addontype = $this->namedArgs['type'];
         $this->Amo->clean($addontype);
-        $this->publish('type_id', $addontype);
-
+        
         $category = $this->namedArgs['cat'];
         $this->Amo->clean($category);
-        $this->publish('cat_id', $category);
-
         $this->Tag->unbindFully();
         $this_tag = $this->Tag->findById($category);
-        $this->publish('this_tag', $this_tag);
-
-        // Build a minimal set of addon details for publishing to view.
-        $_feat_ids = $this->AddonTag->getRandomAddons($category, true,  6, null, $addontype=='all' ? null : $addontype);
-        if (count($_feat_ids) > 0) {
-            $_order_by = 'FIELD(Addon.id, '.implode(',', $_feat_ids).')';
+        
+        // fetch 5 recommended add-ons for slider
+        $_feat_ids = $this->AddonTag->getRandomAddons($category, true,  5, null, $addontype=='all' ? null : $addontype);
+        if (!empty($_feat_ids)) {
+            $featureAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
+                'FIELD(Addon.id,'.implode(',', $_feat_ids).')', true);
         } else {
-            $_order_by = 'Addon.id';
+            $featureAddons = false;
         }
-        $featureAddons = $this->Addon->getListAddons($_feat_ids, $valid_status, $_order_by, true);
-
-        $this->publish('featured_addons', $featureAddons);
-
-        $list_num = 10;
-
-        $pop_addon_ids = $this->Addon->getAddonsFromCategory(
-            STATUS_PUBLIC, $app_listedtypes[APP_ID], $category,
-            'popular', 'DESC', $list_num, 1, '', false
-        );
-        $pop_addons = $this->_buildMinimalAddonDetails(
-            $this->Addon->getListAddons($pop_addon_ids, $valid_status, 'Addon.weeklydownloads DESC')
-        );
-
-        $this->publish('popular_addons', $pop_addons);
-
-        $new_addon_ids = $this->Addon->getAddonsFromCategory(
-            STATUS_PUBLIC, $app_listedtypes[APP_ID], $category, 'newest',
-            'DESC', $list_num, 1, '', false
-        );
-        $new_addons = $this->_buildMinimalAddonDetails(
-            $this->Addon->getListAddons($new_addon_ids, $valid_status, 'Addon.created DESC')
-        );
-
-        $this->publish('new_addons', $new_addons);
-
-        $upd_addon_ids = $this->Addon->getAddonsFromCategory(
-            STATUS_PUBLIC, $app_listedtypes[APP_ID], $category,
-            'rated', 'DESC', $list_num, 1, '', false
-        );
-        $upd_addons = $this->_buildMinimalAddonDetails(
-            $this->Addon->getListAddons($upd_addon_ids, $valid_status, 'Addon.bayesianrating DESC')
-        );
-
-        $this->publish('updated_addons', $upd_addons);
-
+        
+        // fetch another 3 random add-ons
+        $_feat_ids = $this->AddonTag->getRandomAddons($category, false, 3, null, $addontype=='all' ? null : $addontype);
+        if (!empty($_feat_ids)) {
+            $randomAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
+                'FIELD(Addon.id,'.implode(',', $_feat_ids).')', false);
+        } else {
+            $randomAddons = false;
+        }
+        
+        $this->publish('featureAddons', $featureAddons);
+        $this->publish('randomAddons', $randomAddons);
+        unset($featureAddons);
+        unset($randomAddons);
+        
         // fetch all platforms
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
+        // set data available to view
+        $this->publish('type_id', $addontype);
+        $this->publish('cat_id', $category);
+        $this->publish('this_tag', $this_tag);
         $this->set('content_wide', false); // display features next to each other
         $this->publish('collapse_categories', false);
-
+        
         // set layout details
         $this->publish('bigHeader', true);
-        $this->publish('bigHeaderText',
-            sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
-
-        $this->pageTitle = $this_tag['Translation']['name']['string']. " :: " .
-            sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-        $this->publish('rssAdd', array(
-            "/browse/type:{$addontype}/cat:{$category}/format:rss?sort=updated"
-        ));
+        $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
+        
+        $this->pageTitle = $this_tag['Translation']['name']['string']. " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
+        $this->publish('rssAdd', array("/browse/type:{$addontype}/cat:{$category}/format:rss?sort=updated"));
         $this->render('category_landing');
     }
 
@@ -904,16 +650,21 @@ class AddonsController extends AppController
      * Add-on listing page for a specific category
      *
      * Relevant URL format: /browse/type:1/cat:15?sort=name
-     *
+     * 
      * @access private
      */
     function _browseAddonsInCategory() {
         global $valid_status, $app_listedtypes;
-
+        
         $addontype = $this->namedArgs['type'];
         $category = $this->namedArgs['cat'];
         $format = $this->setLayoutForFormat();
-
+        
+        // we are sugar
+        if (true) {
+            $this_tag = $category == 'all' ? array() : $this->Tag->findById($category);
+            $addontype = $addontype == 'all' ? $app_listedtypes[APP_SUGAR] : $addontype;
+        } else
         // type:1 && cat:all shows a global add-ons list (not extensions only)
         if ($addontype == ADDON_EXTENSION && $category == 'all') {
             $this_tag = array();
@@ -922,7 +673,7 @@ class AddonsController extends AppController
             $this->Tag->unbindFully();
             $this_tag = $this->Tag->findById($category);
         }
-
+        
         // determine list sort order
         if (isset($this->params['url']['sort']))
             $sort_by = $this->params['url']['sort'];
@@ -947,7 +698,7 @@ class AddonsController extends AppController
             $sort_dir = 'asc';
             break;
         }
-
+        
         // show experimental add-ons?
         if (isset($this->params['url']['exp'])) {
             /* experimental add-ons requested */
@@ -970,7 +721,7 @@ class AddonsController extends AppController
         }
         $this->set('show_exp', $show_exp);
         $displaystatuses = ($show_exp ? $valid_status : array(STATUS_PUBLIC));
-
+        
         if ($format != 'rss') {
             // initialize pagination component
             $this->Pagination->total = $this->Addon->countAddonsInCategory(
@@ -984,7 +735,7 @@ class AddonsController extends AppController
             $_limit = 20;
             $_page = 1;
         }
-
+        
         // get enough addons for one page.
         $addons = $this->Addon->getAddonsByCategory(null, $displaystatuses,
             $addontype, $category, $sort_by, $sort_dir, $_limit, $_page, '', true);
@@ -993,14 +744,14 @@ class AddonsController extends AppController
             return;
         }
         $this->publish('addons', $addons);
-
+        
         // get platforms (if we are not in RSS mode)
         if ($format != 'rss') {
             $this->Platform->unbindFully();
             $platforms = $this->Platform->findAll();
             $this->publish('platforms', $platforms);
         }
-
+        
         // get other categories list (or all, if this is a complete list)
         $_tags = $this->Tag->query("SELECT DISTINCT t.id FROM tags AS t "
             ."INNER JOIN addons_tags AS at ON (t.id = at.tag_id) "
@@ -1018,14 +769,15 @@ class AddonsController extends AppController
             foreach($tag_list as $_tag) $_tag_names[] = $_tag['Translation']['name']['string'];
             array_multisort($_tag_names, SORT_ASC, $tag_list);
         }
-
+        
         // set data available to view
         $this->publish('this_tag', $this_tag);
         $this->set('type', $addontype);
         $this->publish('tagList', $tag_list);
-
+        
         // set layout details and render view
         if ($category == 'all') {
+            // @partial translation fallback, 5/13/08
             switch ($sort_by) {
                 case 'popular': $_title = ___('browse_addons_popular'); break;
                 case 'updated': $_title = ___('browse_addons_updated'); break;
@@ -1040,15 +792,15 @@ class AddonsController extends AppController
         if ($format != 'rss') {
             $this->pageTitle = $_title . " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
             $this->publish('subpagetitle', $_title);
-
+            
             // preserve GET variables in RSS feed URLs
             $_rss_get = array();
             foreach($_GET as $_getkey => $_getitem)
                 if ($_getkey != 'url') $_rss_get[] = urlencode($_getkey).'='.urlencode($_getitem);
             $this->publish('rssAdd', array("/browse/type:{$this->namedArgs['type']}/cat:{$category}/format:rss?".implode('&', $_rss_get)));
-
+            
             $this->set('collapse_categories', true);
-
+            
             $this->render('browse');
         } else {
             // RSS feed
@@ -1067,9 +819,9 @@ class AddonsController extends AppController
         global $hybrid_categories, $valid_status;
 
         $valid_status = array(STATUS_PUBLIC);
-
+        
         $format = (isset($this->namedArgs['format']) ? $this->namedArgs['format'] : 'html');
-
+        
         // fetch the category belonging to this hybrid page
         $category = array_search(ADDON_SEARCH, $hybrid_categories[APP_ID]);
         if ($category) {
@@ -1079,20 +831,20 @@ class AddonsController extends AppController
             $this_tag = null;
         }
         $this->publish('this_tag', $this_tag);
-
+        
         // fetch a list of all subcategories
         $subcats = $this->Amo->getTags(APP_ID, ADDON_SEARCH);
         $this->publish('subcats', $subcats);
-
+        
         // make subcategory ID list to grab recommendations from
         $subcat_ids = array();
         foreach ($subcats as $subcat)
             $subcat_ids[] = $subcat['Tag']['id'];
         // add hybrid category for possible other recommendations
         $subcat_ids[] = $this_tag['Tag']['id'];
-
-        // fetch up to 4 recommended add-ons
-        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, true, 4);
+        
+        // fetch up to 2 recommended add-ons
+        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, true, 2);
         if (!empty($_feat_ids)) {
             $featureAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
                 null, true);
@@ -1100,12 +852,22 @@ class AddonsController extends AppController
             $featureAddons = array();
         }
         $this->publish('featureAddons', $featureAddons);
-
+        
+        // fetch 2 random ones.
+        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, false, 2);
+        if (!empty($_feat_ids)) {
+            $randomAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
+                null, true);
+        } else {
+            $randomAddons = false;
+        }
+        $this->publish('randomAddons', $randomAddons);
+        
         // fetch all platforms
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
         if ($format != 'rss') {
             $this->set('content_wide', true); // display 2 features next to each other
             $this->set('collapse_categories', true);
@@ -1115,7 +877,7 @@ class AddonsController extends AppController
             $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
             $this->layout='mozilla';
             //$this->publish('rssAdd', array("/browse/type:".ADDON_SEARCH."/format:rss"));
-
+            
             $this->render('searchengines');
         } else {
             // RSS feed
@@ -1135,15 +897,15 @@ class AddonsController extends AppController
         $this->render('plugins');
         return;
     }
-
+    
     /**
      * dictionaries / language tools landing page
      */
     function _dictionaries() {
         global $valid_status, $native_languages;
-
+        
         $format = (isset($this->namedArgs['format']) ? $this->namedArgs['format'] : 'html');
-
+        
         // get list of target locales
         $conditions = array(
             'Addon.addontype_id' => array(ADDON_DICT, ADDON_LPAPP),
@@ -1155,7 +917,7 @@ class AddonsController extends AppController
         $target_locales = array();
         foreach ($target_locales_raw as $tloc) $target_locales[] = $tloc[0]['target_locale'];
         unset($target_locales_raw);
-
+        
         // get list of dictionaries and language packs for each target locale
         $dicts = array();
         foreach($target_locales as $tloc) {
@@ -1164,7 +926,7 @@ class AddonsController extends AppController
                 ADDON_DICT => array(),
                 ADDON_LPAPP  => array()
             );
-
+            
             // get addons for this target locale
             $conditions = array(
                 'LOWER(Addon.target_locale)' => $tloc,
@@ -1174,7 +936,7 @@ class AddonsController extends AppController
             );
             $this->Addon->unbindfully();
             $dicts_raw = $this->Addon->findAll($conditions, null, null, null, null, 2);
-
+            
             $_dict_ids = array();
             foreach ($dicts_raw as $_dict)
                 $_dict_ids[] = $_dict['Addon']['id'];
@@ -1183,24 +945,24 @@ class AddonsController extends AppController
             $tloc_dicts = $this->Addon->getListAddons($_dict_ids, array(STATUS_PUBLIC), null, true);
             foreach ($tloc_dicts as $dict) { // add add-ons to results array
                 if (empty($dict['File'])) continue;
-
+                
                 // purge add-ons incompatible with this app
                 $compat = $this->Version->getCompatibleApps($dict['Version'][0]['id']);
                 $thisapp_compat = false;
                 foreach ($compat as $compat_app)
                     $thisapp_compat = $thisapp_compat || ($compat_app['Application']['application_id'] == APP_ID);
                 if (!$thisapp_compat) continue;
-
+                
                 $dicts[$tloc][$dict['Addon']['addontype_id']][] = $dict;
             }
             unset($dict, $compat, $thisapp_compat, $compat_app);
-
+            
             /* determine the effective display name for this target locale */
             $locale_parts = explode('-', strtolower(str_replace('_', '-', $tloc)));
             // normalize region part
             if (isset($locale_parts[1])) $locale_parts[1] = strtoupper($locale_parts[1]);
             $normalized_locale = implode('-', $locale_parts);
-
+            
             $displayname = false;
             while (true) {
                 $locale = strtolower(implode('-', $locale_parts));
@@ -1241,12 +1003,12 @@ class AddonsController extends AppController
         // sort dictionary list by effective display name
         uasort($dicts, create_function('$a,$b', 'return strcasecmp($a["displayname"],$b["displayname"]);'));
         $this->publish('dicts', $dicts);
-
+        
         // fetch all platforms
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
         // set layout details
         $this->pageTitle = _('langtools_header_dicts_and_langpacks') .' :: '
             . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
@@ -1254,7 +1016,7 @@ class AddonsController extends AppController
         $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
         $this->layout = 'mozilla';
         $this->set('collapse_categories', true);
-
+        
         $this->render('dictionaries');
     }
 
@@ -1265,20 +1027,20 @@ class AddonsController extends AppController
         global $valid_status;
 
         $valid_status = array(STATUS_PUBLIC);
-
+        
         $format = (isset($this->namedArgs['format']) ? $this->namedArgs['format'] : 'html');
-
+        
         // fetch a list of all subcategories
         $subcats = $this->Amo->getTags(APP_ID, ADDON_THEME);
         $this->publish('subcats', $subcats);
-
+        
         // make subcategory ID list to grab recommendations from
         $subcat_ids = array();
         foreach ($subcats as $subcat)
             $subcat_ids[] = $subcat['Tag']['id'];
-
+        
         // fetch up to 2 recommended add-ons
-        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, true, 4);
+        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, true, 2);
         if (!empty($_feat_ids)) {
             $featureAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
                 null, true);
@@ -1286,12 +1048,22 @@ class AddonsController extends AppController
             $featureAddons = array();
         }
         $this->publish('featureAddons', $featureAddons);
-
+        
+        // fetch 2 random ones.
+        $_feat_ids = $this->AddonTag->getRandomAddons($subcat_ids, false, 2);
+        if (!empty($_feat_ids)) {
+            $randomAddons = $this->Addon->getListAddons($_feat_ids, $valid_status,
+                null, true);
+        } else {
+            $randomAddons = array();
+        }
+        $this->publish('randomAddons', $randomAddons);
+        
         // fetch all platforms
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('platforms', $platforms);
-
+        
         // set layout details
         $this->set('content_wide', true); // display 2 features next to each other
         $this->set('collapse_categories', true);
@@ -1299,7 +1071,7 @@ class AddonsController extends AppController
         $this->publish('bigHeader', true);
         $this->publish('bigHeaderText', sprintf(_('addons_home_header_details'), APP_PRETTYNAME));
         $this->layout = 'mozilla';
-
+        
         $this->render('themes_landing');
     }
 
@@ -1313,7 +1085,7 @@ class AddonsController extends AppController
         //override sandbox, recommended page is only public
         $this->publish('addonStatus', array(STATUS_PUBLIC));
         $this->status = array(STATUS_PUBLIC);
-
+        
         $criteria = "Feature.start < NOW() AND Feature.end > NOW() AND Feature.application_id ='" . APP_ID . "' AND "
             ."(Feature.locale = '" . LANG . "' or Feature.locale IS NULL)";
         if (isset($this->namedArgs['format']) && $this->namedArgs['format'] == 'rss') {
@@ -1323,14 +1095,14 @@ class AddonsController extends AppController
             $isrss = false;
             $order = "RAND()";
         }
-
+		
         $_addon_ids = array();
 
-
+		
         if(isset($this->namedArgs['cat']))
         {
            $category = $this->namedArgs['cat'];
-           $this->Amo->clean($category);
+           $this->Amo->clean($category);		
            $criteria = "feature > 0 AND tag_id='".$category."'";
            $featAddons = $this->AddonTag->findAll($criteria);
 
@@ -1338,23 +1110,21 @@ class AddonsController extends AppController
                $_addon_ids[] = $_addon['AddonTag']['addon_id'];
 
         } else {
-            $featAddons = $this->Feature->findAll($criteria);
+            $featAddons = $this->Feature->findAll($criteria);		
             foreach ($featAddons as $_addon)
                $_addon_ids[] = $_addon['Addon']['id'];
         }
-        if (!empty($_addon_ids)) {
+        if (!empty($_addon_ids))
             $featAddons = $this->Addon->getListAddons($_addon_ids, $this->status, $order, true);
-        } else {
+        else
             $featAddons = array();
-        }
-
-
+        
         if (!$isrss) {
             // get platforms (if we are not in RSS mode)
             $this->Platform->unbindFully();
             $platforms = $this->Platform->findAll();
             $this->publish('platforms', $platforms);
-
+            
             $this->layout='mozilla';
             $this->pageTitle = _('addons_recommended_pagetitle').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
             $this->publish('addons', $featAddons);
@@ -1368,7 +1138,7 @@ class AddonsController extends AppController
             $this->render('rss/addons', 'rss');
         }
     }
-
+    
     /**
      * page to display eula prior to installation
      */
@@ -1376,14 +1146,13 @@ class AddonsController extends AppController
         $this->Amo->clean($lightbox);
         $this->Amo->clean($addon_id);
         $this->Amo->clean($file_id);
-
-        $this->layout='amo2009';
-
+        
+        $this->layout='mozilla';
         if (!$addon_id || !is_numeric($addon_id)) {
             $this->flash(sprintf(_('error_missing_argument'), 'addon_id'), '/', 3);
             return;
         }
-
+    
         $this->Addon->unbindFully();
         $this->Addon->bindModel(
             array(
@@ -1403,31 +1172,22 @@ class AddonsController extends AppController
                 )
             )
         );
-
+        
         $this_addon = $this->Addon->findById($addon_id);
         if (empty($this_addon)) {
             $this->flash(_('error_addon_notfound'), '/', 3);
             return;
         }
-
+        
         if (isset($file_id)) {
             $this->File->unbindFully();
             $this_file = $this->File->findById($file_id);
             $this_addon['Version'] =  $this->Version->findAllById($this_file['File']['version_id'], null, null, 0);
-
-            // is this the latest public version?
-            if ($this_addon['Addon']['status'] == STATUS_PUBLIC) {
-                $latest_version_id = $this->Version->getVersionByAddonId($addon_id, $this_addon['Addon']['status']);
-                $this->publish('is_latest', ($latest_version_id === $this_addon['Version'][0]['Version']['id']), false);
-            } else {
-                $this->publish('is_latest', false, false);
-            }
-
             $this->Platform->unbindFully();
             $platforms = $this->Platform->findAllById($this_file['File']['platform_id']);
             $this->publish('platforms', $platforms);
         }
-        else {
+        else { 
             $this->publish('policy', 1);
         }
         // get the tags that are related to the addon, so that they have translation data
@@ -1437,12 +1197,13 @@ class AddonsController extends AppController
         }
         $related_tags = $this->Tag->findAll(array('Tag.id' => $_related_tag_ids, 'Tag.application_id' => APP_ID));
         unset($_related_tag_ids);
-
+        
 
         $this->publish('relatedTags', $related_tags);
         $this->publish('addon', $this_addon);
+        $this->publish('addonIconPath', $this->Image->getAddonIconURL($addon_id), false);
         $this->pageTitle = sprintf(_('addons_display_pagetitle'), $this_addon['Translation']['name']['string']). ' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-
+        
 
     }
 
@@ -1452,16 +1213,16 @@ class AddonsController extends AppController
     function previews($id) {
         $this->Amo->clean($id);
         $this->layout = 'mozilla';
-
+        
         if (!$id || !is_numeric($id)) {
             $this->flash(sprintf(_('error_missing_argument'), 'addon_id'), '/', 3);
             return;
         }
-
+        
         $addon_data = $this->Addon->find(array(
             'Addon.id' => $id,
             'Addon.inactive' => '0',
-            'Addon.status' => array(STATUS_PUBLIC, STATUS_SANDBOX, STATUS_NOMINATED)),
+            'Addon.status' => array(STATUS_PUBLIC, STATUS_SANDBOX, STATUS_NOMINATED)), 
             null , null , 1);
         if (empty($addon_data)) {
             $this->flash(_('error_addon_notfound'), '/', 3);
@@ -1491,20 +1252,14 @@ class AddonsController extends AppController
      */
     function versions($id) {
         global $valid_status;
-
+        
         $this->Amo->clean($id);
 
         // unbind addon from all references but its authors
         $bindusers = array('hasAndBelongsToMany' => array('User' => $this->Addon->hasAndBelongsToMany['User']));
         $this->Addon->unbindFully();
         $this->Addon->bindModel($bindusers);
-        $addon = $this->Addon->find(array('Addon.id'=>$id,
-            'Addon.status'=>$valid_status, 'Addon.inactive'=>0), null, null,
-            null, null, 0);
-        if (empty($addon)) {
-            $this->flash(_('error_addon_notfound'), '/', 3);
-            return;
-        }
+        $addon = $this->Addon->findById($id, null, null, null, null, 0);
 
         // show all valid (even experimental) statuses on versions page
         $version_list = $this->Version->getVersionIdsByAddonId($id, $valid_status);
@@ -1512,39 +1267,36 @@ class AddonsController extends AppController
         $version_ids = array();
 		$comp_apps_by_id = array();
         foreach ($version_list as $single_id) {
-            $cur_id = $single_id['Version']['id'];
+            $cur_id = $single_id['Version']['id'];		
             $version_ids[] = $cur_id;
             $compat_apps = $this->Version->getCompatibleApps($cur_id);
             $comp_apps_by_id[$cur_id] = array_slice($compat_apps, 0, 1);
-        }
-
-        if (!empty($version_ids)) {
+        }			
+		
+        if (!empty($version_ids)) {		
             $versions = $this->Version->findAllById($version_ids, null, "Version.created DESC", null, null, 1);
-
-            for($i =0 ; $i < count($versions); $i++) {
-                $versions[$i]['Compatibility'] = $comp_apps_by_id[$versions[$i]['Version']['id'] ];
-	        }
-        }
+			
+            for($i =0 ; $i < count($versions); $i++) {			
+                $versions[$i]['Compatibility'] = $comp_apps_by_id[$versions[$i]['Version']['id'] ];	
+	        }					
+        }			
         else
             $versions = array();
-
+ 		
         $this->Platform->unbindFully();
         $platforms = $this->Platform->findAll();
         $this->publish('addon', $addon);
         $this->publish('versions', $versions);
         $this->publish('platforms', $platforms);
-
+        
         $_title = sprintf(_('addons_versions_pagetitle'), $addon['Translation']['name']['string']);
         if (!isset($this->namedArgs['format']) || $this->namedArgs['format'] != 'rss') {
             $this->publish('addonIconPath', $this->Image->getAddonIconURL($id));
             $this->pageTitle = $_title. ' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
             $this->publish('subpagetitle', $_title);
             $this->publish('rssAdd', array("/addons/versions/{$id}/format:rss"));
-
-            $this->publish('breadcrumbs', array(
-                sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-                $addon['Translation']['name']['string'] => "/addon/{$id}"
-            ));
+            
+            $this->layout = 'mozilla';
             $this->render();
         } else {
             $this->publish('rss_title', $_title);
@@ -1559,19 +1311,19 @@ class AddonsController extends AppController
     function rss($type='') {
         $this->Amo->clean($type);
         $type = strtolower($type);
-
+        
         switch($type) {
         case 'newest':
             $this->redirect('/browse/type:1/cat:all/format:rss?sort=newest');
             return;
             break;
-
+        
         default:
             $this->redirect('/');
             return;
         }
     }
-
+    
 }
 
 ?>
diff --git a/site/app/controllers/admin_controller.php b/site/app/controllers/admin_controller.php
index d9ae3ec..7495e90 100644
--- a/site/app/controllers/admin_controller.php
+++ b/site/app/controllers/admin_controller.php
@@ -39,7 +39,7 @@
 class AdminController extends AppController
 {
     var $name = 'Admin';
-    var $uses = array('Addon', 'Addontype', 'Application', 'Approval', 'Appversion', 'Cannedresponse', 'Collection', 'CollectionPromo', 'Eventlog', 'Feature', 'File', 'Group', 'Platform', 'Tag', 'Translation', 'User', 'Version', 'Memcaching');
+    var $uses = array('Addon', 'Addontype', 'Application', 'Approval', 'Appversion', 'Cannedresponse', 'Eventlog', 'Feature', 'File', 'Group', 'Platform', 'Tag', 'Translation', 'User', 'Version', 'Memcaching');
     var $components = array('Amo', 'Audit', 'Developers', 'Error', 'Versioncompare');
     var $helpers = array('Html', 'Javascript');
     //These defer to their own access checks
@@ -67,11 +67,12 @@ class AdminController extends AppController
         
         $this->set('jsAdd', array('developers',
                                   'jquery-compressed.js',
-                                  'jquery.autocomplete.pack.js'));
+                                  'jquery.autocomplete.js'));
         $this->set('suppressJQuery', 1);
         
         $this->breadcrumbs = array('Admin Control Panel' => '/admin/index');
         $this->set('breadcrumbs', $this->breadcrumbs);
+        $this->set('suppressJQuery', 1);
 
         $this->set('subpagetitle', 'Admin Control Panel');
         
@@ -113,7 +114,7 @@ class AdminController extends AppController
             }
             
             if (!defined('USERAPP')) {
-                define('USERAPP', 1); // Firefox
+                define('USERAPP', SITE_APP); // Firefox
             }
 
             $this->Session->write('Features', array('userlang' => USERLANG, 'userapp' => USERAPP));
@@ -151,10 +152,11 @@ class AdminController extends AppController
         $this->set('last24', $last24);
         
         //Counts
-        $count['extensions'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_EXTENSION);
-        $count['themes'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_THEME);
-        $count['dictionaries'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_DICT);
-        $count['searchengines'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_SEARCH);
+        $count['activities'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_ACTIVITY);
+        //$count['extensions'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_EXTENSION);
+        //$count['themes'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_THEME);
+        //$count['dictionaries'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_DICT);
+        //$count['searchengines'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_SEARCH);
         $now = time();
         $count['activeSessions'] = $this->Addon->query("SELECT COUNT(*) FROM cake_sessions WHERE expires > {$now}");
         $this->set('count', $count);
@@ -522,77 +524,6 @@ class AdminController extends AppController
         $this->set('page', 'applications');
         $this->render('applications_create');    
     }
-
-   /**
-    * Collections Manager
-    */
-    function collections($action='') {
-        switch($action) {
-            case 'promobox':
-                $this->_collectionsPromoBox();
-                break;
-            default:
-                $this->set('page', 'collections');
-                $this->render('collections');
-                break;
-        }
-    }
-
-    function _collectionsPromoBox() {
-
-        if (!empty($_POST)) {
-            switch ($_POST['action']) {
-                case 'add':
-                    global $valid_languages;
-                    // It's easiest just to split out the stuff we need here and pass it into a custom function.
-                    if (preg_match('/\[(\d+)\]/', $this->data['Collection']['name'], $matches)) {
-                        $_collection_id = $matches[1];
-                    } else {
-                        $this->Error->addError('Collection ID must be specified in brackets.');
-                    }
-
-                    if (in_array($_POST['locale'], array_keys($valid_languages))) {
-                        $_locale = $_POST['locale'];
-                    } else if ($_POST['locale'] == 'all') {
-                        $_locale = '';
-                    } else {
-                        $this->Error->addError('Invalid locale specified.');
-                    }
-
-                    if (in_array($_POST['titletagline'], array_keys($this->CollectionPromo->titles_and_taglines))) {
-                        $_titletagline = $_POST['titletagline'];
-                    } else {
-                        $this->Error->addError('Invalid Title/TagLine specified.');
-                    }
-
-                    if ($this->Error->noErrors()) {
-                        $this->CollectionPromo->promoteCollection($_collection_id, $_titletagline, $_locale);
-                        $this->data = array(); // reset so it doesn't prefill the box again
-                        $this->publish('changeSuccess', true);
-                    }
-                    break;
-                case 'delete':
-                    list($_collection_id, $_titletagline, $_locale) = explode('--',$_POST['target']);
-                    $_locale = ($_locale == 'all') ? '' : $_locale;
-
-                    if ($this->CollectionPromo->demoteCollection($_collection_id, $_titletagline, $_locale) === false) {
-                        $this->Error->addError('Failed to demote collection.');
-                    } else {
-                        $this->publish('changeSuccess', true);
-                    }
-                    break;
-            }
-        }
-
-        $this->set('titles_and_taglines', $this->CollectionPromo->titles_and_taglines);
-        $this->publish('promoted_collections', $this->CollectionPromo->findAll());
-        $this->set('locales', LANGUAGE_CONFIG::getAllValidLanguages('english',true));
-
-        $this->set('errors', $this->Error->errors);
-        $this->set('page', 'collections');
-        $this->set('subpage', 'promobox');
-        $this->render('collections_promobox');
-    }
     
    /**
     * Category Manager
@@ -607,6 +538,10 @@ class AdminController extends AppController
         $this->set('breadcrumbs', $this->breadcrumbs);
         
         $applications = array('All');
+
+        // we are sugar
+        $applications = array();
+
         $_applications = $this->Amo->getApplicationName();
         if (!empty($_applications)) {
             foreach ($_applications as $app_id => $app_name) {
@@ -1541,7 +1476,7 @@ class AdminController extends AppController
             
             if (!empty($this->data['User']['password'])) {
                 $session = $this->Session->read('User');
-                if ($this->User->checkPassword($session, $this->data['User']['password'])) {
+                if (md5($this->data['User']['password']) == $session['password']) {
                     $this->set('config', $config);
                     $this->set('rand', $sessionConfig['rand']);
                     
@@ -1629,17 +1564,16 @@ class AdminController extends AppController
         if (!empty($flagged)) {
             foreach ($flagged as $k => $addon) {
                 $version = $this->Version->findByAddon_id($addon['Addon']['id'],
-                    array('Version.id', 'Version.addon_id', 'Version.version'),
-                    'Version.created DESC');
-                if (!$version) $version = array();
+                                                array('Version.id', 'Version.addon_id',
+                                                      'Version.version'
+                                                      ), 'Version.created DESC');
                 $flagged[$k] = array_merge_recursive($flagged[$k], $version);
                 
                 $history = $this->Approval->find(
-                    "Approval.addon_id={$addon['Addon']['id']} AND
-                    ((Approval.reviewtype='nominated' AND Approval.action=".STATUS_NOMINATED.") OR
-                    (Approval.reviewtype='pending' AND Approval.action=".STATUS_PENDING."))",
-                    null, 'Approval.created DESC');
-                if (!$history) $history = array();
+                            "Approval.addon_id={$addon['Addon']['id']} AND
+                            ((Approval.reviewtype='nominated' AND Approval.action=".STATUS_NOMINATED.") OR
+                            (Approval.reviewtype='pending' AND Approval.action=".STATUS_PENDING."))",
+                                                null, 'Approval.created DESC');
                 $flagged[$k] = array_merge_recursive($flagged[$k], $history);
             }
         }
@@ -1657,8 +1591,7 @@ class AdminController extends AppController
     function users($user_id = 0, $type = 'edit') {
         $this->breadcrumbs['User Manager'] = '/admin/users';
         $this->set('breadcrumbs', $this->breadcrumbs);
-		$this->set('suppressJQuery', 0);
-
+        
         if (!empty($user_id)) {
             $this->Amo->clean($user_id);
             $this->User->id = $user_id;
@@ -1704,10 +1637,6 @@ class AdminController extends AppController
                 case 'edit':
                 default:
                     $this->User->save($this->data['User']);
-
-					// save author "about me"
-					list($localizedFields, $unlocalizedFields) = $this->User->splitLocalizedFields($this->data['User']);
-					$this->User->saveTranslations($user_id, $this->params['form']['data']['User'], $localizedFields);
                     
                     //Log admin action
                     $this->Eventlog->log($this, 'admin', 'user_edit', null, $user_id);
@@ -1718,9 +1647,6 @@ class AdminController extends AppController
                 
             } else {
                 $user = $this->User->read();
-				// grab translated fields
-				$translations = $this->User->getAllTranslations($user_id);
-				$this->set('translations', $translations);
             }
         }
         elseif (!empty($_GET['q'])) {
@@ -1731,9 +1657,6 @@ class AdminController extends AppController
                 $this->flash('E-mail not found.', '/admin/users');
                 return;
             }
-			// grab translated fields
-			$translations = $this->User->getAllTranslations($user['User']['id']);
-			$this->set('translations', $translations);
         }
         $this->set('page', 'users');
         
@@ -1803,38 +1726,5 @@ class AdminController extends AppController
         $this->set('results', $results);
         $this->render('userlookup', 'ajax');
     }
-
-   /**
-    * AJAX Collection lookup.  Matches either name or nickname
-    */
-    function collectionLookup() {
-        if (!$this->SimpleAcl->actionAllowed('Admin', '%', $this->Session->read('User')) ||
-            !$this->SimpleAcl->actionAllowed('Editor', '*', $this->Session->read('User')) ) {
-            $this->Amo->accessDenied();
-        }
-        global $app_shortnames;
-
-        $text = $_REQUEST['q'];
-        $this->Amo->clean($text);
-        $results = array();
-
-        $_query = "SELECT 
-                    collections.id, translations.localized_string, collections.nickname, collections.application_id
-                   FROM collections LEFT JOIN translations ON collections.name=translations.id 
-                   WHERE (translations.locale='".LANG."' 
-                   AND translations.localized_string LIKE '%{$text}%')
-                   OR collections.nickname LIKE '%{$text}%'
-                   ORDER BY translations.localized_string";
-        
-        if ($collections = $this->Collection->query($_query)) {
-            foreach ($collections as $collection) {
-                $_application = array_search($collection['collections']['application_id'], $app_shortnames);
-                $results[] = "{$collection['translations']['localized_string']}|ID: {$collection['collections']['id']}|App: {$_application}|nickname: {$collection['collections']['nickname']};";
-            }
-        }
-        
-        $this->set('results', $results);
-        $this->render('userlookup', 'ajax');
-    }
 }
 ?>
diff --git a/site/app/controllers/api_controller.php b/site/app/controllers/api_controller.php
index 33a85ce..1e41f27 100644
--- a/site/app/controllers/api_controller.php
+++ b/site/app/controllers/api_controller.php
@@ -52,7 +52,7 @@ class ApiController extends AppController
     // cribbed from addonscontroller
     // some of this is excessive but will likely be needed as 
     // development continues
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
     var $uses = array('Addon', 'AddonCollection', 'Addontype', 'Application', 'Collection', 'File', 'Platform', 'Tag', 'Translation', /*'Review',*/ 'UpdateCount', 'Version');    
     var $components = array('Amo', 'Image', 'Pagination', 'Search', 'Session', 'Versioncompare');    
     var $helpers = array('Html', 'Link', 'Time', 'Localization', 'Ajax', 'Number', 'Pagination');
diff --git a/site/app/controllers/collections_controller.php b/site/app/controllers/collections_controller.php
index e9b7bfd..da80d85 100644
--- a/site/app/controllers/collections_controller.php
+++ b/site/app/controllers/collections_controller.php
@@ -39,705 +39,75 @@
 class CollectionsController extends AppController
 {
     var $name = 'Collections';
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
-    var $uses = array('Addon', 'AddonCollection', 'Application', 'Collection', 'File',
-        'Platform', 'Preview', 'Translation', 'Version');
-    var $components = array('Amo', 'CollectionsListing', 'Developers', 'Error', 'Helper', 'Image', 'Pagination', 'Session');
-    var $actionHelpers = array('Html');
-    var $helpers = array('Html', 'Link', 'Listing', 'Time', 'Localization', 'Pagination', 'Number', 'Form');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
+    var $uses = array('Addon', 'AddonTag', 'Addontype', 'Application',
+        'Feature', 'File', 'Platform', 'Preview', 'Tag', 'Translation', 
+        'Review', 'Version', 'Collection');
+    var $components = array('Amo', 'Image', 'Pagination', 'Session', 'Userfunc', 'Search');
+    var $helpers = array('Html', 'Link', 'Time', 'Localization', 'Ajax', 'Number', 'Pagination');
     var $exceptionCSRF = array("/collections/install");
     var $namedArgs = true;
 
     var $securityLevel = 'low';
 
     function beforeFilter() {
-        $this->layout='mozilla';
-        $this->publish('collapse_categories', true);
-        $this->publish('collectionSearch', true);
-        $this->pageTitle = 'Collections' . " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-        $this->publish('jsAdd', array('jquery.autocomplete.pack.js'), false);
         // Disable ACLs because this controller is entirely public.
         $this->SimpleAuth->enabled = false;
         $this->SimpleAcl->enabled = false;
-
-        // disable query caching so devcp changes are visible immediately
-        if ($this->Session->check('User')) {
-            foreach ($this->uses as $_model) {
-                $this->$_model->caching = false;
-            }
-        }
-
-        $this->publish('jsAdd', array('amo2009/collections', 'jquery-ui/jqModal.js'));
+        $this->layout='mozilla';
+        $this->publish('collapse_categories', true);
+        $this->pageTitle = 'Collections' . " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
     }
-
+    
     function index() {
-        /* TODO: preserve get params */
-        $this->redirect('/collections/editors_picks');
+          
     }
-
-    function _listing($collections, $pagination_options=array()) {
-        $ids = array();
-        foreach ($collections as $c) $ids[] = $c['Collection']['id'];
-
-        $collections = $this->CollectionsListing->fetchPage($ids, $pagination_options);
-        list($sort_opts, $sortby) = $this->CollectionsListing->sorting();
-
-        $this->publish('sort_opts', $sort_opts);
-        $this->publish('sortby', $sortby);
-        $this->publish('collections', $collections);
-        $this->set('tabs', $this->_collectionTabs());
-
-        // if a collection was just deleted, show success message
-        $this->publish('collection_deleted', $this->Session->delete('collection_deleted'), false);
-
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-        ));
-
-        $this->render('listing');
-    }
-
-    function _collectionTabs() {
-        $tabs = array(
-            array('href' => 'editors_picks',
-                  'text' => ___('collections_index_li_editors')),
-            array('href' => 'popular',
-                  'text' => ___('collections_index_li_popular')),
-        );
-
-        if ($this->Session->check('User')) {
-            $tabs = array_merge($tabs, array(
-                array('href' => 'mine',
-                      'text' => ___('collections_index_li_mine')),
-                array('href' => 'favorites',
-                      'text' => ___('collections_index_li_favorites')),
-            ));
-        }
-        return $tabs;
-    }
-
-
-    function editors_picks() {
-        $this->set('selected', 'editors_picks');
-        $conditions = array('Collection.collection_type' => Collection::COLLECTION_TYPE_EDITORSPICK,
-                            'Collection.listed' => 1);
-        $this->Collection->unbindFully();
-        $collections = $this->Collection->findAll($conditions, 'Collection.id');
-        $this->_listing($collections);
-    }
-
-    function popular() {
-        $this->set('selected', 'popular');
-        $this->Collection->unbindFully();
-        $collections = $this->Collection->findAll(array('Collection.listed' => 1),
-                                                  'Collection.id');
-        $pagination = array('sortBy' => 'subscribers DESC');
-        $this->_listing($collections, $pagination);
-    }
-
-    function mine() {
-        $this->Amo->checkLoggedIn();
-
-        $this->set('selected', 'mine');
-        $this->set('filler', sprintf(___('collections_index_filler_mine'),
-                                     $this->Html->url('/collections/add')));
-
-        $user = $this->Session->read('User');
-        $collections = $this->Collection->execute(
-            "SELECT Collection.id
-            FROM collections AS Collection JOIN collections_users
-            ON Collection.id = collections_users.collection_id
-            WHERE collections_users.user_id = " . $user['id']);
-        $this->_listing($collections);
-    }
-
-    function favorites() {
-        $this->Amo->checkLoggedIn();
-        $this->set('selected', 'favorites');
-        $this->set('filler', sprintf(___('collections_index_filler_favorites'),
-                                     $this->Html->url('/pages/collector')));
-
-        $user = $this->Session->read('User');
-        $collections = $this->Collection->execute(
-            "SELECT Collection.id
-             FROM collections AS Collection JOIN collection_subscriptions
-             ON Collection.id = collection_subscriptions.collection_id
-             WHERE collection_subscriptions.user_id = " . $user['id']);
-        $this->_listing($collections);
-    }
-
-    /**
-     * Creates a collection if POSTed to, otherwise shows a collection creation form
-     */
-    function add() {
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        // view setup
-        $this->layout = 'amo2009'; // TODO: remove this when the entire controller is amo2009-based
-        $this->set('bodyclass', 'inverse collections-page');
-        $this->publish('jsAdd', array('jquery.autocomplete.pack.js'));
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-            ___('collections_breadcrumb') => '/collections'
-        ));
-
-        $initial_addons = array();
-        if (!empty($this->params['url']['addons'])) {
-            $_init_ids = explode(',', $this->params['url']['addons']);
-            foreach ($_init_ids as &$_init_id) {
-                if (!is_numeric($_init_id)) continue;
-                $_addon = $this->Addon->getAddon($_init_id);
-                if (empty($_addon)) continue;
-                $initial_addons[] = array(
-                    'id' => $_addon['Addon']['id'],
-                    'name' => $_addon['Translation']['name']['string'],
-                    'preview' => $this->Image->getAddonIconURL($_init_id)
-                );
-            }
-        }
-        $this->publish('initial_addons', $initial_addons);
-
-        if (isset($this->data['Collection'])) {
-            // clean up whitespace
-            $this->data['Collection']['name'] = trim($this->data['Collection']['name']);
-            $this->data['Collection']['description'] = trim($this->data['Collection']['description']);
-
-            $user = $this->Session->read('User');
-            $this->data['Collection']['user_id'] = $user['id'];
-            $this->data['Collection']['application_id'] = APP_ID; // defaults to current app
-            $this->data['Collection']['defaultlocale'] = LANG; // defaults to current lang
-
-            $data = $this->data['Collection'];
-            $this->Amo->clean($data);
-            if ($this->Collection->save($data)) {
-                $collectionid = $this->Collection->id; // new collection id
-                $_coll = $this->Collection->findById($collectionid, array('Collection.uuid'));
-
-                $this->Collection->addUser($this->Collection->id, $user['id'], COLLECTION_ROLE_OWNER);
-
-                if (!empty($this->params['form']['addons'])) {
-                    // add-ons preselected
-                    $this->Amo->clean($this->params['form']['addons']);
-                    foreach ($this->params['form']['addons'] as &$addon) {
-                        $this->Collection->addAddonToCollection($collectionid, $user['id'], $addon);
-                    }
-                }
-
-                $this->Session->write('collection_created', $collectionid);
-                $this->redirect("/collections/view/{$_coll['Collection']['uuid']}");
-                return;
-            } else {
-                $this->set('form_errors', true);
-            }
-        }
-    }
-
-    /**
-     * Non-JS only: Adds an add-on to a collection, then redirects to display page
-     */
-    function addtocollection() {
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        if (empty($this->data['addon_id']) || empty($this->data['collection_uuid'])) {
-            $this->flash(sprintf(_('error_missing_argument'), 'addon_id or collection_id'), '/', 3);
-            return;
-        }
-
-        // create new collection if requested
-        if ($this->data['collection_uuid'] == 'new') {
-            if (is_array($this->data['addon_id']))
-                $addonids = implode(',', $this->data['addon_id']);
-            else
-                $addonids = $this->data['addon_id'];
-            $addonids = urlencode($addonids);
-            $this->redirect("/collections/add/?addons={$addonids}");
+    
+    function display($id = NULL) {
+        $this->set('jsAdd', array('jquery-ui/ui.core.min.js', 'jquery-ui/ui.accordion.min.js', 'jquery-ui/jqModal.js'));
+        
+        $this->Amo->clean($id);
+        if (!$id || !is_numeric($id)) {
+            $this->flash(sprintf(_('error_missing_argument'), 'collection_id'), '/', 3);
             return;
         }
-
-        $this->Amo->clean($this->data);
-        $addon_id = $this->data['addon_id'];
-        $collection_id = $this->Collection->getIdForUUID($this->data['collection_uuid']);
-        if (!is_numeric($addon_id) || !$collection_id) {
-            $this->flash(sprintf(_('error_missing_argument'), 'addon_id or collection_id'), '/', 3);
+        
+        $_conditions = array(
+                               'Collection.id' => $id,
+                               'Collection.listed' => 1,
+                           );
+           
+        $this->Collection->unbindFully();
+        $collection = $this->Collection->find($_conditions, null, null, 1);
+        
+        if($collection == null) {
+            $this->flash(_('collection_not_found'), '/', 3);
             return;
         }
-        $user = $this->Session->read('User');
-        $added = $this->Collection->addAddonToCollection($collection_id, $user['id'], $addon_id);
-        // go to add-on's display page and display success message
-        $this->Session->write('collection_addon_added', $this->data['collection_uuid']);
-        $this->redirect("/addon/{$addon_id}");
-        return;
-    }
-
-    function _getSortedAddons($collection_id) {
-        $sort_options = array(
-            'date-added' => ___('collections_detail_sort_date'),
-            'name' => ___('collections_detail_sort_name'),
-            'popularity' => ___('collections_detail_sort_popularity')
-        );
-
-        // Fetch #1.  What's in the collection?
-        $addonIds = $this->Addon->getAddonsFromCollection($collection_id);
-
-        // Set up pagination
-        $this->Pagination->total = count($addonIds);
-        $this->Pagination->show = 7;
-        list($order, $limit, $page) = $this->Pagination->init();
-
-        // Default sorting is by date added to Collection.
-        if (isset($_GET['sortby']) && array_key_exists($_GET['sortby'], $sort_options)) {
-            $sortby = $_GET['sortby'];
-        } else {
-            $sortby = 'date-added';
-        }
-
-        // Fetch #2.  Sort and fetch paged addon ids.
-        if ($sortby == 'date-added') {
-            $field = 'addons_collections.added DESC';
-            $extra = 'JOIN addons_collections ON Addon.id = addons_collections.addon_id';
-            $pagedIds = $this->Addon->sorted($addonIds, $field, $limit, $page, $extra);
-        } else {
-            if ($sortby == 'popularity') {
-                $field = 'weeklydownloads DESC';
-            } else if ($sortby == 'name') {
-                $field = 'name';
-            }
-            $pagedIds = $this->Addon->sorted($addonIds, $field, $limit, $page);
-        }
-
-        // Fetch #3!  Pull useful addon data this time.
-        $addons = $this->Addon->getAddonList($pagedIds,array(
+        
+        $addonIds = $this->Addon->getAddonsFromCollection($id);
+     
+        $addons = $this->Addon->getAddonList($addonIds,array(
             'all_tags', 'authors', 'compatible_apps', 'files', 'latest_version',
             'list_details'));
-
+        
         foreach($addons as &$addon) {
-            $a = &$addon['Addon'];
-            // Get publish details for each add-on
-            $publishDetails = $this->Addon->getCollectionPublishDetails($a['id'], $collection_id);
-            $a = array_merge($a, $publishDetails);
-        }
-
-        return array($addons, $sort_options, $sortby);
-    }
-
-    function view($uuid = NULL) {
-        if (!$uuid) {
-            $this->flash(sprintf(_('error_missing_argument'), 'collection_id'), '/', 3);
-            return;
+            $addonId = $addon['Addon']['id'];
+            $addon['Addon']['dateadded'] = $this->Addon->getDateAddedToCollection($addonId, $id);
         }
-
-        $id = $this->Collection->getIdForUuidOrNickname($uuid);
-        if (!$id) {
-            $this->flash(_('collection_not_found'), '/', 3);
-            return;
-        }
-        $_conditions['Collection.id'] = $id;
-
-        $collection = $this->Collection->find($_conditions, null, null, 1);
-
-        list($addons, $sort_options, $sortby) = $this->_getSortedAddons($collection['Collection']['id']);
-
+        
         $this->publish('addons', $addons);
         $this->publish('collection', $collection);
-        $this->publish('sort_options', $sort_options);
-        $this->publish('sortby', $sortby);
         $this->pageTitle = $collection['Translation']['name']['string'] . " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-
-        // User-specific stuff.
-        if ($this->Session->check('User')) {
-            $user = $this->Session->read('User');
-            $is_subscribed = $this->Collection->isSubscribed($id, $user['id']);
-            if ($is_subscribed) {
-                $action = $this->Collection->getUnsubscribeUrl();
-            } else {
-                $action = $this->Collection->getSubscribeUrl();
-            }
-            $this->publish('is_subscribed', $is_subscribed);
-            $this->publish('subscribe_action', $action);
-            $this->_getUserRights($user, $id);
-        } else {
-            // Use 0 as a dummy user.
-            $this->_getUserRights(array('id' => 0), $id);
-        }
-
-        // was the collection just created? show success message
-        $collection_created = $this->Session->read('collection_created');
-        if ($collection_created == $id) $this->Session->delete('collection_created');
-        $this->publish('collection_created', ($collection_created == $id));
-
-        $rss_url = sprintf('/collection/%s?format=rss', $collection['Collection']['uuid']);
-        $this->publish('rssAdd', array(
-            array($rss_url,
-                  sprintf(___('collection_detail_rss_title'),
-                          $collection['Translation']['name']['string']))
-        ));
-
+        
+        
         if (isset($_GET['format']) && $_GET['format'] == 'rss') {
-            $this->publish('atom_self', $rss_url);
             $this->publish('rss_title', $collection['Translation']['name']['string']);
             $this->publish('rss_description', $collection['Translation']['description']['string']);
-            return $this->render('rss/collection', 'rss');
-        }
-
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-            ___('collections_breadcrumb') => '/collections'
-        ));
-
-        $this->render('detail');
-    }
-
-    /**
-     * Subscribes user to the collection
-     */
-    function subscribe($ajax = null) {
-        $this->_subscribe_unsubscribe($ajax);
-    }
-
-    /**
-     * Unsubscribe a user from a collection
-     */
-    function unsubscribe($ajax = null) {
-        $this->_subscribe_unsubscribe($ajax);
-    }
-
-    /**
-     * Combined function for subscribing/unsubscribing. Action is determined by
-     * $this->action.
-     * @access private
-     * @param string $ajax undefined or 'ajax' for no-frills rendering
-     * @return bool render()ed successfully?
-     */
-    function _subscribe_unsubscribe($ajax = null) {
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        $this->publish('is_ajax', ($ajax == 'ajax'));
-
-        if (!in_array($this->action, array('subscribe', 'unsubscribe'))) {
-            $this->flash(___('error_access_denied'), '/', 3);
-            return;
-        }
-
-        if (empty($this->params['form']['uuid'])) { // uuid needs to be POSTed
-            $this->flash(sprintf(_('error_missing_argument'), 'uuid'), '/', 3);
-            return;
-        }
-        $uuid = $this->params['form']['uuid'];
-        $id = $this->Collection->getIdForUuidOrNickname($uuid);
-        if (!$id || !is_numeric($id)) {
-            $this->set('success', false);
-            return $this->render('subscribe');
-        }
-
-        $user = $this->Session->read('User');
-        if ($this->action == 'subscribe') {
-            $result = $this->Collection->subscribe($id, $user['id']);
-        } else {
-            $result = $this->Collection->unsubscribe($id, $user['id']);
+            $this->render('rss/collection', 'rss');
         }
-        $collection = $this->Collection->findById($id, array('id', 'name'), null, -1);
-        $this->set('success', $result);
-
-        $this->publish('collection', $collection);
-
-        // set up view and render result
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-            ___('collections_breadcrumb') => '/collections'
-        ));
-        return $this->render('subscribe');
     }
-
-    /**
-     * Edit collection
-     */
-    function edit($uuid = null) {
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        // disable query caching so changes are visible immediately
-        $this->Collection->caching = false;
-
-        if (empty($uuid)) {
-            $this->flash(sprintf(_('error_missing_argument'), 'collection_id'), '/', 3);
-            return;
-        }
-        $id = $this->Collection->getIdForUuidOrNickname($uuid);
-        if (!$id) {
-            $this->flash(_('collection_not_found'), '/', 3);
-            return;
-        }
-
-        // access rights
-        $user = $this->Session->read('User');
-        $this->publish('user', $user);
-        $rights = $this->_getUserRights($user, $id);
-        if (!($rights['writable'] || $rights['isadmin'])) {
-            $this->flash(___('error_access_denied'), '/', 3);
-            return;
-        }
-
-        if (!empty($this->data)) {
-            // Delete collection?
-            if (isset($this->data['action']) && $this->data['action'] == 'delete-coll') {
-                if (!$rights['atleast_owner']) {
-                    $this->flash(___('error_access_denied'), '/', 3);
-                    return;
-                }
-                $this->Collection->delete($id);
-                $this->Session->write('collection_deleted', true);
-                $this->redirect("/collections");
-                return;
-            }
-
-            // regular save
-            $success = $this->_saveCollectionEdit($id, $rights);
-
-            if ($success) {
-                // grab updated collection nickname/uuid
-                $updated = $this->Collection->findById($id, array('nickname', 'uuid'));
-                $this->publish('collection_saved', true, false);
-                if (empty($updated['Collection']['nickname']))
-                    $this->publish('collection_url', "/collection/{$updated['Collection']['uuid']}");
-                else
-                    $this->publish('collection_url', "/collection/{$updated['Collection']['nickname']}");
-            } else {
-                $this->set('form_errors', true);
-            }
-        }
-
-        // get collection data for display (and publish to view)
-        $this->_getCollectionDataForView($id);
-
-        // view setup
-        $this->layout = 'amo2009'; // TODO: remove this when the entire controller is amo2009-based
-        $this->set('bodyclass', 'inverse collections-page');
-        $this->publish('jsAdd', array('jquery-ui/ui.core.min', 'jquery-ui/ui.tabs.min',
-            'jquery.autocomplete.pack.js'));
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-            ___('collections_breadcrumb') => '/collections'
-        ));
-    }
-
-    /**
-     * get collection data for collection edit page (and publish it to view)
-     * @param int $id collection ID
-     * @return void
-     * @access private
-     */
-    function _getCollectionDataForView($id) {
-        $this->Collection->unbindModel(array('hasAndBelongsToMany'=>array('Addon')));
-        $collection = $this->Collection->findById($id);
-        $this->data['Collection'] = $collection;
-
-        // translations
-        $translations = $this->Collection->getAllTranslations($id);
-        $this->publish('translations', $translations);
-
-        // addons
-        $addons = $this->AddonCollection->getAddonsFromCollection($id);
-        $this->publish('addons', $addons);
-        $addons_noscript = array();
-        foreach ($addons as &$addon) {
-            $addons_noscript[$addon['AddonCollection']['addon_id']] = $addon['Addon']['Translation']['name']['string'];
-        }
-        $this->publish('addons_noscript', $addons_noscript);
-
-        // collection icon
-        $this->publish('iconurl', $this->Image->getCollectionIconURL($id), false);
-
-        // prepare applications
-        global $app_shortnames, $app_prettynames;
-        $appoptions = array();
-        foreach ($app_shortnames as $sn => &$no) {
-            $appoptions[$no] = $app_prettynames[$sn];
-        }
-        $this->publish('appoptions', $appoptions, false);
-
-        // prepare collection types
-        $this->publish('collection_types', array(
-            Collection::COLLECTION_TYPE_NORMAL => ___('collections_type_normal'),
-            Collection::COLLECTION_TYPE_AUTOPUBLISHER => ___('collections_type_autopublisher'),
-            Collection::COLLECTION_TYPE_EDITORSPICK => ___('collections_type_editorspick')
-        ), false);
-
-        // get existing publishers and managers
-        $publishers = $this->Collection->getUsers($id, array(COLLECTION_ROLE_PUBLISHER));
-        $publishers_noscript = $managers_noscript = array();
-        foreach ($publishers as &$p) {
-            $publishers_noscript[$p['User']['id']] = $p['User']['email'];
-        }
-        $managers = $this->Collection->getUsers($id, array(COLLECTION_ROLE_ADMIN));
-        foreach ($managers as &$m) {
-            $managers_noscript[$m['User']['id']] = $m['User']['email'];
-        }
-        $this->publish('publishers', $publishers);
-        $this->publish('publishers_noscript', $publishers_noscript);
-        $this->data['Publishers']['p_onlyme'] = (int)empty($publishers);
-        $this->publish('managers', $managers);
-        $this->publish('managers_noscript', $managers_noscript);
-        $this->data['Managers']['m_onlyme'] = (int)empty($managers);
-    }
-
-    /**
-     * save collection data from edit page
-     *
-     * @param int $id Collection ID
-     * @param array $rights user rights array from _getUserRights()
-     * @return bool successfully saved?
-     * @access private
-     */
-    function _saveCollectionEdit($id, $rights) {
-        $disallowed_fields = array('uuid', 'access', 'subscribers',
-            'created', 'modified', 'downloads');
-        if (!$rights['isadmin']) $allowed_fields[] = 'collection_type';
-        $collectiondata = $this->Amo->filterFields($this->data['Collection'],
-            array(), $disallowed_fields);
-        $this->Collection->id = $id;
-
-        list($localizedFields, $unlocalizedFields) = $this->Collection->splitLocalizedFields($collectiondata);
-        // clean up whitespace
-        foreach ($localizedFields as $field => &$translations) {
-            foreach ($translations as $lang => &$l_string) {
-                $l_string = trim($l_string);
-                $this->params['form']['data']['Collection'][$field][$lang] = $l_string;
-            }
-        }
-
-        $valid_translations = $this->Collection->validateTranslations($localizedFields);
-        if ($valid_translations) {
-            $this->Amo->clean($localizedFields);
-            $this->Collection->saveTranslations($id, $this->params['form']['data']['Collection'], $localizedFields);
-        }
-
-        // handle icon removal/upload
-        if (!empty($this->data['Icon']['delete'])) {
-            $unlocalizedFields['icontype'] = '';
-            $unlocalizedFields['icondata'] = null;
-        } elseif (!empty($_FILES['icon']['name'])) {
-            $iconData = $this->Developers->validateIcon($_FILES['icon']);
-            if (is_array($iconData)) {
-                $unlocalizedFields = array_merge($unlocalizedFields, $iconData);
-            }
-        }
-
-        // field post-processing
-        if (!isset($unlocalizedFields['listed'])) $unlocalizedFields['listed'] = 0;
-        if (!empty($unlocalizedFields['nickname']))
-            $unlocalizedFields['nickname'] = preg_replace(INVALID_COLLECTION_NICKNAME_CHARS,
-                '_', mb_strtolower(trim($unlocalizedFields['nickname'])));
-
-        if ($success = $this->Collection->save($unlocalizedFields)) {
-            // save noscript data
-            if ($rights['atleast_manager']) {
-                // save users
-                $this->_saveCollectionEditUserData($id, 'Publishers');
-                $this->_saveCollectionEditUserData($id, 'Managers');
-            } // at least manager
-
-            // add-ons
-            // remove old add-ons
-            if (!empty($this->data['Addons']['delete'])) {
-                foreach ($this->data['Addons']['delete'] as &$_aid) {
-                    $this->AddonCollection->deleteByAddonIdAndCollectionId($_aid, $id, ($rights['atleast_manager'] ? null : $user['id']));
-                }
-            }
-            // add new add-ons
-            if (!empty($this->params['form']['q'])) {
-                $_aids = explode(',', $this->params['form']['q']);
-                foreach ($_aids as &$_aid) {
-                    $_aid = trim($_aid);
-                    if (!empty($_aid)) {
-                        $_addon = $this->Addon->getAddon($_aid);
-                        if (!empty($_addon) && in_array($_addon['Addon']['status'], $valid_status))
-                            $this->Collection->addAddonToCollection($id, $user['id'], $_aid);
-                    }
-                }
-            }
-        }
-        return $success;
-    }
-
-    /**
-     * save user data (managers/publishers) for collection edit
-     * @param int $id collection ID
-     * @param string $type "Publishers" or "Managers"
-     * @return void
-     * @access private
-     */
-    function _saveCollectionEditUserData($id, $type) {
-        switch ($type) {
-        case 'Publishers':
-            $onlyme_fieldid = 'p_onlyme';
-            $role = COLLECTION_ROLE_PUBLISHER;
-            break;
-        case 'Managers':
-            $onlyme_fieldid = 'm_onlyme';
-            $role = COLLECTION_ROLE_ADMIN;
-            break;
-        default:
-            return;
-        }
-
-        if (isset($this->data[$type][$onlyme_fieldid]) && $this->data[$type][$onlyme_fieldid]) {
-            // remove all existing users with this role
-            $this->Collection->removeAllUsersByRole($id, $role);
-        } else {
-            // remove old users
-            if (!empty($this->data[$type]['delete'])) {
-                foreach ($this->data[$type]['delete'] as &$_pid) {
-                    $this->Collection->removeUser($id, $_pid);
-                }
-            }
-            // save new users
-            if (!empty($this->data[$type]['new'])) {
-                $_emails = explode(',', $this->data[$type]['new']);
-                foreach ($_emails as &$_em) {
-                    $_em = trim($_em);
-                    if (empty($_em)) continue;
-                    $_uid = $this->User->findByEmail($_em, array('id'));
-                    if (empty($_uid)) continue;
-                    $this->Collection->addUser($id, $_uid['User']['id'], $role);
-                }
-            }
-            // don't publish them back to the view
-            $this->data[$type]['new'] = '';
-        }
-    }
-
-    /**
-     * get user rights for a specific collection
-     * @param array $user array from user model
-     * @param int $collection_id
-     * @return array of booleans ('writable', 'isadmin', 'atleast_manager',
-     *      'atleast_owner', 'role')
-     * @access private
-     */
-    function _getUserRights($user, $collection_id) {
-        $writable = $this->Collection->isWritableByUser($collection_id, $user['id']);
-        $isadmin = $this->SimpleAcl->actionAllowed('Admin', 'EditAnyCollection', $user);
-        $role = $this->Collection->getUserRole($collection_id, $user['id']);
-        $atleast_manager = ($isadmin || in_array($role, array(COLLECTION_ROLE_ADMIN, COLLECTION_ROLE_OWNER)));
-        $atleast_owner = ($isadmin || $role == COLLECTION_ROLE_OWNER);
-
-        $this->publish('writable', $writable, false);
-        $this->publish('isadmin', $isadmin, false);
-        $this->publish('atleast_manager', $atleast_manager, false);
-        $this->publish('atleast_owner', $atleast_owner, false);
-        $this->publish('role', $role, false);
-
-        return array(
-            'writable'          => $writable,
-            'isadmin'           => $isadmin,
-            'atleast_manager'   => $atleast_manager,
-            'atleast_owner'     => $atleast_owner,
-            'role'              => $role
-        );
-    }
-
-
-    /*** Fashion Your Firefox ***/
-
+    
     /**
      * Special "interactive collections" page for first-time users
      */
@@ -747,28 +117,28 @@ class CollectionsController extends AppController
             $this->redirect('/');
             exit();
         }
-
+        
         // XXX: for accessibility (bug 462411), we use a hand-bundled accordion
         // + core jquery UI file. Once jquery UI is updated to post-1.6.2rc2,
         // the regular jquery UI accordion should be used (cf. jquery ui bug
         // 3553, http://ui.jquery.com/bugs/ticket/3553)
         $this->set('jsAdd', array('jquery-ui/jq-ui-162rc2-accordion-bundle-a11y.min.js', 'jquery-ui/jqModal.js'));
         $this->set('cssAdd', array('collection-style'));
-
+        
         $addonIds = $this->Addon->getCategorizedAddonsFromCollection(1); // special collection ID
         $addons = array();
         foreach ($addonIds as $catid => $cataddons) {
             $addons[$catid] = $this->Addon->getAddonList($cataddons, array('files', 'latest_version', 'list_details'));
         }
         $this->publish('addons', $addons);
-
+        
         // prepare view, then render
         $this->publish('suppressHeader', true, false);
         $this->publish('suppressLanguageSelector', true, false);
         $this->publish('suppressCredits', true, false);
         $this->pageTitle = 'Fashion Your Firefox';
     }
-
+    
     /**
      * installation dialog for collections
      * @param string $method 'html' (with layout) or 'ajax' (without)
@@ -778,7 +148,7 @@ class CollectionsController extends AppController
         if (!empty($_POST['addon'])) {
             $addons = $this->Addon->getAddonList($_POST['addon'], array(
             'compatible_apps', 'files', 'latest_version', 'list_details'));
-
+            
             // XXX: ugly hack allowing signed add-ons to be installed separately
             // due to bug 462108 and 453545. The DB doesn't know which ones are
             // signed or not so we need to hardcode them here.
@@ -795,7 +165,7 @@ class CollectionsController extends AppController
             }
         }
         $this->publish('addons', $addons);
-
+        
         // fetch all platforms
         $this->Platform->unbindFully();
         $platforms_all = $this->Platform->findAll();
@@ -804,7 +174,7 @@ class CollectionsController extends AppController
             $platforms[$pf['Platform']['id']] = $pf['Translation']['name']['string'];
         }
         $this->publish('platforms', $platforms);
-
+        
         // prepare and display view
         $this->pageTitle = 'Collections' . " :: " . sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
         $is_ajax = ($method=='ajax');
@@ -835,7 +205,7 @@ class CollectionsController extends AppController
             $addons = array();
         }
         $this->publish('addons', $addons);
-
+        
         $this->set('cssAdd', array('collection-style'));
         $this->publish('suppressHeader', true, false);
         $this->publish('suppressLanguageSelector', true, false);
@@ -843,235 +213,4 @@ class CollectionsController extends AppController
         $this->pageTitle = 'Fashion Your Firefox';
     }
 
-    /*** END Fashion Your Firefox ***/
-
-
-    /*** AJAX Handlers ***/
-
-    /**
-     * AJAX action for looking up add-ons to add to a collection
-     */
-    function addonLookup() {
-        global $valid_status;
-
-        // Rather than change our cake parameter regex, use a normal get var
-        $name = $_GET['q'];
-        $this->Amo->clean($name);
-
-        // search conditions
-        $conditions = array(
-            'Addon.status' => $valid_status,
-            'Addon.inactive' => 0
-        );
-        if (mb_strlen($name) >= 4) { // fuzzy matching on long names only
-            $conditions['Translation.name'] = "LIKE %{$name}%";
-        } else {
-            $conditions['Translation.name'] = $name;
-        }
-
-        $addons = $this->Addon->findAll($conditions,
-            array('Addon.id', 'Addon.name'), 'Translation.name');
-        if (!empty($addons)) {
-            foreach ($addons as &$_addon) {
-                // add icons
-                $_addon['Addon']['iconpath'] = $this->Image->getAddonIconURL($_addon['Addon']['id']);
-            }
-        } else {
-            $addons = false;
-        }
-
-        $this->publish('addons', $addons);
-        $this->render('ajax/addon_lookup', 'ajax');
-    }
-
-    /**
-     * central JSON dispatcher for AJAX requests
-     */
-    function json($action, $additional = '') {
-        switch ($action) {
-            case 'nickname':
-                $json = $this->_checkNickname();
-                break;
-
-            case 'user':
-                $json = $this->_handleUser($additional);
-                break;
-
-            case 'addon':
-                $json = $this->_handleAddon($additional);
-                break;
-
-            default: $json = array(); break;
-        }
-
-        $this->publish('json', $json, false);
-        $this->render('json', 'ajax');
-    }
-
-    /**
-     * AJAX: check if collection nickname is already used
-     */
-    function _checkNickname() {
-        $this->Amo->checkLoggedIn(); // must be logged in
-        if (empty($this->params['url']['nickname'])) {
-            return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'nickname'));
-        }
-        $nickname = preg_replace(INVALID_COLLECTION_NICKNAME_CHARS, '_',
-            mb_strtolower(trim($this->params['url']['nickname'])));
-        if ($nickname != mb_strtolower($this->params['url']['nickname']))
-            return array(
-                'error' => 1,
-                'error_message' => ___('collections_edit_nickname_error'),
-                'nickname' => $nickname
-            );
-
-        $taken = $this->Collection->isNicknameTaken($this->params['url']['nickname']);
-        return array(
-            'error' => 0,
-            'nickname' => $nickname,
-            'taken' => (int)$taken
-        );
-    }
-
-    /**
-     * AJAX: Add / remove user to/from this collection's roles
-     */
-    function _handleUser($action) {
-        if (empty($action)) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'action'));
-        if (empty($this->params['form']['collection_id'])) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'collection_id'));
-
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        $collection_id = $this->params['form']['collection_id'];
-        $role = @$this->params['form']['role'];
-        $email = @$this->params['form']['email'];
-        $user_id = @$this->params['form']['user_id'];
-
-        $user = $this->Session->read('User');
-        $rights = $this->_getUserRights($user, $collection_id);
-        if (!$rights['atleast_manager']) return $this->Error->getJSONforError(___('error_access_denied'));
-
-        switch ($action) {
-        case 'add':
-            if (empty($email)) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'email'));
-            $roles = array('publishers' => COLLECTION_ROLE_PUBLISHER, 'managers' => COLLECTION_ROLE_ADMIN);
-            if (empty($role)) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'role'));
-
-            $newuser = $this->User->findByEmail($email, array('id'));
-            if (!empty($newuser)) {
-                if ($this->Collection->getUserRole($collection_id, $newuser['User']['id']) === false) {
-                    $this->Collection->addUser($collection_id, $newuser['User']['id'], $roles[$role]);
-                    return array('id' => $newuser['User']['id'], 'email' => $email);
-                } else {
-                    return $this->Error->getJSONforError(___('error_user_exists'));
-                }
-            } else {
-                return $this->Error->getJSONforError(___('error_user_notfound'));
-            }
-            break;
-
-        case 'del':
-            if (empty($user_id))
-                return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'user_id'));
-            if ($this->Collection->removeUser($collection_id, $user_id) !== false) {
-                return array('id' => $user_id);
-            } else {
-                return $this->Error->getJSONforError(___('error_user_notfound'));
-            }
-            break;
-
-        default:
-            return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'action'));
-        }
-    }
-
-    /**
-     * AJAX: Add / remove add-on to/from this collection
-     * @param string action one of add, del, savecomment
-     * @param int collection_id (optional)
-     * @param string collection_uuid (optional)
-     *     Either collection_id or collection_uuid must be specified, but not both.
-     * @param int addon_id
-     */
-    function _handleAddon($action) {
-        global $valid_status;
-
-        if (empty($action)) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'action'));
-        if (empty($this->params['form']['addon_id']) || !is_numeric($this->params['form']['addon_id'])) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'addon_id'));
-        if (!empty($this->params['form']['collection_id']) && is_numeric($this->params['form']['collection_id'])) {
-            $collection_id = $this->params['form']['collection_id'];
-        } elseif (!empty($this->params['form']['collection_uuid']) &&
-            ($collection_id = $this->Collection->getIdForUuidOrNickname($this->params['form']['collection_uuid'])) > 0) {
-            // no-op
-        } else {
-            return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'collection_id'));
-        }
-
-        $this->Amo->checkLoggedIn(); // must be logged in
-
-        $addon_id = $this->params['form']['addon_id'];
-
-        $user = $this->Session->read('User');
-        $rights = $this->_getUserRights($user, $collection_id);
-
-        if (!($rights['writable'] || $rights['isadmin'])) return $this->Error->getJSONforError(___('error_access_denied'));
-
-        switch ($action) {
-        case 'add':
-            if ($this->AddonCollection->isAddonInCollection($addon_id, $collection_id))
-                return $this->Error->getJSONforError(___('error_addon_exists'));
-            $addon = $this->Addon->getAddon($addon_id);
-            if (empty($addon) || !in_array($addon['Addon']['status'], $valid_status))
-                return $this->Error->getJSONforError(___('error_addon_notfound'));
-            if (false !== $this->Collection->addAddonToCollection($collection_id, $user['id'], $addon_id)) {
-                return array(
-                    'id' => $addon_id,
-                    'name' => $addon['Translation']['name']['string'],
-                    'iconURL' => $this->Image->getAddonIconURL($addon_id),
-                    'date' => strftime(_('date'), mktime()),
-                    'publisher' => $this->Html->linkUserFromModel($user)
-                );
-            } else {
-                return $this->Error->getJSONforError(___('collection_error_saving_addon'));
-            }
-            break;
-
-        case 'del':
-            if (!$rights['isadmin'] && !$rights['atleast_manager']) {
-                // publisher's own add-on?
-                $res = $this->AddonCollection->deleteByAddonIdAndCollectionId($addon_id, $collection_id, $user['id']);
-            } else {
-                $res = $this->AddonCollection->deleteByAddonIdAndCollectionId($addon_id, $collection_id);
-            }
-            if ($res) {
-                return array('id' => $addon_id);
-            } else {
-                return $this->Error->getJSONforError(___('collection_error_deleting_addon'));
-            }
-            break;
-
-        case 'savecomment':
-            if (!isset($this->params['form']['comment'])) return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'comment'));
-            $comment = strip_tags(trim($this->params['form']['comment']));
-
-            $addon = $this->AddonCollection->find(array('addon_id'=>$addon_id, 'collection_id'=>$collection_id), array('user_id'));
-            if (empty($addon)) return $this->Error->getJSONforError(___('error_addon_notfound'));
-            if (!$rights['isadmin'] && !$rights['atleast_manager']) {
-                // publisher's own add-on?
-                if ($addon['AddonCollection']['user_id'] != $user['id']) return $this->Error->getJSONforError(___('error_access_denied'));
-            }
-            if (!$this->AddonCollection->setComment($collection_id, $addon_id, $comment)) {
-                return $this->Error->getJSONforError(___('collection_error_saving_comment'));
-            } else {
-                return array(
-                    'addon_id' => $addon_id,
-                    'comment'  => $comment
-                );
-            }
-            break;
-
-        default:
-            return $this->Error->getJSONforError(sprintf(_('error_missing_argument'), 'action'));
-        }
-    }
 }
diff --git a/site/app/controllers/compatibility_controller.php b/site/app/controllers/compatibility_controller.php
index fbf3cf3..9a9754f 100644
--- a/site/app/controllers/compatibility_controller.php
+++ b/site/app/controllers/compatibility_controller.php
@@ -68,7 +68,7 @@ class CompatibilityController extends AppController
         $this->jsAdd = array('compatibility.js');
         $this->publish('jsAdd', $this->jsAdd);
         
-        $this->layout = 'amo2009';
+        $this->layout = 'mozilla';
         $this->pageTitle = ___('compatibility_dashboard_center_header', 'Add-on Compatibility Center').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
         
         $this->publish('expand_categories', true);
@@ -91,7 +91,6 @@ class CompatibilityController extends AppController
         $data = unserialize(file_get_contents(NETAPP_STORAGE.'/compatibility-fx-'.$version.'.serialized'));
         
         $this->publish('totals', $data['totals']);
-        $this->publish('percentages', $this->_percentages($data['totals']));
         $this->publish('version', $version);
         
         $session = $this->Session->read('User');
@@ -118,7 +117,7 @@ class CompatibilityController extends AppController
         if ($format == 'ajax')
             $this->render('report', 'ajax');
         else
-            $this->render('report', 'amo2009');
+            $this->render('report', 'mozilla');
     }
     
     function developers($version = COMPAT_DEFAULT_VERSION, $format = 'html') {
@@ -175,7 +174,7 @@ class CompatibilityController extends AppController
         if ($format == 'ajax')
             $this->render('developers', 'ajax');
         else
-            $this->render('developers', 'amo2009');
+            $this->render('developers', 'mozilla');
     }
     
     function users($version = COMPAT_DEFAULT_VERSION) {
@@ -183,20 +182,6 @@ class CompatibilityController extends AppController
         $this->render('users');
     }
 
-    /* Calculate compatibility percentages, making sure they add up to 100. */
-    function _percentages($totals) {
-        $k = array(COMPAT_OTHER, COMPAT_ALPHA, COMPAT_BETA, COMPAT_LATEST);
-        $percentages = array();
-
-        foreach ($k as $compat) {
-            $p = $totals[$compat]['adu'] / $totals['adu95'];
-            // Round to 1 decimal place.
-            $percentages[$compat] = round($p * 100, 1);
-        }
-        // Put any over/under flow into COMPAT_LATEST, somewhat arbitrary.
-        $percentages[COMPAT_LATEST] += 100 - array_sum($percentages);
-        return $percentages;
-    }
 }
 
 ?>
diff --git a/site/app/controllers/components/amo.php b/site/app/controllers/components/amo.php
index 92ac9ac..a4c59b7 100644
--- a/site/app/controllers/components/amo.php
+++ b/site/app/controllers/components/amo.php
@@ -340,7 +340,6 @@ class AmoComponent extends Object {
             $applicationModel->unbindModel(array('hasAndBelongsToMany' => array('Version'), 'hasMany' => array('Tag')));
             $applications = $applicationModel->findAll('Application.supported=1', null, null, null, null, 2);
             $appvids = array();
-            $versions = array();
             foreach ($applications as $application) {    
                 if (!empty($application['Appversion'])) {
                     $appversions = array();
@@ -668,44 +667,66 @@ class AmoComponent extends Object {
      * )
      */
     function getNavCategories() {
-        global $hybrid_categories, $app_listedtypes, $valid_status;
+        global $hybrid_categories, $app_listedtypes;
         
         if (!empty($this->navCategories)) return $this->navCategories;
         
+        if(APP_ID == APP_SUGAR) {
+            $catlist = array();
+        } else
         // addon type list to be added to regular categories list
-        // get "Themes" category name
-        if (!isset($this->controller->Addontype)) {
-            loadModel('Addontype');
-            $this->controller->Addontype = new Addontype();
-        }
+        // @partial translation fallback, 4/23/08
+        if (_('nav_category_dicts_langpacks') != 'nav_category_dicts_langpacks') {
+            $catlist = array(
+                array('name' => _('nav_category_dicts_langpacks'),
+                      'type' => ADDON_DICT,
+                      'cat' => 0,
+                      'weight' => 0),
+                array('name' => _('nav_category_themes'),
+                      'type' => ADDON_THEME,
+                      'cat' => 0,
+                      'weight' => 0)
+            );
+        } else {
+            // get "Themes" category name
+            if (!isset($this->controller->Addontype)) {
+                loadModel('Addontype');
+                $this->controller->Addontype = new Addontype();
+            }
 
-        $names =  $this->controller->Addontype->getNames();
-        $_themes_name = $names[ADDON_THEME];
-        
-        $catlist = array(
-            array('name' => ___('langtools_header_dicts_and_langpacks'),
-                  'type' => ADDON_DICT,
-                  'cat' => 0,
-                  'weight' => 0),
-            array('name' => $_themes_name,
-                  'type' => ADDON_THEME,
-                  'cat' => 0,
-                  'weight' => 0)
-        );
+            $_themes_name = $this->controller->Addontype->getName(ADDON_THEME);
+            
+            $catlist = array(
+                array('name' => _('langtools_header_dicts_and_langpacks'),
+                      'type' => ADDON_DICT,
+                      'cat' => 0,
+                      'weight' => 0),
+                array('name' => $_themes_name,
+                      'type' => ADDON_THEME,
+                      'cat' => 0,
+                      'weight' => 0)
+            );
+        }
         
         // add plugins where appropriate
+        // @partial translation fallback, 4/27/08
         if (in_array(ADDON_PLUGIN, $app_listedtypes[APP_ID])) {
-            $catlist[] = array(
-                'name' => ___('addons_plugins_pagetitle'),
-                'type' => ADDON_PLUGIN,
-                'cat' => 0,
-                'weight' => 0,
-                'count' => COUNT_ADDON_PLUGIN,
-            );
+            if (_('nav_category_plugins') != 'nav_category_plugins') {
+                $catlist[] = array(
+                    'name' => _('nav_category_plugins'),
+                    'type' => ADDON_PLUGIN,
+                    'cat' => 0,
+                    'weight' => 0
+                );
+            } else {
+                $catlist[] = array(
+                    'name' => _('addons_plugins_pagetitle'),
+                    'type' => ADDON_PLUGIN,
+                    'cat' => 0,
+                    'weight' => 0
+                );
+            }
         }
-
-        // we are sugar
-        $catlist = array();
         
         // create two sort arrays that we can use with array_multisort later
         $_weights = array();
@@ -716,7 +737,7 @@ class AmoComponent extends Object {
         }
         
         // add regular categories to list
-        $tags = $this->getTags();
+        $tags = $this->getTags(APP_ID, $app_listedtypes[APP_SUGAR]);
         foreach ($tags as $_tag) {
             /* support hybrid categories */
             if (isset($hybrid_categories[APP_ID][$_tag['Tag']['id']])) {
@@ -729,26 +750,23 @@ class AmoComponent extends Object {
             
             $_name = $_tag['Translation']['name']['string'];
             $_weight = $_tag['Tag']['weight'];
-            $_count = $_tag['Tag']['count'];
             
             // add item to results array
             $catlist[] = array(
                 'name' => $_name,
                 'type' => $_type,
                 'cat' => $_cat,
-                'weight' => $_weight,
-                'count' => $_count
+                'weight' => $_weight
             );
             
             // add item to sort arrays too
             $_names[] = strtolower($_name);
             $_weights[] = $_weight;
         }
-
+        
         // sort results array by weight and name, then return.
         array_multisort($_weights, SORT_ASC, SORT_NUMERIC,
                         $_names, SORT_ASC, SORT_STRING, $catlist);
-        // TODO: Use memcache here?
         $this->navCategories = $catlist; // cache result for subsequent calls
         return $catlist;
     }
diff --git a/site/app/controllers/components/audit.php b/site/app/controllers/components/audit.php
index 2a2d0b3..aad6936 100644
--- a/site/app/controllers/components/audit.php
+++ b/site/app/controllers/components/audit.php
@@ -76,11 +76,11 @@ class AuditComponent extends Object {
                                 $addonInfo = $this->controller->Addon->findById($log['Eventlog']['changed_id'], null, null, -1);
                                 $addon = $this->link($addonInfo['Translation']['name']['string'], '/admin/addons/status/'.$log['Eventlog']['changed_id']);
                                 
-                                $entry = sprintf(___('audit_addon_status'), $user, $addon, $status);
+                                $entry = "{$user} changed the status of {$addon} to {$status}";
                                 break;
                             
                             case 'file_recalchash':
-                                $entry = sprintf(___('audit_file_recalchash'), $user, $log['Eventlog']['changed_id']);
+                                $entry = "{$user} recalculated the hash for file {$log['Eventlog']['changed_id']}";
                                 break;
                             
                             case 'application_create':
@@ -89,10 +89,10 @@ class AuditComponent extends Object {
                                 $application = $this->link($applicationInfo['Translation']['name']['string'], '/admin/applications');
                                 
                                 if ($log['Eventlog']['action'] == 'application_create') {
-                                    $entry = sprintf(___('audit_application_create'), $user, $application);
+                                    $entry = "{$user} created application {$application}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'application_edit') {
-                                    $entry = sprintf(___('audit_application_edit'), $user, $application);
+                                    $entry = "{$user} edited application {$application}";
                                 }
                                 break;
                             
@@ -102,10 +102,10 @@ class AuditComponent extends Object {
                                 $application = $this->link($applicationInfo['Translation']['name']['string'], '/admin/applications');
                                 
                                 if ($log['Eventlog']['action'] == 'appversion_create') {
-                                    $entry = sprintf(___('audit_appversion_create'), $user, $log['Eventlog']['added'], $application);
+                                    $entry = "{$user} created version {$log['Eventlog']['added']} for {$application}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'appversion_delete') {
-                                    $entry = sprintf(___('audit_appversion_delete'), $user, $log['Eventlog']['removed'], $application);
+                                    $entry = "{$user} deleted version {$log['Eventlog']['removed']} for {$application}";
                                 }
                                 break;
                             
@@ -115,15 +115,15 @@ class AuditComponent extends Object {
                                 $tag = $this->link($tagInfo['Translation']['name']['string'], '/admin/tags');
                                 
                                 if ($log['Eventlog']['action'] == 'tag_create') {
-                                    $entry = sprintf(___('audit_tag_create'), $user, $tag);
+                                    $entry = "{$user} created tag {$tag}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'tag_edit') {
-                                    $entry = sprintf(___('audit_tag_edit'), $user, $tag);
+                                    $entry = "{$user} edited category {$tag}";
                                 }
                                 break;
                             
                             case 'tag_delete':
-                                $entry = sprintf(___('audit_tag_delete'), $user, $log['Eventlog']['removed'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} deleted category {$log['Eventlog']['removed']} (ID {$log['Eventlog']['changed_id']})";
                                 break;
                             
                             case 'platform_create':
@@ -132,25 +132,25 @@ class AuditComponent extends Object {
                                 $platform = $this->link($platformInfo['Translation']['name']['string'], '/admin/platforms');
                                 
                                 if ($log['Eventlog']['action'] == 'platform_create') {
-                                    $entry = sprintf(___('audit_platform_create'), $user, $platform);
+                                    $entry = "{$user} created platform {$platform}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'platform_edit') {
-                                    $entry = sprintf(___('audit_platform_edit'), $user, $platform);
+                                    $entry = "{$user} edited platform {$platform}";
                                 }
                                 break;
                             
                             case 'platform_delete':
-                                $entry = sprintf(___('audit_platform_delete'), $user, $log['Eventlog']['removed'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} deleted platform {$log['Eventlog']['removed']} (ID {$log['Eventlog']['changed_id']})";
                                 break;
 
                             case 'feature_add':
                             case 'feature_edit':
                                 $featureInfo = $this->controller->Feature->findById($log['Eventlog']['changed_id'], null, null, -1);
-                                $entry = sprintf(___('audit_feature_edit'), $user, $featureInfo['Feature']['locale']);
+                                $entry = "{$user} changed a feature for {$featureInfo['Feature']['locale']} locale";
                                 break;
 
                             case 'feature_remove':
-                                $entry = sprintf(___('audit_admin_feature_remove'), $user, $log['Eventlog']['removed']);
+                                $entry = "{$user} removed feature {$log['Eventlog']['removed']}";
                                 break;
                             
                             case 'group_create':
@@ -159,15 +159,15 @@ class AuditComponent extends Object {
                                 $group = $this->link($groupInfo['Group']['name'], '/admin/groups');
                                 
                                 if ($log['Eventlog']['action'] == 'group_create') {
-                                    $entry = sprintf(___('audit_group_create'), $user, $group);
+                                    $entry = "{$user} created group {$group}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'group_edit') {
-                                    $entry = sprintf(___('audit_group_edit'), $user, $group);
+                                    $entry = "{$user} edited group {$group}";
                                 }
                                 break;
                             
                             case 'group_delete':
-                                $entry = sprintf(___('audit_group_delete'), $user, $log['Eventlog']['removed'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} deleted group {$log['Eventlog']['removed']} (ID {$log['Eventlog']['changed_id']})";
                                 break;
                             
                             case 'group_addmember':
@@ -179,13 +179,13 @@ class AuditComponent extends Object {
                                     $memberInfo = $this->controller->User->findById($log['Eventlog']['added'], null, null, -1);
                                     $member = $this->link($memberInfo['User']['firstname'].' '.$memberInfo['User']['lastname'], '/admin/users/'.$log['Eventlog']['added']);
                                     
-                                    $entry = sprintf(___('audit_group_addmember'), $user, $member, $group);
+                                    $entry = "{$user} added {$member} to group {$group}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'group_removemember') {
                                     $memberInfo = $this->controller->User->findById($log['Eventlog']['removed'], null, null, -1);
                                     $member = $this->link($memberInfo['User']['firstname'].' '.$memberInfo['User']['lastname'], '/admin/users/'.$log['Eventlog']['removed']);
                                     
-                                    $entry = sprintf(___('audit_group_removemember'), $user, $member, $group);
+                                    $entry = "{$user} removed {$member} from group {$group}";
                                 }
                                 break;
                             
@@ -195,30 +195,30 @@ class AuditComponent extends Object {
                                 $response = $this->link($responseInfo['Translation']['name']['string'], '/admin/responses');
                                 
                                 if ($log['Eventlog']['action'] == 'response_create') {
-                                    $entry = sprintf(___('audit_response_create'), $user, $response);
+                                    $entry = "{$user} created response {$response}";
                                 }
                                 elseif ($log['Eventlog']['action'] == 'response_edit') {
-                                    $entry = sprintf(___('audit_response_edit'), $user, $response);
+                                    $entry = "{$user} edited response {$response}";
                                 }
                                 break;
                             
                             case 'response_delete':
-                                $entry = sprintf(___('audit_response_delete'), $user, $log['Eventlog']['removed'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} deleted response {$log['Eventlog']['removed']} (ID {$log['Eventlog']['changed_id']})";
                                 break;
                             
                             case 'config':
-                                $entry = sprintf(___('audit_config'), $user, $log['Eventlog']['field'], $log['Eventlog']['removed'], $log['Eventlog']['added']);
+                                $entry = "{$user} changed config '{$log['Eventlog']['field']}' from '{$log['Eventlog']['removed']}' to '{$log['Eventlog']['added']}'";
                                 break;
                             
                             case 'user_edit':
                                 $userInfo = $this->controller->User->findById($log['Eventlog']['changed_id'], null, null, -1);
                                 $userLink = $this->link($userInfo['User']['firstname'].' '.$userInfo['User']['lastname'], '/admin/users/'.$log['Eventlog']['changed_id']);
                                 
-                                $entry = sprintf(___('audit_user_edit'), $user, $userLink);
+                                $entry = "{$user} edited {$userLink}'s user information";
                                 break;
                             
                             default:
-                                $entry = sprintf(___('audit_admin_default'), $user, $log['Eventlog']['action'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} committed unknown admin action {$log['Eventlog']['action']} to ID {$log['Eventlog']['changed_id']}";
                                 break;
                         }
                         break;
@@ -228,34 +228,34 @@ class AuditComponent extends Object {
                         switch ($log['Eventlog']['action']) {
                             case 'feature_add':
                                 $addonLink = $this->linkTitle($log['Eventlog']['added'], '/addon/');
-                                $entry = sprintf(___('audit_feature_add'), $user, $addonLink);
+                                $entry = "{$user} added addon {$addonLink} to feature list";
                                 break;
 
                             case 'feature_remove':
                                 $addonLink = $this->linkTitle($log['Eventlog']['removed'], '/addon/');
-                                $entry = sprintf(___('audit_editor_feature_remove'), $user, $addonLink);
+                                $entry = "{$user} removed addon {$addonLink} from feature list";
                                 break;
 
                             case 'feature_locale_change':
                                 $addonLink = $this->linkTitle($log['Eventlog']['changed_id'], '/addon/');
-                                $entry = sprintf(___('audit_feature_locale_change'), $user, $addonLink);
+                                $entry = "{$user} changed locales for addon {$addonLink} on feature list";
                                 break;
 
                             case 'review_approve':
-                                $entry = sprintf(___('audit_review_approve'), $user, $log['Eventlog']['changed_id']);
+                                $entry = "{$user} approved review {$log['Eventlog']['changed_id']}";
                                 break;
                             
                             case 'review_delete':
                                 if ($this->controller->SimpleAcl->actionAllowed('Admin', 'logs', $this->controller->Session->read('User'))) {
-                                    $entry = sprintf(___('audit_review_delete'), $user, $this->link($log['Eventlog']['changed_id'], "/admin/logs/{$log['Eventlog']['id']}"));
+                                    $entry = "{$user} deleted review ".$this->link($log['Eventlog']['changed_id'], "/admin/logs/{$log['Eventlog']['id']}");
                                 }
                                 else {
-                                    $entry = sprintf(___('audit_review_delete'), $user, $log['Eventlog']['changed_id']);
+                                    $entry = "{$user} deleted review {$log['Eventlog']['changed_id']}";
                                 }
                                 break;
                             
                             default:
-                                $entry = sprintf(___('audit_editor_default'), $user, $log['Eventlog']['action'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} committed unknown editor action {$log['Eventlog']['action']} to ID {$log['Eventlog']['changed_id']}";
                                 break;
                         }
                         break;
@@ -263,21 +263,21 @@ class AuditComponent extends Object {
                     case 'l10n':
                         switch ($log['Eventlog']['action']) {
                             case 'update_applications':
-                                $entry = sprintf(___('audit_update_applications'), $user, $this->linkTitle($log['Eventlog']['notes'], "/localizers/applications/?userlang="));
+                                $entry = "{$user} updated application translations for ".$this->linkTitle($log['Eventlog']['notes'], "/localizers/applications/?userlang=");
                                 break;
                             
                             case 'update_tags':
-                                $entry = sprintf(___('audit_update_tags'), $user, $this->linkTitle($log['Eventlog']['notes'], "/localizers/tags/?userlang="));
+                                $entry = "{$user} updated category translations for ".$this->linkTitle($log['Eventlog']['notes'], "/localizers/tags/?userlang=");
                                 break;
                             
                             case 'update_platforms':
-                                $entry = sprintf(___('audit_update_platforms'), $user, $this->linkTitle($log['Eventlog']['notes'], "/localizers/platforms/?userlang="));
+                                $entry = "{$user} updated platform translations for ".$this->linkTitle($log['Eventlog']['notes'], "/localizers/platforms/?userlang=");
                                 break;
                             case 'update_blog':
-                                $entry = sprintf(___('audit_update_blog'), $user, $this->linkTitle($log['Eventlog']['notes'], "/localizers/platforms/?userlang="));
+                                $entry = "{$user} updated blog post translations for ".$this->linkTitle($log['Eventlog']['notes'], "/localizers/platforms/?userlang=");
                                 break;
                             default:
-                                $entry = sprintf(___('audit_l10n_default'), $user, $log['Eventlog']['action'], $log['Eventlog']['notes']);
+                                $entry = "{$user} committed unknown action {$log['Eventlog']['action']} for <u>{$log['Eventlog']['notes']}</u>";
                                 break;
                         }
                         break;
@@ -285,22 +285,22 @@ class AuditComponent extends Object {
                     case 'security':
                         switch ($log['Eventlog']['action']) {
                             case 'reauthentication_failure':
-                                $entry = sprintf(___('audit_reauthentication_failure'), $user, $log['Eventlog']['notes']);
+                                $entry = "{$user} failed to re-authenticate to access {$log['Eventlog']['notes']}.";
                                 break;
                             
                             case 'modify_locked_group':
                                 $groupInfo = $this->controller->Group->findById($log['Eventlog']['changed_id'], null, null, -1);
                                 $group = $this->link($groupInfo['Group']['name'], '/admin/groups');
                                 
-                                $entry = sprintf(___('audit_modify_locked_group'), $user, $group);
+                                $entry = "{$user} attempted to modify locked group {$group}";
                                 break;
                             
                             case 'modify_other_locale':
-                                $entry = sprintf(___('audit_modify_other_locale'), $user, $log['Eventlog']['notes']);
+                                $entry = "{$user} attempted to modify translations in {$log['Eventlog']['notes']} without permission";
                                 break;
                             
                             default:
-                                $entry = sprintf(___('audit_security_default'), $user, $log['Eventlog']['action'], $log['Eventlog']['changed_id']);
+                                $entry = "{$user} committed unknown security action {$log['Eventlog']['action']} to ID {$log['Eventlog']['changed_id']}";
                                 break;
                         }
                         break;
@@ -310,7 +310,7 @@ class AuditComponent extends Object {
                             case 'group_associated':
                                 $groupInfo = $this->controller->Group->findById($log['Eventlog']['changed_id'], null, null, -1);
                                 $group = $this->link($groupInfo['Group']['name'], '/admin/groups');
-                                $entry = sprintf(___('audit_group_associated'), $user, $group);
+                                $entry = "{$user} associated themselves with {$group}";
                                 break;
                         }
                         break;
diff --git a/site/app/controllers/components/developers.php b/site/app/controllers/components/developers.php
index ceb24f8..35becf1 100644
--- a/site/app/controllers/components/developers.php
+++ b/site/app/controllers/components/developers.php
@@ -231,11 +231,6 @@ class DevelopersComponent extends Object {
     function detectAddontype($file) {            
         $extension = substr($file['name'], strrpos($file['name'], '.'));
         switch ($extension) {
-            case '.xo':
-            case '.xol':
-                return ADDON_EXTENSION;
-                break;
-
             case '.xpi':
                 // Dictionaries have a .dic file in the dictionaries directory
                 $zip = new Archive_Zip($file['tmp_name']);
@@ -257,6 +252,14 @@ class DevelopersComponent extends Object {
             case '.xml':
                 return ADDON_SEARCH;
                 break;
+
+            case '.xo':
+                return ADDON_ACTIVITY;
+                break;
+
+            case '.xol':
+                return ADDON_CONTENT;
+                break;
             
             default:
                 return 0;
@@ -476,7 +479,9 @@ class DevelopersComponent extends Object {
     */
     function getAllowedExtensions($addontype) {
         switch ($addontype) {
-            case ADDON_EXTENSION: $allowed = array('.xo', '.xol');
+            case ADDON_ACTIVITY:  $allowed = array('.xo');
+                                  break;
+            case ADDON_CONTENT:   $allowed = array('.xol');
                                   break;
             case ADDON_EXTENSION: $allowed = array('.xpi');
                                   break;
@@ -1166,6 +1171,11 @@ class DevelopersComponent extends Object {
                         ADDON_DICT => $this->controller->Addontype->getName(ADDON_DICT),
                         ADDON_LPAPP => $this->controller->Addontype->getName(ADDON_LPAPP)
                       );
+
+        global $app_listedtypes;
+        foreach ($app_listedtypes[APP_SUGAR] as $type) {
+            $addontypes[$type] = $this->controller->Addontype->getName($type);
+        }
         
         if ($autoDetect == true) {
             $addontypes[0] = _('devcp_additem_addontype_autodetect');
@@ -1179,81 +1189,5 @@ class DevelopersComponent extends Object {
         
         return $addontypes;
     }
-
-    function getLicenses($version_id=null) {
-        if ($version_id != null) {
-            $version = $this->controller->Version->findById($version_id);
-            $version = $version['Version'];
-            $license = $this->controller->License->findById($version['license_id']);
-        }
-
-        // Add 'Please Choose...' only if no license has been selected.
-        if (!isset($version['license_id'])) {
-            $licenses['null'] = array(
-                'name' => ___('devcp_uploader_please_choose'),
-                'selected' => True);
-        }
-
-        // Grab all the pre-approved licenses.
-        foreach ($this->controller->License->getNames() as $num => $builtin) {
-            $licenses['builtin_'.$num] = array(
-                'name' => $builtin,
-                'selected' => isset($license) && (string)$num === $license['License']['name']);
-        }
-
-        // The trans array holds translations for all the custom licenses we'll
-        // be displaying.  `other` starts off empty, for creating new licenses.
-        $trans['other']['text']['en-US'] = '';
-
-        if ($version_id != null) {
-            // Find all the custom licenses in use by this add-on.
-            $q = "SELECT Version.version, Version.license_id
-                  FROM versions AS Version INNER JOIN licenses AS License
-                    ON Version.license_id = License.id
-                  WHERE Version.addon_id = {$version['addon_id']}
-                    AND Version.license_id IS NOT NULL
-                    AND License.name = -1
-                  GROUP BY License.id
-                  ORDER BY Version.id DESC";
-            foreach ($this->controller->Version->execute($q) as $existing) {
-                $existing = $existing['Version'];
-                $t = ___('devcp_license_existing');
-                $val = 'existing_'.$existing['license_id'];
-                $licenses[$val] = array(
-                    'name' => sprintf($t, $version['addon_id'], $existing['version']),
-                    'selected' => $existing['license_id'] == $version['license_id']);
-                $trans[$val] = $this->controller->License->getAllTranslations($existing['license_id']);
-            }
-        }
-
-        $licenses['other'] = array('name' => ___('devcp_uploader_option_other'),
-                                   'selected' => False);
-        return array($licenses, $trans);
-    }
-
-    function saveLicense($licenseData, $text, $params) {
-        $License = $this->controller->License;
-        if ($licenseData['name'] != 'null') {
-            $license = $licenseData['name'];
-            // If the license is pre-approved, we prefixed the id with builtin_.
-            if (preg_match('/^builtin_(\d+)$/', $license, $matches)) {
-                $license_id = $License->getBuiltin($matches[1]);
-            } else if ($license == 'other' ||
-                       preg_match('/^existing_(\d+)$/', $license, $matches)) {
-                // If it's 'other', we need to create a new license.
-                if ($license == 'other') {
-                    $data['License']['name'] = -1;
-                    $License->save($data);
-                    $license_id = $License->getLastInsertId();
-                } else {
-                    $license_id = $matches[1];
-                }
-                // Save any changed translation text.
-                $localized['text'] = $text;
-                $License->saveTranslations($license_id, $params, $localized);
-            }
-            return $license_id;
-        }
-    }
 }
 ?>
diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php
index 0576751..f7b761f 100644
--- a/site/app/controllers/components/editors.php
+++ b/site/app/controllers/components/editors.php
@@ -123,9 +123,9 @@ class EditorsComponent extends Object {
                 $authors[] = $user['email'];
             }
         }
-        
-        $releasenotes = $this->controller->Version->findById($version['Version']['id'], array('Version.releasenotes'), null, -1);
 
+        $releasenotes = $this->controller->Version->findById($version['Version']['id'], array('Version.releasenotes'), null, -1);
+        
         $emailInfo = array('name' => $addon['Translation']['name']['string'],
                            'id' => $this->controller->Addon->id,
                            'reviewer' => $session['firstname'].' '.$session['lastname'],
@@ -136,7 +136,7 @@ class EditorsComponent extends Object {
                            );
         
         $this->controller->set('info', $emailInfo);
-
+        
         if ($data['Approval']['ActionField'] == 'public') {
             if (SITE_RELEASE_EMAIL) {
                 $this->controller->Email->template = 'email/aslo/release';
@@ -145,7 +145,7 @@ class EditorsComponent extends Object {
                 $this->controller->Email->send(false, SITE_RELEASE_EMAIL);
             }
         }
-        
+
         if ($data['Approval']['ActionField'] != 'superreview') {
             $this->controller->Email->template = 'email/nominated/'.$data['Approval']['ActionField'];
             $this->controller->Email->to = $emailInfo['email'];
@@ -281,7 +281,7 @@ class EditorsComponent extends Object {
                            'releasenotes' => $releasenotes[0]['releasenotes']
                            );
         $this->controller->set('info', $emailInfo);
-
+        
         if ($data['Approval']['ActionField'] == 'public') {
             if (SITE_RELEASE_EMAIL) {
                 $this->controller->Email->template = 'email/aslo/release';
@@ -290,7 +290,7 @@ class EditorsComponent extends Object {
                 $this->controller->Email->send(false, SITE_RELEASE_EMAIL);
             }
         }
-        
+
         if ($data['Approval']['ActionField'] != 'superreview') {
             $this->controller->Email->template = 'email/pending/'.$data['Approval']['ActionField'];
             $this->controller->Email->to = $emailInfo['email'];
@@ -366,20 +366,22 @@ class EditorsComponent extends Object {
     function redirectByQueueRank($listtype, $rank) {
         switch($listtype) {
         case 'nominated':
+            $addon = $this->controller->Addon->findAll(array('Addon.status' => STATUS_NOMINATED),
+                array('Addon.id'), null, 1, $rank);
+            if (!empty($addon)) {
+                $addon = $this->controller->Addon->getAddon($addon[0]['Addon']['id'], array('latest_version'));
+                if (!empty($addon['Version'])) {
+                    $this->controller->redirect("/editors/review/{$addon['Version'][0]['id']}?num={$rank}");
+                    return;
+                }
+            }
+            break;
+        
         case 'pending':
-            $rank = intval($rank);
-            $offset = ($rank > 0) ? $rank - 1 : 0;
-            $sql = $this->buildQueueFilterQuery($listtype);
-            $queue_sql = "SELECT `Version`.`id`
-                            {$sql['FROM']}
-                            {$sql['JOIN']}
-                            {$sql['WHERE']}
-                            {$sql['ORDER']}
-                            LIMIT 1 OFFSET {$offset}";
-
-            if ($result = $this->controller->Addon->query($queue_sql)) {
-                $review_id = $result[0]['Version']['id'];
-                $this->controller->redirect("/editors/review/{$review_id}?num={$rank}");
+            $file = $this->controller->File->findAll(array('File.status'=>STATUS_PENDING),
+                array('File.version_id'), null, 1, $rank);
+            if (!empty($file)) {
+                $this->controller->redirect("/editors/review/{$file[0]['File']['version_id']}?num={$rank}");
                 return;
             }
             break;
@@ -489,361 +491,6 @@ class EditorsComponent extends Object {
             $this->controller->Email->subject = sprintf('[RELEASE] %s-%s', $emailInfo['name'], $emailInfo['version']);
             $this->controller->Email->send(false, SITE_RELEASE_EMAIL);
         }
-        
-    }
-
-    /**
-     * Determine if the specified queue is filterable
-     * Queues currently filterable are: 'nominated' and 'pending'
-     * @param string $queue name of queue
-     * @return bool
-     */
-    function isFilterableQueue($queue) {
-        return in_array($queue, array('pending', 'nominated'));
-    }
-
-    /**
-     * Build query components for filtering the specified queue
-     * Returns empty array for unfilterable queues
-     * @param string $queue name of queue
-     * @return array array('FROM'=>string, 'JOIN'=>string, 'WHERE'=>string, 'ORDER'=>string)
-     * @TODO: for cake >=1.2, return compatible 'joins' and 'conditions' arrays
-     */
-    function buildQueueFilterQuery($queue='pending') {
-        if (!$this->isFilterableQueue($queue)) {
-            return array();
-        }
-
-        // Setup query components
-        $base_components = $this->baseQueueFilterQuery($queue);
-        $from = $base_components['FROM'];
-        $joins = $base_components['JOIN'];
-        $where = $base_components['WHERE'];
-        $order = 'ORDER BY';
-
-        // Fetch and apply filter
-        if ($filter = $this->getQueueFilter($queue)) {
-            $this->controller->Amo->clean($filter, false);
-
-            if (isset($filter['AddonOrAuthor']) && strlen($filter['AddonOrAuthor']) > 0) {
-                // search addons.name (localized), addons.supportemail (localized) and users.email
-                $where .= "\nAND (`Version`.`addon_id` IN(
-                                SELECT `a`.`id` FROM `addons` AS `a`
-                                LEFT JOIN `translations` AS `ntr_l` ON
-                                    (`ntr_l`.`id`=`a`.`name` AND `ntr_l`.`locale`='".LANG."')
-                                LEFT JOIN `translations` AS `ntr_en` ON
-                                    (`ntr_en`.`id`=`a`.`name` AND `ntr_en`.`locale`=`a`.`defaultlocale`)
-                                LEFT JOIN `translations` AS `etr_l` ON
-                                    (`etr_l`.`id`=`a`.`supportemail` AND `etr_l`.`locale`='".LANG."')
-                                LEFT JOIN `translations` AS `etr_en` ON
-                                    (`etr_en`.`id`=`a`.`supportemail` AND `etr_en`.`locale`=`a`.`defaultlocale`)
-                                WHERE
-                                    IFNULL(`ntr_l`.`localized_string`, `ntr_en`.`localized_string`)
-                                        LIKE '%{$filter['AddonOrAuthor']}%'
-                                    OR IFNULL(`etr_l`.`localized_string`, `etr_en`.`localized_string`)
-                                        LIKE '%{$filter['AddonOrAuthor']}%'
-
-                            ) OR `Version`.`addon_id` IN(
-                                SELECT `a`.`id` FROM `addons` AS `a`
-                                LEFT JOIN `addons_users` AS `au` ON (`a`.`id`=`au`.`addon_id`)
-                                LEFT JOIN `users` AS `u` ON (`au`.`user_id`=`u`.`id`)
-                                WHERE
-                                    `au`.`role` IN(".AUTHOR_ROLE_ADMINOWNER.","
-                                                .AUTHOR_ROLE_ADMIN.","
-                                                .AUTHOR_ROLE_OWNER.","
-                                                .AUTHOR_ROLE_DEV.")
-                                    AND `u`.`email` LIKE '%{$filter['AddonOrAuthor']}%'
-                            ))";
-            }
-
-            if (!empty($filter['Application'])) {
-                $joins .= "\nLEFT JOIN `applications_versions`
-                    ON (`Version`.`id`=`applications_versions`.`version_id`)";
-                $where .= "\nAND (
-                    `applications_versions`.`application_id`='{$filter['Application']}')";
-
-                if (!empty($filter['MaxVersion'])) {
-                    $where .= "\nAND (`applications_versions`.`max`='{$filter['MaxVersion']}')";
-                }
-            }
-
-            if (!empty($filter['SubmissionAge'])) {
-                $age = $filter['SubmissionAge'];
-                $age_op = '=';  // exact match by default
-
-                if (substr($age, -1) == '+') {
-                    // values like '10+' magically turn into a '>=10' comparison
-                    $age_op = '>=';
-                    $age = substr($age, 0, -1);
-                } elseif ($age === '1') {
-                    // make '1 day' include less than 1 as well
-                    $age_op = '<=';
-                }
-
-                if ($queue == 'pending') {
-                    $where .= "\nAND (TIMESTAMPDIFF(DAY, `Version`.`created`, NOW()){$age_op}'{$age}')";
-                } elseif ($queue == 'nominated') {
-                    $where .= "\nAND (TIMESTAMPDIFF(DAY, `Addon`.`nominationdate`, NOW()){$age_op}'{$age}')";
-                }
-            }
-
-            if (!empty($filter['Addontype'])) {
-                if (is_array($filter['Addontype'])) {
-                    $filter_vals = $filter['Addontype'];
-                } else {
-                    $filter_vals = array($filter['Addontype']);
-                }
-
-                $where .= "\nAND (`Addon`.`addontype_id` IN('"
-                                            . implode("','", $filter_vals) ."'))";
-            }
-
-            if (!empty($filter['Platform'])) {
-                if (is_array($filter['Platform'])) {
-                    $filter_vals = $filter['Platform'];
-                } else {
-                    $filter_vals = array($filter['Platform']);
-                }
-
-                // only available to pending queue for now
-                if ($queue == 'pending') {
-                    $where .= "\nAND (`File`.`platform_id` IN('"
-                                                . implode("','", $filter_vals) ."'))";
-                }
-            }
-        }
-        //End apply filter
-
-        // Sorting
-        $theSort = $this->getQueueSort($queue);
-        switch ($theSort['sortby']) {
-        case 'name':
-            $joins .= "\nLEFT JOIN `translations` AS `tr_l` ON
-                            (`tr_l`.`id` = `Addon`.`name` AND `tr_l`.`locale` = '".LANG."')"
-                     ."\nLEFT JOIN `translations` AS `tr_en` ON
-                            (`tr_en`.`id` = `Addon`.`name` AND `tr_en`.`locale` = `Addon`.`defaultlocale`)";
-            $order .= ' IFNULL(tr_l.localized_string, tr_en.localized_string)';
-            $order .= strtoupper($theSort['direction'] == 'DESC') ? ' DESC' : ' ASC';
-            break;
-
-        case 'type':
-            $joins .= "\nLEFT JOIN addontypes AS `Addontype` ON
-                            (`Addon`.`addontype_id`=`Addontype`.`id`)"
-                     ."\nLEFT JOIN translations AS `tr_l` ON
-                            (`tr_l`.`id` = `Addontype`.`name` AND `tr_l`.`locale` = '".LANG."')"
-                     ."\nLEFT JOIN translations AS tr_en ON
-                            (`tr_en`.`id` = `Addontype`.`name` AND `tr_en`.`locale` = 'en-US')";
-            $order .= ' IFNULL(`tr_l`.`localized_string`, `tr_en`.`localized_string`)';
-            $order .= strtoupper($theSort['direction'] == 'DESC') ? ' DESC' : ' ASC';
-            // secondary sort by age
-            if ($queue == 'pending') {
-                $order .= ', `Version`.`created` ASC';
-            } else {
-                $order .= ', `Addon`.`nominationdate` ASC';
-            }
-            break;
-
-        case 'age':
-        default:
-            if ($queue == 'pending') {
-                $order .= ' `Version`.`created`';
-            } else {
-                $order .= ' `Addon`.`nominationdate`';
-            }
-            $order .= strtoupper($theSort['direction'] == 'DESC') ? ' DESC' : ' ASC';
-            break;
-        }
-
-        return array('FROM'=>$from, 'JOIN'=>$joins, 'WHERE'=>$where, 'ORDER'=>$order);
-    }
-
-    /**
-     * Return base query components for filtering the specified queue
-     * Returns empty array for unfilterable queues
-     * @param string $queue name of queue
-     * @return array array('FROM'=>string, 'JOIN'=>string, 'WHERE'=>string)
-     * @TODO: for cake >=1.2, return compatible 'joins' and 'conditions' arrays
-     */
-    function baseQueueFilterQuery($queue='pending') {
-        if (!$this->isFilterableQueue($queue)) {
-            return array();
-        }
-
-        // Setup query components
-        if ($queue == 'pending') {
-            $from = "FROM `files` AS `File`";
-            $joins = "LEFT JOIN `versions` AS `Version` ON (`File`.`version_id`=`Version`.`id`)";
-            $joins .= "\nINNER JOIN `addons` AS `Addon` ON (`Version`.`addon_id`=`Addon`.`id`)";
-            $where = "WHERE `File`.`status`='".STATUS_PENDING."'";
-
-        } elseif ($queue == 'nominated') {
-            $from = "FROM `addons` AS `Addon`";
-            $joins = "INNER JOIN `versions` AS `Version` ON (`Addon`.`id`=`Version`.`addon_id`)";
-            $where = "WHERE `Addon`.`status`='".STATUS_NOMINATED."'";
-
-            // This makes sure we get only the most recent version
-            // "Find the version where no other version exists for the same addon and a greater creation date"
-            // http://stackoverflow.com/questions/157459/problem-joining-on-the-highest-value-in-mysql-table
-            $joins .= "\nLEFT JOIN `versions` AS `v2` ON (
-                                `Version`.`addon_id`=`v2`.`addon_id` AND
-                                `Version`.`created`<`v2`.`created`)";
-            $where .= "\nAND (`v2`.`id` IS NULL)";
-        }
-
-        return array('FROM'=>$from, 'JOIN'=>$joins, 'WHERE'=>$where);
-    }
-
-    /**
-     * Get the active filter for the specified queue
-     * @param string $queue name of queue
-     * @return array filter array or empty array if none exists
-     */
-    function getQueueFilter($queue) {
-        if (!$this->isFilterableQueue($queue)) {
-            return array();
-        }
-
-        $filter = array();
-        $queue_filters = $this->controller->Session->read('editor_queue_filters');
-        if (isset($queue_filters[$queue])) {
-            $filter = $queue_filters[$queue];
-        }
-        return $filter;
-    }
-
-    /**
-     * Set the active filter for the specified queue
-     * Only known fields are saved into the filter
-     * @param string $queue name of queue
-     * @return array empty array, or valid saved filter
-     */
-    function setQueueFilter($queue, $new_filter) {
-        if (!$this->isFilterableQueue($queue)) {
-            return array();
-        }
-
-        // known filter fields
-        $filter_fields = array('Addontype', 'Application', 'MaxVersion',
-                                'Platform', 'SubmissionAge', 'AddonOrAuthor');
-        $filter = array();
-
-        if (is_array($new_filter)) {
-            foreach ($new_filter as $k => $val) {
-                // only save known filter fields
-                if (!empty($val) && in_array($k, $filter_fields)) {
-                    $filter[$k] = $val;
-                }
-            }
-        }
-
-        // get or create array of filters
-        $queue_filters = $this->controller->Session->read('editor_queue_filters');
-        if (!is_array($queue_filters)) {
-            $queue_filters = array();
-        }
-
-        if ($filter) {
-            // update filter
-            $queue_filters[$queue] = $filter;
-        } else {
-            // clear filter
-            unset($queue_filters[$queue]);
-        }
-
-        // save all filters
-        $this->controller->Session->write('editor_queue_filters', $queue_filters);
-
-        return $filter;
-    }
-
-    /**
-     * Determine if the specified queue is sortable
-     * @param string $queue name of queue
-     * @return bool
-     */
-    function isSortableQueue($queue) {
-        return in_array($queue, array('pending', 'nominated'));
-    }
-
-    /**
-     * Get current sort order parameters for specified queue
-     * @param string $queue name of queue
-     * @param string $default return default filter instead of saved - defaults to false
-     * @return array
-     */
-    function getQueueSort($queue, $default=false) {
-        if (!$this->isSortableQueue($queue)) {
-            return array();
-        }
-
-        $defaults = array(
-                        'pending'   => array('sortby'=>'age', 'direction'=>'ASC'),
-                        'nominated' => array('sortby'=>'age', 'direction'=>'ASC'),
-                    );
-
-        if (!$default) {
-            $queue_sorts = $this->controller->Session->read('editor_queue_sorts');
-            if (isset($queue_sorts[$queue])) {
-                return $queue_sorts[$queue];
-            }
-        }
-
-        return $defaults[$queue];
-    }
-
-    /**
-     * Set sort order parameters on specified queue
-     * @param string $queue
-     * @param string $sortby
-     * @param string $direction
-     * @return bool
-     */
-    function setQueueSort($queue, $sortby='default', $direction='default') {
-        if (!$this->isSortableQueue($queue)) {
-            return array();
-        }
-
-        // valid sorts for the queues, each sort containing default directions
-        $validSorts = array(
-                        'pending' => array(
-                                        'age' => array('direction'=>'ASC'),
-                                        'type' => array('direction'=>'ASC'),
-                                        'name' => array('direction'=>'ASC'),
-                                    ),
-                        'nominated' => array(
-                                        'age' => array('direction'=>'ASC'),
-                                        'type' => array('direction'=>'ASC'),
-                                        'name' => array('direction'=>'ASC'),
-                                    ),
-                    );
-
-        $queueSorts = $this->controller->Session->read('editor_queue_sorts');
-        if (!is_array($queueSorts)) {
-            $queueSorts = array();
-        }
-
-        // reset to default
-        if ($sortby == 'default') {
-            unset($queueSorts[$queue]);
-            $this->controller->Session->write('editor_queue_sorts', $queueSorts);
-
-        // set to a known sort
-        } elseif (array_key_exists($sortby, $validSorts[$queue])) {
-            $newSort = $validSorts[$queue][$sortby];
-            $newSort['sortby'] = $sortby;
-            // use default direction unless...
-            if (in_array(strtoupper($direction), array('DESC', 'ASC'))) {
-                $newSort['direction'] = strtoupper($direction);
-            }
-            $queueSorts[$queue] = $newSort;
-            $this->controller->Session->write('editor_queue_sorts', $queueSorts);
-
-        // unknown sort
-        } else {
-            return false;
-        }
-
-        return true;
     }
 }
 ?>
diff --git a/site/app/controllers/components/email.php b/site/app/controllers/components/email.php
index 71f20ac..83708b4 100644
--- a/site/app/controllers/components/email.php
+++ b/site/app/controllers/components/email.php
@@ -12,7 +12,6 @@ class EmailComponent
  */
     var $from         = NOBODY_EMAIL; 
     var $fromName     = SITE_NAME;
-    var $sender       = null;
     //var $smtpUserName = 'username';  // SMTP username
     //var $smtpPassword = 'password'; // SMTP password
     //var $smtpHostNames= "smtp1.example.com;smtp2.example.com";  // specify main and backup server
@@ -71,14 +70,8 @@ class EmailComponent
         //$mail->Username = $this->smtpUserName;
         //$mail->Password = $this->smtpPassword;
  
+        $mail->Sender   = $this->from;
         $mail->From     = $this->from;
-        // if "Sender" field is set, add correct Sender header (cf. RFC5322 § 3.6.2)
-        if (!empty($this->sender)) {
-            $mail->Sender   = $this->sender;
-            $mail->AddCustomHeader("Sender: {$this->sender}");
-        } else {
-            $mail->Sender   = $this->from;
-        }
         $mail->FromName = $this->fromName;
         $mail->AddAddress($this->to, $this->toName );
         if ($reply)
diff --git a/site/app/controllers/components/image.php b/site/app/controllers/components/image.php
index b0b6992..491a05d 100644
--- a/site/app/controllers/components/image.php
+++ b/site/app/controllers/components/image.php
@@ -77,17 +77,7 @@ class ImageComponent extends Object {
         
         $this->renderImage($addon['Addon']['icondata'], $addon['Addon']['icontype']);
     }
-
-    /**
-     * Renders the icon for a collection
-     * @param int $collection_id the add-on ID
-     */
-    function renderCollectionIcon($collection_id) {
-        $collection = $this->controller->Collection->findById($collection_id, array('icondata', 'icontype'), null, -1);
-
-        $this->renderImage($collection['Collection']['icondata'], $collection['Collection']['icontype']);
-    }
-
+    
     /**
      * Renders the preview or thumbnail for an add-on
      * @param int $preview_id the preview id
@@ -134,25 +124,6 @@ class ImageComponent extends Object {
     }
     
     /**
-     * Gets the URL for the icon of the specified collection
-     * @param int $addon_id the add-on id
-     * @return string the URL
-     */
-    function getCollectionIconURL($collection_id) {
-        $collection = $this->controller->Collection->findById(
-            $collection_id, array(
-                'icontype', 'collection_type', 'uuid', 'modified'
-            ), null, -1
-        );
-        
-        if (empty($collection['Collection']['icontype'])) {
-            return "{$this->controller->base}/img/collection.png";
-        } else {
-            return "{$this->controller->base}/en-US/firefox/images/collection_icon/{$collection_id}/".strtotime($collection['Collection']['modified']);
-        }
-    }
-    
-    /**
      * Gets the URL for the highlighted preview for an add-on
      * @param int $addon_id add-on ID
      * @param string $type type of preview
diff --git a/site/app/controllers/components/search.php b/site/app/controllers/components/search.php
index 20f25ab..8fae4a5 100644
--- a/site/app/controllers/components/search.php
+++ b/site/app/controllers/components/search.php
@@ -152,7 +152,6 @@ class SearchComponent extends Object {
         
         // fields to search in
         $fields = array('name', 'summary', 'description');
-        $_termarray = array();
 
         // first prepare text terms
         if (is_string($terms) && !empty($terms)) {
@@ -163,6 +162,7 @@ class SearchComponent extends Object {
             preg_match_all($this->search_term_regex, $terms, $_termmatches);
         
             // remove quotes around split terms and sanitize them
+            $_termarray = array();
             foreach ($_termmatches[0] as $term) {
                 $term = trim($term, ' "');
                 $term = $this->controller->Sanitize->sql($term);
@@ -181,12 +181,13 @@ class SearchComponent extends Object {
         } else { //in this case enumerate all addons. this allows advanced search to act as a filter
             $text_score = "TRUE";
             $boolean_score = "TRUE";
+            $_termarray = array();
         }
         
         // now initialize compoents of SQL query
         $_selects = $_orderby = $_joins = $_where = array();
         
-        $_orderby[] = '(LOWER(a.name) =  \''.$this->controller->Sanitize->sql($terms).'\') DESC'; 
+        $_orderby[] = '(LOWER(a.name) =  \''.$terms.'\') DESC'; 
         $_orderby[] = '(a.status='.STATUS_PUBLIC.') DESC'; // show public add-ons first
         $_orderby[] = "(a.name LIKE '%".implode(' ', $_termarray)."%') DESC"; // sort exact name hits first
         
@@ -231,6 +232,10 @@ class SearchComponent extends Object {
                 $_addon_types = array(ADDON_EXTENSION, ADDON_THEME, ADDON_SEARCH, ADDON_DICT, ADDON_LPAPP, ADDON_LPADDON);
             }
         }
+
+        // we are sugar
+        $_addon_types = $app_listedtypes[APP_SUGAR];
+
         if (!is_array($_addon_types)) $_addon_types = array($_addon_types);
         
         // override the odd-on type if the advanced search parameter $atype sent. Notice am assuming -1 not an add-on type
@@ -355,104 +360,5 @@ class SearchComponent extends Object {
         foreach ($_results as $_result) $_result_ids[] = $_result['a']['id'];
         return $_result_ids;
     }
-
-
-    /**
-     * The collection search function.
-     *
-     * @param string terms to search for
-     * @param sort is used to specify sort order
-     * @param locale controls whether we search within only the current locale and en-US (faster) or all locales
-     * @return array of collection ids
-     */
-    function searchCollections($terms, $sort='', $locale=false) {
-        // fields to search in
-        $fields = array('name', 'description');
-        $_termarray = array();
-
-        // first prepare text terms
-        if (is_string($terms) && !empty($terms)) {
-            // UTF-8 aware case-insensitive search
-            $terms = mb_strtolower($terms, 'UTF-8');
-
-            // split string into single terms
-            preg_match_all($this->search_term_regex, $terms, $_termmatches);
-        
-            // remove quotes around split terms and sanitize them
-            foreach ($_termmatches[0] as $term) {
-                $term = trim($term, ' "');
-                $term = $this->controller->Sanitize->sql($term);
-                if ($term) $_termarray[] = $term;
-            }
-            // now strip duplicates
-            $_termarray = array_unique($_termarray);
-            $_search_termarray = array();
-            foreach ($_termarray as $term) {
-                if (false !== strpos($term, ' ')) $term = '"'.$term.'"'; // enclose "literal phrases" in quotes
-                $_search_termarray[] = '+'.$term."*";
-            }
-            
-            $text_score = " MATCH(c.".implode(', c.',$fields).") AGAINST ('".implode(" ", $_termarray)."')";
-            $boolean_score =  " MATCH(c.".implode(', c.',$fields).") AGAINST ('".implode(" ", $_search_termarray)."' IN BOOLEAN MODE)";
-        } else { //in this case enumerate all collections. this allows advanced search to act as a filter
-            $text_score = "TRUE";
-            $boolean_score = "TRUE";
-        }
-        
-        // now initialize compoents of SQL query
-        $_selects = $_orderby = $_where = array();
-        
-        $_orderby[] = '(LOWER(c.name) =  \''.$this->controller->Sanitize->sql($terms).'\') DESC'; 
-        $_orderby[] = "(c.name LIKE '%".implode(' ', $_termarray)."%') DESC"; // sort exact name hits first
-        
-        if (!$locale) {
-            $_matches = "(c.locale = '".LANG."' OR c.locale = 'en-US' ) AND ";
-        }
-        $_matches .= $boolean_score;
-        
-        foreach ($fields as $field) {
-            // select strings
-            $_selects[] = "c.".$field;
-        }
-        if ($text_score !== "TRUE") {
-            $_selects[] = $text_score." AS text_score";
-            $_orderby[] = 'text_score DESC';
-        }
-
-        $_where[] = "`Collection`.`application_id`='".APP_ID."'";
-        $_where[] = "`Collection`.`listed`='1'";
-
-        // sorting
-        switch($sort) {
-            case 'all':
-                array_unshift($_orderby, "`Collection`.`subscribers` DESC"); 
-                break;
-            case 'weekly':
-                array_unshift($_orderby, "`Collection`.`weekly_subscribers` DESC"); 
-                break;
-            case 'monthly':
-                array_unshift($_orderby, "`Collection`.`monthly_subscribers` DESC"); 
-                break;
-            case 'newest':
-                array_unshift($_orderby, "`Collection`.`created` DESC");
-                break;
-        }
-
-        // build and run query
-        $sql = "SELECT DISTINCT `c`.`id`, " . implode(', ', $_selects) . "
-                FROM `collections_search_summary` AS `c`
-                INNER JOIN `collections` AS `Collection` ON (`Collection`.`id` = `c`.`id`)
-                WHERE {$_matches}
-                    ".(empty($_where) ? '' : 'AND ('.implode(' AND ', $_where).') ')."
-                ORDER BY ".implode(', ', $_orderby);
-        $_results = $this->controller->Addon->query($sql, true);
-
-        // return the ids found
-        $_result_ids = array();
-        foreach ($_results as $_result) {
-            $_result_ids[] = $_result['c']['id'];
-        }
-        return $_result_ids;
-    }
 }
 ?>
diff --git a/site/app/controllers/components/stats.php b/site/app/controllers/components/stats.php
index 3702a3c..21dded6 100644
--- a/site/app/controllers/components/stats.php
+++ b/site/app/controllers/components/stats.php
@@ -125,10 +125,8 @@ class StatsComponent extends Object {
             
             // Update pings per day
             case 'updatepings':
-                // Since summing update pings per day isn't as useful as summing
-                // the other data points, we're taking an average here instead.
                 if ($data = $model->query("
-                    SELECT `date`, {$date_group_column} AVG(`count`) as `count`
+                    SELECT `date`, {$date_group_column} sum(`count`) as `count` 
                     FROM `update_counts` 
                     WHERE `addon_id`={$addon_id} AND date != '0000-00-00' 
                     GROUP BY `{$date_group_by}`
@@ -523,89 +521,5 @@ class StatsComponent extends Object {
         
         return $xml;
     }
-
-    /**
-     * @return array Array of count results for the current day.
-     */
-    function getDailyStats() {
-
-        $yesterday = date('Y-m-d', strtotime('yesterday'));
-        $after = $yesterday.' 00:00:00';
-        $before = $yesterday.' 23:59:59';
-
-        $ret = array(
-            'nomination' => '',
-            'pending' => '',
-            'flagged' => '',
-            'reviews' => '',
-            'dailyAddons' => '',
-            'totalAddons' => '',
-            'dailyVersions' => '',
-            'dailyUsers' => '',
-            'dailyImages' => '',
-            'dailyDownloads' => '',
-            'after' => $after,
-            'before' => $before
-        );
-
-        $model =& $this->controller->Addon;
-
-        if ($buf = $model->query("SELECT COUNT(*) as nomination FROM addons WHERE status=3", true)) {
-            $ret['nomination'] = $buf[0][0]['nomination'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as pending FROM files WHERE status=2", true)) {
-            $ret['pending'] = $buf[0][0]['pending'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as flagged FROM addons WHERE adminreview=1", true)) {
-            $ret['flagged'] = $buf[0][0]['flagged'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as reviews FROM reviews WHERE editorreview=1", true)) {
-            $ret['reviews'] = $buf[0][0]['reviews'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM addons WHERE created >= '{$after}' AND created <= '{$before}'", true)) {
-            $ret['dailyAddons'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM addons", true)) {
-            $ret['totalAddons'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM versions WHERE created >= '{$after}' AND created <= '{$before}'", true)) {
-            $ret['dailyVersions'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM users WHERE created >= '{$after}' AND created <= '{$before}'", true)) {
-            $ret['dailyUsers'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM reviews WHERE created >= '{$after}' AND created <= '{$before}'", true)) {
-            $ret['dailyReviews'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT COUNT(*) as total FROM previews WHERE created >= '{$after}' AND created <= '{$before}'", true)) {
-            $ret['dailyImages'] = $buf[0][0]['total'];
-            unset($buf);
-        }
-
-        if ($buf = $model->query("SELECT SUM(count) as count FROM download_counts WHERE date = '{$yesterday}'", true)) {
-            $ret['dailyDownloads'] = $buf[0][0]['count'];
-            unset($buf);
-        }
-
-        return $ret;
-    }
 }
 ?>
diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php
index f089e63..a77946e 100644
--- a/site/app/controllers/developers_controller.php
+++ b/site/app/controllers/developers_controller.php
@@ -37,31 +37,11 @@
  * ***** END LICENSE BLOCK ***** */
 require_once('Archive/Zip.php');
 
-/**
- * Returns $object[$name], or $default if that's not set.
- *
- * If $name is a string of dot-separated names like 'foo.bar.baz',
- * $object['foo']['bar']['baz'] will be returned.  If any name
- * along the way is not set, $default will be returned.
- *
- * If you want to fetch a name with embedded dots, look elsewhere.
- */
-function getitem($object, $name, $default=null) {
-    $split = explode('.', $name, 2);
-    if (count($split) == 2) {
-        list($a, $b) = $split;
-        return isset($object[$a]) ? getitem($object[$a], $b, $default)
-                                  : $default;
-    } else {
-        return isset($object[$name]) ? $object[$name] : $default;
-    }
-}
-
 class DevelopersController extends AppController
 {
     var $name = 'Developers';
     var $uses = array('Addon', 'Addontype', 'Application', 'Approval', 'Appversion',
-        'EditorSubscription', 'Eventlog', 'File', 'License', 'Platform', 'Preview', 'Review',
+        'EditorSubscription', 'Eventlog', 'File', 'Platform', 'Preview', 'Review',
         'Tag', 'Translation', 'User', 'Version');
     var $components = array('Amo', 'Developers', 'Editors', 'Email', 'Error',
         'Image', 'Opensearch', 'Rdf', 'Src', 'Versioncompare');
@@ -110,9 +90,6 @@ class DevelopersController extends AppController
         // Default "My Add-ons" sidebar data
         $session = $this->Session->read('User');
         $this->publish('all_addons', $this->Addon->getAddonsByUser($session['id']));
-
-        // Include the dev_agreement column on developer pages.
-        array_push($this->Addon->default_fields, 'dev_agreement');
     }
     
     /**
@@ -235,7 +212,6 @@ class DevelopersController extends AppController
      */
     function _submitAddon() {
         $this->publish('type', 'new');
-        $this->publish('hasAgreement', false);
         
         $this->render('uploader');
     }
@@ -266,17 +242,9 @@ class DevelopersController extends AppController
         $session = $this->Session->read('User');
         $this->Addon->saveAuthor($data['Addon']['id'], $session['id']);
         
-        // Save License
-        $license_id = $this->Developers->saveLicense(
-             $this->data['License'],
-             getitem($this->data, 'License.text'),
-             getitem($this->params, 'form.data.License'));
-        $this->Addon->saveField('dev_agreement', 1);
-
         // Add Version
         $this->Version->id = 0;
         $data['Version']['addon_id'] = $data['Addon']['id'];
-        $data['Version']['license_id'] = $license_id;
         $this->Version->save($data['Version']);
         $data['Version']['id'] = $this->Version->getLastInsertId();
         
@@ -351,30 +319,13 @@ class DevelopersController extends AppController
                 return $this->Error->getJSONforError(sprintf(___('devcp_update_addon_version_exists_error'), $data['Version']['version'], $this->url('/developers/versions/addfile/'.$vcheck['Version']['id'])));
             }
             
-            // Save License
-            if ($addon['Addon']['dev_agreement'] == true) {
-                // If we already have an agreement, we didn't show the license
-                // picker, so use the previously selected license.
-                global $valid_status;
-                $old_id = $this->Version->getVersionByAddonId($addon_id, $valid_status);
-                $oldVersion = $this->Version->findById($old_id);
-                $license_id = $oldVersion['Version']['license_id'];
-            } else {
-                $license_id = $this->Developers->saveLicense(
-                    $this->data['License'],
-                    getitem($this->data, 'License.text'),
-                    getitem($this->params, 'form.data.License'));
-            }
-            $this->Addon->save(array('Addon' => array('id' => $addon_id,
-                                                      'dev_agreement' => 1)));
-
+            
             // Add Version
             $this->Version->id = 0;
             $data['Version']['addon_id'] = $addon_id;
-            $data['Version']['license_id'] = $license_id;
             $this->Version->save($data['Version']);
             $version_id = $this->Version->getLastInsertId();
-
+            
             // If add-on is public, cancel any pending files
             if ($addon['Addon']['status'] == STATUS_PUBLIC) {
                 $this->Addon->execute("UPDATE files SET status = ".STATUS_SANDBOX." WHERE files.version_id IN (SELECT id FROM versions WHERE versions.addon_id={$addon_id}) AND files.status = ".STATUS_PENDING);
@@ -456,6 +407,7 @@ class DevelopersController extends AppController
             );
     }
     
+
     function _rmtree($dir) {
         $dir = "$dir";
 
@@ -543,71 +495,65 @@ class DevelopersController extends AppController
             );
         }
         
-        // we are sugar
-        if (true) {
-            $bundle = $addon['File']['details']['path'];
-            $pathinfo = pathinfo($bundle);
-
-            if ($pathinfo['extension'] == '.xo') {
-                $ini = $this->_unbundle($bundle, 'activity/activity.info');
-                if (isset($ini['error']))
-                    return $this->Error->getJSONforError($ini['error']);
-                $ini_file = $ini['manifest'];
-
-                if (!is_array($ini_file))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_not_found'));
-                if (!isset($ini_file['name']))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_name'));
-                if (!isset($ini_file['activity_version']))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_activity_version'));
-
-                if (isset($ini_file['bundle_id']))
-                    $addon['Addon']['guid'] = $ini_file['bundle_id'];
-                else if (isset($ini_file['service_name']))
-                    $addon['Addon']['guid'] = $ini_file['service_name'];
-                else
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_bundle_id'));
+        if ($addon['Addon']['addontype_id'] == ADDON_ACTIVITY) {
+            $ini = $this->_unbundle($addon['File']['details']['path'], 'activity/activity.info');
+            if (isset($ini['error']))
+                return $this->Error->getJSONforError($ini['error']);
+            $ini_file = $ini['manifest'];
 
-                $addon['Addon']['name'] = $ini_file['name'];
-                $addon['Addon']['summary'] = $ini_file['name'];
-                $addon['Version']['version'] = $ini_file['activity_version'];
+            if (!is_array($ini_file))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_not_found'));
+            if (!isset($ini_file['name']))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_name'));
+            if (!isset($ini_file['activity_version']))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_activity_version'));
 
+            if (isset($ini_file['bundle_id']))
+                $addon['Addon']['guid'] = $ini_file['bundle_id'];
+            else if (isset($ini_file['service_name']))
+                $addon['Addon']['guid'] = $ini_file['service_name'];
+            else
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_bundle_id'));
+
+            $addon['Addon']['name'] = $ini_file['name'];
+            $addon['Addon']['summary'] = $ini_file['name'];
+            $addon['Version']['version'] = $ini_file['activity_version'];
+
+        } else if ($addon['Addon']['addontype_id'] == ADDON_CONTENT) {
+            $ini = $this->_unbundle($addon['File']['details']['path'], 'library/library.info');
+            if (isset($ini['error']))
+                return $this->Error->getJSONforError($ini['error']);
+            $ini_file = $ini['manifest'];
+
+            if (!is_array($ini_file))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_not_found'));
+            if (!isset($ini_file['name']))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_name'));
+            if (!isset($ini_file['long_name']))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_summary'));
+            if (!isset($ini_file['global_name']))
+                return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_bundle_id'));
+
+            $addon['Addon']['name'] = $ini_file['name'];
+            $addon['Addon']['summary'] = $ini_file['long_name'];
+            $addon['Addon']['guid'] = $ini_file['global_name'];
+
+            if (!isset($this->data['Addon']['id'])) {
+                $addon['Version']['version'] = 1;
             } else {
-                $ini = $this->_unbundle($bundle, 'library/library.info');
-                if (isset($ini['error']))
-                    return $this->Error->getJSONforError($ini['error']);
-                $ini_file = $ini['manifest'];
-
-                if (!is_array($ini_file))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_not_found'));
-                if (!isset($ini_file['name']))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_name'));
-                if (!isset($ini_file['long_name']))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_summary'));
-                if (!isset($ini_file['global_name']))
-                    return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_bundle_id'));
-
-                $addon['Addon']['name'] = $ini_file['name'];
-                $addon['Addon']['summary'] = $ini_file['long_name'];
-                $addon['Addon']['guid'] = $ini_file['global_name'];
-
-                if (!isset($this->data['Addon']['id'])) {
-                    $addon['Version']['version'] = 1;
-                } else {
-                    $addon_id = $this->data['Addon']['id'];
-                    $_addon = $this->Addon->findById($addon_id);
-                    $version = 0;
-
-                    if (!empty($_addon)) {
-                        foreach ($_addon['Version'] as $i) {
-                            if ($i['version'] > $version) {
-                                $version = $i['version'];
-                            }
+                $addon_id = $this->data['Addon']['id'];
+                $_addon = $this->Addon->findById($addon_id);
+                $version = 0;
+
+                if (!empty($_addon)) {
+                    foreach ($_addon['Version'] as $i) {
+                        if ($i['version'] > $version) {
+                            $version = $i['version'];
                         }
                     }
-
-                    $addon['Version']['version'] = $version + 1;
                 }
+
+                $addon['Version']['version'] = $version + 1;
             }
         } else
         // Parse install.rdf file if not a search plugin
@@ -665,11 +611,6 @@ class DevelopersController extends AppController
         elseif ($addon['Addon']['addontype_id'] == ADDON_SEARCH) {
             // Get search engine properties
             $search = $this->Opensearch->parse($addon['File']['details']['path']);
-
-            // There was a parse error, the name was empty, etc.  Bad things.
-            if ($search == null) {
-                return $this->Error->getJSONforError(___('devcp_verify_search_engine_error','Either the XML is invalid or required fields are missing.  Please <a href="https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox">read the documentation</a>, verify your add-on, and try again.'));
-            }
             
             $addon['Addon']['name'] = $search->name;
             $addon['Addon']['summary'] = $search->description;
@@ -863,7 +804,7 @@ class DevelopersController extends AppController
             $supportedApps = array(
                 0 => array(
                         'Application' => array(
-                            'id' => APP_FIREFOX
+                            'id' => APP_SUGAR
                         )
                     )
             );
@@ -1030,6 +971,7 @@ class DevelopersController extends AppController
         $criteria['description'] = !empty($addon['Translation']['description']['string']);
         $criteria['category'] = !empty($addon['Tag']);
         $criteria['previews'] = !empty($previews);
+        $criteria['reviews'] = (!empty($reviews) && count($reviews) >= 3) ? true : false;
         $criteria['prerelease'] = !empty($addon['Addon']['prerelease']) ? false : true;
         $criteria['application'] = !empty($versions) ? true : false;
         
@@ -1068,7 +1010,6 @@ class DevelopersController extends AppController
             $addonData = array('status' => STATUS_SANDBOX, 'higheststatus' => STATUS_SANDBOX);
             $this->Addon->save($addonData);
             $this->publish('success', true);
-            if (QUERY_CACHE) $this->Addon->Cache->markListForFlush("addon:{$addon['Addon']['id']}");
             return true;
         }
         
@@ -1111,7 +1052,7 @@ class DevelopersController extends AppController
                         $this->render('addon_status_nominate');
                         return false;
                     }
-                    $addonData = array('status' => STATUS_NOMINATED, 'nominationmessage' => $this->params['form']['data']['Addon']['nominationmessage'], 'nominationdate' => date('Y-m-d H:i:s'));
+                    $addonData = array('status' => STATUS_NOMINATED, 'nominationmessage' => $this->params['form']['data']['Addon']['nominationmessage']);
                     $this->Addon->save($addonData);
                     $this->publish('success', true);
                     
@@ -1226,9 +1167,6 @@ class DevelopersController extends AppController
             $this->publish('version', $version['Version']['version']);
         }
         
-        $addon = $this->Addon->findById($addon_id, array('Addon.dev_agreement'));
-        $this->publish('hasAgreement', $addon['Addon']['dev_agreement']);
-
         $this->render('uploader');
     }
     
@@ -1351,13 +1289,6 @@ class DevelopersController extends AppController
                 }
             }
             
-            // Save license.
-            $license_id = $this->Developers->saveLicense(
-                 $this->data['License'],
-                 getitem($this->data, 'Version.License.text'),
-                 getitem($this->params, 'form.data.Version.License'));
-            $this->Version->saveField('license_id', $license_id);
-
             // flush cached add-on objects
             if (QUERY_CACHE) $this->Addon->Cache->markListForFlush("addon:{$addon_id}");
             
@@ -1385,13 +1316,6 @@ class DevelopersController extends AppController
         
         // Get all translations
         $translations = $this->Version->getAllTranslations($version_id);
-        if (isset($version['Version']['license_id'])) {
-            $trans = $this->License->getAllTranslations($version['Version']['license_id']);
-            $translations['license_text'] = $trans['text'];
-        } else {
-            $translations['license_text'] = array();
-        }
-
         $this->set('translations', $translations);
         
         // Other info
@@ -1486,9 +1410,7 @@ class DevelopersController extends AppController
             // flush cached add-on objects
             if (QUERY_CACHE) $this->Addon->Cache->markListForFlush("addon:{$addon_id}");
             
-            // inform about cache lag, if any of the changes were successful
-            if (!empty($messages['success'])) $messages['success'][] = ___('devcp_several_hours');
-            
+            $messages['success'][] = ___('devcp_several_hours');
             $this->publish('messages', $messages);
         }
         
@@ -1607,10 +1529,8 @@ class DevelopersController extends AppController
             return;
         }
         // Make sure user has some permissions to view this add-on
-        $session = $this->Session->read('User');
-        $isEditor = $this->SimpleAcl->actionAllowed('Editors', '*', $session);
         $role = $this->Amo->getAuthorRole($inforequest['Approval']['addon_id']);
-        if (!$isEditor && empty($role)) $this->Amo->accessDenied();
+        if (empty($role)) $this->Amo->accessDenied();
         
         $this->publish('inforequest', $inforequest);
         
@@ -1628,21 +1548,6 @@ class DevelopersController extends AppController
         if (!empty($this->data)) {
             $session = $this->Session->read('User');
             
-            //Auto-detect addontype if necessary
-            if ($this->data['Addon']['addontype_id'] == 0) {
-                $this->data['Addon']['addontype_id'] = $this->Developers->detectAddontype($this->data['File']['file1']);
-                $this->publish('autoDetected', $this->Addontype->getName($this->data['Addon']['addontype_id']));
-            }
-            
-            //Make sure addontype is allowed
-            $allowedAddonTypes = $this->Developers->getAllowedAddonTypes(false, $this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User')));
-            if (!array_key_exists($this->data['Addon']['addontype_id'], $allowedAddonTypes)) {
-                $this->Error->addError(_('devcp_error_invalid_addontype'));
-            }
-            
-            //Validate files
-            $this->Developers->validateFiles();
-
             // reply submitted
             $approvalData = array(
                 'user_id' => $session['id'],
@@ -1684,5 +1589,1429 @@ class DevelopersController extends AppController
         }
         $this->render();
     }
+    
+   /**
+    * Index
+    */
+    function index($addon_id = '') {
+        $this->Amo->clean($addon_id);
+        $session = $this->Session->read('User');
+        $this->User->id = $session['id'];
+        
+        // If requesting a specific add-on, show details for it
+        if (!empty($addon_id)) {
+            $this->details($addon_id);
+            return;
+        }
+        
+        $addon_ids = $this->Addon->getAddonsByUser($session['id']);
+        $data = array();
+        
+        if (!empty($addon_ids)) {
+            foreach ($addon_ids as $addon_id => $addon_name) {
+                $addon = $this->Addon->find("Addon.id={$addon_id}");
+                
+                if (!empty($addon['Version'][0])) {
+                        $files = $this->File->findAll("File.version_id={$addon['Version'][0]['id']}");
+                        
+                        if (!empty($files)) {
+                            foreach ($files as $file) {
+                                $addon['Version'][0]['File'][] = $file;
+                            }
+                        }
+                }
+                
+                $data['Addon'][$addon_id] = array_merge($addon['Addon'], $addon);
+                $data['Addon'][$addon_id]['updatepings'] = $this->Addon->getMostRecentUpdatePingCount($addon_id);
+            
+            }
+        }
+
+        $this->publish('data', $data);
+        $this->publish('approval', $this->Amo->getApprovalStatus());
+        $this->publish('platforms', $this->Amo->getPlatformName());
+        $this->publish('addontypes', $this->Addontype->getNames());
+    }
+
+   /**
+    * Shows the details of a specific add-on
+    * @param int $id The add-on id
+    */
+    function details($id) {
+        $this->Amo->clean($id);
+
+        if (!$this->Amo->checkOwnership($id)) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }
+
+        //Bind necessary models
+        $this->User->bindFully();
+        $this->Addontype->bindFully();
+        $this->Version->bindFully();
+        $this->Addon->bindFully();
+        
+        $this->Addon->id = intval($id);
+
+        if (!empty($this->data)) {
+            //Save translated fields (releasenotes)
+            $this->Developers->saveTranslations($this->data);
+            $this->flash(_('devcp_comments_updated'), '/developers/details/'.$id);
+            return;
+        }
+
+        if(!$addon = $this->Addon->read()) {
+            $this->flash(_('error_addon_notfound'), '/developers/index');
+            return;
+        }
+        
+        if (!empty($addon)) {
+            if (!empty($addon['Version'])) {
+                foreach ($addon['Version'] as $v => $version) {
+                    $addon['Version'][$v]['File'] = $this->File->findAll("File.version_id='{$version['id']}'");
+                }
+            }
+
+            if (!empty($addon['Preview'])) {
+                foreach ($addon['Preview'] as $p => $preview) {
+                    $this->Preview->id = $preview['id'];
+                    $addon['Preview'][$p] = $this->Preview->read();
+                }
+            }
+
+            if (!empty($addon['Tag'])) {
+                foreach ($addon['Tag'] as $tag) {
+                    $tags[] = $tag['id'];
+                }
+                $tags = $this->Tag->findAll("Tag.id IN (".implode(', ', $tags).")");
+                if (!empty($tags)) {
+                    foreach ($tags as $tag) {
+                        $addon['Tags'][] = $tag['Translation']['name']['string'];
+                    }
+                }
+            }
+        }
+
+        $this->publish('addon', $addon);
+        $this->publish('approval', $this->Amo->getApprovalStatus());
+        $this->publish('platforms', $this->Amo->getPlatformName());
+        $this->publish('addontypes', $this->Addontype->getNames());
+
+        //Retrieve language arrays from bootstrap.
+        global $valid_languages, $native_languages;
+        foreach (array_keys($valid_languages) as $key) {
+            $languages[$key] = $native_languages[$key]['native'];
+
+            $this->Addon->setLang($key, $this);
+            $addonL = $this->Addon->read();
+            
+            foreach ($addonL['Translation'] as $field => $translation) {
+                if ($translation['locale'] == $key) {
+                    $info[$key][$field] = $translation['string'];
+                }
+                else {
+                    $info[$key][$field] = '';
+                }
+            }
+        }
+        $this->Addon->setLang(LANG, $this);
+        
+        //Set up localebox info
+        $this->set('localebox', array('info' => $info,
+                                      'defaultLocale' => $addon['Addon']['defaultlocale'],
+                                      'languages' => $languages));
+        $this->render('details', 'mozilla');
+    }
+
+   /**
+    * Add new version to a new or existing add-on
+    * @param int $id
+    */
+    function add($id = '') {
+        $this->Amo->clean($id);
+        $this->publish('subpagetitle', _('devcp_addon_submit_pagetitle'));
+        $this->breadcrumbs[_('devcp_addon_submit_pagetitle')] = '/developers/add/'.$id;
+        $this->publish('breadcrumbs', $this->breadcrumbs);
+        
+        //If submissions are disabled, show appropriate error
+        if ($this->Config->getValue('submissions_disabled') == 1 && !$this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User'))) {
+            $this->flash(_('devcp_submissions_disabled'), '/', 3);
+            return;
+        }
+
+        //Bind necessary models
+        $this->User->bindFully();
+        $this->Addontype->bindFully();
+        $this->Version->bindFully();
+        $this->Addon->bindFully();
+        
+        //Get a list of add-on types
+        $this->publish('addonTypes', $this->Addontype->getNames());       
+
+        //Determine if adding a new addon or new version
+        if (!empty($this->data['Addon']['newAddon'])) {
+            if ($this->data['Addon']['newAddon'] == 'false') {
+                $this->addVars['newAddon'] = false;
+            }
+            else {
+                $this->addVars['newAddon'] = true;
+            }
+            $this->Addon->id = $id;
+            $this->addVars['existing'] = $this->Addon->read();
+        }
+        else {
+            //This is step 1, so check if the id was passed
+            if (!empty($id) && $this->Amo->checkOwnership($id)) {
+                $this->Addon->id = $id;
+                $this->addVars['existing'] = $this->Addon->read();
+                $this->addVars['newAddon'] = false;
+            }
+            else {
+                $this->addVars['newAddon'] = true;
+                $this->addVars['existing'] = array();
+                $id = '';
+            }
+        }
+        $this->publish('existing', $this->addVars['existing']);
+        
+        //Set some view data used in all steps
+        $this->publish('id', $id);
+        $this->publish('newAddon', $this->addVars['newAddon']);
+        if (!empty($this->data['Version']['id'])) {
+            $this->publish('version', $this->data['Version']['id']);
+            $this->Version->id = $this->data['Version']['id'];
+        }
+
+        //Set default locale
+        if (!empty($this->data['Addon']['defaultlocale'])) {
+            $this->addVars['defaultLocale'] = $this->data['Addon']['defaultlocale'];
+        }
+        elseif (!empty($this->addVars['existing']['Addon']['defaultlocale'])) {
+            $this->addVars['defaultLocale'] = $this->addVars['existing']['Addon']['defaultlocale'];
+        }
+        else {
+            $this->addVars['defaultLocale'] = LANG;
+        }
+
+        //Set models to read and save using default locale, which may not be the current locale
+        $this->Addon->setLang($this->addVars['defaultLocale'], $this);
+        $this->Version->setLang($this->addVars['defaultLocale'], $this);
+
+        $this->set('defaultLocale', $this->addVars['defaultLocale']);
+
+        //Go to appropriate step
+        if (isset($_POST['cancel'])) {
+            $this->_cancelAdd();
+        }
+        elseif (isset($this->data['Addon']['add_step1'])) {
+            $this->_addStep1();
+        }
+        elseif (isset($this->data['Addon']['add_step2'])) {
+            $this->_addStep2();
+        }
+        elseif (isset($this->data['Addon']['add_step3'])) {
+            $this->_addStep3();
+        }
+        elseif (isset($this->data['Addon']['add_step4'])) {
+            $this->_addStep4();
+        }
+        else {
+            if ($this->addVars['newAddon'] == true) {
+                $this->_addStep0();
+            }
+            else {
+                $this->_addStep1();
+            }
+        }
+    }
+    
+   /**
+    * Step 0: Agreement
+    */
+    function _addStep0() {
+        if (isset($this->data['Addon']['add_step0'])) {
+            if (!empty($_POST['accept'])) {
+                $this->data = '';
+                $this->_addStep1();
+                return;
+            }
+        }
+        $this->publish('step', 0);
+        $this->render('add_step0');
+    }
+    
+   /**
+    * Step 1: Upload files/select add-on type
+    */
+    function _addStep1() {
+        //Check if we are processing Step 1 or just displaying it
+        if (isset($this->data['Addon']['add_step1'])) {
+            //Check for model validation first
+            if (!$this->Addon->validates($this->data)) {
+                $this->Error->addError(_('error_formerrors'));
+                $this->validateErrors();
+            }
+            
+            //Auto-detect addontype if necessary
+            if ($this->data['Addon']['addontype_id'] == 0) {
+                $this->data['Addon']['addontype_id'] = $this->Developers->detectAddontype($this->data['File']['file1']);
+                $this->publish('autoDetected', $this->Addontype->getName($this->data['Addon']['addontype_id']));
+            }
+            
+            //Make sure addontype is allowed
+            $allowedAddonTypes = $this->Developers->getAllowedAddonTypes(false, $this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User')));
+            if (!array_key_exists($this->data['Addon']['addontype_id'], $allowedAddonTypes)) {
+                $this->Error->addError(_('devcp_error_invalid_addontype'));
+            }
+            
+            //Validate files
+            $this->Developers->validateFiles();
+                
+            //Only proceed if no errors
+            if ($this->Error->noErrors()) {
+                //Search plugins do not have install.rdf to parse
+                if ($this->data['Addon']['addontype_id'] != ADDON_SEARCH) {
+
+                    //Iterate through files to make sure they're all valid
+                    //Reverse order so that file 1's info will be used after
+                    for ($f = 3; $f >= 1; $f--) {
+                        if (!empty($this->addVars['file'.$f])) {
+                            //Extract install.rdf
+                            $zip = new Archive_Zip($this->addVars['file'.$f]['path']);
+                            $extraction = $zip->extract(array('extract_as_string' => true, 'by_name' => array('install.rdf')));
+                            
+                            //Make sure install.rdf is present
+                            if (!empty($extraction)) {
+                                $fileContents = $extraction[0]['content'];
+                                
+                                //Use Rdf Component to parse install.rdf
+                                $manifestData = $this->Rdf->parseInstallManifest($fileContents);
+                                
+                                //Clean manifest data - take THAT, evil-doers!
+                                $this->Amo->clean($manifestData);
+                                
+                                //Validate manifest data
+                                $validate = $this->Developers->validateManifestData($manifestData);
+                                // Anything other than boolean true is an error
+                                if ($validate === true) {
+                                
+                                    //Validate target applications
+                                    $this->addVars['appversions'] = $this->Developers->validateTargetApplications($manifestData['targetApplication']);
+                                    
+                                    // If result is a string, it's an error
+                                    if (is_string($this->addVars['appversions'])) {
+                                        $this->Error->addError($this->addVars['appversions']);
+                                    }
+                                    
+                                    //Make sure GUIDs match in all manifests
+                                    if (empty($guid)) {
+                                        $guid = $manifestData['id'];
+                                    }
+                                    elseif ($manifestData['id'] != $guid) {
+                                        $this->Error->addError(_('devcp_error_file_guids_dont_match'));
+                                    }
+                                }
+                                else {
+                                    // There was an error validating manifest data
+                                    $this->Error->addError($validate);
+                                }
+                            }
+                            else {
+                                $validAppReference = sprintf(_('devcp_valid_app_reference'), '<a href="'.$this->url('/pages/appversions').'">'._('devcp_valid_app_reference_linktext').'</a>');
+                                $this->Error->addError(_('devcp_error_index_rdf_notfound').'<br>'.$validAppReference);
+                            }
+                        }
+                    }
+                    
+                    if ($this->Error->noErrors()) {
+
+                        //These are arrays by locale
+                        $addonNames = $manifestData['name'];
+                        $addonDesc = $manifestData['description'];
+
+                        //In case user said it was a new add-on when it is actually an update
+                        if ($existing = $this->Addon->findAll("Addon.guid='{$manifestData['id']}'")) {
+                            if ($existing[0]['Addon']['status'] != STATUS_NULL && $this->addVars['newAddon'] == true) {
+                                $this->addVars['newAddon'] = false;
+                                $this->publish('newAddon', $this->addVars['newAddon']);
+                            }
+                            
+                            /**
+                             * If user went back to step 1, we know because newAddon is true
+                             * and status is NULL. If that's the case, we make a note so that
+                             * we don't insert things that are already inserted.
+                             */
+                            if ($existing[0]['Addon']['status'] == STATUS_NULL) {
+                                $this->addVars['skipInserts'] = true;
+                            }
+
+                            $this->addVars['existing'] = $existing[0];
+                            $this->publish('existing', $this->addVars['existing']);
+                            $this->publish('id', $this->addVars['existing']['Addon']['id']);
+                            $this->Addon->id = $this->addVars['existing']['Addon']['id'];
+                            if (!$this->Amo->checkOwnership($this->addVars['existing']['Addon']['id'])) {
+                                $this->flash(_('devcp_error_update_access_denied'));
+                                return;
+                           }
+                        }
+                        elseif ($this->addVars['newAddon'] == false) {
+                            $this->addVars['newAddon'] = true;
+                            $this->publish('newAddon', $this->addVars['newAddon']);
+                            $this->publish('existing', '');
+                            $this->publish('id', '');
+                            $this->Addon->id = 0;
+                        }
+
+                        //Check for identical versions
+                        if (!empty($this->Addon->id)) {
+                        
+                            for ($f = 1; $f <= 4; $f++) {
+                                if (!empty($this->data['File']['platform_id'.$f])) {                        
+                                    $platformIds[] = $this->data['File']['platform_id'.$f];
+                                }
+                            }
+
+                            //If updating the addon, get any identical version numbers
+                            //Must have WHERE statement this way, otherwise cake doesn't quote properly
+                            if ($versions = $this->Version->findAll("addon_id={$this->Addon->id} AND version='{$manifestData['version']}'")) {
+                                foreach ($versions as $version) {
+                                    foreach($version['File'] as $file) {
+                                        if (in_array($file['platform_id'], $platformIds) && $file['status'] != STATUS_NULL) {
+                                            $this->Error->addError(sprintf(_('devcp_error_identical_version_exists'), $manifestData['version']));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                //If it is a search plugin, read the .src file
+                else {
+                    //Parse the .src file
+                    $src = $this->Src->parse(REPO_PATH.'/temp/'.$this->addVars['file1']['filename']);
+                    if ($src !== false) {
+                        $manifestData['name']['en-US'] = $src;
+                    }
+                    else {
+                        $manifestData = array();
+                    }
+                    
+                    $this->data['Addon']['platform_id'] = 1;
+                }
+
+                //If no errors, save
+                if ($this->Error->noErrors()) {
+
+                    //Create the addon entry if new
+                    if ($this->addVars['newAddon'] == true) {
+                        if ($this->data['Addon']['addontype_id'] != ADDON_SEARCH) {
+                            $this->data['Addon']['guid'] = $manifestData['id'];
+                        }
+                        
+                        //If creating new, blacklist status and id.
+                        $addonData = array_merge($this->data['Addon'], (array)$this->addVars['file4']);
+                        $addonData = $this->Amo->filterFields($addonData, array(),
+                                            array('status', 'id', 'trusted', 'averagerating', 'weeklydownloads', 'totaldownloads'));
+                        $this->Addon->save($addonData);
+                        
+                        if (empty($this->addVars['skipInserts'])) {
+                            $this->Addon->id = $this->Addon->getLastInsertId();
+                            
+                            //Insert current user as author so no permissions issues occur
+                            $session = $this->Session->read('User');
+                            $this->Addon->execute("INSERT INTO addons_users (addon_id, user_id) VALUES({$this->Addon->id}, {$session['id']})");
+                        }
+                        
+                        $this->addVars['existing'] = $this->data;
+                        $this->publish('id', $this->Addon->id);
+                    }
+                    else {
+                        //If updating, whitelist defaultlocale and icon fields
+                        if (!empty($this->addVars['file4'])) {
+                            $addonData = array_merge($this->data['Addon'], $this->addVars['file4']);
+                        }
+                        else {
+                            $addonData = $this->data['Addon'];
+                        }
+                        $addonData = $this->Amo->filterFields($addonData,
+                                            array('addontype_id', 'defaultlocale', 'icondata', 'icontype'));
+                        $this->Addon->save($addonData);
+                    }       
+                    
+                    //Create the version entry
+                    $this->data['Version']['addon_id'] = $this->Addon->id;
+                    $this->data['Version']['version'] = (!empty($manifestData['version'])) ? $manifestData['version'] : date('Ymd');
+
+                    //Blacklist id. addon_id should be watched too, but it's already overwritten above
+                    $versionData = $this->Amo->filterFields($this->data['Version'], array(),
+                                          array('id'));
+                    $this->Version->save($versionData);
+                    $this->Version->id = $this->Version->getLastInsertId();
+                    $this->publish('version', $this->Version->id);
+
+                    if(!empty($this->addVars['appversions'])) {
+                        //Insert target apps
+                        foreach ($this->addVars['appversions'] as $appversion) {
+                            //Cake doesn't deal with extra fields in HABTM tables, so have to insert manually
+                            $this->Version->execute("INSERT INTO applications_versions (version_id, application_id, min, max) VALUES('{$this->Version->id}', '{$appversion['application_id']}', '{$appversion['min']}', '{$appversion['max']}')");
+                        }
+                    }
+
+                    //Insert files                
+                    for ($f = 1; $f <= 3; $f++) {
+                        if (!empty($this->addVars['file'.$f]['filename'])) {
+                            $this->File->id = 0;
+                            $this->addVars['file'.$f]['version_id'] = $this->Version->id;
+
+                            //These fields are parsed through the code and shouldn't need filtering
+                            $this->File->save($this->addVars['file'.$f]);
+                            $this->addVars['files'][] = $this->File->getLastInsertId();
+                        }
+                    }
+                    $this->publish('files', $this->addVars['files']);
+    
+                    //Show next step
+                    $this->addVars['manifestData'] = $manifestData;
+                    
+                    //If user opted to not review add-on info and all required info is present,
+                    //skip to step 3
+                    if (!empty($this->data['Addon']['Review']) && $this->Developers->noReviewRequired()) {
+                        $this->_addStep3();
+                    }
+                    else {
+                        $this->_addStep2();
+                    }
+                    
+                    return;
+                }
+            }
+        }
+        
+        //Prep for view
+        //Get Platforms list
+        $this->set('platforms', $this->Amo->getPlatformName());
+        
+        //Default to reviewing add-on information
+        $this->publish('ReviewInfo', ((isset($this->data['Addon']['Review']) && $this->data['Addon']['Review'] == 1) ? array('value' => '1', 'checked' => 'checked') : array()));
+
+        //Set allowed addontypes.
+        $allowedAddonTypes = $this->Developers->getAllowedAddonTypes(true, $this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User')));
+        $this->set('allowedAddonTypes', $allowedAddonTypes);
+        
+        //Retrieve language arrays from bootstrap.
+        global $valid_languages, $native_languages;
+        foreach (array_keys($valid_languages) as $key) {
+            $languages[$key] = $native_languages[$key]['native'];
+        }
+
+        if (empty($this->data))
+            $this->data = array();
+        $this->publish('data', $this->data);
+        $this->set('errors', $this->Error->errors);
+        $this->publish('step', 1);
+        $this->set('languages', $languages);
+        $this->render('add_step1');
+    }
+
+   /**
+    * Step 2: Add-on wide information
+    */
+    function _addStep2() {
+
+        //Check if we are processing step 2 or just displaying the view for it
+        if (isset($this->data['Addon']['add_step2'])) {
+        
+            //Check for model validation first
+            if (!$this->Addon->validates($this->data)) {
+                $this->Error->addError(_('error_formerrors'));
+                $this->validateErrors();
+            }
+
+            //Validate tags/categories if not correcting addontype id
+            if (!empty($this->data['Addon']['addontype_id']) && $this->data['Addon']['addontype_id'] != $this->addVars['existing']['Addon']['addontype_id']) {
+                unset($this->data['Tag']);
+                $this->addVars['showTagsStep3'] = $this->data['Addon']['addontype_id'];
+            }
+            elseif ($this->addVars['existing']['Addon']['addontype_id'] != ADDON_SEARCH && empty($this->data['Tag']['noTags'])) {
+                //Search engines don't have tags
+                @$this->Developers->validateTags($this->data['Tag']['Tag']);
+            }
+            
+            //Validate users
+            @$this->Developers->validateUsers($this->data['User']['User']);
+
+            if ($this->Error->noErrors()) {
+                //Updated Addon
+                if ($this->addVars['newAddon'] == false) {
+                    $tagData = $this->data['Tag']['Tag'];
+                    unset($this->data['Tag']);
+                    unset($this->Addon->data['Tag']); // Cake--
+                    $this->Tag->LEGACY_saveCategories($this->Addon->id, $tagData);
+                
+                    //Update addon - usual addon blacklist
+                    $addonData = $this->Amo->filterFields($this->data, array(),
+                                        array('id', 'guid', 'status', 'trusted', 'averagerating', 'weeklydownloads', 'totaldownloads'));
+                    
+                    if (!$this->Addon->save($addonData, false)) {
+                        $this->Error->addError(_('devcp_error_saving'));
+                    }
+                }
+                //New Addon
+                else {
+                    //Check for duplicate names
+                    //@TODO this doesn't really do well with the new translation stuff.
+                    if ($this->Addon->findAllByName($this->data['Addon']['name'])) {
+                        $this->Error->addError(_('devcp_error_addonname_not_unique'));
+                    }
+                    else {
+                        //Insert addon
+                        $addonData = $this->Amo->filterFields($this->data, array(),
+                                            array('id', 'guid', 'status', 'trusted', 'averagerating', 'weeklydownloads', 'totaldownloads'));
+                        if (!$this->Addon->save($addonData, false)) {
+                            $this->Error->addError(_('devcp_error_saving'));
+                        }
+                    }
+                }
+            }    
+            
+            if ($this->Error->noErrors()) {   
+                //Getting to this point means there were no errors, so show next step
+                $this->_addStep3();
+                return;
+            }
+
+            //Prepare for view - use post data (unclean data before publishing to avoid escaped quotes in html)
+            $info = $this->Amo->unclean($this->data);
+
+            //Checkboxes
+            $checked = array('value' => '1', 'checked' => 'checked');
+            $notChecked = array();
+            $info['Addon']['viewsource'] = (!empty($this->data['Addon']['viewsource'])) ? $checked : $notChecked;
+            $info['Addon']['prerelease'] = (!empty($this->data['Addon']['prerelease'])) ? $checked : $notChecked;
+            $info['Addon']['sitespecific'] = (!empty($this->data['Addon']['sitespecific'])) ? $checked : $notChecked;
+            $info['Addon']['externalsoftware'] = (!empty($this->data['Addon']['externalsoftware'])) ? $checked : $notChecked;
+        }
+        else {
+            //Prepare for view - use existing data if !empty, else use parsed manifest
+            $manifestData = $this->Amo->unclean($this->addVars['manifestData']);
+            $info = $this->Amo->unclean($this->data);
+            
+            $info['Addon']['name'] = (!empty($this->addVars['existing']['Translation']['name']['string']) ? $this->addVars['existing']['Translation']['name']['string'] : (!empty($manifestData['name']['en-US']) ? $manifestData['name']['en-US'] : ''));
+            $info['Addon']['description'] = (!empty($this->addVars['existing']['Translation']['description']['string']) ? $this->addVars['existing']['Translation']['description']['string'] : (!empty($manifestData['description']['en-US']) ? $manifestData['description']['en-US'] : ''));
+            $info['Addon']['homepage'] = (!empty($this->addVars['existing']['Translation']['homepage']['string']) ? $this->addVars['existing']['Translation']['homepage']['string'] : (!empty($manifestData['homepageURL']) ? $manifestData['homepageURL'] : ''));
+			
+            $info['Addon']['addontype_id'] = !empty($this->addVars['existing']['Addon']['addontype_id']) ? $this->addVars['existing']['Addon']['addontype_id'] : $this->data['Addon']['addontype_id'];
+            $info['Version']['version'] = !empty($manifestData['version']) ? $manifestData['version'] : '';
+            $info['Addon']['summary'] = !empty($this->addVars['existing']['Translation']['summary']['string']) ? $this->addVars['existing']['Translation']['summary']['string'] : '';
+			
+            $info['Addon']['supportemail'] = (!empty($this->addVars['existing']['Translation']['supportemail']['string']) ? $this->addVars['existing']['Translation']['supportemail']['string'] : '');			
+            $info['Addon']['supporturl'] = (!empty($this->addVars['existing']['Translation']['supporturl']['string']) ? $this->addVars['existing']['Translation']['supporturl']['string'] : (!empty($manifestData['homepageURL']) ? $manifestData['homepageURL'] : ''));
+			
+            $info['Addon']['eula'] = !empty($this->addVars['existing']['Translation']['eula']['string']) ? $this->addVars['existing']['Translation']['eula']['string'] : '';
+            $info['Addon']['privacypolicy'] = !empty($this->addVars['existing']['Translation']['privacypolicy']['string']) ? $this->addVars['existing']['Translation']['privacypolicy']['string'] : '';
+            $info['Addon']['guid'] = (!empty($this->addVars['existing']['Addon']['guid']) ? $this->addVars['existing']['Addon']['guid'] : (!empty($manifestData['id']) ? $manifestData['id'] : ''));
+            $info['File']['id'] = $this->addVars['files'];
+
+            //Checkboxes
+            $checked = array('value' => '1', 'checked' => 'checked');
+            $notChecked = array();
+            $info['Addon']['viewsource'] = (!empty($this->addVars['existing']['Addon']['viewsource'])) ? $checked : $notChecked;
+            $info['Addon']['prerelease'] = (!empty($this->addVars['existing']['Addon']['prerelease'])) ? $checked : $notChecked;
+            $info['Addon']['sitespecific'] = (!empty($this->addVars['existing']['Addon']['sitespecific'])) ? $checked : $notChecked;
+            $info['Addon']['externalsoftware'] = (!empty($this->addVars['existing']['Addon']['externalsoftware'])) ? $checked : $notChecked;
+        }
+
+        //Get authors in order of post data, existing data, default data
+        $info['authors'] = @$this->Developers->getAuthors($this->addVars['existing']['User']);
+
+        //Get application_ids
+        $applicationIds = array();
+        if (!empty($this->addVars['appversions'])) {
+            foreach ($this->addVars['appversions'] as $appversion) {
+                $applicationIds[] = $appversion['application_id'];
+            }
+        }
+        else {
+            $version = $this->Version->read();
+            foreach ($version['Application'] as $appversion) {
+                $applicationIds[] = $appversion['id'];
+            }
+        }
+
+        $tags = $this->Developers->getTags($this->addVars['existing']['Addon']['addontype_id'], $applicationIds);
+        $this->set('tags', $tags);
+        
+        //Get selected tags in order of post data, existing data, default data
+        $info['selectedTags'] = @$this->Developers->getSelectedTags($this->addVars['existing']['Tag']); 
+
+        //Set allowed addontypes.
+        $allowedAddonTypes = $this->Developers->getAllowedAddonTypes(false, $this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User')));
+        $this->set('allowedAddonTypes', $allowedAddonTypes);
+        
+        $this->publish('info', $info);
+        $this->set('errors', $this->Error->errors);
+        $this->publish('step', 2);
+        $this->render('add_step2');
+    }
+
+   /**
+    * Step 3: Version Information
+    */
+    function _addStep3() {
+        //Check whether we are processing Step 3 or just displaying it
+        if (isset($this->data['Addon']['add_step3'])) {
+            //Check for model validation first
+            if (!$this->Version->validates($this->data)) {
+                $this->Error->addError(_('error_formerrors'));
+                $this->validateErrors();
+            }
+
+            if ($this->addVars['newAddon'] == false && empty($this->data['Version']['releasenotes'])) {
+                $this->Error->addError(_('devcp_error_describe_changes'), 'Version/releasenotes');
+                //For some reason, using Version model to invalidate doesn't work...
+                $this->Addon->invalidate('releasenotes');
+                $this->Error->addError(_('error_formerrors'));
+            }
+
+            if ($this->Error->noErrors()) {
+                $version = $this->Version->read();
+                
+                $fileUpdates = $this->Developers->moveFiles($version, $this->addVars['existing']['Addon']['addontype_id']);
+
+                if ($this->Error->noErrors()) {
+
+                    //Update version
+                    $versionData = $this->Amo->filterFields($this->data['Version'], array(),
+                                          array('id', 'addon_id'));
+                    $this->Version->data = '';
+                    $this->Version->save($versionData);
+                
+                    //Determine file status
+                    $fileStatus = $this->Developers->determineFileStatus($this->addVars['existing']['Addon']);
+
+                     //Update file locations
+                    if (!empty($fileUpdates)) {
+                        foreach ($fileUpdates as $file => $filename) {
+                            $this->File->id = $file;
+                            $filename['status'] = $fileStatus;
+                            $this->File->save($filename);
+                            
+                            // Copy file to rsync area if public
+                            if ($fileStatus == STATUS_PUBLIC) {
+                                $fileInfo = $this->File->read();
+                                $this->Amo->copyFileToPublic($this->Addon->id, $fileInfo['File']['filename']);
+                                $this->File->save(array('datestatuschanged' => $this->Amo->getNOW()));
+                            }
+                        }
+                    }
+
+                    //If add-on is public, cancel any pending files
+                    if ($this->addVars['existing']['Addon']['status'] == STATUS_PUBLIC) {
+                        if (!empty($this->addVars['existing']['Version'])) {
+                            foreach($this->addVars['existing']['Version'] as $version) {
+                                $version = $this->Version->find("Version.id='{$version['id']}'");
+                                if (!empty($version['File'])) {
+                                    foreach ($version['File'] as $file) {
+                                        if ($file['status'] == STATUS_PENDING) {
+                                            $this->File->id = $file['id'];
+                                            $this->File->save(array('status' => STATUS_SANDBOX));
+                                        }
+                                    }
+                                }
+                            }
+                        } 
+                    }
+
+                    //Update addon status if new or incomplete
+                    if ($this->addVars['newAddon'] == true || $this->addVars['existing']['Addon']['status'] == 0) {
+                        $addonData = array('Addon' => array('status' => STATUS_SANDBOX));
+                        if (!empty($this->data['Tag'])) {
+                            $addonData['Tag'] = $this->data['Tag'];
+                        }
+                        $this->Addon->save($addonData);
+                    }
+
+                    //Getting this far means there were no errors, display step 5
+                    $this->_addStep4();
+                    return;
+                }
+            }
+        }
+
+        //Prep view    
+        //Pull version info
+        $info = $this->Version->read();
+        
+        if (!empty($this->addVars['showTagsStep3'])) {
+            foreach ($info['Application'] as $appversion) {
+                $applicationIds[] = $appversion['id'];
+            }
+            $tags = $this->Developers->getTags($this->addVars['showTagsStep3'], $applicationIds);
+            $this->publish('tags', $tags);
+        }
+
+        $info['files'] = $this->File->findAllByVersion_id($this->Version->id);
+        $info['targetapps'] = $this->Amo->getMinMaxVersions($this->Version->id);
+
+        // Determine compatibility with latest Firefox
+        $noticeVersion = $this->Config->getValue('firefox_notice_version');
+        if (!empty($noticeVersion)) {
+            if (!empty($info['targetapps'])) {
+                foreach ($info['targetapps'] as $targetApp) {
+                    if ($targetApp['max']['application_id'] == APP_FIREFOX &&
+                        $this->Versioncompare->compareVersions($targetApp['max']['version'], $noticeVersion) == -1) {
+                        $this->publish('showFirefoxVersionNotice', true);
+                    }
+                }
+            }
+        }
+
+        //Get Platforms list
+        $this->publish('platforms', $this->Amo->getPlatformName());
+
+        $this->publish('info', $info);
+        $this->set('errors', $this->Error->errors);
+        $this->publish('step', 3);
+        $this->render('add_step3');
+    }
+
+   /**
+    * Step 4: Localization
+    */
+    function _addStep4() {
+        //Check whether we are processing Step 4 or just displaying it
+        if (isset($this->data['Addon']['add_step4'])) {
+
+            $this->Developers->saveTranslations($this->data);
+			
+            $this->_addStep5();
+            return;
+        }
+
+        //Prep view
+        
+        //Retrieve language arrays from bootstrap.
+        global $valid_languages, $native_languages;
+        foreach (array_keys($valid_languages) as $key) {
+            $languages[$key] = $native_languages[$key]['native'];
+
+            $this->Addon->setLang($key, $this);
+            $addon = $this->Addon->read();
+
+            foreach ($addon['Translation'] as $field => $translation) {
+                if ($translation['locale'] == $key) {
+                    $info[$key][$field] = $translation['string'];
+                }
+                else {
+                    $info[$key][$field] = '';
+                }
+            }
+
+            $this->Version->useLang = $key;
+            $version = $this->Version->read();
+
+            foreach ($version['Translation'] as $field => $translation) {
+                if ($translation['locale'] == $key) {
+                    $info[$key][$field] = $translation['string'];
+                }
+                else {
+                    $info[$key][$field] = '';
+                }
+            }
+        }
+
+        $localizedFields = array(
+                                   'name'          => array(
+                                                           'type'       => 'input',
+                                                           'display'    => _('devcp_addon_field_name_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'name',
+                                                           'attributes' => array()
+                                                      ),
+                                   'homepage'      => array(
+                                                           'type'       => 'input',
+                                                           'display'    => _('devcp_addon_field_homepage_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'homepage',
+                                                           'attributes' => array(
+                                                                                 'size' => 40
+                                                                           )
+                                                      ),
+                                   'summary'       => array(
+                                                           'type'       => 'textarea',
+                                                           'display'    => _('devcp_addon_field_summary_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'summary',
+                                                           'attributes' => array(
+                                                                                 'rows' => 3,
+                                                                                 'cols' => 55,
+                                                                                 'onBlur' => 'checkSummary(this, \''._('devcp_error_addon_field_summary_toolong').'\');'
+                                                                           )
+                                                      ),
+                                   'description'   => array(
+                                                           'type'       => 'textarea',
+                                                           'display'    => _('devcp_addon_field_description_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'description',
+                                                           'attributes' => array(
+                                                                                 'rows' => 4,
+                                                                                 'cols' => 55
+                                                                           )
+                                                      ),
+                                   'eula'          => array(
+                                                           'type'       => 'textarea',
+                                                           'display'    => _('devcp_addon_field_eula_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'eula',
+                                                           'attributes' => array(
+                                                                                 'rows' => 6,
+                                                                                 'cols' => 55
+                                                                           )
+                                                      ),
+                                   'privacypolicy' => array(
+                                                           'type'       => 'textarea',
+                                                           'display'    => _('devcp_addon_field_privacy_displaytitle'),
+                                                           'model'      => 'Addon',
+                                                           'field'      => 'privacypolicy',
+                                                           'attributes' => array(
+                                                                                 'rows' => 6,
+                                                                                 'cols' => 55
+                                                                           )
+                                                      ),
+                                   'releasenotes'  => array(
+                                                            'type'       => 'textarea',
+                                                            'display'    => _('devcp_addon_field_versionnotes_displaytitle'),
+                                                            'model'      => 'Version',
+                                                            'field'      => 'releasenotes',
+                                                            'attributes' => array(
+                                                                                  'rows' => 3,
+                                                                                  'cols' => 55
+                                                                            )
+                                                       )
+                              );
+        
+        //Set up localebox info
+        $this->set('localebox', array('info' => $info,
+                                      'defaultLocale' => $this->addVars['defaultLocale'],
+                                      'languages' => $languages,
+                                      'localizedFields' => $localizedFields));
+        $this->publish('step', 4);
+        $this->render('add_step4');
+    }
+
+   /**
+    * Step 5: Success
+    */
+    function _addStep5() {
+        //Determine file status
+        $fileStatus = $this->Developers->determineFileStatus($this->addVars['existing']['Addon']);
+
+        $this->publish('fileStatus', $fileStatus);
+        $this->publish('step', 5);
+        $this->render('add_step5');
+    }
+    
+   /**
+    * Cancel additem process
+    */
+    function _cancelAdd() {
+        if (!$this->Amo->checkOwnership($this->Addon->id)) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }
+        
+        //Delete version, files, and translations
+        $this->Developers->deleteVersion($this->Version->id);
+
+        //If this was a new add-on, delete it and translations
+        if ($this->addVars['newAddon'] == true) {
+            $this->Developers->deleteAddon($this->Addon->id);
+        }
+        
+        $this->redirect('/developers');
+    }
+
+   /**
+    * Edit add-on
+    * @param int $id
+    */
+    function edit($id) {
+        $this->Amo->clean($id);
+        $this->publish('subpagetitle', _('devcp_addon_edit_pagetitle'));
+        $this->breadcrumbs[_('devcp_addon_edit_pagetitle')] = '/developers/edit/'.$id;
+        $this->publish('breadcrumbs', $this->breadcrumbs);
+
+        if (!$this->Amo->checkOwnership($id)) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }
+
+        //Bind necessary models
+        $this->User->bindFully();
+        $this->Addontype->bindFully();
+        $this->Version->bindFully();
+        $this->Addon->bindFully();
+
+        $this->Addon->id = $id;
+        
+        $this->Amo->detailedLog('Editing add-on');
+        
+        if (!empty($this->data)) {
+            $this->Amo->detailedLog('Non-empty data');
+                $this->Amo->detailedLog('Editing add-on details');
+                //Check for model validation first
+                if (!$this->Addon->validates($this->data)) {
+                    $this->Error->addError(_('error_formerrors'));
+                    $this->validateErrors();
+                    $this->Amo->detailedLog('Validation errors');
+                }
+                
+                $addon = $this->Addon->read();
+                
+                //Validate tags/categories
+                if ($addon['Addon']['addontype_id'] != ADDON_SEARCH && empty($this->data['Tag']['noTags'])) {
+                    @$this->Developers->validateTags($this->data['Tag']['Tag']);
+                }
+                
+                //Validate users
+                @$this->Developers->validateUsers($this->data['User']['User']);
+                
+                $this->Amo->detailedLog('Validated tags and users');
+                
+                //Delete icon if requested
+                if (!empty($this->data['Addon']['DeleteIcon'])) {
+                    $this->data['Addon']['icontype'] = '';
+                    $this->data['Addon']['icondata'] = '';
+                }
+                
+                //Update/insert icon
+                if (!empty($this->data['Addon']['icon']['name'])) {
+                    $fileErrors = array('1' => ___('devcp_edit_file_error_size'),
+                                        '2' => ___('devcp_edit_file_error_size'),
+                                        '3' => ___('devcp_edit_file_error_incomplete'),
+                                        '4' => ___('devcp_edit_file_error_no')
+                                        );
+                    $allowedImage = array('.png', '.jpg', '.gif');
+                    
+                    $iconData = $this->Developers->validateIcon($this->data['Addon']['icon'], $fileErrors, $allowedImage);
+                    
+                    if (is_string($iconData)) {
+                        $this->Error->addError($iconData, 'Addon/icon');
+                    }
+                    else {
+                        $this->data['Addon'] = array_merge($this->data['Addon'], $iconData);
+                    }
+                }
+ 
+                if ($this->Error->noErrors()) {
+                    $this->Amo->detailedLog('No errors - performing update');
+                    //Update addon
+                    $this->Developers->saveUsers($this->data['User']['User']);
+                    $this->Amo->detailedLog('Saved users');
+                    
+                    //Strip localized fields
+                    $addonData = $this->Developers->stripLocalized($this->data);
+                    $this->Amo->detailedLog('Stripped localized fields: '.print_r($addonData, true), false);
+                    
+                    //usual addon blacklist
+                    if ($this->SimpleAcl->actionAllowed('*', '*', $this->Session->read('User'))) {
+                        $blacklist = array('id', 'guid', 'status');
+                    }
+                    else {
+                        $blacklist = array('id', 'guid', 'status', 'trusted', 'averagerating', 'weeklydownloads', 'totaldownloads');
+                    }
+                    $addonData = $this->Amo->filterFields($addonData, array(), $blacklist);
+                    $this->Amo->detailedLog('Fields filtered: '.print_r($addonData, true), false);
+                    $this->Addon->data = array();
+                    $tagData = $addonData['Tag']['Tag'];
+                    unset($addonData['Tag']['Tag']);
+                    
+                    if ($this->Addon->save($addonData) && $this->Developers->saveTranslations($this->data)) {
+                        $this->Tag->LEGACY_saveCategories($this->Addon->id, $tagData);
+                        $this->Amo->detailedLog('Add-on and translations saved: '.print_r($addonData, true));
+                        $this->flash(_('devcp_addon_updated_successfully'), '/developers/edit/'.$this->Addon->id);
+                        return;
+                    }
+                    else {
+                        $this->Error->addError(_('devcp_error_saving'));
+                    }
+                }
+        }
+
+        if (!$addon = $this->Addon->read()) {
+            $this->flash(_('error_addon_notfound'), '/developers/index');
+            return;
+        }
+
+        //Get tags based on addontype
+        $this->Version->id = $addon['Version'][0]['id'];
+        $applicationIds = array();
+        $version = $this->Version->read();
+        if (!empty($version)) {
+            foreach ($version['Application'] as $appversion) {
+                $applicationIds[] = $appversion['id'];
+            }
+        }
+        $this->set('tags', $this->Developers->getTags($addon['Addon']['addontype_id'], $applicationIds));
+        
+        //Get selected tags
+        $this->set('selectedTags', $this->Developers->getSelectedTags($addon['Tag']));
+        
+        //Get author info
+        $addon['authors'] = $this->Developers->getAuthors($addon['User'], false);
+
+        //Retrieve language arrays from bootstrap.
+        global $valid_languages, $native_languages;
+        foreach (array_keys($valid_languages) as $key) {
+            $languages[$key] = $native_languages[$key]['native'];
+
+            $this->Addon->setLang($key, $this);
+            $addonL = $this->Addon->read();
+
+            foreach ($addonL['Translation'] as $field => $translation) {
+                if ($translation['locale'] == $key) {
+                    $info[$key][$field] = $translation['string'];
+                }
+                else {
+                    $info[$key][$field] = '';
+                }
+            }
+        }
+        $this->Addon->setLang(LANG, $this);
+
+        //Checkboxes
+        $checked = array('value' => '1', 'checked' => 'checked');
+        $notChecked = array();
+        $addon['Addon']['viewsource'] = (!empty($addon['Addon']['viewsource'])) ? $checked : $notChecked;
+        $addon['Addon']['prerelease'] = (!empty($addon['Addon']['prerelease'])) ? $checked : $notChecked;
+        $addon['Addon']['sitespecific'] = (!empty($addon['Addon']['sitespecific'])) ? $checked : $notChecked;
+        $addon['Addon']['externalsoftware'] = (!empty($addon['Addon']['externalsoftware'])) ? $checked : $notChecked;
+        $addon['Addon']['trusted'] = (!empty($addon['Addon']['trusted'])) ? $checked : $notChecked;
+        
+        $this->publish('addon', $addon);
+        $this->set('errors', $this->Error->errors);
+        $localizedFields = array(
+                            'name'          => array(
+                                                    'type'       => 'input',
+                                                    'display'    => _('devcp_addon_field_name_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'name',
+                                                    'attributes' => array()
+                                               ),
+                            'homepage'      => array(
+                                                    'type'       => 'input',
+                                                    'display'    => _('devcp_addon_field_homepage_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'homepage',
+                                                    'attributes' => array(
+                                                                          'size' => 40
+                                                                    )
+                                               ),
+                            'supportemail'      => array(
+                                                    'type'       => 'input',
+                                                    'display'    => _('devcp_addon_field_supportemail_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'supportemail',
+                                                    'attributes' => array(
+                                                                          'size' => 40
+                                                                    )
+                                               ),											   											   
+                            'supporturl'      => array(
+                                                    'type'       => 'input',
+                                                    'display'    => _('devcp_addon_field_supporturl_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'supporturl',
+                                                    'attributes' => array(
+                                                                          'size' => 40
+                                                                    )
+                                               ),											   
+                            'summary'       => array(
+                                                    'type'       => 'textarea',
+                                                    'display'    => _('devcp_addon_field_summary_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'summary',
+                                                    'attributes' => array(
+                                                                          'rows' => 3,
+                                                                          'cols' => 55,
+                                                                          'onBlur' => 'checkSummary(this, \''._('devcp_error_addon_field_summary_toolong').'\');'
+                                                                    )
+                                               ),
+                            'description'   => array(
+                                                    'type'       => 'textarea',
+                                                    'display'    => _('devcp_addon_field_description_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'description',
+                                                    'attributes' => array(
+                                                                          'rows' => 4,
+                                                                          'cols' => 55
+                                                                    )
+                                               ),
+                            'eula'          => array(
+                                                    'type'       => 'textarea',
+                                                    'display'    => _('devcp_addon_field_eula_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'eula',
+                                                    'attributes' => array(
+                                                                          'rows' => 6,
+                                                                          'cols' => 55
+                                                                    )
+                                               ),
+                            'privacypolicy' => array(
+                                                    'type'       => 'textarea',
+                                                    'display'    => _('devcp_addon_field_privacy_displaytitle'),
+                                                    'model'      => 'Addon',
+                                                    'field'      => 'privacypolicy',
+                                                    'attributes' => array(
+                                                                          'rows' => 6,
+                                                                          'cols' => 55
+                                                                    )
+                                               )
+                       );
+
+        //Set up localebox info
+        $this->set('localebox', array('info' => $info,
+                                      'defaultLocale' => $addon['Addon']['defaultlocale'],
+                                      'languages' => $languages,
+                                      'localizedFields' => $localizedFields));
+    }
+
+   /**
+    * Edit a version
+    * @param int $id
+    */
+    function editversion($id) {
+        $this->Amo->clean($id);
+        $this->set ('subpagetitle', _('devcp_version_edit_pagetitle'));
+        $this->breadcrumbs[_('devcp_version_edit_pagetitle')] = '/developers/editversion/'.$id;
+        $this->publish('breadcrumbs', $this->breadcrumbs);        
+
+        //Bind necessary models
+        $this->User->bindFully();
+        $this->Addontype->bindFully();
+        $this->Version->bindFully();      
+        $this->Addon->bindFully();
+
+        $this->Version->id = $id;
+        if (!$version = $this->Version->read()) {
+            $this->flash(_('error_version_notfound'), '/developers/index');
+            return;
+        }
+        
+        if (!$this->Amo->checkOwnership($version['Version']['addon_id'])) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }  
+
+        if (!empty($this->data)) {
+            foreach ($this->data['File']['id'] as $id => $file_id) {
+                $this->File->id = $file_id;
+                
+                //Update or delete file
+                if ($this->data['File']['Delete'][$id] != 1) {
+                    $fileData = array('platform_id' => $this->data['File']['platform_id'][$id]);
+                    $this->File->save($fileData);
+                }
+                else {
+                    $this->Developers->deleteFile($this->File->id, $version['Version']['addon_id']);
+                }
+            }
+
+            //Save translated fields (releasenotes)
+            $this->Developers->saveTranslations($this->data);
+
+            //Save min/max versions
+            $this->Amo->saveMinMaxVersions($this->Version->id, $this->data['targetApps']);
+
+            //Save other version fields by whitelist
+            $versionData = $this->Amo->filterFields($this->data['Version'], array('approvalnotes'));
+            $this->Version->save($versionData);
+
+            $this->flash(_('devcp_version_updated_successfully'), '/developers/editversion/'.$this->Version->id);
+            return;
+        }
+        
+        $version['targetapps'] = $this->Amo->getMinMaxVersions($this->Version->id);
+
+        // Get all versions
+        foreach ($version['targetapps'] as $k => $app) {
+            $_versionlist = $this->Appversion->findAllByApplication_id($app['applications']['id'], '', '', '', '', -1);
+            $this->Versioncompare->sortAppversionArray($_versionlist);
+            $version['targetapps'][$k]['appversions'] = $_versionlist;
+        }
+
+        //Retrieve language arrays from bootstrap.
+        global $valid_languages, $native_languages;
+        foreach (array_keys($valid_languages) as $key) {
+            $languages[$key] = $native_languages[$key]['native'];
+
+            $this->Version->setLang($key, $this);
+            $versionL = $this->Version->read();
+
+            foreach ($versionL['Translation'] as $field => $translation) {
+                if ($translation['locale'] == $key) {
+                    $info[$key][$field] = $translation['string'];
+                }
+                else {
+                    $info[$key][$field] = '';
+                }
+            }
+        }
+        $this->Version->setLang(LANG, $this);
+
+        //Pull add-on info for translations
+        $this->Addon->id = $version['Version']['addon_id'];
+        $addon = $this->Addon->read();
+
+        $localizedFields = array(
+                            'releasenotes' => array(
+                                                    'type'       => 'textarea',
+                                                    'display'    => _('devcp_addon_field_versionnotes_displaytitle'),
+                                                    'model'      => 'Version',
+                                                    'field'         => 'releasenotes',
+                                                    'attributes' => array(
+                                                                          'rows' => 3,
+                                                                          'cols' => 55
+                                                                    )
+                                              )
+                          );
+
+        $this->publish('version', $version);
+        $this->publish('addon', $addon);
+        $this->publish('platforms', $this->Amo->getPlatformName());
+
+        //Set up localebox info
+        $this->set('localebox', array('info' => $info,
+                                      'defaultLocale' => $addon['Addon']['defaultlocale'],
+                                      'languages' => $languages,
+                                      'localizedFields' => $localizedFields));
+        //Javascript localization
+        $this->publish('jsLocalization', array(
+                                          'deleteMessage' => _('devcp_question_delete_file')
+                                         ));
+    }
+    
+    /**
+     * Disable or enable add-on
+     */
+    function disable($addon_id) {
+        $this->Amo->clean($addon_id);
+        $session = $this->Session->read('User');
+        $this->User->id = $session['id'];
+        
+        $this->Addon->id = $addon_id;
+        
+        // Make sure user has permission
+        if (!$this->Amo->checkOwnership($addon_id)) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }
+        
+        if (!empty($_POST)) {
+            if (!empty($_POST['enable'])) {
+                $addonData = array('inactive' => 0);
+                $this->Addon->save($addonData);
+                $this->flash(_('devcp_addon_enabled_successfully'), '/developers/details/'.$this->Addon->id);
+            }
+            else {
+                $addonData = array('inactive' => 1);
+                $this->Addon->save($addonData);
+                $this->flash(_('devcp_addon_disabled_successfully'), '/developers/details/'.$this->Addon->id);
+            }
+            
+            return;
+        }
+        
+        $addon = $this->Addon->read();
+        
+        $this->publish('addon', $addon);
+        
+        $this->render('disable');
+    }
+    
+   /**
+    * Nominate an add-on to be public
+    * @param int $id the add-on id
+    */
+    function nominate($id) {
+        $this->Amo->clean($id);
+        $session = $this->Session->read('User');
+        $this->User->id = $session['id'];
+        
+        $this->publish('subpagetitle', _('devcp_addon_nominate_pagetitle'));
+        $this->breadcrumbs[_('devcp_addon_nominate_pagetitle')] = '/developers/nominate/'.$id;
+        $this->publish('breadcrumbs', $this->breadcrumbs);           
+
+        $this->User->bindFully();
+        $data = $this->User->read();
+        
+        $this->Addon->id = $id;
+        if (!$addon = $this->Addon->read()) {
+            $this->flash(_('error_addon_notfound'), '/developers/index');
+            return;
+        }
+        
+        //Make sure has ownership or is an editor to nominate
+        if (!$this->Amo->checkOwnership($id) && !$this->SimpleAcl->actionAllowed('Editors', '*', $this->Session->read('User'))) {
+            $this->flash(_('devcp_error_addon_access_denied'), '/developers/index');
+            return;
+        }
+        
+        //Make sure add-on is in sandbox
+        if ($addon['Addon']['status'] != STATUS_SANDBOX) {
+            $this->flash(_('devcp_error_nominate_sandbox_only'), '/developers/details/'.$id, 3);
+            return;
+        }
+        
+        //Nominate
+        if (!empty($_POST['nominate'])) {
+            //Make sure not a pre-release
+            if ($addon['Addon']['prerelease'] == 1) {
+                $this->flash(_('devcp_error_nominate_no_prerelease'), '/developers/details/'.$id, 3);
+                return;
+            }
+            
+            //Make sure nomination message not empty
+            if (empty($this->data['Addon']['nominationmessage'])) {
+                $this->flash(_('devcp_error_nominate_message'), '/developers/nominate/'.$id, 3);
+                return;
+            }
+            
+            //Amo->clean is being stupid. Yes, that's right. I said STUPID
+            $nominationMessage = str_replace('\n', "\n", $this->data['Addon']['nominationmessage']);
+            $nominationMessage = str_replace('\r', "\r", $nominationMessage);
+            
+            $addonData = array('status' => STATUS_NOMINATED, 'nominationmessage' => $nominationMessage);
+            
+            $this->Addon->save($addonData);
+            $this->flash(_('devcp_addon_nominated_successfully'), '/developers/details/'.$id, 3);
+            return;
+        }
+        
+        $this->publish('addon', $addon);
+    }
+
+   /**
+    * AJAX action for looking up an author by email
+    * @param string $email
+    */
+    function authorLookup() {
+        // Rather than change our cake parameter regex, use a normal get var
+        $email = $_GET['q'];
+        $this->Amo->clean($email);
+        if ($authors = $this->User->findAllByEmail($email)) {
+            $author = $authors[0]['User']['firstname'].' '.$authors[0]['User']['lastname'];
+            $author .= ' ['.$authors[0]['User']['email'].']';
+            $this->publish('id', $authors[0]['User']['id']);
+        }
+        else {
+            $author = false;
+        }
+
+        $this->publish('author', $author);
+        $this->publish('email', $email);
+        $this->render('author_lookup', 'ajax');
+    }
+
 }
+
 ?>
diff --git a/site/app/controllers/downloads_controller.php b/site/app/controllers/downloads_controller.php
index 0057a4d..fc182db 100644
--- a/site/app/controllers/downloads_controller.php
+++ b/site/app/controllers/downloads_controller.php
@@ -76,11 +76,10 @@ class DownloadsController extends AppController
             $file_loc = REPO_PATH . '/' . $file_data['Version']['addon_id'] . '/' . $file_data['File']['filename'];
                    
             // If add-on is in sandbox, make sure sandbox is enabled. If disabled, make sure admin or author.
-            // If _GET['confirmed'] exists, then a user confirmed a sandbox download via JS, bug 441739
             if (($addon_data['Addon']['status'] == STATUS_SANDBOX ||
                  $addon_data['Addon']['status'] == STATUS_NOMINATED ||
                  $file_data['File']['status'] == STATUS_PENDING)
-                 && !$this->Session->check('User') && !isset($_GET['confirmed'])) {
+                 && !$this->Session->check('User')) {
                 
                 $target_url = str_replace(LANG . '/' . APP_SHORTNAME . '/','',$this->params['url']['url']);
                 $this->redirect('/users/login?to=' . urlencode($target_url) . "&m=1");
@@ -147,17 +146,7 @@ class DownloadsController extends AppController
         
         if (!empty($file_id)) {
             // Use normal download method if file is found
-            $target = "/downloads/file/{$file_id}/{$type}/{$file_data['File']['filename']}";
-            if (count($this->params['url']) > 1) { // re-append query string
-                $getvars = array();
-                foreach ($this->params['url'] as $k => $v) {
-                    if ($k == 'url') continue;
-                    $getvars[] = "$k=$v";
-                }
-                $qs = implode(',', $getvars);
-                $target .= "?$qs";
-            }
-            $this->redirect($target);
+            $this->redirect("/downloads/file/{$file_id}/{$type}/{$file_data['File']['filename']}");
         }
         else {
             // File wasn't found
diff --git a/site/app/controllers/editors_controller.php b/site/app/controllers/editors_controller.php
index 3a97e51..314f2ef 100644
--- a/site/app/controllers/editors_controller.php
+++ b/site/app/controllers/editors_controller.php
@@ -23,8 +23,6 @@
  *      Wil Clouser <clouserw@gmail.com>
  *      Frederic Wenzel <fwenzel@mozilla.com>
  *      Les Orchard <lorchard@mozilla.com>
- *      Cesar Oliveira <a.sacred.line@gmail.com>
- *      Scott McCammon <smccammon@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -56,7 +54,6 @@ class EditorsController extends AppController
     function beforeFilter() {
         //beforeFilter() is apparently called before components are initialized. Cake++
         $this->Amo->startup($this);
-        $this->Editors->startup($this);
         
         $this->Amo->checkLoggedIn();
         
@@ -67,10 +64,7 @@ class EditorsController extends AppController
         $this->publish('cssAdd', $this->cssAdd);
         
         $this->publish('jsAdd', array('jquery-compressed.js',
-                                    'jquery.autocomplete.pack.js',
-                                    'jquery.tablesorter.min.js',
-                                    'jquery.flot.js',
-                                    'jquery.sparkline.min.js',
+                                    'jquery.autocomplete.js',
                                     'editors'));
 
         $this->breadcrumbs = array(_('editors_pagetitle') => '/editors/index');
@@ -85,10 +79,16 @@ class EditorsController extends AppController
         }
         
         //Get counts
-        $count['pending'] = $this->_getCount('pending');
-        $count['nominated'] = $this->_getCount('nominated');
-        $count['reviews'] = $this->_getCount('reviews');
+        $pending = $this->File->query("SELECT COUNT(*) FROM `files` WHERE `status`=".STATUS_PENDING." GROUP BY `status`");
+        $nominated = $this->Addon->query("SELECT COUNT(*) FROM `addons` WHERE `status`=".STATUS_NOMINATED." GROUP BY `status`");
+        $reviews = $this->Review->query("SELECT COUNT(*) FROM `reviews` WHERE `editorreview`=1 GROUP BY `editorreview`");
+        
+        $count['pending'] = !empty($pending) ? $pending[0][0]['COUNT(*)'] : 0;
+        $count['nominated'] = !empty($nominated) ? $nominated[0][0]['COUNT(*)'] : 0;
+        $count['reviews'] = !empty($reviews) ? $reviews[0][0]['COUNT(*)'] : 0;
         $this->publish('count', $count);
+        
+        $this->count = $count;
     }
     
    /**
@@ -143,6 +143,8 @@ class EditorsController extends AppController
         
         $this->publish('collapse_categories', true);
         
+        $count = $this->count;
+        
         $this->Amo->clean($mode);
         $this->breadcrumbs[_('editors_review_queue_pagetitle')] = '/editors/queue';
         $this->publish('breadcrumbs', $this->breadcrumbs);
@@ -150,38 +152,72 @@ class EditorsController extends AppController
         
         $this->publish('mode', $mode);
 
-        // Setup queue filter
-        if (array_key_exists('filter', $this->params['form'])) {
-            // set a new filter on this queue
-            $filter = $this->Editors->setQueueFilter($mode, $this->data['Filter']);
-
-        } elseif (array_key_exists('clear', $this->params['form'])) {
-            // clear existing filter on this queue
-            $filter = $this->Editors->setQueueFilter($mode, null);
-
-            // clear sorting
-            $this->Editors->setQueueSort($mode, 'default');
-
-        } else {
-            // fetch existing filter
-            $filter = $this->Editors->getQueueFilter($mode);
-        }
+        if ($mode == 'pending') {
+            // Setup our pagination
+            $this->Pagination->total = $count['pending'];
+            $_pagination_options = array('sortByClass' => 'Version', 'sortBy' => 'created');
 
-        // Handle changes to sorting
-        if (isset($this->params['url']['sort'])) {
-            if (isset($this->params['url']['dir'])) {
-                $this->Editors->setQueueSort($mode, $this->params['url']['sort'], $this->params['url']['dir']);
+            if (!array_key_exists('show', $_GET) && $this->Session->read('editor_queue_pending_show')) {
+                $_pagination_options['show'] = $this->Session->read('editor_queue_pending_show');
+            } else {
+                // If $_GET['show'] exists it overrides this in the pagination component
+                $_pagination_options['show'] = 50;
+            }
+            list($_order,$_limit,$_page) = $this->Pagination->init(null, null, $_pagination_options);
+            $this->Session->write('editor_queue_pending_show', $_limit);
+            
+            //Pull any files that have STATUS_PENDING
+            $pending = $this->File->findAllByStatus(STATUS_PENDING,
+                                                    array('File.id', 'File.platform_id', 'Version.id', 
+                                                          'Version.addon_id', 'Version.version', 
+                                                          'Version.created'
+                                                          ), $_order, $_limit, $_page, 0);
+            
+            if (!empty($pending)) {
+                foreach ($pending as $k => $file) {
+                    $addon = $this->Addon->findById($file['Version']['addon_id'],
+                                                    array('Addon.id', 'Addon.name', 'Addon.defaultlocale',
+                                                          'Addon.addontype_id', 'Addon.prerelease',
+                                                          'Addon.sitespecific', 'Addon.externalsoftware',
+                                                          ));
+                    $pending[$k] = array_merge_recursive($pending[$k], $addon);
+                }
+            }
+            $addons = $pending;
+        }
+        elseif ($mode == 'nominated') {
+            // Setup our pagination
+            $this->Pagination->total = $count['nominated'];
+            $_pagination_options = array('sortByClass' => 'Addon', 'sortBy' => 'created');
+            if (!array_key_exists('show', $_GET) && $this->Session->read('editor_queue_nominated_show')) {
+                $_pagination_options['show'] = $this->Session->read('editor_queue_nominated_show');
             } else {
-                $this->Editors->setQueueSort($mode, $this->params['url']['sort']);
+                // If $_GET['show'] exists it overrides this in the pagination component
+                $_pagination_options['show'] = 50;
             }
-        }
+            list($_order,$_limit,$_page) = $this->Pagination->init(null,null,$_pagination_options);
+            $this->Session->write('editor_queue_nominated_show', $_limit);
 
-        // Build the queue
-        if ($mode == 'pending' || $mode == 'nominated') {
-            $addons = $this->_buildQueue($mode);
+            //Pull any add-ons that have STATUS_NOMINATED
+            $nominated = $this->Addon->findAllByStatus(STATUS_NOMINATED,
+                                                    array('Addon.id', 'Addon.name', 'Addon.defaultlocale',
+                                                          'Addon.addontype_id', 'Addon.prerelease',
+                                                          'Addon.sitespecific', 'Addon.externalsoftware',
+                                                          'Addon.created'
+                                                          ), $_order, $_limit, $_page, 0);
+            if (!empty($nominated)) {
+                foreach ($nominated as $k => $addon) {
+                    $version = $this->Version->findByAddon_id($addon['Addon']['id'],
+                                                    array('Version.id', 'Version.addon_id',
+                                                          'Version.version', 'Version.modified'
+                                                          ), 'Version.created DESC');
+                    $nominated[$k] = array_merge_recursive($nominated[$k], $version);
+                }
+            }
+            $addons = $nominated;
         }
         elseif ($mode == 'reviews') {
-            $this->_reviews($this->_getCount('reviews'));
+            $this->_reviews($count['reviews']);
             return;
         }
         else {
@@ -189,56 +225,141 @@ class EditorsController extends AppController
             return;
         }
         
-        //Setup filter form fields
-        $selected = array('Application'=>'', 'MaxVersion'=>'',
-                        'SubmissionAge'=>'', 'Addontype'=>'', 'Platform'=>'',);
-        if (is_array($filter)) {
-            foreach ($filter as $k => $val) {
-                if (array_key_exists($k, $selected)) {
-                    $selected[$k] = $val;
+        $platforms = $this->Amo->getPlatformName();
+        $applications = $this->Amo->getApplicationName();
+
+        $submissionTypes = array(   'new' => _('editors_submissiontype_new'),
+                                    'updated' => _('editors_submissiontype_updated')
+                                 );
+        
+        //make modifications to the queue array
+        if (!empty($addons)) {
+            foreach ($addons as $k => $addon) {
+                //get min/max versions
+                if ($targetApps = $this->Amo->getMinMaxVersions($addon['Version']['id'])) {
+                    foreach ($targetApps as $targetApp) {
+                        $appName = $targetApp['translations']['localized_string'];
+                        $addons[$k]['targetApps'][$appName]['min'] = $targetApp['min']['version'];
+                        $addons[$k]['targetApps'][$appName]['max'] = $targetApp['max']['version'];
+                    }
+                }
+
+                //Age
+                if ($mode == 'pending') {
+                    $age = time() - strtotime($addon['Version']['created']);
+                }
+                elseif ($mode == 'nominated') {
+                    $age = time() - strtotime($addon['Addon']['created']);
+                }
+                
+                //days
+                if ($age >= (60*60*24*2)) {
+                    $addons[$k]['age'] = sprintf(_('editors_x_days'), floor($age/(60*60*24)));
+                }
+                //1 day
+                elseif ($age >= (60*60*24)) {
+                    $addons[$k]['age'] = _('editors_one_day');
+                }
+                //hours
+                elseif ($age >= (60*60*2)) {
+                    $addons[$k]['age'] = sprintf(_('editors_x_hours'), floor($age/(60*60)));
+                }
+                //hour
+                elseif ($age >= (60*60)) {
+                    $addons[$k]['age'] = _('editors_one_hour');
+                }
+                //minutes
+                elseif ($age > 60) {
+                    $addons[$k]['age'] = sprintf(_('editors_x_minutes'), floor($age/60));
+                }
+                //minute
+                else {
+                    $addons[$k]['age'] = _('editors_one_minute');
+                }
+                
+                //Generate any additional notes
+                $addons[$k]['notes'] = array();
+                
+                //Platform-specific?
+                if (!empty($addon['Version'][0]['File'][0]['platform_id']) && $addon['Version'][0]['File'][0]['platform_id'] != 1) {
+                    $os = array();
+                    foreach ($addon['Version'][0]['File'] as $file) {
+                        $os[] = $platforms[$file['platform_id']];
+                    }
+                    $addons[$k]['notes'][] = sprintf(_('editors_platform_x_only'), implode(', ', $os));
+                }
+                elseif (!empty($addon['File']['platform_id']) && $addon['File']['platform_id'] != 1) {
+                    $addons[$k]['notes'][] = sprintf(_('editors_platform_x_only'), $platforms[$addon['File']['platform_id']]);
+                }
+                
+                //Featured?
+                //@TODO
+                
+                //Site specific?
+                if ($addon['Addon']['sitespecific'] == 1) {
+                    $addons[$k]['notes'][] = _('editors_site_specific');
+                }
+                //Pre-release?
+                if ($addon['Addon']['prerelease'] == 1) {
+                    $addons[$k]['notes'][] = _('editors_pre-release');
+                }
+                //External software?
+                if ($addon['Addon']['externalsoftware'] == 1) {
+                    $addons[$k]['notes'][] = _('editors_external_software');
                 }
             }
         }
-
-        $addonOrAuthor = isset($filter['AddonOrAuthor']) ? $filter['AddonOrAuthor'] : '';
-
-        $maxVersions = array();
-        if (!empty($filter['Application'])) {
-            $app_versions = $this->Appversion->findAllByApplicationId($filter['Application'],
-                                array('Appversion.id', 'Appversion.version'), 'Appversion.version DESC');
-            foreach ($app_versions as $av) {
-                $maxVersions[$av['Appversion']['id']] = $av['Appversion']['version'];
+        //pr($addons);
+        //Filters
+        $selected = array(  'Addontype' => array(),
+                            'Application' => array(),
+                            'Platform' => array(),
+                            'SubmissionType' => array()
+                          );
+        $filtered = false;
+                          
+        if (!empty($this->data['Approval']['Addontype'])) {
+            foreach ($this->data['Approval']['Addontype'] as $option) {
+                $selected['Addontype'][$option] = true;
             }
+            $filtered = true;
         }
 
-        $submissionAges = array('1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5',
-                                '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10+' => '10+');
-        $platforms = $this->Amo->getPlatformName();
-        $applications = $this->Amo->getApplicationName();
-
-        $filtered = !empty($filter);
-        $filterChanged = $filtered && array_key_exists('filter', $this->params['form']);
-        $filteredCount = $this->_getCount($mode, true);
-
-        $sortOpts = $this->Editors->getQueueSort($mode);
+        if (!empty($this->data['Approval']['Application'])) {
+            foreach ($this->data['Approval']['Application'] as $option) {
+                $selected['Application'][$option] = true;
+            }
+            $filtered = true;
+        }
         
-        // raw values for selectTags
-        $this->set('selected', $selected);
+        if (!empty($this->data['Approval']['Platform'])) {
+            foreach ($this->data['Approval']['Platform'] as $option) {
+                $selected['Platform'][$option] = true;
+            }
+            $filtered = true;
+        }
+        
+        if (!empty($this->data['Approval']['SubmissionType'])) {
+            foreach ($this->data['Approval']['SubmissionType'] as $option) {
+                $selected['SubmissionType'][$option] = true;
+            }
+            $filtered = true;
+        }
+        
+        if (isset($this->data['filter'])) {
+            $filtered = true;
+        }
+        elseif (isset($this->data['clear'])) {
+            $filtered = false;
+        }
+
+        $this->publish('addons', $addons);
         $this->set('platforms', $platforms);
         $this->set('addontypes', $this->Addontype->getNames());
         $this->set('applications', $applications);
-        $this->set('maxVersions', $maxVersions);
-        $this->set('submissionAges', $submissionAges);
-
-        $this->publish('addonOrAuthor', $addonOrAuthor);
+        $this->set('submissionTypes', $submissionTypes);
+        $this->publish('selected', $selected);
         $this->publish('filtered', $filtered);
-        $this->publish('filterChanged', $filterChanged);
-        $this->publish('filteredCount', $filteredCount);
-        $this->publish('sortBy', $sortOpts['sortby']);
-        $this->publish('sortDir', $sortOpts['direction']);
-
-        $this->publish('mode', $mode);
-        $this->publish('addons', $addons);
         $this->render('queue');
     }
     
@@ -303,8 +424,6 @@ class EditorsController extends AppController
             }
         }
         
-        $this->pageTitle = $addon['Translation']['name']['string'] . ' :: ' . $this->pageTitle;
-
         if (!empty($addon['Tag'])) {
             foreach ($addon['Tag'] as $tag) {
                 $tags[] = $tag['id'];
@@ -375,10 +494,6 @@ class EditorsController extends AppController
         } else {
             $reviewType = 'pending';
         }
-
-        // count of filtered queue
-        $filtered = (true && $this->Editors->getQueueFilter($reviewType));
-        $filteredCount = $this->_getCount($reviewType, true);
         
         // rank in nomination/update queue
         if (isset($this->params['url']['num']) && is_numeric($this->params['url']['num']))
@@ -397,8 +512,6 @@ class EditorsController extends AppController
         $this->publish('history', $history); 
         $this->publish('errors', $this->Error->errors);
         $this->publish('reviewType', $reviewType, false);
-        $this->publish('filtered', $filtered);
-        $this->publish('filteredCount', $filteredCount);
         
         $this->render('review');
     }
@@ -408,7 +521,7 @@ class EditorsController extends AppController
     * @param int $id The file id
     */
     function file($id) {
-        $this->Amo->clean($id);
+	$this->Amo->clean($id);
         $this->File->id = $id;
         
         if (!$file = $this->File->read()) {
@@ -434,698 +547,6 @@ class EditorsController extends AppController
         }
         exit;
     }
-
-    
-    /**
-     * Performance reports jump off point
-     * Handles report selection, and user parameter
-     */
-    function performance($mode = '') {
-        $session = $this->Session->read('User');
-        if (!$this->SimpleAcl->actionAllowed('Editor', '*', $session)) {
-            $this->Amo->accessDenied();
-        }
-
-        //Senior Editors can generate reports on anyone
-        $isSenior = $this->SimpleAcl->actionAllowed('Admin', 'EditAnyAddon', $session);
-        if ($isSenior && !empty($this->params['url']['user'])) {
-            $user = $this->User->findByEmail($this->params['url']['user']);
-            if (empty($user)) {
-                header('HTTP/1.1 404 Not Found');
-                $this->flash(___('editors_performance_user_not_found', 'User not found'), "/editors/performance/{$mode}");
-                return;
-            }
-        } else {
-            $user = $this->User->findById($session['id']);
-        }
-
-        //Chart AJAX
-        // @TODO: enable this and make charts use ajax to load new data
-        if (false && $mode == 'chartData') {
-            $summary = !empty($this->params['url']['sum']) ? $this->params['url']['sum'] : '';
-
-            if ($summary == 'month') {
-                $data = $this->_performanceSummaryByMonth($user['User']['id'], 12);
-            }
-            elseif ($summary == 'cat') {
-                $year = null;
-                $month = null;
-                if (!empty($this->params['url']['year'])) {
-                    $year = intval($this->params['url']['year']);
-                }
-                if (!empty($this->params['url']['month'])) {
-                    $month = intval($this->params['url']['month']);
-                }
-                $data = $this->_performanceSummaryByCategory($user['User']['id'], $year, $month);
-            }
-
-            $this->set('json', $data);
-            $this->render('ajax/json', 'ajax');
-            return;
-        }
-
-        // display name (or email if not set)
-        $userName = trim("{$user['User']['firstname']} {$user['User']['lastname']}");
-        if ($userName == '') {
-            $userName = $user['User']['email'];
-        }
-
-        $this->publish('mode', $mode);
-        $this->publish('user', $user);
-        $this->publish('userName', $userName);
-        $this->publish('showUserLookup', $isSenior);
-        $this->publish('editors', $isSenior ? $this->_recentEditors() : array());
-        $this->publish('collapse_categories', false);
-        $this->publish('subpagetitle', ___('editors_performance_pagetitle', 'Performance Reports'));
-        $this->set('page', 'performance');
-
-        //Standard text report
-        if ($mode == '') {
-            $this->_performanceTable($user['User']['id']);
-
-        //Charts
-        } elseif ($mode == 'charts') {
-            $this->_performanceCharts($user['User']['id']);
-
-        } else {
-            $this->redirect('/editors/performance');
-        }
-        return;
-    }
-
-
-    /**
-     * Generate a detailed performance report with weekly totals and team averages
-     * @param int $userId user to generate report for
-     */
-    function _performanceTable($userId) {
-        // Initialize report data
-        $myApprovals = array();
-        $myTotal = 0;
-        $teamTotal = 0;
-        $teamSize = 0;
-        $teamAverage = 0;
-        $weeklyTotals = array();
-        $myMtdTotal = 0;
-        $teamMtdTotal = 0;
-        $teamMtdAverage = 0;
-        $myYtdTotal = 0;
-        $teamYtdTotal = 0;
-        $teamYtdSize = 0;
-        $teamYtdAverage = 0;
-
-        //Default conditions are the current month
-        $ytdEndTime = strtotime('tomorrow');
-        $startDate = date('Y-m-01');
-        $startTime = strtotime($startDate);
-        $endDate = ___('editors_date_filter_placeholder', 'YYYY-MM-DD');
-        $endTime = $ytdEndTime;
-        
-        //If user has specified own conditions, use those
-        if (!empty($this->params['url']['start'])) {
-            $ts = strtotime($this->params['url']['start']);
-            if ($ts !== false && $ts != -1) {
-                $startTime = $ts;
-                $startDate = $this->params['url']['start'];
-            }
-        }
-        if (!empty($this->params['url']['end'])) {
-            $ts = strtotime($this->params['url']['end']);
-            if ($ts !== false && $ts != -1) {
-                $endTime = strtotime('+1 day', $ts);
-                $endDate = $this->params['url']['end'];
-            }
-        }
-
-        //Initialize weekly data
-        $week = array('from' => $startTime,
-                        'to' => min(strtotime('next Monday', $startTime), $endTime)-1,
-                        'myTotal' => 0, 'teamTotal' => 0, 'teamAverage' => 0);
-        while ($week['from'] < $endTime) {
-            $weeklyKey = $this->_makeYearWeekKey($week['from']);
-            $weeklyTotals[$weeklyKey] = $week;
-
-            $week = array('from' => $week['to']+1,
-                            'to' => min(strtotime('+7 day', $week['to']), $endTime-1),
-                            'myTotal' => 0, 'teamTotal' => 0, 'teamAverage' => 0);
-        }
-
-        //Fetch approvals over specified date range
-        $conditions = array("Approval.created >= FROM_UNIXTIME('{$startTime}')",
-                            "Approval.created < FROM_UNIXTIME('{$endTime}')");
-
-        $order = '`Approval`.`created` ASC';
-        if ($approvals = $this->Approval->findAll($conditions, null, $order)) {
-            foreach ($approvals as $k => $approval) {
-                $weeklyKey = $this->_makeYearWeekKey(strtotime($approval['Approval']['created']));
-                if (!array_key_exists($weeklyKey, $weeklyTotals)) {
-                    // this should never happen, but better to let there be obvious gaps in
-                    // weekly totals than seemingly legit (but probably bogus) counts
-                    continue;
-                }
-
-                //Fetch addon details for approvals by the report user
-                if ($approval['User']['id'] == $userId) {
-                    $approval['Addon'] = $this->Addon->getAddon($approval['Approval']['addon_id'],
-                                                                array('list_details'));
-                    $myApprovals[] = $approval;
-                    $myTotal++;
-                    $weeklyTotals[$weeklyKey]['myTotal']++;
-                }
-                $teamTotal++;
-                $weeklyTotals[$weeklyKey]['teamTotal']++;
-            }
-        }
-
-        /* add formatting to aid in debugging
-        foreach ($weeklyTotals as $k => $w) {
-            $weeklyTotals[$k]['formatted'] =
-                date('Y-m-d H:i:s', $w['from']).' - '.date('Y-m-d H:i:s', $w['to']);
-        }
-        pr($weeklyTotals); /**/
-
-        // YTD and MTD calculations
-        $sql = "SELECT MONTH(`Approval`.`created`) AS `month`, `User`.`id`, COUNT(*) AS `total`
-                  FROM `approvals` AS `Approval`
-                  LEFT JOIN `users` AS `User` ON (`User`.`id`=`Approval`.`user_id`)
-                 WHERE `Approval`.`created` >= '".date('Y')."-01-01 00:00:00'
-                   AND `Approval`.`created` < FROM_UNIXTIME('{$ytdEndTime}')
-                 GROUP BY `month`, `Approval`.`user_id`";
-        if ($results = $this->Approval->query($sql)) {
-            $thisMonth = date('m');
-            foreach ($results as $row) {
-                $teamYtdTotal += $row[0]['total'];
-                $teamMtdTotal += ($row[0]['month'] == $thisMonth) ? $row[0]['total'] : 0;
-                if ($row['User']['id'] == $userId) {
-                    $myYtdTotal += $row[0]['total'];
-                    $myMtdTotal += ($row[0]['month'] == $thisMonth) ? $row[0]['total'] : 0;
-                }
-            }
-        }
-
-        //Calculate averages
-        $teamSize = $this->_teamSize($endTime);
-        if ($teamSize) {
-            $teamAverage = $teamTotal / $teamSize;
-            foreach ($weeklyTotals as $k => $week) {
-                $weeklyTotals[$k]['teamAverage'] = $week['teamTotal'] / $teamSize;
-            }
-        }
-        $teamYtdSize = $this->_teamSize($ytdEndTime);
-        if ($teamYtdSize) {
-            $teamYtdAverage = $teamYtdTotal / $teamYtdSize;
-            $teamMtdAverage = $teamMtdTotal / $teamYtdSize;
-        }
-
-        // Publish and render
-        $this->publish('startDate', $startDate);
-        $this->publish('endDate', $endDate);
-
-        $this->publish('addonTypes', $this->Addontype->getNames());
-        $this->publish('myApprovals', $myApprovals);
-        $this->publish('myTotal', $myTotal);
-        $this->publish('teamAverage', $teamAverage);
-        $this->publish('weeklyTotals', $weeklyTotals);
-        $this->publish('myMtdTotal', $myMtdTotal);
-        $this->publish('teamMtdAverage', $teamMtdAverage);
-        $this->publish('myYtdTotal', $myYtdTotal);
-        $this->publish('teamYtdAverage', $teamYtdAverage);
-
-        $this->render('performance_table');
-    }
-
-
-    /**
-     * Generate charts showing yearly activity and category breakdowns
-     * @param int $userId user to generate report for
-     */
-    function _performanceCharts($userId) {
-        $byMonthData = $this->_performanceSummaryByMonth($userId, 12);
-        $teamSize = $this->_teamSize(time());
-
-        // category breakdown can be for an entire year, or a specific
-        // month and year
-        $year = date('Y');
-        $month = null;
-        if (!empty($this->params['url']['year'])) {
-            $year = intval($this->params['url']['year']);
-        }
-        if (!empty($this->params['url']['month'])) {
-            $month = intval($this->params['url']['month']);
-        }
-        $byCatData = $this->_performanceSummaryByCategory($userId, $year, $month);
-
-        // points for x-axis labels (javascript)
-        $monthlyTicks = array();
-        foreach ($byMonthData['labels'] as $i => $label) {
-            $this->_sanitizeArray($label);
-            $monthlyTicks[] = "[{$i},'{$label}']";
-        }
-
-        // points for user activity (javascript)
-        $userPoints = array();
-        foreach ($byMonthData['usercount'] as $i => $n) {
-            $userPoints[] = "[{$i},{$n}]";
-        }
-
-        // points for team activity (javascript)
-        $teamPoints = array();
-        foreach ($byMonthData['teamcount'] as $i => $n) {
-            $n = $n / $teamSize;
-            $teamPoints[] = "[{$i},{$n}]";
-        }
-
-        // pie chart color-scheme (javascript)
-        $sliceColors = array("'#6d746a'","'#205f9a'","'#3d8128'","'#63522b'",
-                                "'#dc5313'","'#f3c01c'","'#bc1c39'");
-
-        // pie chart labels (javascript)
-        $sliceLabels = array();
-        foreach ($byCatData['labels'] as $i => $label) {
-            $this->_sanitizeArray($label);
-            $sliceLabels[] = "'{$label}'";
-        }
-
-        // pie chart date title
-        if ($month) {
-            $pieTitleDate = strftime('%B %Y', mktime(12,0,0,$month,1,$year));
-        } else {
-            $pieTitleDate = $year;
-        }
-
-        // months for filter select
-        $monthSelect = array(''=>'');
-        for ($n = 1; $n<=12; $n++) {
-            $monthSelect[$n] = strftime('%B', mktime(12,0,0,$n,1));
-        }
-
-        $this->set('monthlyTicksJS', implode(',', $monthlyTicks));
-        $this->set('monthlyUserPointsJS', implode(',', $userPoints));
-        $this->set('monthlyTeamPointsJS', implode(',', $teamPoints));
-        $this->set('sliceColorsJS', implode(',', $sliceColors));
-        $this->set('sliceLabelsJS', implode(',', $sliceLabels));
-        $this->set('userPieDataJS', implode(',', $byCatData['usercount']));
-        $this->set('teamPieDataJS', implode(',', $byCatData['teamcount']));
-        $this->publish('year', $year);
-        $this->publish('month', $month);
-        $this->publish('monthSelect', $monthSelect);
-        $this->publish('pieTitleDate', $pieTitleDate);
-        $this->render('performance_charts');
-    }
-
-
-    /**
-     * Generate data for monthly summary of user and team activity
-     * @param int $userId user to generate report for
-     * @param int $months number of months
-     * @param int $endMonth last month of report (default current month)
-     * @param int $endYear year of last month of report (default current year)
-     * @return array
-     */
-    function _performanceSummaryByMonth($userId, $months=12, $endMonth=null, $endYear=null) {
-        $user = $this->User->findById($userId);
-        $data = array(
-                    'email'     => $user['User']['email'],
-                    'firstname' => $user['User']['firstname'],
-                    'lastname'  => $user['User']['lastname'],
-                    'labels'    => array(),
-                    'usercount' => array(),
-                    'teamcount' => array());
-
-        if (is_null($endMonth)) {
-            $endMonth = date('n');
-        }
-        if (is_null($endYear)) {
-            $endYear = date('Y');
-        }
-
-        $endTime = strtotime(sprintf('%04d-%02d-01 00:00:00 +1 month', $endYear, $endMonth));
-        $startTime = strtotime(sprintf('-%d month', $months), $endTime);
-        
-        $sql = "SELECT DATE_FORMAT(`Approval`.`created`, '%Y-%m') AS yearmonth,
-                       `Approval`.`created`, `User`.`id`, COUNT(*) AS `total`
-                  FROM `approvals` AS `Approval`
-                  LEFT JOIN `users` AS `User` ON (`User`.`id`=`Approval`.`user_id`)
-                 WHERE `Approval`.`created` >= FROM_UNIXTIME('{$startTime}')
-                   AND `Approval`.`created` < FROM_UNIXTIME('{$endTime}')
-                 GROUP BY yearmonth, `Approval`.`user_id`";
-
-        $results = $this->Approval->query($sql);
-        foreach ($results as $row) {
-            $label = strftime('%b %Y', strtotime($row['Approval']['created']));
-            if (!in_array($label, $data['labels'])) {
-                $data['labels'][] = $label;
-                $data['teamcount'][] = 0;
-                $data['usercount'][] = 0;
-            }
-            $i = count($data['labels']) - 1;
-            $data['teamcount'][$i] += $row[0]['total'];
-            if ($row['User']['id'] == $userId) {
-                $data['usercount'][$i] += $row[0]['total'];
-            }
-        }
-
-        return $data;
-    }
-
-
-    /**
-     * Generate data for category breakdown summary for user and team
-     * @param int $userId user to generate report for
-     * @param int $year year (default: current year)
-     * @param int $month month to summarize (default: generate data for entire year)
-     * @return array
-     */
-    function _performanceSummaryByCategory($userId, $year=null, $month=null) {
-        $user = $this->User->findById($userId);
-        $data = array(
-                    'email'     => $user['User']['email'],
-                    'firstname' => $user['User']['firstname'],
-                    'lastname'  => $user['User']['lastname'],
-                    'labels'    => array(),
-                    'usercount' => array(),
-                    'teamcount' => array());
-
-        $addonTypes = $this->Addontype->getNames();
-        asort($addonTypes);
-
-        $addonTypeKeys = array();
-        foreach ($addonTypes as $key => $val) {
-            $addonTypeKeys[] = $key;
-            $data['labels'][] = $val;
-            $data['usercount'][] = 0;
-            $data['teamcount'][] = 0;
-        }
-
-        // single month or year summary breakdown by category
-        // default date range is current year
-        if (is_null($year)) {
-            $year = date('Y');
-        }
-
-        if ($month > 0) {
-            $startTime = strtotime(sprintf('%d-%02d-01 00:00:00', $year, $month));
-            $endTime = strtotime('+1 month', $startTime);
-        } else {
-            $startTime = strtotime(sprintf('%d-01-01 00:00:00', $year));
-            $endTime = strtotime('+1 year', $startTime);
-        }
-
-        $sql = "SELECT `Addon`.`addontype_id`, `User`.`id`, COUNT(*) AS `total`
-                  FROM `approvals` AS `Approval`
-                  LEFT JOIN `users` AS `User` ON (`User`.`id`=`Approval`.`user_id`)
-                  LEFT JOIN `addons` AS `Addon` ON (`Addon`.`id`=`Approval`.`addon_id`)
-                 WHERE `Approval`.`created` >= FROM_UNIXTIME('{$startTime}')
-                   AND `Approval`.`created` < FROM_UNIXTIME('{$endTime}')
-                 GROUP BY `Approval`.`user_id`, `Addon`.`addontype_id`";
-
-        $results = $this->Approval->query($sql);
-        foreach ($results as $row) {
-            $i = array_search($row['Addon']['addontype_id'], $addonTypeKeys);
-            if ($i === false) {
-                continue; // approvals should always have a known addontype ?
-            }
-            $data['teamcount'][$i] += $row[0]['total'];
-            if ($row['User']['id'] == $userId) {
-                $data['usercount'][$i] += $row[0]['total'];
-            }
-        }
-
-        return $data;
-    }
-
-
-   /**
-    * AJAX Add-on and Author email lookup
-    */
-    function addonAndAuthorLookup($queue='pending') {
-        if (!$this->SimpleAcl->actionAllowed('Admin', '%', $this->Session->read('User')) ||
-            !$this->SimpleAcl->actionAllowed('Editor', '*', $this->Session->read('User')) ) {
-            $this->Amo->accessDenied();
-        }
-
-        $text = $_REQUEST['q'];
-        $this->Amo->clean($text, false);
-        $addonsAndEmails = array();
-
-        if (strlen($text) > 0 && in_array($queue, array('pending', 'nominated'))) {
-            // Use the base filter components to limit results to those in the queue
-            $sql_base = $this->Editors->baseQueueFilterQuery($queue);
-
-            // search localized addon names
-            $sql = "SELECT DISTINCT IFNULL(`tr_l`.`localized_string`, `tr_en`.`localized_string`) AS `lname`
-                    {$sql_base['FROM']}
-                    {$sql_base['JOIN']}
-                    LEFT JOIN `translations` AS `tr_l` ON
-                        (`tr_l`.`id`=`Addon`.`name` AND `tr_l`.`locale`='".LANG."')
-                    LEFT JOIN `translations` AS `tr_en` ON
-                        (`tr_en`.`id`=`Addon`.`name` AND `tr_en`.`locale`=`Addon`.`defaultlocale`)
-                    {$sql_base['WHERE']}
-                        AND IFNULL(`tr_l`.`localized_string`, `tr_en`.`localized_string`) LIKE '%{$text}%'
-                    ORDER BY `lname` ASC";
-
-            $results = $this->Version->query($sql);
-            if (!empty($results)) {
-                foreach ($results as $row) {
-                    $addonsAndEmails[] = $row[0]['lname'];
-                }
-            }
-
-            // search localized addon support emails
-            $emails = array();
-            $sql = "SELECT IFNULL(`tr_l`.`localized_string`, `tr_en`.`localized_string`) AS `lemail`
-                    {$sql_base['FROM']}
-                    {$sql_base['JOIN']}
-                    LEFT JOIN `translations` AS `tr_l` ON
-                        (`tr_l`.`id`=`Addon`.`supportemail` AND `tr_l`.`locale`='".LANG."')
-                    LEFT JOIN `translations` AS `tr_en` ON
-                        (`tr_en`.`id`=`Addon`.`supportemail` AND `tr_en`.`locale`=`Addon`.`defaultlocale`)
-                    {$sql_base['WHERE']}
-                        AND IFNULL(`tr_l`.`localized_string`, `tr_en`.`localized_string`) LIKE '%{$text}%'";
-
-            $results = $this->Version->query($sql);
-            if (!empty($results)) {
-                foreach ($results as $row) {
-                    $emails[] = $row[0]['lemail'];
-                }
-            }
-
-            // search author emails
-            $sql = "SELECT `User`.`email`
-                    {$sql_base['FROM']} 
-                    {$sql_base['JOIN']}
-                    LEFT JOIN `addons_users` AS `au` ON (`Addon`.`id`=`au`.`addon_id`)
-                    LEFT JOIN `users` AS `User` ON (`au`.`user_id`=`User`.`id`)
-                    {$sql_base['WHERE']}
-                        AND `au`.`role` IN(".AUTHOR_ROLE_ADMINOWNER.","
-                                        .AUTHOR_ROLE_ADMIN.","
-                                        .AUTHOR_ROLE_OWNER.","
-                                        .AUTHOR_ROLE_DEV.")
-                        AND `User`.`email` LIKE '%{$text}%'";
-
-            $results = $this->Version->query($sql);
-            if (!empty($results)) {
-                foreach ($results as $row) {
-                    $emails[] = $row['User']['email'];
-                }
-            }
-
-            // sort, dedup, and merge
-            sort($emails);
-            $emails = array_unique($emails);
-            $addonsAndEmails = array_merge($addonsAndEmails, $emails);
-        }
-        
-        $this->set('addonsAndEmails', $addonsAndEmails);
-        $this->render('ajax/addon_and_author_lookup', 'ajax');
-    }
-
-    /**
-     * AJAX action for looking up appversions for the specified app
-     * @param int $app_id The application id
-     */
-    function appversionLookup($app_id) {
-        $this->Amo->clean($app_id);
-        $results = $this->Appversion->findAllByApplicationId($app_id,
-                            array('Appversion.id', 'Appversion.version'), 'Appversion.version DESC');
-        $appversions = array();
-        foreach ($results as $av) {
-            $appversions[] = $av['Appversion'];
-        }
-
-        $this->publish('appversions', $appversions);
-        $this->render('ajax/appversion_lookup', 'ajax');
-    }
-
-    /**
-     * Count the number of (possibly filtered) items in the specified queue
-     * @param string $queue
-     * @param bool $useFilter (default=false)
-     * @return int
-     * @todo possibly cache results
-     */
-    function _getCount($queue, $useFilter=false) {
-        $result = null;
-
-        if ($useFilter && $this->Editors->buildQueueFilterQuery($queue)) {
-            $sql = $this->Editors->buildQueueFilterQuery($queue);
-            $result = $this->Addon->query(
-                "SELECT COUNT(*) {$sql['FROM']} {$sql['JOIN']} {$sql['WHERE']}");
-
-        } elseif ($queue == 'pending') {
-            $result = $this->File->query(
-                "SELECT COUNT(*) FROM `files` WHERE `status`=".STATUS_PENDING." GROUP BY `status`");
-
-        } elseif ($queue == 'nominated') {
-            $result = $this->Addon->query(
-                "SELECT COUNT(*) FROM `addons` WHERE `status`=".STATUS_NOMINATED." GROUP BY `status`");
-
-        } elseif ($queue == 'reviews') {
-            $result = $this->Review->query(
-                "SELECT COUNT(*) FROM `reviews` WHERE `editorreview`=1 GROUP BY `editorreview`");
-        }
-
-        $count = !empty($result) ? $result[0][0]['COUNT(*)'] : 0;
-
-        return $count;
-    }
-
-    /**
-     * Fetch an array of (possibly filtered) addons for the specified queue
-     * @param string $queue
-     * @return array
-     */
-    function _buildQueue($queue) {
-        if (!in_array($queue, array('pending', 'nominated'))) {
-            return array();
-        }
-
-        $sql = $this->Editors->buildQueueFilterQuery($queue);
-    
-        // Setup pagination
-        $this->Pagination->total = $this->_getCount($queue, true);
-
-        $_pagination_options = array();
-        if ($queue == 'pending') {
-            if (!array_key_exists('show', $_GET) && $this->Session->read('editor_queue_pending_show')) {
-                $_pagination_options['show'] = $this->Session->read('editor_queue_pending_show');
-            } else {
-                // If $_GET['show'] exists it overrides this in the pagination component
-                $_pagination_options['show'] = 50;
-            }
-            list($not_used,$_limit,$_page) = $this->Pagination->init(null, null, $_pagination_options);
-            $this->Session->write('editor_queue_pending_show', $_limit);
-
-        } else {
-            if (!array_key_exists('show', $_GET) && $this->Session->read('editor_queue_nominated_show')) {
-                $_pagination_options['show'] = $this->Session->read('editor_queue_nominated_show');
-            } else {
-                // If $_GET['show'] exists it overrides this in the pagination component
-                $_pagination_options['show'] = 50;
-            }
-            list($not_used,$_limit,$_page) = $this->Pagination->init(null,null,$_pagination_options);
-            $this->Session->write('editor_queue_nominated_show', $_limit);
-        }
-
-        $_offset = ($_page > 0) ? $_limit * ($_page-1) : 0; // no negative offsets, thank you
-
-        $extra_fields = '';
-        if ($queue == 'pending') {
-            $extra_fields .= ", `File`.`id`, `File`.`platform_id`";
-        }
-
-        // Fetch the queue
-        $queue_sql = "SELECT
-                            `Version`.`id`,
-                            `Version`.`addon_id`,
-                            `Version`.`version`,
-                            `Version`.`created`,
-                            `Version`.`modified`
-                            {$extra_fields}
-                        {$sql['FROM']}
-                        {$sql['JOIN']}
-                        {$sql['WHERE']}
-                        {$sql['ORDER']}
-                        LIMIT {$_limit} OFFSET {$_offset}";
-
-        $addons = $this->Version->query($queue_sql);
-
-        //Merge in Addon details
-        if (!empty($addons)) {
-            foreach ($addons as $k => $addon) {
-                $addon = $this->Addon->findById($addon['Version']['addon_id'],
-                                            array('Addon.id',
-                                                  'Addon.name', 'Addon.defaultlocale',
-                                                  'Addon.addontype_id', 'Addon.prerelease',
-                                                  'Addon.sitespecific', 'Addon.externalsoftware',
-                                                  'Addon.created', 'Addon.nominationdate'), '', 0);
-                $addons[$k] = array_merge_recursive($addons[$k], $addon);
-            }
-        }
-
-        $platforms = $this->Amo->getPlatformName();
-        $applications = $this->Amo->getApplicationName();
-        
-        //make modifications to the queue array
-        if (!empty($addons)) {
-            foreach ($addons as $k => $addon) {
-                //get min/max versions
-                if ($targetApps = $this->Amo->getMinMaxVersions($addon['Version']['id'])) {
-                    foreach ($targetApps as $targetApp) {
-                        $appName = $targetApp['translations']['localized_string'];
-                        $addons[$k]['targetApps'][$appName]['min'] = $targetApp['min']['version'];
-                        $addons[$k]['targetApps'][$appName]['max'] = $targetApp['max']['version'];
-                    }
-                }
-
-                //Age
-                if ($queue == 'pending') {
-                    $age = time() - strtotime($addon['Version']['created']);
-                }
-                elseif ($queue == 'nominated') {
-                    $age = time() - strtotime($addon['Addon']['created']);
-                    $nominationage = time() - strtotime($addon['Addon']['nominationdate']);
-                    $addons[$k]['nominationage'] = $this->_humanizeAge($nominationage);
-                }
-                
-                $addons[$k]['age'] = $this->_humanizeAge($age);
-
-                //Generate any additional notes
-                $addons[$k]['notes'] = array();
-                
-                //Platform-specific?
-                if (!empty($addon['Version'][0]['File'][0]['platform_id']) && $addon['Version'][0]['File'][0]['platform_id'] != 1) {
-                    $os = array();
-                    foreach ($addon['Version'][0]['File'] as $file) {
-                        $os[] = $platforms[$file['platform_id']];
-                    }
-                    $addons[$k]['notes'][] = sprintf(_('editors_platform_x_only'), implode(', ', $os));
-                }
-                elseif (!empty($addon['File']['platform_id']) && $addon['File']['platform_id'] != 1) {
-                    $addons[$k]['notes'][] = sprintf(_('editors_platform_x_only'), $platforms[$addon['File']['platform_id']]);
-                }
-                
-                //Featured?
-                //@TODO
-                
-                //Site specific?
-                if ($addon['Addon']['sitespecific'] == 1) {
-                    $addons[$k]['notes'][] = _('editors_site_specific');
-                }
-                //Pre-release?
-                if ($addon['Addon']['prerelease'] == 1) {
-                    $addons[$k]['notes'][] = _('editors_pre-release');
-                }
-                //External software?
-                if ($addon['Addon']['externalsoftware'] == 1) {
-                    $addons[$k]['notes'][] = _('editors_external_software');
-                }
-            }
-        }
-        //pr($addons);
-
-        return $addons;
-    }
     
    /**
     * Moderated Reviews Queue
@@ -1448,87 +869,6 @@ class EditorsController extends AppController
         $this->set('page', 'reviewlog');
         $this->render('reviewlog');
     }
-
-    /* Humanizes a Unix Timestamp */
-    function _humanizeAge($age) {
-        $humanized = '';
-
-        //days
-        if ($age >= (60*60*24*2)) {
-            $humanized = sprintf(_('editors_x_days'), floor($age/(60*60*24)));
-        }
-        //1 day
-        elseif ($age >= (60*60*24)) {
-            $humanized = _('editors_one_day');
-        }
-        //hours
-        elseif ($age >= (60*60*2)) {
-            $humanized = sprintf(_('editors_x_hours'), floor($age/(60*60)));
-        }
-        //hour
-        elseif ($age >= (60*60)) {
-            $humanized = _('editors_one_hour');
-        }
-        //minutes
-        elseif ($age > 60) {
-            $humanized = sprintf(_('editors_x_minutes'), floor($age/60));
-        }
-        //minute
-        else {
-            $humanized = _('editors_one_minute');
-        }
-
-        return $humanized;
-    }
-
-    /* Generate a sortable key from the given timestamp in the form of 'YYYY-WW' */
-    function _makeYearWeekKey($timestamp) {
-        $year = date('Y', $timestamp);
-        $week = date('W', $timestamp);
-
-        // the end of December is often part of the first week for the following year
-        if ($week == '01' && date('m', $timestamp) == '12') {
-            $year++;
-        }
-        return "{$year}-{$week}";
-    }
-
-    /* Approximate team size at a point in time */
-    function _teamSize($timestamp) {
-        $this->Amo->clean($timestamp);
-
-        //  Count the number of unique users that submitted a review during
-        //  the 60 days leading up to the time specified.
-        $teamSize = 0;
-        $sql = "SELECT COUNT(DISTINCT `Approval`.`user_id`) AS `teamSize`
-                  FROM `approvals` AS `Approval`
-                 WHERE `Approval`.`created` < FROM_UNIXTIME('{$timestamp}')
-                   AND `Approval`.`created` >= FROM_UNIXTIME('".strtotime('-60 day', $timestamp)."')";
-        if ($results = $this->Approval->query($sql)) {
-            $teamSize = $results[0][0]['teamSize'];
-        }
-        return $teamSize;
-    }
-
-    /* Fetch emails of all editors active in the last reviewDays days */
-    function _recentEditors($reviewDays=90) {
-        $this->Amo->clean($reviewDays);
-
-        $sql = "SELECT DISTINCT `User`.`email`
-                  FROM `approvals` AS `Approval`
-                 INNER JOIN `users` AS `User` ON (`User`.`id`=`Approval`.`user_id`)
-                 WHERE `Approval`.`created` >= FROM_UNIXTIME('".strtotime("-{$reviewDays} day")."')
-                 ORDER BY `User`.`email` ASC";
-
-        $editors = array();
-        if ($results = $this->Approval->query($sql)) {
-            foreach ($results as $user) {
-                $editors[] = $user['User']['email'];
-            }
-        }
-
-        return $editors;
-    }
 }
 
 ?>
diff --git a/site/app/controllers/files_controller.php b/site/app/controllers/files_controller.php
index 694085d..e662400 100644
--- a/site/app/controllers/files_controller.php
+++ b/site/app/controllers/files_controller.php
@@ -72,7 +72,7 @@ class FilesController extends AppController
         
         $this->File->id = $file_id;
         if (!$file = $this->File->read()) {
-            $this->flash(_('error_file_notfound'), '/');
+            $this->flash($file_id, '/');
             return;
         }
         $this->Addon->id = $file['Version']['addon_id'];
@@ -85,7 +85,7 @@ class FilesController extends AppController
         }
 
         $addontype = $addon['Addon']['addontype_id'];
-        $startfile = 'install.rdf';
+        $startfile = 'install.rdf2';
         $path = REPO_PATH.'/'.$this->Addon->id.'/'.$file['File']['filename'];
 
         if (!file_exists($path)) {
@@ -116,14 +116,12 @@ class FilesController extends AppController
             foreach ($contents as $content) {
                 $isJar = false;
 
-                if ($addontype == ADDON_EXTENSION) {
-                    $paths = split("/", $content['filename'], 2);
-                    $pathinfo = pathinfo($path);
-                    if ($pathinfo['extension'] == '.xo')
-                        $startfile = $paths[0].'/activity/activity.info';
-                    else
-                        $startfile = $paths[0].'/library/library.info';
-                }
+                // we are sugar
+                $paths = split("/", $content['filename'], 2);
+                if ($addontype == ADDON_CONTENT)
+                    $startfile = $paths[0].'/library/library.info';
+                else
+                    $startfile = $paths[0].'/activity/activity.info';
 
                 if (substr($content['filename'], strrpos($content['filename'], '.')) == '.jar') {
                     $content['folder'] = 1;
@@ -169,7 +167,7 @@ class FilesController extends AppController
         $contents = $this->_get_contents($path, $file, $addontype);
 
         if (is_bool($contents) && $contents == false) {
-            $this->flash(_('error_file_notfound'), '/');
+            $this->flash($file, '/');
             return;
         }
         $this->publish('filename', $file);
diff --git a/site/app/controllers/images_controller.php b/site/app/controllers/images_controller.php
index b25ec59..d20353d 100644
--- a/site/app/controllers/images_controller.php
+++ b/site/app/controllers/images_controller.php
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Andrei Hajdukewycz <sancus@off.net> (Original Author)
  *   Justin Scott <fligtar@mozilla.com>
- *   Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -40,7 +39,7 @@
 class ImagesController extends AppController
 {
     var $name = 'Images';
-    var $uses = array('Addon', 'Collection', 'Preview');
+    var $uses = array('Addon', 'Preview');
     var $components = array('Image');
     var $autoRender = false;
 
@@ -69,22 +68,6 @@ class ImagesController extends AppController
     }
     
     /**
-     * Renders the icon for the specified add-on
-     * @param int $addon_id ID of the add-on
-     * @param int $timestamp timestamp of last update (optional)
-     * @param bool $cache whether to memcache or not (optional)
-     */
-    function collection_icon($collection_id, $timestamp = '', $cache = true) {
-        if ($cache !== true) {
-            $this->Collection->caching = false;
-        }
-
-        if (!empty($collection_id)) {
-            $this->Image->renderCollectionIcon($collection_id);
-        }
-    }
-
-    /**
      * Renders the full-size preview with the ID specified
      * @param int $preview_id ID of the preview to render
      * @param int $timestamp timestamp of last update (optional)
diff --git a/site/app/controllers/pages_controller.php b/site/app/controllers/pages_controller.php
index 2dd39d0..c22cd47 100644
--- a/site/app/controllers/pages_controller.php
+++ b/site/app/controllers/pages_controller.php
@@ -44,8 +44,8 @@ class PagesController extends AppController{
 
     var $name = 'Pages';
     var $helpers = array('Html', 'Localization');
-    var $components = array('Image', 'Pagination');
-    var $uses = array('Addon', 'Collection', 'File', 'Platform', 'User');
+    var $components = array('Pagination');
+    var $uses = array('User');
 
     var $securityLevel = 'low';
 
@@ -109,21 +109,6 @@ class PagesController extends AppController{
             $title = ___('page_title_submissionhelp', 'Submission Help'); break;
         case 'faq':
             $title = ___('page_title_faq', 'Frequently Asked Questions'); break;
-        case 'developer_faq':
-            $title = ___('page_title_developer_faq'); break;
-        case 'collector':
-            $title = ___('page_title_collector');
-            $this->publish('collectionSearch', true); break;
-        case 'collector_faq':
-            $title = ___('page_title_collector_faq');
-            $this->publish('collectionSearch', true); break;
-        case 'collector_features':
-            $title = ___('page_title_collector_features');
-            $this->publish('collectionSearch', true); break;
-        case 'collector_firstrun':
-            $this->set('jsAdd', array('amo2009/collections'));
-            $title = ___('page_title_collector_firstrun');
-            $this->publish('collectionSearch', true); break;
         default:
             if (!empty($path[$count - 1])) {
                 $title = ucfirst($path[$count - 1]);
diff --git a/site/app/controllers/reviews_controller.php b/site/app/controllers/reviews_controller.php
index a62c557..f1dad56 100644
--- a/site/app/controllers/reviews_controller.php
+++ b/site/app/controllers/reviews_controller.php
@@ -48,7 +48,7 @@ class ReviewsController extends AppController
     var $components = array('Amo', 'Pagination', 'Session');
     var $helpers = array('Html', 'Link', 'Localization', 'Pagination', 'Time');
     var $namedArgs = true;
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
 
     var $securityLevel = 'low';
 
@@ -552,9 +552,11 @@ class ReviewsController extends AppController
         // mark review for editor approval
         $this->Review->id = $reviewid;
         if (!$error && $this->Review->saveField('editorreview', 1)) {
+            // @partial translation fallback, 5/22/08
             $this->publish('msg', ___('review_flag_success', 
                 'Thanks; this review has been flagged for editor approval.'));
         } else {
+            // @partial translation fallback, 5/22/08
             if (!isset($this->viewVars['msg']))
                 $this->publish('msg', ___('review_flag_error', 
                     'Error flagging this review!'));
diff --git a/site/app/controllers/search_controller.php b/site/app/controllers/search_controller.php
index 670bc15..d2cba55 100644
--- a/site/app/controllers/search_controller.php
+++ b/site/app/controllers/search_controller.php
@@ -53,8 +53,8 @@ class SearchController extends AppController
     /**
      * Cake array for what tables this controller accesses
      */
-    var $uses = array('Addon', 'Addontype', 'Collection', 'File', 'Translation', 'Platform', );
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
+    var $uses = array('Addon', 'Addontype', 'Translation', 'Platform', );
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
 
     /**
      * Holds the sanitize component, used to clean variables in our custom queries
@@ -66,7 +66,7 @@ class SearchController extends AppController
     var $helpers = array('Javascript', 'Pagination', 'Time');
     
     // components to be used by this controller
-    var $components = array('Image', 'Pagination', 'Search', "Versioncompare", "Amo", "CollectionsListing");
+    var $components = array('Image', 'Pagination', 'Search', "Versioncompare", "Amo");
 
     // view layout
     var $layout = 'mozilla';
@@ -109,6 +109,15 @@ class SearchController extends AppController
             $_terms = '';
         }
         $this->publish('search_terms', $_terms);
+        
+        if (!empty($this->params['url']['cat'])) {
+            $category = explode(',', $this->params['url']['cat']);
+            if (count($category) != 2 || !is_numeric($category[0]) ||
+                !is_numeric($category[1]))
+                $category = array(0,0);
+        } else
+            $category = array(0,0);
+        $this->publish('category', $category);
 
         //if advanced search appid set, use it
         $appname = "";
@@ -121,21 +130,6 @@ class SearchController extends AppController
         }
         $this->publish('appid', APP_ID); //publish for element caching
 
-        // collection search is a special case
-        if (!empty($this->params['url']['cat']) && ($this->params['url']['cat'] == 'collections')) {
-            $this->_collections($_terms);
-            return;
-        }
-        
-        if (!empty($this->params['url']['cat'])) {
-            $category = explode(',', $this->params['url']['cat']);
-            if (count($category) != 2 || !is_numeric($category[0]) ||
-                !is_numeric($category[1]))
-                $category = array(0,0);
-        } else
-            $category = array(0,0);
-        $this->publish('category', $category);
-
         //if advanced search atype set, use it.
         $atype = -1;
         $addon_types = $this->Addontype->getNames();
@@ -166,8 +160,7 @@ class SearchController extends AppController
         $this->publish('sort', $sort); //publish for element caching
 
         //if advanced search hver and lver set (for version range), use the
-        $hver = 'any'; 
-        $lver = -1;
+        $hver = $lver = -1;
         $vfuz = false;
         if (isset($this->params['url']['lver']) && isset( $this->params['url']['hver']) && isset( $this->params['url']['vfuz'])) { 
             $hver = $this->params['url']['hver'];
@@ -254,48 +247,6 @@ class SearchController extends AppController
         return $this->index();  // let index handle rss action
     }
 
-
-    /**
-     * Search collections
-     */
-    function _collections($terms = '') {
-        //search
-        $_result_ids = $this->Search->searchCollections($terms);
-
-        //if advanced search pagination set, use it.
-        $pp = 10;
-        if (isset( $this->params['url']['pp']) && in_array($this->params['url']['pp'], $this->Pagination->resultsPerPage)) {
-            $pp = $this->params['url']['pp'];
-        }
-        $this->publish('pp',  $pp); //publish for element caching
-
-        // Fetch a sorted page of collections
-        $page_options = array('show' => $pp);
-        $collections = $this->CollectionsListing->fetchPage($_result_ids, $page_options);
-
-        // Our view needs the current sort options
-        list($sort_opts, $sortby) = $this->CollectionsListing->sorting();
-
-        // Prep and render the view
-        $this->pageTitle = ___('search_collections_pagetitle', 'Collection Search Results').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-       
-        $this->publish('jsAdd', array('amo2009/collections', 'jquery-ui/jqModal.js'));
-        $this->publish('breadcrumbs', array(
-            sprintf(___('addons_home_pagetitle'), APP_PRETTYNAME) => '/',
-            ___('collections_breadcrumb') => '/collections'
-        ));
-
-        $this->publish('collapse_categories', true);
-        $this->publish('collectionSearch', true);
-        $this->publish('query', $terms);
-        $this->publish('sort_opts', $sort_opts);
-        $this->publish('sortby', $sortby);
-        $this->publish('collections', $collections);
-        $this->forceCache();
-        $this->render('collections');
-        return;
-    }
-
 }
 
 ?>
diff --git a/site/app/controllers/statistics_controller.php b/site/app/controllers/statistics_controller.php
index b6a7ffd..7acf45e 100644
--- a/site/app/controllers/statistics_controller.php
+++ b/site/app/controllers/statistics_controller.php
@@ -41,7 +41,7 @@ class StatisticsController extends AppController
     var $name = 'Statistics';
     var $uses = array('Addon', 'Addontype', 'Application', 'User', 'Version');
     var $components = array('Amo', 'Image', 'Stats');
-    var $helpers = array('Html', 'Javascript', 'Listing', 'Localization', 'Statistics', 'Time');
+    var $helpers = array('Html', 'Javascript', 'Listing', 'Localization', 'Time');
 
    /**
     * Require login for all actions
@@ -56,7 +56,7 @@ class StatisticsController extends AppController
         // Clean post data
         $this->Amo->clean($this->data); 
         
-        $this->layout = 'amo2009';
+        $this->layout = 'mozilla';
         $this->pageTitle = _('statistics_pagetitle').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
         
         $this->cssAdd = array('stats/stats');
@@ -78,10 +78,6 @@ class StatisticsController extends AppController
     * Index
     */
     function index($addon_id = 0) {
-
-        // Get public stats for dashboard.
-        $this->publish('dailyStats',$this->Stats->getDailyStats());
-
         // If add-on id was specified, go to its statistics
         if (!empty($addon_id) || !empty($_GET['data']['Addon']['id'])) {
             if (!empty($addon_id))
@@ -94,11 +90,7 @@ class StatisticsController extends AppController
         // If not, figure out what to do
         else {
             $session = $this->Session->read('User');
-            if ($session) {
-                $addons = $this->Addon->getAddonsByUser($session['id']);
-            } else {
-                $addons = array();
-            }
+            $addons = $this->Addon->getAddonsByUser($session['id']);
             $this->publish('addons', $addons);
             
             // If user can access all add-on stats, pull all
@@ -148,6 +140,7 @@ class StatisticsController extends AppController
             return;
         }
         
+        $this->publish('suppressJQuery', true);
         $this->jsAdd = array(
             //'simile/timeplot/timeplot-api.js?local',
             'jquery-compressed.js',
@@ -218,23 +211,6 @@ class StatisticsController extends AppController
                 $stats['last_downloads'] = $statsQry[0]['download_counts']['count'];
                 $stats['last_downloads_date'] = $statsQry[0]['download_counts']['date'];
             }
-            // Grouping by week is not quite what we want, since the current
-            // week is going to be shorter than (the complete) last week.
-            // If you know how to get (now, now - 7), (now - 8, now - 14) ranges
-            // in a group by, feel free to improve this.
-            $thisWeek = $this->Addon->query("SELECT AVG(count) as `count` FROM update_counts
-                                             WHERE addon_id={$addon_id}
-                                               AND date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)");
-            $prevWeek = $this->Addon->query("SELECT AVG(count) as `count` FROM update_counts
-                                             WHERE addon_id={$addon_id}
-                                               AND date <= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-                                               AND date >= DATE_SUB(CURDATE(), INTERVAL 14 DAY)");
-            if ($thisWeek && $prevWeek) {
-                $thisWeek = $thisWeek[0][0]['count'];
-                $prevWeek = $prevWeek[0][0]['count'];
-                $stats['weekly_updatepings'] = $thisWeek;
-                $stats['weekly_updatepings_change'] = $prevWeek > 0 ? (($thisWeek - $prevWeek) / $prevWeek) * 100 : 0;
-            }
         }
         $this->set('stats', $stats);
         $this->pageTitle = $addon['Translation']['name']['string'].' :: '._('statistics_pagetitle').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
@@ -276,7 +252,7 @@ class StatisticsController extends AppController
                     'statistics_js_plotselection_options_csv_tooltip' => _('statistics_js_plotselection_options_csv_tooltip')
                 ));
             
-            $this->render('addon', 'amo2009');
+            $this->render('addon', 'mozilla');
         }
         else {
             $this->publish('rss_title', sprintf(_('statistics_title_addon_stats'), $addon['Translation']['name']['string']));
diff --git a/site/app/controllers/tests_controller.php b/site/app/controllers/tests_controller.php
index 05893ca..a9a9c89 100644
--- a/site/app/controllers/tests_controller.php
+++ b/site/app/controllers/tests_controller.php
@@ -37,7 +37,6 @@
  */
 vendor('simpletest/reporter');
 vendor('simpletest'.DS.'unit_tester', 'simpletest'.DS.'web_tester', 'simpletest'.DS.'mock_objects', 'simpletest'.DS.'xml', 'simpletest'.DS.'remote');
-vendor('phpQuery/phpQuery');
 require_once(TESTS.'test_manager.php');
 require_once(TESTS.'groups.php');
 require_once(TESTS.'cake_reporter.php');
diff --git a/site/app/controllers/users_controller.php b/site/app/controllers/users_controller.php
index a848e4e..485571c 100644
--- a/site/app/controllers/users_controller.php
+++ b/site/app/controllers/users_controller.php
@@ -41,12 +41,12 @@
 class UsersController extends AppController
 {
     var $name = 'Users';
-    var $uses = array('User', 'Addon', 'Collection', 'Eventlog', 'Review', 'Version');
+    var $uses = array('User', 'Addon', 'Eventlog', 'Review', 'Version');
     var $components = array('Amo', 'Email', 'Ldap', 'Session', 'Pagination', 'Recaptcha');
     var $helpers = array('Html', 'Link', 'Javascript');
-    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox', 'checkAdvancedSearch');
+    var $beforeFilter = array('checkCSRF', 'getNamedArgs', '_checkSandbox');
     var $exceptionCSRF = array("/users/login", "/users/register", "/users/pwreset");	
-    var $layout = 'amo2009';
+    var $layout = 'mozilla';
     var $namedArgs = true;
 
     var $securityLevel = 'high';
@@ -110,7 +110,7 @@ class UsersController extends AppController
             $this->Amo->clean($this->data);
             $this->User->data = $this->data;
             // hash password(s)
-            $this->User->data['User']['password'] = $this->User->createPassword($this->User->data['User']['password']);
+            $this->User->data['User']['password'] = md5($this->User->data['User']['password']);
             
             // compare passwords
             if ($this->data['User']['password'] !== $this->data['User']['confirmpw'])
@@ -238,8 +238,7 @@ class UsersController extends AppController
                 } else {
                     // user found: send pw reset URL via email
                     $this->publish('data', $thisuser);
-                    $resetCode = $this->User->setResetCode($thisuser['User']['id']);
-                    $this->publish('resetcode', $resetCode);
+                    $this->publish('resetcode', md5($thisuser['User']['password']));
                     $this->Email->template = 'email/pwreset';
                     $this->Email->to = $this->data['User']['email'];
                     $this->Email->subject = sprintf(_('user_email_pwreset_subject'), APP_PRETTYNAME);
@@ -250,16 +249,7 @@ class UsersController extends AppController
             }
             return;
         }
-
-        // id and/or code was sent, make sure the page isn't cached.
-        $this->disableCache();
-
-        // Remove 'id/resetcode' from the URI so it doesn't get echoed.
-        $_SERVER['REQUEST_URI'] = preg_replace('@pwreset/.*$@', 'pwreset/', $_SERVER['REQUEST_URI']);
-        if (isset($this->params['url']['url'])) {
-            $this->params['url']['url'] = preg_replace('@pwreset/.*$@', 'pwreset/', $this->params['url']['url']);
-        }
-
+        
         if (!$id || !$code) {
             $this->flash(sprintf(_('error_missing_argument'), 'user_id or code'), '/', 3);
             return;
@@ -271,8 +261,7 @@ class UsersController extends AppController
             return;
         }
 
-        if (!$this->User->checkResetCode($id, $code)) {
-            // TODO: update message re: expiration
+        if ($code !== md5($thisuser['User']['password'])) {
             $this->flash(_('error_user_badconfirmationcode'), '/', 3);
             return;
         }
@@ -297,7 +286,7 @@ class UsersController extends AppController
 
             // store new pw
             $newpw = array();
-            $newpw['User']['password'] = $this->User->createPassword($this->data['User']['password']);
+            $newpw['User']['password'] = md5($this->data['User']['password']);
             $this->User->id = $id;
             $this->User->save($newpw);
             // success
@@ -356,7 +345,7 @@ class UsersController extends AppController
             return;
         }
 
-        if ($this->User->checkPassword($someone['User'], $this->data['Login']['password'])) {
+        if (!empty($someone['User']['password']) && $someone['User']['password'] == md5($this->data['Login']['password'])) {
             
             //Set expiration to two weeks if they check 'remember me'
             $expirationTime = isset($this->data['Login']['remember']) ? 60*60*24*7*2 : 0;
@@ -414,10 +403,7 @@ class UsersController extends AppController
         $this->pageTitle = _('users_edit_pagetitle').' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
         $this->publish('cssAdd', array('forms', 'jquery-ui/flora/flora.tabs'));
         $this->publish('jsAdd', array('jquery-ui/ui.core.min', 'jquery-ui/ui.tabs.min'));
-
-        $translations = $this->User->getAllTranslations($sessionuser['id']);
-        $this->set('translations', $translations);
-
+        
         if (empty($this->data)) {
             $this->publish('userAddons', $this->Addon->getAddonsByUser($sessionuser['id']));
             
@@ -434,14 +420,12 @@ class UsersController extends AppController
         $changed['nickname'] = $this->data['User']['nickname'];
         $changed['emailhidden'] = $this->data['User']['emailhidden'];
         $changed['homepage'] = $this->data['User']['homepage'];
-        $changed['display_collections'] = $this->data['User']['display_collections'];
-        $changed['display_collections_fav'] = $this->data['User']['display_collections_fav'];
 
         if (!empty($this->data['User']['password']) &&
             !empty($this->data['User']['newpassword'])) {
             
             // trying to change the password
-            if (!$this->User->checkPassword($sessionuser, $this->data['User']['password']))
+            if ($sessionuser['password'] !== md5($this->data['User']['password']))
                 $this->User->invalidate('password');
             if ($this->data['User']['newpassword'] != $this->data['User']['confirmpw'])
                 $this->User->invalidate('confirmpw');
@@ -449,7 +433,7 @@ class UsersController extends AppController
             // store the new chosen pw to the "edited" array.
             // If we invalidated fields up here, it's not going to be
             // stored anyway.
-            $changed['password'] = $this->User->createPassword($this->data['User']['newpassword']);
+            $changed['password'] = md5($this->data['User']['newpassword']);
         }
 
         // nickname has to be unique
@@ -511,11 +495,6 @@ class UsersController extends AppController
         }
         // if we get here, the data was saved successfully
         
-        // save author "about me"
-        list($localizedFields, $unlocalizedFields) = $this->User->splitLocalizedFields($this->data['User']);
-        $this->Amo->clean($localizedFields);
-        $this->User->saveTranslations($sessionuser['id'], $this->params['form']['data']['User'], $localizedFields);
-
         // send out confirmation email if necessary
         if ($newemail !== false) {
             $this->set('newemail', $newemail);
@@ -531,7 +510,11 @@ class UsersController extends AppController
             // send out the confirmation email
             $this->Email->template = 'email/emailchange';
             $this->Email->to = $newemail;
-            $this->Email->subject = sprintf(___('user_emailchange_subject'), APP_PRETTYNAME);
+            // @partial translation fallback, 5/6/08
+            if (_('user_emailchange_subject') != 'user_emailchange_subject')
+                $this->Email->subject = sprintf(_('user_emailchange_subject'), APP_PRETTYNAME);
+            else
+                $this->Email->subject = sprintf('Please confirm your email address change at %1$s Add-ons', APP_PRETTYNAME);
             $result = $this->Email->send();
         }
         
@@ -594,7 +577,13 @@ class UsersController extends AppController
         
         // is the token expired (48 hours max)?
         if (time()-$changedata[2] > 48*60*60) {
-            $this->publish('errormsg', ___('error_user_emailchange_expired'));
+            // @partial translation fallback, 5/6/08
+            if (_('error_user_emailchange_expired') != 'error_user_emailchange_expired')
+                $this->publish('errormsg', _('error_user_emailchange_expired'));
+            else
+                $this->publish('errormsg', 'The email change has expired. Please change '
+                    .'your email address again in your user profile and click the link '
+                    .'in the confirmation email as soon as you receive it.');
             $this->render();
             return;
         }
@@ -687,20 +676,6 @@ class UsersController extends AppController
         }
         $this->publish('reviews', $reviews);
 
-        // get user's own and favorite collections, if they allowed that
-        if ($thisuser['User']['display_collections']) {
-            $coll_ids = $this->Collection->getCollectionsByUser($thisuser['User']['id']);
-            $coll = $this->Collection->findAll(array('Collection.id'=>$coll_ids, 'listed'=>1),
-                array('name', 'description', 'uuid', 'nickname', 'application_id'), 'Translation.name');
-            $this->publish('coll', $coll);
-        }
-        if ($thisuser['User']['display_collections_fav']) {
-            $coll_ids = $this->Collection->getSubscriptionsByUser($thisuser['User']['id']);
-            $coll_fav = $this->Collection->findAll(array('Collection.id'=>$coll_ids, 'listed'=>1),
-                array('name', 'description', 'uuid', 'nickname', 'application_id'), 'Translation.name');
-            $this->publish('coll_fav', $coll_fav);
-        }
-
         if (!empty($thisuser['User']['nickname']))
             $name = $thisuser['User']['nickname'];
         else
@@ -738,7 +713,7 @@ class UsersController extends AppController
             }
             
             // password entered correctly?
-            if (!$this->User->checkPassword($deluser, $this->data['User']['password'])) {
+            if (md5($this->data['User']['password']) != $deluser['password']) {
                 $this->set('deleteerror', 'password');
                 $this->data['User']['password'] = ''; // do not post back password
                 return;
diff --git a/site/app/controllers/versions_controller.php b/site/app/controllers/versions_controller.php
index 9e7cbdc..ee52d96 100644
--- a/site/app/controllers/versions_controller.php
+++ b/site/app/controllers/versions_controller.php
@@ -39,30 +39,14 @@
 class VersionsController extends AppController
 {
     var $name = 'Versions';
-    var $uses = array('Addon', 'License', 'Translation', 'Version');
-    var $components = array('Amo', 'Pagination');
+    var $uses = array('Translation', 'Version');
 
     function beforeFilter() {
         // Disable ACLs because this controller is entirely public.
         $this->SimpleAuth->enabled = false;
         $this->SimpleAcl->enabled = false;
     }
-
-    function license($version_id) {
-        $version = $this->Version->findById($version_id);
-        $addon = $this->Addon->getAddon($version['Version']['addon_id']);
-        $license_text = $this->License->getText($version['Version']['license_id']);
-        $this->set('version', $version);
-        $this->publish('addon', $addon);
-        $this->publish('license_text', $license_text);
-
-        // set up view, then render
-        $this->layout = 'amo2009';
-        $this->pageTitle = sprintf(___('versions_license_header_source'),
-            $addon['Translation']['name']['string'], $version['Version']['version'])
-            .' :: '.sprintf(_('addons_home_pagetitle'), APP_PRETTYNAME);
-    }
-
+    
     /**
      * Displays a version's releasenotes in the form requested for updateInfoURLs
      * See http://developer.mozilla.org/en/docs/Extension_Versioning%2C_Update_and_Compatibility
@@ -81,15 +65,15 @@ class VersionsController extends AppController
                 $this->Version->setLang($locale, $this);
             }
         }
-
+        
         $version = $this->Version->findById($version_id, array('Version.releasenotes'), null, -1);
-
+        
         $updateInfo = $version[0]['releasenotes'];
-
+        
         $this->publish('updateInfo', $updateInfo);
         $this->render('update_info', 'ajax');
     }
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/site/app/locale/af/LC_MESSAGES/messages.po b/site/app/locale/af/LC_MESSAGES/messages.po
index 83d68ac..c801644 100644
--- a/site/app/locale/af/LC_MESSAGES/messages.po
+++ b/site/app/locale/af/LC_MESSAGES/messages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 #, fuzzy
 msgid "a_cancel_installation"
 msgstr "Cancel Installation"
@@ -26,184 +26,175 @@ msgstr "Cancel Installation"
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, fuzzy, php-format
 msgid "a_download"
 msgstr "Download Now %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 #, fuzzy
 msgid "a_eula_download"
 msgstr "Accept and Download"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 #, fuzzy
 msgid "a_eula_install"
 msgstr "Accept and Install"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 #, fuzzy
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 #, fuzzy
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, fuzzy, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads_weekly"
 msgstr "weekly downloads"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s add-on"
 msgstr[1] "%1$s add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 #, fuzzy
 msgid "addon_list_perpage"
 msgstr "per page"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 #, fuzzy
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 #, fuzzy
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 #, fuzzy
 msgid "addon_listitem_flag_recommended"
 msgstr "recommended"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 #, fuzzy
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is not available for %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, fuzzy, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Back to %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, fuzzy, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Back to the reviews..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 #, fuzzy
 msgid "addon_review_add_rating_field"
 msgstr "Rating:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 #, fuzzy
 msgid "addon_review_add_review_field"
 msgstr "Review:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 #, fuzzy
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_add_title"
 msgstr "Add a review for %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 #, fuzzy
 msgid "addon_review_add_title_field"
 msgstr "Title/Summary:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 #, fuzzy
 msgid "addon_review_admin_delete"
 msgstr "Delete"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 #, fuzzy
 msgid "addon_review_author_reply_link"
 msgstr "Reply"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 #, fuzzy
 msgid "addon_review_confirm_delete"
 msgstr "Are you sure you wish to delete this review?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 #, fuzzy
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 #, fuzzy
 msgid "addon_review_confirm_yes"
 msgstr "Yes"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 #, fuzzy
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
@@ -214,7 +205,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_edit_title"
 msgstr "Edit Review for %s"
@@ -228,20 +219,20 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 #, fuzzy
 msgid "addon_review_in_moderation"
 msgstr ""
 "Please note: Before your review shows up on the public site it will be "
 "moderated by an editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 #, fuzzy
 msgid "addon_review_in_reply_to"
 msgstr "Developer reply to:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -258,34 +249,48 @@ msgid "addon_review_pagetitle"
 msgstr "Reviews for %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Reply by %1$s on %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 #, fuzzy
 msgid "addon_review_reply_prefix"
 msgstr "Developer Reply:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 #, fuzzy
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
-#, fuzzy
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, fuzzy, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "by %1$s on %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, fuzzy, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "by %1$s on %2$s (rated %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -293,157 +298,104 @@ msgstr "Permanent link to this version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, fuzzy, php-format
 msgid "addons_browse_browse_category"
 msgstr "Browse %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 #, fuzzy
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 #, fuzzy
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
 msgstr "Don't like it"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 #, fuzzy
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 #, fuzzy
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 #, fuzzy
 msgid "addons_display_hate_it"
 msgstr "Hate it"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 #, fuzzy
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 #, fuzzy
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
@@ -453,25 +405,21 @@ msgstr "Like it"
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 #, fuzzy
 msgid "addons_display_love_it"
 msgstr "Love it"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 #, fuzzy
 msgid "addons_display_more_images"
 msgstr "More Images"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -481,21 +429,21 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support for this add-on is provided by the developer at %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -503,22 +451,23 @@ msgstr ""
 "e-mail to %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support for this add-on is provided by the developer at %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 #, fuzzy
 msgid "addons_display_really_like_it"
 msgstr "Really like it"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -527,51 +476,56 @@ msgstr ""
 "resolve your issue."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, fuzzy, php-format
 msgid "addons_display_see_all_addons"
 msgstr "See All %1$s Add-ons"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, fuzzy, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 #, fuzzy
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+#, fuzzy
+msgid "addons_display_version_history"
+msgstr "Complete Version History"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 #, fuzzy
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -581,233 +535,120 @@ msgstr "What do you think?"
 msgid "addons_display_workswith"
 msgstr "Works with:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 #, fuzzy
 msgid "addons_home_by"
 msgstr "by"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 #, fuzzy
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, fuzzy, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
 "a look around and make %1$s your own."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you to customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
+#: views/addons/home.thtml:201
 #, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 #, fuzzy
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, fuzzy, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+#, fuzzy
+msgid "addons_home_popular_header"
+msgstr "Most Popular:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+#, fuzzy
+msgid "addons_home_recommended_header"
+msgstr "We Recommend:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+#, fuzzy
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+#, fuzzy
+msgid "addons_home_view_all"
+msgstr "View all"
+
+#: views/addons/home.thtml:209
 #, fuzzy
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 #, fuzzy
 msgid "addons_home_view_all_popular_title"
 msgstr "View all popular add-ons"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 #, fuzzy
 msgid "addons_home_view_all_recommended_title"
 msgstr "View all recommended add-ons"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 #, fuzzy
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -815,12 +656,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 #, fuzzy
 msgid "addons_install_in_thunderbird"
 msgstr ""
@@ -829,49 +670,46 @@ msgstr ""
 "Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
 "button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 #, fuzzy
 msgid "addons_install_in_thunderbird_title"
 msgstr "How to Install in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 #, fuzzy
 msgid "addons_options_show_experimental"
 msgstr "show experimental add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 #, fuzzy
 msgid "addons_options_submit"
 msgstr "Go"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 #, fuzzy
 msgid "addons_plugins_by"
 msgstr "By"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 #, fuzzy
 msgid "addons_plugins_for_linux"
 msgstr "for Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 #, fuzzy
 msgid "addons_plugins_for_macosx"
 msgstr "for Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 #, fuzzy
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, fuzzy, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -879,12 +717,12 @@ msgstr ""
 "more information about other plugins available for Mozilla-based Browsers, "
 "visit %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 #, fuzzy
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Looking for a plugin not listed here?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 #, fuzzy
 msgid "addons_plugins_main_description"
 msgstr ""
@@ -893,26 +731,26 @@ msgstr ""
 "from extensions, which modify or add to existing functionality."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 #, fuzzy
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 #, fuzzy
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, fuzzy, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -920,46 +758,41 @@ msgstr ""
 "installation can proceed:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, fuzzy, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 #, fuzzy
 msgid "addons_recommended_introduction"
 msgstr ""
 "With so many great add-ons available, there's something for everyone. To get "
 "you started, here's a list of some of the most popular. Enjoy!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 #, fuzzy
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Add-ons"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 #, fuzzy
 msgid "addons_recommended_title"
 msgstr "Recommended Add-ons"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 #, fuzzy
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 #, fuzzy
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
@@ -976,49 +809,48 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Learn how to %1$s at the %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_link"
 msgstr "make your own"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Browse through more search engines at %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 #, fuzzy
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 #, fuzzy
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Special thanks to the Mycroft Project for their work on Firefox Search "
 "Engines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1063,19 +895,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1086,42 +918,30 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 #, fuzzy
 msgid "addons_versions_careful"
 msgstr "Be Careful With Old Versions"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 #, fuzzy
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 #, fuzzy
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, fuzzy, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -1162,150 +982,138 @@ msgstr "Group Admin"
 msgid "admin_group_saved"
 msgstr "The Group has been saved"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 #, fuzzy
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 #, fuzzy
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 #, fuzzy
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 #, fuzzy
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 #, fuzzy
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 #, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 #, fuzzy
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 #, fuzzy
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 #, fuzzy
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 #, fuzzy
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 #, fuzzy
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 #, fuzzy
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 #, fuzzy
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 #, fuzzy
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 #, fuzzy
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 #, fuzzy
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 #, fuzzy
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 #, fuzzy
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 #, fuzzy
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 #, fuzzy
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 #, fuzzy
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 #, fuzzy
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 #, fuzzy
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 #, fuzzy
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 #, fuzzy
 msgid "app_compat_older_firefox_only"
 msgstr "This add-on is for older versions of Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1313,348 +1121,46 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 #, fuzzy
 msgid "app_compat_try_old_version"
 msgstr "An <a href=\"%1$s\">older version</a> may work"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 #, fuzzy
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1665,864 +1171,53 @@ msgid "categories_current_title"
 msgstr "Current Category"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 #, fuzzy
 msgid "categories_header"
 msgstr "Categories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 #, fuzzy
 msgid "categories_header_title"
 msgstr "Choose a category"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, fuzzy, php-format
-msgid "category_extra_see_all"
-msgstr "See All %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
+#: views/addons/category_landing.thtml:68
 #, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+msgid "category_extra_allrecommended"
+msgstr "See All Recommended Add-ons"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
+#: views/addons/category_landing.thtml:59
 #, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+msgid "category_extra_highestrated"
+msgstr "Highest Rated First"
 
-#: controllers/collections_controller.php:1065
+#: views/addons/category_landing.thtml:60
 #, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+msgid "category_extra_lastupdated"
+msgstr "Last Updated First"
 
-#: controllers/collections_controller.php:1051
+#: views/addons/category_landing.thtml:58
 #, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+msgid "category_extra_mostpopular"
+msgstr "Most Popular First"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, fuzzy, php-format
+msgid "category_extra_see_all"
+msgstr "See All %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2530,71 +1225,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2603,26 +1298,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2630,115 +1325,115 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 #, fuzzy
 msgid "credits_intro"
 msgstr ""
 "Mozilla would like to thank the following people for their contributions to "
 "the addons.mozilla.org project over the years:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 #, fuzzy
 msgid "credits_section_developers"
 msgstr "Developers"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 #, fuzzy
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 #, fuzzy
 msgid "credits_section_localizers"
 msgstr "Localizers"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 #, fuzzy
 msgid "credits_section_other_contributors"
 msgstr "Other Contributors"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 #, fuzzy
 msgid "credits_section_past_developers"
 msgstr "Past Developers"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 #, fuzzy
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 #, fuzzy
 msgid "credits_software_famfamfam"
 msgstr ""
@@ -2747,7 +1442,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2758,20 +1453,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 #, fuzzy
 msgid "date"
 msgstr "%B %e, %Y"
@@ -2812,25 +1504,25 @@ msgstr "Statistics Dashboard"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2840,6 +1532,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detect)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, fuzzy, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 #, fuzzy
 msgid "devcp_additem_linktitle_opensin_newwindow"
@@ -2885,77 +1590,156 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
+#: controllers/developers_controller.php:2746
+#, fuzzy
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+#, fuzzy
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+#: controllers/developers_controller.php:2741
+#, fuzzy
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+#, fuzzy
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+#, fuzzy
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+#, fuzzy
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+#, fuzzy
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 #, fuzzy
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+#, fuzzy
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+#, fuzzy
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+#: controllers/developers_controller.php:2540
+#, fuzzy
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+#, fuzzy
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+#, fuzzy
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+#, fuzzy
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+#: controllers/developers_controller.php:2814
+#, fuzzy
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2991,7 +1775,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -3001,6 +1785,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -3012,13 +1801,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -3028,7 +1817,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -3038,12 +1827,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -3052,14 +1841,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3138,13 +1927,138 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, fuzzy, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+#: views/developers/add_step5.thtml:76
+#, fuzzy
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+#: views/developers/add_step5.thtml:76
+#, fuzzy
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+#: views/developers/add_step5.thtml:57
+#, fuzzy
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+#: views/developers/add_step5.thtml:63
+#, fuzzy
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+#: views/developers/add_step5.thtml:60
+#, fuzzy
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+#: views/developers/add_step5.thtml:51
+#, fuzzy
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+#: views/developers/add_step5.thtml:54
+#, fuzzy
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+#, fuzzy
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+#: controllers/developers_controller.php:2460
+#, fuzzy
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, fuzzy, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+#: views/developers/add_step5.thtml:71
+#, fuzzy
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, fuzzy, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+#: views/developers/author_lookup.thtml:44
+#, fuzzy
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#, fuzzy
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#, fuzzy
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+#, fuzzy
+msgid "devcp_button_next"
+msgstr "Next"
+
+#: views/developers/add_step2.thtml:66
+#, fuzzy
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+#: controllers/developers_controller.php:1487
+#, fuzzy
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3221,37 +2135,211 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+#, fuzzy
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_author"
+msgstr "Author"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+#: views/developers/details.thtml:73
+#, fuzzy
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+#, fuzzy
+msgid "devcp_details_category"
+msgstr "Category"
+
+#: views/developers/details.thtml:74
+#, fuzzy
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+#, fuzzy
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+#: views/developers/details.thtml:69
+#, fuzzy
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+#, fuzzy
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+#, fuzzy
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+#: views/developers/details.thtml:102
+#, fuzzy
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+#: views/developers/details.thtml:79
+#, fuzzy
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+#, fuzzy
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+#, fuzzy
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+#: views/developers/details.thtml:109
+#, fuzzy
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+#: views/developers/details.thtml:117
+#, fuzzy
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+#: views/developers/details.thtml:151
+#, fuzzy
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+#, fuzzy
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, fuzzy, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+#, fuzzy
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+#: views/developers/disable.thtml:64
+#, fuzzy
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+#, fuzzy
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+#, fuzzy
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+#, fuzzy
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, fuzzy, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+#, fuzzy
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+#, fuzzy
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+#, fuzzy
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, fuzzy, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3305,62 +2393,77 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+#, fuzzy
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+#: views/developers/edit.thtml:69
+#, fuzzy
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/edit.thtml:56
+#, fuzzy
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3373,30 +2476,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3475,22 +2578,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3499,12 +2602,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3512,12 +2615,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3526,24 +2629,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3551,7 +2654,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3576,47 +2679,123 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+#, fuzzy
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+#, fuzzy
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+#: views/developers/edit.thtml:99
+#, fuzzy
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+#: views/developers/edit.thtml:96
+#, fuzzy
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+#: views/developers/edit.thtml:131
+#, fuzzy
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/edit.thtml:75
+#, fuzzy
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+#, fuzzy
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 #, fuzzy
 msgid "devcp_edit_label_externalsoftware"
 msgstr "This add-on requires external software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+#, fuzzy
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+#: views/developers/edit.thtml:104
+#, fuzzy
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+#: views/developers/edit.thtml:92
+#, fuzzy
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 #, fuzzy
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 #, fuzzy
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 #, fuzzy
 msgid "devcp_edit_label_sitespecific"
 msgstr "This is a site-specific add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 #, fuzzy
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+#, fuzzy
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3624,12 +2803,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3637,60 +2816,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3699,32 +2878,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3732,22 +2911,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3755,12 +2934,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3768,39 +2947,51 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+#, fuzzy
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+#: views/developers/edit.thtml:121
+#, fuzzy
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3888,8 +3079,51 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Pending Updates (%s)"
 msgstr[1] "Pending Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+#, fuzzy
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, fuzzy, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+#, fuzzy
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+#: views/developers/editversion.thtml:75
+#, fuzzy
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+#: views/developers/editversion.thtml:69
+#, fuzzy
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+#: views/developers/editversion.thtml:117
+#, fuzzy
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/editversion.thtml:122
+#, fuzzy
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
@@ -3897,6 +3131,25 @@ msgstr[1] "Pending Updates (%s)"
 msgid "devcp_error_addon_access_denied"
 msgstr "You do not have access to that add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+#, fuzzy
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+#: controllers/developers_controller.php:1992
+#, fuzzy
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3911,10 +3164,10 @@ msgstr "Please see %s for reference."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: views/developers/addon_edit_authors.thtml:76
+#: controllers/developers_controller.php:2098
 #, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3933,6 +3186,11 @@ msgstr ""
 "That file extension (%s) is not allowed for the selected add-on type. Please "
 "use one of the following: %s"
 
+#: controllers/developers_controller.php:1739
+#, fuzzy
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
 #: controllers/components/developers.php:64
 #, fuzzy
 msgid "devcp_error_five_categories"
@@ -3972,7 +3230,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, fuzzy, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 #, fuzzy
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
@@ -3982,7 +3247,7 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 #, fuzzy
 msgid "devcp_error_invalid_addontype"
 msgstr "Please select a valid add-on type."
@@ -4057,6 +3322,21 @@ msgstr "No ID could be found for this add-on in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
+#: controllers/developers_controller.php:2803
+#, fuzzy
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+#: controllers/developers_controller.php:2797
+#, fuzzy
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+#: controllers/developers_controller.php:2789
+#, fuzzy
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
 #: controllers/components/developers.php:59
 #, fuzzy
 msgid "devcp_error_one_category"
@@ -4076,6 +3356,18 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+#, fuzzy
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+#: controllers/developers_controller.php:1781
+#, fuzzy
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
 #: controllers/components/developers.php:511
 #, fuzzy
 msgid "devcp_error_updatekey"
@@ -4090,99 +3382,345 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+#, fuzzy
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+#, fuzzy
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+#: views/developers/add_step2.thtml:84
+#, fuzzy
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+#: views/developers/add_step2.thtml:107
+#, fuzzy
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+#: views/developers/add_step2.thtml:105
+#, fuzzy
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: views/developers/add_step2.thtml:132
+#, fuzzy
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+#: views/developers/add_step2.thtml:76
+#, fuzzy
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+#: views/developers/add_step1.thtml:63
+#, fuzzy
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+#: views/developers/add_step2.thtml:127
+#, fuzzy
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+#: views/developers/add_step1.thtml:72
+#, fuzzy
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+#: views/developers/add_step1.thtml:80
+#, fuzzy
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+#: views/developers/add_step1.thtml:89
+#, fuzzy
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+#: views/developers/add_step1.thtml:59
+#, fuzzy
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+#: views/developers/add_step2.thtml:145
+#, fuzzy
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/add_step2.thtml:97
+#, fuzzy
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/add_step2.thtml:79
+#, fuzzy
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+#, fuzzy
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+#, fuzzy
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/add_step2.thtml:130
+#, fuzzy
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+#, fuzzy
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+#: views/developers/add_step2.thtml:157
+#, fuzzy
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+#: views/developers/add_step3.thtml:70
+#, fuzzy
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+#: views/developers/add_step2.thtml:110
+#, fuzzy
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+#, fuzzy
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+#: views/developers/add_step2.thtml:74
+#, fuzzy
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+#, fuzzy
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+#: views/developers/add_step2.thtml:149
+#, fuzzy
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+#: views/developers/add_step2.thtml:140
+#, fuzzy
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+#: views/developers/add_step2.thtml:153
+#, fuzzy
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+#: views/developers/add_step2.thtml:125
+#, fuzzy
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+#: views/developers/add_step2.thtml:115
+#, fuzzy
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+#, fuzzy
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+#, fuzzy
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+#: views/developers/add_step3.thtml:66
+#, fuzzy
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+#, fuzzy
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+#: views/developers/add_step3.thtml:89
+#, fuzzy
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+#: views/developers/add_step3.thtml:100
+#, fuzzy
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/add_step3.thtml:114
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+#: views/developers/add_step3.thtml:119
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, fuzzy, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+#: views/developers/add_step1.thtml:44
+#, fuzzy
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+#: views/developers/add_step1.thtml:44
+#, fuzzy
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+#: views/developers/add_step2.thtml:43
+#, fuzzy
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+#: views/developers/add_step2.thtml:43
+#, fuzzy
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+#: views/developers/add_step3.thtml:43
+#, fuzzy
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+#: views/developers/add_step3.thtml:43
+#, fuzzy
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+#: views/developers/add_step4.thtml:43
+#, fuzzy
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+#: views/developers/add_step4.thtml:43
+#, fuzzy
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+#: views/developers/add_step5.thtml:43
+#, fuzzy
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+#: views/developers/add_step5.thtml:43
+#, fuzzy
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+#: views/developers/index.thtml:48
+#, fuzzy
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 #, fuzzy
 msgid "devcp_localebox_header_localizedfields"
@@ -4199,13 +3737,13 @@ msgstr ""
 "to the selected default locale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 #, fuzzy
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Tools"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 #, fuzzy
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Tools"
@@ -4216,32 +3754,32 @@ msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 #, fuzzy
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Back to Main"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 #, fuzzy
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 #, fuzzy
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submit Add-on"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 #, fuzzy
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4253,26 +3791,38 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+#, fuzzy
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, fuzzy, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, fuzzy, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4287,6 +3837,18 @@ msgstr ""
 "Removing this as the default preview will cause another preview to "
 "automatically become the default preview."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, fuzzy, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 #, fuzzy
@@ -4295,14 +3857,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4337,46 +3899,46 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4384,7 +3946,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4404,7 +3966,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4414,7 +3976,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4429,27 +3991,27 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4477,18 +4039,28 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+#, fuzzy
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+#: controllers/developers_controller.php:2717
+#, fuzzy
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 #, fuzzy
 msgid "devcp_review_agreement_please"
 msgstr ""
@@ -4501,7 +4073,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4513,6 +4085,11 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+#, fuzzy
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4616,18 +4193,71 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+#, fuzzy
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+#, fuzzy
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+#, fuzzy
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+#: views/developers/index.thtml:91
+#, fuzzy
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+#: views/developers/index.thtml:75
+#, fuzzy
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+#: views/developers/index.thtml:74
+#, fuzzy
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 #, fuzzy
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, fuzzy, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+#: views/developers/index.thtml:102
+#, fuzzy
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, fuzzy, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+#: views/developers/add_step5.thtml:68
+#, fuzzy
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4635,44 +4265,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4682,7 +4312,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4690,64 +4320,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4756,7 +4386,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4768,33 +4398,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4807,29 +4432,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4840,12 +4465,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4869,23 +4494,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4894,7 +4514,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4903,14 +4523,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4920,7 +4540,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4928,7 +4548,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4936,22 +4556,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4970,30 +4584,35 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, fuzzy, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, fuzzy
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
 #, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+#, fuzzy
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -5062,34 +4681,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -5097,49 +4716,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -5149,59 +4763,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5210,26 +4817,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5272,7 +4879,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
@@ -5326,7 +4933,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -5402,7 +5009,7 @@ msgstr "View entries between %s and %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -5432,28 +5039,28 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 #, fuzzy
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 #, fuzzy
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 #, fuzzy
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 #, fuzzy
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 #, fuzzy
 msgid "editors_external_software"
 msgstr "External Software"
@@ -5468,46 +5075,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 #, fuzzy
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 #, fuzzy
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 #, fuzzy
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 #, fuzzy
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 #, fuzzy
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 #, fuzzy
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -5522,186 +5129,123 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 #, fuzzy
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 #, fuzzy
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 #, fuzzy
 msgid "editors_notice_none_found"
 msgstr "There are currently no add-ons of this type to review."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 #, fuzzy
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 #, fuzzy
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 #, fuzzy
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 #, fuzzy
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, fuzzy, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 #, fuzzy
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, fuzzy, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 #, fuzzy
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 #, fuzzy
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 #, fuzzy
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 #, fuzzy
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 #, fuzzy
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 #, fuzzy
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 #, fuzzy
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 #, fuzzy
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5709,7 +5253,7 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 #, fuzzy
 msgid "editors_review_details_nominated_public"
 msgstr ""
@@ -5717,26 +5261,26 @@ msgstr ""
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 #, fuzzy
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 #, fuzzy
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public add-on to appear on the "
 "public side."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 #, fuzzy
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public add-on to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 #, fuzzy
 msgid "editors_review_details_superreview"
 msgstr ""
@@ -5744,88 +5288,88 @@ msgstr ""
 "other concerns that an administrator should look into, enter your comments "
 "in the area below. They will be sent to administrators, not the author."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 #, fuzzy
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 #, fuzzy
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 #, fuzzy
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 #, fuzzy
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 #, fuzzy
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 #, fuzzy
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 #, fuzzy
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 #, fuzzy
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 #, fuzzy
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 #, fuzzy
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 #, fuzzy
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, fuzzy, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 #, fuzzy
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 #, fuzzy
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 #, fuzzy
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
@@ -5859,7 +5403,7 @@ msgstr "Nomination Approved/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 #, fuzzy
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
@@ -5891,109 +5435,96 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 #, fuzzy
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 #, fuzzy
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 #, fuzzy
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 #, fuzzy
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 #, fuzzy
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 #, fuzzy
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 #, fuzzy
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 #, fuzzy
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 #, fuzzy
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 #, fuzzy
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 #, fuzzy
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 #, fuzzy
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 #, fuzzy
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 #, fuzzy
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
@@ -6023,7 +5554,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 #, fuzzy
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
@@ -6038,89 +5569,101 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 #, fuzzy
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+#, fuzzy
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+#: controllers/editors_controller.php:232
+#, fuzzy
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+#: controllers/editors_controller.php:470
 #, fuzzy
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 #, fuzzy
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 #, fuzzy
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 #, fuzzy
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 #, fuzzy
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+#, fuzzy
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+#: views/editors/queue.thtml:81
+#, fuzzy
+msgid "editors_th_age"
+msgstr "Age"
+
+#: views/editors/queue.thtml:56
+#, fuzzy
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 #, fuzzy
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
+#: views/editors/queue.thtml:55
 #, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
+#: views/editors/queue.thtml:57
 #, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, fuzzy, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, fuzzy, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, fuzzy, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 #, fuzzy
 msgid "error_access_denied"
 msgstr "Access Denied"
@@ -6130,19 +5673,17 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -6151,14 +5692,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 #, fuzzy
 msgid "error_addon_notfound"
 msgstr "Add-on not found!"
@@ -6173,27 +5711,27 @@ msgstr "This add-on is not viewable here."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 #, fuzzy
 msgid "error_browse_no_addons"
 msgstr "No add-ons in this category!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 #, fuzzy
 msgid "error_email_invalid"
 msgstr "This is not a valid email address."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 #, fuzzy
 msgid "error_field_required"
 msgstr "This field must not be empty."
@@ -6201,32 +5739,36 @@ msgstr "This field must not be empty."
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 #, fuzzy
 msgid "error_file_notfound"
 msgstr "File not found!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, fuzzy, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 #, fuzzy
 msgid "error_formerrors"
 msgstr "There are errors in this form. Please correct them and resubmit."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 #, fuzzy
 msgid "error_invalid_url"
 msgstr ""
@@ -6235,48 +5777,37 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, fuzzy, php-format
 msgid "error_missing_argument"
 msgstr "Missing argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, fuzzy
+msgid "error_notice"
+msgstr "Notice"
+
 #: controllers/previews_controller.php:200
 #, fuzzy
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -6286,27 +5817,27 @@ msgstr "You must select a rating."
 msgid "error_user_already_confirmed"
 msgstr "This user account is already confirmed."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 #, fuzzy
 msgid "error_user_badconfirmationcode"
 msgstr "Invalid confirmation code!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 #, fuzzy
 msgid "error_user_confirmpw_nomatch"
 msgstr "The passwords did not match."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 #, fuzzy
 msgid "error_user_email_notunique"
 msgstr "This email address is already taken by another user."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6314,24 +5845,15 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 #, fuzzy
 msgid "error_user_nickname_notunique"
 msgstr "This nickname is already taken."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 #, fuzzy
 msgid "error_user_notfound"
 msgstr "User not found!"
@@ -6342,46 +5864,43 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "Please confirm your user account first with the code you received by email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 #, fuzzy
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 #, fuzzy
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 #, fuzzy
 msgid "error_wrong_password"
 msgstr "Wrong password entered!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 #, fuzzy
 msgid "feature_learnmore"
 msgstr "Learn more"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, fuzzy, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s review"
 msgstr[1] "%1$s reviews"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 #, fuzzy
 msgid "feature_view_more_from_category"
 msgstr "View more from"
@@ -6426,46 +5945,45 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 #, fuzzy
 msgid "footer_credits"
 msgstr "Credits"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 #, fuzzy
 msgid "footer_disclaimer"
 msgstr ""
@@ -6474,116 +5992,110 @@ msgstr ""
 "to. Any questions, complaints or claims regarding the applications must be "
 "directed to the appropriate software vendor."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 #, fuzzy
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Go"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 #, fuzzy
 msgid "footer_legal_notices"
 msgstr "Legal Notices"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 #, fuzzy
 msgid "footer_other_languages"
 msgstr "Other languages:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 #, fuzzy
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+#, fuzzy
+msgid "forum_save"
+msgstr "Save"
+
+#: models/addontype.php:89
 #, fuzzy
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 #, fuzzy
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 #, fuzzy
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Add-on)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 #, fuzzy
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 #, fuzzy
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 #, fuzzy
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 #, fuzzy
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 #, fuzzy
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, fuzzy, php-format
 msgid "header_home_tooltip"
 msgstr "Return to the %1$s Add-ons homepage"
@@ -6593,102 +6105,44 @@ msgstr "Return to the %1$s Add-ons homepage"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 #, fuzzy
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 #, fuzzy
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 #, fuzzy
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 #, fuzzy
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 #, fuzzy
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 #, fuzzy
 msgid "header_navlink_login"
 msgstr "Log in"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 #, fuzzy
 msgid "header_navlink_logout"
 msgstr "Log out"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 #, fuzzy
 msgid "header_navlink_myaccount"
 msgstr "My Account"
@@ -6698,74 +6152,51 @@ msgstr "My Account"
 msgid "header_navlink_register"
 msgstr "Register"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, fuzzy, php-format
 msgid "img_preview_of"
 msgstr "Preview Image of %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 #, fuzzy
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2"
 "$s\">Why</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, fuzzy, php-format
 msgid "install_button_text"
 msgstr "Add to %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, fuzzy, php-format
 msgid "install_button_title"
 msgstr "Add %1$s to %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 #, fuzzy
 msgid "install_error_addon_not_found"
 msgstr "This add-on is not available."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 #, fuzzy
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
@@ -6780,8 +6211,8 @@ msgstr "Download Dictionary"
 msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -6796,87 +6227,43 @@ msgstr "Install Dictionary"
 msgid "langtools_install_langpack"
 msgstr "Install Language Pack"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 #, fuzzy
 msgid "langtools_tableheader_dictionary"
 msgstr "Dictionary"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 #, fuzzy
 msgid "langtools_tableheader_langpack"
 msgstr "Language Pack"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 #, fuzzy
 msgid "langtools_tableheader_language"
 msgstr "Language"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 #, fuzzy
 msgid "list_sortby_date"
 msgstr "Date"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 #, fuzzy
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 #, fuzzy
 msgid "list_sortby_name"
 msgstr "Add-on Name"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 #, fuzzy
 msgid "list_sortby_rating"
@@ -6907,23 +6294,31 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 #, fuzzy
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+#, fuzzy
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 #, fuzzy
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 #, fuzzy
 msgid "other_users"
 msgstr "others"
@@ -6933,35 +6328,14 @@ msgstr "others"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6998,17 +6372,17 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 #, fuzzy
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 #, fuzzy
 msgid "pages_appversions_header"
 msgstr "Valid Application Versions"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 #, fuzzy
 msgid "pages_appversions_intro"
 msgstr ""
@@ -7017,7 +6391,7 @@ msgstr ""
 "below are allowed for these applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -7026,17 +6400,21 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
 msgstr "here"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 #, fuzzy
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 #, fuzzy
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
@@ -7046,6 +6424,12 @@ msgstr "Sandbox Information Page"
 msgid "pagination_next_page"
 msgstr "next"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, fuzzy, php-format
+msgid "pagination_page_number_title"
+msgstr "This is page %1$s of %2$s"
+
 #: views/elements/pagination.thtml:52
 #, fuzzy
 msgid "pagination_previous_page"
@@ -7086,17 +6470,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -7106,7 +6490,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -7126,8 +6510,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -7145,7 +6529,7 @@ msgstr ""
 "editor review."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -7163,149 +6547,119 @@ msgstr ""
 "Guidelines</a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, fuzzy, php-format
 msgid "reviews_header"
 msgstr "Reviews for %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 #, fuzzy
 msgid "rss_featuredaddons"
 msgstr "Featured Add-ons"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 #, fuzzy
 msgid "rss_newestaddons"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 #, fuzzy
 msgid "search_disabled"
 msgstr "Search is currently disabled. Please try again later."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 #, fuzzy
 msgid "search_form_all_addons"
 msgstr "all add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 #, fuzzy
 msgid "search_form_default_text"
 msgstr "search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 #, fuzzy
 msgid "search_form_within"
 msgstr "within"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 #, fuzzy
 msgid "search_landing_all_search_engines"
 msgstr "All Search Engines"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 #, fuzzy
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, fuzzy, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matching add-on"
+msgstr[1] "%s matching add-ons"
+
+#: views/search/index.thtml:49
 #, fuzzy
 msgid "search_nothing_found"
 msgstr "No results found."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 #, fuzzy
 msgid "search_pagetitle"
 msgstr "Search Add-ons"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 #, fuzzy
 msgid "search_rss_description"
 msgstr "Search results feed"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, fuzzy, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 #, fuzzy
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 #, fuzzy
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 #, fuzzy
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Welcome, %s"
@@ -7315,7 +6669,7 @@ msgstr "Welcome, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dictionary"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 #, fuzzy
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
@@ -7325,7 +6679,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "I am looking for a:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 #, fuzzy
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
@@ -7335,7 +6689,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Search Plugin"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 #, fuzzy
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
@@ -7345,25 +6699,26 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Theme"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, fuzzy, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 #, fuzzy
 msgid "stars_not_yet_rated"
 msgstr "Not yet rated"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Rated %s out of 5 stars"
@@ -7406,13 +6761,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, fuzzy, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s created"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
@@ -7427,222 +6782,222 @@ msgstr "Close"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 #, fuzzy
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 #, fuzzy
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 #, fuzzy
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 #, fuzzy
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 #, fuzzy
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 #, fuzzy
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 #, fuzzy
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 #, fuzzy
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 #, fuzzy
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 #, fuzzy
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 #, fuzzy
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 #, fuzzy
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 #, fuzzy
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 #, fuzzy
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
@@ -7686,7 +7041,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #, fuzzy
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
@@ -7721,22 +7076,27 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+#, fuzzy
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 #, fuzzy
 msgid "statistics_settings_access_description"
 msgstr ""
@@ -7744,102 +7104,102 @@ msgstr ""
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 #, fuzzy
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 #, fuzzy
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 #, fuzzy
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, fuzzy, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 #, fuzzy
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 #, fuzzy
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 #, fuzzy
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 #, fuzzy
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 #, fuzzy
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -7854,7 +7214,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
@@ -7875,7 +7235,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
@@ -7905,56 +7265,39 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 #, fuzzy
 msgid "themes_landing_all_themes"
 msgstr "All Themes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 #, fuzzy
 msgid "themes_landing_browse_themes"
 msgstr "Browse Themes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 #, fuzzy
 msgid "user_change_password"
 msgstr "Change password"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 #, fuzzy
 msgid "user_confirmationcode_resent"
 msgstr "The confirmation code was resent!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7962,23 +7305,23 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7988,60 +7331,60 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -8049,7 +7392,7 @@ msgstr ""
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -8057,18 +7400,18 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -8076,7 +7419,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -8104,8 +7447,9 @@ msgstr ""
 "-- %2$s Add-ons Staff"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -8145,126 +7489,103 @@ msgstr ""
 "Thanks,\n"
 "-- %2$s Add-ons Staff"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, fuzzy, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reset your %s Add-ons password"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 #, fuzzy
 msgid "user_form_confirmpassword"
 msgstr "Confirm password"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, fuzzy, php-format
 msgid "user_form_editprofile"
 msgstr "Edit user profile for %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 #, fuzzy
 msgid "user_form_email"
 msgstr "Email address"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 #, fuzzy
 msgid "user_form_firstname"
 msgstr "First name"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 #, fuzzy
 msgid "user_form_hideemail"
 msgstr "Hide email address"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 #, fuzzy
 msgid "user_form_homepage"
 msgstr "Website URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 #, fuzzy
 msgid "user_form_lastname"
 msgstr "Last name"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 #, fuzzy
 msgid "user_form_login"
 msgstr "User Login"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 #, fuzzy
 msgid "user_form_newpassword"
 msgstr "New password"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 #, fuzzy
 msgid "user_form_nickname"
 msgstr "Nickname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 #, fuzzy
 msgid "user_form_oldpassword"
 msgstr "Old password"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 #, fuzzy
 msgid "user_form_password"
 msgstr "Password"
@@ -8274,77 +7595,77 @@ msgstr "Password"
 msgid "user_form_registration"
 msgstr "New User Registration"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 #, fuzzy
 msgid "user_form_showsandbox"
 msgstr "Show sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 #, fuzzy
 msgid "user_form_submit_edit"
 msgstr "Save"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 #, fuzzy
 msgid "user_form_submit_login"
 msgstr "Log in"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 #, fuzzy
 msgid "user_form_submit_register"
 msgstr "Register"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, fuzzy, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons user since"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 #, fuzzy
 msgid "user_login_register_link"
 msgstr "Create a new user account"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 #, fuzzy
 msgid "user_profile_edit_error"
 msgstr ""
 "There were errors in the changes you made. Please correct them and resubmit."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 #, fuzzy
 msgid "user_profile_saved"
 msgstr "Profile updated."
@@ -8359,17 +7680,17 @@ msgstr "Password reset for %s"
 msgid "user_pwreset_header"
 msgstr "Password Reset"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 #, fuzzy
 msgid "user_pwreset_link"
 msgstr "Forgot your password?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 #, fuzzy
 msgid "user_pwreset_link_sent"
 msgstr "The password reset link was sent to your email address."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 #, fuzzy
 msgid "user_pwreset_okay"
 msgstr "Password successfully reset."
@@ -8384,7 +7705,7 @@ msgstr "Submit password change"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Send password reset link"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, fuzzy, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -8398,7 +7719,7 @@ msgstr ""
 "You have to click it before you can log into %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, fuzzy, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -8411,25 +7732,11 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "resend the confirmation message"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 #, fuzzy
 msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, fuzzy, php-format
@@ -8440,32 +7747,22 @@ msgstr ""
 "us %1$s to your email address mentioned above."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, fuzzy, php-format
 msgid "user_register_welcome"
 msgstr "Thanks for registering and welcome to %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -8475,74 +7772,58 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Successfully verified!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 #, fuzzy
 msgid "users_edit_pagetitle"
 msgstr "User Account Editing"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, fuzzy, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons by %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 #, fuzzy
 msgid "users_info_author_name"
 msgstr "Name"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 #, fuzzy
 msgid "users_info_author_profile"
 msgstr "User Profile"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 #, fuzzy
 msgid "users_info_email"
 msgstr "Email address"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 #, fuzzy
 msgid "users_info_homepage"
 msgstr "Homepage"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 #, fuzzy
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, fuzzy, php-format
 msgid "users_info_pagetitle"
 msgstr "User Info for %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 #, fuzzy
 msgid "users_login_pagetitle"
 msgstr "User Login"
@@ -8576,896 +7857,3 @@ msgstr "User Password Reset"
 #, fuzzy
 msgid "users_register_pagetitle"
 msgstr "New User Registration"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
-#, fuzzy
-#~ msgid "addons_display_version_history"
-#~ msgstr "Complete Version History"
-
-#, fuzzy
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Newest:"
-
-#, fuzzy
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Most Popular:"
-
-#, fuzzy
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "We Recommend:"
-
-#, fuzzy
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Recently Updated:"
-
-#, fuzzy
-#~ msgid "addons_home_view_all"
-#~ msgstr "View all"
-
-#, fuzzy
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "See All Recommended Add-ons"
-
-#, fuzzy
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Highest Rated First"
-
-#, fuzzy
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Last Updated First"
-
-#, fuzzy
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Most Popular First"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#, fuzzy
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "This version of your add-on does not claim compatibility with Firefox %1"
-#~ "$s. Mozilla is expecting the next version of Firefox to be released soon, "
-#~ "so please test your add-on in the new version and update compatibility "
-#~ "information. You can find out more about this <a href=\"%2$s\">here</a>. "
-#~ "This is only a notice and you may continue to submit this version to "
-#~ "addons.mozilla.org."
-
-#, fuzzy
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Add-on disabled successfully"
-
-#, fuzzy
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Edit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Add-on enabled successfully"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Add-on Description"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Add-on Homepage"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Add-on Name"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Privacy Policy"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Add-on Summary"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Version Notes"
-
-#, fuzzy
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nominate Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Add-on nominated successfully!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visit the %1$s page to make changes to your submission, or %2$s to return "
-#~ "to the Developer Tools."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "click here"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Edit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox while it awaits review from "
-#~ "sandbox testers and a Mozilla Add-ons editor. You will be notified by e-"
-#~ "mail when action has been taken."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "You can read more about the Sandbox Review System %s."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "here"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox for use by experienced users. "
-#~ "In order for it to be shown on the public site, you must %s your add-on "
-#~ "and undergo a review process."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nominate"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Your add-on submission has been completed successfully."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Because your add-on is trusted, this version has automatically been "
-#~ "approved for the public area."
-
-#, fuzzy
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Submit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Add-on updated successfully"
-
-#, fuzzy
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "You may wish to %s to increase interest in your add-on."
-
-#, fuzzy
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "upload a preview"
-
-#, fuzzy
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "No author found [%s]"
-
-#, fuzzy
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancel"
-
-#, fuzzy
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Are you sure you wish to cancel your submission?"
-
-#, fuzzy
-#~ msgid "devcp_button_next"
-#~ msgstr "Next"
-
-#, fuzzy
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Change add-on type:"
-
-#, fuzzy
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Developer Comments updated."
-
-#, fuzzy
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Add Preview"
-
-#, fuzzy
-#~ msgid "devcp_details_author"
-#~ msgstr "Author"
-
-#, fuzzy
-#~ msgid "devcp_details_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_details_category"
-#~ msgstr "Category"
-
-#, fuzzy
-#~ msgid "devcp_details_description"
-#~ msgstr "Description"
-
-#, fuzzy
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Disabled"
-
-#, fuzzy
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#, fuzzy
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Details"
-
-#, fuzzy
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Developer Comments"
-
-#, fuzzy
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Previews"
-
-#, fuzzy
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versions"
-
-#, fuzzy
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Homepage"
-
-#, fuzzy
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "No caption"
-
-#, fuzzy
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "No previews found."
-
-#, fuzzy
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "No support email provided by developer."
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "No support url provided by developer."
-
-#, fuzzy
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Trusted"
-
-#, fuzzy
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "No versions found."
-
-#, fuzzy
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancel and go back"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Yes, disable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Are you sure you want to disable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Disabling this add-on will hide it from searches and listings. It will "
-#~ "not be downloadable from the website and will not be returned in client "
-#~ "update checks. The add-on will effectively be deleted, although you will "
-#~ "be able to return here and re-enable it at your convenience."
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Disable %s"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Yes, enable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Are you sure you want to enable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Enabling this add-on will cause it to once again appear in searches and "
-#~ "listings. It will be downloadable both from the website and from client "
-#~ "update checks."
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Enable %s"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Add Author"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Author's Email Address"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#, fuzzy
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Add Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Change Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Only clear the existing icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "New Icon File"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "short additional info (such as a local dialect name)"
-
-#, fuzzy
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple "
-#~ "locale name</a>, such as 'en-US'"
-
-#, fuzzy
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Checked files will be deleted."
-
-#, fuzzy
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#, fuzzy
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Files"
-
-#, fuzzy
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Target Applications"
-
-#, fuzzy
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "No files."
-
-#, fuzzy
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#, fuzzy
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Summaries are limited to a maximum of 250 characters.\n"
-#~ "(You entered %s)"
-
-#, fuzzy
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "The name for your add-on already exists in the database. Please make sure "
-#~ "that: <br /><li>Your GUIDs match. The most common cause for this error is "
-#~ "mismatched GUIDs.</li><li>You do not have a duplicate entry in the "
-#~ "database. If you do, you should update that entry or delete it and try "
-#~ "again.</li>"
-
-#, fuzzy
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Please describe the changes made in this add-on update."
-
-#, fuzzy
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Not all file GUIDs match"
-
-#, fuzzy
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "An identical version (%s) already exists for this add-on and platform."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "You must supply the requested details for nomination."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "You cannot nominate a pre-release add-on."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "You can only nominate add-ons currently in the sandbox."
-
-#, fuzzy
-#~ msgid "devcp_error_saving"
-#~ msgstr "An error occurred trying to save your data."
-
-#, fuzzy
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "You do not have permission to update this add-on."
-
-#, fuzzy
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Add Another Platform File"
-
-#, fuzzy
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Add Author"
-
-#, fuzzy
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Categories for your new add-on type will be available in the next step."
-
-#, fuzzy
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#, fuzzy
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Please enter a description of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Please enter the name of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Please select the type of add-on you are submitting."
-
-#, fuzzy
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Please enter a summary of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Add-on File"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Add-on File 2"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Add-on File 3"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Add-on Type"
-
-#, fuzzy
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#, fuzzy
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Author's Email Address"
-
-#, fuzzy
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#, fuzzy
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Description"
-
-#, fuzzy
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "End-User License Agreement (EULA)"
-
-#, fuzzy
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "This add-on requires external software"
-
-#, fuzzy
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Files"
-
-#, fuzzy
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Homepage"
-
-#, fuzzy
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Icon File"
-
-#, fuzzy
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Name"
-
-#, fuzzy
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Supported Platforms"
-
-#, fuzzy
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "This is a pre-release"
-
-#, fuzzy
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Privacy Policy"
-
-#, fuzzy
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "This is a site-specific add-on"
-
-#, fuzzy
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Summary"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Target Applications"
-
-#, fuzzy
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Version"
-
-#, fuzzy
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Version Notes"
-
-#, fuzzy
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Because your add-on is trusted, please choose where this version should "
-#~ "go:"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Public"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#, fuzzy
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Developer Agreement"
-
-#, fuzzy
-#~ msgid "devcp_header_step1"
-#~ msgstr "Step 1"
-
-#, fuzzy
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Upload File"
-
-#, fuzzy
-#~ msgid "devcp_header_step2"
-#~ msgstr "Step 2"
-
-#, fuzzy
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Add-on Details"
-
-#, fuzzy
-#~ msgid "devcp_header_step3"
-#~ msgstr "Step 3"
-
-#, fuzzy
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Version Details"
-
-#, fuzzy
-#~ msgid "devcp_header_step4"
-#~ msgstr "Step 4"
-
-#, fuzzy
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localization"
-
-#, fuzzy
-#~ msgid "devcp_header_step5"
-#~ msgstr "Step 5"
-
-#, fuzzy
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Success"
-
-#, fuzzy
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "My Add-ons"
-
-#, fuzzy
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Return to add-on details"
-
-#, fuzzy
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatically detected add-on type: %s."
-
-#, fuzzy
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "The default locale of this add-on (%1$s [%2$s]) is different from your "
-#~ "currently selected locale (%3$s [%4$s]). The fields below should be "
-#~ "completed in %1$s."
-
-#, fuzzy
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorrect?"
-
-#, fuzzy
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Are you sure you want to delete this file?"
-
-#, fuzzy
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Skip updating my current add-on information"
-
-#, fuzzy
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Add-on submissions are currently disabled. Please check back at a later "
-#~ "time."
-
-#, fuzzy
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "I Accept"
-
-#, fuzzy
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "I Decline"
-
-#, fuzzy
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "This add-on has been disabled by an administrator."
-
-#, fuzzy
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Disabled"
-
-#, fuzzy
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Trusted"
-
-#, fuzzy
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "You don't have any add-ons. Click %s to submit one."
-
-#, fuzzy
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "here"
-
-#, fuzzy
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Please be sure to %s for your theme."
-
-#, fuzzy
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "upload a preview"
-
-#, fuzzy
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Edit Version"
-
-#, fuzzy
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Version updated successfully."
-
-#, fuzzy
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "New"
-
-#, fuzzy
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Updated"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#, fuzzy
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Add-on Types"
-
-#, fuzzy
-#~ msgid "editors_th_age"
-#~ msgstr "Age"
-
-#, fuzzy
-#~ msgid "editors_th_applications"
-#~ msgstr "Applications"
-
-#, fuzzy
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platforms"
-
-#, fuzzy
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Submission Types"
-
-#, fuzzy
-#~ msgid "error_notice"
-#~ msgstr "Notice"
-
-#, fuzzy
-#~ msgid "forum_save"
-#~ msgstr "Save"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-#, fuzzy
-#~ msgid "pagination_page_number_title"
-#~ msgstr "This is page %1$s of %2$s"
-
-#, fuzzy
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s matching add-on"
-#~ msgstr[1] "%s matching add-ons"
-
-#, fuzzy
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS feed of summary data"
diff --git a/site/app/locale/ar/LC_MESSAGES/messages.po b/site/app/locale/ar/LC_MESSAGES/messages.po
index 2226023..6b814d5 100644
--- a/site/app/locale/ar/LC_MESSAGES/messages.po
+++ b/site/app/locale/ar/LC_MESSAGES/messages.po
@@ -21,79 +21,71 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "ألغ� التثبيت"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "نزّل الآن %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "اقبل ونزّل"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "اقبل وثبّت"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "عام"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "ساحة اللعب"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "ح�دّثت �ي %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "الإصدارة %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "التنزيلات"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "مجموع التنزيلات"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "التنزيلات الأسبوعية"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -104,90 +96,89 @@ msgstr[3] "%1$s إضا�ات"
 msgstr[4] "%1$s إضا�ة"
 msgstr[5] "%1$s إضا�ة"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "�ي الص�حة"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "ترتيب حسب:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "تجريبية"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
-msgstr "مزكَّاة"
+msgstr "منصوح بها"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s غير متاحة ل� %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "عودة إلى %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "عودة إلى المراجعات..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "التقييم:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "المراجعة:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "أرسل مراجعتك"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "أض� مراجعة ل� %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "العنوان/الملخص:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "احذ�"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "ردّ"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "أمتأكد أنك تريد حذ� هذه المراجعة؟"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "لا"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "نعم"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "حذ� المراجعة"
 
@@ -196,7 +187,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "ح�ذ�ت المراجعة بنجاح."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "تحرير مراجعة %s"
@@ -209,16 +200,16 @@ msgstr ""
 "100 حر�. عدد الأحر� لديك هو %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "ي�رجى ملاحظة أنّ مراجعتك سيشر� عليها أحد المحررين قبل أن ت�نشر على الملأ."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "ردّ المطوّر على:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -239,171 +230,131 @@ msgid "addon_review_pagetitle"
 msgstr "مراجعة ل� %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "ردّ من %1$s على %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "ردّ المطوّر:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "ح��ظت مراجعتك بنجاح. شكرًا!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "من %1$s �ي %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "من %1$s �ي %2$s (بتقييم %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "الإضا�ة التالية"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "الإضا�ة السابقة"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "رابط دائم لهذه الإصدارة"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "أحدث نسخة متوا�قة مع %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "اذهب"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "شاهد مل� المؤل�"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "استعرض كل السمات :: إضا�ات %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "استعرض %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "استعرض سمات %1$s :: إضا�ات %2$s"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "أض�� مراجعة"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "ت�اصيل متقدمة"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "التصني�ات"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "مراجعة م�صلة"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "لا تعجبني"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "حرّر مراجعتك"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "لهذه الإضا�ة سياسة خصوصية."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "أكرهها"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "تعليقات المطوّر"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ص�حة البداية"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "المراجعات"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "الدعم"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "تعجبني"
 
@@ -411,23 +362,19 @@ msgstr "تعجبني"
 msgid "addons_display_long_description"
 msgstr "الوص� المطوّل"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "أحبّها"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "المزيد من الصور"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "إضا�ات أخرى أعدّها %1$s"
@@ -440,85 +387,91 @@ msgstr[5] "إضا�ات أخرى أعدّها المؤل�ون %1$s"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة بمراسلة البريد الإلكتروني %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة �ي %s أو بمراسلة البريد الإلكتروني %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "يقدّم المطوّر دعمًا لهذه الإضا�ة �ي %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "قيّمها"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "تعجبني حقًا"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "رجاءً لا تبلّغ عن العلل �ي المراجعات. نحن لا ننشر بريدك الإنترنت أمام "
 "المطوّرين، وهم قد يحتاجون إلى التواصل معك للمساعدة �ي حل مشكلتك."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">إرشادات المراجعات</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "انظر <a href=\"%1$s\">قسم الدعم</a> لمعر�ة أين يمكنك الحصول على مساعدة بشأن "
 "هذه الإضا�ة."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "اح�ظ"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "شاهد كل الإضا�ات ال� %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "شاهد كل المراجعات (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "شاهد كل الإصدارات"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "تاريخ الإصدارات الكامل"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "شاهد المصدر"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "شاهد الإحصائيات"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "ما رأيك؟"
 
@@ -526,237 +479,119 @@ msgstr "ما رأيك؟"
 msgid "addons_display_workswith"
 msgstr "تعمل مع:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "من"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
-msgstr "نزكّي"
-
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+msgstr "ننصح ب�"
+
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "تزيد الإضا�ات قدرات %1$s، متيحة لك تطويع تص�حك للوب. خذ جولة �ي المكان واجعل "
 "من %1$s شيئًا ينتمي إليك."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "الأحدث:"
 
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "تطبيقات أخرى"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "إضا�ات %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "الأكثر شعبية:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "ننصح ب�:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "المحدّثة مؤخرًا:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "شاهد الكل"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "شاهد كل الإضا�ات الجديدة"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "شاهد كل الإضا�ات الشعبية"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
-msgstr "شاهد كل الإضا�ات المزكَّاة"
+msgstr "شاهد كل الإضا�ات المنصوح بها"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "شاهد كل الإضا�ات المحدّثة مؤخرًا"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>انقر على الرابط أدناه لح�ظ المل�.</li><li>�ي موزيلا صنب�رد، ا�تح "
 "الإضا�ات من قائمة الأدوات.</li><li>انقر على زر التثبيت وحدّد المل� الذي تريد "
 "تنزيله ثم انقر على \"موا�ق\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "كي�ية التثبيت �ي صَنْب�رْد"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>انقر بالزر الأيمن على الرابط أدناه واختر \"اح�ظ الوصلة ك�...\" لتنزيل "
@@ -764,53 +599,50 @@ msgstr ""
 "الأدوات.</li><li>انقر على زر التثبيت واختر المل� الذي نزّلته ثم انقر على "
 "\"موا�ق\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "كي�ية التثبيت �ي ثَند�رب�رد"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "أظه�ر الإضا�ات التجريبية"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "اذهب"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "من"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "للينكس"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "لماك أو إس"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "لويندوز"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
 "تسرد هذه الص�حة �قط بعض الملحقات الأكثر شعبية. للمزيد من المعلومات عن "
 "الملحقات الأخرى المتاحة للمتص�حات المرتكزة على موزيلا، ي�رجى زيارة %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "أتبحث عن ملحق غير موجود هنا؟"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "تساعد الملحقات متص�حك على القيام بوظائ� معينة، كمشاهدة تنسيقات رسومية معينة "
@@ -818,65 +650,60 @@ msgstr ""
 "الأخير تضي� أو تعدّل على الوظي�ة الموجودة."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "الملحقات الشائعة ل� %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "الملحقات"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "وثائق الدعم: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
 "يتطلب %s منك أن تقبل ات�اقية ترخيص المستخدم التالية قبل متابعة التثبيت:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "معاينات %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "مع كل هذا العدد من الإضا�ات العظيمة، هناك شيء ما لكل شخص. كبداية، هذه قائمة "
 "من الإضا�ات الأكثر شعبية. استمتع!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
-msgstr "الإضا�ات المزكَّاة"
+msgstr "الإضا�ات المنصوح بها"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
-msgstr "الإضا�ات التي نزكّيها"
+msgstr "الإضا�ات التي ننصح بها"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "موارد إضا�ية"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "مركز مطوّري موزيلا"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr "عذرًا، تحتاج إلى متص�ح مرتكز على موزيلا (مثل �َيَر��كس) لتثبيت ملحق البحث."
 
@@ -888,40 +715,41 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "تعلم كي� %1$s �ي %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/ar/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "تصنع واحدة خاصة بك"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "تص�ح من خلال المزيد من محركات البحث �ي %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "محركات البحث"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "شكر خاص لمشروع مايكرو�ت على عملهم �ي محركات بحث �َيَر��كس."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -963,17 +791,17 @@ msgstr "إصدارة غير مكتملة"
 msgid "addons_status_nominated"
 msgstr "�ي ساحة اللعب؛ ترشيح عام"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "�ي ساحة اللعب؛ بانتظار المراجعات"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "عام"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "�ي ساحة اللعب"
@@ -982,38 +810,26 @@ msgstr "�ي ساحة اللعب"
 msgid "addons_status_unknown"
 msgstr "مجهول"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "اعر� المزيد عن هذه الإضا�ة"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "كن حذرًا مع الإصدارات القديمة"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "هذه الإصدارات معروضة لتكون مرجعًا ومن أجل أغراض اختبارية. ينبغي عليك دائمًا أن "
 "تستخدم أحدث إصدارة من الإضا�ة."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "تاريخ الإصدارات مع سجل التغييرات"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "تاريخ إصدارات %1$s"
@@ -1048,465 +864,151 @@ msgstr "مدير المجموعة"
 msgid "admin_group_saved"
 msgstr "ح��ظت المجموعة"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "متقدم"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "أي وقت"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "أي نوع"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "أي إصدارة"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "التطبيق"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "تطابق الكلمات الأساسية"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "المحدّثة مؤخرًا"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "الاسم"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "الأحدث"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "�ي الشهور الثلاثة الماضية"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "�ي الشهور الستة الماضية"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "البارحة"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "الشهر الماضي"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "الأسبوع الماضي"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "السنة الماضية"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "�ي الص�حة"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "منصة التشغيل"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "الشعبية"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "التقييم"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "ترتيب حسب"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "إلى"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "انتقل إلى نمط البحث المتقدم"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "النوع"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "الإصدارة"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "تجاهل �حص الإصدارة"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "هذه الإضا�ة هي من أجل إصدارات أقدم من �َيَر��كس"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "يمكنك أن <a href=\"%1$s\">تجرّب إصدارة أقدم</a> أو <a href=\"#\" onclick=\"%2"
 "$s\">تتجاهل هذا ال�حص</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "قد تعمل <a href=\"%1$s\">الإصدارة الأقدم</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "هذه الإضا�ة تتطلب النسخة التي لم تصدر بعد من <a href=\"%1$s\">�َيَر��كس %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">قم بترقية �َيَر��كس</a> لاستخدام هذه الإضا�ة"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "الإضا�ات حسب الاسم"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "الإضا�ات الأحدث"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "الإضا�ات الأكثر شعبية"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "الإضا�ات حسب التقييم"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "الإضا�ات المحدّثة مؤخرًا"
 
@@ -1515,921 +1017,106 @@ msgid "categories_current_title"
 msgstr "التصني� الحالي"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "التصني�ات"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "اختر تصني�ًا"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "شاهد كل %1$s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "شاهد كل الإضا�ات المنصوح بها"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "ذات التقييم الأعلى أولًا"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "المحدّثة مؤخرًا أولًا"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "الأكثر شعبية أولًا"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "شاهد كل %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "المجموعة غير موجودة!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "أضي�ت %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "مركز توا�قية الإضا�ات"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "كن مستعدًا لإصدار %1$s مع الأدوات والمعلومات المتاحة لمجتمع إضا�ات %2$s "
 "الموجودة أدناه."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "يجري تحميل البيانات..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "عودة إلى الرئيسية"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "تقرير توا�قية الإضا�ة"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "معلومات لمطوّري الإضا�ات"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "صحّح الإصدارة القصوى دون أن تعيد الر�ع"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "تحقق من حالة إضا�اتي"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "إن كان لديك إضا�ات مستضا�ة �ي موقع إضا�ات موزيلا، <a href=\"%1$s\">سجّل دخولك "
 "رجاءً</a> لتحليل حالة إضا�اتك ل� %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "شعار مركز تطوير موزيلا"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "ليس لديك أي إضا�ات مستضا�ة �ي موقع إضا�ات موزيلا."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "نتائج التحقق من حالة الإضا�ات"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "يجري استخلاص حالة الإضا�ات المستضا�ة..."
 
@@ -2437,118 +1124,118 @@ msgstr "يجري استخلاص حالة الإضا�ات المستضا�ة..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s مستخدمًا ل� %2$s (%3$s&#37; من الكل)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "الإضا�ات أدناه تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، وهي مرتبة حسب "
 "مقدار الاستخدام."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "شاهد التقرير الم�صّل"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "من بين %1$s إضا�ة تشكّل 95% من استخدام الإضا�ات المعرو� لموزيلا، ت�عتبر <b>%2"
 "$s&#37;</b> منها متوا�قة حاليًا مع آخر إصدارات %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "إصدارات أل�ا"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "الإضا�ات المتوا�قة مع إصدارة أل�ا من %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "إصدارات بيتا"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "الإضا�ات المتوا�قة مع إصدارة بيتا أو إصدارة مرشحة من %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "آخر إصدارة"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "الإضا�ات المحدّثة لآخر إصدارات %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "إصدارات أخرى"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "الإضا�ات غير المتوا�قة مع أي إصدارات من %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "تقرير توا�قية الإضا�ة"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "معلومات لمستخدمي الإضا�ة"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "شاهد تقرير التوا�قية"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "لمعر�ة معلومات عن المشاركة، انظر %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "ص�حة الويكي"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "تودّ موزيلا أن تشكر الأشخاص التالية أسماؤهم لمساهمتهم �ي مشروع addons.mozilla."
 "org project خلال هذه السنوات:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "المطوّرون"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "المحرّرون"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "المترجمون"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "مشاركون آخرون"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "مطوّرون سابقون"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "البرنامج والصور"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "بعض الأيقونات المستخدمة مأخوذة من <a href=\"http://www.famfamfam.com/lab/"
@@ -2556,7 +1243,7 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
 "2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2567,20 +1254,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B، %Y"
 
@@ -2615,25 +1299,25 @@ msgstr "لوحة الإحصائيات"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2642,6 +1326,17 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(اكتشا�-تلقائي)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"لا تعلن هذه الإصدارة من إضا�تك تو�قيتها مع �ير�كس %1$s. تتوقع موزيلا صدور "
+"النسخة القادمة من �ير�كس قريبا، �من �ضلك اختبر إضا�تك مع النسخة الجديدة ثم "
+"حدّث معلومات التوا�قية. طالع المزيد عن هذا <a href=\"%2$s\">هنا</a>. هذا مجرد "
+"إخطار، وتستطيع مواصلة إرسال هذه النسخة إلى addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "ي�تح �ي نا�ذة جديدة"
@@ -2678,76 +1373,141 @@ msgstr "الخطوة الخامسة: نجاح"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "مساعدة الإرسال"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "ع�طّلت الإضا�ة بنجاح"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "تحرير الإضا�ة"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "��عّ�لت الإضا�ة بنجاح"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "وص� الإضا�ة"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "ات�اقية ترخيص المستخدم"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "ص�حة بداية الإضا�ة"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "اسم الإضا�ة"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "معاينة العنوان"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "سياسة الخصوصية"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "ملخص الإضا�ة"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "بريد الدعم"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "موقع الدعم"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "ملاحظات الإصدارة"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "ترشيح الإصدارة"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "ر�شّحت الإصدارة!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2783,7 +1543,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2793,6 +1553,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2804,13 +1569,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2820,7 +1585,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2830,12 +1595,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2844,14 +1609,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -2930,13 +1695,118 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"ز�ر ص�حة %1$s للقيام بتعديلات على ما أرسلته، أو %2$s للعودة إلى أدوات "
+"المطوّرين."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "انقر هنا"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "حرّر الإضا�ة"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"هذه النسخة و�ضعت �ي ساحة اللعب ريثما تنتظر المراجعة من المختبرين �ي ساحة "
+"اللعب و محرّر إضا�ات موزيلا. سو� ت�نبّه بريديًا عند حصول أي حدث."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "يمكنك قراءة المزيد عن نظام ساحة اللعب %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "هنا"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"و�ض�عت هذه النسخة �ي ساحة اللعب ليستخدمها المستخدمين الخبراء. يجب عليك أن %s "
+"إضا�تك وأن تخضع للمراجعة، لتنشر �ي الموقع العام."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "رشّح"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "إرسالك للإضا�ة قد اكتمل بنجاح."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "لأن إضا�تك موثوق بها، سو� ي�وا�َق على نشر هذه الإصدارة آليًا على الملأ."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "إرسال الإضا�ة"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "ح�دّثت الإضا�ة بنجاح"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "قد ترغب ب� %s من أجل زيادة الاهتمام بإضا�تك."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "ار�ع معاينة"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "تعذر إيجاد المؤل� [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "أز�ل"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "ألغ�"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "أمتأكد أنك تريد إلغاء الإرسال؟"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "التالي"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "غيّر نوع الإضا�ة:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "ح�دّثت تعليقات المطوّر."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3013,37 +1883,178 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "أض�� معاينة"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "المؤل�"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "المؤل�ون"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "لا أحد"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "التصني�ات"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "التصني�"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "الوص�"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "م�عطّل"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "المعرّ� ال�ريد"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "الت�اصيل"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "تعليقات المطوّر"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "المعاينات"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "الإصدارات"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "ص�حة البداية"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "لا يوجد"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "لا عنوان"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "لا يوجد معاينات."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "تحديث"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "بريد الدعم"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "لم يزوّد المطوّر بريدًا للدعم."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "موقع الدعم"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "لم يزوّد المطوّر موقعًا للدعم."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "موثوق بها"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "الإصدارة %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "لا إصدارات موجودة."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "ألغ� وع�د إلى الخل�"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "نعم، عطّلها"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "أمتأكد أنك تريد أن تعطّل الإضا�ة؟"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"تعطيل هذه الإضا�ة سيخ�يها عن البحث ومن القوائم، ولن يعود بالإمكان تنزيلها من "
+"موقع الوب كما لن تظهر �ي التماسات التحديثات عند العميل. عمليًا، ستصبح الإضا�ة "
+"�ي حكم المحذو�ة، غير أنه بإمكانك العودة إلى هنا وإعادة تمكينها وقتما تشاء."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "تعطيل %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "نعم، مكّنها"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "أمتأكد أنك تريد تمكين هذه الإضا�ة؟"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"تمكين هذه الإضا�ة سيعيد إظهارها عند البحث و�ي القوائم. سيصبح تنزيلها ممكنًا "
+"من موقع الوب أو عن طريق التماس التحديث من ق�بَل العميل."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "تمكين %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "إضا�ة ردّ"
@@ -3086,62 +2097,74 @@ msgstr "Ø£Ù�رسل ردّك بنجاح. سيستلم المشاركون Ù�ÙŠ اÙ
 msgid "devcp_discuss_writtenby"
 msgstr "كتبه %1$s �ي %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "أض� المؤل�"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "بريد المؤل� الإلكتروني"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "أز�ل"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3154,30 +2177,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3256,22 +2279,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3280,12 +2303,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3293,12 +2316,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3307,24 +2330,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3332,7 +2355,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3357,42 +2380,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "لا يوجد تصني�ات متاحة لهذا النوع من الإضا�ات."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "المؤل�ون"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "أض�� أيقونة"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "غيّر الأيقونة"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "اسمح للمستخدمين بتص�ح مصدر المل� وهم على اتصال"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "التصني�ات"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "اللغة المبدئية"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "هذه الإضا�ة تتطلب برنامجًا خارجيًا"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "امسح �قط الأيقونة الموجودة"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "مل� أيقونة جديد"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "أيقونة"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "معلومات إضا�ية عن اللغة"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "هذه ما-قبل-الإصدارة"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "هذه إضا�ة خاصة بمواقع معينة"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "اللغة الهد�"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "قليل من المعلومات الإضا�ية (مثل اسم اللهجة المحلية)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3400,12 +2488,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3413,60 +2501,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3475,32 +2563,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3508,22 +2596,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3531,12 +2619,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3544,39 +2632,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "حدّث"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">الاسم المختصر "
+"للغة</a>، مثل 'ar'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3675,14 +2773,68 @@ msgstr[3] "%s تحديثات تنتظر"
 msgstr[4] "%s تحديثًا ينتظر"
 msgstr[5] "%s تحديث ينتظر"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "المل�ات المؤشّر عليها سو� ت�حذ�."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "المل�ات"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "التطبيقات الهد�"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "لا مل�ات."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "ملاحظات إلى المراجع"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "حدّث"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "أنت لا تملك إذن الوصول إلى هذه الإضا�ة."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"الملخصات محدودة بعدد حرو� أقصى هو 250 حر�ًا.\n"
+"(لقد أدخلتَ %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"اسم الإضا�ة موجود مسبقًا �ي قاعدة البيانات. رجاءً تأكد أن: <br /><li>المعرّ�ات "
+"ال�ريدة متطابقة، إذ أن السبب الشائع لهذا الخطأ هو عدم تطابق المعرّ�ات ال�ريدة."
+"</li><li>ليس لديك إدخال آخر بن�س الاسم �ي قاعدة البيانات. إن كان لديك واحد، "
+"�عليك تحديثه، أو حذ�ه والمحاولة من جديد.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3696,10 +2848,9 @@ msgstr "رجاءً انظر إلى %s كمرجع."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "هذه الص�حة"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "ص�� رجاءً التعديلات التي يتضمنها تحديث هذه الإضا�ة."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3718,6 +2869,10 @@ msgstr ""
 "امتداد المل� (%s) غير مسموح لنوع الإضا�ات المحدّد. رجاءً اختر واحدًا من الأنواع "
 "التالية: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "ليست كل معرّ�ات المل�ات ال�ريدة متطابقة"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "لا تختر رجاءً أكثر من خمسة تصني�ات."
@@ -3750,7 +2905,14 @@ msgstr "لم ي�ر�ع أي مل�"
 msgid "devcp_error_icon_extension"
 msgstr "امتداد المل� (%s) غير مسموح للأيقونات. اختر رجاءً أحد هذه الأنواع: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "هناك إصدارة مشابهة (%s) موجودة مسبقًا من هذه الإضا�ة لهذه المنصة."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "مل� install.rdf م�قود."
 
@@ -3758,7 +2920,7 @@ msgstr "مل� install.rdf م�قود."
 msgid "devcp_error_install_manifest"
 msgstr "و�جدت الأخطاء التالية �ي مل� install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "اختر رجاءً نوع إضا�ة صالح."
 
@@ -3826,6 +2988,18 @@ msgstr "تعذر إيجاد معرّ� لهذه الإضا�ة �ي install.rdf.
 msgid "devcp_error_no_platform"
 msgstr "لم تحدّد منصة التشغيل"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "يجب أن تزوّد الت�اصيل المطلوبة من أجل الترشيح."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "لا يمكنك ترشيح إضا�ة �ي مرحلة ما قبل الإصدار."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "يمكنك ترشيح الإضا�ات التي �ي ساحة اللعب �قط."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "اختر رجاءً تصني�ًا واحدًا على الأقل."
@@ -3842,6 +3016,16 @@ msgid "devcp_error_preview_extension"
 msgstr ""
 "امتداد المل� (%s) غير مسموح �ي المعاينات. اختر رجاءً أحد هذه الأنواع: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "حصل خطأ عند محاولة ح�ظ بياناتك."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "أنت لا تملك الصلاحيات لتحديث هذه الإضا�ة."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3854,98 +3038,292 @@ msgstr ""
 "الإضا�ات لا يمكنها استخدام updateURL خارجي. رجاءً أز�ل ذلك من install.rdf "
 "وحاول مجددًا."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "رجاءً ار�ع مل�ًا."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "أض�� مل� منصة تشغيل آخر"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "أض�� مؤل�ًا"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "أز�ل"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "تصني�ات نوع الإضا�ة الجديد ستكون متاحة �ي الخطوة التالية."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "لا تصني�ات متاحة لهذا النوع من الإضا�ات."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "رجاءً أدخ�ل وص�ًا لإضا�تك."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "رجاءً أدخ�ل اسمًا لإضا�تك."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "اختر رجاءً نوع الإضا�ة التي ترسلها."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "أدخ�ل رجاءً ملخصًا لإضا�تك."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "مل� الإضا�ة"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "مل� الإضا�ة 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "مل� الإضا�ة 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "نوع الإضا�ة"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "اسمح للمستخدمين برؤية مصدر المل�ات وهم على اتصال"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "بريد المؤل� الإلكتروني"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "المؤل�ون"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "التصني�ات"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "اللغة المبدئية"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "الوص�"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "ات�اقية ترخيص المستخدم (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "هذه الإضا�ة تتطلب برنامجًا خارجيًا"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "المل�ات"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "ص�حة البداية"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "مل� الأيقونة"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "الاسم"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "منصات التشغيل المدعومة"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "هذه ما-قبل-إصدارة"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "سياسة الخصوصية"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "هذه إضا�ة خاصة بمواقع معينة"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "الملخص"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "بريد الدعم"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "موقع الدعم"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "التطبيقات الهد�"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "الإصدارة"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "ملاحظات الإصدارة"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "لا شيء"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "ملاحظات للم�راجع"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"لأنّ إضا�تك موثوق بها، ي�رجى منك اختيار المكان الذي ستذهب إليه هذه الإصدارة:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "الساحة العامة"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "ساحة اللعب"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "ات�اقية المطوّر"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "الخطوة الأولى"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "ر�ع المل�"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "الخطوة الثانية"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "ت�اصيل الإضا�ة"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "الخطوة الثالثة"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "ت�اصيل الإصدارة"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "الخطوة الرابعة"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "الترجمة"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "الخطوة الخامسة"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "نجاح"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "إضا�اتي"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "الحقول المترجمة"
@@ -3960,12 +3338,12 @@ msgstr ""
 "متاحة، سيظهر النص باللغة المبدئية (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "أدوات المدير"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "أدوات المحرّر"
 
@@ -3974,28 +3352,28 @@ msgid "devcp_myaddons_link"
 msgstr "إضا�اتي"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "عودة إلى الرئيسية"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "لوحة الإحصائيات"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "أرس�ل الإضا�ة"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "أدوات المطوّر"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4007,26 +3385,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "ع�د إلى ت�اصيل الإضا�ة"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "رشّح %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "نوع الإضا�ة المكتشَ� آليًا: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4040,6 +3429,17 @@ msgstr ""
 "إزالة هذه المعاينة المبدئية سيؤدي آليًا إلى أن تصبح معاينة أخرى هي المعاينة "
 "المبدئية."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"اللغة الا�تراضية لهذه الإضا�ة (%1$s [%2$s]) تختل� عن لغتك التي اخترتها (%3$s "
+"[%4$s]). يجب أن ت�كمل الحقول أدناه باللغة %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4047,14 +3447,14 @@ msgstr ""
 "سيؤدي تعيين هذه المعاينة كمعاينة مبدئية إلى إزالة حالة المبدئية عن المعاينة "
 "المبدئية الحالية."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4083,46 +3483,46 @@ msgstr "تحرير المعاينة"
 msgid "devcp_preview_updated_successfully"
 msgstr "ح�دّثت المعاينة بنجاح."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4130,7 +3530,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4147,7 +3547,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "أض�� معاينة"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4156,7 +3556,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "حرّر المعاينة"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4169,27 +3569,27 @@ msgstr "مل� المعاينة"
 msgid "devcp_previews_label_makedefault"
 msgstr "اجعل هذه هي صورة المعاينة المبدئية"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4213,18 +3613,26 @@ msgstr "حرّر المعاينة"
 msgid "devcp_previews_submit_upload"
 msgstr "ار�ع المعاينة"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "غير صحيح؟"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "أمتأكد أنك تريد حذ� هذا المل�؟"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "ي�رجى مراجعة وقبول ات�اقية المطوّر التالية قبل المتابعة."
 
@@ -4235,7 +3643,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4247,6 +3655,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "تغاضَ عن تحديث معلوماتي الحالية عن الإضا�ة"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4350,17 +3762,61 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "إرسال الإضا�ات معطل حاليًا. ي�رجى إعادة المحاولة لاحقًا."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "أوا�ق"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "أر�ض"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "لقد عطّل المدير هذه الإضا�ة."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "معطّلة"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "موثوق بها"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "الإصدارة الأخيرة:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "أنت لا تملك أي إضا�ات. انقر %s لإرسال واحدة."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "هنا"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "تأكّد رجاءً من %s ل�س�مَت�ك."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "ر�ع معاينة"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4368,44 +3824,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4415,7 +3871,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4423,64 +3879,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4489,7 +3945,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4501,33 +3957,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4540,29 +3991,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4573,12 +4024,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4602,23 +4053,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4627,7 +4073,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4636,14 +4082,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4653,7 +4099,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4661,7 +4107,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4669,22 +4115,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4703,29 +4143,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "ي�رجى الاطلاع على %s كمرجع."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "هذه الص�حة"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "تحرير الإصدارة"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "ح�دّثت الإصدارة بنجاح."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4794,34 +4237,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4829,49 +4272,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4881,59 +4319,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4942,26 +4373,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5004,7 +4435,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "هذه الإضا�ة معطّلة"
 
@@ -5048,7 +4479,7 @@ msgstr "تص�ية"
 msgid "editorcp_logs_filter_by"
 msgstr "تص�ية حسب النوع/الإجراء"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "سجلّ الأحداث"
 
@@ -5110,7 +4541,7 @@ msgstr "اعرض الإدخالات بين %s و %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "لا يوجد مراجعات �ي هذه ال�ترة."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "سجلّ المراجعات"
 
@@ -5134,24 +4565,24 @@ msgstr "نشاط المحرّر مؤخرًا"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "كل المراجعات"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "مراجعة الإضا�ة"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "أكم�ل رجاءً الحقول التالية:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "اختر رجاءً مل�ًا واحدًا على الأقل لمراجعته."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "مراجعاتك لإضا�تك غير مسموحة."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "برنامج خارجي"
 
@@ -5163,39 +4594,39 @@ msgstr "أض�� ميزة"
 msgid "editors_featured_add_feature_submit"
 msgstr "أض��"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "�شلت إضا�ة الميزة."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "أضي�ت الميزة بنجاح."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "�شل تحرير الميزة."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "ح�رّرت الميزة بنجاح."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "هناك لغة واحدة أو أكثر غير صالحة."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�شلت إزالة الميزة."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "أزيلت الميزة بنجاح."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "الإضا�ات المميّزة"
 
@@ -5207,263 +4638,200 @@ msgstr "اذهب"
 msgid "editors_featured_remove_feature"
 msgstr "أز�ل الميزة"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "تص�ية الطابور"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "وصلات م�يدة"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "مرشد المحرّرين"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "سياسة الإضا�ة"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "ستبقى هذه المص�ّيات طوال هذه الجلسة أو حتى مسحها."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "لا يوجد إضا�ات من هذا النوع حاليًا لمراجعتها."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "يوم واحد"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "ساعة واحدة"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "دقيقة واحدة"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "أدوات المحرّر"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s �قط"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "ما-قبل-الإصدارة"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "التوا�ق مع %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "امسح"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "صَ�ّ�"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "جميع طوابير المراجعات معطلة حاليًا. ي�رجى إعادة المحاولة لاحقًا."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "إجراء المراجعة"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "اطلب المزيد من المعلومات"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "انشر على العموم"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "اطلب مراجعة ممتازة"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "أبْق�ها �ي ساحة اللعب"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "تعليقات المراجعة"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "استخدم هذا النموذج لطلب المزيد من المعلومات من المؤل�. سيستلم المؤل� رسالة "
 "ليتمكن من الإجابة هنا، وستستلم إشعارًا بريديًا عندما يجيب."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "هذا سيضي� علامة النشر للعموم على الإضا�ة وإصدارتها الأخيرة ومل�اتها. ستوضع "
 "الإصدارات المستقبلية �ي ساحة اللعب حتى يراجعها أحد المحرّرين."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "هذا سيبقي الإضا�ة �ي ساحة اللعب."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "هذا سيعطي الإذن لنسخة ساحة لعب من إضا�ة عامة بأن ت�نشر �ي الساحة العامة."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "هذا سيجبر نسخة ساحة لعب من إضا�ة عامة على البقاء �ي ساحة اللعب."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "إن كنتَ مهتمًا بخصوص أمن هذه الإضا�ة أو شؤون حقوق نسخها أو أي أمور أخرى ينبغي "
 "للمدير أن يطلع عليها، أدخ�ل تعليقاتك �ي المساحة أدناه، وست�رسل إلى المدراء لا "
 "إلى المؤل�."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "قار�ن مع النسخة العامة"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "اعرض المحتويات"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "المؤل�ون:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "التصني�ات:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "التوا�قية:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "الوص�"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "تعليقات المطوّر"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ات�اقية ترخيص المستخدم"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "المل�ات:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "تاريخ العناصر"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "رسالة الترشيح"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "المعاينات"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "سياسة الخصوصية"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "راجع %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "ملاحظات للمراجع"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "الملخص"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "ملاحظات الإصدارة"
 
@@ -5491,7 +4859,7 @@ msgstr "الترشيح مقبول/الساحة العامة"
 msgid "editors_review_history_nominated_denied"
 msgstr "الترشيح مر�وض/ساحة اللعب"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "تعذر إيجاد إدخالات مراجعات سابقة."
 
@@ -5522,91 +4890,78 @@ msgstr[3] "أظه�ر/أخ�� الردود (%1$s)"
 msgstr[4] "أظه�ر/أخ�� الردود (%1$s)"
 msgstr[5] "أظه�ر/أخ�� الردود (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "التطبيقات:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "أو اختر ردًا معلبًا:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "التعليقات:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "أنظمة التشغيل:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "�وق"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "تالي &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "لا معاينات موجودة."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; سابق"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "طابور المراجعات"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> من أصل %2$s �ي الطابور"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "ق�م بالإجراء"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "الإجراء"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "التعليقات"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "التاريخ"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "الم�راجع"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "إصدارة/مل�"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "نبّهني عند وجود تحديث لهذه الإضا�ة (التحديثات اللاحقة لن تتسبب بإرسال رسالة)."
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "عولجت المراجعة بنجاح."
 
@@ -5630,7 +4985,7 @@ msgstr "الإجراء"
 msgid "editors_reviews_in_reply_to"
 msgstr "ردًا على:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "عولجت المراجعات بنجاح!"
 
@@ -5642,82 +4997,87 @@ msgstr "لا يوجد مراجعات تحت الإشرا� حاليًا."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "عالج المراجعات"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "مختص بموقع معيّن"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "جديد"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "م�حدَّث"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "تطبيق مجرَّب"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "أنظمة تشغيل مجرَّبة"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "معلومات إضا�ية"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "الإضا�ة"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "النوع"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "أنواع الإضا�ات"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "العمر"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "التطبيقات"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "حصرها باللغات؟"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "المنصات"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "أنواع الإرسال"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s يومًا"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ساعة"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s دقيقة"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "الوصول ممنوع"
 
@@ -5725,19 +5085,17 @@ msgstr "الوصول ممنوع"
 msgid "error_access_denied_message"
 msgstr "غير مسموح لك بمشاهدة هذه الص�حة."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5746,14 +5104,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "الإضا�ة غير موجودة!"
 
@@ -5765,7 +5120,7 @@ msgstr "لا يمكن مشاهدة هذه الإضا�ة هنا."
 msgid "error_addon_selfreview"
 msgstr "لا يمكنك أن تضع مراجعة لإضا�تك الشخصية."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "لا يوجد إضا�ات �ي هذا التصني�!"
 
@@ -5773,45 +5128,50 @@ msgstr "لا يوجد إضا�ات �ي هذا التصني�!"
 msgid "error_collection_feed_notfound"
 msgstr "تلقيم الإضا�ة غير موجود"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "هذا ليس بريدًا إلكترونيًا صالحًا."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "يجب أن يكون هذا الحقل غير �ارغ."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "المل� غير موجود!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "خطا �ي المل�: %s غير موجود."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "هناك أخطاء �ي هذا النموذج. ي�رجى تصحيح الأخطاء ثم إعادة الإرسال."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "الكابتشا غير صالحة، ي�رجى المحاولة ثانية!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "هذا العنوان غير صالح. العناوين الصالحة تكون على نسق http://example.com/"
@@ -5819,46 +5179,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "المعامل ناقص: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "لا مل�ات"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "ملاحظة"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "المعاينة غير موجودة!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "يجب عليك اختيار تقييم."
 
@@ -5866,46 +5214,37 @@ msgstr "يجب عليك اختيار تقييم."
 msgid "error_user_already_confirmed"
 msgstr "حساب المستخدم هذا قد أكّ�د مسبقًا."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "رمز التأكيد غير صحيح!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "كلمات السر لا تتطابق."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "هذا البريد الإلكتروني مأخوذ من ق�بَل مستخدم آخر."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "انتهت مهلة تغيير البريد الإلكتروني. ي�رجى تغيير البريد الإلكتروني مجددًا �ي "
 "مل� المستخدم الشخصي والنقر على الوصلة �ي رسالة التأكيد حالما تستلمها."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "هذا الاسم المستعار مأخوذ مسبقًا."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "المستخدم غير موجود!"
 
@@ -5914,34 +5253,32 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "ي�رجى تأكيد حساب المستخدم أولًا من خلال الرمز الذي استلمته بالبريد الإلكتروني."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "اسم المستخدم أو كلمة السر خطأ!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "الإصدارة غير موجودة!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "كلمة السر التي أدخلتها خطأ!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "اعر� المزيد"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "اعر� المزيد عن %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5952,8 +5289,7 @@ msgstr[3] "%1$s مراجعات"
 msgstr[4] "%1$s مراجعة"
 msgstr[5] "%1$s مراجعة"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "شاهد المزيد من"
 
@@ -5992,141 +5328,133 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "جميع الحقوق مح�وظة."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "حقوق النسخ"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "المساهمون"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "تزوّد موزيلا وصلات لهذه التطبيقات من باب المجاملة، ولكنها لا تقدّم أيّ تعري�ات "
 "بهذه التطبيقات ولا معلومات متعلقة بها. يجب توجيه أي أسئلة أو شكاوى أو "
 "احتجاجات بخصوص هذه التطبيقات إلى بائع البرنامج."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "اذهب"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "ملاحظات قانونية"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "لغات أخرى:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "سياسة الخصوصية"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "اح�ظ"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "قاموس"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "قواميس"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "امتداد"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "امتدادات"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "حزمة لغة (إضا�ة)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "حزمات لغات (إضا�ة)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "حزمة لغة (تطبيق)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "حزمات لغات (تطبيق)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "ملحق"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "ملحقات"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "محرك بحث"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "محركات بحث"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "سمة"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "سمات"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "ع�د إلى ص�حة بداية إضا�ات %1$s"
@@ -6135,95 +5463,37 @@ msgstr "ع�د إلى ص�حة بداية إضا�ات %1$s"
 msgid "header_main_firefox_header"
 msgstr "إضا�ات �َيَر��كس"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "الإضا�ات"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "إضا�ات س�يمَنكي"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "إضا�ات صَنب�رد"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "إضا�ات ثند�رب�رد"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "الإضا�ات"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "دخول"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "خروج"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "حسابي"
 
@@ -6231,72 +5501,49 @@ msgstr "حسابي"
 msgid "header_navlink_register"
 msgstr "تسجيل"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "صورة معاينة ل� %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">سجّل دخولك</a> لتثبيت هذه الإضا�ة التجريبية. <a href=\"%2$s"
 "\">لماذا</a>؟"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "أض�� إلى %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "أض�� %1$s إلى %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "نزّ�ل %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "هذه الإضا�ة غير متاحة."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "قائمة من حزمات اللغات والقواميس."
 
@@ -6308,8 +5555,8 @@ msgstr "نزّل القاموس"
 msgid "langtools_download_langpack"
 msgstr "نزّل حزمة اللغة"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "القواميس وحزمات اللغات"
 
@@ -6321,80 +5568,36 @@ msgstr "ثبّت القاموس"
 msgid "langtools_install_langpack"
 msgstr "ثبّت حزمة اللغة"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "القاموس"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "حزمة اللغة"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "اللغة"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "انقر هنا للعودة إلى ص�حة الواجهة."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "التاريخ"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "التنزيلات"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "اسم الإضا�ة"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "التقييم"
@@ -6419,20 +5622,27 @@ msgstr "صَنْب�رد"
 msgid "main_prettyname_thunderbird"
 msgstr "ثندر�ب�رد"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "القواميس وحزمات اللغات"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "الملحقات"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "السمات"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "ابحث عن إضا�ات لتطبيقات أخرى"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "أخرى"
 
@@ -6440,34 +5650,12 @@ msgstr "أخرى"
 msgid "page_title_appversions"
 msgstr "إصدارات التطبيقات"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "المساهمون"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "الإضا�ات التجريبية"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6497,15 +5685,15 @@ msgstr "نظام مراجعات ساحة اللعب"
 msgid "page_title_submissionhelp"
 msgstr "مساعدة الإرسال"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "المعرّ� ال�ريد"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "إصدارات التطبيقات الصالحة"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "يجب أن تحتوي الإضا�ات المرسَلة إلى موزيلا على مل� install.rdf يحوي على الأقل "
@@ -6513,7 +5701,7 @@ msgstr ""
 "المسموح بها لهذه التطبيقات."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6522,15 +5710,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "هنا"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "الإصدارات"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "عودة إلى الص�حة السابقة"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "ص�حة معلومات ساحة اللعب"
 
@@ -6538,6 +5729,12 @@ msgstr "ص�حة معلومات ساحة اللعب"
 msgid "pagination_next_page"
 msgstr "تالي"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "هذه هي الص�حة %1$s من اصل %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "سابق"
@@ -6572,15 +5769,15 @@ msgstr ""
 "إن كان صعبًا عليك قراءتها، يمكنك <a href=\"%1$s\">تجربة كلمات مختل�ة</a> أو "
 "<a href=\"%2$s\">الاستماع إلى شيء ما</a> عوضًا عن ذلك."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "هل أنت إنسان؟"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "ما هذا؟"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "حصل خطأ عند تعليم هذه المراجعة!"
 
@@ -6588,7 +5785,7 @@ msgstr "حصل خطأ عند تعليم هذه المراجعة!"
 msgid "review_flag_reason_bug_support"
 msgstr "التبليغ عن العلة أو طلب الدعم موضوع �ي غير مكانه"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "بلّغ عن هذه المراجعة (اختر سببًا)"
 
@@ -6604,8 +5801,8 @@ msgstr "سبب آخر (ي�رجى التحديد)"
 msgid "review_flag_reason_spam"
 msgstr "س�خام أو محتوى غير متعلق بالمراجعات"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "شكرًا؛ لقد ع�لّمتْ هذه المراجعة انتظارًا لموا�قة المحرّر."
 
@@ -6620,7 +5817,7 @@ msgstr ""
 "يراجعها المحرّر."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>أبق� هذه التلميحات �ي ذهنك:</p><ul><li>اكتب وكأنك تخبر صديقًا عن تجربتك "
@@ -6635,131 +5832,105 @@ msgstr ""
 "الت�اصيل عن مراجعات المستخدم للإضا�ات.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "مراجعات ل� %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "الإضا�ات المميزة"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "الإضا�ات الأحدث"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "الإضا�ات المحدّثة"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "البحث معطل حاليًا، ي�رجى إعادة المحاولة لاحقًا."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "كل الإضا�ات"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "ابحث عن الإضا�ات"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "ابحث عن الإضا�ات"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "انقر لإدخال كلمات البحث"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "ضمن"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "كل محركات البحث"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "استعرض محركات البحث"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "لا إضا�ات مطابقة"
+msgstr[1] "إضا�ة واحدة مطابقة"
+msgstr[2] "إضا�تان مطابقتان"
+msgstr[3] "%s إضا�ات مطابقة"
+msgstr[4] "%s إضا�ة مطابقة"
+msgstr[5] "%s إضا�ة مطابقة"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "لا نتائج."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "بحث عن الإضا�ات"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "تلقيم نتائج البحث"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "نتائج البحث ل�: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "أدوات المدير"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "أدوات المطوّر"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "أدوات المحرّر"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "أهلًا وسهلًا"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "أهلًا بك، %s"
@@ -6768,7 +5939,7 @@ msgstr "أهلًا بك، %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "القاموس"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "الإضا�ات المميزة"
 
@@ -6776,7 +5947,7 @@ msgstr "الإضا�ات المميزة"
 msgid "sidebar_pitch_looking_for"
 msgstr "أنا أبحث عن:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "الإضا�ات الأحدث"
 
@@ -6784,7 +5955,7 @@ msgstr "الإضا�ات الأحدث"
 msgid "sidebar_pitch_search"
 msgstr "ابحث عن ملحق"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "اشترك �ي"
 
@@ -6792,23 +5963,24 @@ msgstr "اشترك �ي"
 msgid "sidebar_pitch_theme"
 msgstr "السمة"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "الإضا�ات المحدّثة"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s ك.بايت"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "بلا تقييم حتى الآن"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "تقييمه %s من أصل 5 نجوم"
@@ -6845,13 +6017,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A %e %b"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "أنش�ئت %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "أصد�ر %1$s"
@@ -6864,181 +6036,181 @@ msgstr "أغل�ق"
 msgid "statistics_help_link"
 msgstr "مساعدة"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "أو اختر إضا�ة أخرى"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "أو اختر إضا�ة لها إحصائيات عامة"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr ""
 "اختر واحدة من إضا�اتك لعرض إحصائياتهاSelect one of your add-ons to view its "
 "statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "اختر إضا�ة لعرض إحصائياتها"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "اختر إضا�ة لها إحصائيات عامة"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "لوحة الإحصائيات"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "اعرض الإحصائيات"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "اعرض هذا الجدول �ي تنسيق CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "لا شيء"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "أز�ل هذا المخطّط"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "تجميع حسب: اليوم"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "تجميع حسب: الشهر"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "تجميع حسب: الأسبوع"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "قار�ن حسب: الأسبوع"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "و�جد %s �ي المجال"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "أض�� مخططًا"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "أض�� مخططًا آخر لهذا الرسم البياني"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "أخ�� المجموع الكامل"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "أظه�ر المجموع الكامل"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "أض�� المجموع الكامل �ي هذا الرسم البياني"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "شاهد البيانات (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "احصل على مل� من هذه البيانات ق�يَم�ه� م�صولة ب�اصلة"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "أخ�� أحداث %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "أظه�ر أحداث %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "أظه�ر تواريخ إصدار الإضا�ة على المخططات"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "أخ�� أحداث �َيَر��كس"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "أظه�ر أحداث �َيَر��كس"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "عيّن تواريخ إصدار �َيَر��كس على المخططات"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "قلّص الرسم البياني"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "وسّع الرسم البياني"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "غيّر حجم الرسم البياني"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "المستخدمون النشطون يوميًا"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "التطبيق"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "مخصص"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "التنزيلات"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "نظام التشغيل"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "حالة الإضا�ة"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "الملخص"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "إصدارة الإضا�ة"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "التطبيق"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "نظام التشغيل"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "حالة الإضا�ة"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "مجهول"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "إصدارة الإضا�ة"
 
@@ -7073,7 +6245,7 @@ msgstr "لقد ح�دّثت إعداداتك!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "لوحة الإحصائيات"
 
@@ -7101,104 +6273,108 @@ msgstr "رؤية أبعد"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "رؤية أبعد بشهر واحد"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "ملخص الإحصاءات اليومية ل� %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "تلقيم RSS لبيانات الملخص"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A، %e %B، %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "إحصائيات %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "بشكل ا�تراضي، لا ي�سمح إلا لك ولموزيلا �قط بالوصول إلى المعلومات التي �ي لوحة "
 "قيادتك. غير أنه بإمكانك �تح ذلك للعموم ليتمكّن أي شخص من مشاهدة بيانات إضا�تك."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "حقّ الوصول إلى لوحة القيادة"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "خاص"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "أنت وموزيلا �قط تستطيعان مشاهدة إحصائيات الإضا�ة"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "عام"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "أيّ شخص يمكنه مشاهدة إحصائيات هذه الإضا�ة"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "غيّر الإعدادات"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "تعامل رجاءً مع هذه المعلومات على أنها سرّية."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "لوحة القيادة هذه <b>خاصة</b> حاليًا."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "لوحة القيادة هذه <b>عامة</b> حاليًا."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "مق�لة"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "ع�د إلى لوحة القيادة"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "اح�ظ الإعدادات"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "إعدادات لوحة الإحصائيات ل� %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "غير مق�لة"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "تطبيق"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "نظام تشغيل"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "حالة"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "مجهول"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "إصدارة"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "متوسط التنزيلات اليومية"
 
@@ -7210,7 +6386,7 @@ msgstr "التنزيلات"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "إحصاء آخر يوم"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "التنزيلات �ي آخر 7 أيام"
 
@@ -7228,7 +6404,7 @@ msgstr "منذ %1$s"
 msgid "statistics_summary_nodata"
 msgstr "لا بيانات حتى الآن"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "متوسط المستخدمين النشطين يوميًا"
 
@@ -7254,70 +6430,53 @@ msgstr "المستخدمون النشطون يوميًا"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "�ي %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "إحصائيات %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "كل السمات"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "استعرض السمات"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "غيّر البريد الإلكتروني"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "غيّر كلمة السر"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "أرس�ل رمز التأكيد!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "ح�ذ� حساب مستخدمك %1$s بنجاح. إن أردت العودة �ي وقت لاحق، يمكنك إعادة التسجيل "
 "�ي <a href=\"%2$s\">ص�حة تسجيل المستخدم</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "مجتمع إضا�ات موزيلا حزين لرؤيتك ترحل."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "أكّد كلمة السر"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "احذ� حساب المستخدم الآن"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "لا يمكنك حذ� حسابك إن كنت أحد <a href=\"%1$s\">المؤل�ين لأي إضا�ة</a>. لحذ� "
@@ -7325,75 +6484,75 @@ msgstr ""
 "المؤل�ين لإضا�اتك، ثم يمكنك بعدها أن تحذ� حسابك هنا."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "إن كان لديك أسئلة إضا�ية، تواصل مع %1$s للحصول على المساعدة."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "عليك أن تؤشّر على الصندوق \"أ�هم ذلك...\" لكي نستطيع أن نحذ� لك حسابك."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "أدخ�ل رجاءً كلمة سرّك بشكل صحيح ليمكن القيام بهذه الخطوة."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "حصل خطأ غير معرو� أثناء حذ� حسابك. تواصل رجاءً مع %1$s وبلّغه عن المشكلة وسو� "
 "نحذ�ه من أجلك. نعتذر عن هذا الخطأ."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "تأكيد حذ� الحساب"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "حذ� حساب المستخدم %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "وداعًا!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "لن يعود باستطاعتك تسجيل دخولك إلى إضا�ات موزيلا بعد ذلك."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "عند النقر على \"احذ�\"، <strong>سي�حذ� حسابك نهائيًا</strong>، وهذا يعني:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr "أنّ مراجعاتك وتقييماتك لن ت�حذ�، ولكنها لن تعود مرتبطة بك بعد ذلك."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "إن كان لديك مشكلة ميّنة �قد نستطيع المساعدة. رجاءً لا تحذ� حسابك الآم، ولكن "
 "تواصل معنا �ي %1$s وسنبذل جهدنا لمساعدتك �ي حل مشكلتك."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "أنا أ�هم أنه لا يمكن التراجع عن هذه الخطوة."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "مستخدم محذو�"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "أرس�لت رسالة إلى %1$s لتأكيد بريدك الإلكتروني الجديد. ليأخذ التغيير م�عوله، "
 "عليك أن تنقر على الوصلة الموجودة �ي تلك الرسالة. حتى ذلك الوقت، يمكنك "
 "المتابعة مع بريدك الإلكتروني الحالي."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "احذ� حساب المستخدم"
 
@@ -7419,7 +6578,9 @@ msgstr ""
 "-- �ريق عمل إضا�ات %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "لقد طلبت تغيير بريدك الإلكتروني �ي إضا�ات %2$s.\n"
@@ -7459,110 +6620,89 @@ msgstr ""
 "شكرًا،\n"
 "-- �ريق عمل إضا�ات %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "إعادة تعيين كلمة السر لإضا�ات %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "خطأ!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "ي�رجى منك تأكيد تغييرك للبريد الإلكتروني �ي إضا�ات %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "نجحت!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "لقد غيّرت بريدك الإلكتروني بنجاح. استخدم %1$s من الآن �صاعدًا لتسجيل دخولك."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "أكّد كلمة السرّ"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "حرّر مل� المستخدم الشخصي ل� %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "البريد الإلكتروني"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "الاسم الأول"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "أخ�� البريد الإلكتروني"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "عنوان موقع الوب"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "الاسم الأخير"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "تسجيل دخول المستخدم"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "كلمة السر الجديدة"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "الاسم المستعار"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "كلمة السر القديمة"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "إجراءات أخرى"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "كلمة السر"
 
@@ -7570,64 +6710,64 @@ msgstr "كلمة السر"
 msgid "user_form_registration"
 msgstr "تسجيل المستخدم الجديد"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "تذكّرني على هذا الحاسوب"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "إظهار ساحة اللعب؟"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "اح�ظ"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "سجّل دخولي"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "سجّل"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "مستخدم لإضا�ات %s منذ"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "أنشئ حساب مستخدم جديد"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
-msgstr "توا�قية الإضا�ة (م�زكَّاة بقوة)"
+msgstr "توا�قية الإضا�ة (منصوح بها بشدة)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "الأحداث والمسابقات القادمة"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "لا يوجد حاليًا تنبيهات متاحة لك لإعدادها."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "قد ترسل لك موزيلا، من وقت لآخر، رسالة تتكلم عن الإصدارات القادمة وأحداث "
 "الإضا�ات. اختر رجاءً المواضيع التي تهتم بها مما يلي:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "تحت�ظ موزيلا بحقها �ي التواصل معك شخصيًا بخصوص أمور معينة تتعلق بإضا�اتك "
 "الم�ستضا�ة عندها."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "هناك أخطاء �ي التعديلات التي أجريتها. صحّحها رجاءً ثمّ أعد الإرسال."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "ح�دّث المل� الشخصي."
 
@@ -7640,15 +6780,15 @@ msgstr "أع�د تعيين كلمة السر ل� %s"
 msgid "user_pwreset_header"
 msgstr "إعادة تعيين كلمة السر"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "نسيتَ كلمة سرّك؟"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "أرس�لت وصلة إعادة تعيين كلمة السر إلى بريدك الإلكتروني."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "أ�عيدَ تعيين كلمة السر بنجاح."
 
@@ -7660,7 +6800,7 @@ msgstr "أرس�ل تعديل كلمة السر"
 msgid "user_pwreset_submit_sendlink"
 msgstr "أرس�ل وصلة إعادة تعيين كلمة السر"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "إضا�ات %s"
@@ -7674,7 +6814,7 @@ msgstr ""
 "لتتمكن من تسجيل دخولك إلى إضا�ات %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7685,24 +6825,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "نعيد إرسال رسالة التأكيد"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "تهانينا! لقد أنشئ حساب مستخدمك بنجاح."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7713,30 +6839,20 @@ msgstr ""
 "�ي الأعلى."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "شكرًا على تسجيلك معنا ومرحبًا بك �ي %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "مطلوب منك أن ت�دخل اسمك الأول أو الأخير أو الاسم المستعار."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "التنبيهات"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "مل� المستخدم الشخصي"
 
@@ -7744,66 +6860,50 @@ msgstr "مل� المستخدم الشخصي"
 msgid "user_verified_okay"
 msgstr "جرى التحقق منه بنجاح!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "حذ� حساب المستخدم"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "تحرير حساب المستخدم"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "الإضا�ات من %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "الاسم"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "مل� المستخدم الشخصي"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "البريد الإلكتروني"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "ص�حة البداية"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "الاسم المستعار"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "معلومات المستخدم ل� %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "مراجعات ل� %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "تسجيل دخول المستخدم"
 
@@ -7835,690 +6935,5 @@ msgstr "إعادة تعيين كلمة سر المستخدم"
 msgid "users_register_pagetitle"
 msgstr "تسجيل المستخدم الجديد"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "الإضا�ة التالية"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "الإضا�ة السابقة"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "أحدث إصدارة متوا�قة مع"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "تاريخ الإصدارات الكامل"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "الأحدث:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "الأكثر شعبية:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "نزكّي:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "المحدّثة مؤخرًا:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "شاهد الكل"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "شاهد كل الإضا�ات المزكَّاة"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "ذات التقييم الأعلى أولًا"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "المحدّثة مؤخرًا أولًا"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "الأكثر شعبية أولًا"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "لا تعلن هذه الإصدارة من إضا�تك تو�قيتها مع �ير�كس %1$s. تتوقع موزيلا صدور "
-#~ "النسخة القادمة من �ير�كس قريبا، �من �ضلك اختبر إضا�تك مع النسخة الجديدة "
-#~ "ثم حدّث معلومات التوا�قية. طالع المزيد عن هذا <a href=\"%2$s\">هنا</a>. "
-#~ "هذا مجرد إخطار، وتستطيع مواصلة إرسال هذه النسخة إلى addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "ع�طّلت الإضا�ة بنجاح"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "تحرير الإضا�ة"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "��عّ�لت الإضا�ة بنجاح"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "وص� الإضا�ة"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "ات�اقية ترخيص المستخدم"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "ص�حة بداية الإضا�ة"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "اسم الإضا�ة"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "سياسة الخصوصية"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "ملخص الإضا�ة"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "بريد الدعم"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "موقع الدعم"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "ملاحظات الإصدارة"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "ترشيح الإصدارة"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "ر�شّحت الإصدارة!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "ز�ر ص�حة %1$s للقيام بتعديلات على ما أرسلته، أو %2$s للعودة إلى أدوات "
-#~ "المطوّرين."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "انقر هنا"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "حرّر الإضا�ة"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "هذه النسخة و�ضعت �ي ساحة اللعب ريثما تنتظر المراجعة من المختبرين �ي ساحة "
-#~ "اللعب و محرّر إضا�ات موزيلا. سو� ت�نبّه بريديًا عند حصول أي حدث."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "يمكنك قراءة المزيد عن نظام ساحة اللعب %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "هنا"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "و�ض�عت هذه النسخة �ي ساحة اللعب ليستخدمها المستخدمين الخبراء. يجب عليك أن %"
-#~ "s إضا�تك وأن تخضع للمراجعة، لتنشر �ي الموقع العام."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "رشّح"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "إرسالك للإضا�ة قد اكتمل بنجاح."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "لأن إضا�تك موثوق بها، سو� ي�وا�َق على نشر هذه الإصدارة آليًا على الملأ."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "إرسال الإضا�ة"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "ح�دّثت الإضا�ة بنجاح"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "قد ترغب ب� %s من أجل زيادة الاهتمام بإضا�تك."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "ار�ع معاينة"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "تعذر إيجاد المؤل� [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "أز�ل"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "ألغ�"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "أمتأكد أنك تريد إلغاء الإرسال؟"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "التالي"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "غيّر نوع الإضا�ة:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "ح�دّثت تعليقات المطوّر."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "أض�� معاينة"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "المؤل�"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "المؤل�ون"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "لا أحد"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "التصني�ات"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "التصني�"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "الوص�"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "م�عطّل"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "المعرّ� ال�ريد"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "الت�اصيل"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "تعليقات المطوّر"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "المعاينات"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "الإصدارات"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "ص�حة البداية"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "لا يوجد"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "لا عنوان"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "لا يوجد معاينات."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "تحديث"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "بريد الدعم"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "لم يزوّد المطوّر بريدًا للدعم."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "موقع الدعم"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "لم يزوّد المطوّر موقعًا للدعم."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "موثوق بها"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "لا إصدارات موجودة."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "ألغ� وع�د إلى الخل�"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "نعم، عطّلها"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "أمتأكد أنك تريد أن تعطّل الإضا�ة؟"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "تعطيل هذه الإضا�ة سيخ�يها عن البحث ومن القوائم، ولن يعود بالإمكان تنزيلها "
-#~ "من موقع الوب كما لن تظهر �ي التماسات التحديثات عند العميل. عمليًا، ستصبح "
-#~ "الإضا�ة �ي حكم المحذو�ة، غير أنه بإمكانك العودة إلى هنا وإعادة تمكينها "
-#~ "وقتما تشاء."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "تعطيل %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "نعم، مكّنها"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "أمتأكد أنك تريد تمكين هذه الإضا�ة؟"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "تمكين هذه الإضا�ة سيعيد إظهارها عند البحث و�ي القوائم. سيصبح تنزيلها "
-#~ "ممكنًا من موقع الوب أو عن طريق التماس التحديث من ق�بَل العميل."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "تمكين %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "أض� المؤل�"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "بريد المؤل� الإلكتروني"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "أز�ل"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "لا يوجد تصني�ات متاحة لهذا النوع من الإضا�ات."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "المؤل�ون"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "أض�� أيقونة"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "غيّر الأيقونة"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "اسمح للمستخدمين بتص�ح مصدر المل� وهم على اتصال"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "التصني�ات"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "اللغة المبدئية"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "امسح �قط الأيقونة الموجودة"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "مل� أيقونة جديد"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "أيقونة"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "قليل من المعلومات الإضا�ية (مثل اسم اللهجة المحلية)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "حدّث"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">الاسم "
-#~ "المختصر للغة</a>، مثل 'ar'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "المل�ات المؤشّر عليها سو� ت�حذ�."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "المل�ات"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "التطبيقات الهد�"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "لا مل�ات."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "ملاحظات إلى المراجع"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "حدّث"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "الملخصات محدودة بعدد حرو� أقصى هو 250 حر�ًا.\n"
-#~ "(لقد أدخلتَ %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "اسم الإضا�ة موجود مسبقًا �ي قاعدة البيانات. رجاءً تأكد أن: <br /"
-#~ "><li>المعرّ�ات ال�ريدة متطابقة، إذ أن السبب الشائع لهذا الخطأ هو عدم تطابق "
-#~ "المعرّ�ات ال�ريدة.</li><li>ليس لديك إدخال آخر بن�س الاسم �ي قاعدة "
-#~ "البيانات. إن كان لديك واحد، �عليك تحديثه، أو حذ�ه والمحاولة من جديد.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "ص�� رجاءً التعديلات التي يتضمنها تحديث هذه الإضا�ة."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "ليست كل معرّ�ات المل�ات ال�ريدة متطابقة"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "هناك إصدارة مشابهة (%s) موجودة مسبقًا من هذه الإضا�ة لهذه المنصة."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "يجب أن تزوّد الت�اصيل المطلوبة من أجل الترشيح."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "لا يمكنك ترشيح إضا�ة �ي مرحلة ما قبل الإصدار."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "يمكنك ترشيح الإضا�ات التي �ي ساحة اللعب �قط."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "حصل خطأ عند محاولة ح�ظ بياناتك."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "أنت لا تملك الصلاحيات لتحديث هذه الإضا�ة."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "أض�� مل� منصة تشغيل آخر"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "أض�� مؤل�ًا"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "أز�ل"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "تصني�ات نوع الإضا�ة الجديد ستكون متاحة �ي الخطوة التالية."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "لا تصني�ات متاحة لهذا النوع من الإضا�ات."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "رجاءً أدخ�ل وص�ًا لإضا�تك."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "رجاءً أدخ�ل اسمًا لإضا�تك."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "اختر رجاءً نوع الإضا�ة التي ترسلها."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "أدخ�ل رجاءً ملخصًا لإضا�تك."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "مل� الإضا�ة"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "مل� الإضا�ة 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "مل� الإضا�ة 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "نوع الإضا�ة"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "اسمح للمستخدمين برؤية مصدر المل�ات وهم على اتصال"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "بريد المؤل� الإلكتروني"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "المؤل�ون"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "التصني�ات"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "اللغة المبدئية"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "الوص�"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "ات�اقية ترخيص المستخدم (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "هذه الإضا�ة تتطلب برنامجًا خارجيًا"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "المل�ات"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "ص�حة البداية"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "مل� الأيقونة"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "الاسم"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "منصات التشغيل المدعومة"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "هذه ما-قبل-إصدارة"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "سياسة الخصوصية"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "هذه إضا�ة خاصة بمواقع معينة"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "الملخص"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "بريد الدعم"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "موقع الدعم"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "التطبيقات الهد�"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "الإصدارة"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "ملاحظات الإصدارة"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "لا شيء"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "ملاحظات للم�راجع"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "لأنّ إضا�تك موثوق بها، ي�رجى منك اختيار المكان الذي ستذهب إليه هذه الإصدارة:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "الساحة العامة"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "ساحة اللعب"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "ات�اقية المطوّر"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "الخطوة الأولى"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "ر�ع المل�"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "الخطوة الثانية"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "ت�اصيل الإضا�ة"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "الخطوة الثالثة"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "ت�اصيل الإصدارة"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "الخطوة الرابعة"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "الترجمة"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "الخطوة الخامسة"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "نجاح"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "إضا�اتي"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "ع�د إلى ت�اصيل الإضا�ة"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "نوع الإضا�ة المكتشَ� آليًا: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "اللغة الا�تراضية لهذه الإضا�ة (%1$s [%2$s]) تختل� عن لغتك التي اخترتها (%3"
-#~ "$s [%4$s]). يجب أن ت�كمل الحقول أدناه باللغة %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "غير صحيح؟"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "أمتأكد أنك تريد حذ� هذا المل�؟"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "تغاضَ عن تحديث معلوماتي الحالية عن الإضا�ة"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "إرسال الإضا�ات معطل حاليًا. ي�رجى إعادة المحاولة لاحقًا."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "أوا�ق"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "أر�ض"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "لقد عطّل المدير هذه الإضا�ة."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "معطّلة"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "موثوق بها"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "أنت لا تملك أي إضا�ات. انقر %s لإرسال واحدة."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "هنا"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "تأكّد رجاءً من %s ل�س�مَت�ك."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "ر�ع معاينة"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "تحرير الإصدارة"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "ح�دّثت الإصدارة بنجاح."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "جديد"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "م�حدَّث"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "أنواع الإضا�ات"
-
-#~ msgid "editors_th_age"
-#~ msgstr "العمر"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "التطبيقات"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "المنصات"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "أنواع الإرسال"
-
-#~ msgid "error_notice"
-#~ msgstr "ملاحظة"
-
-#~ msgid "forum_save"
-#~ msgstr "اح�ظ"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "الملحقات"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "الإضا�ات التجريبية"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "عودة إلى الص�حة السابقة"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "هذه هي الص�حة %1$s من اصل %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "لا إضا�ات مطابقة"
-#~ msgstr[1] "إضا�ة واحدة مطابقة"
-#~ msgstr[2] "إضا�تان مطابقتان"
-#~ msgstr[3] "%s إضا�ات مطابقة"
-#~ msgstr[4] "%s إضا�ة مطابقة"
-#~ msgstr[5] "%s إضا�ة مطابقة"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "تلقيم RSS لبيانات الملخص"
diff --git a/site/app/locale/ca/LC_MESSAGES/messages.po b/site/app/locale/ca/LC_MESSAGES/messages.po
index 2d8aa0a..f1133c2 100644
--- a/site/app/locale/ca/LC_MESSAGES/messages.po
+++ b/site/app/locale/ca/LC_MESSAGES/messages.po
@@ -23,169 +23,160 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 0.2\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancel·la la instal·lació"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
-msgstr "Baixa ara el %s"
+msgstr "Baixa ara %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accepta i baixa"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accepta i instal·la"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Públic"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Entorn de proves"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Actualitza %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versió %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "baixades"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "baixades en total"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "baixades per setmana"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s complement"
 msgstr[1] "%1$s complements"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per pàgina"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordenat per:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomanat"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s no està disponible per al %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Torna a %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Torna a les revisions..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Valoració:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Comentari:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Envieu el vostre comentari"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Envia una revisió per a %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Títol/resum:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Suprimeix"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Respon"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Voleu suprimir aquesta revisió?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Sí"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Suprimeix la revisió"
 
@@ -194,7 +185,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "La revisió s'ha suprimit satisfactòriament."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Edita una revisió per a %s"
@@ -207,24 +198,24 @@ msgstr ""
 "estan limitades entre 10 i 100 caràcters; la vostra en té %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Atenció: abans que es publiqui la vostra revisió en el lloc web públic, es "
 "moderarà per un editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Resposta al desenvolupador:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
-msgstr[0] "Mostra la última revisió d'aquest complement enviada per %2$s."
+msgstr[0] "Mostra la última revisió d'aquest complement enviada per  %2$s."
 msgstr[1] ""
-"Mostra les %1$s últimes revisions d'aquest complement enviades per %2$s."
+"Mostra les %1$s últimes revisions d'aquest complement enviades per  %2$s."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -236,161 +227,131 @@ msgid "addon_review_pagetitle"
 msgstr "Revisions de %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
-msgstr "resposta per en/la %1$s el %2$s"
+msgstr "resposta per en/nla %1$s el %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Resposta del desenvolupador:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "La vostra revisió s'ha desat satisfactòriament. Gràcies."
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "per %1$s el %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "per %1$s el %2$s (valoració %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Complement següent "
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Complement anterior"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Enllaç permanent a aquesta versió"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "La versió més recent compatible amb el %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Accepta"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Mostra el perfil de l'autor"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Mostra tots els temes :: Complements del %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Mostra %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Mostra %1$s temes :: Complements del %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Què és això?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Afegeix una revisió"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalls avançats"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Afegeix-ho a una col·lecció:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Col·lecció nova..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Selecciona una col·lecció..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publica"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s s'ha afegit a la col·lecció %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Què és això?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "i %1$s col·lecció més"
-msgstr[1] "i %1$s col·leccions més"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "revisió detallada"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "No ha agradat"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editeu la vostra revisió"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Aquest complement té una política de privadesa."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "No ha agradat gens"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Col·leccions relacionades"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentaris del desenvolupador"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Pàgina web"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Llicència del codi font"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Revisions"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Ajuda"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Ha agradat"
 
@@ -398,22 +359,19 @@ msgstr "Ha agradat"
 msgid "addons_display_long_description"
 msgstr "Descripció llarga"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Ha agradat molt"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Més imatges"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Aquest complement encara no està a cap col·lecció."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Altres complements fets per %1$s"
@@ -422,21 +380,21 @@ msgstr[1] "Altres complements fets pels autors següents: %1$s"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "El desenvolupador ofereix ajuda per a aquesta extensió a %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -444,20 +402,21 @@ msgstr ""
 "un missatge a %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "El desenvolupador ofereix ajuda per a aquesta extensió a %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Valoreu-lo"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Ha agradat de debò"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "No envieu cap problema o error als comentaris. Ja que la vostra adreça de "
@@ -466,45 +425,50 @@ msgstr ""
 "solucionar el vostre problema."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Guia per a revisions</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Vegeu la <a href=\"%1$s\">secció d'ajuda</a> per a saber on podeu trobar "
 "ajuda per a aquest complement."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Desa"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Mostra tots els %1$s complements"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Mostra totes les revisions (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Mostra totes les versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Historial de versions complet"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visualitza el codi font"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Mostra les estadístiques"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Què en penseu?"
 
@@ -512,210 +476,109 @@ msgstr "Què en penseu?"
 msgid "addons_display_workswith"
 msgstr "Funciona amb:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Acabat d'afegir"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Recomanat"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Subscriu"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Examina els complements"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Actualitzat"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "per"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Col·leccions populars"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Col·leccions"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> complement"
-msgstr[1] "<strong>%1$s</strong> complements"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Mostra totes les col·leccions"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Les col·leccions són una manera de categoritzar, barrejar, trobar i combinar "
-"complements. Podeu subscriure-us a les col·leccions que han creat altres "
-"usuaris o bé crear-ne un vostre."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriptor"
-msgstr[1] "<strong>%1$s</strong> subscriptors"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Recomanem"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
-"Els complements amplien el %1$s, i us permeten personalitzar la vostra "
+"Els complements estenen el %1$s, i us permeten personalitzar la vostra "
 "experiència de navegació per Internet. Feu-ne una ullada i feu-vos vostre el "
 "%1$s."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Com aquest? Trobeu més complements a %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Hi ha més de 5000 extres</strong> que us permetran personalitzar i "
-"ampliar el Firefox com us faci falta."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Què són els complements?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Fàcil d'instal·lar</strong>, rebreu una avis quan hi hagin "
-"actualitzacions disponibles."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introducció"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Barres d'eines, temes i cercadors que <strong>us ajudaran a realitzar les "
-"tasques del dia a dia.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "El més nou:"
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NOU!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Altres aplicacions"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Complements del %1$s "
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>complement baixat</span>"
-msgstr[1] "<strong>%1$s</strong> <span>complements baixats</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Els més famosos:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>complement fent-se servir</span>"
-msgstr[1] "<strong>%1$s</strong> <span>complements fent-se servir</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Recomanem:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Actualitzat fa poc:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Mostra'ls tots"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Mostra tots els complements creats recentment"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Mostra tots els complements famosos"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Mostra tots els complements recomanats"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Mostra tots els complements actualitzats recentment"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Cliqueu l'enllaç següent per a desar el fitxer.</li><li>En el "
@@ -723,11 +586,11 @@ msgstr ""
 "botó Instal·la, cerqueu el fitxer que us heu baixat i cliqueu \"D'acord\".</"
 "li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Com instal·lar-ho al Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Cliqueu amb el botó dret a l'enllaç de sota i escolliu \"Anomena i "
@@ -736,42 +599,39 @@ msgstr ""
 "el botó Instal·la, cerqueu el fitxer que us heu baixat i cliqueu \"D'acord\"."
 "</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Com instal·lar-ho en el Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "mostra els complements experimentals"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "D'acord"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Per"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "per a Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "per a Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "per a Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -779,11 +639,11 @@ msgstr ""
 "Per a més informació sobre altres connectors disponibles per a navegadors "
 "basats en Mozilla, visiteu  %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Cerqueu un connector que no està en aquesta llista?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Els connectors ajuden al vostre navegador a desenvolupar funcions  "
@@ -793,24 +653,24 @@ msgstr ""
 "existents."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Connectors típics per al %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Connectors"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentació d'ajuda: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -818,40 +678,36 @@ msgstr ""
 "abans de procedir amb la instal·lació:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previsualitzacions del %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Afegit recentment"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Amb tants fantàstics complements disponibles, hi ha sempre alguna cosa per a "
 "tothom. Per a començar, ací teniu una llista dels més populars. Gaudiu-los! "
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Complements recomanats"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Complements recomanats"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos addicionals"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centre de desenvolupament de Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Perdoneu, necessiteu un navegador basat amb Mozilla (com el Firefox) per a "
@@ -866,64 +722,71 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Apreneu com  %1$s al %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/ca/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "feu-vos el vostre propi"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Cerqueu més motors de cerca a %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motors de cerca"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "S'agraeix especialment el projecte Mycroft per a la seva feina amb els "
 "Motors de cerca del Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Comparteix-ho"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Afegeix-ho al Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Posa-ho al Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Publica-ho al Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Comparteix-ho al FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Publica-ho al MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -937,17 +800,17 @@ msgstr "Versió incompleta"
 msgid "addons_status_nominated"
 msgstr "A l'entorn de proves; nominació pública"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "A l'entorn de proves; pendent de revisió"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Públic"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "A l'entorn de proves"
@@ -956,36 +819,26 @@ msgstr "A l'entorn de proves"
 msgid "addons_status_unknown"
 msgstr "Desconegut"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Mostra més informació sobre el complement"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Els més baixats"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Els més ben valorats"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Aneu amb compte amb les versions antigues"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Aquestes versions es mostren només com a referència i per a fer proves. "
 "Sempre heu d'utilitzar les darreres versions dels complements."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Historial de versions amb el registre de canvis"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historial de versions del %1$s"
@@ -1020,431 +873,153 @@ msgstr "Administrador de grups"
 msgid "admin_group_saved"
 msgstr "El grup s'ha desat"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avançat"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Qualsevol hora"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Qualsevol"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Qualsevol"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplicació"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Paraula clau"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Última actualització"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nom"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "El més recent"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Els últims 3 mesos"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Els últims 6 mesos"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "L'últim dia"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "L'últim mes"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "La última setmana"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "L'últim any"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Per pàgina"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Plataforma"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitat"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Valoració"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordena per"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "a"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Commuta el mode de cerca avançada"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tipus"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "Versió"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Següent"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Anterior"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignora la comprovació de versions"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Aquest complement és només per a versions més antigues del Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Podeu <a href=\"%1$s\">provar una versió més antiga</a> o <a href=\"#\" "
 "onclick=\"%2$s\">ignorar aquesta comprovació</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Pot ser que funcioni en una <a href=\"%1$s\">versió més antiga</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Aquest complement requereix una versió del <a href=\"%1$s\">Firefox %2$s</a> "
 "que encara no ha sortit"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Actualitzeu el Firefox</a> per a utilitzar "
 "aquest complement"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "En/na %1$s va canviar l'estat de %2$s a %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr ""
-"En/na %1$s va validar l'acció d'administració desconeguda %2$s amb id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "En/na %1$s va suprimir la característica %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "En/na %1$s va crear l'aplicació %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "En/na %1$s va editar l'aplicació %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "En/na %1$s va crear la versió %2$s del %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "En/na %1$s va suprimir la versió %2$s del %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "En/na %1$s va canviar el valor de '%2$s' de '%3$s' a '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "En/na %1$s va validar l'acció d'editor desconeguda %2$s amb id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "En/na %1$s va esborrar el complement %2$s de la llista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "En/na %1$s va afegir el complement %2$s a la llista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "En/na %1$s va canviar una característica per a l'idioma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr ""
-"En/na %1$s va canviar algun idioma de la llista de característiques del "
-"complement %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "En/na %1$s va recalcular el codi hash del fitxer %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "En/na %1$s va afegir %2$s al grup %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "En/na %1$s s'ha afegit ell/a mateix al grup %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "En/na %1s va crear el grup %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "En/na %1$s va suprimir el grup %2$s (id %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "En/na %1$s va editar el grup %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "En/na %1$s va suprimir l'usuari %2$s del grup %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "En/na %1$s va validar l'acció desconeguda %2$s amb id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "En/na %1$s va intentar modificar el grup bloquejat %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr ""
-"En/na %1$s va intentar modificar les traduccions en %2$s quan no tenia permís"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "En/na %1$s va crear la plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "En/na %1$s va suprimir la plataforma %2$s (id %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "En/na %1$s va editar la plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr ""
-"En/na %1$s va fallar més de dues vegades a l'identificar-se per accedir a %2"
-"$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "En/na %1$s va crear la resposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "En/na %1$s va suprimir la resposta %2$s (id %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "En/na %1$s va editar la resposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "En/na %1$s va aprovar la revisió %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "En/na %1$s va suprimir la revsisió %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr ""
-"En/na %1$s va validar l'acció de seguretat desconeguda %2$s amb id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "En/na %1$s va crear la categoria %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "En/na %1$s va suprimir la categoria %2$s (id %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "En/na %1$s va editar la categoria %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "En/na %1$s va actualitzar les traduccions en %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "En/na %1$s va actualitzar una entrada del bloc de traducció %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "En/na %1$s va actualitzar les traduccions en %2$s de la plataforma"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "En/na %1$s va actualitzar les traduccions en %2$s de les categories"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "En/na %1$s va editar la informació de l'usuari %2$s"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Complements per nom"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Els complements més nous"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Els complements més famosos"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Complements per valoració"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Complements actualitzats recentment"
 
@@ -1453,794 +1028,108 @@ msgid "categories_current_title"
 msgstr "Categoria actual"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Selecció de la categoria"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Categoria %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "La descripció hauria de tenir menys de %1$s caràcters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Col·lecció %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Mostra tots els complements recomanats"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "S'ha produït un error quan es suprimia el complement."
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Mostra el més ben valorat primer"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "S'ha produït un error quan es desava el complement."
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Mostra el més nou primer"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "S'ha produït un error quan es desava el comentari."
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "El més famós primer"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "El nom hauria de tenir menys de %1$s caràcters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Categoria %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "No s'ha trobat l'agrupació."
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Si ja sabeu quins complements voleu afegir a la vostra col·lecció, comenceu "
-"a escriure els seu noms a continuació. Si preferiu fer-ho més tard, cliqueu %"
-"1$s ara."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Escolliu els vostres primers complements"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Crea una col·lecció"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Complements seleccionats"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"Crear-vos la vostre pròpia col·lecció de complements és tan senzill com "
-"omplir els camps següents."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Crea una col·lecció"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Col·leccions"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Més informació"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Afegeix-la a les preferides"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Suprimeix-la de les preferides"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>Podeu visualitzar la vostra nova co·lecció a continuació. Si voleu donar-"
-"li un àlies, afegir-li una icona o modificar més opcions, aneu a la pàgina "
-"<a href='%1$s'>Gestiona les col·leccions</a>.</p><p>Podreu accedir a la "
-"vostra col·lecció des d'aquí: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "La vostra col·lecció ja està feta."
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "En quant a aquesta col·lecció"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s complement en aquesta col·lecció"
-msgstr[1] "%1$s complements en aquesta col·lecció"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Creada per:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Actualitzada:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "S'està afegint a les preferides&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "S'està suprimint de les preferides&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr ""
-"<a href=\"%1$s\">Inicia una sessió</a> per a afegir aquesta col·lecció a les "
-"vostres preferides."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Gestiona la col·lecció"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Data"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Nom"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularitat"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s baixada aquesta setmana"
-msgstr[1] "%1$s baixades aquesta setmana"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Els complements seleccionats se suprimiran després de desar"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"Per a publicar complements nous a aquesta col·lecció, introduïu-ne els noms "
-"a continuació."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"Per a publicar complements nous a aquesta col·lecció, introduïu a "
-"continuació una llista separada per comes dels ID dels complements."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr ""
-"També podeu publicar un complement des de la llista de complements normal."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "%2$s va afegir-lo el %1$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Afegeix un comentari a la publicació"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Suprimeix el comentari de la publicació"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edita el comentari de la publicació"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Atenció: el comentari apareixerà tal com va ser publicat originalment en la "
-"data de publicació."
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Desa el comentari"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Suprimeix"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Afegeix una col·lecció"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Comprova la disponibilitat"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Sí, vull suprimir aquesta col·lecció."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-"Marqueu la casella, i després cliqueu \"%1$s\" per a suprimir la col·lecció."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Després de clicar el botó \"%1$s\", es suprimirà la vostra col·lecció. Si no "
-"voleu suprimir la vostra col·lecció, no marqueu la casella de confirmació de "
-"la pestanya \"%2$s\" i continueu editant la col·lecció. Si abandoneu aquesta "
-"pàgina sense desar-la, la vostra col·lecció tampoc s'esborrarà."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "La vostra col·lecció es suprimirà."
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Cal que introduïu una descripció de la vostra col·lecció."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "S'ha produït un error mentre es pujava la vostra icona."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Cal que doneu un nom a la col·lecció."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Si escolliu un àlies, cal que sigui únic."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Nom del complement:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Aplicació associada"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Seleccioneu l'aplicació amb la qual funciona la vostra col·lecció."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Tipus de col·lecció"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Suprimeix la col·lecció"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Si suprimiu la col·lecció, s'esborrarà per sempre."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Descripció de la col·lecció"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr ""
-"Descriviu breument la vostra col·lecció i el tipus de complements que conté"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Icona"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"Podeu pujar icones tipus JPG, GIF o PNG, les icones s'escalaran a 32x32 "
-"píxels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Qui podrà veure la vostra col·lecció?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"Per defecte, la col·lecció apareixerà en el Directori de col·leccions públic "
-"i la podrà veure tothom. Si voleu restringir la visibilitat de la vostra "
-"col·lecció a només a les persones a qui li heu donat un enllaç especial, "
-"marqueu la següent opció."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Només les persones que jo inviti podran veure la meva col·lecció"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Tothom pot veure la meva col·lecció en el directori"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Qui pot gestionar la meva col·lecció?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Aquests usuaris poden publicar complements a la vostra col·lecció, gestinar-"
-"los, canviar-ne les opcions i modificar els permisos d'altres usuaris."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Nom de la col·lecció"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Cal que doneu un nom descriptiu a la vostra col·lecció, com per exemple "
-"\"Els millors complements per a viatges d'en David\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Àlias de la col·lecció"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-"Opcionalment, podeu donar un àlias únic a la vostra col·lecció per a trobar-"
-"la més ràpidament:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Qui pot publicar complements a la vostra col·lecció?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Aquests usuaris poden publicar complements a la vostra col·lecció i suprimir "
-"només els que hagin publicat."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Introduïu l'adreça electrònica d'un compte de Firefox Add-ons:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Els comptes seleccionats es suprimiran quan es desi"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Introduïu una llista d'adreces electròniques de comptes de Firefox Add-ons "
-"separades per comes"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Només jo"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Jo i aquests usuaris:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Afegeix"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Gestiona %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Gestiona el contingut de la col·lecció"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Complements actuals:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Opcions avançades"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Gestiona els permisos de la col·lecció"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel·la"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Suprimeix la icona"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Canvia la icona"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "La icona es suprimirà quan cliqueu el botó \"%1$s\""
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "L'àlies està disponible"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"El vostre àlies té caràcters incorrectes i s'ha de corregir. Torneu-ho a "
-"intentar."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "L'àlies ja està agafat"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "La vostra col·lecció es pot accedir des d'aquesta ubicació:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "La vostra col·lecció s'ha desat satisfactòriament."
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Actualitza la col·lecció"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Suprimeix la col·lecció"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Complements"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avançades"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Nom &amp; detalls"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permisos"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr ""
-"Complements que poden vigilar els vostres fills i controlar el vostre "
-"calendari."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Organitzador familiar"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Mireu-vos l'Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Crea una col·lecció"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Vés"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>Encara no teniu col·leccions preferides.</strong></p> <p>Les "
-"col·leccions que marqueu com a preferides es poden accedir ràpidament des "
-"d'aquesta pàgina, i apareixeran en <a href='%1$s'>l'Add-on Collector</a> si "
-"encara no el teniu.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>Encara no heu creat cap col·lecció. Les col·leccions són fàcils de crear "
-"i omplir amb els vostres complements preferits.  <a href='%1$s'>Proveu-ho</"
-"a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Col·leccions"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "creada per %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Què són les col·leccions?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Ordena per"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Les destacades per un editor"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Les meves preferides"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Les meves col·leccions"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Les més famoses de tots els temps"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Les més populars d'aquest mes"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Les més noves"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Les més populars d'aquesta setmana"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Hi ha una nova manera per a gestiona i trobar els millors complements. "
-"Comenteu, compartiu i sincronitzeu les col·leccions, i tot des del vostre "
-"navegador"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"Les col·leccions són agrupacions de complements que s'han aplegat per a "
-"compartir-los fàcilment."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "S'ha afegit %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Complements que poden millorar la cerca en línia."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Taula de referències"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Complements per a gestionar les vostres xarxes socials."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Circuït social"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Tanca"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"S'ha produït un error mentre s'intentava afegir una col·lecció preferida. "
-"Potser aquesta col·lecció ja era una preferida?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "No em tornis a mostrar aquest missatge."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "La col·lecció %1$s s'ha afegit a les preferides."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"Ara podeu trobar ràpidament aquesta col·lecció des de la pestanya <a href=\"%"
-"1$s\">%2$s</a> del directori. Si encara voleu trobar les vostres "
-"col·leccions preferides més fàcilemnt, proveu l'extensió del Firefox <a href="
-"\"%3$s\">Add-on Collector</a>."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "S'ha suprimit la col·lecció."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Complements que us poden convertir en una agència de viatges."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Agència de viatges"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Publicació automàtica"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Destacada per un editor"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"S'ha produït un error mentre s'intentava suprimir una col·lecció preferida. "
-"Potser aquesta col·lecció no era preferida?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "La col·lecció %1$s s'ha suprimit de les vostres preferides."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Complements per a crear fàcilment el perfecte lloc web."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Barra d'eines del desenvolupador web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Què són les col·leccions?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Llegiu les PMF"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Hi ha una nova manera de gestionar i trobar els vostres complements "
-"preferits. Comenteu, compartiu i sincronitzeu col·leccions de complements. "
-"Tot des del vostre navegador."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Pàgina web de l'Add-on Collector"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Baixeu-vos l'Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logotip de l'Add-on Collector"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centre de compatibilitat dels complements"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Prepareu-vos per a la versió final del %1$s amb les eines i la informació "
 "disponible per a la comunitat de complements del %2$s que trobareu a "
 "continuació."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "S'estan carregant les dades..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Torna a l'inici"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Informe de compatibilitat del complement"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informació per als desenvolupadors de complements"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajusta el maxVersion sense pujar el fitxer"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Comprova l'estat dels complements"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Si teniu complements hostatjats al Mozilla Add-ons, <a href=\"%1$s"
 "\">registreu-vos</a> per a veure l'estat dels vostres complements per al %2"
 "$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logotip del Centre de desenvolupadors de Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "No teniu cap complement hostatjat al Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Resultats de la comprovació del complement"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "S'està recuperant l'estat dels complements hostatjats..."
 
@@ -2248,121 +1137,121 @@ msgstr "S'està recuperant l'estat dels complements hostatjats..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s usuaris (%3$s&#37; del total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Els següents complements, que es mostren ordenats segons la utilització, "
 "tenen una utilització superior al 95%, segons les dades que disposa Mozilla. "
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Mostra l'informe detallat"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Dels %1$s complements que tenen una utilització superior del 95&#37;, que "
 "tingui constància Mozilla, <b>%2$s&#37;</b> es consideren actualment "
 "compatibles amb l'última versió del %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versions Alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Complements compatibles amb una versió alfa del %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versions Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "Complements compatibles amb una versió beta o amb una versió candidata a "
 "versió final del %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Última versió"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Complements actualitzats per a l'última versió del %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Altres versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Complements que no són compatibles amb cap de les versions del %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Informe de compatibilitat del complement"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informació per als usuaris del complement"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Mostra l'informe de compatibilitat"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Per a més informació de com contribuir, consulteu la nostra %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pàgina wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla voldria agrair a les persones següents la contribució al projecte "
 "addons.mozilla.org al llarg dels anys:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Desenvolupadors"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Traductors"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Altres col·laboradors"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Antics desenvolupadors"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Programes i imatges"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Algunes icones que s'han utilitzat són del <a href=\"http://www.famfamfam."
@@ -2370,30 +1259,28 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
-"Algunes pàgines utilitzen elements de <a href=\"http://www.simile-widgets."
-"org/timeplot/\">Timeplot</a>, que té una <a href=\"http://simile.mit.edu/"
-"license.html\">llicència BSD</a>."
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2428,36 +1315,46 @@ msgstr "Estadístiques"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr ""
-"El fitxer %1$s té una extensió que no és vàlida (%2$s). Les extensions "
-"permeses són: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr ""
-"El fitxer %s no s'ha pogut desar a la base de dades. Torneu-ho a provar."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr ""
-"S'ha reemplaçat satisfactòriament la previsualització %1$s amb el fitxer %2"
-"$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr ""
-"S'ha pujat satisfactòriament el fitxer %s. A continuació podeu afegir-li un "
-"títol."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detecta)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Aquesta versió del vostre complement diu que no és compatible amb el Firefox "
+"%1$s. Mozilla preveu que la propera versió del Firefox sortirà aviat, per "
+"tant proveu el vostre complement amb la nova versió i actualitzeu la "
+"informació de compatibilitat. Sobre tot això també se'n parla <a href=\"%2$s"
+"\">aquí</a>. Això només és un avís i podeu continuar amb l'enviament "
+"d'aquesta versió a l'addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Obre en una nova finestra"
@@ -2494,835 +1391,1382 @@ msgstr "Pas 5: Fi"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda a la publicació"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "S'ha deshabilitat el complement correctament"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edita el complement"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "S'ha habilitat el complement correctament"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descripció del complement"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "ALUF (EULA)"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Pàgina web del complement"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nom del complement"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Text de la previsualització"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Activa el complement"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Política de privadesa"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Resum del complement"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Correu per a problemes"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL per a problemes"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Notes de la versió"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nomina el complement"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "S'ha nominat el complement correctament"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Activa el vostre complement, el mostra a les llistes públiques i habilita el "
-"servei de validació d'actualitzacions."
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Dóna per acabat el complement"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Dóna per acabat el complement i el passa a l'entorn de proves"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Desactiva el complement"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Desactiva el vostre complement, l'oculta de les llistes públiques i "
-"deshabilita el servei de validació d'actualitzacions."
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Mou-lo a l'entorn de proves"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Torna el vostre complement a l'entorn de proves. Això és reversible."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Nomina'l per a fer-lo públic"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Nomina el vostre complement per a fer-lo públic"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Publica el complement"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Torna a fer públic el vostre complement."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"El vostre complement està <span class=\"inactive-0\">Actiu</span>. Això vol "
-"dir que s'està mostrant a totes les llistes corresponents al seu estat."
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Cal complir tots els criteris anteriors abans de completar el vostre "
-"complement i moure'l a <span class=\"status-1\">l'entorn de proves</span>."
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Ara podeu completar el vostre complement i moure'l a <span class=\"status-1"
-"\">l'entorn de proves</span> clicant el botó següent."
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Com a mínim cal seleccionar una categoria"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Fa falta escriure una descripció del complement"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Cal donar un nom al complement"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "El complement no està marcat com a versió candidata a final."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr ""
-"Com a mínim cal una imatge de previsualització per a les extensions i temes."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Cal un resum del complement"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Estat del complement: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Accions disponibles"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Estat actual: <span class=\"inactive-0\">Actiu</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Criteris per a completar el complement"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Estat actual: <span class=\"inactive-1\">Inactiu</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Criteris per a la nominació pública"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Nivell de confiança: <span class=\"status-4\">de confiança</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"El vostre complement està <span class=\"inactive-1\">inactiu</span>. Això "
-"vol dir que el vostre complement no es mostrarà a cap llista, tot i el "
-"nivell de confiança anterior. I no se'n publicarà <b>cap</b> actualització "
-"al servei de comprovació d'actualitzacions."
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"Cal que compliu tots els criteris anteriors abans de nominar el vostre "
-"complement i esdevingui <span class=\"status-4\">públic</span>."
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Ara podeu nominar el vostre complement per a què es faci <span class="
-"\"status-4\">públic</span> clicant el botó següent."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Públic"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "A l'entorn de proves"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"El vostre complement l'ha <span class=\"status-5\">deshabilitat</span> un "
-"administrador i no es pot utilitzar. Si voleu fer cap pregunta, escriviu un "
-"correu a %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
 msgstr ""
-"El vostre complement actualment està <span class=\"status-0\">incomplet</"
-"span>. Això significa que no es mostra enlloc del web ni al servei "
-"d'actualitzacions. Podeu tornar a aquesta pàgina per a completar el vostre "
-"complement, i un cop compleixi els criteris següents ja es podrà moure a "
-"<span class=\"status-1\">l'entorn de proves</span>."
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
-"El vostre complement actualment està nominat per a esdevenir <span class="
-"\"status-4\">públic</span> i està a punt per a ser revisat per un editor. A "
-"la cua de nominacions hi ha %s complements més."
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
 msgstr ""
-"El vostre complement està pendent. Això no hauria d'haver passat. Escriviu "
-"un correu a %s amb l'ID del vostre complement i expliqueu que teniu aquest "
-"error."
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
 msgstr ""
-"El vostre complement és <span class=\"status-4\">públic</span>, això "
-"significa que s'està mostrant a totes les llistes i cerques i que es pot "
-"baixar sense cap restricció. També estan disponibles les actualitzacions del "
-"vostre complement a través del servei de comprovació d'actualitzacions."
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
 msgstr ""
-"El vostre complement està a <span class=\"status-1\">l'entorn de proves</"
-"span>, això vol dir que es mostrarà a en les llistes i les cerques, però els "
-"usuaris s'hauran de registrar i baixar-se'l. I no es publicarà <b>cap</b> "
-"actualització a través del servei de comprovació d'actualitzacions."
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Estat del %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
-"El vostre complement és <span class=\"status-4\">de confiança</span>. Això "
-"significa que podeu enviar actualitzacions del vostre complement sense la "
-"revisió d'un editor."
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visiteu la pàgina del %1$s per a fer canvis a la vostra publicació, o bé a %2"
+"$s per a tornar al tauler de control del desenvolupador."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "Cliqueu ací"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edita el complement"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"La versió s'ha posat en l'entorn de proves mentre s'espera que la provi "
+"algun provador i un editor de complements de Mozilla. Rebreu un correu "
+"electrònic quan s'hagi decidit alguna cosa."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Trobareu més informació sobre el sistema de revisió i l'entorn de proves a %"
+"s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "ací"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Aquesta versió s'ha posat en l'entorn de proves perquè la puguin utilitzar "
+"els usuaris experimentats. Per tal de mostrar-la en el lloc web públic, cal "
+"que la nomineu, %1, i que «segueixi un procés de revisió»."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nomina"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "La publicació del vostre complement s'ha completat satisfactòriament."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Ja que el vostre complement és de confiança, aquesta versió s'ha aprovat "
+"automàticament per anar a l'àrea pública."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Envia el complement"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "El complement s'ha actualitzat satisfactòriament"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"Segurament voleu que %s incrementi el seu interès amb el vostre complement."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "Envia una previsualització"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No s'ha trobat cap autor [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Esborra"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancel·a"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Esteu segur que voleu cancel·lar la vostra publicació?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Següent"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Canvia el tipus de complement:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "S'ha actualitzat els comentaris del desenvolupador."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Actiu"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s actualment %2$s i %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Canvia l'estat"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
-"El vostre complement ha estat deshabilitat per un administrador i no es pot "
-"fer servir.  Si teniu cap pregunta, escriviu a %s."
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Estat del complement: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Consola del desenvolupador"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Benvingut a la consola del desenvolupador"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Inactiu"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Editat per última vegada el %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
 msgstr ""
-"Actualment no teniu cap complement hostatjat al Mozilla add-ons. Per "
-"aprendre com funciona el procés i enviar el vostre primer complement, "
-"cliqueu Comença ara."
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Comença ara"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Versions i fitxers"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Puja una nova versió"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr ""
-"La previsualització %s no s'ha pogut esborrar de la base de dades. Torneu a "
-"intentar-ho."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "La previsualització %s s'ha esborrat satisfactòriament."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "No teniu privilegis per a suprimir versions o fitxers."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s fitxer %2$s"
-msgstr[1] "%1$s fitxers %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Afegeix una previsualització"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autors"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Cap"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descripció"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Deshabilitat"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detalls"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Comentaris del desenvolupador"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Previsualitza"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versió"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Pàgina d'inici"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Cap"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Sense nom"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "No s'han trobat cap previsualització."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Actualitza"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Correu per a problemes"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "El desenvolupador no ha donat cap adreça de correu per a problemes."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL per a problemes"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "El desenvolupador no ha donat cap URL per a problemes."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "De confiança"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versió %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "No s'han trobat versions."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancel·la i torna enrere"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Sí, deshabilita'l"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Esteu segur que voleu deshabilitar aquest complement?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Si deshabiliteu aquest complement no es mostrarà en cap cerca ni cap "
+"llistat. No es podrà baixar del web ni s'enviaran actualitzacions als "
+"clients. El complement s'esborrarà, tot i que podreu tornar aquí i tornar-lo "
+"a habilitar si voleu."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Deshabilita %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Sí, habilita'l"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Esteu segur que voleu habilitar aquest complement?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Si habiliteu aquest complement de nou tornarà a aparèixer en les cerques i "
+"llistats. I es podrà baixar tant des de la pàgina web com des del client "
+"d'actualitzacions."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Habilita %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Afegeix una resposta"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Respostes"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
 msgstr ""
-"S'ha produït un error desant la vostra resposta. Per aquest motiu cal que "
-"contacteu amb %1$s."
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
 msgstr ""
-"Un editor de Mozilla Add-ons us demana més informació sobre la versió %2$s "
-"del vostre complement %1$s."
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "Amplia la informació sobre la revisió del complement %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Envia la resposta"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
 msgstr ""
-"La vostra resposta s'ha desat satisfactòriament. Es notificarà per correu "
-"electrònic els demés participants de la discussió."
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "escrit per %1$s el %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Afegeix un autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Adreça de correu de l'autor"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Esborra"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Afegeix un autor nou"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Afegeix un autor"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Adreça electrònica de l'autor:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Comprovant l'adreça electrònica..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Cliqueu el botó Actualitza els autors per a desar-ho."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Autors actuals"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Gestiona els autors del complement"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Llista dels autors que es mostren a les pàgines públiques"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
-"<strong>Desenvolupador</strong> - Pot gestionar tot el que fa referència a "
-"les llistes del complement, excepte afegir i suprimir altres autors."
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
-"<strong>Propietari</strong>- Pot gestionar tot el que fa referència a les "
-"llistes del complement, incloent-hi afegir i suprimir altres autors."
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
-"<strong>Observador</strong> - Pot veure les les estadístiques i les llistes "
-"del desenvolupador, però no pot fer cap canvi."
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Seleccioneu un rol per a l'autor:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Llistat"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Rol"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Actualitza els autors"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Actualitza les categories"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "El meu complement no concorda amb cap de les categories disponibles."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "Categories del %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Gestiona les categories del complement"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Passeu el ratolí per sobre una categoria per a veure'n la descripció."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Categoria %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr ""
-"No hi ha cap categoria disponible per a aquest tipus de complement i "
-"d'aplicació."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
 msgstr ""
-"Poseu el vostre complement en aquesta categoria només si no concorda amb cap "
-"altra categoria disponible."
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr ""
-"Podeu seleccionar fins a tres categories del %s per al vostre complement"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Afegiu o suprimiu usuaris que puguin gestionar aquest complement."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
 msgstr ""
-"Seleccioneu les categories més importants de totes els aplicacions on "
-"tingueu disponible el vostre complement."
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
 msgstr ""
-"Afegeix o modifica una traducció del resum del complement, de la descripció, "
-"de la llicència de l'usuari, i de la política de privadesa."
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr ""
-"Canvia el nom del vostre complement, la pàgina principal, la icona i altres "
-"paràmetres."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Actualitza les descripcions"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Corregiu els errors anteriors, que apareixen en vermell."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Edita les descripcions del complement"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
-"Qualsevol informació que l'usuari final pugui voler saber i que, per alguna "
-"raó, no es pugui posar ni al resum ni a la descripció. Per exemple per a "
-"explicar problemes coneguts, o donar informació de com enviar incidències i "
-"problemes o per anunciar amb antelació de la data d'una nova versió, etc."
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Comentaris del desenvolupador"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
-"La descripció del vostre complement és una explicació més extensa i "
-"detallada de les propietats i les funcionalitats i de la informació més "
-"important. La descripció es mostra sota del resum a la pàgina del complement."
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Descripció del complement"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
-"Si el vostre complement té un Acord de llicència d'usuari final (EULA), "
-"introduïu el text a continuació. Si s'inclou l'acord, els usuaris hauran "
-"d'acceptar-la abans d'instal·lar-es el complement. Cal tenir en compte que "
-"aquest acord no és el mateix que la llicència del codi, com per exemple GPL "
-"o MPL."
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Acord de llicència de l'usuari final"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
-"Si el vostre complement té una política de privadesa, introduïu el text "
-"aquí. A la pàgina del vostre complement es mostrarà un enllaç per a ensenyar-"
-"la."
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Política de privadesa"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
-"El resum és una explicació curta de les funcionalitats bàsiques del vostre "
-"complement. Es mostra en les cerques i en les llistes, així com a dalt de "
-"tot de la pàgina del vostre complement. <strong>No pot tenim és de 250 "
-"caràters.</strong>"
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Resum del complement"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Gestiona els autors del complement"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Gestiona les categories del complement"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Gestiona les descripcions del complement"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Gestiona les propietats del complement"
+msgstr "Manage Add-on Properties"
+
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No hi ha cap categoria disponible per a aquest tipus de complement."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autors"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Afegeix una icona"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Canvia la icona"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permet als usuaris veure en línia els fitxers font"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Localització per defecte"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Aquest complement requereix programari extern"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Només esborra la icona existent"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nou fitxer d'icona"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icona"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Més informació de la traducció"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Açò és una versió candidata"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Aquest és el web específic del complement"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Idioma"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "més informació breu (com el dialecte)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Actualitza les propietats"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Només canvieu-ho si sou conscients de totes les conseqüències."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Icona actual"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
-"És important que estigui present l'idioma per defecte d'un complement. Si "
-"falta alguna de les traduccions de les descripcions del vostre complement en "
-"l'idioma que ha seleccionat l'usuari, aleshores es mostrarà la descripció en "
-"l'idioma per defecte."
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr ""
-"Aquests indicadors s'utilitzen per a filtrar i classificar els complements."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
-"L'identificador del vostre complement (GUID) s'especifica al install.rdf i "
-"només allà. No podreu canviar de GUID un cop estigui a la llista de Mozilla "
-"Add-ons."
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Edita les propietats del complement"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Tipus de complement"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Opcions d'admin"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Idioma per defecte"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Indicadors del compelment"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID del complement"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Icona del complement"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "altres opcions"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Complement de confiança?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Visualitza el codi font en línia"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
-"La icona del complement és una petita imatge que es mostra al costat del nom "
-"del vostre complement. Apareixerà tant a la pàgina, com als resultats de la "
-"cerca, com al diàleg d'instal·lació de complements. La imatge es "
-"redimensionarà a 32 x 32 píxels. Utilitzeu un dels tipus d'imatge següents: %"
-"s"
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Aquest complement conté components binaris"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "No de confiança"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "De confiança"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Icona nova"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Suprimeix la icona"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
-"Si el vostre complement té una altra pàgina web, introduïu l'adreça aquí. No "
-"cal que afegiu altres traduccions a no ser que el lloc web estigui en altres "
-"idiomes."
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Pàgina web del complement"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr ""
-"El nom del vostre complement es mostrarà a tot arreu on aparegui el vostre "
-"complement."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Nom del complement"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
-"Si teniu un adreça de correu per a atendre les preguntes i problemes, "
-"introduïu-la aquí. No cal que afegiu altres traduccions a no ser que tingueu "
-"diverses adreces de correu per a diverses llengües."
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "Adreça de correu per a consultes"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
-"Si teniu un lloc web o un fòrum per a atendre les preguntes i problemes, "
-"introduïu l'adreça aquí. No cal que afegiu altres traduccions a no ser que "
-"web estigui en diversos idiomes."
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Web o fòrum de consultes"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr ""
-"Els complements de confiança poden esdevenir públics sense la revisió d'un "
-"editor."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Es suprimirà la icona quan deseu. <a %s>Voleu cancel·lar?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
-"Si voleu, el codi font del vostre complement el pot veure en línia qualsevol "
-"usuari registrat."
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Permet la visualització del codi font en línia"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "No permetis la visualització del codi font en línia"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Actualitza"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">identificador "
+"de l'idioma</a>, per exemple 'ca-AD'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Autors"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
 msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Canvia l'estat"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Descripcions"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Edita el complement"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Versió nova"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Propietats"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Mostra les captures de pantalla"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Estadístiques"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Versions i fitxers"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Mostra la llista"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3334,7 +2778,7 @@ msgstr "Complements destacats"
 #, php-format
 msgid "devcp_editorsqueue_moderatedreviews"
 msgid_plural "devcp_editorsqueue_moderatedreviews"
-msgstr[0] "Revisió moderada (%s)"
+msgstr[0] "Revisions moderades (%s)"
 msgstr[1] "Revisions moderades (%s)"
 
 #. %1 is the nominated addons count
@@ -3343,7 +2787,7 @@ msgstr[1] "Revisions moderades (%s)"
 #, php-format
 msgid "devcp_editorsqueue_nominated"
 msgid_plural "devcp_editorsqueue_nominated"
-msgstr[0] "Complement nominat (%s)"
+msgstr[0] "Complements nominats (%s)"
 msgstr[1] "Complements nominats (%s)"
 
 #. %1 is the update count
@@ -3352,17 +2796,72 @@ msgstr[1] "Complements nominats (%s)"
 #, php-format
 msgid "devcp_editorsqueue_pendingupdates"
 msgid_plural "devcp_editorsqueue_pendingupdates"
-msgstr[0] "Actualització pendent (%s)"
+msgstr[0] "Actualitzacions pendents (%s)"
 msgstr[1] "Actualitzacions pendents (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Els fitxers marcats se suprimiran."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Fitxers"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplicacions destinació"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "No hi ha fitxers."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes per al revisor"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Actualitza"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "No teniu accés a aquest complement."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Els resums estan limitats a un màxim de 250 caràcters.\n"
+"(N'heu escrit %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"El nom del vostre complement ja existeix a la base de dades. Assegureu-vos "
+"de què: <br /><li>El vostre GUID sigui correcte. La causa més comuna "
+"d'aquest error és un GUID incorrecte.</li><li>No tingueu un registre "
+"duplicat a la base de dades. Si és així, haureu d'actualitzar el registre o "
+"esborrar-lo i tornar-ho a intentar.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3376,16 +2875,18 @@ msgstr "Consulteu %s com a referència."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "aquesta pàgina"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "El vostre complement cal que tingui com a mínim un propietari."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Descriviu els canvis que heu fet en aquesta actualització del complement."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
 msgstr ""
-"Ja existeix una versió d'aquest complement. Per a substituir-lo, primer heu "
-"de suprimir el fitxer %1$s."
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
@@ -3396,6 +2897,10 @@ msgstr ""
 "No es permet aquesta extensió de fitxer (%s) per a aquest tipus de "
 "complement. N'heu de seleccionar una de les següents:%s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "No tots els GUID dels fitxers són correctes"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "No podeu seleccionar més de cinc categories."
@@ -3430,7 +2935,15 @@ msgstr ""
 "No es permet aquesta extensió de fitxer (%s) per a una icona. N'heu de "
 "seleccionar una de les següents: %s "
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Ja existeix una versió idèntica (%s) per a aquest complement i plataforma."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No s'ha trobat install.rdf."
 
@@ -3438,7 +2951,7 @@ msgstr "No s'ha trobat install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "S'han trobat els següents errors a install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Heu de seleccionar un tipus de complement vàlid."
 
@@ -3511,6 +3024,20 @@ msgstr "No s'ha trobat cap ID per a aquest complement en el install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No s'ha escollit cap plataforma"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Heu de proporcionar els detalls necessaris per a la nominació."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "No podeu nominar una versió candidata d'un complement."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Només podeu nominar complements que actualment estiguin en l'entorn de "
+"proves."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Heu de seleccionar com a mínim una categoria."
@@ -3528,6 +3055,16 @@ msgstr ""
 "No es permet aquesta extensió de fitxer (%s) per a una previsualització. Heu "
 "d'utilitzar una de les següents: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "S'ha produït un error mentre s'intentava desar les vostres dades."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "No teniu permisos per actualitzar aquest complement."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3540,81 +3077,294 @@ msgstr ""
 "Els complements no poden utilitzar un updateURL extern. Heu d'eliminar-ho "
 "del fitxer install.rdf i tornar-ho a intentar."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Cal enviar un fitxer"
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Afegeix un altre fitxer de plataforma"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Afegeix un autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Esborra"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Les categories per al vostre nou tipus de complement les tindreu disponibles "
+"en el pròxim pas."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No hi ha cap categoria disponible per a aquest tipus de complement."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Escriviu una descripció del vostre complement."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Escriviu el nom del vostre complement."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Escriviu el tipus del complement que esteu publicat."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Escriviu un resum del vostre complement."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Fitxer del complement"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Fitxer 2 del complement"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Fitxer 3 del complement"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tipus de complement"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permet als usuaris consultar en línia els fitxers font"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Adreça de correu de l'autor"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Localització per defecte"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descripció"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Acord de la llicència d'usuari final (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Aquest complement necessita programari extern"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Fitxers"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Pàgina web"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Fitxer d'icona"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nom"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plataformes disponibles"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Aquesta és una versió candidata"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Política de privadesa"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Aquest és un complement específic d'un web"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Resum"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Correu per a problemes"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL per a problemes"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplicacions destinació"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versió"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Notes de la versió"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Cap"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notes del revisor"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Perquè el vostre complement és de confiança, trieu on voleu que vagi aquesta "
+"versió:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Públic"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Entorn de proves"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Acord del desenvolupador"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1r pas"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Enviament del fitxer"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2n pas"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detalls del complement"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3r pas"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detalls de la versió"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4t pas"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localització"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5è pas"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Fi"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Els meus complements"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Puja un fitxer"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Cancel·la"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Introduïu l'adreça de correu de l'autor que voleu afegir."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Mou avall"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Mou amunt"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Suprimeix la compatibilitat de l'aplicació"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Mostra l'autor en les llistes públiques"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Seleccioneu una llicència."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Introduïu un text per a la vostra llicència."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Desenvolupador"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Propietari"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Observador"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Suprimeix l'autor"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Esteu <strong>segur</strong> que voleu suprimir aquest autor?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Heu de seleccionar un fitxer per a pujar."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "La llicència personalitzada del complement %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3632,12 +3382,12 @@ msgstr ""
 "disponible, aleshores es farà servir la localització per defecte (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Tauler de control de l'admin"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Tauler de control de l'editor"
 
@@ -3646,61 +3396,76 @@ msgid "devcp_myaddons_link"
 msgstr "Els meus complements"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Torna a la principal"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Estadístiques"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Envia el complement"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Eines de desenvolupament"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
-"L'identificador d'aquest complement (%1$s) ja existeix a la base de dades. "
-"Si és el vostre complement, podeu <a href=\"%2$s\">actualitzar la versió</a>."
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Cancel·la i torna"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Torna als detalls del complement"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nomina %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Detecta automàticament el tipus de complement: %s"
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
-"<span>No s'han pogut desar tots els canvis.</span><br />Comproveu els errors "
-"a continuació. La resta de canvis s'han pogut desar satisfactòriament."
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
 msgstr ""
-"<span>Tots els canvis s'han pogut desar.</span><br />Cal que tingueu en "
-"compte que alguns canvis poden tardar hores a aparèixer a tot arreu del web."
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
@@ -3708,6 +3473,18 @@ msgstr ""
 "Esborrant això com a previsualització per defecte farà que una altra "
 "previsualització esdevingui la per defecte."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"La localització per defecte d'aquest complement  (%1$s [%2$s]) és diferent "
+"de la localització que actualment teniu seleccionada (%3$s [%4$s]). Els "
+"camps següents s'haurien de completar en %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3715,13 +3492,14 @@ msgstr ""
 "Si feu que aquesta previsualització sigui la per defecte, la "
 "previsualització per defecte actual ho deixarà de ser."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Hi ha canvis que no s'han desat encara"
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3750,106 +3528,120 @@ msgstr "Edita la previsualització"
 msgid "devcp_preview_updated_successfully"
 msgstr "S'ha modificat la previsualització satisfactòriament."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Afegeix una altra previsualització"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Suprimeix la previsualització"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Substitueix la previsualització"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Actualitza les previsualitzacions"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Afegeix una previsualització"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
-"Seleccioneu una imatge per a pujar-la. Les imatges que siguin més grans de "
-"700 píxels d'ample i 525 píxels d'alçada s'escalaran. Els tipus permesos "
-"són: %s"
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Cliqueu Actualitza les previsualitzacions per a pujar.la."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
-"Cliqueu Actualitza les previsualitzacions per a desar la imatge. (<a %"
-"s>Cancel·la?</a>)"
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
-"Aquesta previsualització se suprimirà quan cliqueu Actualitza les "
-"previsualitzacions. (<a %s>Cancel·la?</a>)"
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
 msgstr ""
-"Utilitza el següent formulari per a pujar una captura de pantalla del vostre "
-"complement en format PNG, JPG o GIF. Les imatges que siguin més grans de 700 "
-"píxels d'ample i 525 píxels d'alçada s'escalaran."
+"Utilitzeu el formulari següent per a enviar una captura de pantalla del "
+"vostre complement en PNG, JPG o GIF. Es canviarà automàticament la mida de "
+"les imatges que ocupin més de 700 píxels d'amplada i 525 píxels d'alçada."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Afegeix una previsualització"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Títol de la previsualització"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Edita la previsualització"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Previsualització per defecte"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
-msgstr "Fitxer de la previsualització"
+msgstr "Fitxer de previsualització"
 
 #: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
-msgstr "Fes-la previsualització per defecte"
+msgstr "Fes que aquesta sigui la previsualització per defecte"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Imatge nova:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Imatge per pujar: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "No s'ha pogut desar una previsualització o més de les noves."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Les vostres actualitzacions s'han pogut desar satisfactòriament."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
-"Les previsualitzacions de les captures de pantalla del vostre complement es "
-"mostren a continuació. Podeu fer canvis als títols o a les imatges. La "
-"previsualització per defecte és la previsualització que es mostra al costat "
-"del vostre complement en les cerques i en les llistes."
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3865,37 +3657,54 @@ msgstr "Edita la previsualització"
 
 #: views/previews/add.thtml:63
 msgid "devcp_previews_submit_upload"
-msgstr "Actualitza la previsualització"
+msgstr "Envia la previsualització"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Miniatures"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Gestor de previsualitzacions del %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrecta?"
 
-#: views/developers/uploader.thtml:74
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Esteu segur que voleu suprimir aquest fitxer?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
-"Reviseu i accepteu el següent Acord del desenvolupador abans de continuar."
+"Reviseu i accepteu la següent Acord del desenvolupador abans de continuar."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
-"<span>No teniu permís per a fer canvis a aquesta pàgina.</span><br /"
-">Contacteu al propietari del complement si necessiteu fer cap canvi."
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
-"Cal que tingueu en compte que alguns canvis tardaran diverses hores abans "
-"que apareixin a tot arreu del web."
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Consola"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Omet l'actualització de la informació del meu complement actual"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3919,632 +3728,763 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> baixades setmanals"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"Si es marca aquest complement com a actiu, aleshores es publicarà en els "
-"llocs corresponents al seu estat, incloent cerques i llistes públiques. Es "
-"podrà baixar des del lloc web i es podrà actualitzar a través del servei "
-"d'actualitzacions, depenent del seu estat. Podreu tornar a aquí i "
-"deshabilitar-lo de nou quan vulgueu."
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Esteu segur que voleu marcar aquest complement com a actiu?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Esteu segur?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
-"Si es marca aquest complement com a inactiu, s'evitarà que es mostri enlloc, "
-"incloent les cerques i les llistes públiques. No es podrà baixar des del "
-"lloc web i no es podrà actualitzar via el servei d'actualitzacions. Podreu "
-"tornar aquí i tornar a habilitar-lo quan vulgueu."
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Esteu segur que voleu marcar aquest complement com a inactiu?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "No, cancel·la-ho"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
 msgstr ""
-"Si es marca aquest complement com a públic, aleshores es permetrà que tothom "
-"se'l pugui baixar i s'oferiran actualitzacions als usuaris."
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Esteu segur que voleu fer-lo públic?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Si es torna aquest complement a l'entorn de proves, aleshores els usuaris "
-"s'hauran de registrar abans de baixar-se'l i es deixarà d'oferir les "
-"actualitzacions. Com que el complement actualment és públic, podreu tornar "
-"aquí quan vulgueu i tornar-lo a fer públic."
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Esteu segur que voleu tornar aquest complement a l'entorn de proves?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Sí, segur"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
-"<span>És necessari un missatge de nominació.</span><br />Cal que ompliu el "
-"camp de text amb la informació que s'us demana i ho torneu a provar."
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Nominació del complement"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Els enviaments de complements estan inhabilitats actualment. Torneu-ho a "
+"comprovar més endavant."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Ho accepto"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Ho refuso"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Un administrador ha inhabilitat el complement."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Inhabilitat"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "De confiança"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Darrera versió:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "No teniu cap complement. Feu clic a %s per a enviar-ne un."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "ací"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Assegureu-vos de %s el vostre tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "Envia una previsualització"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Edita %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Ajuda (sense deixar la pàgina)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Ajuda"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Caràcters utilitzats: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Esteu segur que voleu suprimir aquesta traducció?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Què són aquestes %s pestanyes?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Què passa si no tinc cap traducció?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Oculta l'ajuda"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"Si un usuari consulta el lloc web i no hi ha la traducció al seu idioma, "
-"aleshores es mostrarà segons l'idioma per defecte del vostre complement, tal "
-"com s'ha especificat a Edita les propietats del complement. Si no teniu cap "
-"traducció, escriviu el que podeu en l'idioma que heu definit per defecte, "
-"que hauria de correspondre amb el vostre idioma ."
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"Això és <i>el quadre de traducció</i>. Us permet traduir un determinat camp "
-"a altres llengües. Podeu afegir, editar i suprimir traduccions utilitzant "
-"les pestanyes."
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Afegeix una traducció"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Suprimeix una traducció"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Afegeix un idioma a tot"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Afegeix un idioma"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Cancel·la"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Suprimeix-ho"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Seleccioneu l'idioma de la traducció que voleu afegir:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
-"El GUID del complement utilitzat en aquest fitxers (%1$s) no concorda amb el "
-"GUID existent d'aquest complement (%2$s)."
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "No teniu prou privilegis per actualitzar aquest complement."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "La versió especificada (%1$s) no pertany a aquest complement (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"El número de versió que s'ha pujat (%1$s) ja existia per aquest complement. "
-"Si esteu intentant d'afegir un altre fitxer a aquesta versió, <a href=\"%2$s"
-"\">cliqueu aquí</a>."
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "El número de versió (%1$s) no concorda amb la versió existent (%2$s)."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Comença ara"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "S'està pujant el fitxer..."
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "D'acord"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Edita el meu complement"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Acabaré el meu complement més tard."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Afegeix unes notes de la versió"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
-"<p>La llista del vostre complement s'ha creat satisfactòriament. La "
-"informació bàsica que s'ha obtingut del fitxer que heu pujat s'ha desat "
-"correctament, però a banda de la vostra llista, encara hi ha molta més "
-"informació que podeu personalitzar.</p><p>El vostre complement actualment "
-"està marcat com a <strong>Incomplet</strong>. Per tal de completar el vostre "
-"complement, heu d'assegurar-vos que té un nom, un resum i una descripció "
-"correctes, i cal escollir una categoria. Podeu editar la informació del "
-"vostre complement utilitzant l'enllaç següent i comprovar-ne l'estat a "
-"qualsevol hora consultant la <a %s>pàgina de l'estat</a>."
-
-#: views/developers/uploader.thtml:143
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Corregiu el problema i torneu a pujar el fitxer una altra vegada."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
-"El nou fitxer s'ha afegit a la versió %1$s i actualment està marcat com a %2"
-"$s."
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "S'ha creat el complement."
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Sembla que hi ha hagut un problema amb aquest fitxer..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "S'ha afegit el fitxer."
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Com funciona tot?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "S'ha creat la versió %s"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Puja un fitxer"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
-"<p>Gràcies pel vostre interès en publicar el vostre complement al Mozilla "
-"Add-ons. Hostatjar el vostre complement al Mozilla Add-ons és la forma més "
-"senzilla per a gestionar la distribució del vostre complement. Disposareu de "
-"tot això:</p> <ul><li>Tots els complement tindran una pàgina pública amb la "
-"informació que hàgiu donat, com per exemple un resum breu de la funció del "
-"vostre complement, una descripció opcional, més llarga i un catàleg de "
-"previsualitzacions.<li><li>El vostre complement apareixerà a les cerques i a "
-"les llistes públiques del web, i també al Gestor de complements del Firefox "
-"3.</li><li>Ens cuidarem d'hostatjar totes les baixades i oferirem un sistema "
-"d'actualització automàtica als usuaris que permetrà distribuir les noves "
-"versions que pugeu.</li><li>Podreu consultar estadístiques amb informació "
-"detallada dels vostres usuaris.</li></ul><p>Els complement hostatjats al web "
-"hauran de ser revisats per un editor de Mozilla Add-ons abans que rebre tots "
-"els avantatges que s'han explicat. Si esteu a punt per a començar el procés "
-"i ja teniu preparat per pujar el paquet del vostre complement cliqueu el "
-"botó Comença ara.</p>"
-
-#: views/developers/uploader.thtml:125
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Plataformes disponibles:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Fitxer del complement: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Altre"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
-"El nou fitxer es publicarà tant aviat com un editor pugui revisar-vos-el. "
-"Actualment hi ha %1$s complements més a la cua. Si voleu que es revisi més "
-"ràpidament penseu en <a %2$s>fer-vos editor</a>."
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
-"La nova versió es publicarà tant aviat com un editor pugui revisar-vos-la. "
-"Actualment hi ha %1$s complements més a la cua. Si voleu que es revisi més "
-"ràpidament penseu en <a %2$s>fer-vos editor</a>."
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr ""
-"La vostra nova versió s'ha creat correctament i actualment està marcada com "
-"a %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
-"Consulteu el vostre nou fitxer a la <a %1$s>Pàgina de versions i fitxers</"
-"a>, vigileu el vostre complement a <a %2$s>l'Estat actual</a>, o <b>afegiu "
-"unes notes de la versió</b> clicant el següent botó (recomanat)."
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
-"Consulteu la vostra nova versió a la <a %1$s>Pàgina de versions i fitxers</"
-"a>, vigileu el vostre complement a <a %2$s>l'Estat actual</a>, o <b>afegiu "
-"unes notes de la versió</b> clicant el següent botó (recomanat)."
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
-"Pugeu el fitxer del vostre complement utilitzant el següent formulari. Si "
-"teniu més d'un fitxer, específic per a cada plataforma, seleccioneu només un "
-"fitxer i pugeu els demés fitxers utilitzant el Gestor de versions i fitxers."
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Totes"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Específica:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Seleccioneu-lo..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Afegeix un fitxer al %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Envia un nou complement"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Actualitza el %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Llegiu %s com a referència."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "aquesta pàgina"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "No s'ha trobat cap compte per aquesta adreça electrònica."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"O bé l'XML conté errors o bé falta algun camp obligatori. Cal que <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">llegiu la documentació</a>, verifiqueu el vostre complement, i ho torneu "
-"a intentar."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edita la versió"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "La versió s'ha actualitzat amb èxit."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Cancel·la"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Suprimeix la versió"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Suprimeix la versió buida"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Voleu suprimir-la?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Afegeix una versió nova"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Cancel·la"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Suprimeix la versió"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Això també suprimirà:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s fitxer"
-msgstr[1] "%s fitxers"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Suprimeix la versió %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s revisió"
-msgstr[1] "%s revisions"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Esteu segur que voleu suprimir permanentment la versió %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Cancel·la"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Suprimeix el fitxer"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Afegeix una nova aplicació"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Suprimeix l'aplicació"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Afegeix un nou fitxer"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"Si canvieu la configuració de l'aplicació aquí podreu fer que els usuaris "
-"pugin instal·lar el vostre complement tot i que el install.rdf del paquet "
-"indiqui que el complement és incompatible. <a %s>Llista d'aplicacions "
-"permeses</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
-"Esteu <b>segur</b> que voleu suprimir la compatibilitat amb aquesta "
-"aplicació?"
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Esteu <b>segur</b> que voleu suprimir permanentment aquest fitxer?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Informació d'aprovació"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Aplicacions compatibles"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Informació del fitxer"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Llicència"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Gestiona la versió %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Notes de l'aprovació"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Suprimeix el fitxer"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Fitxer %1$s (%2$s) es va crear el %3$s i es va passar a %4$s el %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Seleccioneu una llicència per al vostre complement. Aquesta llicència "
-"especificarà els drets que donareu al vostre codi font."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "No s'ha trobat cap fitxer."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Informació opcional de l'editor que revisa aquesta versió."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Suprimeix la compatibilitat de l'aplicació"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Seleccioneu una aplicació"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Fitxer"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Plataforma"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Mida"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Estat"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"Informació sobre els canvis d'aquesta versió, noves funcionalitats, "
-"problemes coneguts i altre informació d'utilitat referent a la versió. "
-"Aquesta informació també estarà disponible per als usuaris que s'instal·lin "
-"el complement amb el Gestor de complements del Firefox 3."
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Notes de la versió"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>Teniu canvis sense desar.</strong> La compatibilitat s'esborrarà "
-"fins que cliqueu Actualitza la versió."
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>Teniu canvis sense desar.</strong> Els fitxers no se suprimiran fins "
-"que cliqueu Actualitza la versió."
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Actualitza les versions"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Gestiona les versions i els fitxers"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Cap versió."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "La versió %s s'ha suprimit satisfactòriament."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
 msgstr ""
-"Aquesta versió no té cap fitxer associat que es pugui suprimir. Voleu "
-"suprimir aquesta versió?"
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Creat"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "Estat"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Versió"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "S'ha inhabilitat el complement"
 
@@ -4588,7 +4528,7 @@ msgstr "Filtra"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtra per tipus/acció"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registre d'esdeveniments"
 
@@ -4650,7 +4590,7 @@ msgstr "Mostra-ho entre %s i %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No s'han trobat cap revisió en aquest període."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registre de revisions"
 
@@ -4674,24 +4614,24 @@ msgstr "Activitat recent de l'editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Revisions totals"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Revisa el complement"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Completeu els següents camps:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Seleccioneu com a mínim un fitxer per a revisar."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "No es permeten les revisions pròpies."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Programari extern"
 
@@ -4703,39 +4643,39 @@ msgstr "Afegeix una característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Afegeix"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "No s'ha pogut afegir la característica."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "S'ha afegit la característica correctament."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "No s'ha pogut editar la característica."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "S'ha editat la característica correctament."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Un o més codis d'idomes són invàlids."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "No s'ha pogut suprimir la característica."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "S'ha suprimit la característica correctament."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Característiques del complement"
 
@@ -4747,189 +4687,138 @@ msgstr "D'acord"
 msgid "editors_featured_remove_feature"
 msgstr "Suprimeix la característica"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Cua de filtratge"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Enllaços útils"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guia d'edició"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Política dels complements"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Els filtres romandran al mateix lloc durant aquesta sessió o fins que es "
 "netegin."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "No hi ha actualment cap complement de %s per revisar."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dia"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Tauler de control d'edició"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "només %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Versió candidata"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilitat del %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Adreça electrònica del complement o de l'autor"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tipus de complements"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplicació"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Versiò màx."
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Plataformes"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Antiguitat (dies)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] ""
-"Resultats de la vostra cerca filtrada: <strong>%1$s</strong> complement"
-msgstr[1] ""
-"Resultats de la vostra cerca filtrada: <strong>%1$s</strong> complements"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Neteja"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtra"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Totes les cues de revisió estan actualment inhabilitades. Torneu-ho a "
 "comprovar més endavant."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Edita l'element"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Història de l'element"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Web de l'element"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Descripció general"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Previsualitzacions"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acció de revisió"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "Sol·licita més informació"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Porta a la part pública"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Sol·licita una revisió suprema"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Retén en l'entorn de proves"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Revisa els comentaris"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
-"Utilitzeu aquest formulari per a sol·licitar informació dels autors. Rebran "
-"un correu i podran respondre-us aquí. Quan us responguin us ho notificarem "
-"per correu electrònic."
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Açò marcarà el complement i la seua versió més recent i fitxers com a "
 "públic. Les versions futures aniran a l'entorn de proves fins que les revisi "
 "un editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Açò retindrà el complement en l'entorn de proves."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Açò aprovarà una versió d'un complement públic en l'entorn de proves per tal "
 "que aparegui en la part publica."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Açò farà que una versió en l'entorn de proves d'un complement públic "
 "romangui allà."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Si patiu pel que fa a la seguretat del complement, aspectes de drets "
@@ -4937,84 +4826,86 @@ msgstr ""
 "una ullada, introduïu els vostres comentaris al següent camp. Aquests "
 "s'enviaran als administradors, no a l'autor."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Compara amb la versió pública"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Visualitza els continguts"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilitat:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descripció"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentaris del desenvolupador"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ALUF (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Fitxers"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historial d'elements"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Missatge de nominació"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previsualitzacions"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de privadesa"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisa %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes al revisor"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Resum"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notes de la versió"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Resposta"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Sol·licitud d'informació"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -5031,7 +4922,7 @@ msgstr "Nominació aprovada/públic"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominació denegada/entorn de proves"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No s'han trobat revisions anteriors."
 
@@ -5053,95 +4944,85 @@ msgstr "Denegat / entorn de proves"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Mostra/oculta la resposta (%1$s)"
-msgstr[1] "Mostra/oculta les respostes (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicacions:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o selecciona una resposta predeterminada:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentaris:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistema operatiu:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Inici"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Atenció: només fes més d'una revisió si heu provat tots els fitxers que heu "
-"seleccionat."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "següent &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No hi ha previsualitzacions."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; anterior"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Cua de revisions"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> de %2$s a la cua"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> de %2$s a la cua (filtrada)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Processa l'acció"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acció"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentaris"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versió/fitxer"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notifica'm només la propera vegada que s'actualitzi aquest complement. (Les "
 "actualitzacions que la segueixin no generaran cap correu)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "La revisió s'ha processat satisfactòriament."
 
@@ -5165,7 +5046,7 @@ msgstr "Acció"
 msgid "editors_reviews_in_reply_to"
 msgstr "En resposta a:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "La revisió s'ha processat satisfactòriament."
 
@@ -5177,79 +5058,87 @@ msgstr "Actualment no hi ha cap revisió moderant-se."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Processa les revisions"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Web específic"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nou"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Actualitzat"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicació provada"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistema operatiu provat"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informació addicional"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Complement"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tipus"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipus de complements"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Edat"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplicacions"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Limita'l als idiomes?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Temps a la cua"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Ordenació ascendent"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plataformes"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Ordenació descendent"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipus de publicacions"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dies"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hores"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuts"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Accés denegat"
 
@@ -5257,18 +5146,17 @@ msgstr "Accés denegat"
 msgid "error_access_denied_message"
 msgstr "No esteu autoritzats a veure aquesta pàgina."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "El complement ja existeix"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5277,14 +5165,11 @@ msgstr "El complement ja existeix"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "El complement no s'ha trobat."
 
@@ -5296,7 +5181,7 @@ msgstr "Aquest complement no es pot veure ací."
 msgid "error_addon_selfreview"
 msgstr "No us podeu revisar el vostre propi complement."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "No hi ha cap complement en aquesta categoria."
 
@@ -5304,45 +5189,50 @@ msgstr "No hi ha cap complement en aquesta categoria."
 msgid "error_collection_feed_notfound"
 msgstr "No s'ha trobat el canal del complement."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Aquesta adreça de correu no és vàlida."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Aquest camp no pot estar buit."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "No s'ha trobat el fitxer."
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Error en el fitxer: no existeix %s."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Hi ha errors en el formulari. Corregiu-los i torneu-lo a enviar."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "El captcha no és correcte, torneu a intentar-ho."
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Aquest URL no té un format vàlid. Els URL són de la forma http://exemple.com/"
@@ -5350,46 +5240,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Falta el paràmetre: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Sense fitxers"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Avís"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "No s'ha trobat la previsualització."
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Heu de fer una valoració."
 
@@ -5397,46 +5275,38 @@ msgstr "Heu de fer una valoració."
 msgid "error_user_already_confirmed"
 msgstr "El compte de l'usuari ja estava confirmat."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "El codi de confirmació no és vàlid."
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "La contrasenya no és correcta."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "L'adreça de correu ja està assignada a un altre usuari"
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "El canvi d'adreça de correu ha caducat. Haureu de tornar a canviar la vostra "
 "adreça de correu des del perfil d'usuari i clicar l'enllaç del correu de "
 "confirmació tan aviat com el rebeu."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Els usuaris només poden tenir un únic rol. Cal que suprimiu tots els rols "
-"que tingui abans de continuar."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "L'àlies ja està assignat."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Usuari desconegut"
 
@@ -5446,42 +5316,39 @@ msgstr ""
 "Primer de tot confirmeu el vostre compte d'usuari amb el codi que heu rebut "
 "per correu."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Usuari o contrasenya erronis"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versió desconeguda"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Contrasenya incorrecta"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Més informació"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Més informació sobre %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s revisió"
 msgstr[1] "%1$s revisions"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Més informació sobre el"
 
@@ -5520,39 +5387,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Quant a"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "Bloc"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tots els drets reservats."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Drets de còpia"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Crèdits"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla només enllaça a aquestes aplicacions com a gentilesa, però això no "
@@ -5560,96 +5430,91 @@ msgstr ""
 "d'informació relacionada. Qualsevol consulta, queixa o reclamació de "
 "l'aplicació cal fer-la directament al proveïdor de programari corresponent."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Vés"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Avís legal"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Altres llengües:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Política de privadesa"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Desa"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Diccionari"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Diccionaris"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensió"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Paquet d'idioma (complement)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paquets d'idioma (complement)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Paquet d'idioma (aplicació)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paquets d'idioma (aplicació)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Connector"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Connector"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor de cerca"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Motors de cerca"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Temes"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Tots els idiomes"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Torna a la pàgina principal dels complements %1$s"
@@ -5658,86 +5523,37 @@ msgstr "Torna a la pàgina principal dels complements %1$s"
 msgid "header_main_firefox_header"
 msgstr "Complements del Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Complements <em>per al</em> <img alt=\"Firefox\" src=\"%1$s\" /> "
-"<strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Complements"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Complements <img alt=\"Complements\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Complements del Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Complements <em>per al</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Complements del Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Complements <em>per al</em> <img alt=\"sunbird\" src=\"%1$s\" /> "
-"<strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Complements del Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Complements <em>per al</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Salta a un altre menú d'aplicacions"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Salta al menú de categories"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Salta als continguts principals"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Salta al formulari de cerca"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Complements"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Inicia una sessió"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Surt"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "El meu compte"
 
@@ -5745,69 +5561,47 @@ msgstr "El meu compte"
 msgid "header_navlink_register"
 msgstr "Registre"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr ""
-"<a href=\"%1$s\">Registra'm</a> o <a href=\"%2$s\">Inicia una sessió</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Eines"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Previsualitza la imatge de %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Registreu-vos</a> per a instal·lar aquest complement"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Permet-me instal·lar aquest complement experimental. <a href=\"%1$s\">Què és "
-"això?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Afegeix-lo al %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Afegeix %1$s al %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Baixa %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Aquest complement no està disponible."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Llista de paquets d'idioma i diccionaris"
 
@@ -5819,8 +5613,8 @@ msgstr "Baixa el diccionari"
 msgid "langtools_download_langpack"
 msgstr "Baixa el paquet d'idioma"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Diccionaris i paquets d'idioma"
 
@@ -5832,72 +5626,36 @@ msgstr "Instal·la el diccionari"
 msgid "langtools_install_langpack"
 msgstr "Instal·la el paquet d'idioma"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Diccionari"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Paquet d'idioma"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Idioma"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Cliqueu aquí per a tornar a la pàgina principal."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Data"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Baixades"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nom del complement"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Valoració"
@@ -5922,20 +5680,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Diccionaris i paquets d'idioma"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Connectors"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Troba complements per a altres aplicacions"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "altres"
 
@@ -5943,29 +5708,12 @@ msgstr "altres"
 msgid "page_title_appversions"
 msgstr "Versions de l'aplicació"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "PMF de l'Add-on Collector"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Característiques de l'Add-on Collector"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Benvingut a l'Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Crèdits"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "PMF del desenvolupador"
+msgid "page_title_experimental_addons"
+msgstr "Complements experimentals"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5981,7 +5729,7 @@ msgstr "Normes dels complements"
 
 #: controllers/pages_controller.php:103
 msgid "page_title_privacy"
-msgstr "Política de privadesa de Mozilla"
+msgstr "Política de privacitat de Mozilla"
 
 #: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
@@ -5995,15 +5743,15 @@ msgstr "Sistema de revisió de l'entorn de proves"
 msgid "page_title_submissionhelp"
 msgstr "Ajuda a la publicació"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versions d'aplicació vàlides"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Els complements publicats a Mozilla Add-ons han de tenir un fitxer install."
@@ -6012,7 +5760,7 @@ msgstr ""
 "aplicacions."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6021,15 +5769,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "ací"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Torna a la pàgina anterior"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Informació de l'entorn de proves"
 
@@ -6037,6 +5788,12 @@ msgstr "Informació de l'entorn de proves"
 msgid "pagination_next_page"
 msgstr "següent"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Aquesta és la pàgina %1$s de %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "anterior"
@@ -6072,15 +5829,15 @@ msgstr ""
 "diferents</a> o bé, en comptes d'això, <a href=\"%2$s\">escoltar una altra "
 "cosa</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Sou humà?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Què és això?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "S'ha produït un error marcant aquesta revisió."
 
@@ -6088,7 +5845,7 @@ msgstr "S'ha produït un error marcant aquesta revisió."
 msgid "review_flag_reason_bug_support"
 msgstr "Petició o un problema que no hauria de ser aquí"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Denuncia aquesta revisió (selecciona el motiu)"
 
@@ -6104,8 +5861,8 @@ msgstr "Un altre motiu (especifica)"
 msgid "review_flag_reason_spam"
 msgstr "És spam o bé el contingut no és una revisió"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Gràcies, aquesta revisió està marcada per a què l'aprovi un editor."
 
@@ -6120,7 +5877,7 @@ msgstr ""
 "per a marcar-la per a ser revisada per un editor."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Tingueu present aquests consells:</p><ul><li>Escriviu com si parléssiu a "
@@ -6139,125 +5896,101 @@ msgstr ""
 "revisió de complements.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Revisions del %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Complements destacats"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Complements nous"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Complements populars"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Complements actualitzats"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Resultat de la cerca de col·leccions"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Resultat de la cerca de col·leccions"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "La cerca està inhabilitada. Torneu-ho a provar més tard."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "tots els complements"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "totes les col·leccions"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "cerca complements"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "cerca col·leccions"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Cerca complements"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Cliqueu per a introduir el termes de la cerca"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "a"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Tots els motors de cerca"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Els motors de cerca del navegador"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s complement trobat"
+msgstr[1] "%s complements trobats"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "No s'han trobat resultats."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Cerca complements"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Canal dels resultats de la cerca"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultats de la cerca: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Eines de l'administrador"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Eines del desenvolupador"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Eines de l'editor"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Benvingut/da"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Benvingut/da, %s"
@@ -6266,7 +5999,7 @@ msgstr "Benvingut/da, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Diccionari"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Complements recomanats"
 
@@ -6274,7 +6007,7 @@ msgstr "Complements recomanats"
 msgid "sidebar_pitch_looking_for"
 msgstr "Estic cercant:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Els complements més nous"
 
@@ -6282,7 +6015,7 @@ msgstr "Els complements més nous"
 msgid "sidebar_pitch_search"
 msgstr "Connector de cerca"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscriu-me a"
 
@@ -6290,23 +6023,24 @@ msgstr "Subscriu-me a"
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complements actualitzats"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s kB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Encara no s'ha valorat"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Valorat amb %s de 5 estrelles"
@@ -6343,13 +6077,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s creats"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s acabats"
@@ -6362,180 +6096,180 @@ msgstr "Tanca"
 msgid "statistics_help_link"
 msgstr "Ajuda"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "o bé selecciona un altre complement"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "o bé selecciona un complement amb estadístiques publicades"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr ""
 "Seleccioneu un dels vostres complements per a veure'n les estadístiques"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Seleccioneu un complement per a veure'n les estadístiques"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Seleccioneu un complement amb estadístiques publicades"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Consola d'estadístiques"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Mostra les estadístiques"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Visualitza aquesta taula en format CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "cap"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Esborra aquesta traça"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupa per: Dia"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupa per: Mes"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupa per: Setmana"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compara per: Setmana"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trobat en la regió"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Afegeix una traça"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Afegeix una altra traça al diagrama"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Amaga el total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostra el total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Mostra el total en aquest diagrama"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visualitza les dades (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Obtén les dades en un fitxer amb els valors separats per comes"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Amaga %s esdeveniments"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostra %s esdeveniments"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Sobreposa les dates de sortida del complement en el diagrama"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Amaga els esdeveniments del Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostra els esdeveniments del Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Sobreposa les dades de sortida del Firefox en els diagrames"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Amaga el diagrama"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Mostra el diagrama"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Canvia la mida del diagrama"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuaris actius diàriament"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicació"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalitzat"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Baixades"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operatiu"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estat del complement"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Resum"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versió del complement"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplicació"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema operatiu"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Estat del complement"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Desconegut"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versió del complement"
 
@@ -6575,7 +6309,7 @@ msgstr "S'han actualitzat les vostres preferències."
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Consola d'estadístiques"
 
@@ -6603,105 +6337,109 @@ msgstr "Redueix"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Redueix un mes"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resum diari de les estadístiques de %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Canal RSS del resum"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e de %B de %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Estadístiques de %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Per defecte, només vostè i Mozilla podreu accedir a la informació de la "
 "consola d'estadístiques. Però també podeu obrir-ho al públic per tal que "
 "tothom pugui veure les dades del vostre complement."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Accés a les dades"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privat"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Només vostè i Mozilla podreu veure les estadístiques del complement"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Públic"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Tothom podrà veure les estadístiques d'aquest complement"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Canvia les preferències"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Tracteu aquesta informació com a confidencial."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Aquestes dades actualment són <b>privades</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Aquestes dades actualment són <b>públiques</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloquejat"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Torna a les estadístiques"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Desa les preferències"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Preferències de la consola d'estadístiques de %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloquejat"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Apl."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "S.O."
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Est"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Des"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Mitjana de baixades diàries"
 
@@ -6713,7 +6451,7 @@ msgstr "Baixades"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Recompte de l'últim dia"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Baixades dels últims 7 dies"
 
@@ -6731,7 +6469,7 @@ msgstr "Des de %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Sense dades encara"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Mitjana d'usuaris actius diàriament"
 
@@ -6757,69 +6495,55 @@ msgstr "Usuaris actius diàriament"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "A %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Mitjana d'usuaris diaris d'aquesta setmana"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s comparat amb l'última setmana"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Estadístiques de %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Tots els temes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Explora els temes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Canvia l'adreça de correu"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Canvia la contrasenya"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Canvia la contrasenya o l'adreça electrònica"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "El codi de confirmació es va tornar a enviar!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "El vostre compte d'usuari %1$s s'ha suprimit correctament. Si alguna vegada "
 "voleu tornar us podeu tornar a registrar a la <a href=\"%2$s\">pàgina de "
 "registre d'usuaris</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr ""
 "La comunitat de complements del Mozilla s'entristeix al veure't marxar."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirma la contrasenya"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Suprimeix el meu compte d'usuari ara"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "No podeu suprimir el vostre compte d'usuari si sou a la llista <a href=\"%1$s"
@@ -6829,76 +6553,76 @@ msgstr ""
 "el vostre compte des d'aquí."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Si teniu una pregunta més, contacteu amb %1$s per a ser atesos."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Cal que marqueu la casella «Ho he entès...» abans de suprimir el vostre "
 "compte."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr ""
 "Cal que introduïu la vostra contrasenya correctament per tal de continuar."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "S'ha produït un error desconegut al suprimir el vostre compte. Contacteu amb "
 "%1$s i informeu del problema, nosaltres us suprimirem el vostre compte. "
 "Perdoneu l'inconvenient."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmació de la supressió del compte"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Supressió del compte d'usuari %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Comiat"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Ja no podreu tornar a iniciar una sessió al Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Si cliqueu «Suprimeix» el vostre compte <strong>s'esborrarà permanentment</"
 "strong>. Això significa que:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Les vostres revisions i valoracions no s'esborraran, però es deixaran "
 "d'estar associades amb vostè."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Si teniu cap problema específic us podem mirar d'ajudar, per favor no "
 "suprimiu el compte ara, i contacteu amb nosaltres via %1$s. Farem el millor "
 "que podem per a atendre-us i solucionar-ho. "
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "He entès que aquest pas no es pot desfer."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Suprimeix l'usuari"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "S'ha enviat un correu electrònic a %1$s per a confirmar la vostra nova "
@@ -6906,7 +6630,7 @@ msgstr ""
 "inclòs en el correu. Fins aleshores, podeu continuar entrant amb la vostra "
 "adreça de correu actual. "
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Suprimeix el compte de l'usuari"
 
@@ -6933,7 +6657,9 @@ msgstr ""
 "-- Personal del %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Heu sol·licitat un canvi d'adreça de correu des de %2$s Add-ons.\n"
@@ -6974,107 +6700,90 @@ msgstr ""
 "Gràcies,\n"
 "-- Personal de %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Recuperació de la vostra contrasenya del %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Confirmeu el canvi de la vostra adreça de correu al %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Èxit!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "La vostra adreça de correu s'ha canviat satisfactòriament. A partir d'ara "
 "feu servir %1$s per a entrar."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Sobre mi"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Presenteu-vos vosaltres mateixos a la comunitat, si ho voleu. Aquest text "
-"apareixerà públicament a la vostra pàgina d'informació personal. Es "
-"respectaran els salts de línia, però no es permetrà tot l'HTML."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirma la contrasenya"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Mostra les col·leccions que he creat al meu perfil d'usuari"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Mostra les meves col·leccions preferides al meu perfil d'usuari"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Edita el perfil d'usuari d'en/na %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Adreça de correu"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Nom"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Oculta l'adreça de correu"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL de la pàgina web"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Cognoms"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Usuari"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nova contrasenya"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Àlies"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Contrasenya antiga"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Altres accions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Contrasenya"
 
@@ -7082,67 +6791,67 @@ msgstr "Contrasenya"
 msgid "user_form_registration"
 msgstr "Registre d'un nou usuari"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Recorda'm en aquest ordinador"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Mostra l'entorn de proves?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Desa"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Inicia una sessió"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registre"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Usuari del %s complements des de"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Crea un compte d'usuari"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilitat del complement (molt recomanada)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Esdeveniments futurs i respostes"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "No teniu cap notificació disponible que calgui configurar."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "De tant en tant, Mozilla us anirà enviant correus sobre les properes "
 "versions i esdeveniments dels complements. Seleccioneu els temes que us "
 "interessen:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla es reserva el dret de contactar-vos individualment per tractar de "
 "temes específics dels vostres complements hostatjats."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Hi ha errors en els canvis que heu fet. Corregiu-los i torneu a enviar el "
 "formulari"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "El perfil s'ha actualitzat."
 
@@ -7155,17 +6864,17 @@ msgstr "Recuperació de la contrasenya d'en/na %s"
 msgid "user_pwreset_header"
 msgstr "Recuperació de la contrasenya"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Heu oblidat la vostra contrasenya?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "S'ha enviat un correu a la vostra adreça amb l'enllaç cap a la recuperació "
 "de la contrasenya."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "La contrasenya s'ha recuperat satisfactòriament."
 
@@ -7177,7 +6886,7 @@ msgstr "Envia el canvi de contrasenya"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Envia l'enllaç per a recuperar la contrasenya"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Complements del %s"
@@ -7192,7 +6901,7 @@ msgstr ""
 "vos al %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7204,23 +6913,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "Torna a enviar el missatge de confirmació"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Felicitats! El vostre compte d'usuari s'ha creat satisfactòriament."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p><strong>No cal que us registreu</strong> a l'AMO si tan sols voleu baixar "
-"i instal·lar-vos complements públics.</p><p>Només cal que us registreu si:</"
-"p><ul><li>Voleu publicar comentaris dels complements</li><li>Sou un "
-"desenvolupador de complements i voleu fer-los públics utilitzant l'AMO</li></"
-"ul><p>Després que us hàgiu registrat correctament, se us enviarà una "
-"confirmació a l'adreça electrònica que hàgiu indicat. Seguiu les "
-"instruccions per a crear el vostre compte.</p><p>Si ho desitgeu podeu llegir "
-"les nostres <a href='%1$s' title='Notes legals'>Notes legals</a> i la <a "
-"href='%2$s' title='Política de privacitat'> Política de privacitat</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7232,28 +6928,20 @@ msgstr ""
 "descrita anteriorment. "
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Gràcies per registrar-vos i benvingut al %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Benvingut a addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Cal informar del nom, del cognom o bé de l'àlies"
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Col·leccions"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notificacions"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "El perfil de l'usuari."
 
@@ -7261,63 +6949,50 @@ msgstr "El perfil de l'usuari."
 msgid "user_verified_okay"
 msgstr "S'ha verificat satisfactòriament!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Supressió del compte d'usuari"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Edició del compte d'usuari"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Sobre mi"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Complements d'en/na %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nom"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Perfil d'usuari"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Col·leccions de l'usuari %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Adreça de correu"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Col·leccions preferides"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Pàgina d'inici"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Àlies"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Informació de l'usauri %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Revisats per %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Inici de sessió"
 
@@ -7349,679 +7024,5 @@ msgstr "Recuperació de la contrasenya de l'usuari"
 msgid "users_register_pagetitle"
 msgstr "Registre d'un nou usuari"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Llicència del codi font del %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Mostra tots els que s'han afegit recentment"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Mostra tots els més baixats"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Mostra tots els més ben valorats"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Complement següent "
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Complement anterior"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "La versió més nova compatible amb"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Historial de versions complet"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "El més nou:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Els més famosos:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Recomanem:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Actualitzat fa poc:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Mostra'ls tots"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Mostra tots els complements recomanats"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Mostra el més ben valorat primer"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Mostra el més nou primer"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "El més famós primer"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Aquesta versió del vostre complement diu que no és compatible amb el "
-#~ "Firefox %1$s. Mozilla preveu que la propera versió del Firefox sortirà "
-#~ "aviat, per tant proveu el vostre complement amb la nova versió i "
-#~ "actualitzeu la informació de compatibilitat. Sobre tot això també se'n "
-#~ "parla <a href=\"%2$s\">aquí</a>. Això només és un avís i podeu continuar "
-#~ "amb l'enviament d'aquesta versió a l'addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "S'ha deshabilitat el complement correctament"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Edita el complement"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "S'ha habilitat el complement correctament"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Descripció del complement"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "ALUF (EULA)"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Pàgina web del complement"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nom del complement"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Política de privadesa"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Resum del complement"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Correu per a problemes"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL per a problemes"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Notes de la versió"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nomina el complement"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "S'ha nominat el complement correctament"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Fan falta revisions de diversos usuaris (poden ser revisions externes)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visiteu la pàgina del %1$s per a fer canvis a la vostra publicació, o bé "
-#~ "a %2$s per a tornar al tauler de control del desenvolupador."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "Cliqueu ací"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Edita el complement"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "La versió s'ha posat en l'entorn de proves mentre s'espera que la provi "
-#~ "algun provador i un editor de complements de Mozilla. Rebreu un correu "
-#~ "electrònic quan s'hagi decidit alguna cosa."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Trobareu més informació sobre el sistema de revisió i l'entorn de proves "
-#~ "a %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "ací"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Aquesta versió s'ha posat en l'entorn de proves perquè la puguin "
-#~ "utilitzar els usuaris experimentats. Per tal de mostrar-la en el lloc web "
-#~ "públic, cal que la nomineu, %1, i que «segueixi un procés de revisió»."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nomina"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr ""
-#~ "La publicació del vostre complement s'ha completat satisfactòriament."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Ja que el vostre complement és de confiança, aquesta versió s'ha aprovat "
-#~ "automàticament per anar a l'àrea pública."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Envia el complement"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "El complement s'ha actualitzat satisfactòriament"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr ""
-#~ "Segurament voleu que %s incrementi el seu interès amb el vostre "
-#~ "complement."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "Envia una previsualització"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "No s'ha trobat cap autor [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Esborra"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancel·a"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Esteu segur que voleu cancel·lar la vostra publicació?"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Canvia el tipus de complement:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "S'ha actualitzat els comentaris del desenvolupador."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Afegeix una previsualització"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Autors"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Cap"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Categoria"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Descripció"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Deshabilitat"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detalls"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Comentaris del desenvolupador"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Previsualitza"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versió"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Pàgina d'inici"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Cap"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Sense nom"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "No s'han trobat cap previsualització."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Actualitza"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Correu per a problemes"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "El desenvolupador no ha donat cap adreça de correu per a problemes."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL per a problemes"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "El desenvolupador no ha donat cap URL per a problemes."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "De confiança"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "No s'han trobat versions."
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Sí, deshabilita'l"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Esteu segur que voleu deshabilitar aquest complement?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Si deshabiliteu aquest complement no es mostrarà en cap cerca ni cap "
-#~ "llistat. No es podrà baixar del web ni s'enviaran actualitzacions als "
-#~ "clients. El complement s'esborrarà, tot i que podreu tornar aquí i tornar-"
-#~ "lo a habilitar si voleu."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Deshabilita %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Sí, habilita'l"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Esteu segur que voleu habilitar aquest complement?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Si habiliteu aquest complement de nou tornarà a aparèixer en les cerques "
-#~ "i llistats. I es podrà baixar tant des de la pàgina web com des del "
-#~ "client d'actualitzacions."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Habilita %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Afegeix un autor"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Adreça de correu de l'autor"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "No hi ha cap categoria per a aquest tipus de complement."
-
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Transferència incompleta"
-
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No s'ha pujat cap fitxer"
-
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Supera la mida màxima permesa per a pujar un fitxer"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Autors"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Afegeix una icona"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Canvia la icona"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permet als usuaris veure en línia els fitxers font"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Localització per defecte"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Només esborra la icona existent"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Nou fitxer d'icona"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icona"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "més informació breu (com el dialecte)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Actualitza"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names"
-#~ "\">identificador de l'idioma </a>, com per exemple 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Els fitxers marcats se suprimiran."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Fitxers"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Aplicacions destinació"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "No hi ha fitxers."
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Actualitza"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Els resums estan limitats a un màxim de 250 caràcters.\n"
-#~ "(N'heu escrit %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "El nom del vostre complement ja existeix a la base de dades. Assegureu-"
-#~ "vos de què: <br /><li>El vostre GUID sigui correcte. La causa més comuna "
-#~ "d'aquest error és un GUID incorrecte.</li><li>No tingueu un registre "
-#~ "duplicat a la base de dades. Si és així, haureu d'actualitzar el registre "
-#~ "o esborrar-lo i tornar-ho a intentar.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr ""
-#~ "Descriviu els canvis que heu fet en aquesta actualització del complement."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "No tots els GUID dels fitxers són correctes"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Ja existeix una versió idèntica (%s) per a aquest complement i plataforma."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Heu de proporcionar els detalls necessaris per a la nominació."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "No podeu nominar una versió candidata d'un complement."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Només podeu nominar complements que actualment estiguin en l'entorn de "
-#~ "proves."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "S'ha produït un error mentre s'intentava desar les vostres dades."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "No teniu permisos per actualitzar aquest complement."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Afegeix un altre fitxer de plataforma"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Afegeix un autor"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Esborra"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Les categories per al vostre nou tipus de complement les tindreu "
-#~ "disponibles en el pròxim pas."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "No hi ha cap categoria disponible per a aquest tipus de complement."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Escriviu una descripció del vostre complement."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Escriviu el nom del vostre complement."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Escriviu el tipus del complement que esteu publicat."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Escriviu un resum del vostre complement."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Fitxer del complement"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Fitxer 2 del complement"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Fitxer 3 del complement"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tipus de complement"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permet als usuaris consultar en línia els fitxers font"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Adreça de correu de l'autor"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Autors"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Localització per defecte"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Acord de la llicència d'usuari final (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Aquest complement necessita programari extern"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Fitxers"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Pàgina web"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Fitxer d'icona"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nom"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plataformes disponibles"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Aquesta és una versió candidata"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Política de privadesa"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Aquest és un complement específic d'un web"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Resum"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Correu per a problemes"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL per a problemes"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Aplicacions destinació"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versió"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Notes de la versió"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Cap"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notes del revisor"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Perquè el vostre complement és de confiança, trieu on voleu que vagi "
-#~ "aquesta versió:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Públic"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Entorn de proves"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Acord del desenvolupador"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "1r pas"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Enviament del fitxer"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "2n pas"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detalls del complement"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "3r pas"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Detalls de la versió"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "4t pas"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localització"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "5è pas"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Fi"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Els meus complements"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Torna als detalls del complement"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Detecta automàticament el tipus de complement: %s"
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "La localització per defecte d'aquest complement  (%1$s [%2$s]) és "
-#~ "diferent de la localització que actualment teniu seleccionada (%3$s [%4"
-#~ "$s]). Els camps següents s'haurien de completar en %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "És incorrecta?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Esteu segur que voleu suprimir aquest fitxer?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Omet l'actualització de la informació del meu complement actual"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Els enviaments de complements estan inhabilitats actualment. Torneu-ho a "
-#~ "comprovar més endavant."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Ho accepto"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Ho refuso"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Un administrador ha inhabilitat el complement."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Inhabilitat"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "De confiança"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "No teniu cap complement. Feu clic a %s per a enviar-ne un."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "ací"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Assegureu-vos de %s el vostre tema."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "Envia una previsualització"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Edita la versió"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "La versió s'ha actualitzat amb èxit."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nou"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Actualitzat"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Antiguitat del complement"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tipus de complements"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Edat"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplicacions"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plataformes"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Tipus de publicacions"
-
-#~ msgid "error_notice"
-#~ msgstr "Avís"
-
-#~ msgid "forum_save"
-#~ msgstr "Desa"
-
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Connectors"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Complements experimentals"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Torna a la pàgina anterior"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Aquesta és la pàgina %1$s de %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s complement trobat"
-#~ msgstr[1] "%s complements trobats"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Canal RSS del resum"
diff --git a/site/app/locale/compile-mo.sh b/site/app/locale/compile-mo.sh
index f9dca74..8330cac 100755
--- a/site/app/locale/compile-mo.sh
+++ b/site/app/locale/compile-mo.sh
@@ -12,7 +12,7 @@ function usage() {
 # check if file and dir are there
 if [[ ($# -ne 1) || (! -d "$1") ]]; then usage; fi
 
-for lang in `find $1 -type f -name "messages.po"`; do
+for lang in `find $1 -type f -name "*.po"`; do
     dir=`dirname $lang`
     stem=`basename $lang .po`
     msgfmt -o ${dir}/${stem}.mo $lang
diff --git a/site/app/locale/cs/LC_MESSAGES/messages.po b/site/app/locale/cs/LC_MESSAGES/messages.po
index 736d2ae..d0be68c 100644
--- a/site/app/locale/cs/LC_MESSAGES/messages.po
+++ b/site/app/locale/cs/LC_MESSAGES/messages.po
@@ -1,7285 +1,6891 @@
-# Czech translations for addons.mozilla.org package.
-# This file is distributed under the same license as the addons.mozilla.org package.
-# Copyright (C) 2007-2009 addons.mozilla.org
-# Copyright (C) 2007-2009 Pavel Franc <franc@czilla.cz>
-# Copyright (C) 2008-2009 Pavel Cvr�ek <jasnapaka@jasnapaka.com>
-# Copyright (C) 2007 Lukáš Petrovický <petrovicky@czilla.cz>
-msgid ""
-msgstr ""
-"Project-Id-Version: REMORA 0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-03-09 23:50+0100\n"
-"Last-Translator: Pavel Franc <franc@czilla.cz>\n"
-"Language-Team: CZilla <info@czilla.cz>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: views/addons/policy.thtml:98
-msgid "a_cancel_installation"
-msgstr "Přerušit instalaci"
-
-#. This is the text that appears on buttons to download add-ons.
-#. %$1s is an optional string that only appears if the add-on is only available for
-#. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
-#, php-format
-msgid "a_download"
-msgstr "Stáhnout doplněk %s"
-
-#: views/addons/policy.thtml:72
-msgid "a_eula_download"
-msgstr "Souhlasím a stahovat"
-
-#: views/addons/policy.thtml:74
-msgid "a_eula_install"
-msgstr "Souhlasím a instalovat"
-
-#: views/elements/header.thtml:76 views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
-msgid "a_header_public"
-msgstr "Veřejné doplňky"
-
-#: views/elements/header.thtml:58 views/elements/header.thtml:75
-#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
-msgid "a_header_sandbox"
-msgstr "Pískoviště"
-
-#. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
-msgid "addon_detail_last_updated"
-msgstr "Aktualizováno dne %s"
-
-#. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
-#: views/elements/addon_version_detail.thtml:51
-#, php-format
-msgid "addon_display_header_version"
-msgstr "Verze %s"
-
-#: views/addons/browse_thumbs.thtml:80
-msgid "addon_downloads"
-msgstr "stažení"
-
-#: views/addons/display.thtml:147
-msgid "addon_downloads_total"
-msgstr "staženo celkem"
-
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
-msgid "addon_downloads_weekly"
-msgstr "staženo týdně"
-
-#. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
-#, php-format
-msgid "addon_list_category_totalcount"
-msgid_plural "addon_list_category_totalcount"
-msgstr[0] "%1$s doplněk v&nbsp;kategorii \"%2$s\""
-msgstr[1] "%1$s doplňky v&nbsp;kategorii \"%2$s\""
-msgstr[2] "%1$s doplňků v&nbsp;kategorii \"%2$s\""
-
-#: views/elements/amo2009/addon_list_options.thtml:103
-#: views/elements/pagination.thtml:67
-#: views/elements/addon_list_options.thtml:94
-msgid "addon_list_perpage"
-msgstr "na stránku"
-
-#: views/elements/amo2009/addon_list_options.thtml:84
-#: views/elements/addon_list_options.thtml:98
-msgid "addon_list_sortby"
-msgstr "Řazení:"
-
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
-msgid "addon_listitem_flag_experimental"
-msgstr "experimentální"
-
-#: views/helpers/addons_html.php:570
-msgid "addon_listitem_flag_recommended"
-msgstr "doporu�ované"
-
-#. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
-msgid "addon_not_available_for_platform"
-msgstr "Doplněk %1$s není pro %2$s dostupný."
-
-#. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
-#, php-format
-msgid "addon_review_a_back_to_addon_x"
-msgstr "Zpět na doplněk %1$s…"
-
-#. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
-#, php-format
-msgid "addon_review_a_back_to_reviews"
-msgstr "Zpět na recenze…"
-
-#: views/reviews/add.thtml:85
-msgid "addon_review_add_rating_field"
-msgstr "Hodnocení:"
-
-#: views/reviews/add.thtml:102
-msgid "addon_review_add_review_field"
-msgstr "Recenze:"
-
-#: views/reviews/add.thtml:107
-msgid "addon_review_add_submit"
-msgstr "Odeslat recenzi"
-
-#. %s is the name of the add-on
-#: views/reviews/add.thtml:51
-#, php-format
-msgid "addon_review_add_title"
-msgstr "Přidat recenzi doplňku %s"
-
-#: views/reviews/add.thtml:78
-msgid "addon_review_add_title_field"
-msgstr "Název/Stru�ný popis:"
-
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
-msgid "addon_review_admin_delete"
-msgstr "Smazat"
-
-#: views/reviews/display.thtml:76
-msgid "addon_review_author_reply_link"
-msgstr "Odpovědět"
-
-#: views/reviews/delete.thtml:62
-msgid "addon_review_confirm_delete"
-msgstr "Opravdu chcete smazat tuto recenzi?"
-
-#: views/reviews/delete.thtml:63
-msgid "addon_review_confirm_no"
-msgstr "Ne"
-
-#: views/reviews/delete.thtml:64
-msgid "addon_review_confirm_yes"
-msgstr "Ano"
-
-#: views/reviews/delete.thtml:48
-msgid "addon_review_delete_header"
-msgstr "Smazat recenzi"
-
-#: controllers/reviews_controller.php:449
-msgid "addon_review_deleted_successfully"
-msgstr "Recenze úspěšně smazána."
-
-#. %s is the name of the add-on
-#: views/reviews/add.thtml:51
-#, php-format
-msgid "addon_review_edit_title"
-msgstr "Úprava recenze doplňku %s"
-
-#. %1 is the count of characters entered as notes for the review flag reason.
-#: controllers/reviews_controller.php:539
-msgid "addon_review_flag_error_other_length"
-msgstr ""
-"Problém s&nbsp;nahlášením recenze: Poznámky pro nahlášení recenze jsou "
-"omezeny na 10 až 100 znaků. Délka poznámky byla %1$s."
-
-#. Removing an extra comma
-#: views/reviews/review_added.thtml:53
-msgid "addon_review_in_moderation"
-msgstr "Upozornění: Recenze musí být před zveřejněním schválena redaktorem."
-
-#: views/reviews/add.thtml:57
-msgid "addon_review_in_reply_to"
-msgstr "Odpově� vývojáře:"
-
-#. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
-#, php-format
-msgid "addon_review_others_by_user"
-msgid_plural "addon_review_others_by_user"
-msgstr[0] ""
-"Zobrazit %1$s předchozí recenzi napsanou pro tento doplněk uživatelem %2$s."
-msgstr[1] ""
-"Zobrazit %1$s předchozí recenze napsané pro tento doplněk uživatelem %2$s."
-msgstr[2] ""
-"Zobrazit %1$s předchozích recenzí napsaných pro tento doplněk uživatelem %2"
-"$s."
-
-#. %1 is the add-on name
-#: controllers/reviews_controller.php:201
-#: controllers/reviews_controller.php:250
-#: controllers/reviews_controller.php:345
-#: controllers/reviews_controller.php:424
-#, php-format
-msgid "addon_review_pagetitle"
-msgstr "Recenze doplňku %s"
-
-#. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
-#, php-format
-msgid "addon_review_reply_on_x_by_y"
-msgstr "Odpově� uživatele %1$s dne %2$s"
-
-#: views/reviews/display.thtml:157
-msgid "addon_review_reply_prefix"
-msgstr "Odpově� vývojáře:"
-
-#: views/reviews/review_added.thtml:51
-msgid "addon_review_saved_successfully"
-msgstr "Recenze byla uložena. Děkujeme!"
-
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
-msgid "addon_reviewed_by_u_on_d"
-msgstr "uživatelem %1$s dne %2$s"
-
-#. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
-#, php-format
-msgid "addon_reviewed_on_x_rated_y"
-msgstr "Uživatel %1$s dne %2$s (hodnocení: %3$s)"
-
-#: views/elements/amo2009/addon_version_detail.thtml:52
-#: views/elements/addon_version_detail.thtml:52
-msgid "addon_version_permalink"
-msgstr "Stálý odkaz na tuto verzi"
-
-#. %1 is the current Application name (e.g. Firefox)
-#. %2 is the Application's version number
-#: views/addons/versions.thtml:140
-msgid "addon_versions_getlatestversion"
-msgstr "Nejnovější verze kompatibilní s&nbsp;aplikací %1$s %2$s"
-
-#: views/addons/display.thtml:447
-msgid "addons_author_addons_submit"
-msgstr "Odeslat"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
-msgid "addons_author_tooltip"
-msgstr "Zobrazí profil autora"
-
-#. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
-msgid "addons_browse_all_themes_title"
-msgstr "Motivy vzhledu :: Doplňky aplikace %1$s"
-
-#. %s is the name of the category
-#: controllers/addons_controller.php:1016
-#, php-format
-msgid "addons_browse_browse_category"
-msgstr "Procházet %s"
-
-#. %1 is the name of the theme category (eg. Modern)
-#. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
-msgid "addons_browse_categories_header_theme"
-msgstr "Motivy vzhledu z&nbsp;kategorie %1$s :: Doplňky aplikace %2$s"
-
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Co to je?"
-
-#: views/reviews/display.thtml:222
-msgid "addons_display_add_review"
-msgstr "Přidat recenzi"
-
-#: views/addons/display.thtml:294
-msgid "addons_display_advanced_details"
-msgstr "Další podrobnosti"
-
-#: views/addons/display.thtml:98
-msgid "addons_display_categories"
-msgstr "Kategorie"
-
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Přidat do sbírky:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nová sbírka..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Zvolit sbírku..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publikovat"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s byl přidán ke sbírce %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Co to je?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "a %1$s dalších sbírek"
-
-#: views/addons/display.thtml:403
-msgid "addons_display_detailed_review"
-msgstr "Podrobná recenze"
-
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
-msgid "addons_display_dont_like_it"
-msgstr "Nelíbí se mi"
-
-#: views/reviews/display.thtml:220
-msgid "addons_display_edit_review"
-msgstr "Upravit recenzi"
-
-#: views/addons/display.thtml:132
-msgid "addons_display_has_privacy"
-msgstr "Tento doplněk obsahuje zásady ochrany soukromí"
-
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
-msgid "addons_display_hate_it"
-msgstr "Nesnáším ho"
-
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Obdobné sbírky"
-
-#: views/addons/display.thtml:297
-msgid "addons_display_header_developer_comments"
-msgstr "Komentáře vývojářů"
-
-#: views/addons/display.thtml:230
-msgid "addons_display_header_homepage"
-msgstr "Titulní stránka"
-
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licence zdrojového kódu"
-
-#: views/addons/display.thtml:337
-msgid "addons_display_header_reviews"
-msgstr "Recenze"
-
-#: views/addons/display.thtml:261
-msgid "addons_display_header_support"
-msgstr "Podpora"
-
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
-msgid "addons_display_like_it"
-msgstr "Líbí se mi"
-
-#: views/addons/display.thtml:210
-msgid "addons_display_long_description"
-msgstr "Popis"
-
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
-msgid "addons_display_love_it"
-msgstr "Miluji ho"
-
-#: views/addons/display.thtml:178
-msgid "addons_display_more_images"
-msgstr "Další obrázky"
-
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Tento doplněk dosud není v žádné sbírce."
-
-#. %1$s is either an author's name or a comma separated list of authors. Using
-#. the list doesn't make sense in the English plural form so we ignore the
-#. variable.
-#: views/addons/display.thtml:436
-msgid "addons_display_other_addons_by"
-msgid_plural "addons_display_other_addons_by"
-msgstr[0] "Další doplňky autora %1$s"
-msgstr[1] "Další doplňky těchto autorů"
-msgstr[2] "Další doplňky těchto autorů"
-
-#. %s is the name of the add-on and the add-on section.  Example:
-#.   Some Add-on :: Firefox Add-ons
-#. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
-#, php-format
-msgid "addons_display_pagetitle"
-msgstr "Doplněk %s"
-
-#. %s is an email address
-#: views/addons/display.thtml:286
-#, php-format
-msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Podporu tohoto doplňku poskytuje vývojář na e-mailu %s"
-
-#. %$1s is a URL
-#. %$2s is an email address
-#: views/addons/display.thtml:269
-#, php-format
-msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr ""
-"Podporu tohoto doplňku poskytuje vývojář na stránce %1$s nebo na e-mailu %2$s"
-
-#. %s is a URL
-#: views/addons/display.thtml:278
-#, php-format
-msgid "addons_display_paragraph_supportinfourl"
-msgstr "Podporu tohoto doplňku poskytuje vývojář na stránce %s"
-
-#: views/addons/display.thtml:383
-msgid "addons_display_rate_it"
-msgstr "Hodnocení"
-
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
-msgid "addons_display_really_like_it"
-msgstr "Velmi se mi líbí"
-
-#: views/addons/display.thtml:410
-msgid "addons_display_review_etiquette"
-msgstr ""
-"Nepřidávejte prosím do recenze hlášení chyb. Jelikož vývojář rozšíření nemá "
-"možnost, jak ze stránek získat vaši e-mailovou adresu, nemá rovněž možnost, "
-"jak vás kontaktovat a vyřešit váš problém."
-
-#. %1 is the review guidelines link
-#: views/addons/display.thtml:417
-msgid "addons_display_review_guidelines_link"
-msgstr "<a href=\"%s\">Pravidla pro přidání recenze</a>"
-
-#. %1 is the support section link
-#: views/addons/display.thtml:414
-msgid "addons_display_review_see_support"
-msgstr ""
-"Informace o&nbsp;asistenci k&nbsp;tomuto doplňku naleznete v&nbsp;<a href=\"%"
-"1$s\">sekci podpora</a>."
-
-#: views/addons/display.thtml:404
-msgid "addons_display_review_submit"
-msgstr "Uložit"
-
-#: views/addons/display.thtml:430
-#, php-format
-msgid "addons_display_see_all_addons"
-msgstr "Zobrazit všechny doplňky z&nbsp;kategorie %1$s"
-
-#. %1 is the number of reviews
-#: views/addons/display.thtml:364
-#, php-format
-msgid "addons_display_see_all_reviews"
-msgstr "Zobrazit všechny recenze (%1$s)"
-
-#: views/addons/display.thtml:219
-msgid "addons_display_see_all_versions"
-msgstr "Zobrazit všechny verze"
-
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
-msgid "addons_display_view_source"
-msgstr "Zobrazit zdrojový kód"
-
-#: views/addons/display.thtml:324
-msgid "addons_display_view_stats"
-msgstr "Zobrazit statistiku"
-
-#: views/addons/display.thtml:376
-msgid "addons_display_what_do_you_think"
-msgstr "Jak se vám líbí?"
-
-#: views/elements/app_compatibility.thtml:49
-msgid "addons_display_workswith"
-msgstr "Vyžaduje:"
-
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Právě přidané"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populární"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Doporu�ené"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Odebírat"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Procházet doplňky"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Aktualizované"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
-msgid "addons_home_by"
-msgstr "od"
-
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Populární sbírky"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Sbírky"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> doplněk"
-msgstr[1] "<strong>%1$s</strong> doplňky"
-msgstr[2] "<strong>%1$s</strong> doplňků"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Zobrazit všechny sbírky"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Sbírky vám umožňují kategorizovat, porovnávat a míchat doplňky. Odebírejte "
-"sbírky vytvořené jinými uživateli nebo si vytvořte vlastní."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> odběratel"
-msgstr[1] "<strong>%1$s</strong> odběratelé"
-msgstr[2] "<strong>%1$s</strong> odběratelů"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
-msgid "addons_home_feature_head"
-msgstr "Doporu�ujeme"
-
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
-#, php-format
-msgid "addons_home_header_details"
-msgstr ""
-"Doplňky rozšiřují %1$s a umožňují vám lépe personalizovat své prohlížení "
-"webu. Porozhlédněte se kolem a udělejte si %1$s přesně podle sebe."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Líbí se vám? Více doplňků naleznete v %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Více jak 5000 způsobů</strong>, jak si přizpůsobit a rozšířit "
-"Firefox dle svých potřeb."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Co jsou doplňky?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Snadné na instalaci</strong>. Když budou dostupné aktualizace, "
-"budete upozornění."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Úvod"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Lišty, motivy vzhledu a vyhledávací moduly, které vám  <strong>pomohou "
-"urychlit provádění běžných �inností.</strong>"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NOVÄš!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
-msgid "addons_home_other_applications"
-msgstr "Ostatní aplikace"
-
-#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
-#. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
-#: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
-#: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
-#: controllers/reviews_controller.php:251
-#: controllers/reviews_controller.php:346
-#: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
-#: controllers/localizers_controller.php:72
-#, php-format
-msgid "addons_home_pagetitle"
-msgstr "Doplňky aplikace %1$s"
-
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>stažený doplněk</span>"
-msgstr[1] "<strong>%1$s</strong> <span>stažené doplňky</span>"
-msgstr[2] "<strong>%1$s</strong> <span>stažených doplňků</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>používaný doplněk</span>"
-msgstr[1] "<strong>%1$s</strong> <span>používané doplňky</span>"
-msgstr[2] "<strong>%1$s</strong> <span>používaných doplňků</span>"
-
-#: views/addons/home.thtml:136
-msgid "addons_home_view_all_newest_title"
-msgstr "Zobrazit všechny nové doplňky"
-
-#: views/addons/home.thtml:129
-msgid "addons_home_view_all_popular_title"
-msgstr "Zobrazit všechny populární doplňky"
-
-#: views/addons/home.thtml:150
-msgid "addons_home_view_all_recommended_title"
-msgstr "Zobrazit všechny doporu�ované doplňky"
-
-#: views/addons/home.thtml:143
-msgid "addons_home_view_all_updated_title"
-msgstr "Zobrazit všechny aktualizované doplňky"
-
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
-msgid "addons_install_in_sunbird"
-msgstr ""
-"<ol><li>Uložte soubor klepnutím na odkaz níže.</li><li>V Mozilla Sunbirdu "
-"otevřete Spráce doplňků z&nbsp;nabídky Nástroje.</li><li>Klepněte na "
-"tla�ítko Instalovat, zvolte soubor, který jste stáhli a klepněte na \"OK\".</"
-"li></ol>"
-
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
-msgid "addons_install_in_sunbird_title"
-msgstr "Jak nainstalovat v&nbsp;Sunbirdu"
-
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
-msgid "addons_install_in_thunderbird"
-msgstr ""
-"<ol><li>Na odkaz níže klepněte pravým tla�ítkem a z&nbsp;místní nabídky "
-"zvolte \"Uložit odkaz jako…\" a uložte soubor dopňku na váš pevný disk.</"
-"li><li>V Mozilla Thunderbirdu otevřete z&nbsp;nabídky Správce doplňků.</"
-"li><li>Klepněte na tla�ítko Instalovat, najděte a vyberte stažený soubor a "
-"klepněte na \"OK\".</li></ol>"
-
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
-msgid "addons_install_in_thunderbird_title"
-msgstr "Jak naistalovat doplněk do Thunderbirdu"
-
-#: views/elements/amo2009/addon_list_options.thtml:108
-#: views/elements/addon_list_options.thtml:105
-msgid "addons_options_show_experimental"
-msgstr "Experimentální doplňky"
-
-#: views/elements/amo2009/addon_list_options.thtml:113
-#: views/elements/addon_list_options.thtml:109
-msgid "addons_options_submit"
-msgstr "Odeslat"
-
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
-msgid "addons_plugins_by"
-msgstr "Výrobce: "
-
-#: views/addons/plugins.thtml:107
-msgid "addons_plugins_for_linux"
-msgstr "Linux"
-
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
-msgid "addons_plugins_for_macosx"
-msgstr "Mac OS X"
-
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
-msgid "addons_plugins_for_windows"
-msgstr "Windows"
-
-#. %1$s is a URL
-#: views/addons/plugins.thtml:139
-#, php-format
-msgid "addons_plugins_looking_for_more"
-msgstr ""
-"Tato stránka obsahuje seznam nej�astěji používaných zásuvných modulů. Pokud "
-"hledáte další zásuvné moduly pro prohlíže�e založené na Mozille, najdete je "
-"na stránkách projektu %1$s"
-
-#: views/addons/plugins.thtml:137
-msgid "addons_plugins_looking_for_plugin"
-msgstr "Hledáte zásuvný modul, který tu není"
-
-#: views/addons/plugins.thtml:58
-msgid "addons_plugins_main_description"
-msgstr ""
-"Zásuvné moduly (angl. plugins) jsou malé doplňky, které přidávají do "
-"prohlíže�e nové, a většinou specifické, funkce. Typickým příkladem je "
-"přidání podpory ur�itého grafického formátu a nebo podpora multimédií - "
-"např. Flash, PDF, WMV. Zásuvné moduly na rozdíl od rozšíření nemodifikují "
-"samotný kód aplikace."
-
-#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
-#, php-format
-msgid "addons_plugins_main_header"
-msgstr "Zásuvné moduly pro %1$s"
-
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
-msgid "addons_plugins_pagetitle"
-msgstr "Zásuvné moduly"
-
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
-msgid "addons_plugins_support_documentation"
-msgstr "Uživatelská dokumentace: "
-
-#. %s is the name of the add-on
-#: views/addons/policy.thtml:61
-#, php-format
-msgid "addons_policy_eula_require"
-msgstr ""
-"Před instalací doplňku %s je nutné odsouhlasit následující Licen�ní smlouvu "
-"s koncovým uživatelem (EULA): "
-
-#. %1 is the add-on name
-#: controllers/addons_controller.php:1476
-#, php-format
-msgid "addons_previews_pagetitle"
-msgstr "Náhledy doplňku %s"
-
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Nedávno přidané"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
-msgid "addons_recommended_introduction"
-msgstr ""
-"Ve více než tisíci doplňcích si jistě každý najde ten svůj. Pro za�átek vám "
-"nabízíme pár našich oblíbených. Užijte si je!"
-
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-msgid "addons_recommended_pagetitle"
-msgstr "Doporu�ované doplňky"
-
-#: controllers/addons_controller.php:1360
-msgid "addons_recommended_title"
-msgstr "Doporu�ované doplňky"
-
-#: views/addons/searchengines.thtml:136
-msgid "addons_searchengines_additional_resources"
-msgstr "Další zdroje"
-
-#. link text devmo
-#: views/addons/searchengines.thtml:141
-msgid "addons_searchengines_devmo_link"
-msgstr "Vývojářském centrum Mozilly"
-
-#: views/pages/js_constants.js.thtml:67
-msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr ""
-"Je nám líto, ale váš prohlíže� nepodporuje instalaci vyhledávacích modulů."
-
-#: views/addons/searchengines.thtml:49
-msgid "addons_searchengines_error_nojavascript"
-msgstr ""
-"K instalaci vyhledávacích modulů je vyžadován JavaScript, který váš "
-"prohlíže� nepodporuje a nebo ho máte vypnutý. Před instalací níže uvedených "
-"vyhledávacích modulů si prosím zapněte podporu JavaScriptu."
-
-#. %1 is "make your own" link
-#. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-msgid "addons_searchengines_learn_howto"
-msgstr "Nau�te se %1$s podle návodu na %2$s."
-
-#. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
-msgid "addons_searchengines_makeyourown_href"
-msgstr "/cs/docs/Vytvo%C5%99en%C3%AD_vyhled%C3%A1vac%C3%ADho_modulu_OpenSearch"
-
-#. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
-msgid "addons_searchengines_makeyourown_link"
-msgstr "vytvářet vlastní moduly"
-
-#. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-msgid "addons_searchengines_more"
-msgstr "Vyhledejte další moduly na stránkách %1$s"
-
-#. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-msgid "addons_searchengines_mycroft_link"
-msgstr "mycroft.mozdev.org"
-
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
-msgid "addons_searchengines_pagetitle"
-msgstr "Vyhledávací moduly"
-
-#: views/addons/searchengines.thtml:143
-msgid "addons_searchengines_thanks"
-msgstr ""
-"Specialní díky patří projektu Mycroft za jejich práci kolem vyhledávacích "
-"modulů Firefoxu."
-
-#: views/addons/display.thtml:154
-msgid "addons_share_button_text"
-msgstr "Sdílet"
-
-#: controllers/addons_controller.php:89
-msgid "addons_share_label_delicious"
-msgstr "Přidat do Delicious"
-
-#: controllers/addons_controller.php:77
-msgid "addons_share_label_digg"
-msgstr "Přidat na Digg"
-
-#: controllers/addons_controller.php:83
-msgid "addons_share_label_facebook"
-msgstr "Přidat na Facebook"
-
-#: controllers/addons_controller.php:101
-msgid "addons_share_label_friendfeed"
-msgstr "Přidat na FriendFeed"
-
-#: controllers/addons_controller.php:95
-msgid "addons_share_label_myspace"
-msgstr "Přidat na  MySpace"
-
-#: controllers/components/amo.php:201 controllers/components/amo.php:229
-msgid "addons_status_disabled"
-msgstr "Zakázaný"
-
-#: controllers/components/amo.php:191 controllers/components/amo.php:224
-msgid "addons_status_incomplete"
-msgstr "Neúplná verze"
-
-#: controllers/components/amo.php:197 controllers/components/amo.php:227
-msgid "addons_status_nominated"
-msgstr "Na pískovišti: Nominováno ke zveřejnění"
-
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
-#: controllers/components/amo.php:226
-msgid "addons_status_pending"
-msgstr "Na pískovišti: Čeká na kontrolu"
-
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
-#: controllers/components/amo.php:228
-msgid "addons_status_public"
-msgstr "veřejné"
-
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
-#: controllers/components/amo.php:225
-msgid "addons_status_sandbox"
-msgstr "na pískovišti"
-
-#: controllers/components/amo.php:203
-msgid "addons_status_unknown"
-msgstr "neznámý"
-
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
-msgid "addons_title_tooltip"
-msgstr "Zobrazí více o&nbsp;doplňku"
-
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Nejvíce stahované"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Nejlépe hodnocené"
-
-#: views/addons/versions.thtml:62
-msgid "addons_versions_careful"
-msgstr "Při používání starších verzí bu�te opatrní"
-
-#: views/addons/versions.thtml:63
-msgid "addons_versions_careful_introduction"
-msgstr ""
-"Tyto verze jsou nabízeny především pro porovnání a pro testovací ú�ely. Pro "
-"běžné používání doporu�ujeme mít nainstalovánu vždy nejnovější verzi doplňku."
-
-#: controllers/addons_controller.php:1549
-msgid "addons_versions_history"
-msgstr "Historie verzí s&nbsp;popisem změn"
-
-#. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
-#, php-format
-msgid "addons_versions_pagetitle"
-msgstr "Historie verzí doplňku %1$s"
-
-#: controllers/groups_controller.php:71
-msgid "admin_group_add_pagetitle"
-msgstr "Přidat skupinu"
-
-#: controllers/groups_controller.php:111
-msgid "admin_group_delete_pagetitle"
-msgstr "Smazat skupinu"
-
-#. %s is a number to identify the group
-#: controllers/groups_controller.php:117
-#, php-format
-msgid "admin_group_deleted"
-msgstr "Skupina s&nbsp;ID %s byla smazána"
-
-#: controllers/groups_controller.php:89
-msgid "admin_group_edit_pagetitle"
-msgstr "Úprava skupiny"
-
-#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
-msgid "admin_group_error_invalid_id"
-msgstr "Neplatné ID skupiny"
-
-#: controllers/groups_controller.php:65
-msgid "admin_group_pagetitle"
-msgstr "Správce skupin"
-
-#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
-msgid "admin_group_saved"
-msgstr "Skupina byla uložena"
-
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
-msgid "advanced_search_form"
-msgstr "Rozšířené"
-
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
-msgid "advanced_search_form_any_time"
-msgstr "Kdykoliv"
-
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
-msgid "advanced_search_form_any_type"
-msgstr "Nezáleží"
-
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
-msgid "advanced_search_form_any_version"
-msgstr "Nezáleží"
-
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
-msgid "advanced_search_form_application"
-msgstr "Aplikace"
-
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
-msgid "advanced_search_form_keyword_match"
-msgstr "Shoda klí�ového slova"
-
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
-msgid "advanced_search_form_lastupdate"
-msgstr "Aktualizované"
-
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
-msgid "advanced_search_form_name"
-msgstr "Název"
-
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
-msgid "advanced_search_form_newest"
-msgstr "Nejnovější"
-
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
-msgid "advanced_search_form_past_3_months"
-msgstr "Poslední 3 měsíce"
-
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
-msgid "advanced_search_form_past_6_months"
-msgstr "Posledních 6 měsíců"
-
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
-msgid "advanced_search_form_past_day"
-msgstr "Poslední den"
-
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
-msgid "advanced_search_form_past_month"
-msgstr "Poslední měsíc"
-
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
-msgid "advanced_search_form_past_week"
-msgstr "Poslední týden"
-
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
-msgid "advanced_search_form_past_year"
-msgstr "Poslední rok"
-
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
-msgid "advanced_search_form_perpage"
-msgstr "Doplňků na stránku"
-
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
-msgid "advanced_search_form_platform"
-msgstr "Platforma"
-
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
-msgid "advanced_search_form_popularity"
-msgstr "Popularita"
-
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
-msgid "advanced_search_form_rating"
-msgstr "Hodnocení"
-
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
-msgid "advanced_search_form_sortby"
-msgstr "Seřadit dle"
-
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
-msgid "advanced_search_form_to"
-msgstr "až"
-
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
-msgid "advanced_search_form_toggle_tooltip"
-msgstr "Přepne do režimu rozšířeného vyhledávání"
-
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
-msgid "advanced_search_form_type"
-msgstr "Typ"
-
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
-msgid "advanced_search_form_version"
-msgstr "Verze"
-
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Další"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Předchozí"
-
-#: views/pages/js_constants.js.thtml:96
-msgid "app_compat_ignore_check"
-msgstr "Ignorovat kontrolu verzí"
-
-#: views/pages/js_constants.js.thtml:72
-msgid "app_compat_older_firefox_only"
-msgstr "Tento doplněk je pouze pro starší verzi Firefoxu"
-
-#. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
-msgid "app_compat_older_version_or_ignore_check"
-msgstr ""
-"Můžete <a href=\"%1$s\">vyzkoušet starší verzi</a> nebo <a href=\"#\" "
-"onclick=\"%2$s\">tuto kontrolu ignorovat</a>"
-
-#. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
-msgid "app_compat_try_old_version"
-msgstr "Zkuste použít <a href=\"%1$s\">starší verzi</a>"
-
-#. %1$s is a URL
-#. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
-msgid "app_compat_unreleased_version"
-msgstr ""
-"Tento doplněk vyžaduje dosud nevydaný <a href=\"%1$s\">Firefox %2$s</a>"
-
-#: views/pages/js_constants.js.thtml:70
-msgid "app_compat_update_firefox"
-msgstr ""
-"Pro použití tohoto doplňku je nutné <a href=\"http://getfirefox.com"
-"\">aktualizovat Firefox</a>"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "Uživatel %1$s změnil stav %2$s na %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "Uživatel %1$s u�inil neznámou administrátorskou akci %2$s u ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "Uživatel %1$s odstranil funkci %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "Uživatel %1$s vytvořil aplikaci %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "Uživatel %1$s upravil aplikaci %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "Uživatel %1$s vytvořil verzi %2$s pro %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "Uživatel %1$s odstranil verzi %2$s pro %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "Uživatel %1$s změnil předvolbu '%2$s' z '%3$s' na '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "Uživatel %1$s u�inil neznámou akci editora %2$s na ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "Uživatel %1$s odstranil doplněk %2$s ze seznamu doporu�ovaných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "Uživatel %1$s přidal %2$s na seznam doporu�ovaných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "Uživatel %1$s změnil doporu�ení pro jazyk %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "Uživatel %1$s změnil jazyky pro doplněk %2$s ze seznamu doporu�ovaných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "Uživatel %1$s přepo�ítal kontrolní sou�et souboru %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "Uživatel %1$s byl přidán %2$s do skupiny %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "Uživatel %1$s se přiřadil k %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "Uživatel %1s vytvořil skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "Uživatel %1$s odstranil skupinu %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "Uživatel %1$s upravil skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "Uživatel %1$s odstranil %2$s ze skupiny %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "Uživatel %1$s provedl neznámou akci %2$s u %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "Uživatel %1$s se pokusil upravit uzam�enou skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "Uživatel %1$s se pokusil bez oprávnění upravit překlady u %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "Uživatel %1$s vytvořil platformu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "Uživatel %1$s odstranil platformu %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "Uživatel %1$s upravil platformu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "Uživatel %1$s selhal při opětovném ověření přístupu k %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "Uživatel %1$s vytvořil odpově� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "Uživatel %1$s odstranil odpově� %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "Uživatel %1$s upravil odpově� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "Uživatel %1$s schválil recenzi %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "Uživatel %1$s odstranil recenzi %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "Uživatel %1$s provedl neznámou bezpe�nostní akci %2$s na ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "Uživatel %1$s vytvořil štítek %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "Uživatel %1$s odstranil kategorii %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "Uživatel %1$s upravil kategorii %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "Uživatel %1$s upravil překlady aplikace pro %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "Uživatel %1$s upravil překlad příspěvku do blogu pro %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "Uživatel %1$s upravil překlady platformy pro %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "Uživatel %1$s upravil překlady kategorií pro %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "Uživatel %1$s upravil informace o uživateli %2$s"
-
-#: controllers/addons_controller.php:1012
-msgid "browse_addons_name"
-msgstr "Doplňky podle jména"
-
-#: controllers/addons_controller.php:1010
-msgid "browse_addons_newest"
-msgstr "Nové doplňky"
-
-#: controllers/addons_controller.php:1008
-msgid "browse_addons_popular"
-msgstr "Oblíbené doplňky"
-
-#: controllers/addons_controller.php:1011
-msgid "browse_addons_rated"
-msgstr "Doplňky podle hodnocení"
-
-#: controllers/addons_controller.php:1009
-msgid "browse_addons_updated"
-msgstr "Právě aktualizované doplňky"
-
-#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
-msgid "categories_current_title"
-msgstr "Sou�asná kategorie"
-
-#: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
-msgid "categories_header"
-msgstr "Kategorie"
-
-#: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
-msgid "categories_header_title"
-msgstr "Vybere kategorii"
-
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Zobrazit vše v&nbsp;kategorii %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Popis by měl být kratší než %1$s znaků."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Sbírka %s"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Chyba při mazání doplňku!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Chyba při ukládání doplňku!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Chyba při ukládání komentáře!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Jméno by mělo být kratší než %1$s znaků."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
-msgid "collection_not_found"
-msgstr "Sbírka nenalezena!"
-
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Pokud již víte, které doplňky chcete přidat do vaší sbírky, jednoduše "
-"za�něte psáte níže jejich jména. Pokud je chcete raději přidat později, "
-"jednoduše klepněte na %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Zvolte váš první doplněk"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Vytvořit sbírku"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Zvolené doplňky"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"Pomocí několika polí níže je snadné vytvořit si vlastní sbírky doplňků."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Vytvořit sbírku"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Sbírky"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Dozvědět se více"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Přidat do oblíbených"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Odebrat z oblíbených"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>Vaši novou sbírku můžete vidět níže. Pokud byste rádi u sbírky nastavili "
-"ozna�ení, nahráli ikonu �i změnili další nastavení, navštivte prosím stránku "
-"<a href='%1$s'>Správa sbírek</a>.</p><p>Vaše sbírka je dostupná na adrese: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Vaše sbírka je nyní připravena!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "O této sbírce"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s doplněk ve sbírce"
-msgstr[1] "%1$s doplňky v této sbírce"
-msgstr[2] "%1$s doplňků v této sbírce"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Vytvořil:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Aktualizováno:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Přidání k oblíbeným&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Odebrání z oblíbených&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "Pro přidání sbírky k oblíbeným se <a href=\"%1$s\">přihlašte</a>."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Správa sbírky"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Datum přidání"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Jméno"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularita"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s stažení tento týden"
-msgstr[1] "%1$s stažení tento týden"
-msgstr[2] "%1$s stažení tento týden"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Zvolené doplňky budou po uložení odstraněny"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Pro přidání nových doplňků do sbírky za�nete psát níže jejich jména."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"Pro přidání nových doplňků do této sbírky vložte níže seznam jejich ID "
-"oddělený �árkami."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Doplněk též můžete přidat z jeho stránky."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Přidán %1$s uživatelem(kou) %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Přidat komentář vydavatele"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Smazat komentář vydavatele"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Upravit komentář vydavatele"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Poznámka: Komentář se bude tvářit, jako by jej psal vydavatel v den původní "
-"publikace"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Uložit komentář"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Odebrat"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Přidat do sbírky"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Ověřit dostupnost"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Ano, chci smazat tuto sbírku."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Pro smazání tété sbírky zaškrtněte pole a klepněte na \"%1$s\"."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Po klepnutí na \"%1$s\" níže bude vaše sbírka smazána. Pokud nechcete vaši "
-"sbírku smazat, odškrtněte potvrzující dialog na panelu \"%2$s\" a pokra�ujte "
-"úpravou vaší sbírky. Pokud tuto stránku opustíte bez uložení vaše sbírka též "
-"nebude smazána."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Sbírka bude smazána!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "K své sbírce musíte napsat popis."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Při nahrávání ikony nastala chyba."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Vaši sbírku musíte pojmenovat."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Pokud zvolíte ozna�ení, musí být unikátní."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Jméno doplňku:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Přiřazená aplikace"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Zvolte aplikaci, kterou vaše sbírka podporuje."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Typ sbírky"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Smazat sbírku"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Smazáním vaší sbírky ji definitivně odstraníte."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Popis sbírky"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Stru�ně popište vaši sbírku a typ doplňků, které obsahuje"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Ikona"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"Můžete nahrát ikonu ve formátech JPG, GIF �i PNG, které budou upraveny na "
-"rozměry 32x32 pixelů."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Kdo může vidět vaši sbírku?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"Ve výchozím nastavení jsou sbírky viditelné ve veřejném adresáři sbírek a "
-"každý se na ně může podívat. Pokud chcete k vaší sbírce dát přístup pouze "
-"lidem, kterým dáte speciální odkaz, zvolte volbu níže."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Sbírku mohou vidět pouze lidé, které pozvu"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Kdokoliv může mou sbírku vidět v adresáři"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Kdo může spravovat mou sbírku?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Tito uživatelé mohou přidávat doplňky do vaší sbírky, spravovat všechny "
-"doplňky a nastavení a udělovat práva jiným uživatelům."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Jméno sbírky"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Pojmenujte vaši sbírku rozumně. Například \"Mé oblíbené doplňky pro vývoj\"."
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Ozna�ení sbírky"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Volitelně můžete dát vaší sbírce unikátní ozna�ení pro rychlý přístup:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Kdo může přidávat doplňky do vaší sbírky?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Tito uživatelé smí přidávat doplňky do vaší sbírky a odstraňovat ty, které "
-"přidali."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Vložte e-mailovou adresu svého ú�tu na webu Doplňky Firefoxu:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Vybrané ú�ty budou po uložení odstraněny"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Vložte seznam e-mailových adres ú�tů webu Doplňky Firefoxu oddělených �árkou"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Pouze já"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Já a tito uživatelé:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Přidat"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Správa %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Správa obsahu sbírky"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Aktuální doplňky:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Pokro�ilá nastavení"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Správa práv ke sbírce"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Zrušit"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Smazat ikonu"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Nahradit ikonu"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Ikona bude po klepnutí na \"%1$s\" odstraněna"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Dostupné ozna�ení"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Ozna�ení obsahuje neplatné znaky, které byly opraveny. Zkuste to prosím "
-"znovu."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Ozna�ení je obsazeno"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Sbírka může být dostupná v tomto umístění:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Sbírka byla úspěšně uložena!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Aktualizovat sbírku"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Smazat sbírku"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Doplňky"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Pokro�ilé"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Jméno a podrobnosti"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Povolení"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Doplňky mohou dávat pozor na vaše děti i kalendář."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Rodina"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Vyzkoušejte Sbírku doplňků"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Vytvořit sbírku"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Přejít"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>Prozatím nemáte žádné oblíbené sbírky.</strong></p> "
-"<p>Sbírky, které ozna�íte jako oblíbené, jsou z této stránky rychle dostupné "
-"a zobrazí se též v rozšíření <a href='%1$s'>Sbírky doplňků</a>, pokud ho "
-"máte nainstalováno.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>Prozatím jste nevytvořili žádné sbírky. Sbírky se snadno vytvářejí "
-"a naplňují vašimi oblíbenými doplňky. <a href='%1$s'>Vyzkoušejte je</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Sbírky"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Sbírky doplňků"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "vytvořili %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Co jsou sbírky?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Řadit dle"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Doporu�ené redaktory"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Mé oblíbené"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Mé sbírky"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populární"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Nejpopulárnější"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Nejpopulárnější tento měsíc"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Nejnovější"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Nejpopulárnější tento týden"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Existuje nový způsob, jak spravovat a vyhledávat oblíbené doplňky. "
-"Komentujte, sdílejte a synchronizujte sbírky. Vše z vašeho prohlíže�e."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Sbírky jsou skupiny podobných doplňků seskupených pro snadné sdílení."
-
-#. %s is a date in the _('date') format
-#: views/elements/collections_interactive_addon.thtml:85
-#, php-format
-msgid "collections_interactive_addon_added"
-msgstr "Přidáno %s"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Doplňky mohou usnadnit vaše vyhledávání."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Reference"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Doplňky mohou spravovat vaši sociální síť."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Sociální sítě"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Zavřít"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"Při pokusu o přidání k oblíbené sbírce nastala chyba. Je tato sbírka "
-"stále oblíbená?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Příště tuto zprávu nezobrazovat."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s byl přidán do vašich oblíbených sbírek."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"Tuto sbírku můžete nyní snadno nalézt v tomto adresáři na panelu <a href=\"%1$s\">%2$s</a> "
-"Pro ještě snadnější správu vašich oblíbených sbírek vyzkoušejte "
-"rozšíření <a href=\"%3$s\">Sbírky doplňků</a> pro Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Sbírka byla smazána."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Doplňky se mohou stát vašim cestovním agentem."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Cestování"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Automaticky publikované"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Volba redaktora"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Běžné"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"Při pokusu o odebrání sbírky z oblíbených nastala chyba. Byla tato "
-"sbírka mezi oblíbenými?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "Sbírka %1$s byla odebrána z vašich oblíbených sbírek."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Doplňky usnadňují vytváření perfektní webové stránky."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Vývoj pro web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Co jsou sbírky?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Pře�těte si FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Existuje nový způsob, jak spravovat a vyhledávat oblíbené doplňky. "
-"Komentujte, sdílejte a synchronizujte sbírky. Vše z vašeho prohlíže�e."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Domovská stránka Sbírky doplňků"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Stáhnout sbírku doplňků:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo Sbírky doplňků"
-
-#: views/compatibility/dashboard.thtml:49
-#: controllers/compatibility_controller.php:72
-msgid "compatibility_dashboard_center_header"
-msgstr "Centrum kompatibility doplňků"
-
-#. %1$s is the name of an application and a version.  Example: Firefox 3.0
-#. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
-msgid "compatibility_dashboard_intro"
-msgstr ""
-"Připravte se na vydání aplikace %1$s pomocí nástrojů a informací dostupných "
-"níže."
-
-#: views/compatibility/dashboard.thtml:103
-msgid "compatibility_dashboard_loading"
-msgstr "Nahrávání dat…"
-
-#: views/compatibility/dashboard.thtml:45
-msgid "compatibility_dashboard_main_link"
-msgstr "Návrat na titulní stránku"
-
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
-msgid "compatibility_dashboard_report"
-msgstr "Hlášení o&nbsp;kompatibilitě doplňků"
-
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
-msgid "compatibility_developer_info"
-msgstr "Informace pro vývojáře doplňků"
-
-#: views/compatibility/developers.thtml:66
-msgid "compatibility_developers_adjust_maxversion"
-msgstr "Nastavit maxVersion bez nahrávání"
-
-#: views/compatibility/dashboard.thtml:124
-msgid "compatibility_developers_check_status"
-msgstr "Zkontrolovat stav svých doplňků"
-
-#. %1$s is a URL
-#. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
-msgid "compatibility_developers_login_first"
-msgstr ""
-"Pokud máte na serveru doplňky Mozilly hostovány své doplňky, <a href=\"%1$s"
-"\">přihlašte se prosím</a> a zkontrolujte si stav svých doplňků pro aplikaci "
-"%2$s."
-
-#: views/compatibility/dashboard.thtml:114
-msgid "compatibility_developers_mdclogo_alt"
-msgstr "Logo vývojářského centra Mozilly"
-
-#: views/compatibility/developers.thtml:73
-msgid "compatibility_developers_no_addons"
-msgstr "Na serveru doplňky Mozilly nemáte hostované žádné doplňky."
-
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
-msgid "compatibility_developers_results"
-msgstr "Hlášení o&nbsp;kontrole stavu doplňků"
-
-#: views/compatibility/dashboard.thtml:137
-msgid "compatibility_developers_retrieving"
-msgstr "Získávání stavu hostovaných doplňků…"
-
-#. %1$s is a number
-#. %2$s is an application name  
-#. %3$s is a number.
-#. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
-msgid "compatibility_developers_user_count"
-msgstr "%1$s uživatelů aplikace %2$s (%3$s&#37; celkem)"
-
-#: views/compatibility/report.thtml:45
-msgid "compatibility_report_detail_intro"
-msgstr ""
-"Níže uvedené doplňky tvoří dle měření Mozilly 95% nejvíce používaných "
-"doplňků a jsou seřazeny dle používanosti."
-
-#: views/compatibility/dashboard.thtml:94
-msgid "compatibility_report_detailed_link"
-msgstr "Zobrazit podrobné hlášení"
-
-#. %1$s and %2$s are numbers
-#. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
-msgid "compatibility_report_intro"
-msgstr ""
-"%1$s doplňků pokrývá 95&#37; používanosti doplňků dle měření Mozilly. <b>%2"
-"$s&#37;</b> doplňků je v&nbsp;sou�asnosti považováno za kompatibilní s&nbsp;"
-"poslední verzí aplikace %3$s."
-
-#: views/compatibility/dashboard.thtml:81
-msgid "compatibility_report_legend_alpha"
-msgstr "Alfa verze"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
-msgid "compatibility_report_legend_alpha_description"
-msgstr "Doplňky kompatibilní s&nbsp;alfa verzemi aplikace %1$s"
-
-#: views/compatibility/dashboard.thtml:85
-msgid "compatibility_report_legend_beta"
-msgstr "Beta verze"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
-msgid "compatibility_report_legend_beta_description"
-msgstr "Doplňky kompatibilní s&nbsp;beta verzemi aplikace %1$s"
-
-#: views/compatibility/dashboard.thtml:89
-msgid "compatibility_report_legend_latest"
-msgstr "Poslední verze"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
-msgid "compatibility_report_legend_latest_description"
-msgstr "Doplňky kompatibilní s&nbsp;posledními verzemi aplikace %1$s"
-
-#: views/compatibility/dashboard.thtml:77
-msgid "compatibility_report_legend_other"
-msgstr "Jiné verze"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
-msgid "compatibility_report_legend_other_description"
-msgstr "Doplňky nekompatibilní s&nbsp;žádnou verzí aplikace %1$s"
-
-#: views/compatibility/dashboard.thtml:62
-msgid "compatibility_report_title"
-msgstr "Hlášení o&nbsp;kompatibilitě doplňků"
-
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
-msgid "compatibility_user_info"
-msgstr "Informace pro uživatele doplňku"
-
-#: views/compatibility/dashboard.thtml:52
-msgid "compatibility_view_report"
-msgstr "Zobrazit hlášení o&nbsp;kompatibilitě"
-
-#. %s is a URL
-#: views/pages/credits.thtml:142
-#, php-format
-msgid "credits_contributing"
-msgstr "Více informací o&nbsp;přispívání naleznete na naší %s."
-
-#: views/pages/credits.thtml:142
-msgid "credits_contributing_wikipage"
-msgstr "wiki stránce"
-
-#: views/pages/credits.thtml:99
-msgid "credits_intro"
-msgstr ""
-"Mozilla děkuje následujícím lidem za jejich práci na projektu addons.mozilla."
-"org:"
-
-#: views/pages/credits.thtml:103
-msgid "credits_section_developers"
-msgstr "Vývojáři"
-
-#: views/pages/credits.thtml:115
-msgid "credits_section_editors"
-msgstr "Redaktoři"
-
-#: views/pages/credits.thtml:109
-msgid "credits_section_localizers"
-msgstr "Lokalizátoři"
-
-#: views/pages/credits.thtml:121
-msgid "credits_section_other_contributors"
-msgstr "Ostatní přispěvatelé"
-
-#: views/pages/credits.thtml:127
-msgid "credits_section_past_developers"
-msgstr "Bývalí vývojáři"
-
-#: views/pages/credits.thtml:133
-msgid "credits_section_software"
-msgstr "Software a obrázky"
-
-#: views/pages/credits.thtml:136
-msgid "credits_software_famfamfam"
-msgstr ""
-"Některé z&nbsp;ikon pochází z&nbsp;balí�ku <a href=\"http://www.famfamfam."
-"com/lab/icons/silk/\">famfamfam Silk Icon</a>, licencovaného pod licencí <a "
-"href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
-"Attribution 2.5</a>."
-
-#: views/pages/credits.thtml:137
-msgid "credits_software_timeplot"
-msgstr ""
-"Některé stránky používají technologii <a href=\"http://www.simile-widgets."
-"org/timeplot/\">Timeplot</a>, která je dostupná pod <a href=\"http://simile."
-"mit.edu/license.html\">licencí BSD</a>."
-
-#. date format string as used in PHP's strftime():
-#. http://php.net/strftime
-#: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
-msgid "date"
-msgstr "%e. %B %Y"
-
-#. date and time format string (strftime)
-#. http://php.net/strftime
-#: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
-#: views/admin/addons_status.thtml:57
-msgid "datetime"
-msgstr "%e. %B %Y, %H.%M"
-
-#: views/elements/developers/actionbar.thtml:47
-msgid "devcp_actionbar_link_details"
-msgstr "Více informací"
-
-#: views/elements/developers/actionbar.thtml:42
-#: views/elements/developers/actionbar.thtml:50
-#: views/developers/dashboard.thtml:64
-msgid "devcp_actionbar_link_edit"
-msgstr "Úpravy doplňku"
-
-#: views/elements/developers/actionbar.thtml:51
-msgid "devcp_actionbar_link_newversion"
-msgstr "Nahrát novou verzi"
-
-#: views/elements/developers/actionbar.thtml:44
-#: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:73
-msgid "devcp_actionbar_link_stats"
-msgstr "Stránka statistik"
-
-#. %1$s is a filename, e.g. "foo.txt"
-#. %2$s is the extension, e.g. ".txt"
-#. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
-msgid "devcp_add_previews_extension_error"
-msgstr "Soubor %1$s má neplatnou příponu (%2$s). Povolené přípony jsou: %3$s"
-
-#. %s is the filename.
-#: controllers/developers_controller.php:1394
-msgid "devcp_add_previews_save_error"
-msgstr "Soubor %s se nepodařilo uložit do databáze. Zkuste to prosím znova."
-
-#. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
-msgid "devcp_add_previews_success_replace"
-msgstr "Náhled %1$s byl úspěšně nahrazen souborem %2$s."
-
-#. %s is the filename.
-#: controllers/developers_controller.php:1391
-msgid "devcp_add_previews_success_upload"
-msgstr "Soubor %s byl úspěšně nahrán. Nyní můžete přidat popisek."
-
-#: controllers/components/developers.php:1163
-msgid "devcp_additem_addontype_autodetect"
-msgstr "(ur�it automaticky)"
-
-#: views/elements/developers/additem.thtml:76
-msgid "devcp_additem_linktitle_opensin_newwindow"
-msgstr "Otevřít v&nbsp;novém okně"
-
-#: views/elements/developers/additem.thtml:41
-msgid "devcp_additem_sidebar_title"
-msgstr "Přidání doplňku"
-
-#: views/elements/developers/additem.thtml:53
-msgid "devcp_additem_step0_newlink"
-msgstr "Souhlas vývojáře"
-
-#: views/elements/developers/additem.thtml:46
-msgid "devcp_additem_step1_link"
-msgstr "Krok 1: Nahrání souboru"
-
-#: views/elements/developers/additem.thtml:47
-msgid "devcp_additem_step2_link"
-msgstr "Krok 2: Informace o&nbsp;doplňku"
-
-#: views/elements/developers/additem.thtml:48
-msgid "devcp_additem_step3_link"
-msgstr "Krok 3: Informace o&nbsp;verzi"
-
-#: views/elements/developers/additem.thtml:49
-msgid "devcp_additem_step4_link"
-msgstr "Krok 4: Lokalizace"
-
-#: views/elements/developers/additem.thtml:50
-msgid "devcp_additem_step5_link"
-msgstr "Krok 5: Hotovo"
-
-#: views/elements/developers/additem.thtml:76
-msgid "devcp_additem_submissionhelp_link"
-msgstr "Nápověda přidání doplňku"
-
-#: controllers/previews_controller.php:168
-#: controllers/previews_controller.php:277
-msgid "devcp_addon_field_preview_caption_displaytitle"
-msgstr "Ukázka záhlaví"
-
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Aktivovat"
-
-#: views/developers/addon_status.thtml:178
-msgid "devcp_addon_status_action_activate_description"
-msgstr ""
-"Po aktivaci se bude doplněk zobrazovat ve veřejně dostupných výpisech a bude "
-"povolena jeho aktualiza�ní služba."
-
-#: views/developers/addon_status.thtml:135
-msgid "devcp_addon_status_action_complete"
-msgstr "Dokon�it doplněk"
-
-#: views/developers/addon_status.thtml:136
-msgid "devcp_addon_status_action_complete_description"
-msgstr "Dokon�ený doplněk se přesune na pískoviště."
-
-#: views/developers/addon_status.thtml:181
-msgid "devcp_addon_status_action_deactivate"
-msgstr "Deaktivovat"
-
-#: views/developers/addon_status.thtml:182
-msgid "devcp_addon_status_action_deactivate_description"
-msgstr ""
-"Po deaktivaci se přestane doplněk zobrazovat ve veřejně dostupných výpisech "
-"a bude zakázána jeho aktualiza�ní služba."
-
-#: views/developers/addon_status.thtml:143
-msgid "devcp_addon_status_action_move"
-msgstr "Přesunout na pískoviště"
-
-#: views/developers/addon_status.thtml:144
-msgid "devcp_addon_status_action_move_description"
-msgstr "Doplněk bude přesunut zpět na pískoviště. Tato operace je vratná."
-
-#: views/developers/addon_status.thtml:139
-msgid "devcp_addon_status_action_nominate"
-msgstr "Nominovat ke zveřejnění"
-
-#: views/developers/addon_status.thtml:140
-msgid "devcp_addon_status_action_nominate_description"
-msgstr "Nominujte svůj doplněk ke zveřejnění."
-
-#: views/developers/addon_status.thtml:147
-msgid "devcp_addon_status_action_public"
-msgstr "Zveřejnit"
-
-#: views/developers/addon_status.thtml:148
-msgid "devcp_addon_status_action_public_description"
-msgstr "Doplněk bude opět zveřejněn."
-
-#: views/developers/addon_status.thtml:169
-msgid "devcp_addon_status_active"
-msgstr ""
-"Doplněk je <span class=\"inactive-0\">aktivní</span>. Doplněk se zobrazuje "
-"ve všech seznamech odpovídajících jeho stavu výše."
-
-#: views/developers/addon_status.thtml:111
-msgid "devcp_addon_status_completion_disabled"
-msgstr ""
-"Před dokon�ením doplňku a jeho přesunem na <span class=\"status-1"
-"\">pískoviště</span> splňte prosím výše uvedené požadavky."
-
-#: views/developers/addon_status.thtml:108
-msgid "devcp_addon_status_completion_enabled"
-msgstr ""
-"Klepnutím na tla�ítko níže můžete svůj doplněk doko�it a přesunout jej na "
-"<span class=\"status-1\">pískoviště</span>."
-
-#: views/developers/addon_status.thtml:102
-msgid "devcp_addon_status_criteria_category"
-msgstr "Musí být zvolena nejméně jedna kategorie"
-
-#: views/developers/addon_status.thtml:101
-msgid "devcp_addon_status_criteria_description"
-msgstr "Je vyžadován popis doplňku"
-
-#: views/developers/addon_status.thtml:99
-msgid "devcp_addon_status_criteria_name"
-msgstr "Je vyžadován název doplňku"
-
-#: views/developers/addon_status.thtml:120
-msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Doplněk není ozan�en jako kandidát na vydání."
-
-#: views/developers/addon_status.thtml:119
-msgid "devcp_addon_status_criteria_preview"
-msgstr "Pro rozšíření a motivy vzhledu je vyžadován alespoň jeden náhled."
-
-#: views/developers/addon_status.thtml:100
-msgid "devcp_addon_status_criteria_summary"
-msgstr "Je vyžadován stru�ný popis doplňku"
-
-#. %s is the status in a span, e.g. "<span>_('Public')</span>".
-#: views/developers/addon_status.thtml:58
-msgid "devcp_addon_status_header"
-msgstr "Stav doplňku: %s"
-
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
-msgid "devcp_addon_status_header_actions"
-msgstr "Dostupné akce"
-
-#: views/developers/addon_status.thtml:168
-msgid "devcp_addon_status_header_active"
-msgstr "Stav aktivity doplňku: <span class=\"inactive-0\">aktivní</span>"
-
-#: views/developers/addon_status.thtml:97
-msgid "devcp_addon_status_header_criteria"
-msgstr "Kritéria pro dokon�ení doplňku"
-
-#: views/developers/addon_status.thtml:164
-msgid "devcp_addon_status_header_inactive"
-msgstr "Stav aktivity doplňku: <span class=\"inactive-1\">není aktivní</span>"
-
-#: views/developers/addon_status.thtml:117
-msgid "devcp_addon_status_header_nomination"
-msgstr "Kritéria pro nominaci ke zveřejnění"
-
-#: views/developers/addon_status.thtml:190
-msgid "devcp_addon_status_header_trusted"
-msgstr "Důvěryhodnost doplňku: <span class=\"status-4\">důvěryhodný</span>"
-
-#: views/developers/addon_status.thtml:165
-msgid "devcp_addon_status_inactive"
-msgstr ""
-"Doplněk <span class=\"inactive-1\">není aktivní</span> a proto se "
-"nezobrazuje ve žádném seznamu bez ohledu na jeho stav výše. Aktualizace "
-"doplňku <b>nejsou</b>pomocí aktualiza�ní služby poskytovány."
-
-#: views/developers/addon_status.thtml:128
-msgid "devcp_addon_status_nominate_disabled"
-msgstr ""
-"Před nominací doplňku ke <span class=\"status-4\">zveřejnění</span> splňte "
-"prosím výše uvedené požadavky."
-
-#: views/developers/addon_status.thtml:125
-msgid "devcp_addon_status_nominate_enabled"
-msgstr ""
-"Klepnutím na tla�ítko níže můžete svůj doplněk nominovat ke <span class="
-"\"status-4\">zveřejnění</span>."
-
-#: views/developers/addon_status.thtml:64
-msgid "devcp_addon_status_public"
-msgstr "veřejný"
-
-#: views/developers/addon_status.thtml:63
-msgid "devcp_addon_status_sandbox"
-msgstr "Pískoviště"
-
-#. %s is an email address.
-#: views/developers/addon_status.thtml:89
-msgid "devcp_addon_status_switch_disabled"
-msgstr ""
-"Doplněk je <span class=\"status-5\">zakázán</span> administrátorem a proto "
-"ho nelze používat. Pokud máte dotaz, zašlete ho prosím na e-mail %s."
-
-#: views/developers/addon_status.thtml:67
-msgid "devcp_addon_status_switch_incomplete"
-msgstr ""
-"Doplněk je <span class=\"status-0\">nekompletní</span> a proto se "
-"nezobrazuje v žádné �ásti stránek a je zakázána jeho aktualiza�ní služba. "
-"Pokud splníte kritéria pro jeho dokon�ení a přesun na <span class=\"status-1"
-"\">pískoviště</span> můžete ho na této stránce dokon�it."
-
-#. %s is a number, perhaps 42.
-#: views/developers/addon_status.thtml:77
-msgid "devcp_addon_status_switch_nominated"
-msgstr ""
-"Doplněk je nominován ke <span class=\"status-4\">zveřejnění</span> a �eká na "
-"kontrolu redaktora. V nomina�ní frontě je v&nbsp;sou�asnosti %s dalších "
-"doplňků."
-
-#. %s is an email address.
-#: views/developers/addon_status.thtml:81
-msgid "devcp_addon_status_switch_pending"
-msgstr ""
-"Doplněk je �ekající. Tato situace by neměla nastat. Pošlete nám prosím na "
-"adresu %s e-mail s&nbsp;Id doplňku a informujte nás o&nbsp;této chybě."
-
-#: views/developers/addon_status.thtml:85
-msgid "devcp_addon_status_switch_public"
-msgstr ""
-"Doplněk je <span class=\"status-4\">veřejný</span> a proto se zobrazuje ve "
-"veřejně dostupných výpisech a lze ho bez omezení stáhnout. Jeho aktualizace "
-"jsou poskytovány pomocí aktualiza�ní služby."
-
-#: views/developers/addon_status.thtml:71
-#: views/developers/addon_status.thtml:75
-msgid "devcp_addon_status_switch_sandbox"
-msgstr ""
-"Doplněk je na <span class=\"status-1\">pískovišti</span> a proto se "
-"zobrazuje ve veřejně dostupných výpisech, ale pro jeho stažení se musí "
-"uživatelé přihlásit. Jeho aktualizace <b>nejsou</b> poskytovány pomocí "
-"aktualiza�ní služby."
-
-#. %s is the add-on name.
-#: views/developers/addon_status_nominate.thtml:43
-#: views/developers/addon_status_confirm.thtml:43
-#: views/developers/addon_status.thtml:43
-msgid "devcp_addon_status_title"
-msgstr "Stav doplňku %s "
-
-#: views/developers/addon_status.thtml:191
-msgid "devcp_addon_status_trusted"
-msgstr ""
-"Doplněk je <span class=\"status-4\">důvěryhodný</span> a proto můžete "
-"nahrávat jeho aktualizace bez kontroly redaktora."
-
-#: views/developers/dashboard.thtml:68
-msgid "devcp_dashboard_active"
-msgstr "aktivní"
-
-#. %1$s is the add-on type string
-#. %2$s is Inactive or Active in a <span>
-#. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
-#: views/developers/dashboard.thtml:69
-msgid "devcp_dashboard_addontype_status"
-msgstr "Typ doplňku: %1$s&nbsp;·&nbsp;Stav doplňku: %2$s a %3$s"
-
-#: views/developers/dashboard.thtml:67
-msgid "devcp_dashboard_change_status"
-msgstr "Změna stavu"
-
-#. %s is the addons email address.
-#: views/developers/dashboard.thtml:99
-msgid "devcp_dashboard_disabled_questions"
-msgstr ""
-"Doplněk je zakázán administrátorem a proto ho nelze používat. Pokud máte "
-"dotaz, zašlete ho prosím na e-mail %s."
-
-#. %s is the (localized) add-on status string in a span, e.g. "Disabled"
-#: views/developers/dashboard.thtml:98
-msgid "devcp_dashboard_disabled_status"
-msgstr "Stav doplňku: %s"
-
-#: views/developers/dashboard.thtml:43
-msgid "devcp_dashboard_header_main"
-msgstr "Nástěnka vývojáře"
-
-#: views/developers/dashboard.thtml:110
-msgid "devcp_dashboard_header_welcome"
-msgstr "Vítejte na vývojářově nástěnce"
-
-#: views/developers/dashboard.thtml:68
-msgid "devcp_dashboard_inactive"
-msgstr "Deaktivován"
-
-#. %s is a date in the _('date') format
-#: views/developers/dashboard.thtml:65
-msgid "devcp_dashboard_last_edited"
-msgstr "Naposledy upraveno: %s"
-
-#: views/developers/dashboard.thtml:111
-msgid "devcp_dashboard_learn"
-msgstr ""
-"V sou�asnosti nemáte na serveru doplňky Mozilly žádné vlastní doplňky. Pokud "
-"chcete nahrát svůj první doplněk, klepněte na tla�ítko Za�ít níže."
-
-#: views/developers/dashboard.thtml:112
-msgid "devcp_dashboard_start"
-msgstr "Za�ít"
-
-#: views/developers/dashboard.thtml:82
-msgid "devcp_dashboard_versions"
-msgstr "Verze a soubory"
-
-#: views/developers/dashboard.thtml:91
-msgid "devcp_dashboard_versions_new"
-msgstr "Nahrání nové verze"
-
-#. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
-msgid "devcp_delete_previews_error"
-msgstr ""
-"Náhled %s se nepodařilo smazat z&nbsp;databáze. Zkuste to prosím znova."
-
-#. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
-msgid "devcp_delete_previews_success"
-msgstr "Náhled %s byl úspěšně smazán."
-
-#: controllers/developers_controller.php:1089
-msgid "devcp_delete_version_priv_error"
-msgstr "Namáte dostate�ná oprávnění mazat verze nebo soubory."
-
-#. %1$s is the count of files, a number
-#. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
-msgid "devcp_describe_version_status"
-msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s soubor ve stavu %2$s"
-msgstr[1] "%1$s soubory ve stavu %2$s"
-msgstr[2] "%1$s souborů ve stavu %2$s"
-
-#. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
-#, php-format
-msgid "devcp_details_version"
-msgstr "Verze %s"
-
-#: views/developers/discuss.thtml:68
-msgid "devcp_discuss_addreply_header"
-msgstr "Odpovědět"
-
-#: views/developers/discuss.thtml:57
-msgid "devcp_discuss_allreplies_header"
-msgstr "Odpovědi"
-
-#. notice when an error occurs saving a discussion reply
-#. %1 is the email address (linked) for the amo-editors list
-#: views/developers/discuss.thtml:70
-msgid "devcp_discuss_error_notice"
-msgstr ""
-"Uložení odpovědi se nezdařilo. Kontaktujte prosím %1$s a nahlšte tento "
-"problém."
-
-#. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
-#: views/developers/discuss.thtml:46
-msgid "devcp_discuss_intro"
-msgstr ""
-"Redaktor serveru doplňky Mozilly požaduje dodate�né informace ohledně verze %"
-"2$s vašeho doplňku %1$s."
-
-#. %1 is the add-on name
-#: views/developers/discuss.thtml:43
-msgid "devcp_discuss_pagetitle"
-msgstr "Kvůli kontrole doplňku %1$s je požadováno více informací"
-
-#. submit button text
-#: views/developers/discuss.thtml:79
-msgid "devcp_discuss_submit_reply"
-msgstr "Odeslat odpově�"
-
-#: views/developers/discuss.thtml:72
-msgid "devcp_discuss_success_message"
-msgstr ""
-"Vaše odpově� byla úspěšně uložena. Ostatní ú�astníci diskuze budou "
-"informování e-mailem."
-
-#. in an author/editor discussion about an add-on to be reviewed:
-#. %1 is the commenter's user name (linked).
-#. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
-msgid "devcp_discuss_writtenby"
-msgstr "napsáno %1$s dne %2$s"
-
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
-msgid "devcp_edit_authors_add_author"
-msgstr "Přidat nového autora"
-
-#: views/developers/addon_edit_authors.thtml:96
-msgid "devcp_edit_authors_add_author_button"
-msgstr "Přidat autora"
-
-#: views/developers/addon_edit_authors.thtml:83
-msgid "devcp_edit_authors_add_email"
-msgstr "E-mail ú�tu autora:"
-
-#: views/developers/addon_edit_authors.thtml:98
-msgid "devcp_edit_authors_add_loading"
-msgstr "Kontrola e-mailu ú�tu…"
-
-#: views/developers/addon_edit_authors.thtml:70
-msgid "devcp_edit_authors_click_save"
-msgstr "Pro uložení klepněte na tla�ítko Aktualizovat autory."
-
-#: views/developers/addon_edit_authors.thtml:58
-msgid "devcp_edit_authors_header_current"
-msgstr "Sou�asní autoři"
-
-#: views/developers/addon_edit_authors.thtml:50
-msgid "devcp_edit_authors_header_manage"
-msgstr "Správa autorů doplňku"
-
-#: views/developers/addon_edit_authors.thtml:93
-msgid "devcp_edit_authors_label_add_listed"
-msgstr "Zobrazit autora na veřejných stránkách"
-
-#: views/developers/addon_edit_authors.thtml:89
-msgid "devcp_edit_authors_label_developer"
-msgstr ""
-"<strong>Vývojář</strong> - Může spravovat vše kolem seznamů doplňku mimo "
-"přidávání a odebírání dalších autorů."
-
-#: views/developers/addon_edit_authors.thtml:88
-msgid "devcp_edit_authors_label_owner"
-msgstr ""
-"<strong>Vlastník</strong> - Může spravovat vše kolem seznamů doplňku v�etně "
-"přidávání a odebírání dalších autorů."
-
-#: views/developers/addon_edit_authors.thtml:90
-msgid "devcp_edit_authors_label_viewer"
-msgstr ""
-"<strong>Pozorovatel</strong> - Může prohlížet vývojářské seznamy a "
-"statistiky doplňku, ale nemůže nic měnit."
-
-#. Placeholder for the empty option in a <select>.
-#: views/developers/addon_edit_categories.thtml:69
-msgid "devcp_edit_authors_option_empty"
-msgstr "----------------"
-
-#: views/developers/addon_edit_authors.thtml:86
-msgid "devcp_edit_authors_select_role"
-msgstr "Zvolte roli autora:"
-
-#. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
-msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
-
-#. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
-msgid "devcp_edit_authors_th_listed"
-msgstr "Zobrazení"
-
-#. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
-msgid "devcp_edit_authors_th_role"
-msgstr "Role"
-
-#: views/developers/addon_edit_authors.thtml:77
-msgid "devcp_edit_authors_update_author"
-msgstr "Aktualizovat autory"
-
-#: views/developers/addon_edit_categories.thtml:99
-msgid "devcp_edit_categories_button_update"
-msgstr "Aktualizovat kategorie"
-
-#: views/developers/addon_edit_categories.thtml:88
-msgid "devcp_edit_categories_does_not_fit"
-msgstr "Můj doplněk se nehodí do žádné z&nbsp;dostupných kategorií."
-
-#. %s is the application name (Firefox, Thunderbird).
-#: views/developers/addon_edit_categories.thtml:61
-msgid "devcp_edit_categories_header_application"
-msgstr "Kategorie aplikace %s"
-
-#: views/developers/addon_edit_categories.thtml:49
-msgid "devcp_edit_categories_header_manage"
-msgstr "Správa kategorií doplňku"
-
-#: views/developers/addon_edit_categories.thtml:91
-msgid "devcp_edit_categories_hover"
-msgstr "Pro zobrazení popisu kategorie naje�te myší nad její název."
-
-#. %s is the category number (1, 2, 3).
-#: views/developers/addon_edit_categories.thtml:67
-msgid "devcp_edit_categories_label_category_num"
-msgstr "Kategorie %s"
-
-#: views/developers/addon_edit_categories.thtml:94
-#: views/developers/addon_edit_categories.thtml:103
-msgid "devcp_edit_categories_none_available"
-msgstr "Pro tento typ doplňku a aplikaci nejsou dostupné žádné kategorie."
-
-#: views/developers/addon_edit_categories.thtml:86
-msgid "devcp_edit_categories_other"
-msgstr ""
-"Tuto kategorii vyberte pouze tehdy pokud doplněk nelze umístit do jiné "
-"kategorie."
-
-#. %s is the application name (Firefox, Thunderbird).
-#: views/developers/addon_edit_categories.thtml:63
-msgid "devcp_edit_categories_select_application_categories"
-msgstr "Pro svůj doplněk vyberte až tři kategorie aplikace %s"
-
-#: views/developers/addon_edit.thtml:47
-msgid "devcp_edit_dd_manage_authors"
-msgstr "Přidání nebo odebrání uživatelů, kteří smí spravovat tento doplněk."
-
-#: views/developers/addon_edit.thtml:49
-msgid "devcp_edit_dd_manage_categories"
-msgstr "Volba odpovídajících kategorií pro doplňkem podporované aplikace."
-
-#: views/developers/addon_edit.thtml:51
-msgid "devcp_edit_dd_manage_description"
-msgstr ""
-"Přidání nebo změna překladu stru�ného popisu, popisu, licence pro koncové "
-"uživatele a zásad ochrany soukromí."
-
-#: views/developers/addon_edit.thtml:53
-msgid "devcp_edit_dd_manage_properties"
-msgstr "Změna názvu, domovské stránky, ikony a dalších příznaků doplňku."
-
-#: views/developers/addon_edit_descriptions.thtml:116
-msgid "devcp_edit_description_button_update"
-msgstr "Aktualizovat popis"
-
-#: views/developers/addon_edit_descriptions.thtml:115
-msgid "devcp_edit_description_correct_error"
-msgstr "Opravte prosím výše uvedené �erveně vyzna�ené chyby."
-
-#: views/developers/addon_edit_descriptions.thtml:51
-msgid "devcp_edit_descriptions_header"
-msgstr "Úprava popisu doplňku"
-
-#: views/developers/addon_edit_descriptions.thtml:94
-msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr ""
-"Jakékoliv informace pro koncové uživatele, které se nehodí do stru�ného "
-"popisu nebo popisu doplňku. Lze zde například uvádět seznam známých hlavních "
-"chyb, informace o&nbsp;hlášení chyb, o�ekávané datum vydání nové verze, atd. "
-
-#: views/developers/addon_edit_descriptions.thtml:93
-msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Komentáře vývojáře"
-
-#: views/developers/addon_edit_descriptions.thtml:86
-msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr ""
-"Popis doplňku je delší vysvětlení jeho vlastností, funkcí a dalších "
-"odpovídajících informací. Zobrazuje se pod stru�ným popisem na stránce "
-"doplňku."
-
-#: views/developers/addon_edit_descriptions.thtml:85
-msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Popis doplňku"
-
-#: views/developers/addon_edit_descriptions.thtml:103
-msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr ""
-"Pokud má doplněk obsahovat Licen�ní smlouvu s&nbsp;koncovým uživatelem "
-"(EULA), vložte její text níže. Pokud bude smlouva vložena, budou ji "
-"uživatelé muset odsouhlasit před instalací doplňku. Berte prosím na vědomí, "
-"že EULA není to samé jako licence zdrojového kódu jako např.GPL nebo MPL."
-
-#: views/developers/addon_edit_descriptions.thtml:102
-msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Licen�ní smlouva s&nbsp;koncovým uživatelem"
-
-#: views/developers/addon_edit_descriptions.thtml:112
-msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr ""
-"Pokud má doplněk obsahovat zásady ochrany soukromí, vložte jejich text níže. "
-"Na stránce doplňku pak bude zobrazen odkaz na tyto zásady."
-
-#: views/developers/addon_edit_descriptions.thtml:111
-msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Zásady ochrany soukromí"
-
-#: views/developers/addon_edit_descriptions.thtml:78
-msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr ""
-"Stru�ný popis doplňku je krátké vysvětlení jeho základních funkcí, které se "
-"zobrazuje ve výpisech hledání a veřejných seznamech, stejně jako v&nbsp;"
-"horní �ásti stránky doplňku. <strong>Popis je omezen na 250 znaků.</strong>"
-
-#: views/developers/addon_edit_descriptions.thtml:77
-msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Přehled doplňku"
-
-#: views/developers/addon_edit.thtml:46
-msgid "devcp_edit_dt_manage_authors"
-msgstr "Správa autorů doplňku"
-
-#: views/developers/addon_edit.thtml:48
-msgid "devcp_edit_dt_manage_categories"
-msgstr "Správa kategorií doplňku"
-
-#: views/developers/addon_edit.thtml:50
-msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Správa popisu doplňku"
-
-#: views/developers/addon_edit.thtml:52
-msgid "devcp_edit_dt_manage_properties"
-msgstr "Správa vlastností doplňku"
-
-#: views/developers/addon_edit_properties.thtml:170
-msgid "devcp_edit_label_externalsoftware"
-msgstr "Tento doplněk vyžaduje externí software"
-
-#: views/developers/addon_edit_properties.thtml:205
-msgid "devcp_edit_label_locale_disambiguation"
-msgstr "Dodate�né lokaliza�ní informace"
-
-#: views/developers/addon_edit_properties.thtml:168
-msgid "devcp_edit_label_prerelease"
-msgstr "Toto je kandidát na vydání doplňku"
-
-#: views/developers/addon_edit_properties.thtml:169
-msgid "devcp_edit_label_sitespecific"
-msgstr "Toto je doplněk pro specifický server"
-
-#: views/developers/addon_edit_properties.thtml:202
-msgid "devcp_edit_label_target_locale"
-msgstr "Cílová lokalizace"
-
-#: views/developers/addon_edit_properties.thtml:212
-msgid "devcp_edit_properties_button_update"
-msgstr "Aktualizovat vlastnosti"
-
-#: views/developers/addon_edit_properties.thtml:198
-msgid "devcp_edit_properties_change_guid"
-msgstr "Změny provádějte pouze pokud rozumíte všem důsledkům."
-
-#: views/developers/addon_edit_properties.thtml:109
-msgid "devcp_edit_properties_current_icon"
-msgstr "Aktuální ikona"
-
-#: views/developers/addon_edit_properties.thtml:85
-msgid "devcp_edit_properties_default_locale"
-msgstr ""
-"Výchozí lokalizací dopňku je ta lAn add-on's default locale is the main "
-"locale in which translations must be present. If translations for your add-"
-"on's descriptions are unavailable in a user's selected language, they will "
-"fall back to this default locale."
-
-#: views/developers/addon_edit_properties.thtml:167
-msgid "devcp_edit_properties_flags"
-msgstr "Tyto příznaky se používají v&nbsp;filtrování a klasifikaci doplňků."
-
-#: views/developers/addon_edit_properties.thtml:174
-msgid "devcp_edit_properties_guid"
-msgstr ""
-"GUID doplňku ho jednozna�ně ur�uje a nachází se v&nbsp;souboru install.rdf."
-"Po nahrání doplňku na server doplňky Mozilly již nelze GUID měnit."
-
-#: views/developers/addon_edit_properties.thtml:53
-msgid "devcp_edit_properties_header"
-msgstr "Úprava vlastností doplňku"
-
-#: views/developers/addon_edit_properties.thtml:186
-msgid "devcp_edit_properties_header_addon_type"
-msgstr "Typ doplňku"
-
-#: views/developers/addon_edit_properties.thtml:181
-msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Administrátorské nastavení"
-
-#: views/developers/addon_edit_properties.thtml:84
-msgid "devcp_edit_properties_header_default_locale"
-msgstr "Výchozí lokalizace"
-
-#: views/developers/addon_edit_properties.thtml:166
-msgid "devcp_edit_properties_header_flags"
-msgstr "Příznaky doplňku"
-
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
-msgid "devcp_edit_properties_header_guid"
-msgstr "GUID doplňku"
-
-#: views/developers/addon_edit_properties.thtml:104
-msgid "devcp_edit_properties_header_icon"
-msgstr "Icona doplňku"
-
-#: views/developers/addon_edit_properties.thtml:159
-msgid "devcp_edit_properties_header_other_settings"
-msgstr "Ostatní nastavení"
-
-#. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
-msgid "devcp_edit_properties_header_trusted"
-msgstr "Důvěryhodný doplněk?"
-
-#: views/developers/addon_edit_properties.thtml:160
-msgid "devcp_edit_properties_header_view_source"
-msgstr "Zobrazit zdrojový kód online"
-
-#. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
-msgid "devcp_edit_properties_icon"
-msgstr ""
-"Ikona doplňku je malý obrázek, který se zobrazuje vedle názvu doplňku ve "
-"výpisech hledání, veřejných seznamech, stránce doplňku a v&nbsp;instal�ním "
-"dialogu doplňku. Velikost obrázku bude po nahrátí automaticky upravena na 32 "
-"x 32 bodů. Používejte prosím pouze následující formáty obrázků: %s"
-
-#: views/developers/addon_edit_properties.thtml:171
-msgid "devcp_edit_properties_label_binary"
-msgstr "Tento doplněk obsahuje binární komponenty"
-
-#: views/developers/addon_edit_properties.thtml:185
-msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Nedůvěryhodný"
-
-#: views/developers/addon_edit_properties.thtml:184
-msgid "devcp_edit_properties_label_trusted"
-msgstr "Důvěryhodný"
-
-#: views/developers/addon_edit_properties.thtml:110
-msgid "devcp_edit_properties_new_icon"
-msgstr "Nová ikona"
-
-#: views/developers/addon_edit_properties.thtml:118
-msgid "devcp_edit_properties_remove_icon"
-msgstr "Odstranit ikonu"
-
-#: views/developers/addon_edit_properties.thtml:136
-msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr ""
-"Pokud má doplňek vlastní domovskou stránku, vložte zde její adresu. Překlady "
-"adresy přidávejte pouze tehdy, pokud je stránka lokalizovaná i do dalších "
-"jazyků."
-
-#: views/developers/addon_edit_properties.thtml:135
-msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Domovská stránka doplňku"
-
-#: views/developers/addon_edit_properties.thtml:79
-msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Název doplňku se zobrazuje všude, kde je doplněk vypsán."
-
-#: views/developers/addon_edit_properties.thtml:78
-msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Název doplňku"
-
-#: views/developers/addon_edit_properties.thtml:145
-msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr ""
-"Pokud máte zřízen e-mail pro podporu doplňku, vložte zde jeho adresu. "
-"Překlady adresy přidávejte pouze tehdy, pokud máte různé adresy pro různé "
-"jazyky."
-
-#: views/developers/addon_edit_properties.thtml:144
-msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "E-mailová adresa podpory"
-
-#: views/developers/addon_edit_properties.thtml:154
-msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr ""
-"Pokud máte zřízenu stránku nebo fórum pro podporu doplňku, vložte zde její "
-"adreesu. Překlady adresy přidávejte pouze tehdy, pokud je stránka "
-"lokalizovaná i do dalších jazyků."
-
-#: views/developers/addon_edit_properties.thtml:153
-msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Stránka podpory"
-
-#: views/developers/addon_edit_properties.thtml:183
-msgid "devcp_edit_properties_trusted"
-msgstr "Důvěryhodné doplňky lze zveřejňovat bez kontroly redaktora."
-
-#. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
-msgid "devcp_edit_properties_undelete"
-msgstr "Ikona bude smazána při uložení. <a %s>Zrušit?</a>"
-
-#: views/developers/addon_edit_properties.thtml:161
-msgid "devcp_edit_properties_view_source"
-msgstr ""
-"Přihlášení uživatelé mají možnost procházet zdrojový kód souborů doplňku."
-
-#: views/developers/addon_edit_properties.thtml:162
-msgid "devcp_edit_properties_view_source_allow"
-msgstr "Povolit online prohlížení zdrojového kódu"
-
-#: views/developers/addon_edit_properties.thtml:163
-msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Zakázat online prohlížení zdrojového kódu"
-
-#: views/elements/developers/editbox.thtml:46
-msgid "devcp_editbox_authors"
-msgstr "Autoři"
-
-#: views/elements/developers/editbox.thtml:47
-msgid "devcp_editbox_categories"
-msgstr "Kategorie"
-
-#: views/elements/developers/editbox.thtml:52
-msgid "devcp_editbox_change_status"
-msgstr "Změna stavu"
-
-#: views/elements/developers/editbox.thtml:48
-msgid "devcp_editbox_descriptions"
-msgstr "Popis"
-
-#: views/elements/developers/editbox.thtml:43
-msgid "devcp_editbox_edit_addon"
-msgstr "Úpravy doplňku"
-
-#: views/elements/developers/editbox.thtml:57
-msgid "devcp_editbox_new_version"
-msgstr "Nová verze"
-
-#: views/elements/developers/editbox.thtml:49
-msgid "devcp_editbox_properties"
-msgstr "Vlastnosti"
-
-#: views/elements/developers/editbox.thtml:60
-msgid "devcp_editbox_screenshots"
-msgstr "Náhledy"
-
-#: views/elements/developers/editbox.thtml:53
-msgid "devcp_editbox_statistics_dashboard"
-msgstr "Nástěnka statistik"
-
-#: views/elements/developers/editbox.thtml:54
-msgid "devcp_editbox_versions"
-msgstr "Verze a soubory"
-
-#: views/elements/developers/editbox.thtml:42
-msgid "devcp_editbox_view_listing"
-msgstr "Stránka doplňku"
-
-#: views/elements/developers/editorsmenu.thtml:59
-msgid "devcp_editorsqueue_featured"
-msgstr "Uváděné doplňky"
-
-#. %1 is the review count
-#: views/elements/developers/editorsqueue.thtml:42
-#: views/elements/developers/editorsmenu.thtml:56
-#, php-format
-msgid "devcp_editorsqueue_moderatedreviews"
-msgid_plural "devcp_editorsqueue_moderatedreviews"
-msgstr[0] "%s moderovaná recenze"
-msgstr[1] "%s moderované recenze"
-msgstr[2] "%s moderovaných recenzí"
-
-#. %1 is the nominated addons count
-#: views/elements/developers/editorsqueue.thtml:44
-#: views/elements/developers/editorsmenu.thtml:58
-#, php-format
-msgid "devcp_editorsqueue_nominated"
-msgid_plural "devcp_editorsqueue_nominated"
-msgstr[0] "%s nominovaný doplněk"
-msgstr[1] "%s nominované doplňky"
-msgstr[2] "%s nominovaných doplňků"
-
-#. %1 is the update count
-#: views/elements/developers/editorsqueue.thtml:43
-#: views/elements/developers/editorsmenu.thtml:57
-#, php-format
-msgid "devcp_editorsqueue_pendingupdates"
-msgid_plural "devcp_editorsqueue_pendingupdates"
-msgstr[0] "%s �ekající aktualizace"
-msgstr[1] "%s �ekající aktualizace"
-msgstr[2] "%s �ekajících aktualizací"
-
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
-#: controllers/previews_controller.php:108
-#: controllers/previews_controller.php:211
-#: controllers/previews_controller.php:312
-msgid "devcp_error_addon_access_denied"
-msgstr "K tomuto doplňku nemáte přístup."
-
-#. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
-#. in the <a> tag.  This should be fixed.
-#: controllers/components/developers.php:591
-#, php-format
-msgid "devcp_error_appversion_reference_link"
-msgstr "Více informací viz stránka %s."
-
-#. This is the link text in the <a> for devcp_error_appversion_reference_link.  This
-#. should be fixed.
-#: controllers/components/developers.php:591
-msgid "devcp_error_appversion_reference_link_text"
-msgstr "platných verzí aplikace"
-
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Doplněk musí mít alespoň jednoho vlastníka."
-
-#. %1$s is the name of the file
-#: controllers/components/developers.php:658
-msgid "devcp_error_file_exists"
-msgstr ""
-"Tato verze doplňku již existuje. Pokud ji chcete nahradit, musíte nejdříve "
-"odstranit soubor %1$s."
-
-#. %1$s is a file extension.  Example:  .exe
-#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
-#: controllers/components/developers.php:355
-#, php-format
-msgid "devcp_error_file_extension"
-msgstr ""
-"Přípona souboru (%s) není povolena pro tento typ doplňku. Použijte prosím "
-"jednu z&nbsp;následujících: %s"
-
-#: controllers/components/developers.php:64
-msgid "devcp_error_five_categories"
-msgstr "Nevolte prosím více než 5 kategorií."
-
-#: controllers/components/developers.php:526
-msgid "devcp_error_guid_application"
-msgstr "Id tohoto doplňku je již používáno aplikací."
-
-#: controllers/components/developers.php:337
-#: controllers/components/developers.php:389
-msgid "devcp_error_http_incomplete"
-msgstr "Nekompletní nahrání"
-
-#: controllers/components/developers.php:335
-#: controllers/components/developers.php:336
-#: controllers/components/developers.php:387
-#: controllers/components/developers.php:388
-msgid "devcp_error_http_maxupload"
-msgstr "Překro�ena maximální velikost nahrávaného souboru"
-
-#: controllers/components/developers.php:338
-#: controllers/components/developers.php:390
-msgid "devcp_error_http_nofile"
-msgstr "Nebyl nahrán soubor"
-
-#. %1$s is a file extension.  Example:  .exe
-#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
-#: controllers/components/developers.php:401
-#, php-format
-msgid "devcp_error_icon_extension"
-msgstr ""
-"Přípona souboru (%s) není povolena pro ikonu. Použijte prosím jednu z&nbsp;"
-"následujících: %s"
-
-#: controllers/developers_controller.php:504
-msgid "devcp_error_index_rdf_notfound"
-msgstr "Nebyl nalezen soubor install.rdf."
-
-#: controllers/components/developers.php:601
-msgid "devcp_error_install_manifest"
-msgstr "V souboru install.rdf byly nalezeny následujícící chyby:"
-
-#: controllers/developers_controller.php:1463
-msgid "devcp_error_invalid_addontype"
-msgstr "Id doplňku je neplatné: %s"
-
-#. %$1s is a version.  Example: 3.1.1
-#. %$2s is an add-on name.
-#: controllers/components/developers.php:569
-#: controllers/components/developers.php:581
-#, php-format
-msgid "devcp_error_invalid_appversion"
-msgstr "Verze %s není platná pro aplikaci %s"
-
-#. %s is a string
-#: controllers/components/developers.php:521
-#, php-format
-msgid "devcp_error_invalid_guid"
-msgstr "Id doplňku je neplatné: %s"
-
-#. %$1s is a version.  Example: 3.1.1
-#. %$2s is an add-on name.
-#: controllers/components/developers.php:572
-#, php-format
-msgid "devcp_error_invalid_minversion"
-msgstr "%s není platná verze pro %s: minimální verze nesmí obsahovat *"
-
-#: controllers/components/developers.php:536
-msgid "devcp_error_invalid_version"
-msgstr ""
-"Verze doplňku je neplatná: platné verze viz <a href=\"http://developer."
-"mozilla.org/en/docs/Toolkit_version_format\">specifikace</a>"
-
-#: controllers/components/developers.php:531
-msgid "devcp_error_invalid_version_spaces"
-msgstr "Verze doplňku je neplatná: verze nesmí obsahovat mezery."
-
-#. %s is an error message from the parser.
-#: controllers/components/developers.php:501
-#, php-format
-msgid "devcp_error_manifest_parse"
-msgstr "Pří zpracovávání souboru install.rdf nastaly následující chyby: %s"
-
-#: controllers/components/developers.php:373
-msgid "devcp_error_move_file"
-msgstr "Nelze přesunout soubor"
-
-#. %s is the name of a file
-#: controllers/components/developers.php:650
-#: controllers/components/developers.php:662
-#: controllers/components/developers.php:667
-#: controllers/components/developers.php:727
-#: controllers/components/developers.php:738
-#: controllers/components/developers.php:743
-#, php-format
-msgid "devcp_error_moving_file"
-msgstr "Při přesunu %s nastala chyba."
-
-#: controllers/components/developers.php:595
-msgid "devcp_error_mozilla_application"
-msgstr "Je nutné ur�it alespoň jednu platnou cílovou aplikaci Mozilla."
-
-#: controllers/components/developers.php:516
-msgid "devcp_error_no_guid"
-msgstr "V souboru install.rdf nabylo nalezeno Id doplňku."
-
-#: controllers/components/developers.php:287
-msgid "devcp_error_no_platform"
-msgstr "Nebyla zvolena platforma"
-
-#: controllers/components/developers.php:59
-msgid "devcp_error_one_category"
-msgstr "Zvolte prosím alespoň jednu kategorii."
-
-#: controllers/components/developers.php:92
-msgid "devcp_error_one_user"
-msgstr "Doplněk musí mít alespoň jednoho autora."
-
-#. %1$s is a file extension.  Example:  .exe
-#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
-#: controllers/components/developers.php:1081
-#, php-format
-msgid "devcp_error_preview_extension"
-msgstr ""
-"Přípona souboru (%s) není povolena pro náhledy. Použijte prosím jednu z&nbsp;"
-"následujících: %s"
-
-#: controllers/components/developers.php:511
-msgid "devcp_error_updatekey"
-msgstr ""
-"Doplňky nesmí používat vlastní klí� updateKey. Odstraňte prosím tuto položku "
-"a nahrání opakujte"
-
-#: controllers/components/developers.php:506
-msgid "devcp_error_updateurl"
-msgstr ""
-"Doplňky nesmí používat externí updateURL. Odstraňte prosím tuto položku ze "
-"souboru install.rdf a nahrání opakujte."
-
-#: controllers/developers_controller.php:465
-#: controllers/components/developers.php:271
-msgid "devcp_error_upload_file"
-msgstr "Nahrajte prosím soubor."
-
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
-msgstr "Nahrát soubor"
-
-#: views/pages/js_constants.js.thtml:89
-msgid "devcp_js_a_cancel"
-msgstr "Zrušit"
-
-#: views/pages/js_constants.js.thtml:90
-msgid "devcp_js_add_email"
-msgstr "Vložte prosím e-mail ú�tu autora, kterého chcete přidat."
-
-#. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
-msgid "devcp_js_img_move_down"
-msgstr "Posune dolů"
-
-#. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
-msgid "devcp_js_img_move_up"
-msgstr "Posune nahoru"
-
-#: views/pages/js_constants.js.thtml:91
-msgid "devcp_js_img_remove_compat"
-msgstr "Odstranit kompatibilitu aplikace"
-
-#: views/pages/js_constants.js.thtml:86
-msgid "devcp_js_input_list_author"
-msgstr "Zobrazí autora ve veřejných seznamech"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Zvolte prosím licenci."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Vložte prosím text vaší licence."
-
-#. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
-msgid "devcp_js_option_developer"
-msgstr "Vývojář"
-
-#. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
-msgid "devcp_js_option_owner"
-msgstr "Vlastník"
-
-#. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
-msgid "devcp_js_option_viewer"
-msgstr "Pozorovatel"
-
-#: views/pages/js_constants.js.thtml:88
-msgid "devcp_js_remove_author"
-msgstr "Odebere autora"
-
-#: views/pages/js_constants.js.thtml:87
-msgid "devcp_js_sure_remove"
-msgstr "<strong>Opravdu</strong> chcete odebrat tohoto autora?"
-
-#: views/pages/js_constants.js.thtml:77
-msgid "devcp_js_upload_alert"
-msgstr "Musíte vybrat soubor k nahrání."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Vlastní licence pro doplněk %1$s v. %2$s"
-
-#: views/elements/developers/localebox.thtml:44
-msgid "devcp_localebox_header_localizedfields"
-msgstr "Položky lokalizace"
-
-#. %1 is the default locale
-#: views/elements/developers/localebox.thtml:48
-#, php-format
-msgid "devcp_localebox_intro"
-msgstr ""
-"Některé z&nbsp;položek na této stránce mohou být lokalizovány a zobrazovat "
-"se tak uživatelům v&nbsp;jejich mateřském jazyce. K&nbsp;úpravě detailů "
-"svého doplňku ve zvolené lokalizaci zvolte v&nbsp;nabídce odpovídající "
-"lokalizaci. Pokud není překlad pro danou lokalizaci dostupný, budou položky "
-"zobrazeny ve zvolené výchozí lokalizaci (%s)."
-
-#: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
-msgid "devcp_myaddons_admincp_link"
-msgstr "Ovládací panel správce"
-
-#: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
-msgid "devcp_myaddons_editorcp_link"
-msgstr "Ovládací panel redaktora"
-
-#: views/elements/developers/myaddons.thtml:52
-msgid "devcp_myaddons_link"
-msgstr "Mé doplňky"
-
-#: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
-msgid "devcp_myaddons_mainpage_link"
-msgstr "Titulní stránka"
-
-#: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
-msgid "devcp_myaddons_statistics_link"
-msgstr "Stránka statistik"
-
-#: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
-msgid "devcp_myaddons_submitaddon_link"
-msgstr "Přidání doplňku"
-
-#: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
-msgid "devcp_myaddons_title"
-msgstr "Nástroje vývojáře"
-
-#. %1$s is an add-on ID, perhaps 167.
-#. %2$s is a URL.
-#: controllers/developers_controller.php:256
-msgid "devcp_new_addon_error"
-msgstr ""
-"Toto Id doplňku (%1$s) již v&nbsp;databázi existuje. Pokud se jedná o&nbsp;"
-"váš doplňek, můžete <a href=\"%2$s\">nahrát novou verzi</a>."
-
-#: views/developers/addon_status_nominate.thtml:62
-msgid "devcp_nominate_cancel"
-msgstr "Zrušit a vrátit se"
-
-#. %1 is the add-on name
-#: views/developers/addon_status_nominate.thtml:61
-#, php-format
-msgid "devcp_nominate_submit_nominate"
-msgstr "Nominovat doplněk %s"
-
-#: views/developers/addon_edit_properties.thtml:50
-#: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
-msgid "devcp_notice_changes_error"
-msgstr ""
-"<span>Jedna nebo více provedených změn se nepodařilo uložit.</span><br /> "
-"Prohlédněte si prosím chyby níže. Zbylé změny byly úspěšně uloženy."
-
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
-#: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
-#: views/developers/addon_edit_categories.thtml:46
-msgid "devcp_notice_changes_saved"
-msgstr ""
-"<span>Provedené změny byly uloženy.</span><br /> Berte prosím na vědomí, že "
-"projevení změn v&nbsp;některých �ástech stránek může trvat až několik hodin."
-
-#: controllers/previews_controller.php:252
-msgid "devcp_notice_cleardefault"
-msgstr ""
-"Odstranění výchozího náhledu způsobí, že se další náhled automaticky stane "
-"výchozím náhledem."
-
-#: controllers/previews_controller.php:184
-#: controllers/previews_controller.php:251
-msgid "devcp_notice_makedefault"
-msgstr ""
-"Nastavením tohoto náhledu jako výchozí odstraníte příznak výchozí ze "
-"sou�asného výchozího náhledu."
-
-#: views/developers/addon_edit_authors.thtml:70
-msgid "devcp_notice_unsaved_changes"
-msgstr "Máte neuložené změny."
-
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
-#: controllers/previews_controller.php:67
-#: controllers/previews_controller.php:79
-#: controllers/previews_controller.php:82
-msgid "devcp_pagetitle"
-msgstr "Ovládací panel vývojáře"
-
-#: controllers/previews_controller.php:103
-#: controllers/previews_controller.php:104
-msgid "devcp_preview_add_pagetitle"
-msgstr "Přidat náhled"
-
-#: controllers/previews_controller.php:135
-msgid "devcp_preview_added_successfully"
-msgstr "Náhled úspěšně přidán."
-
-#: controllers/previews_controller.php:323
-msgid "devcp_preview_deleted_successfully"
-msgstr "Náhled úspěšně smazán."
-
-#: controllers/previews_controller.php:194
-#: controllers/previews_controller.php:195
-msgid "devcp_preview_edit_pagetitle"
-msgstr "Úprava náhledu"
-
-#: controllers/previews_controller.php:237
-msgid "devcp_preview_updated_successfully"
-msgstr "Náhled úspěšně upraven."
-
-#: views/developers/previews.thtml:120
-msgid "devcp_previews_a_another"
-msgstr "Přidat jiný náhled"
-
-#: views/developers/previews.thtml:96
-msgid "devcp_previews_a_delete"
-msgstr "Smazat náhled"
-
-#: views/developers/previews.thtml:95
-msgid "devcp_previews_a_replace"
-msgstr "Nahradit náhled"
-
-#: views/developers/previews.thtml:126
-msgid "devcp_previews_a_update"
-msgstr "Aktualizovat náhledy"
-
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
-msgid "devcp_previews_add_new"
-msgstr "Přidat nový náhled"
-
-#. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
-msgid "devcp_previews_add_select"
-msgstr ""
-"Zvolte obrázek v&nbsp;nahrátí. Obrázky o&nbsp;velikosti větší než 700 bodů "
-"na šířku a 525 bodů na výšku budou zmenšeny. Povolené formáty obrázků jsou: %"
-"s"
-
-#: views/developers/previews.thtml:121
-msgid "devcp_previews_click_below"
-msgstr "Pro nahrání náhledu klepněte na tla�ítko Aktualizovat náhledy."
-
-#. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
-msgid "devcp_previews_click_update"
-msgstr ""
-"Pro uložení tohoto obrázku klepněte na tla�ítko Aktualizovat náhledy.(<a %"
-"s>Zrušit?</a>)"
-
-#. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
-msgid "devcp_previews_error_message"
-msgstr ""
-"Tento náhled bude po klepnutí na tla�ítko Aktualizovat náhledy smazán.(<a %"
-"s>Zrušit?</a>)"
-
-#: views/previews/add.thtml:45
-msgid "devcp_previews_filetype_info"
-msgstr ""
-"Formulář níže lze použít pro nahrání náhledů doplňku ve formátech PNG, JPG "
-"nebo GIF. Obrázky širší než 700 bodů a vyšší něž 525 bodů budou automaticky "
-"zmenšeny."
-
-#: views/previews/add.thtml:43
-msgid "devcp_previews_header_add"
-msgstr "Přidat náhled"
-
-#: views/developers/previews.thtml:80
-msgid "devcp_previews_header_caption"
-msgstr "Legenda v&nbsp;náhledu"
-
-#: views/previews/edit.thtml:43
-msgid "devcp_previews_header_edit"
-msgstr "Úprava náhledu"
-
-#: views/developers/previews.thtml:93
-msgid "devcp_previews_label_default"
-msgstr "Výchozí náhled"
-
-#: views/previews/add.thtml:54
-msgid "devcp_previews_label_file"
-msgstr "Soubor náhledu"
-
-#: views/previews/add.thtml:59 views/previews/edit.thtml:50
-msgid "devcp_previews_label_makedefault"
-msgstr "Nastavit jako výchozí náhled"
-
-#: views/developers/previews.thtml:100
-msgid "devcp_previews_label_new"
-msgstr "Nový obrázek:"
-
-#: views/developers/previews.thtml:118
-msgid "devcp_previews_label_upload"
-msgstr "Nahrát náhled: "
-
-#: views/developers/previews.thtml:50
-msgid "devcp_previews_notice_error"
-msgstr "Jeden nebo více náhledů se nepodařilo uloži."
-
-#: views/developers/previews.thtml:47
-msgid "devcp_previews_notice_success"
-msgstr "Náhledy byly úspěšně aktualizovány."
-
-#: views/developers/previews.thtml:59
-msgid "devcp_previews_p_screenshots"
-msgstr ""
-"Níže naleznete přehled náhledů doplňku. Můžete měnit jak legendy, tak "
-"samotné obrázky. Výchozí náhled se zobrazuje vedle doplňku ve výpisech "
-"hledání a veřejných seznamech."
-
-#: views/previews/edit.thtml:55
-msgid "devcp_previews_submit_delete"
-msgstr "Smazat náhled"
-
-#: views/previews/edit.thtml:55
-msgid "devcp_previews_submit_delete_confirm"
-msgstr "Opravdu chcete tento náhled smazat?"
-
-#: views/previews/edit.thtml:54
-msgid "devcp_previews_submit_edit"
-msgstr "Upravit náhled"
-
-#: views/previews/add.thtml:63
-msgid "devcp_previews_submit_upload"
-msgstr "Nahrát náhled"
-
-#: views/developers/previews.thtml:78
-msgid "devcp_previews_thumbnail"
-msgstr "Náhled obrázku"
-
-#. %s is the add-on name.
-#: views/developers/previews.thtml:44
-msgid "devcp_previews_title"
-msgstr "Spráce náhledů doplňku %s"
-
-#: views/developers/uploader.thtml:74
-msgid "devcp_review_agreement_please"
-msgstr "Před pokra�ováním si prosím pře�těte a odsouhlaste následující text."
-
-#: views/elements/developers/rolecheck.thtml:42
-msgid "devcp_rolecheck_no_privs"
-msgstr ""
-"<span>Nemáte potřebná oprávnění pro provádění změn na této stránce.</"
-"span><br />Pokud potřebujete něco změnit, kontaktujte prosím vlastníka "
-"doplňku."
-
-#: controllers/developers_controller.php:1315
-msgid "devcp_several_hours"
-msgstr ""
-"Berte prosím na vědomí, že projevení změn v&nbsp;některých �ástech stránek "
-"může trvat až několik hodin."
-
-#: views/elements/developers/sidebar.thtml:52
-msgid "devcp_sidebar_a_dashboard"
-msgstr "Nástěnka"
-
-#. %s is a number
-#: views/elements/developers/statsbar.thtml:45
-#: views/developers/dashboard.thtml:79
-#, php-format
-msgid "devcp_statsbar_adu"
-msgstr "Aktivních uživatelů za den: <em>%s</em> "
-
-#. %s is a number
-#: views/elements/developers/statsbar.thtml:41
-#: views/developers/dashboard.thtml:75
-#, php-format
-msgid "devcp_statsbar_total_downloads"
-msgstr "Celkově staženo: <em>%s</em>"
-
-#. %s is a number
-#: views/elements/developers/statsbar.thtml:43
-#: views/developers/dashboard.thtml:77
-#, php-format
-msgid "devcp_statsbar_weekly_downloads"
-msgstr "Staženo za týden: <em>%s</em>"
-
-#: views/developers/addon_status_confirm.thtml:59
-msgid "devcp_status_confirm_active"
-msgstr ""
-"Po ozna�ení doplňku jako aktivní se za�ne doplněk zobrazovat na veřejně "
-"dostupných stránkách odpovídajících jeho stavu, v�etně hledání a výpisů. "
-"Doplněk bude ze stránek stažitelný a v závislosti na jeho stavu bude nabízen "
-"v rámci své aktualiza�ní služby. V případě potřeby budete mít na této "
-"stránce možnost doplněk opět zakázat."
-
-#: views/developers/addon_status_confirm.thtml:59
-msgid "devcp_status_confirm_active_sure"
-msgstr "Opravdu chcete ozna�it tento doplněk jako aktivní?"
-
-#: views/developers/addon_status_confirm.thtml:50
-msgid "devcp_status_confirm_header_sure"
-msgstr "Jste si jisti?"
-
-#: views/developers/addon_status_confirm.thtml:55
-msgid "devcp_status_confirm_inactive"
-msgstr ""
-"Po ozna�ení doplňku jako neaktivní se přestane doplněk zobrazovat na veřejně "
-"dostupných stránkách, v�etně hledání a výpisů. Doplněk nebude ze stránek "
-"stažitelný a to ani v rámci své aktualiza�ní služby. V případě potřeby "
-"budete mít na této stránce možnost doplněk opět povolit."
-
-#: views/developers/addon_status_confirm.thtml:55
-msgid "devcp_status_confirm_inactive_sure"
-msgstr "Opravdu chcete ozna�it tento doplněk jako neaktivní?'"
-
-#: views/developers/addon_status_confirm.thtml:74
-msgid "devcp_status_confirm_no"
-msgstr "Ne, zrušit"
-
-#: views/developers/addon_status_confirm.thtml:67
-msgid "devcp_status_confirm_public"
-msgstr ""
-"Po zveřejnění bude doplněk ze stránek stažitelný a bude nabízen existujícím "
-"uživatelům v rámci své aktualiza�ní služby."
-
-#: views/developers/addon_status_confirm.thtml:67
-msgid "devcp_status_confirm_public_sure"
-msgstr "Opravdu chcete tento doplněk zveřejnit?"
-
-#: views/developers/addon_status_confirm.thtml:63
-msgid "devcp_status_confirm_sandbox"
-msgstr ""
-"Po přesunutí doplňku na pískoviště bude k jeho stažení vyžadováno přihlášení "
-"a doplněk nebude existujícím uživatelům nabíze v rámci své aktualiza�ní "
-"služby. Jelikož je doplněk v sou�asnosti veřejný, budete mít na této stránce "
-"v případě potřeby možnost doplněk opět zveřejnit."
-
-#: views/developers/addon_status_confirm.thtml:63
-msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Opravdu chcete přesunout tento doplněk na pískoviště?"
-
-#: views/developers/addon_status_confirm.thtml:73
-msgid "devcp_status_confirm_yes"
-msgstr "Ano, jsem si jistý"
-
-#: views/developers/addon_status_nominate.thtml:46
-msgid "devcp_status_nominate_error_notice"
-msgstr ""
-"<span>Je požadována nomina�ní zpráva.</span><br />Vepište prosím do "
-"textového pole požadované informace a zkuste to znova."
-
-#: views/developers/addon_status_nominate.thtml:55
-msgid "devcp_status_nominate_header"
-msgstr "Nominace doplňku"
-
-#: views/developers/dashboard.thtml:85
-msgid "devcp_summary_lastversion"
-msgstr "Poslední verze:"
-
-#. %s is the add-on name.
-#: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
-#: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
-#: views/developers/addon_edit_categories.thtml:43
-#: views/developers/versions.thtml:43
-msgid "devcp_title_edit_addon"
-msgstr "Úpravy doplňku %s"
-
-#. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
-msgid "devcp_transbox_a_title_help"
-msgstr "Zobrazí nápovědu (a neopustí stránku)"
-
-#: views/elements/translationbox.thtml:68
-msgid "devcp_transbox_alt_help"
-msgstr "Nápověda"
-
-#. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
-msgid "devcp_transbox_chars_used"
-msgstr "Použité znaky: %1$s / %2$s"
-
-#: views/elements/translationbox.thtml:132
-msgid "devcp_transbox_delete_sure"
-msgstr "Opravdu chcete smazat tento překlad?"
-
-#. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
-msgid "devcp_transbox_help_header_tabs"
-msgstr "K �emu jsou tyto %s panely?"
-
-#: views/elements/translationbox.thtml:145
-msgid "devcp_transbox_help_header_what"
-msgstr "Co když nemám žádný překlad?"
-
-#: views/elements/translationbox.thtml:147
-msgid "devcp_transbox_help_hide"
-msgstr "Skrýt nápovědu"
-
-#: views/elements/translationbox.thtml:146
-msgid "devcp_transbox_help_if"
-msgstr ""
-"Pokud při prohlížení stránky není dostupný překlad pro aktuálně používaný "
-"jazyk, bude použita lokalizace ozna�ená jako výchozí. Ta lze nastavit v "
-"�ásti úprav vlastností doplňku. Pokud nemáte k dispozici žádný překlad, "
-"použijte jako výchozí lokalizaci váš mateřský jazyk."
-
-#: views/elements/translationbox.thtml:144
-msgid "devcp_transbox_help_transbox"
-msgstr ""
-"Toto je <i>lokaliza�ní koutek</i>, který vám umožní přeložit danou položku "
-"do libovolného podporovaného jazyka. Můžete zde pomocí lokaliza�ních karet "
-"přidávat, upravovat a odebírat překlady."
-
-#: views/elements/translationbox.thtml:85
-msgid "devcp_transbox_img_add_trans"
-msgstr "Přidá překlad"
-
-#: views/elements/translationbox.thtml:86
-msgid "devcp_transbox_img_remove_trans"
-msgstr "Odebere překlad"
-
-#: views/elements/translationbox.thtml:123
-msgid "devcp_transbox_input_add_all"
-msgstr "Přidat lokalizaci ke všem"
-
-#: views/elements/translationbox.thtml:122
-msgid "devcp_transbox_input_add_locale"
-msgstr "Přidat lokalizaci"
-
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
-msgid "devcp_transbox_input_cancel"
-msgstr "Zrušit"
-
-#: views/elements/translationbox.thtml:134
-msgid "devcp_transbox_input_delete"
-msgstr "Smazat"
-
-#: views/elements/translationbox.thtml:113
-msgid "devcp_transbox_select_locale"
-msgstr "Lokalizaci překladu, který se má přidat:"
-
-#. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
-msgid "devcp_update_addon_guid_error"
-msgstr ""
-"GUID doplňku v&nbsp;souboru (%1$s) neodpovídá GUID tohoto doplňku (%2$s)."
-
-#: controllers/developers_controller.php:334
-msgid "devcp_update_addon_priv_error"
-msgstr "K aktualizaci tohoto doplňku nemáte dostate�ná oprávnění."
-
-#. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
-msgid "devcp_update_addon_version_belong_error"
-msgstr "Uvedená verze (%1$s) nepatří v&nbsp;doplňku (%2$s)."
-
-#. %1$s is a version number, maybe 1.1.
-#. %2$s is a URL.
-#: controllers/developers_controller.php:351
-msgid "devcp_update_addon_version_exists_error"
-msgstr ""
-"Nahrané �íslo verze (%1$s) již u tohoto doplňku existuje. Pokud se snažíte "
-"k&nbsp;této verzi přidat další soubor, <a href=\"%2$s\">klepněte zde</a>."
-
-#. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
-msgid "devcp_update_addon_version_match_error"
-msgstr "Číslo nahrané verze (%1$s) neodpovídá �íslu existující verze (%2$s)."
-
-#: views/developers/uploader.thtml:68
-msgid "devcp_uploader_a_start"
-msgstr "Za�ít"
-
-#: views/developers/uploader.thtml:137
-msgid "devcp_uploader_ajax_loading"
-msgstr "Nahrávání souboru…"
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Souhlasím a pokra�ovat"
-
-#: views/developers/uploader.thtml:157
-msgid "devcp_uploader_button_edit"
-msgstr "Upravit doplněk"
-
-#: views/developers/uploader.thtml:158
-msgid "devcp_uploader_button_later"
-msgstr "Dokon�it doplněk později."
-
-#: views/developers/uploader.thtml:168
-msgid "devcp_uploader_button_release"
-msgstr "Přidat poznámky v&nbsp;vydání"
-
-#. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
-#, fuzzy
-msgid "devcp_uploader_created_results"
-msgstr ""
-"<p>Your add-on listing has been successfully created. The basic information "
-"obtained from your uploaded file has been stored, but there's a lot more to "
-"your listing that can be customized.</p><p>Your add-on is currently marked "
-"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
-"need to make sure it has an accurate name, summary, and description, as well "
-"as at least one selected category. You can edit your add-on's information "
-"using the link below and check the status of your add-on at any time on the "
-"<a %s>status page</a>."
-
-#: views/developers/uploader.thtml:143
-msgid "devcp_uploader_error_correct"
-msgstr "Opravte prosím tento problém a nahrajte soubor znova."
-
-#. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
-msgid "devcp_uploader_file_created"
-msgstr "K verzi %1$s byl přidán nový soubor a je ozna�en jako %2$s."
-
-#: views/developers/uploader.thtml:154
-msgid "devcp_uploader_header_created"
-msgstr "Doplněk vytvořen!"
-
-#: views/developers/uploader.thtml:141
-msgid "devcp_uploader_header_error"
-msgstr "Jejda! Vypadá to, že máme problém se souborem…"
-
-#: views/developers/uploader.thtml:173
-msgid "devcp_uploader_header_file_added"
-msgstr "Soubor přidán!"
-
-#: views/developers/uploader.thtml:66
-msgid "devcp_uploader_header_how"
-msgstr "Jak to funguje?"
-
-#. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
-msgid "devcp_uploader_header_update_created"
-msgstr "Verze %s vytvořena"
-
-#: views/developers/uploader.thtml:117
-msgid "devcp_uploader_header_upload"
-msgstr "Nahrání souboru"
-
-#: views/developers/uploader.thtml:67
-#, fuzzy
-msgid "devcp_uploader_how"
-msgstr ""
-"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
-"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
-"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
-"will have a public display page with information you provide, such as a "
-"brief summary of the add-on's functionality, an optional longer description, "
-"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
-"will appear in search and browse listings across the site, and even in the "
-"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
-"downloads and providing automatic updates to users when you upload a new "
-"version.</li><li>You'll have access to a statistics dashboard with detailed "
-"information about your user base.</li></ul><p>Add-ons hosted on the site "
-"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
-"the features listed above. If you're ready to start the process and have "
-"your add-on package ready for upload, just click on Get Started below!</p>"
-
-#: views/developers/uploader.thtml:125
-msgid "devcp_uploader_label_platformtype"
-msgstr "Podporované platformy:"
-
-#: views/developers/uploader.thtml:124
-msgid "devcp_uploader_label_upload_field"
-msgstr "Soubor doplňku: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Jiné"
-
-#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
-#, fuzzy
-msgid "devcp_uploader_p_pending_file"
-msgstr ""
-"The new file will be available to the public as soon as an editor is able to "
-"review it. There are currently %1$s other add-ons in the queue. Want to be "
-"reviewed faster? Consider <a %2$s>becoming an editor</a>."
-
-#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
-#, fuzzy
-msgid "devcp_uploader_p_pending_version"
-msgstr ""
-"The new version will be available to the public as soon as an editor is able "
-"to review it. There are currently %1$s other add-ons in the queue. Want to "
-"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
-
-#. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
-msgid "devcp_uploader_p_update_created"
-msgstr "Nová verze byla vytvořena a ozna�ena jako %s."
-
-#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
-#. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
-#, fuzzy
-msgid "devcp_uploader_p_update_file"
-msgstr ""
-"View your new file in the <a %1$s>Versions and Files page</a>, check out "
-"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
-"clicking the button below (highly recommended)."
-
-#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
-#. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
-#, fuzzy
-msgid "devcp_uploader_p_update_version"
-msgstr ""
-"View your new version in the <a %1$s>Versions and Files page</a>, check out "
-"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
-"clicking the button below (highly recommended)."
-
-#: views/developers/uploader.thtml:118
-#, fuzzy
-msgid "devcp_uploader_p_upload"
-msgstr ""
-"Upload your add-on file using the form below. If you have multiple, platform-"
-"specific files to upload, choose a single file and then upload the others "
-"using the Versions and Files Manager."
-
-#: views/developers/uploader.thtml:125
-msgid "devcp_uploader_platformtype_all"
-msgstr "VÅ¡echny"
-
-#: views/developers/uploader.thtml:126
-msgid "devcp_uploader_platformtype_specific"
-msgstr "Pouze:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Zvolte prosím..."
-
-#. %1$s is the add-on name, %2$s is the version number.
-#: views/developers/uploader.thtml:57
-msgid "devcp_uploader_title_file"
-msgstr "Přidat soubor v&nbsp;%1$s %2$s"
-
-#: views/developers/uploader.thtml:50
-msgid "devcp_uploader_title_submit"
-msgstr "Přidání nového doplňku"
-
-#. %s is the add-on name.
-#: views/developers/uploader.thtml:54
-msgid "devcp_uploader_title_update"
-msgstr "Aktualizace doplňku %s"
-
-#. %s is a full <a> tag
-#: controllers/developers_controller.php:503
-#, php-format
-msgid "devcp_valid_app_reference"
-msgstr "Více informací naleznete na %s."
-
-#. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
-#. fixed.
-#: controllers/developers_controller.php:503
-msgid "devcp_valid_app_reference_linktext"
-msgstr "této stránce"
-
-#: controllers/developers_controller.php:581
-msgid "devcp_verify_author_error"
-msgstr "K této e-mailové adrese nebyl nalezen žádný ú�et."
-
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Zdá se, že XML je nevalidní nebo chybí některá důležitá pole. Pře�těte si "
-"prosím <a href=\"https://developer.mozilla.org/en/"
-"Creating_OpenSearch_plugins_for_Firefox\">dokumentaci</a>, zkontrolujte svůj "
-"doplněk a zkuste to znovu."
-
-#: views/developers/versions.thtml:75
-msgid "devcp_versions_a_cancel"
-msgstr "Zrušit"
-
-#: views/developers/versions.thtml:79
-msgid "devcp_versions_a_delete"
-msgstr "Smaže verzi"
-
-#: views/developers/versions.thtml:74
-msgid "devcp_versions_a_empty"
-msgstr "Odstranit prázdnou verzi"
-
-#: views/developers/versions.thtml:71
-msgid "devcp_versions_a_remove"
-msgstr "Odstranit?"
-
-#: views/developers/versions.thtml:91
-msgid "devcp_versions_add"
-msgstr "Přidat novou verzi"
-
-#: views/developers/versions_delete.thtml:58
-msgid "devcp_versions_delete_a_cancel"
-msgstr "Zrušit"
-
-#: views/developers/versions_delete.thtml:56
-msgid "devcp_versions_delete_a_delete"
-msgstr "Smazat verzi"
-
-#. Followed by a list of reviews and files that will be removed.
-#: views/developers/versions_delete.thtml:50
-msgid "devcp_versions_delete_also"
-msgstr "Toto rovněž smaže:"
-
-#: views/developers/versions_delete.thtml:53
-msgid "devcp_versions_delete_files"
-msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s soubor"
-msgstr[1] "%s soubory"
-msgstr[2] "%s souborů"
-
-#. %s is the version number.
-#: views/developers/versions_delete.thtml:48
-msgid "devcp_versions_delete_header"
-msgstr "Smazat verzi %s?"
-
-#: views/developers/versions_delete.thtml:52
-msgid "devcp_versions_delete_reviews"
-msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s recenze"
-msgstr[1] "%s recenze"
-msgstr[2] "%s recenzí"
-
-#. %s is the version number.
-#: views/developers/versions_delete.thtml:49
-msgid "devcp_versions_delete_sure"
-msgstr "Opravdu chcete trvale smazat verzi %s?"
-
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
-msgid "devcp_versions_edit_a_cancel"
-msgstr "Zrušit"
-
-#: views/developers/versions_edit.thtml:101
-msgid "devcp_versions_edit_a_delete"
-msgstr "Smazat soubor"
-
-#: views/developers/versions_edit.thtml:165
-msgid "devcp_versions_edit_a_new_app"
-msgstr "Přidat novou aplikaci"
-
-#: views/developers/versions_edit.thtml:154
-msgid "devcp_versions_edit_a_remove_app"
-msgstr "Odebrat aplikaci"
-
-#: views/developers/versions_edit.thtml:114
-msgid "devcp_versions_edit_add"
-msgstr "Přidat nový soubor"
-
-#. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
-#, fuzzy
-msgid "devcp_versions_edit_adjust"
-msgstr ""
-"Adjusting application information here will allow users to install your add-"
-"on even if the install.rdf in the package indicates that the add-on is "
-"incompatible. <a %s>List of supported applications</a>"
-
-#: views/developers/versions_edit.thtml:153
-msgid "devcp_versions_edit_compat_sure"
-msgstr "<b>Opravdu</b> chcete odebrat kompatibilitu s&nbsp;touto aplikací?"
-
-#: views/developers/versions_edit.thtml:100
-msgid "devcp_versions_edit_delete_sure"
-msgstr "<b>Opravdu</b> chcete trvale smazat tento soubor?"
-
-#: views/developers/versions_edit.thtml:203
-msgid "devcp_versions_edit_header_approval"
-msgstr "Informace o&nbsp;schválení"
-
-#: views/developers/versions_edit.thtml:120
-msgid "devcp_versions_edit_header_compat"
-msgstr "Kompatibilní aplikace"
-
-#: views/developers/versions_edit.thtml:74
-msgid "devcp_versions_edit_header_file"
-msgstr "Informace o&nbsp;souboru"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licence"
-
-#. %s is the version number.
-#: views/developers/versions_edit.thtml:53
-msgid "devcp_versions_edit_header_manage"
-msgstr "Správe verze %s"
-
-#: views/developers/versions_edit.thtml:212
-msgid "devcp_versions_edit_header_notes"
-msgstr "Poznámky ke&nbsp;schválení"
-
-#: views/developers/versions_edit.thtml:98
-msgid "devcp_versions_edit_img_delete"
-msgstr "Smazat soubor"
-
-#. %1$s is the file id, e.g. 18723.
-#. %2$s is the platform name, e.g. ALL or Windows.
-#. %3$s is the _('date) created.
-#. %4$s is the status, e.g. "In Sandbox" or "Public".
-#. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Soubor %1$s (%2$s) vytvořen dne %3$s byl změněn do stavu %4$s dne %5$s"
-
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Zvolte prosím pro váš doplněk odpovídající licenci. Tato licence ur�uje "
-"práva, která dáváte ke svému zdrojovému kódu."
-
-#: views/developers/versions_edit.thtml:111
-msgid "devcp_versions_edit_no_files"
-msgstr "Nebyl nalezen žádný soubor."
-
-#: views/developers/versions_edit.thtml:213
-msgid "devcp_versions_edit_optional"
-msgstr "Nepovinné informace pro redaktora, který bude kontrolovat tuto verzi."
-
-#: views/developers/versions_edit.thtml:151
-msgid "devcp_versions_edit_remove_compat"
-msgstr "Odebrat kompatibilní aplikace"
-
-#: views/developers/versions_edit.thtml:167
-msgid "devcp_versions_edit_select_app"
-msgstr "Zvolte prosím aplikaci"
-
-#: views/developers/versions_edit.thtml:78
-msgid "devcp_versions_edit_th_file"
-msgstr "Soubor"
-
-#: views/developers/versions_edit.thtml:79
-msgid "devcp_versions_edit_th_platform"
-msgstr "Platforma"
-
-#: views/developers/versions_edit.thtml:80
-msgid "devcp_versions_edit_th_size"
-msgstr "Velikost"
-
-#: views/developers/versions_edit.thtml:81
-msgid "devcp_versions_edit_th_status"
-msgstr "Stav"
-
-#: views/developers/versions_edit.thtml:183
-#, fuzzy
-msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr ""
-"Information about changes in this release, new features, known bugs, and "
-"other useful information specific to this release/version. This information "
-"will also be available to users updating the add-on in the Firefox 3 Add-ons "
-"Manager interface."
-
-#: views/developers/versions_edit.thtml:182
-msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Poznámky v&nbsp;vydání"
-
-#: views/developers/versions_edit.thtml:164
-msgid "devcp_versions_edit_unsaved_compat"
-msgstr ""
-"<strong>Neuložené změny!</strong> Kompatibilita nebude smazána dokud "
-"neklepnete na tla�ítko Aktualizovat verzi."
-
-#: views/developers/versions_edit.thtml:113
-msgid "devcp_versions_edit_unsaved_files"
-msgstr ""
-"<strong>Neuložené změny!</strong> Soubory nebudou smazány dokud neklepnete "
-"na tla�ítko Aktualizovat verzi."
-
-#: views/developers/versions_edit.thtml:218
-msgid "devcp_versions_edit_update"
-msgstr "Aktualizovat verzi"
-
-#: views/developers/versions.thtml:49
-msgid "devcp_versions_header_manage"
-msgstr "Správa verzí a souborů"
-
-#: views/developers/versions.thtml:87
-msgid "devcp_versions_no_versions"
-msgstr "Bez verzí"
-
-#. %s is a version number, base 10.
-#: views/developers/versions.thtml:46
-msgid "devcp_versions_notice_success"
-msgstr "Verze %s byla úspěšně smazána."
-
-#: views/developers/versions.thtml:73
-msgid "devcp_versions_p_remove"
-msgstr ""
-"Tato verze nemá přiřazeny žádné soubory a lze ji proto smazat. Chcete ji "
-"smazat?"
-
-#: views/developers/versions.thtml:58
-msgid "devcp_versions_th_created"
-msgstr "Vytvořeno"
-
-#: views/developers/versions.thtml:57
-msgid "devcp_versions_th_status"
-msgstr "Stav"
-
-#: views/developers/versions.thtml:56
-msgid "devcp_versions_th_version"
-msgstr "Verze"
-
-#: controllers/downloads_controller.php:91
-msgid "downloads_disable_warning"
-msgstr "Tento doplněk je zakázán"
-
-#: controllers/components/editors.php:57
-msgid "editor_review_error_addon_not_nominated"
-msgstr "Tento doplněk nebyl nominován."
-
-#: controllers/components/editors.php:213
-msgid "editor_review_error_file_not_pending"
-msgstr "Tento soubor ne�eká na kontrolu."
-
-#. Actions are, for example: approving or rejecting
-#: controllers/components/editors.php:79
-#: controllers/components/editors.php:182
-msgid "editor_review_error_no_action"
-msgstr "Zvolte prosím akci kontroly."
-
-#: controllers/components/editors.php:192
-msgid "editor_review_error_no_applications"
-msgstr "Zadejte prosím testovanou aplikací."
-
-#. Comments are required when an editor approves or rejects an add-on.
-#: controllers/components/editors.php:84
-#: controllers/components/editors.php:187
-msgid "editor_review_error_no_comments"
-msgstr "Zadejte prosím komentář kontroly."
-
-#: controllers/components/editors.php:161
-msgid "editor_review_error_no_files"
-msgstr "Zvolte prosím alespoň jeden soubor ke kontrole."
-
-#: controllers/components/editors.php:197
-msgid "editor_review_error_no_operating_system"
-msgstr "Zadejte prosím testovaný opera�ní systém."
-
-#: views/editors/logs.thtml:51
-msgid "editorcp_logs_button_filter"
-msgstr "Filtrovat"
-
-#: views/editors/logs.thtml:44
-msgid "editorcp_logs_filter_by"
-msgstr "Filtrovat podle typu/akce"
-
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
-msgid "editorcp_logs_page_heading"
-msgstr "Záznam událostí"
-
-#: views/elements/developers/editorsmenu.thtml:60
-msgid "editorcp_menu_eventlog_link"
-msgstr "Záznam událostí"
-
-#: views/elements/developers/editorsmenu.thtml:62
-msgid "editorcp_menu_mainpage_link"
-msgstr "Zpět na titulní stránku"
-
-#: views/elements/developers/editorsmenu.thtml:61
-msgid "editorcp_menu_reviewlog_link"
-msgstr "Záznam kontroly"
-
-#: views/elements/developers/editorsmenu.thtml:55
-msgid "editorcp_menu_summary_link"
-msgstr "Přehled redaktora"
-
-#: views/elements/developers/editorsmenu.thtml:52
-msgid "editorcp_menu_title"
-msgstr "Nástroje redaktora"
-
-#: views/editors/reviewlog.thtml:49
-msgid "editorcp_reviewlog_button_filter"
-msgstr "Filtrovat"
-
-#: views/editors/reviewlog.thtml:58
-msgid "editorcp_reviewlog_column_action"
-msgstr "Akce"
-
-#: views/editors/reviewlog.thtml:56
-msgid "editorcp_reviewlog_column_addon"
-msgstr "Doplněk"
-
-#: views/editors/reviewlog.thtml:55
-msgid "editorcp_reviewlog_column_date"
-msgstr "Datum"
-
-#: views/editors/reviewlog.thtml:57
-msgid "editorcp_reviewlog_column_editor"
-msgstr "Redaktor"
-
-#: views/editors/reviewlog.thtml:94
-msgid "editorcp_reviewlog_comments_hide"
-msgstr "Skrýt komentáře"
-
-#: views/editors/reviewlog.thtml:93
-msgid "editorcp_reviewlog_comments_show"
-msgstr "Zobrazit komentáře"
-
-#. %1$s and %2$s are full <input> tags for dates
-#: views/editors/reviewlog.thtml:45
-#, php-format
-msgid "editorcp_reviewlog_entries_between"
-msgstr "Zobrazit položky mezi %s a %s"
-
-#: views/editors/reviewlog.thtml:104
-msgid "editorcp_reviewlog_none_found"
-msgstr "Pro toto období nebyla nalezena žádná kontrola."
-
-#: views/editors/reviewlog.thtml:42
-msgid "editorcp_reviewlog_page_heading"
-msgstr "Záznam kontroly"
-
-#: views/editors/summary.thtml:61
-msgid "editorcp_summary_monthreviews_heading"
-msgstr "Měsí�ní kontrola"
-
-#: views/editors/summary.thtml:77
-msgid "editorcp_summary_neweditors_heading"
-msgstr "Noví redaktoři"
-
-#: views/editors/summary.thtml:42
-msgid "editorcp_summary_page_heading"
-msgstr "Přehled redaktora"
-
-#: views/editors/summary.thtml:94
-msgid "editorcp_summary_recentactivity_heading"
-msgstr "Nedávna aktivita redaktora"
-
-#: views/editors/summary.thtml:45
-msgid "editorcp_summary_totalreviews_heading"
-msgstr "Kontroly celkem"
-
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
-msgid "editors_addon_review_pagetitle"
-msgstr "Kontrola doplňku"
-
-#: controllers/editors_controller.php:349
-msgid "editors_error_js-formerror"
-msgstr "Vyplňte prosím následující položky:"
-
-#: controllers/editors_controller.php:350
-msgid "editors_error_review_one_file"
-msgstr "Zvolte prosím alespoň jeden soubor ke&nbsp;kontrole."
-
-#: controllers/editors_controller.php:274
-msgid "editors_error_self_reviews_forbidden"
-msgstr "Vlastní kontrola není povolena."
-
-#: controllers/editors_controller.php:699
-msgid "editors_external_software"
-msgstr "Externí software"
-
-#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
-msgid "editors_featured_add_feature"
-msgstr "Přidat vlastnost"
-
-#: views/editors/featured.thtml:126
-msgid "editors_featured_add_feature_submit"
-msgstr "Přidat"
-
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
-msgid "editors_featured_addon_add_failure"
-msgstr "Přidání vlastnosti skon�ilo chybou."
-
-#: controllers/editors_controller.php:851
-msgid "editors_featured_addon_add_success"
-msgstr "Vlastnost byla úspěšně přidána."
-
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
-msgid "editors_featured_addon_edit_failure"
-msgstr "Úprava vlastnosti skon�ilo chybou."
-
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
-msgid "editors_featured_addon_edit_success"
-msgstr "Vlastnost byla úspěšně upravena."
-
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
-msgid "editors_featured_addon_invalid_locale"
-msgstr "Jedna nebo více lokalizací je naplatná."
-
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
-msgid "editors_featured_addon_remove_failure"
-msgstr "Odebrání vlastnosti skon�ilo chybou."
-
-#: controllers/editors_controller.php:901
-msgid "editors_featured_addon_remove_success"
-msgstr "Vlastnost byla úspěšně odebrána."
-
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
-msgid "editors_featured_addons_pagetitle"
-msgstr "Uváděné doplňky"
-
-#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
-msgid "editors_featured_edit_feature_submit"
-msgstr "Odeslat"
-
-#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
-msgid "editors_featured_remove_feature"
-msgstr "Odebrat vlastnost"
-
-#: views/editors/queue.thtml:46
-msgid "editors_filter_queue"
-msgstr "Filtr fronty"
-
-#: views/editors/queue.thtml:182
-msgid "editors_helpful_links"
-msgstr "Pomocné odkazy"
-
-#: views/editors/queue.thtml:182
-msgid "editors_link_guide"
-msgstr "Průvodce redaktora"
-
-#: views/editors/queue.thtml:182
-msgid "editors_link_policy"
-msgstr "Zásady užití doplňku"
-
-#: views/editors/queue.thtml:47
-msgid "editors_notice_filter_session"
-msgstr ""
-"Tyto filtry zůstanou aktivní po celou dobu relace nebo dokud nebudou "
-"vymazány."
-
-#. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
-msgid "editors_notice_none_found"
-msgstr "V sou�asnosti nejsou ke kontrole dostupné žádné doplňky."
-
-#: controllers/editors_controller.php:1040
-msgid "editors_one_day"
-msgstr "1 den"
-
-#: controllers/editors_controller.php:1048
-msgid "editors_one_hour"
-msgstr "1 hodina"
-
-#: controllers/editors_controller.php:1056
-msgid "editors_one_minute"
-msgstr "1 minuta"
-
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
-msgid "editors_pagetitle"
-msgstr "Ovládací panel redaktora"
-
-#. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
-#, php-format
-msgid "editors_platform_x_only"
-msgstr "pouze %s"
-
-#: controllers/editors_controller.php:695
-msgid "editors_pre-release"
-msgstr "kandidát na vydání"
-
-#. %1 is the app name
-#: views/editors/queue.thtml:131
-#, php-format
-msgid "editors_queue_app_compatibility"
-msgstr "%s kompatibilita"
-
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Doplněk nebo e-mail autora"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Typy doplňků"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplikace"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. verze"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platformy"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Stáří odeslání (ve dnech)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Výsledek vyhledávání: <strong>%1$s</strong> doplňků"
-
-#: views/editors/queue.thtml:84
-msgid "editors_queue_submit_clean"
-msgstr "Vymazat"
-
-#: views/editors/queue.thtml:83
-msgid "editors_queue_submit_filter"
-msgstr "Filtr"
-
-#: controllers/editors_controller.php:133
-msgid "editors_queues_disabled"
-msgstr ""
-"Všechny fronty kontroly doplňků jsou v&nbsp;sou�asnosti zakázány. Opakujte "
-"prosím akci později."
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Upravit doplněk"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Historie doplňku"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Domovská stránka doplňku"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Souhrnné informace"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Náhledy"
-
-#: controllers/editors_controller.php:345
-msgid "editors_review_action"
-msgstr "Akce kontroly"
-
-#: views/editors/review.thtml:159
-msgid "editors_review_action_info"
-msgstr "Požadovat více informací"
-
-#: views/editors/review.thtml:157
-msgid "editors_review_action_public"
-msgstr "Zveřejnit"
-
-#: views/editors/review.thtml:160
-msgid "editors_review_action_request_superreview"
-msgstr "Požádat o&nbsp;super-kontrolu"
-
-#: views/editors/review.thtml:158
-msgid "editors_review_action_sandbox"
-msgstr "Ponechat na pískovišti"
-
-#: controllers/editors_controller.php:346
-msgid "editors_review_comments"
-msgstr "Komentář kontroly"
-
-#: views/editors/review.thtml:182
-msgid "editors_review_details_info_request"
-msgstr ""
-"Tento formulář lze použít k požádání autorů o dodate�né informace. Ti obdrží "
-"e-mail a budou zde moci odpovědět. Až se tak stane, budete rovněž "
-"informováni e-mailem."
-
-#: views/editors/review.thtml:174
-msgid "editors_review_details_nominated_public"
-msgstr ""
-"Přesune doplněk, jeho sou�asnou verzi a příslušné soubory mezi veřejné "
-"doplňky. Budoucí verze doplňku budou opět umístěny na pískoviště, dokud "
-"nebudou zkontrolovány redaktorem."
-
-#: views/editors/review.thtml:177
-msgid "editors_review_details_nominated_sandbox"
-msgstr "Ponechá doplněk na pískovišti."
-
-#: views/editors/review.thtml:166
-msgid "editors_review_details_pending_public"
-msgstr ""
-"Schválí verzi doplňku z&nbsp;pískoviště již jednou veřejného doplňku k&nbsp;"
-"zobrazení na stránkách veřejných doplňků."
-
-#: views/editors/review.thtml:169
-msgid "editors_review_details_pending_sandbox"
-msgstr ""
-"Ponechá verzi doplňku z&nbsp;pískoviště již jednou veřejného doplňku na "
-"pískovišti."
-
-#: views/editors/review.thtml:185
-msgid "editors_review_details_superreview"
-msgstr ""
-"Pokud máte jakékoliv pochybnosti ohledně bezpe�nosti doplňku, jeho "
-"autorských práv, �i jakékoliv jiné záležitosti, na které by se správci měli "
-"podívat, vepište níže váš komentář. Tento komentář bude zaslán pouze "
-"správcům, ne autorům."
-
-#: views/editors/review.thtml:134
-msgid "editors_review_file_diff_link"
-msgstr "Porovnat s&nbsp;veřejnou verzí"
-
-#: views/editors/review.thtml:131
-msgid "editors_review_file_viewcontents_link"
-msgstr "Zobrazit obsah"
-
-#: views/editors/review.thtml:65
-msgid "editors_review_header_authors"
-msgstr "Autoři:"
-
-#: views/editors/review.thtml:79
-msgid "editors_review_header_categories"
-msgstr "Kategorie:"
-
-#: views/editors/review.thtml:92
-msgid "editors_review_header_compatibility"
-msgstr "Kompatibilita:"
-
-#: views/editors/review.thtml:251
-msgid "editors_review_header_description"
-msgstr "Popis"
-
-#: views/editors/review.thtml:275
-msgid "editors_review_header_devcomments"
-msgstr "Komentáře vývojářů"
-
-#: views/editors/review.thtml:263
-msgid "editors_review_header_eula"
-msgstr "EULA"
-
-#: views/editors/review.thtml:115
-msgid "editors_review_header_files"
-msgstr "Soubory:"
-
-#: views/editors/review.thtml:284
-msgid "editors_review_header_itemhistory"
-msgstr "Položka historie"
-
-#: views/editors/review.thtml:232
-msgid "editors_review_header_nominationmessage"
-msgstr "Nomina�ní zpráva"
-
-#: views/editors/review.thtml:311
-msgid "editors_review_header_previews"
-msgstr "Náhledy"
-
-#: views/editors/review.thtml:269
-msgid "editors_review_header_privacy"
-msgstr "Zásady ochrany soukromí"
-
-#. %1 is the add-on name and version
-#: views/editors/review.thtml:56
-#, php-format
-msgid "editors_review_header_review"
-msgstr "Kontrola doplňku %s"
-
-#: views/editors/review.thtml:239
-msgid "editors_review_header_reviewernotes"
-msgstr "Poznámky pro kontrolora"
-
-#: views/editors/review.thtml:245
-msgid "editors_review_header_summary"
-msgstr "Přehled"
-
-#: views/editors/review.thtml:257
-msgid "editors_review_header_versionnotes"
-msgstr "Poznámky k&nbsp;verzi"
-
-#. a noun: shown in an add-on's editor review history
-#: views/elements/developers/editors_review_history_item.thtml:80
-msgid "editors_review_history_info_reply"
-msgstr "Odpovědět"
-
-#: views/elements/developers/editors_review_history_item.thtml:78
-msgid "editors_review_history_info_request"
-msgstr "Žádost o&nbsp;informace"
-
-#: views/elements/developers/editors_review_history_item.thtml:62
-#: views/editors/reviewlog.thtml:77
-msgid "editors_review_history_nominated_adminreview"
-msgstr "Správce kontroly"
-
-#: views/elements/developers/editors_review_history_item.thtml:56
-#: views/editors/reviewlog.thtml:71
-msgid "editors_review_history_nominated_approved"
-msgstr "Nominace schválena/veřejné doplňky"
-
-#: views/elements/developers/editors_review_history_item.thtml:59
-#: views/editors/reviewlog.thtml:74
-msgid "editors_review_history_nominated_denied"
-msgstr "Nominace zamítnuta/pískoviště"
-
-#: views/editors/review.thtml:303
-msgid "editors_review_history_nonefound"
-msgstr "Nebyly nalezeny žádné záznamy předchozího kontroly."
-
-#: views/elements/developers/editors_review_history_item.thtml:73
-#: views/editors/reviewlog.thtml:88
-msgid "editors_review_history_pending_adminreview"
-msgstr "Správce kontroly"
-
-#: views/elements/developers/editors_review_history_item.thtml:67
-#: views/editors/reviewlog.thtml:82
-msgid "editors_review_history_pending_approved"
-msgstr "Schváleno/veřejné doplňky"
-
-#: views/elements/developers/editors_review_history_item.thtml:70
-#: views/editors/reviewlog.thtml:85
-msgid "editors_review_history_pending_denied"
-msgstr "Zamítnuto/Pískoviště"
-
-#. link text in an add-on's editor review history, allowing to hide and show an information request's replies
-#. %1 is the number of replies
-#: views/elements/developers/editors_review_history_item.thtml:90
-msgid "editors_review_history_show_hide_replies"
-msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Zobrazit/Skrýt %1$s odpově�"
-msgstr[1] "Zobrazit/Skrýt %1$s odpovědi"
-msgstr[2] "Zobrazit/Skrýt %1$s odpovědí"
-
-#: views/editors/review.thtml:208
-msgid "editors_review_label_applications"
-msgstr "Aplikace:"
-
-#: views/editors/review.thtml:196
-msgid "editors_review_label_cannedresponse"
-msgstr "nebo zvolte některou z&nbsp;připravených odpovědí:"
-
-#: views/editors/review.thtml:190
-msgid "editors_review_label_comments"
-msgstr "Komentáře:"
-
-#: views/editors/review.thtml:204
-msgid "editors_review_label_operating_systems"
-msgstr "Opera�ní systém:"
-
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
-msgid "editors_review_link_pagetop"
-msgstr "Nahoru"
-
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Poznámka: Kontrolujte pouze více než jeden soubor, pokud jste testovali "
-"všechny zvolené soubory."
-
-#: views/editors/review.thtml:51
-msgid "editors_review_next_link"
-msgstr "další &raquo;"
-
-#: views/editors/review.thtml:322
-msgid "editors_review_previews_notfound"
-msgstr "Náhledy nenalezeny."
-
-#: views/editors/review.thtml:50
-msgid "editors_review_previous_link"
-msgstr "&laquo; předchozí"
-
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
-msgid "editors_review_queue_pagetitle"
-msgstr "Fronta kontroly"
-
-#. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
-msgid "editors_review_rank_in_queue"
-msgstr "<strong># %1$s</strong> z&nbsp;%2$s ve frontÄ›"
-
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> z %2$s, které jsou ve frontě (filtrováno)"
-
-#: views/editors/review.thtml:223
-msgid "editors_review_submit_process_action"
-msgstr "Provést akci"
-
-#: views/editors/review.thtml:293
-msgid "editors_review_th_action"
-msgstr "Akce"
-
-#: views/editors/review.thtml:294
-msgid "editors_review_th_comments"
-msgstr "Komentáře"
-
-#: views/editors/review.thtml:291
-msgid "editors_review_th_date"
-msgstr "Datum"
-
-#: views/editors/review.thtml:292
-msgid "editors_review_th_reviewer"
-msgstr "Kontrolor"
-
-#: views/editors/review.thtml:290
-msgid "editors_review_th_version_file"
-msgstr "Verze/soubor"
-
-#: views/editors/review.thtml:217
-msgid "editors_review_update_notify_once"
-msgstr ""
-"Upozornit na následující aktualizace tohoto doplňku. (Postupné aktualizace "
-"nebudou generovat e-mail.)"
-
-#: controllers/editors_controller.php:298
-msgid "editors_reviewed_successfully"
-msgstr "Kontrola úspěšně provedena."
-
-#: views/editors/reviews_queue.thtml:106
-msgid "editors_reviews_action_delete_review"
-msgstr "Smazat kontrolu"
-
-#: views/editors/reviews_queue.thtml:104
-msgid "editors_reviews_action_keep"
-msgstr "Odstranit hlášení a ponechat recenzi"
-
-#: views/editors/reviews_queue.thtml:102
-msgid "editors_reviews_action_skip"
-msgstr "Přesko�it"
-
-#: views/editors/reviews_queue.thtml:100
-msgid "editors_reviews_header_action"
-msgstr "Akce"
-
-#: views/editors/reviews_queue.thtml:67
-msgid "editors_reviews_in_reply_to"
-msgstr "V odpovědi uživatele:"
-
-#: controllers/editors_controller.php:748
-msgid "editors_reviews_processed"
-msgstr "Kontroly úspěšně provedeny!"
-
-#: views/editors/reviews_queue.thtml:117
-msgid "editors_reviews_queue_empty"
-msgstr "V sou�asnosti nejsou žádné požadavky na kontrolu."
-
-#: views/editors/reviews_queue.thtml:111
-msgid "editors_reviews_submit_process_reviews"
-msgstr "Provést kontrolu"
-
-#: controllers/editors_controller.php:691
-msgid "editors_site_specific"
-msgstr "Pro specifický server"
-
-#: controllers/editors_controller.php:348
-msgid "editors_tested_app"
-msgstr "Testovaná aplikace"
-
-#: controllers/editors_controller.php:347
-msgid "editors_tested_os"
-msgstr "Testovaný opera�ní systém"
-
-#: views/editors/queue.thtml:151
-msgid "editors_th_additional_info"
-msgstr "Doplňující informace"
-
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
-#: views/admin/flagged_queue.thtml:53
-msgid "editors_th_addon"
-msgstr "Doplněk"
-
-#: views/editors/queue.thtml:125
-msgid "editors_th_addontype"
-msgstr "Typ"
-
-#: views/editors/featured.thtml:64
-msgid "editors_th_locales"
-msgstr "Omezit na lokalizace?"
-
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "ÄŒas ve frontÄ›"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Vzestupné řazení"
-
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Sestupné řazení"
-
-#. %s is a number
-#: controllers/editors_controller.php:1036
-#, php-format
-msgid "editors_x_days"
-msgstr "%s dní"
-
-#. %s is a number
-#: controllers/editors_controller.php:1044
-#, php-format
-msgid "editors_x_hours"
-msgstr "%s hodin"
-
-#. %s is a number
-#: controllers/editors_controller.php:1052
-#, php-format
-msgid "editors_x_minutes"
-msgstr "%s minut"
-
-#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
-#: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
-#: controllers/reviews_controller.php:353
-#: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
-msgid "error_access_denied"
-msgstr "Přístup zamítnout"
-
-#: views/errors/error401.thtml:52
-msgid "error_access_denied_message"
-msgstr "K zobrazení požadované stránky nemáte dostate�né oprávnění."
-
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Doplněk již existuje!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
-#: controllers/previews_controller.php:115
-#: controllers/previews_controller.php:206
-#: controllers/previews_controller.php:307
-#: controllers/reviews_controller.php:77
-#: controllers/reviews_controller.php:240
-#: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
-#: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
-msgid "error_addon_notfound"
-msgstr "Doplněk nenalezen!"
-
-#: controllers/files_controller.php:83 controllers/files_controller.php:196
-msgid "error_addon_notviewable"
-msgstr "Tento doplněk zde nelze zobrazit."
-
-#: controllers/reviews_controller.php:246
-msgid "error_addon_selfreview"
-msgstr "Nelze recenzovat svůj vlastní doplněk."
-
-#: controllers/addons_controller.php:970
-msgid "error_browse_no_addons"
-msgstr "V této kategorii nejsou žádné doplňky."
-
-#: controllers/api_controller.php:424
-msgid "error_collection_feed_notfound"
-msgstr "Kanál doplňku nenalezen."
-
-#: views/users/register.thtml:65 views/users/edit.thtml:194
-msgid "error_email_invalid"
-msgstr "Tato e-mailová adresa není platná."
-
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
-msgid "error_field_required"
-msgstr "Tato položka nesmí být prázdná."
-
-#: controllers/files_controller.php:75 controllers/files_controller.php:93
-#: controllers/files_controller.php:96 controllers/files_controller.php:163
-#: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
-msgid "error_file_notfound"
-msgstr "Soubor nebyl nalezen!"
-
-#. %s is a filename
-#: controllers/editors_controller.php:430
-#, php-format
-msgid "error_file_x_notfound"
-msgstr "Chyba souboru: %s neexistuje."
-
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
-msgid "error_formerrors"
-msgstr ""
-"Tento formulář obsahuje chyby. Opravte je prosím a formulář znova odešlete."
-
-#: views/users/register.thtml:109
-msgid "error_invalid_captcha"
-msgstr "Neplatný ověřovací kód. Zkuste to prosím znova!"
-
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
-msgid "error_invalid_url"
-msgstr ""
-"Tato adresa nemá platný formát. Platné adresy mají tvar http://moje.domena."
-"cz/moje-stranka/."
-
-#. %s is a string representing what's missing.  Example:  file_id
-#: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
-#: controllers/reviews_controller.php:71
-#: controllers/reviews_controller.php:234
-#: controllers/reviews_controller.php:325
-#: controllers/reviews_controller.php:473
-#: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
-#, php-format
-msgid "error_missing_argument"
-msgstr "Chybějící argument: %s"
-
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
-msgid "error_no_files_in_addon"
-msgstr "Soubory nenalezeny"
-
-#: controllers/previews_controller.php:200
-msgid "error_preview_notfound"
-msgstr "Náhled nebyl nalezen!"
-
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
-msgid "error_review_rating_required"
-msgstr "Musíte zvolit hodnocení."
-
-#: controllers/users_controller.php:160
-msgid "error_user_already_confirmed"
-msgstr "Tento uživatelský dokument je již aktivován."
-
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
-msgid "error_user_badconfirmationcode"
-msgstr "Špatný aktiva�ní kód!"
-
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
-msgid "error_user_confirmpw_nomatch"
-msgstr "Hesla nesouhlasí."
-
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
-msgid "error_user_email_notunique"
-msgstr "Tuto e-mailovou adresu již používá jiný uživatel."
-
-#: controllers/users_controller.php:596
-msgid "error_user_emailchange_expired"
-msgstr ""
-"Platnost tohoto potvrzení vypršela. Ve svém profilu si prosím opět změňte "
-"svůj e-mail. Ihned po obdržení potvrzovacího e-mailu, klepněte na zaslaný "
-"odkaz."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Uživatelé mohou mít ve stejný �as pouze jednu roli. Před pokra�ováním "
-"odstraňte uživatele z jakékoliv existující role."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
-msgid "error_user_nickname_notunique"
-msgstr "Tuto přezdívku používá již jiný uživatel."
-
-#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
-msgid "error_user_notfound"
-msgstr "Uživatel nenalezen!"
-
-#: views/users/activatefirst.thtml:47
-msgid "error_user_unconfirmed"
-msgstr ""
-"Nejprve prosím aktivujte svůj uživatelský ú�et pomocí kódu, který jste "
-"obdrželi v&nbsp;e-mailu."
-
-#: views/users/login.thtml:67
-msgid "error_username_or_pw_wrong"
-msgstr "Chybné uživatelské jméno a nebo heslo!"
-
-#: controllers/editors_controller.php:260
-msgid "error_version_notfound"
-msgstr "Verze nenalezena!"
-
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
-msgid "error_wrong_password"
-msgstr "Vloženo chybné heslo!"
-
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
-msgid "feature_learnmore"
-msgstr "Více informací"
-
-#. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
-#, php-format
-msgid "feature_learnmore_about_addon"
-msgstr "Více informací o&nbsp;doplňku %1$s"
-
-#. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
-#, php-format
-msgid "feature_reviews"
-msgid_plural "feature_reviews"
-msgstr[0] "%1$s recenze"
-msgstr[1] "%1$s recenze"
-msgstr[2] "%1$s recenzí"
-
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
-msgid "feature_view_more_from_category"
-msgstr "Zobrazit více z&nbsp;kategorie"
-
-#. This appears on a page that views the source of an add-on.  This link will return
-#. the user to the add-on's main page
-#: views/files/browse.thtml:65
-msgid "file_browser_link_addon"
-msgstr "Zpět na stránku doplňku"
-
-#. There is a list of directories and files on the page.  Clicking this will show the
-#. contents of all the directories (normally you would click on each one to see the
-#. contents)
-#: views/files/browse.thtml:67
-msgid "file_browser_link_expand_all"
-msgstr "Rozbalit vše"
-
-#. This appears on a page that views the source of an add-on.  This link will return
-#. the user to the add-on's review page (it only appears if the add-on is being
-#. reviewed)
-#: views/files/browse.thtml:64
-msgid "file_browser_link_review"
-msgstr "Zpět na stránku recenzí"
-
-#. The title of the page for viewing an add-on's source.
-#. %1$s is the name of the add-on
-#. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
-#: views/files/browse.thtml:46
-msgid "file_browser_title"
-msgstr "%1$s :: Prohlíže� souborů :: Doplňky aplikace %2$s"
-
-#. This appears on a page that views the source of an add-on.  There is a list of
-#. directories and files on the page.  Clicking this link will toggle between an
-#. expanded or a collapsed list.  This string should be kept short.
-#: views/files/browse.thtml:68
-msgid "file_browser_toggle_expand_collapse"
-msgstr "+/-"
-
-#. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
-msgid "footer_a_about"
-msgstr "O nás"
-
-#. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
-msgid "footer_a_blog"
-msgstr "Blog"
-
-#. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
-msgid "footer_a_faq"
-msgstr "Otázky"
-
-#. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
-msgid "footer_abbr_faq"
-msgstr "Často kladené otázky"
-
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
-msgid "footer_all_rights_reserved"
-msgstr "Všechna práva vyhrazena."
-
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
-msgid "footer_copyright"
-msgstr "Copyright"
-
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
-msgid "footer_credits"
-msgstr "Autoři"
-
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
-msgid "footer_disclaimer"
-msgstr ""
-"Mozilla poskytuje rozcestník na tyto aplikace v&nbsp;dobré vůli. Nezastupuje "
-"autory těchto aplikací ani neposkytuje žádné informace, které se jich "
-"týkají. Jakékoliv dotazy, stížnosti, �i požadavky týkající se těchto "
-"aplikací musí být adresovány příslušným poskytovatelům daného software."
-
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
-msgid "footer_lang_form_lang_submit_go"
-msgstr "Přejít"
-
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
-msgid "footer_legal_notices"
-msgstr "Právní omezení"
-
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
-msgid "footer_other_languages"
-msgstr "Další jazyky:"
-
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
-msgid "footer_privacy_policy"
-msgstr "Zásady ochrany soukromí"
-
-#: models/addontype.php:79
-msgid "general_addontype_dict"
-msgstr "Slovník"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:100
-msgid "general_addontype_dict_plural"
-msgstr "Slovníky"
-
-#: models/addontype.php:75
-msgid "general_addontype_extension"
-msgstr "Rozšíření"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:98
-msgid "general_addontype_extension_plural"
-msgstr "Rozšíření"
-
-#: models/addontype.php:85
-msgid "general_addontype_lpaddon"
-msgstr "Jazykový balí�ek (doplněk)"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:103
-msgid "general_addontype_lpaddon_plural"
-msgstr "Jazykové balí�ky (doplněk)"
-
-#: models/addontype.php:83
-msgid "general_addontype_lpapp"
-msgstr "Jazykový balí�ek (aplikace)"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:102
-msgid "general_addontype_lpapp_plural"
-msgstr "Jazykové balí�ky (aplikace)"
-
-#: models/addontype.php:87
-msgid "general_addontype_plugin"
-msgstr "Zásuvný modul"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:104
-msgid "general_addontype_plugin_plural"
-msgstr "Zásuvné moduly"
-
-#: models/addontype.php:81
-msgid "general_addontype_search"
-msgstr "Vyhledávací modul"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:101
-msgid "general_addontype_search_plural"
-msgstr "Vyhledávací moduly"
-
-#: models/addontype.php:77
-msgid "general_addontype_theme"
-msgstr "Motivy vzhledu"
-
-#. Plural in this context means many of the add-on type
-#: models/addontype.php:99
-msgid "general_addontype_theme_plural"
-msgstr "Motivy vzhledu"
-
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "VÅ¡echny jazyky"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
-#. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
-#, php-format
-msgid "header_home_tooltip"
-msgstr "Návrat na titulní stránku doplňků aplikace %1$s"
-
-#: views/elements/header.thtml:87
-msgid "header_main_firefox_header"
-msgstr "Doplňky Firefoxu"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Doplňky <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefoxu</strong>"
-
-#: views/elements/header.thtml:99
-msgid "header_main_header"
-msgstr "Doplňky"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Doplňky <img alt=\"Doplňky\" src=\"%1$s\" />"
-
-#: views/elements/header.thtml:90
-msgid "header_main_seamonkey_header"
-msgstr "Doplňky Seamonkey"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Doplňky <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
-#: views/elements/header.thtml:93
-msgid "header_main_sunbird_header"
-msgstr "Doplňky Sunbirdu"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Doplňky <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbirdu</strong>"
-
-#: views/elements/header.thtml:96
-msgid "header_main_thunderbird_header"
-msgstr "Doplňky Thunderbirdu"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Doplňky <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbirdu</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Přesko�it na nabídku ostatních aplikací"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Přesko�it na nabídku kategorií"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Přesko�it na hlavní obsah"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Přesko�it na vyhledávací formulář"
-
-#: views/elements/header.thtml:62
-msgid "header_navlink_addons"
-msgstr "Doplňky"
-
-#: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
-msgid "header_navlink_login"
-msgstr "Přihlášení"
-
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
-msgid "header_navlink_logout"
-msgstr "Odhlášení"
-
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
-msgid "header_navlink_myaccount"
-msgstr "Můj ú�et"
-
-#: views/elements/header.thtml:158
-msgid "header_navlink_register"
-msgstr "Registrace"
-
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Registrace</a> nebo <a href=\"%2$s\">Přihlášení</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Nástroje"
-
-#. %s is the add-on name
-#: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
-#: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
-#, php-format
-msgid "img_preview_of"
-msgstr "Náhledy doplňku %s"
-
-#. %1 is the login URL for the link tag
-#. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
-msgid "install_a_login_to_install"
-msgstr "Pro instalaci tohoto doplňku se musíte <a href=\"%1$s\">přihlásit</a>."
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Povolit instalaci tohoto experimentálního doplňku. <a href=\"%1$s\">Co to "
-"znamená?</a>"
-
-#. %1$s is the application name.  Example:  Firefox
-#. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
-#, php-format
-msgid "install_button_text"
-msgstr "Přidat do aplikace %s %s"
-
-#. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
-#, php-format
-msgid "install_button_title"
-msgstr "Přidá doplněk %1$s do aplikace %2$s"
-
-#. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
-#, php-format
-msgid "install_download"
-msgstr "Stáhnout doplněk %1$s"
-
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
-msgid "install_error_addon_not_found"
-msgstr "Tento doplněk není dostupný."
-
-#: views/addons/dictionaries.thtml:65
-msgid "langtools_a11y_tablesummary"
-msgstr "Přehled slovníků a jazykových balí�ků."
-
-#: views/addons/dictionaries.thtml:47
-msgid "langtools_download_dictionary"
-msgstr "Stáhnout slovník"
-
-#: views/addons/dictionaries.thtml:48
-msgid "langtools_download_langpack"
-msgstr "Stáhnout jazykový balí�ek"
-
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
-msgid "langtools_header_dicts_and_langpacks"
-msgstr "Slovníky a jazykové balí�ky"
-
-#: views/addons/dictionaries.thtml:44
-msgid "langtools_install_dictionary"
-msgstr "Instalovat slovník"
-
-#: views/addons/dictionaries.thtml:45
-msgid "langtools_install_langpack"
-msgstr "Instalovat jazykový balí�ek"
-
-#: views/addons/dictionaries.thtml:69
-msgid "langtools_tableheader_dictionary"
-msgstr "Slovníky"
-
-#: views/addons/dictionaries.thtml:70
-msgid "langtools_tableheader_langpack"
-msgstr "Jazykový balí�ek"
-
-#: views/addons/dictionaries.thtml:68
-msgid "langtools_tableheader_language"
-msgstr "Jazyk"
-
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Vlastní licence"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD licence"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, verze 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, verze 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, verze 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, verze 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 licence"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, verze 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
-msgid "link_return_to_front_page"
-msgstr "Klepnutím zde se vrátíte na titulní stránku."
-
-#: views/elements/amo2009/addon_list_options.thtml:46
-#: views/elements/addon_list_options.thtml:46
-msgid "list_sortby_date"
-msgstr "Datum"
-
-#: views/elements/amo2009/addon_list_options.thtml:47
-#: views/elements/addon_list_options.thtml:47
-msgid "list_sortby_downloads"
-msgstr "Stažení"
-
-#: views/elements/amo2009/addon_list_options.thtml:45
-#: views/elements/addon_list_options.thtml:45
-msgid "list_sortby_name"
-msgstr "Název"
-
-#: views/elements/amo2009/addon_list_options.thtml:48
-#: views/elements/addon_list_options.thtml:48
-msgid "list_sortby_rating"
-msgstr "Hodnocení"
-
-#: config/bootstrap.php:278
-msgid "main_prettyname_fennec"
-msgstr "Fennec"
-
-#: config/bootstrap.php:274
-msgid "main_prettyname_firefox"
-msgstr "Firefox"
-
-#: config/bootstrap.php:277
-msgid "main_prettyname_seamonkey"
-msgstr "SeaMonkey"
-
-#: config/bootstrap.php:276
-msgid "main_prettyname_sunbird"
-msgstr "Sunbird"
-
-#: config/bootstrap.php:275
-msgid "main_prettyname_thunderbird"
-msgstr "Thunderbird"
-
-#: views/elements/addon_categories.thtml:52
-msgid "nav_category_dicts_langpacks"
-msgstr "Slovníky a jazykové balí�ky"
-
-#: views/elements/addon_categories.thtml:55
-msgid "nav_category_themes"
-msgstr "Motivy vzhledu"
-
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
-msgid "other_apps_tooltip"
-msgstr "Zobrazí doplňky pro ostatní aplikace"
-
-#. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
-msgid "other_users"
-msgstr "další"
-
-#: controllers/pages_controller.php:90
-msgid "page_title_appversions"
-msgstr "Verze aplikace"
-
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Sbírky doplňků"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ ke sbírce doplňků"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Vlastnosti rozšíření Sbírky doplňků"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Vítá vás rozšíření Sbírky doplňků"
-
-#: controllers/pages_controller.php:92
-msgid "page_title_credits"
-msgstr "Autoři"
-
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Otázky pro vývojáře"
-
-#: controllers/pages_controller.php:111
-msgid "page_title_faq"
-msgstr "Často kladené otázky"
-
-#: controllers/pages_controller.php:94
-msgid "page_title_fashionyourfirefox_faq"
-msgstr "Vytvořte si své Firefox FAQ"
-
-#: controllers/pages_controller.php:101
-msgid "page_title_policy"
-msgstr "Zásady doplňků"
-
-#: controllers/pages_controller.php:103
-msgid "page_title_privacy"
-msgstr "Zásady ochrany soukromí Mozilly"
-
-#: controllers/pages_controller.php:105
-msgid "page_title_review_guide"
-msgstr "Příru�ka recenzenta"
-
-#: controllers/pages_controller.php:107
-msgid "page_title_sandbox"
-msgstr "Systém pískoviště"
-
-#: controllers/pages_controller.php:109
-msgid "page_title_submissionhelp"
-msgstr "Nápověda v&nbsp;odeslání"
-
-#: views/pages/appversions.thtml:87
-msgid "pages_appversions_guid"
-msgstr "GUID"
-
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
-msgid "pages_appversions_header"
-msgstr "Platné verze aplikace"
-
-#: views/pages/appversions.thtml:80
-msgid "pages_appversions_intro"
-msgstr ""
-"Všechny doplňky serveru doplňky Mozilly musí obsahovat soubor install.rdf "
-"obsahující alespoň jednu níže podporovanou aplikaci. Pro tyto aplikace jsou "
-"pak podporovány pouze verze uvedené níže."
-
-#. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
-#, php-format
-msgid "pages_appversions_required_files"
-msgstr ""
-"Soubor install.rdf s&nbsp;požadovanými vlastnostmi, které jsou specifikovány "
-"%s, je do doplňku nutné zahrnout i v&nbsp;případě, že vámi podporovaná "
-"aplikace tento soubor nevyžaduje."
-
-#. this is the text inside of an <a> tag for pages_appversions_required_files.  This
-#. should be fixed.
-#: views/pages/appversions.thtml:93
-msgid "pages_appversions_required_files_link"
-msgstr "zde"
-
-#: views/pages/appversions.thtml:88
-msgid "pages_appversions_versions"
-msgstr "Verze"
-
-#: views/pages/policy.thtml:51
-msgid "pages_policy_sandbox_link"
-msgstr "Informa�ní stránka pískoviště"
-
-#: views/elements/pagination.thtml:53
-msgid "pagination_next_page"
-msgstr "následující"
-
-#: views/elements/pagination.thtml:52
-msgid "pagination_previous_page"
-msgstr "předchozí"
-
-#: views/elements/recaptcha.thtml:65
-msgid "recaptcha_enter_both_words"
-msgstr "Vložte prosím níže <strong>obě slova oddělená mezerou</strong>."
-
-#: views/elements/recaptcha.thtml:83
-msgid "recaptcha_enter_here"
-msgstr "Zde vložte odpově�"
-
-#: views/elements/recaptcha.thtml:74
-msgid "recaptcha_enter_whatyouhear"
-msgstr "Vložte prosím, co jste slyšeli."
-
-#. %1 is the link switching refreshing the captcha
-#. %2 is the link switching to a text captcha
-#: views/elements/recaptcha.thtml:77
-msgid "recaptcha_hardtohear_text"
-msgstr ""
-"Pokud tomu není rozumnět, můžete <a href=\"%1$s\">si poslechnout něco jiného "
-"</a> nebo <a href=\"%2$s\">se přepnou zpět na text</a>."
-
-#. %1 is the link switching refreshing the captcha
-#. %2 is the link switching to an audio captcha
-#: views/elements/recaptcha.thtml:68
-msgid "recaptcha_hardtoread_text"
-msgstr ""
-"Pokud je tento text těžko �itelný, můžete <a href=\"%1$s\">zkusit jiná slova "
-"</a> nebo <a href=\"%2$s\">si ho poslechnout</a>."
-
-#: views/users/register.thtml:105
-msgid "recaptcha_label"
-msgstr "Jste �lověk?"
-
-#: views/users/register.thtml:106
-msgid "recaptcha_whatsthis"
-msgstr "Copak je to?"
-
-#: controllers/reviews_controller.php:559
-msgid "review_flag_error"
-msgstr "Chyba při nahlášení recenze!"
-
-#: models/reviews_moderation_flag.php:69
-msgid "review_flag_reason_bug_support"
-msgstr "Nevhodné oznámení chyby nebo žádost o&nbsp;podporu"
-
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
-msgid "review_flag_reason_instructions"
-msgstr "Nahlásit toto hodnocení (zvolte důvod)"
-
-#: models/reviews_moderation_flag.php:67
-msgid "review_flag_reason_language"
-msgstr "Nevhodný jazyk/chování"
-
-#: models/reviews_moderation_flag.php:71
-msgid "review_flag_reason_other"
-msgstr "Jiné (prosím upřesněte)"
-
-#: models/reviews_moderation_flag.php:65
-msgid "review_flag_reason_spam"
-msgstr "Nevyžádaný příspěvek �i obsah nesouvisící s&nbsp;recenzí"
-
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
-msgid "review_flag_success"
-msgstr "Děkujeme. Recenze bude zkontrolována redaktorem."
-
-#: views/reviews/display.thtml:41
-msgid "review_flag_this"
-msgstr "Nahlásit recenzi"
-
-#: views/reviews/display.thtml:42
-msgid "review_flag_this_titletip"
-msgstr ""
-"Je tato recenze nevhodná, chybná �i se jedná o&nbsp;nevyžádanou zprávu? "
-"Klepněte zde a ozna�te ji ke zkontrolování redaktorem."
-
-#. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
-msgid "review_guidelines_short"
-msgstr ""
-"<p>Pře�těte si prosím následující tipy:</p><ul><li>Pište, jako byste se "
-"ptali přítele na jeho zkušenost s&nbsp;doplňkem. Poskytujte detailní a "
-"užite�né informace, jako jsou vlastnosti, které máte �i nemáte rádi, jak "
-"snadno se vám doplněk používá a popis nedostatků, které má. Vyvarujte se "
-"obecných hlášek typu \"Skvělé\" �i \"Špatné\" bez toho, abyste sdělili "
-"důvod, pro� tomu tak je.</li><li>Nepřidávejte prosím do recenze příspěvky "
-"s&nbsp;hlášením chyb. Vaše e-mailová adresa není viditelná ani vývojářům "
-"doplňků, kteří vás mohou chtít kontaktovat pro vyřešení vašeho problému. "
-"Podívejte se do <a href=\"%1$s\">sekce podpory</a>, kde naleznete, jak se "
-"vám může dostat podpory pro konkrétní doplněk.</li><li>Recenzi pište prosím "
-"�istě, vyhýbejte se neslušným výrazům a nezadávejte do nich žádné osobní "
-"informace.</li></ul><p>Pře�těte si prosím <a href=\"%2$s\">pravidla pro "
-"přidávání recenze</a>, kde naleznete více informaci o&nbsp;tom, jak psát "
-"recenzi.</p>"
-
-#. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
-#, php-format
-msgid "reviews_header"
-msgstr "Recenze doplňku %s"
-
-#: controllers/addons_controller.php:435
-msgid "rss_featuredaddons"
-msgstr "Zajímavé doplňky"
-
-#: controllers/addons_controller.php:432
-msgid "rss_newestaddons"
-msgstr "Nejnovější doplňky"
-
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Populární doplňky"
-
-#: controllers/addons_controller.php:433
-msgid "rss_updatedaddons"
-msgstr "Aktualizované doplňky"
-
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Hledat"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Výsledky vyhledávání sbírky"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Výsledky vyhledávání sbírky"
-
-#: controllers/search_controller.php:99
-msgid "search_disabled"
-msgstr "Hledání je nyní zakázáno. Zkuste to zprosím později."
-
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
-msgid "search_form_all_addons"
-msgstr "všechny doplňky"
-
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "všechny sbírky"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
-msgid "search_form_default_text"
-msgstr "hledat doplňky"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "hledání sbírek"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
-msgid "search_form_submit_tooltip"
-msgstr "Vyhledá doplňky"
-
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
-msgid "search_form_tooltip"
-msgstr "Klepněte a zadejte název hledaného doplňku"
-
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
-msgid "search_form_within"
-msgstr "v kategorii"
-
-#: views/addons/searchengines.thtml:118
-msgid "search_landing_all_search_engines"
-msgstr "Vyhledávací moduly"
-
-#: views/addons/searchengines.thtml:114
-msgid "search_landing_browse_search_engines"
-msgstr "Vyhledávací moduly dle typu"
-
-#: views/search/collections.thtml:58 views/search/index.thtml:59
-msgid "search_nothing_found"
-msgstr "Nic nebylo nalezeno."
-
-#: controllers/search_controller.php:185
-msgid "search_pagetitle"
-msgstr "Vyhledávání doplňků"
-
-#: controllers/search_controller.php:242
-msgid "search_rss_description"
-msgstr "Kanál s&nbsp;výsledky hledání"
-
-#. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
-#, php-format
-msgid "search_rss_results_for"
-msgstr "Výsledky hledání pro: %s"
-
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
-msgid "sidebar_navlink_admin_tools"
-msgstr "Nástroje správce"
-
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
-msgid "sidebar_navlink_developer_tools"
-msgstr "Nástroje vývojáře"
-
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
-msgid "sidebar_navlink_editor_tools"
-msgstr "Nástroje redaktora"
-
-#: views/layouts/amo2009.thtml:302
-msgid "sidebar_navlink_welcome"
-msgstr "Vítejte"
-
-#. %s is the user's name
-#: views/layouts/amo2009.thtml:302
-#, php-format
-msgid "sidebar_navlink_welcome_name"
-msgstr "Vítejte uživateli %s"
-
-#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
-msgid "sidebar_pitch_dictionary"
-msgstr "Slovník"
-
-#: views/elements/pitch.thtml:72
-msgid "sidebar_pitch_featured_addons"
-msgstr "Doporu�ované doplňky"
-
-#: views/elements/pitch.thtml:61
-msgid "sidebar_pitch_looking_for"
-msgstr "Hledám:"
-
-#: views/elements/pitch.thtml:70
-msgid "sidebar_pitch_newest_addons"
-msgstr "Nejnovější doplňky"
-
-#: views/elements/pitch.thtml:49
-msgid "sidebar_pitch_search"
-msgstr "Vyhledávací modul"
-
-#: views/elements/pitch.thtml:69
-msgid "sidebar_pitch_subscribe_to"
-msgstr "Odebírat"
-
-#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
-msgid "sidebar_pitch_theme"
-msgstr "Motiv vzhledu"
-
-#: views/elements/pitch.thtml:71
-msgid "sidebar_pitch_updated_addons"
-msgstr "Aktualizované doplňky"
-
-#. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
-#, php-format
-msgid "size_kb"
-msgstr "%1$s KB"
-
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
-msgid "stars_not_yet_rated"
-msgstr "Nehodnoceno"
-
-#. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
-#, php-format
-msgid "stars_rated_x_outof_5"
-msgstr "Hodnoceno %s z&nbsp;5 hvězdi�ek"
-
-#: views/statistics/addon.thtml:59
-msgid "statistics_addon_dashboard_link"
-msgstr "Stránka statistik"
-
-#: views/statistics/addon.thtml:58
-msgid "statistics_addon_developertools_link"
-msgstr "Nástroje vývojáře"
-
-#: views/statistics/addon.thtml:53
-msgid "statistics_addon_switch"
-msgstr "Přepnout doplněk"
-
-#. This is a date format.
-#. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
-msgid "statistics_date_shortmonth"
-msgstr "%e. %b."
-
-#. This is a date format.
-#. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
-msgid "statistics_date_shortmonthwithyear"
-msgstr "%e. %b. %Y"
-
-#. This is a date format.
-#. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
-msgid "statistics_date_weekdayshortmonth"
-msgstr "%A %e. %b."
-
-#. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
-#, php-format
-msgid "statistics_events_addon_created"
-msgstr "Doplněk %1$s vytvořen"
-
-#. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
-#, php-format
-msgid "statistics_events_app_released"
-msgstr "Aplikace %1$s vydána"
-
-#: views/statistics/addon.thtml:71
-msgid "statistics_help_close_link"
-msgstr "Zavřít"
-
-#: views/statistics/addon.thtml:60
-msgid "statistics_help_link"
-msgstr "Nápověda"
-
-#: views/statistics/index.thtml:83
-msgid "statistics_index_anotheraddon"
-msgstr " a nebo zvolte jiný doplněk"
-
-#: views/statistics/index.thtml:85
-msgid "statistics_index_anotheraddon_public"
-msgstr " a nebo zvolte jiný doplněk s&nbsp;veřejnými statistikami"
-
-#: views/statistics/index.thtml:71
-msgid "statistics_index_myaddons"
-msgstr "Pro zobrazení statistik zvolte některý ze&nbsp;svých doplňků"
-
-#: views/statistics/index.thtml:89
-msgid "statistics_index_selectaddon"
-msgstr "Pro zobrazení statistik zvolte některý z&nbsp;doplňků"
-
-#: views/statistics/index.thtml:91
-msgid "statistics_index_selectaddon_public"
-msgstr "Zvolte doplněk z&nbsp;veřejnými statistikami"
-
-#: views/statistics/index.thtml:39
-msgid "statistics_index_title"
-msgstr "Stránka statistik"
-
-#: views/statistics/index.thtml:97
-msgid "statistics_index_view_button"
-msgstr "Zobrazit statistiky"
-
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
-msgid "statistics_js_download_csv"
-msgstr "Zobrazit tuto tabulku ve formátu CSV"
-
-#: controllers/statistics_controller.php:246
-msgid "statistics_js_dropdowns_none"
-msgstr "žádný"
-
-#: controllers/statistics_controller.php:245
-msgid "statistics_js_dropdowns_removeplot"
-msgstr "Odstranit diagram"
-
-#: controllers/statistics_controller.php:248
-msgid "statistics_js_groupby_selector_date"
-msgstr "Seskupit podle dne"
-
-#: controllers/statistics_controller.php:251
-msgid "statistics_js_groupby_selector_month"
-msgstr "Seskupit podle měsíce"
-
-#: controllers/statistics_controller.php:249
-msgid "statistics_js_groupby_selector_week"
-msgstr "Seskupit podle týdnek"
-
-#: controllers/statistics_controller.php:250
-msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Porovnat podle týdne"
-
-#: controllers/statistics_controller.php:260
-msgid "statistics_js_plotselection_foundinrange"
-msgstr "%s nalezen v&nbsp;rozsahu"
-
-#: controllers/statistics_controller.php:270
-msgid "statistics_js_plotselection_options_addplot_name"
-msgstr "Přidat diagram"
-
-#: controllers/statistics_controller.php:271
-msgid "statistics_js_plotselection_options_addplot_tooltip"
-msgstr "Přidá další diagram do tohoto grafu"
-
-#: controllers/statistics_controller.php:261
-msgid "statistics_js_plotselection_options_count_name_checked"
-msgstr "Skrýt celkový po�et"
-
-#: controllers/statistics_controller.php:262
-msgid "statistics_js_plotselection_options_count_name_unchecked"
-msgstr "Zobrazit celkový po�et"
-
-#: controllers/statistics_controller.php:263
-msgid "statistics_js_plotselection_options_count_tooltip"
-msgstr "Vykreslí na tento graf celkový po�et"
-
-#: controllers/statistics_controller.php:275
-msgid "statistics_js_plotselection_options_csv_name"
-msgstr "Zobrazit data (CSV)"
-
-#: controllers/statistics_controller.php:276
-msgid "statistics_js_plotselection_options_csv_tooltip"
-msgstr "Zobrazí �árkou oddělené hodnoty pro tyto data"
-
-#: controllers/statistics_controller.php:267
-msgid "statistics_js_plotselection_options_events_addon_name_checked"
-msgstr "Skrýt události doplňku %s"
-
-#: controllers/statistics_controller.php:268
-msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
-msgstr "! události doplňku %s"
-
-#: controllers/statistics_controller.php:269
-msgid "statistics_js_plotselection_options_events_addon_tooltip"
-msgstr "Vyzna�í do diagramu datumy vydání doplňku"
-
-#: controllers/statistics_controller.php:264
-msgid "statistics_js_plotselection_options_events_firefox_name_checked"
-msgstr "Skrýt události Firefoxu"
-
-#: controllers/statistics_controller.php:265
-msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
-msgstr "Zobrazit události Firefoxu"
-
-#: controllers/statistics_controller.php:266
-msgid "statistics_js_plotselection_options_events_firefox_tooltip"
-msgstr "Vyzna�í do diagramu datumy vydání Firefoxu"
-
-#: controllers/statistics_controller.php:272
-msgid "statistics_js_plotselection_options_resize_name_checked"
-msgstr "Zmenšit graf"
-
-#: controllers/statistics_controller.php:273
-msgid "statistics_js_plotselection_options_resize_name_unchecked"
-msgstr "Zvětšit graf"
-
-#: controllers/statistics_controller.php:274
-msgid "statistics_js_plotselection_options_resize_tooltip"
-msgstr "Změní velikost grafu"
-
-#: controllers/statistics_controller.php:254
-msgid "statistics_js_plotselection_selector_adu"
-msgstr "Uživatelé za den"
-
-#: controllers/statistics_controller.php:256
-msgid "statistics_js_plotselection_selector_application"
-msgstr "Aplikace"
-
-#: controllers/statistics_controller.php:259
-msgid "statistics_js_plotselection_selector_custom"
-msgstr "Vlastní"
-
-#: controllers/statistics_controller.php:253
-msgid "statistics_js_plotselection_selector_downloads"
-msgstr "Stažení"
-
-#: controllers/statistics_controller.php:258
-msgid "statistics_js_plotselection_selector_os"
-msgstr "Opera�ní systém"
-
-#: controllers/statistics_controller.php:257
-msgid "statistics_js_plotselection_selector_status"
-msgstr "Stav doplňku"
-
-#: controllers/statistics_controller.php:252
-msgid "statistics_js_plotselection_selector_summary"
-msgstr "Celkový přehled"
-
-#: controllers/statistics_controller.php:255
-msgid "statistics_js_plotselection_selector_version"
-msgstr "Verze doplňku"
-
-#: controllers/components/stats.php:398
-msgid "statistics_longnames_application"
-msgstr "Aplikace"
-
-#: controllers/components/stats.php:400
-msgid "statistics_longnames_os"
-msgstr "Opera�ní systém"
-
-#: controllers/components/stats.php:399
-msgid "statistics_longnames_status"
-msgstr "Stav doplňku"
-
-#: controllers/components/stats.php:401
-msgid "statistics_longnames_unknown"
-msgstr "Neznámý"
-
-#: controllers/components/stats.php:397
-msgid "statistics_longnames_version"
-msgstr "Verze doplňku"
-
-#: views/statistics/addon.thtml:118
-msgid "statistics_notice_data_insufficient"
-msgstr ""
-"Pro zobrazení tohoto grafu stále není dostatek dat. Zkuste to prosím později."
-
-#: views/statistics/addon.thtml:130
-msgid "statistics_notice_data_none"
-msgstr ""
-"Pro zobrazení grafu toho doplňku nejsou žádná data. Zkuste to prosím za pár "
-"dní."
-
-#: views/statistics/addon.thtml:41
-msgid "statistics_notice_data_updating"
-msgstr ""
-"Statistiky doplňku jsou nyní aktualizovány. Zobrazovaná data můžou být proto "
-"nekompletní. Zkuste to prosím později."
-
-#: views/statistics/addon.thtml:136
-msgid "statistics_notice_disabled"
-msgstr "Stránka statistik je momentálně zakázánaná. Zkuste to prosím později."
-
-#: views/statistics/addon.thtml:123
-msgid "statistics_notice_nojavascript"
-msgstr "Pro zobrazení grafů na stránce statistik je vyžadován JavaScript."
-
-#: views/statistics/addon.thtml:44
-msgid "statistics_notice_settings_updated"
-msgstr "Nastavení bylo aktualizováno!"
-
-#: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:71
-#: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
-msgid "statistics_pagetitle"
-msgstr "Stránka statistik"
-
-#: views/statistics/addon.thtml:99
-msgid "statistics_plot_legend_adu"
-msgstr "Po�et aktivních uživatelů za den"
-
-#: views/statistics/addon.thtml:95
-msgid "statistics_plot_legend_downloads"
-msgstr "Po�et stažení za den"
-
-#: views/statistics/addon.thtml:107
-msgid "statistics_plot_options_zoomin_alt"
-msgstr "Zvětšit velikost"
-
-#: views/statistics/addon.thtml:106
-msgid "statistics_plot_options_zoomin_title"
-msgstr "Zvětšit velikost na jeden měsíc"
-
-#: views/statistics/addon.thtml:110
-msgid "statistics_plot_options_zoomout_alt"
-msgstr "Zmenšit velikost"
-
-#: views/statistics/addon.thtml:109
-msgid "statistics_plot_options_zoomout_title"
-msgstr "Zmenšit velikost na jeden měsíc"
-
-#: controllers/statistics_controller.php:283
-#, php-format
-msgid "statistics_rss_description"
-msgstr "Denní přehled statistik doplňku %1$s"
-
-#: views/statistics/rss/summary.thtml:68
-msgid "statistics_rss_title_fulldate"
-msgstr "%A, %e. %B %Y"
-
-#: views/statistics/rss/summary.thtml:68
-#, php-format
-msgid "statistics_rss_title_statsfordate"
-msgstr "Statistiky doplňku %1$s"
-
-#: views/statistics/settings.thtml:49
-msgid "statistics_settings_access_description"
-msgstr ""
-"Ve výchozím nastavení může tyto statistiky vidět pouze Mozilla a vy. Tyto "
-"statistiky lze ale zveřejnit a umožnit tak komukoliv vidět data vašeho "
-"doplňku."
-
-#: views/statistics/settings.thtml:48
-msgid "statistics_settings_access_heading"
-msgstr "Přístup ke statistikám"
-
-#: views/statistics/settings.thtml:51
-msgid "statistics_settings_access_private"
-msgstr "Soukromý"
-
-#: views/statistics/settings.thtml:51
-msgid "statistics_settings_access_private_description"
-msgstr "Pouze vy a Mozilla si může zobrazit statistiky tohoto doplňku"
-
-#: views/statistics/settings.thtml:52
-msgid "statistics_settings_access_public"
-msgstr "Veřejný"
-
-#: views/statistics/settings.thtml:52
-msgid "statistics_settings_access_public_description"
-msgstr "Kdokoliv si může zobrazit statistiky tohoto doplňku"
-
-#: views/statistics/addon.thtml:251
-msgid "statistics_settings_change_link"
-msgstr "Změnit nastavení"
-
-#: views/statistics/addon.thtml:253
-msgid "statistics_settings_confidential"
-msgstr "Považujte prosím tyto informace za důvěrné."
-
-#: views/statistics/addon.thtml:245
-msgid "statistics_settings_currently_private"
-msgstr "Tato stránka je v&nbsp;sou�asnosti <b>soukromá</b>."
-
-#: views/statistics/addon.thtml:241
-msgid "statistics_settings_currently_public"
-msgstr "Tato stránka je v&nbsp;sou�asnosti <b>veřejná</b>."
-
-#: views/statistics/addon.thtml:246
-msgid "statistics_settings_locked_alt"
-msgstr "Zamknuto"
-
-#: views/statistics/settings.thtml:57
-msgid "statistics_settings_return_link"
-msgstr "Návrat na stránku statistik"
-
-#: views/statistics/settings.thtml:56
-msgid "statistics_settings_save_button"
-msgstr "Uložit nastavení"
-
-#: views/statistics/settings.thtml:46
-#, php-format
-msgid "statistics_settings_title"
-msgstr "Nastavení stránky statistik pro doplněk %1$s"
-
-#: views/statistics/addon.thtml:242
-msgid "statistics_settings_unlocked_alt"
-msgstr "Odemknuto"
-
-#: controllers/components/stats.php:405
-msgid "statistics_shortnames_application"
-msgstr "Apl"
-
-#: controllers/components/stats.php:407
-msgid "statistics_shortnames_os"
-msgstr "OS"
-
-#: controllers/components/stats.php:406
-msgid "statistics_shortnames_status"
-msgstr "St"
-
-#: controllers/components/stats.php:408
-msgid "statistics_shortnames_unknown"
-msgstr "Nz"
-
-#: controllers/components/stats.php:404
-msgid "statistics_shortnames_version"
-msgstr "Verze"
-
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
-msgid "statistics_summary_downloads_average"
-msgstr "Průměrný po�et stažení za den"
-
-#: views/statistics/rss/summary.thtml:39
-msgid "statistics_summary_downloads_heading"
-msgstr "Stažení"
-
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
-msgid "statistics_summary_downloads_lastcount"
-msgstr "Po�et za poslední den"
-
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
-msgid "statistics_summary_downloads_lastweek"
-msgstr "Po�et stažení za poslední týden"
-
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
-msgid "statistics_summary_downloads_total"
-msgstr "Celkový po�et stažení"
-
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
-#, php-format
-msgid "statistics_summary_downloads_total_sincedate"
-msgstr "Od %1$s"
-
-#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
-msgid "statistics_summary_nodata"
-msgstr "Chybí data"
-
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
-msgid "statistics_summary_updatepings_average"
-msgstr "Průměrný po�et aktivních uživatelů za den"
-
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
-msgid "statistics_summary_updatepings_changefromprevious"
-msgstr "Změna z&nbsp;předchozího po�tu"
-
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
-#, php-format
-msgid "statistics_summary_updatepings_changefromprevious_ondate"
-msgstr "%1$s v&nbsp;%2$s"
-
-#: views/statistics/rss/summary.thtml:45
-msgid "statistics_summary_updatepings_heading"
-msgstr "Aktivní uživatelé za den"
-
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
-msgid "statistics_summary_updatepings_total"
-msgstr "Po�et aktivních uživatelů za den"
-
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
-#, php-format
-msgid "statistics_summary_updatepings_total_ondate"
-msgstr "%1$s"
-
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Průměrný po�et denních uživatelů v tomto týdnu"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s oproti minulému týdnu"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
-#, php-format
-msgid "statistics_title_addon_stats"
-msgstr "Statistika doplňku %1$s"
-
-#: views/addons/themes_landing.thtml:113
-msgid "themes_landing_all_themes"
-msgstr "VÅ¡echny motivy vzhledu"
-
-#: views/addons/themes_landing.thtml:109
-msgid "themes_landing_browse_themes"
-msgstr "Procházet motivy vzhledu"
-
-#: views/users/edit.thtml:185
-msgid "user_change_email"
-msgstr "Změnit e-mailovou adresu"
-
-#: views/users/edit.thtml:169
-msgid "user_change_password"
-msgstr "Změnit heslo"
-
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Změna hesla nebo e-mailu"
-
-#: controllers/users_controller.php:197
-msgid "user_confirmationcode_resent"
-msgstr "Aktiva�ní kód byl znova poslán!"
-
-#. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
-msgid "user_del_account_deleted"
-msgstr ""
-"Váš uživatelský ú�et %1$s byl úspěšně smazán. Pakliže se budete chtít někdy "
-"později vrátit, můžete se znova registrovat na <a href=\"%2$s\">stránce "
-"registrace nového uživatele</a>."
-
-#: views/users/delete.thtml:102
-msgid "user_del_community_sad"
-msgstr "Komunitu Mozilla Add-ons mrzí, že odcházíte."
-
-#: views/users/delete.thtml:123
-msgid "user_del_confirm_password"
-msgstr "Potvrzení hesla"
-
-#: views/users/delete.thtml:134
-msgid "user_del_deletenow"
-msgstr "Smazat můj uživatelský ú�et"
-
-#. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
-msgid "user_del_error_addons"
-msgstr ""
-"Pokud jste veden jako <a href=\"%1$s\">autor některého doplňku</a>, nemůže "
-"být váš uživatelský ú�et smazán. Před smazáním svého ú�tu pověřte jinou "
-"osobou ve vašem vývojovém týmu odstraněním vaší osoby ze seznamu autorů "
-"doplňků. Poté již budete schopen svůj uživatelský ú�et odstranit."
-
-#. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
-msgid "user_del_error_addons_more_questions"
-msgstr "Pokud máte další otázky, kontaktujte prosím pro asistenci %1$s."
-
-#: views/users/delete.thtml:78
-msgid "user_del_error_checkbox"
-msgstr ""
-"Předtím, než budete moci smazat váš ú�et, musíte zaškrtnout pole \"Souhlasím…"
-"\""
-
-#: views/users/delete.thtml:84
-msgid "user_del_error_password"
-msgstr "Pro provedení tohoto kroku zadejte platné heslo."
-
-#. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
-msgid "user_del_error_unknown"
-msgstr ""
-"Při mazání ú�tu došlo v&nbsp;neznámé chybě. Kontaktujte prosím %1$s s&nbsp;"
-"informací o chybě a my váš ú�et odstraníme. Omlouváme se za problémy."
-
-#: views/users/delete.thtml:110
-msgid "user_del_header_confirm_deletion"
-msgstr "Potvrzení smazání ú�tu"
-
-#. %1 is the user's email address
-#: views/users/delete.thtml:100
-msgid "user_del_header_delete_account"
-msgstr "Smazat uživatelský ú�et %1$s"
-
-#: views/users/delete.thtml:50
-msgid "user_del_header_farewell"
-msgstr "Sbohem!"
-
-#: views/users/delete.thtml:115
-msgid "user_del_nologin"
-msgstr "Nebudete již schopen se přihlásit na Mozilla Add-ons."
-
-#: views/users/delete.thtml:112
-msgid "user_del_permanently_removed_means"
-msgstr ""
-"Klepnutím na \"smazat\" bude váš ú�et <strong>natrvalo odstraněn</strong>. "
-"To znamená:"
-
-#: views/users/delete.thtml:116
-msgid "user_del_reviews_anonymized"
-msgstr "Vaše recenze nebudou smazány, pouze s&nbsp;vámi nebudou již provázány."
-
-#. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
-msgid "user_del_specific_problem_editors"
-msgstr ""
-"Pokud máte konkrétní problém, s&nbsp;kterým vám můžeme pomoci, pak svůj ú�et "
-"nemažte a namísto toho nás kontaktujte na adrese %1$s. My se pokusíme váš "
-"problém vyřešit."
-
-#: views/users/delete.thtml:130
-msgid "user_del_understand_permanent"
-msgstr "Rozumím, že tento krok je nevratný."
-
-#: views/helpers/addons_html.php:192
-msgid "user_deleted_nickname"
-msgstr "Smazat uživatele"
-
-#. %1 is the new email address
-#: views/users/edit.thtml:71
-msgid "user_edit_confirm_email_sent"
-msgstr ""
-"Pro potvrzení nové e-mailové adresy byl odeslán e-mail na adresu %1$s. Pro "
-"potvrzení změny bude potřeba, abyste klepli na odkaz uvedený v&nbsp;tomto e-"
-"mailu. Do té doby zůstane přihlašování spojené s&nbsp;vaší aktuální e-"
-"mailovou adresou."
-
-#: views/users/edit.thtml:201
-msgid "user_edit_delete_user"
-msgstr "Smazat uživatelský ú�et"
-
-#. This contains the email sent to users when they signed up for a new
-#. account:
-#. %1 is the confirmation URL, %2 is the current app
-#: views/users/email/confirm_plain.thtml:6
-#, php-format
-msgid "user_email_confirm_account_nopass"
-msgstr ""
-"Vítejte na serveru doplňky Mozilly.\n"
-"\n"
-"Před tím, než budete moci za�ít využívat váš ú�et, je nutné ho aktivovat - "
-"to zaru�í, že e-mailová adresa, kterou jste použily, je platná a je vaše.\n"
-"K aktivaci ú�tu sta�í klepnout na následující odkaz, �i tento odkaz "
-"zkopírovat do adresního řádku ve svém prohlíže�i:\n"
-"\n"
-"%1$s\n"
-"\n"
-"Po úspěšné aktivaci svého ú�tu můžete tento e-mail smazat.\n"
-"\n"
-"Děkujeme za registraci na serveru doplňky Mozilly.\n"
-"-- Tým serveru doplňky Mozilly"
-
-#. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-msgid "user_email_confirm_emailchange"
-msgstr ""
-"Požádali jste o&nbsp;změnu e-mailové adresy u vašeho ú�tu na %2$s Add-ons.\n"
-"\n"
-"Pokud chcete novou adresu potvrdit, klepnete na odkaz níže nebo jej "
-"zkopírujte a vložte do adresního řádku svého prohlíže�e:\n"
-"\n"
-"%1$s\n"
-"\n"
-"Na potvrzení nové adresy máte 48 hodin. Pokud si již adresu nepřejete změnit "
-"posta�í, když tento e-mail budete ignorovat.\n"
-"\n"
-"Díky!\n"
-"-- Tým %2$s Add-ons"
-
-#: controllers/users_controller.php:168
-#, php-format
-msgid "user_email_confirm_subject"
-msgstr "Doplňky Mozilly - aktivace ú�tu"
-
-#. This is the password reset email
-#. %1 is the pw reset URL, %2 is the application
-#: views/users/email/pwreset_plain.thtml:5
-#, php-format
-msgid "user_email_pwreset"
-msgstr ""
-"Žádost o&nbsp;obnovení hesla na serveru doplňky Mozilly\n"
-"\n"
-"Server doplňky Mozilly obdržel žádost na obnovení hesla ú�tu, který je "
-"provázán s&nbsp;tímto e-mailem. Pokud si přejete heslo změnit, klepněte "
-"prosím na následující odkaz nebo tento odkaz vložte do svého prohlíže�e:\n"
-"\n"
-"%1$s\n"
-"\n"
-"Pokud jste změnu hesla nepožadovali, tento e-mail prosím ignorujte.\n"
-"\n"
-"S pozdravem,\n"
-"-- Tým serveru doplňky Mozilly"
-
-#: controllers/users_controller.php:245
-#, php-format
-msgid "user_email_pwreset_subject"
-msgstr "Doplňky Mozilly - obnovení hesla"
-
-#: views/users/emailchange.thtml:50
-msgid "user_emailchange_error"
-msgstr "Chyba!"
-
-#. %1 is the application name
-#: controllers/users_controller.php:533
-msgid "user_emailchange_subject"
-msgstr "Potvr�te prosím změnu své e-mailové adresy na stránkách %1$s doplňky"
-
-#: views/users/emailchange.thtml:48
-msgid "user_emailchange_success"
-msgstr "Úspěch!"
-
-#. %1 is the new email address
-#: views/users/emailchange.thtml:49
-msgid "user_emailchange_successful_description"
-msgstr ""
-"Vaše e-mailová adresa byla úspěšně změněna. Odte� prosím používejte pro "
-"příhlášení %1$s."
-
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "O mnÄ›"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Pokud chcete, představte se komunitě. Tento text se zobrazí veřejně na "
-"stránce s informacemi o vás. Odřádkování bude zachováno, ale není povoleno "
-"HTML."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
-msgid "user_form_confirmpassword"
-msgstr "Heslo znova"
-
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Zobrazit mé sebrané sbírky"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Zobrazit mé oblíbené sbírky"
-
-#: views/users/edit.thtml:86
-#, php-format
-msgid "user_form_editprofile"
-msgstr "Upravit profil uživatele %s"
-
-#: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
-msgid "user_form_email"
-msgstr "E-mailová adresa"
-
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
-msgid "user_form_firstname"
-msgstr "Křestní jméno"
-
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
-msgid "user_form_hideemail"
-msgstr "Skrýt e-mailovou adresu"
-
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
-msgid "user_form_homepage"
-msgstr "Adresa webové stránky"
-
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
-msgid "user_form_lastname"
-msgstr "Příjmení"
-
-#: controllers/users_controller.php:333
-msgid "user_form_login"
-msgstr "Přihlášení"
-
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
-msgid "user_form_newpassword"
-msgstr "Nové heslo"
-
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
-msgid "user_form_nickname"
-msgstr "Přezdívka"
-
-#: views/users/edit.thtml:171
-msgid "user_form_oldpassword"
-msgstr "Původní heslo"
-
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
-msgid "user_form_otheractions"
-msgstr "Další akce"
-
-#: views/users/login.thtml:85 views/users/register.thtml:68
-msgid "user_form_password"
-msgstr "Heslo"
-
-#: controllers/users_controller.php:93
-msgid "user_form_registration"
-msgstr "Registrace nového uživatele"
-
-#: views/users/login.thtml:90
-msgid "user_form_remember_me"
-msgstr "Zapamatovat si mě na tomto po�íta�i"
-
-#: views/admin/users_edit.thtml:95
-msgid "user_form_showsandbox"
-msgstr "Zobrazit pískoviště"
-
-#: views/users/edit.thtml:205
-msgid "user_form_submit_edit"
-msgstr "Uložit"
-
-#: views/users/login.thtml:93
-msgid "user_form_submit_login"
-msgstr "Přihlášení"
-
-#: views/users/register.thtml:113
-msgid "user_form_submit_register"
-msgstr "Založit ú�et"
-
-#: views/users/info.thtml:75
-#, php-format
-msgid "user_info_usersince"
-msgstr "Uživatelem serveru doplňky Mozilly od"
-
-#: views/users/login.thtml:102
-msgid "user_login_register_link"
-msgstr "Založit nový ú�et"
-
-#: views/users/edit.thtml:160
-msgid "user_notifications_item_compat"
-msgstr "Kompatibilita doplňku (silně doporu�ováno)"
-
-#: views/users/edit.thtml:161
-msgid "user_notifications_item_events"
-msgstr "Nadcházející události a soutěže"
-
-#: views/users/edit.thtml:156
-msgid "user_notifications_none_available"
-msgstr "Nejsou dostupné žádné typy upozornění, které by šlo nastavit."
-
-#: views/users/edit.thtml:158
-msgid "user_notifications_select_topics"
-msgstr ""
-"Čas od �asu posílá Mozilla e-mail o&nbsp;nadcházejících vydání doplňků nebo "
-"událostech. Zvolte si prosím témata, která vás zajímají: "
-
-#: views/users/edit.thtml:164
-msgid "user_notifications_specific_contact"
-msgstr ""
-"Mozilla si vyhrazuje právo vás individuálně kontaktovat v otázkách ohledně "
-"vámi hostovaného doplňku."
-
-#: controllers/users_controller.php:543
-msgid "user_profile_edit_error"
-msgstr ""
-"Změněné údaje obsahují chyby. Opravte je prosím a formulář znova odešlete."
-
-#: controllers/users_controller.php:540
-msgid "user_profile_saved"
-msgstr "Profil aktualizován."
-
-#: views/users/pwreset.thtml:65
-#, php-format
-msgid "user_pwreset_for_email"
-msgstr "Heslo uživatele %s obnoveno"
-
-#: controllers/users_controller.php:226
-msgid "user_pwreset_header"
-msgstr "Obnovení hesla"
-
-#: views/users/login.thtml:103
-msgid "user_pwreset_link"
-msgstr "Zapomněli jste heslo?"
-
-#: controllers/users_controller.php:248
-msgid "user_pwreset_link_sent"
-msgstr "Odkaz pro obnovení hesla vám byl odeslán e-mailem."
-
-#: controllers/users_controller.php:304
-msgid "user_pwreset_okay"
-msgstr "Heslo úspěšně obnoveno."
-
-#: views/users/pwreset.thtml:82
-msgid "user_pwreset_submit_changepw"
-msgstr "Odeslat změněné heslo"
-
-#: views/users/pwreset.thtml:57
-msgid "user_pwreset_submit_sendlink"
-msgstr "Poslat odkaz na obnovení hesla"
-
-#: views/users/register_complete.thtml:51
-#, php-format
-msgid "user_register_amo_link"
-msgstr "doplňky Mozilly"
-
-#. %1 is the user's email address, %2 is the current app
-#: views/users/activatefirst.thtml:49
-#, php-format
-msgid "user_register_click_confirm_link"
-msgstr ""
-"Na vaši adresu %1$s byl odeslán e-mail obsahující odkaz k&nbsp;aktivaci "
-"ú�tu. Před tím než se budete moci přihlásit, si musíte svůj ú�et aktivovat "
-"klepnutím na tento odkaz."
-
-#. %1 is the user's email address
-#: views/users/register_complete.thtml:49
-#, php-format
-msgid "user_register_confirm_email_sent"
-msgstr ""
-"Na vaši adresu %1$s byl odeslán e-mail obsahující odkaz k&nbsp;aktivaci "
-"ú�tu. Před tím než se budete moci přihlásit, si musíte svůj ú�et aktivovat "
-"klepnutím na tento odkaz."
-
-#: views/users/activatefirst.thtml:51
-msgid "user_register_confirmation_link_text"
-msgstr "znova poslat aktiva�ní e-mail"
-
-#: views/users/register_complete.thtml:47
-msgid "user_register_congratulations"
-msgstr "Gratulujeme! Váš ú�et byl úspěšně vytvořen."
-
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registrace na AMO <strong>není vyžadována</strong>, pokud chcete pouze "
-"stahovat a instalovat veřejné doplňky.</p><p>Registrace je nutná pouze pokud:"
-"</p><ul><li>chcete recenzovat doplňky</li><li>jste vývojář a chcete na AMO "
-"hostovat svůj doplněk.</li></ul><p>Po vyplnění registra�ního formuláře vám "
-"bude na zadanou adresu zaslán aktiva�ní e-mail s popisem jak postupovat pro "
-"dokon�ení registrace.</p><p>Také si můžete prostudovat naše <a href='%1$s' "
-"title='Legal Notices'>právní omezení</a> a <a href='%2$s' title='Privacy "
-"Policy'>zásady ochrany soukromí</a>.</p>"
-
-#. %1 is the link to the "resend confirmation code" page
-#: views/users/activatefirst.thtml:51
-#, php-format
-msgid "user_register_resend_confirmation_link"
-msgstr ""
-"Pokud jste neobdrželi aktiva�ní e-mail, zkontrolujte prosím, zda ho váš "
-"poštovní klient neozna�il jako \"nevyžádanou poštu\". Pokud potřebujete, "
-"můžete si na svoji e-mailovou adresu uvedenou výše nechat %1$s."
-
-#. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
-#, php-format
-msgid "user_register_welcome"
-msgstr "Děkujeme za zaregistrování a vítejte na serveru %1$s!"
-
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Vítejte na serveru addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
-msgid "user_required_firstlast_or_nickname"
-msgstr "Je vyžadováno jméno, příjmení �i přezdívka."
-
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Sbírky"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
-msgid "user_tab_notifications"
-msgstr "Upozornění"
-
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
-msgid "user_tab_profile"
-msgstr "Uživatelský profil"
-
-#: controllers/users_controller.php:209
-msgid "user_verified_okay"
-msgstr "Úspěšně ověřeno!"
-
-#: controllers/users_controller.php:723
-msgid "users_delete_pagetitle"
-msgstr "Smazat uživatelský ú�et"
-
-#: controllers/users_controller.php:414
-msgid "users_edit_pagetitle"
-msgstr "Úprava uživatelského ú�tu"
-
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "O mnÄ›"
-
-#: views/users/info.thtml:96
-#, php-format
-msgid "users_info_addons_by_user"
-msgstr "Doplňky od uživatele %1$s"
-
-#: views/users/info.thtml:51
-msgid "users_info_author_name"
-msgstr "Jméno"
-
-#: views/users/info.thtml:48
-msgid "users_info_author_profile"
-msgstr "Profil autora"
-
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Sbírky od %s"
-
-#: views/users/info.thtml:66
-msgid "users_info_email"
-msgstr "E-mailová adresa"
-
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Oblíbené sbírky"
-
-#: views/users/info.thtml:61
-msgid "users_info_homepage"
-msgstr "Domovská stránka"
-
-#: views/users/info.thtml:56
-msgid "users_info_nickname"
-msgstr "Přezdívka"
-
-#: controllers/users_controller.php:707
-#, php-format
-msgid "users_info_pagetitle"
-msgstr "Profil uživatele %1$s"
-
-#. %1 is the user's name
-#: views/users/info.thtml:116
-msgid "users_info_reviews_by_user"
-msgstr "Recenze od uživatele %s"
-
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
-msgid "users_login_pagetitle"
-msgstr "Přihlášení uživatele"
-
-#. %1 is the link to the sandbox/policy explanation page
-#. This message is for a specific add-on not found
-#: views/users/login.thtml:53
-#, php-format
-msgid "users_login_sandbox_display_warning"
-msgstr ""
-"Doplněk, který hledáte, je v&nbsp;sou�asnosti na pískovišti. Pokud máte na "
-"serveru doplňky Mozilly ú�et, pak se prosím přihlaste, a nebo si zjistěte "
-"o&nbsp;pískovišti <a href=\"%1$s\">více informací.</a>"
-
-#. %1 is the link to the sandbox/policy explanation page
-#. This message is for any given sandbox-related page not found
-#: views/users/login.thtml:56
-#, php-format
-msgid "users_login_sandbox_page_warning"
-msgstr ""
-"Stránka, kterou hledáte, je sou�ástí pískoviště. Pokud máte na serveru "
-"doplňky Mozilly ú�et, pak se prosím přihlaste, a nebo si zjistěte o&nbsp;"
-"pískovišti <a href=\"%1$s\">více informací.</a>"
-
-#: controllers/users_controller.php:223 controllers/users_controller.php:225
-msgid "users_pwreset_pagetitle"
-msgstr "Obnovení uživatelského hesla"
-
-#: controllers/users_controller.php:90 controllers/users_controller.php:92
-msgid "users_register_pagetitle"
-msgstr "Registrace nového uživatele"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licence ke zdrojovém kódu %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Zobrazit všechny nedávno přidané"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Zobrazit všechny nej�astěji stahované"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Zobrazit všechny nejlépe hodnocené"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Na�ítání"
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Zobrazit více informací"
-
-#~ msgid "home"
-#~ msgstr "Domů"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s odpovídající doplněk"
-#~ msgstr[1] "%s odpovídající doplňky"
-#~ msgstr[2] "%s odpovídajících doplňků"
+# Remora Preliminary Language File
+# Copyright (C) 2006 Mozilla Corporation
+# This file is distributed under the same license as the REMORA package.
+# Pavel Franc <franc@czilla.cz>, 2007-2009.
+# Pavel Cvr�ek <jasnapaka@jasnapaka.com>, 2008.
+# Lukáš Petrovický <petrovicky@czilla.cz>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: REMORA 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-16 11:45-0800\n"
+"PO-Revision-Date: 2009-03-09 23:50+0100\n"
+"Last-Translator: Pavel Franc <franc@czilla.cz>\n"
+"Language-Team: CZilla <info@czilla.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: views/addons/policy.thtml:100
+msgid "a_cancel_installation"
+msgstr "Přerušit instalaci"
+
+#. This is the text that appears on buttons to download add-ons.
+#. %$1s is an optional string that only appears if the add-on is only available for
+#. a certain platform.  Examples:  (Windows)  or  (Linux)
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
+#, php-format
+msgid "a_download"
+msgstr "Stáhnout doplněk %s"
+
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
+msgid "a_eula_download"
+msgstr "Souhlasím a stahovat"
+
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
+msgid "a_eula_install"
+msgstr "Souhlasím a instalovat"
+
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
+msgid "a_header_public"
+msgstr "Veřejné doplňky"
+
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
+#: views/api/collections_feed.thtml:77
+msgid "a_header_sandbox"
+msgstr "Pískoviště"
+
+#. %s is a date in the _('date') format
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
+msgid "addon_detail_last_updated"
+msgstr "Aktualizováno dne %s"
+
+#. %s is the version of the add-on.  Example:  3.2a1
+#: views/elements/addon_version_detail.thtml:51
+#, php-format
+msgid "addon_display_header_version"
+msgstr "Verze %s"
+
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
+msgid "addon_downloads"
+msgstr "stažení"
+
+#: views/addons/display.thtml:143
+msgid "addon_downloads_total"
+msgstr "staženo celkem"
+
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
+msgid "addon_downloads_weekly"
+msgstr "staženo týdně"
+
+#. %1 is the add-on count, %2 the category name
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
+#, php-format
+msgid "addon_list_category_totalcount"
+msgid_plural "addon_list_category_totalcount"
+msgstr[0] "%1$s doplněk v&nbsp;kategorii \"%2$s\""
+msgstr[1] "%1$s doplňky v&nbsp;kategorii \"%2$s\""
+msgstr[2] "%1$s doplňků v&nbsp;kategorii \"%2$s\""
+
+#: views/elements/pagination.thtml:67
+#: views/elements/addon_list_options.thtml:94
+msgid "addon_list_perpage"
+msgstr "na stránku"
+
+#: views/elements/addon_list_options.thtml:98
+msgid "addon_list_sortby"
+msgstr "Řazení:"
+
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
+msgid "addon_listitem_flag_experimental"
+msgstr "experimentální"
+
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
+msgid "addon_listitem_flag_recommended"
+msgstr "doporu�ované"
+
+#. %1 is the add-on name, %2 is the platform
+#: views/pages/js_constants.js.thtml:57
+msgid "addon_not_available_for_platform"
+msgstr "Doplněk %1$s není pro %2$s dostupný."
+
+#. %1 is the add-on name
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
+#, php-format
+msgid "addon_review_a_back_to_addon_x"
+msgstr "Zpět na doplněk %1$s..."
+
+#. %1 is the add-on name
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
+#, php-format
+msgid "addon_review_a_back_to_reviews"
+msgstr "Zpět na hodnocení..."
+
+#: views/reviews/add.thtml:99
+msgid "addon_review_add_rating_field"
+msgstr "Hodnocení:"
+
+#: views/reviews/add.thtml:116
+msgid "addon_review_add_review_field"
+msgstr "Hodnocení:"
+
+#: views/reviews/add.thtml:121
+msgid "addon_review_add_submit"
+msgstr "Odeslat hodnocení"
+
+#. %s is the name of the add-on
+#: views/reviews/add.thtml:46
+#, php-format
+msgid "addon_review_add_title"
+msgstr "Přidat hodnocení doplňku %s"
+
+#: views/reviews/add.thtml:92
+msgid "addon_review_add_title_field"
+msgstr "Název/Stru�ný popis:"
+
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
+msgid "addon_review_admin_delete"
+msgstr "Smazat"
+
+#: views/reviews/display.thtml:80
+msgid "addon_review_author_reply_link"
+msgstr "Odpovědět"
+
+#: views/reviews/delete.thtml:55
+msgid "addon_review_confirm_delete"
+msgstr "Opravdu chcete smazat toto hodnocení?"
+
+#: views/reviews/delete.thtml:56
+msgid "addon_review_confirm_no"
+msgstr "Ne"
+
+#: views/reviews/delete.thtml:57
+msgid "addon_review_confirm_yes"
+msgstr "Ano"
+
+#: views/reviews/delete.thtml:44
+msgid "addon_review_delete_header"
+msgstr "Smazat hodnocení"
+
+#: controllers/reviews_controller.php:449
+msgid "addon_review_deleted_successfully"
+msgstr "Hodnocení úspěšně smazáno."
+
+#. %s is the name of the add-on
+#: views/reviews/add.thtml:46
+#, php-format
+msgid "addon_review_edit_title"
+msgstr "Upravit hodnocení doplňku %s"
+
+#. %1 is the count of characters entered as notes for the review flag reason.
+#: controllers/reviews_controller.php:539
+msgid "addon_review_flag_error_other_length"
+msgstr ""
+"Problém s ozna�eným hodnocení: Poznámky pro ozna�ené hodnocení jsou omezeny "
+"na 10 až 100 znaků. Délka poznámky byla %1$s."
+
+#. Removing an extra comma
+#: views/reviews/review_added.thtml:49
+msgid "addon_review_in_moderation"
+msgstr "Upozornění: Hodnocení musí být před zveřejněním schváleno redaktorem."
+
+#: views/reviews/add.thtml:71
+msgid "addon_review_in_reply_to"
+msgstr "Odpově� vývojáře uživateli:"
+
+#. %1 is the review count, %2 is the nickname or full name of the user.
+#: views/reviews/display.thtml:135
+#, php-format
+msgid "addon_review_others_by_user"
+msgid_plural "addon_review_others_by_user"
+msgstr[0] ""
+"Zobrazit %1$s předchozí hodnocení napsané pro tento doplněk uživatelem %2$s."
+msgstr[1] ""
+"Zobrazit %1$s předchozí hodnocení napsaných pro tento doplněk uživatelem %2"
+"$s."
+msgstr[2] ""
+"Zobrazit %1$s předchozích hodnocení napsaných pro tento doplněk uživatelem %2"
+"$s."
+
+#. %1 is the add-on name
+#: controllers/reviews_controller.php:201
+#: controllers/reviews_controller.php:250
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
+#, php-format
+msgid "addon_review_pagetitle"
+msgstr "Hodnocení doplňku %s"
+
+#. %1 is the user, %2 is the (localized) date
+#: views/reviews/display.thtml:164
+#, php-format
+msgid "addon_review_reply_on_x_by_y"
+msgstr "Odpově� uživatele %1$s dne %2$s"
+
+#: views/reviews/display.thtml:161
+msgid "addon_review_reply_prefix"
+msgstr "Odpově� vývojáře:"
+
+#: views/reviews/review_added.thtml:48
+msgid "addon_review_saved_successfully"
+msgstr "Hodnocení bylo uloženo. Děkujeme!"
+
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
+msgid "addon_reviewed_by_u_on_d"
+msgstr "uživatelem %1$s dne %2$s"
+
+#. %1 is the user, %2 is the (localized) date, %3 is the rating
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
+#, php-format
+msgid "addon_reviewed_on_x_rated_y"
+msgstr "Uživatel %1$s dne %2$s (bodové hodnocení: %3$s)"
+
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Další doplněk"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Předchozí doplněk"
+
+#: views/elements/addon_version_detail.thtml:52
+msgid "addon_version_permalink"
+msgstr "Stálý odkaz na tuto verzi"
+
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+#: views/addons/versions.thtml:118
+msgid "addon_versions_getlatestversion"
+msgstr "Nejnovější verze kompatibilní s aplikací %1$s %2$s"
+
+#: views/addons/display.thtml:455
+msgid "addons_author_addons_submit"
+msgstr "Odeslat"
+
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
+msgid "addons_author_tooltip"
+msgstr "Zobrazí profil autora"
+
+#. %1 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:1053
+msgid "addons_browse_all_themes_title"
+msgstr "Motivy vzhledu :: Doplňky aplikace %1$s"
+
+#. %s is the name of the category
+#: controllers/addons_controller.php:773
+#, php-format
+msgid "addons_browse_browse_category"
+msgstr "Procházet %s"
+
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+#: controllers/addons_controller.php:486
+msgid "addons_browse_categories_header_theme"
+msgstr "Motivy vzhledu z kategorie %1$s :: Doplňky aplikace %2$s"
+
+#: views/reviews/display.thtml:227
+msgid "addons_display_add_review"
+msgstr "Přidat hodnocení"
+
+#: views/addons/display.thtml:336
+msgid "addons_display_advanced_details"
+msgstr "Rozšířené informace"
+
+#: views/addons/display.thtml:93
+msgid "addons_display_categories"
+msgstr "Kategorie"
+
+#: views/addons/display.thtml:407
+msgid "addons_display_detailed_review"
+msgstr "Podrobné hodnocení"
+
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
+msgid "addons_display_dont_like_it"
+msgstr "Nelíbí se mi"
+
+#: views/reviews/display.thtml:225
+msgid "addons_display_edit_review"
+msgstr "Upravit své hodnocení"
+
+#: views/addons/display.thtml:167
+msgid "addons_display_has_privacy"
+msgstr "Tento doplněk obsahuje zásady ochrany soukromí"
+
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
+msgid "addons_display_hate_it"
+msgstr "Nesnáším ho"
+
+#: views/addons/display.thtml:339
+msgid "addons_display_header_developer_comments"
+msgstr "Komentáře vývojářů"
+
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
+msgid "addons_display_header_homepage"
+msgstr "Úvodní stránka"
+
+#: views/addons/display.thtml:288
+msgid "addons_display_header_reviews"
+msgstr "Hodnocení"
+
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
+msgid "addons_display_header_support"
+msgstr "Podpora"
+
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
+msgid "addons_display_like_it"
+msgstr "Líbí se mi"
+
+#: views/addons/display.thtml:210
+msgid "addons_display_long_description"
+msgstr "Popis"
+
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
+msgid "addons_display_love_it"
+msgstr "Miluji ho"
+
+#: views/addons/display.thtml:180
+msgid "addons_display_more_images"
+msgstr "Další obrázky"
+
+#. %1$s is either an author's name or a comma separated list of authors. Using
+#. the list doesn't make sense in the English plural form so we ignore the
+#. variable.
+#: views/addons/display.thtml:445
+msgid "addons_display_other_addons_by"
+msgid_plural "addons_display_other_addons_by"
+msgstr[0] "Další doplňky autora %1$s"
+msgstr[1] "Další doplňky těchto autorů"
+msgstr[2] "Další doplňky těchto autorů"
+
+#. %s is the name of the add-on and the add-on section.  Example:
+#.   Some Add-on :: Firefox Add-ons
+#. This should not be concatenated in the code and should be fixed.
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
+#, php-format
+msgid "addons_display_pagetitle"
+msgstr "Doplněk %s"
+
+#. %s is an email address
+#: views/addons/display.thtml:279
+#, php-format
+msgid "addons_display_paragraph_supportinfoemail"
+msgstr ""
+"Podpora tohoto doplňku je dostupná na %s. Pokud chcete nahlásit vývojáři "
+"chybu, je nejlepší nahlásit chybu přímo vývojáři, neboť pouze tak s&nbsp;"
+"vámi může vývojář plně komunikovat. Komentáře v&nbsp;hodnocení nejsou "
+"primárně ur�eny pro hlášení chyb. Jelikož vývojář rozšíření nemá možnost, "
+"jak ze stránek získat vaši e-mailovou adresu, nemá rovněž možnost, jak vás "
+"kontaktovat a vyžádat si další podrobné informace ohledně nalezené chyby, �i "
+"vám dát vědět, zda vaše chyba byla již v&nbsp;další verzi opravena."
+
+#. %$1s is a URL
+#. %$2s is an email address
+#: views/addons/display.thtml:262
+#, php-format
+msgid "addons_display_paragraph_supportinfoemailurl"
+msgstr ""
+"Podpora tohoto doplňku je dostupná na %s a %s. Pokud chcete nahlásit "
+"vývojáři chybu, je nejlepší nahlásit chybu přímo vývojáři, neboť pouze tak "
+"s&nbsp;vámi může vývojář plně komunikovat. Komentáře v&nbsp;hodnocení nejsou "
+"primárně ur�eny pro hlášení chyb. Jelikož vývojář rozšíření nemá možnost, "
+"jak ze stránek získat vaši e-mailovou adresu, nemá rovněž možnost, jak vás "
+"kontaktovat a vyžádat si další podrobné informace ohledně nalezené chyby, �i "
+"vám dát vědět, zda vaše chyba byla již v&nbsp;další verzi opravena."
+
+#. %s is a URL
+#: views/addons/display.thtml:271
+#, php-format
+msgid "addons_display_paragraph_supportinfourl"
+msgstr ""
+"Podpora tohoto doplňku je dostupná na %s. Pokud chcete nahlásit vývojáři "
+"chybu, je nejlepší nahlásit chybu přímo vývojáři, neboť pouze tak s&nbsp;"
+"vámi může vývojář plně komunikovat. Komentáře v&nbsp;hodnocení nejsou "
+"primárně ur�eny pro hlášení chyb. Jelikož vývojář rozšíření nemá možnost, "
+"jak ze stránek získat vaši e-mailovou adresu, nemá rovněž možnost, jak vás "
+"kontaktovat a vyžádat si další podrobné informace ohledně nalezené chyby, �i "
+"vám dát vědět, zda vaše chyba byla již v&nbsp;další verzi opravena."
+
+#: views/addons/display.thtml:389
+msgid "addons_display_rate_it"
+msgstr "Hodnocení"
+
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
+msgid "addons_display_really_like_it"
+msgstr "Velmi se mi líbí"
+
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
+msgid "addons_display_review_etiquette"
+msgstr ""
+"Nepřidávejte prosím do hodnocení hlášení chyb. Jelikož vývojář rozšíření "
+"nemá možnost, jak ze stránek získat vaši e-mailovou adresu, nemá rovněž "
+"možnost, jak vás kontaktovat a vyřešit váš problém."
+
+#. %1 is the review guidelines link
+#: views/addons/display.thtml:429
+msgid "addons_display_review_guidelines_link"
+msgstr "<a href=\"%s\">Pravidla pro přidávání hodnocení</a>"
+
+#. %1 is the support section link
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
+msgid "addons_display_review_see_support"
+msgstr ""
+"Informace o asistenci k&nbsp;tomuto doplňku naleznete v&nbsp;<a href=\"%1$s"
+"\">sekcii podpory</a>."
+
+#: views/addons/display.thtml:403
+msgid "addons_display_review_submit"
+msgstr "Uložit"
+
+#: views/addons/display.thtml:439
+#, php-format
+msgid "addons_display_see_all_addons"
+msgstr "Zobrazit všechny doplňky z&nbsp;kategorie %1$s"
+
+#. %1 is the number of reviews
+#: views/addons/display.thtml:326
+#, php-format
+msgid "addons_display_see_all_reviews"
+msgstr "Prohlédnout hodnocení (%1$s)"
+
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
+msgid "addons_display_see_all_versions"
+msgstr "Zobrazit všechny verze"
+
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Úplná historie verzí"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
+msgid "addons_display_view_source"
+msgstr "Zobrazit zdrojový kód"
+
+#: views/addons/display.thtml:362
+msgid "addons_display_view_stats"
+msgstr "Zobrazit statistiku"
+
+#: views/addons/display.thtml:382
+msgid "addons_display_what_do_you_think"
+msgstr "Jak se vám líbí?"
+
+#: views/elements/app_compatibility.thtml:49
+msgid "addons_display_workswith"
+msgstr "Vyžaduje:"
+
+#: views/elements/fyf_promotion.thtml:51
+#: views/elements/addon_discussionheader.thtml:83
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
+msgid "addons_home_by"
+msgstr "od"
+
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
+msgid "addons_home_feature_head"
+msgstr "Doporu�ujeme"
+
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
+#, php-format
+msgid "addons_home_header_details"
+msgstr ""
+"Doplňky rozšiřují %1$s a umožňují vám lépe personalizovat své prohlížení "
+"webu. Porozhlédněte se kolem a udělejte si %1$s přesně podle sebe."
+
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Novinky:"
+
+#: views/elements/app_chooser.thtml:48
+msgid "addons_home_other_applications"
+msgstr "Ostatní aplikace"
+
+#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
+#. Sunbird
+#: controllers/developers_controller.php:67
+#: controllers/compatibility_controller.php:72
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
+#: controllers/statistics_controller.php:60
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
+#: controllers/reviews_controller.php:251
+#: controllers/reviews_controller.php:346
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
+#: controllers/localizers_controller.php:72
+#, php-format
+msgid "addons_home_pagetitle"
+msgstr "Doplňky aplikace %1$s"
+
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Nejoblíbenější:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Doporu�ujeme:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Právě aktualizováno:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Zobrazit vše"
+
+#: views/addons/home.thtml:209
+msgid "addons_home_view_all_newest_title"
+msgstr "Zobrazí všechny nové doplňky"
+
+#: views/addons/home.thtml:199
+msgid "addons_home_view_all_popular_title"
+msgstr "Zobrazí všechny populární doplňky"
+
+#: views/addons/home.thtml:189
+msgid "addons_home_view_all_recommended_title"
+msgstr "Zobrazí všechny doporu�ované doplňky"
+
+#: views/addons/home.thtml:219
+msgid "addons_home_view_all_updated_title"
+msgstr "Zobrazí všechny aktualizované doplňky"
+
+#: views/elements/install.thtml:108
+msgid "addons_install_in_sunbird"
+msgstr ""
+"<ol><li>Uložte soubor klepnutím na odkaz níže.</li><li>V Mozilla Sunbirdu "
+"otevřete Spráce doplňků z nabídky Nástroje.</li><li>Klepněte na tla�ítko "
+"Instalovat, zvolte soubor, který jste stáhli a klepněte na \"OK\".</li></ol>"
+
+#: views/elements/install.thtml:107
+msgid "addons_install_in_sunbird_title"
+msgstr "Jak nainstalovat v Sunbirdu"
+
+#: views/elements/install.thtml:102
+msgid "addons_install_in_thunderbird"
+msgstr ""
+"<ol><li>Na odkaz níže klepněte pravým tla�ítkem a z&nbsp;místní nabídky "
+"zvolte \"Uložit odkaz jako...\" a uložte soubor dopňku na váš pevný disk.</"
+"li><li>V Mozilla Thunderbirdu otevřete z&nbsp;nabídky Správce doplňků.</"
+"li><li>Klepněte na tla�ítko Instalovat, najděte a vyberte stažený soubor a "
+"klepněte na \"OK\".</li></ol>"
+
+#: views/elements/install.thtml:101
+msgid "addons_install_in_thunderbird_title"
+msgstr "Jak naistalovat doplněk do Thunderbirdu"
+
+#: views/elements/addon_list_options.thtml:105
+msgid "addons_options_show_experimental"
+msgstr "Experimentální doplňky"
+
+#: views/elements/addon_list_options.thtml:109
+msgid "addons_options_submit"
+msgstr "Odeslat"
+
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
+msgid "addons_plugins_by"
+msgstr "Výrobce: "
+
+#: views/addons/plugins.thtml:111
+msgid "addons_plugins_for_linux"
+msgstr "Linux"
+
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
+msgid "addons_plugins_for_macosx"
+msgstr "Mac OS X"
+
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
+msgid "addons_plugins_for_windows"
+msgstr "Windows"
+
+#. %1$s is a URL
+#: views/addons/plugins.thtml:154
+#, php-format
+msgid "addons_plugins_looking_for_more"
+msgstr ""
+"Tato stránka obsahuje seznam nej�astěji používaných zásuvných modulů. Pokud "
+"hledáte další zásuvné moduly pro prohlíže�e založené na Mozille, najdete je "
+"na stránkách projektu %1$s"
+
+#: views/addons/plugins.thtml:152
+msgid "addons_plugins_looking_for_plugin"
+msgstr "Hledáte zásuvný modul, který tu není"
+
+#: views/addons/plugins.thtml:53
+msgid "addons_plugins_main_description"
+msgstr ""
+"Zásuvné moduly (angl. plugins) jsou malé doplňky, které přidávají do "
+"prohlíže�e nové, a většinou specifické, funkce. Typickým příkladem je "
+"přidání podpory ur�itého grafického formátu a nebo podpora multimédií - "
+"např. Flash, PDF, WMV. Zásuvné moduly na rozdíl od rozšíření nemodifikují "
+"samotný kód aplikace."
+
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#: controllers/addons_controller.php:879
+#, php-format
+msgid "addons_plugins_main_header"
+msgstr "Zásuvné moduly pro %1$s"
+
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
+msgid "addons_plugins_pagetitle"
+msgstr "Zásuvné moduly"
+
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
+msgid "addons_plugins_support_documentation"
+msgstr "Uživatelská dokumentace: "
+
+#. %s is the name of the add-on
+#: views/addons/policy.thtml:68
+#, php-format
+msgid "addons_policy_eula_require"
+msgstr ""
+"Před instalací doplňku %s je nutné odsouhlasit následující Licen�ní smlouvu "
+"s koncovým uživatelem (EULA): "
+
+#. %1 is the add-on name
+#: controllers/addons_controller.php:1222
+#, php-format
+msgid "addons_previews_pagetitle"
+msgstr "Náhledy doplňku %s"
+
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
+msgid "addons_recommended_introduction"
+msgstr ""
+"Ve více než tisíci doplňcích si jistě každý najde ten svůj. Pro za�átek vám "
+"nabízíme pár našich oblíbených. Užijte si je!"
+
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+msgid "addons_recommended_pagetitle"
+msgstr "Doporu�ované doplňky"
+
+#: controllers/addons_controller.php:1115
+msgid "addons_recommended_title"
+msgstr "Doporu�ované doplňky"
+
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
+msgid "addons_searchengines_additional_resources"
+msgstr "Další zdroje"
+
+#. link text devmo
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
+msgid "addons_searchengines_devmo_link"
+msgstr "Vývojářském centrum Mozilly"
+
+#: views/pages/js_constants.js.thtml:58
+msgid "addons_searchengines_error_mozilla_browser_required"
+msgstr ""
+"Je nám líto, ale váš prohlíže� nepodporuje instalaci vyhledávacích modulů."
+
+#: views/addons/searchengines.thtml:49
+msgid "addons_searchengines_error_nojavascript"
+msgstr ""
+"K instalaci vyhledávacích modulů je vyžadován JavaScript, který váš "
+"prohlíže� nepodporuje a nebo ho máte vypnutý. Před instalací níže uvedených "
+"vyhledávacích modulů si prosím zapněte podporu JavaScriptu."
+
+#. %1 is "make your own" link
+#. %2 is MDC link
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
+msgid "addons_searchengines_learn_howto"
+msgstr "Nau�te se %1$s podle návodu na %2$s."
+
+#. link path to search plugins instructions, relative to devmo
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
+msgid "addons_searchengines_makeyourown_href"
+msgstr "/cs/docs/Vytvo%C5%99en%C3%AD_vyhled%C3%A1vac%C3%ADho_modulu_OpenSearch"
+
+#. link text for "make your own" (opensearch engine)
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
+msgid "addons_searchengines_makeyourown_link"
+msgstr "vytvářet vlastní moduly"
+
+#. %1 is the link to mycroft.mozdev.org
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
+msgid "addons_searchengines_more"
+msgstr "Vyhledejte další moduly na stránkách %1$s"
+
+#. link text to mycroft.mozdev.org
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
+msgid "addons_searchengines_mycroft_link"
+msgstr "mycroft.mozdev.org"
+
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
+msgid "addons_searchengines_pagetitle"
+msgstr "Vyhledávací moduly"
+
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
+msgid "addons_searchengines_thanks"
+msgstr ""
+"Specialní díky patří projektu Mycroft za jejich práci kolem vyhledávacích "
+"modulů Firefoxu."
+
+#: views/addons/display.thtml:104
+msgid "addons_share_button_text"
+msgstr "Sdílet"
+
+#: controllers/addons_controller.php:89
+msgid "addons_share_label_delicious"
+msgstr "Přidat do Delicious"
+
+#: controllers/addons_controller.php:77
+msgid "addons_share_label_digg"
+msgstr "Přidat na Digg"
+
+#: controllers/addons_controller.php:83
+msgid "addons_share_label_facebook"
+msgstr "Přidat na Facebook"
+
+#: controllers/addons_controller.php:101
+msgid "addons_share_label_friendfeed"
+msgstr "Přidat na FriendFeed"
+
+#: controllers/addons_controller.php:95
+msgid "addons_share_label_myspace"
+msgstr "Přidat na  MySpace"
+
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
+msgid "addons_status_disabled"
+msgstr "Zakázaný"
+
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
+msgid "addons_status_incomplete"
+msgstr "Neúplná verze"
+
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
+msgid "addons_status_nominated"
+msgstr "Na pískovišti: Nominováno ke zveřejnění"
+
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
+#: controllers/components/amo.php:226
+msgid "addons_status_pending"
+msgstr "Na pískovišti: Čeká na kontrolu"
+
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
+#: controllers/components/amo.php:228
+msgid "addons_status_public"
+msgstr "veřejné"
+
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
+#: controllers/components/amo.php:225
+msgid "addons_status_sandbox"
+msgstr "Na pískovišti"
+
+#: controllers/components/amo.php:203
+msgid "addons_status_unknown"
+msgstr "Neznámý"
+
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
+msgid "addons_title_tooltip"
+msgstr "Zobrazí více o doplňku"
+
+#: views/addons/versions.thtml:53
+msgid "addons_versions_careful"
+msgstr "Při používání starších verzí bu�te opatrní"
+
+#: views/addons/versions.thtml:54
+msgid "addons_versions_careful_introduction"
+msgstr ""
+"Tyto verze jsou nabízeny především pro porovnání a pro testovací ú�ely. Pro "
+"běžné používání doporu�ujeme mít nainstalovánu vždy nejnovější verzi doplňku."
+
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
+msgid "addons_versions_history"
+msgstr "Historie verzí s&nbsp;popisem změn"
+
+#. %1$s is the add-on name
+#: controllers/addons_controller.php:1275
+#, php-format
+msgid "addons_versions_pagetitle"
+msgstr "Historie verzí doplňku %1$s"
+
+#: controllers/groups_controller.php:71
+msgid "admin_group_add_pagetitle"
+msgstr "Přidat skupinu"
+
+#: controllers/groups_controller.php:111
+msgid "admin_group_delete_pagetitle"
+msgstr "Smazat skupinu"
+
+#. %s is a number to identify the group
+#: controllers/groups_controller.php:117
+#, php-format
+msgid "admin_group_deleted"
+msgstr "Skupina s&nbsp;ID %s byla smazána"
+
+#: controllers/groups_controller.php:89
+msgid "admin_group_edit_pagetitle"
+msgstr "Upravit skupinu"
+
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
+msgid "admin_group_error_invalid_id"
+msgstr "Neplatné ID skupiny"
+
+#: controllers/groups_controller.php:65
+msgid "admin_group_pagetitle"
+msgstr "Správce skupin"
+
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
+msgid "admin_group_saved"
+msgstr "Skupina byla uložena"
+
+#: views/elements/search.thtml:238
+msgid "advanced_search_form"
+msgstr "Rozšířené"
+
+#: views/elements/search.thtml:124
+msgid "advanced_search_form_any_time"
+msgstr "Kdykoliv"
+
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
+msgid "advanced_search_form_any_type"
+msgstr "Nezáleží"
+
+#: views/elements/search.thtml:253
+msgid "advanced_search_form_any_version"
+msgstr "Nezáleží"
+
+#: views/elements/search.thtml:211
+msgid "advanced_search_form_application"
+msgstr "Aplikace"
+
+#: views/elements/search.thtml:141
+msgid "advanced_search_form_keyword_match"
+msgstr "Shoda klí�ového slova"
+
+#: views/elements/search.thtml:224
+msgid "advanced_search_form_lastupdate"
+msgstr "Aktualizované"
+
+#: views/elements/search.thtml:143
+msgid "advanced_search_form_name"
+msgstr "Jméno"
+
+#: views/elements/search.thtml:142
+msgid "advanced_search_form_newest"
+msgstr "Nejnovější"
+
+#: views/elements/search.thtml:128
+msgid "advanced_search_form_past_3_months"
+msgstr "Poslední 3 měsíce"
+
+#: views/elements/search.thtml:129
+msgid "advanced_search_form_past_6_months"
+msgstr "Posledních 6 měsíců"
+
+#: views/elements/search.thtml:125
+msgid "advanced_search_form_past_day"
+msgstr "Poslední den"
+
+#: views/elements/search.thtml:127
+msgid "advanced_search_form_past_month"
+msgstr "Poslední měsíc"
+
+#: views/elements/search.thtml:126
+msgid "advanced_search_form_past_week"
+msgstr "Poslední týden"
+
+#: views/elements/search.thtml:130
+msgid "advanced_search_form_past_year"
+msgstr "Poslední rok"
+
+#: views/elements/search.thtml:229
+msgid "advanced_search_form_perpage"
+msgstr "Doplňků na stránku"
+
+#: views/elements/search.thtml:223
+msgid "advanced_search_form_platform"
+msgstr "Platforma"
+
+#: views/elements/search.thtml:145
+msgid "advanced_search_form_popularity"
+msgstr "Popularita"
+
+#: views/elements/search.thtml:144
+msgid "advanced_search_form_rating"
+msgstr "Hodnocení"
+
+#: views/elements/search.thtml:230
+msgid "advanced_search_form_sortby"
+msgstr "Seřadit dle"
+
+#: views/elements/search.thtml:215
+msgid "advanced_search_form_to"
+msgstr "až"
+
+#: views/elements/search.thtml:236
+msgid "advanced_search_form_toggle_tooltip"
+msgstr "Přepne do režimu rozšířeného vyhledávání"
+
+#: views/elements/search.thtml:222
+msgid "advanced_search_form_type"
+msgstr "Typ"
+
+#: views/elements/search.thtml:213
+msgid "advanced_search_form_version"
+msgstr "Verze"
+
+#: views/pages/js_constants.js.thtml:85
+msgid "app_compat_ignore_check"
+msgstr "Ignorovat kontrolu verzí"
+
+#: views/pages/js_constants.js.thtml:63
+msgid "app_compat_older_firefox_only"
+msgstr "Tento doplněk je pouze pro starší verze Firefoxu"
+
+#. %1$s and %2$s are URLs
+#: views/pages/js_constants.js.thtml:65
+msgid "app_compat_older_version_or_ignore_check"
+msgstr ""
+"Můžete <a href=\"%1$s\">vyzkoušet starší verzi</a> nebo <a href=\"#\" "
+"onclick=\"%2$s\">tuto kontrolu ignorovat</a>"
+
+#. %1$s is a URL
+#: views/pages/js_constants.js.thtml:62
+msgid "app_compat_try_old_version"
+msgstr "Zkuste použít <a href=\"%1$s\">starší verzi</a>"
+
+#. %1$s is a URL
+#. %2$s is a version number.  Example: 3.1
+#: views/pages/js_constants.js.thtml:64
+msgid "app_compat_unreleased_version"
+msgstr ""
+"Tento doplněk vyžaduje dosud nevydaný <a href=\"%1$s\">Firefox %2$s</a>"
+
+#: views/pages/js_constants.js.thtml:61
+msgid "app_compat_update_firefox"
+msgstr ""
+"Pro použití tohoto doplňku je nutné <a href=\"http://getfirefox.com"
+"\">aktualizovat Firefox</a>"
+
+#: controllers/addons_controller.php:769
+msgid "browse_addons_name"
+msgstr "Doplňky podle jména"
+
+#: controllers/addons_controller.php:767
+msgid "browse_addons_newest"
+msgstr "Nové doplňky"
+
+#: controllers/addons_controller.php:765
+msgid "browse_addons_popular"
+msgstr "Oblíbené doplňky"
+
+#: controllers/addons_controller.php:768
+msgid "browse_addons_rated"
+msgstr "Doplňky podle hodnocení"
+
+#: controllers/addons_controller.php:766
+msgid "browse_addons_updated"
+msgstr "Právě aktualizované doplňky"
+
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
+msgid "categories_current_title"
+msgstr "Sou�asná kategorie"
+
+#: views/elements/categories.thtml:50
+msgid "categories_header"
+msgstr "Kategorie"
+
+#: views/elements/categories.thtml:50
+msgid "categories_header_title"
+msgstr "Vybere kategorii"
+
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Zobrazit všechny doporu�ované doplňky"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "S&nbsp;nejlepším hodnocením"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Naposledy aktualizované"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Nejoblíbenější"
+
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Zobrazit vše v&nbsp;kategorii %1$s"
+
+#: controllers/collections_controller.php:84
+msgid "collection_not_found"
+msgstr "Kolekce nenalezena!"
+
+#. %s is a date in the _('date') format
+#: views/elements/collections_interactive_addon.thtml:85
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Přidáno %s"
+
+#: views/compatibility/dashboard.thtml:45
+#: controllers/compatibility_controller.php:72
+msgid "compatibility_dashboard_center_header"
+msgstr "Centrum kompatibility doplňků"
+
+#. %1$s is the name of an application and a version.  Example: Firefox 3.0
+#. %2$s is the name of an application.  Example: Firefox
+#: views/compatibility/dashboard.thtml:46
+msgid "compatibility_dashboard_intro"
+msgstr ""
+"Připravte se na vydání aplikace %1$s pomocí nástrojů a informací dostupných "
+"níže."
+
+#: views/compatibility/dashboard.thtml:107
+msgid "compatibility_dashboard_loading"
+msgstr "Nahrávání dat..."
+
+#: views/compatibility/dashboard.thtml:41
+msgid "compatibility_dashboard_main_link"
+msgstr "Návrat na úvodní stránku"
+
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
+msgid "compatibility_dashboard_report"
+msgstr "Hlášení o kompatibilitě doplňků"
+
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
+msgid "compatibility_developer_info"
+msgstr "Informace pro vývojáře doplňků"
+
+#: views/compatibility/developers.thtml:64
+msgid "compatibility_developers_adjust_maxversion"
+msgstr "Nastavit maxVersion bez nahrávání"
+
+#: views/compatibility/dashboard.thtml:128
+msgid "compatibility_developers_check_status"
+msgstr "Zkontrolovat stav svých doplňků"
+
+#. %1$s is a URL
+#. %2$s is an application and version.  Example:  Firefox 3.0
+#: views/compatibility/dashboard.thtml:130
+msgid "compatibility_developers_login_first"
+msgstr ""
+"Pokud máte na serveru doplńky Mozilly hostovány své doplňky, <a href=\"%1$s"
+"\">přihlašte se prosím</a> a zkontrolujte si stav svých doplňků pro aplikaci "
+"%2$s."
+
+#: views/compatibility/dashboard.thtml:118
+msgid "compatibility_developers_mdclogo_alt"
+msgstr "Logo vývojářského centra Mozilly"
+
+#: views/compatibility/developers.thtml:71
+msgid "compatibility_developers_no_addons"
+msgstr "Na serveru doplňky Mozilly nemáte hostované žádné doplňky."
+
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
+msgid "compatibility_developers_results"
+msgstr "Hlášení o kontrole stavu doplňků"
+
+#: views/compatibility/dashboard.thtml:141
+msgid "compatibility_developers_retrieving"
+msgstr "Získávání stavu hostovaných doplňků..."
+
+#. %1$s is a number
+#. %2$s is an application name
+#. %3$s is a number.
+#. Full example:   50 Firefox users (10% of total)
+#: views/compatibility/developers.thtml:63
+msgid "compatibility_developers_user_count"
+msgstr "%1$s uživatelů aplikace %2$s (%3$s&#37; celkem)"
+
+#: views/compatibility/report.thtml:43
+msgid "compatibility_report_detail_intro"
+msgstr ""
+"Níže uvedené doplňky tvoří dle měření Mozilly 95% nejvíce používaných "
+"doplňků a jsou seřazeny dle používanosti."
+
+#: views/compatibility/dashboard.thtml:98
+msgid "compatibility_report_detailed_link"
+msgstr "Zobrazit podrobné hlášení"
+
+#. %1$s and %2$s are numbers
+#. %3$s is an application name and version.  Example: Firefox 3.1
+#: views/compatibility/dashboard.thtml:69
+msgid "compatibility_report_intro"
+msgstr ""
+"%1$s doplňků pokrývá 95&#37; používanosti doplňků dle měření Mozilly. "
+"<b>%2$s&#37;</b> doplňků je v sou�asnosti považováno za kompatibilní s poslední verzí aplikace %3$s."
+
+#: views/compatibility/dashboard.thtml:85
+msgid "compatibility_report_legend_alpha"
+msgstr "Alfa verze"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+#: views/compatibility/dashboard.thtml:85
+msgid "compatibility_report_legend_alpha_description"
+msgstr "Doplňky kompatibilní s alfa verzemi aplikace %1$s"
+
+#: views/compatibility/dashboard.thtml:89
+msgid "compatibility_report_legend_beta"
+msgstr "Beta verze"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+#: views/compatibility/dashboard.thtml:89
+msgid "compatibility_report_legend_beta_description"
+msgstr "Doplňky kompatibilní s beta verzemi aplikace %1$s"
+
+#: views/compatibility/dashboard.thtml:93
+msgid "compatibility_report_legend_latest"
+msgstr "Poslední verze"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+#: views/compatibility/dashboard.thtml:93
+msgid "compatibility_report_legend_latest_description"
+msgstr "Doplňky kompatibilní s posledními verzemi aplikace %1$s"
+
+#: views/compatibility/dashboard.thtml:81
+msgid "compatibility_report_legend_other"
+msgstr "Jiné verze"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+#: views/compatibility/dashboard.thtml:81
+msgid "compatibility_report_legend_other_description"
+msgstr "Doplňky nekompatibilní s žádnou verzí aplikace %1$s"
+
+#: views/compatibility/dashboard.thtml:66
+msgid "compatibility_report_title"
+msgstr "Hlášení o kompatibilitě doplňků"
+
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
+msgid "compatibility_user_info"
+msgstr "Informace pro uživatele doplňku"
+
+#: views/compatibility/dashboard.thtml:48
+msgid "compatibility_view_report"
+msgstr "Zobrazit hlášení o kompatibilitě"
+
+#. %s is a URL
+#: views/pages/credits.thtml:140
+#, php-format
+msgid "credits_contributing"
+msgstr "Více informací o přispívání naleznete na naší %s."
+
+#: views/pages/credits.thtml:140
+msgid "credits_contributing_wikipage"
+msgstr "wiki stránce"
+
+#: views/pages/credits.thtml:97
+msgid "credits_intro"
+msgstr ""
+"Mozilla děkuje následujícím lidem za jejich práci na projektu addons.mozilla."
+"org:"
+
+#: views/pages/credits.thtml:101
+msgid "credits_section_developers"
+msgstr "Vývojáři"
+
+#: views/pages/credits.thtml:113
+msgid "credits_section_editors"
+msgstr "Redaktoři"
+
+#: views/pages/credits.thtml:107
+msgid "credits_section_localizers"
+msgstr "Lokalizátoři"
+
+#: views/pages/credits.thtml:119
+msgid "credits_section_other_contributors"
+msgstr "Ostatní přispěvatelé"
+
+#: views/pages/credits.thtml:125
+msgid "credits_section_past_developers"
+msgstr "Bývalí vývojáři"
+
+#: views/pages/credits.thtml:131
+msgid "credits_section_software"
+msgstr "Software a obrázky"
+
+#: views/pages/credits.thtml:134
+msgid "credits_software_famfamfam"
+msgstr ""
+"Některé z ikon pochází z balí�ku <a href=\"http://www.famfamfam.com/lab/"
+"icons/silk/\">famfamfam Silk Icon</a>, licencovaného pod licencí <a href="
+"\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
+"2.5</a>."
+
+#: views/pages/credits.thtml:135
+msgid "credits_software_timeplot"
+msgstr ""
+"Některé stránky používají technologii <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, která je dostupná pod <a href=\"http://simile.mit.edu/license."
+"html\">licencí BSD</a>."
+
+#. date format string as used in PHP's strftime():
+#. http://php.net/strftime
+#: views/elements/collections_interactive_addon.thtml:85
+#: views/elements/addon_version_detail.thtml:54
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
+msgid "date"
+msgstr "%e. %B %Y"
+
+#. date and time format string (strftime)
+#. http://php.net/strftime
+#: views/elements/addon_version_detail.thtml:53
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#: views/admin/addons_status.thtml:57
+msgid "datetime"
+msgstr "%e. %B %Y, %H.%M"
+
+#: views/elements/developers/actionbar.thtml:47
+msgid "devcp_actionbar_link_details"
+msgstr "Více informací"
+
+#: views/elements/developers/actionbar.thtml:42
+#: views/elements/developers/actionbar.thtml:50
+#: views/developers/dashboard.thtml:64
+msgid "devcp_actionbar_link_edit"
+msgstr "Upravit doplněk"
+
+#: views/elements/developers/actionbar.thtml:51
+msgid "devcp_actionbar_link_newversion"
+msgstr "Nahrát novou verzi"
+
+#: views/elements/developers/actionbar.thtml:44
+#: views/elements/developers/actionbar.thtml:49
+#: views/developers/dashboard.thtml:73
+msgid "devcp_actionbar_link_stats"
+msgstr "Stránka statistik"
+
+#. %1$s is a filename, e.g. "foo.txt"
+#. %2$s is the extension, e.g. ".txt"
+#. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
+#: controllers/developers_controller.php:1288
+msgid "devcp_add_previews_extension_error"
+msgstr "Soubor %1$s má neplatnou příponu (%2$s). Povolené přípony jsou: %3$s"
+
+#. %s is the filename.
+#: controllers/developers_controller.php:1321
+msgid "devcp_add_previews_save_error"
+msgstr "Soubor %s se nepodařilo uložit do databáze. Zkuste to prosím znova."
+
+#. %1$s is the preview ID number, %2$s is the filename.
+#: controllers/developers_controller.php:1316
+msgid "devcp_add_previews_success_replace"
+msgstr "Náhled %1$s byl úspěšně nahrazen souborem %2$s."
+
+#. %s is the filename.
+#: controllers/developers_controller.php:1318
+msgid "devcp_add_previews_success_upload"
+msgstr "Soubor %s byl úspěšně nahrán. Nyní můžete přidat popisek."
+
+#: controllers/components/developers.php:1163
+msgid "devcp_additem_addontype_autodetect"
+msgstr "(ur�it automaticky)"
+
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Tato verze vašeho doplňku není kompatibilní s&nbsp;aplikací Firefox %1$s. "
+"Jelikož Mozilla o�ekává vydání této nové verze Firefoxu v&nbsp;nejbližší "
+"době, rádi bychom vás požádali o otestování doplňku v&nbsp;této nové verzi "
+"Firefoxu a o aktualizaci informací o kompatibilitě. Další informace "
+"naleznetete <a href=\"%2$s\">zde</a>. I přes toto upozornění můžete nyní "
+"pokra�ovat v&nbsp;nahrávání této verze doplňku."
+
+#: views/elements/developers/additem.thtml:76
+msgid "devcp_additem_linktitle_opensin_newwindow"
+msgstr "Otevřít v&nbsp;novém okně"
+
+#: views/elements/developers/additem.thtml:41
+msgid "devcp_additem_sidebar_title"
+msgstr "Přidání doplňku"
+
+#: views/elements/developers/additem.thtml:53
+msgid "devcp_additem_step0_newlink"
+msgstr "Souhlas vývojáře"
+
+#: views/elements/developers/additem.thtml:46
+msgid "devcp_additem_step1_link"
+msgstr "Krok 1: Nahrání souboru"
+
+#: views/elements/developers/additem.thtml:47
+msgid "devcp_additem_step2_link"
+msgstr "Krok 2: Informace o doplňku"
+
+#: views/elements/developers/additem.thtml:48
+msgid "devcp_additem_step3_link"
+msgstr "Krok 3: Informace o verzi"
+
+#: views/elements/developers/additem.thtml:49
+msgid "devcp_additem_step4_link"
+msgstr "Krok 4: Lokalizace"
+
+#: views/elements/developers/additem.thtml:50
+msgid "devcp_additem_step5_link"
+msgstr "Krok 5: Hotovo"
+
+#: views/elements/developers/additem.thtml:76
+msgid "devcp_additem_submissionhelp_link"
+msgstr "Nápověda přidání doplňku"
+
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Doplněk úspěšně zakázán"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Upravit doplněk"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Doplněk úspěšně povolen"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Popis doplňku"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Domovská stránka doplňku"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Název doplňku"
+
+#: controllers/previews_controller.php:168
+#: controllers/previews_controller.php:277
+msgid "devcp_addon_field_preview_caption_displaytitle"
+msgstr "Ukázka záhlaví"
+
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Zásady ochrany soukromí"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Stru�ný popis doplňku"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "E-mail podpory"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL podpory"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Poznámky k&nbsp;vydání"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominovat doplněk"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Doplněk úspěšně nominován!"
+
+#: views/developers/addon_status.thtml:178
+msgid "devcp_addon_status_action_activate"
+msgstr "Aktivovat"
+
+#: views/developers/addon_status.thtml:179
+msgid "devcp_addon_status_action_activate_description"
+msgstr ""
+"Po aktivaci se bude doplněk zobrazovat ve veřejně dostupných výpisech a bude "
+"povolena jeho aktualiza�ní služba."
+
+#: views/developers/addon_status.thtml:136
+msgid "devcp_addon_status_action_complete"
+msgstr "Dokon�it doplněk"
+
+#: views/developers/addon_status.thtml:137
+msgid "devcp_addon_status_action_complete_description"
+msgstr "Dokon�ený doplněk se přesune na pískoviště."
+
+#: views/developers/addon_status.thtml:182
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Deaktivovat"
+
+#: views/developers/addon_status.thtml:183
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr ""
+"Po deaktivaci se přestane doplněk zobrazovat ve veřejně dostupných výpisech "
+"a bude zakázána jeho aktualiza�ní služba."
+
+#: views/developers/addon_status.thtml:144
+msgid "devcp_addon_status_action_move"
+msgstr "Přesunout na pískoviště"
+
+#: views/developers/addon_status.thtml:145
+msgid "devcp_addon_status_action_move_description"
+msgstr "Doplněk bude přesunut zpět na pískoviště. Tato operace je vratná."
+
+#: views/developers/addon_status.thtml:140
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominovat ke zveřejnění"
+
+#: views/developers/addon_status.thtml:141
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "Nominujte svůj doplněk ke zveřejnění."
+
+#: views/developers/addon_status.thtml:148
+msgid "devcp_addon_status_action_public"
+msgstr "Zveřejnit"
+
+#: views/developers/addon_status.thtml:149
+msgid "devcp_addon_status_action_public_description"
+msgstr "Doplněk bude opět zveřejněn."
+
+#: views/developers/addon_status.thtml:170
+msgid "devcp_addon_status_active"
+msgstr ""
+"Doplněk je <span class=\"inactive-0\">aktivní</span>. Doplněk se zobrazuje ve všech seznamech "
+"odpovídajících jeho stavu výše."
+
+#: views/developers/addon_status.thtml:111
+msgid "devcp_addon_status_completion_disabled"
+msgstr ""
+"Před dokon�ením doplňku a jeho přesunem na <span class=\"status-1\">pískoviště</span> "
+"splňte prosím výše uvedené požadavky."
+
+#: views/developers/addon_status.thtml:108
+msgid "devcp_addon_status_completion_enabled"
+msgstr ""
+"Klepnutím na tla�ítko níže můžete svůj doplněk doko�it a přesunout jej na <span class=\"status-1\">pískoviště</span>."
+
+#: views/developers/addon_status.thtml:102
+msgid "devcp_addon_status_criteria_category"
+msgstr "Musí být zvolena nejméně jedna kategorie"
+
+#: views/developers/addon_status.thtml:101
+msgid "devcp_addon_status_criteria_description"
+msgstr "Je vyžadován popis doplňku"
+
+#: views/developers/addon_status.thtml:99
+msgid "devcp_addon_status_criteria_name"
+msgstr "Je vyžadován název doplňku"
+
+#: views/developers/addon_status.thtml:121
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Doplněk není ozan�en jako kandidát na vydání."
+
+#: views/developers/addon_status.thtml:119
+msgid "devcp_addon_status_criteria_preview"
+msgstr "Pro rozšíření a motivy vzhledu je vyžadován alespoň jeden náhled."
+
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Několik hodnocení doplňku uživateli (může být externí hodnocení)."
+
+#: views/developers/addon_status.thtml:100
+msgid "devcp_addon_status_criteria_summary"
+msgstr "Je vyžadován stru�ný popis doplňku"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+#: views/developers/addon_status.thtml:58
+msgid "devcp_addon_status_header"
+msgstr "Stav doplňku: %s"
+
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+msgid "devcp_addon_status_header_actions"
+msgstr "Dostupné akce"
+
+#: views/developers/addon_status.thtml:169
+msgid "devcp_addon_status_header_active"
+msgstr "Stav aktivity doplňku: <span class=\"inactive-0\">Aktivní</span>"
+
+#: views/developers/addon_status.thtml:97
+msgid "devcp_addon_status_header_criteria"
+msgstr "Kritéria pro dokon�ení doplňku"
+
+#: views/developers/addon_status.thtml:165
+msgid "devcp_addon_status_header_inactive"
+msgstr "Stav aktivity doplňku: <span class=\"inactive-1\">Není aktivní</span>"
+
+#: views/developers/addon_status.thtml:117
+msgid "devcp_addon_status_header_nomination"
+msgstr "Kritéria pro nominaci ke zveřejnění"
+
+#: views/developers/addon_status.thtml:191
+msgid "devcp_addon_status_header_trusted"
+msgstr "Stav důvěry doplňku: <span class=\"status-4\">Důvěryhodný</span>"
+
+#: views/developers/addon_status.thtml:166
+msgid "devcp_addon_status_inactive"
+msgstr ""
+"Doplněk <span class=\"inactive-1\">není aktivní</span> a proto se nezobrazuje "
+"ve žádném seznamu bez ohledu na jeho stav výše. Aktualizace doplňku <b>nejsou</b>"
+"pomocí aktualiza�ní služby poskytovány."
+
+#: views/developers/addon_status.thtml:129
+msgid "devcp_addon_status_nominate_disabled"
+msgstr ""
+"Před nominací doplňku ke <span class=\"status-4\">zveřejnění</span> "
+"splňte prosím výše uvedené požadavky."
+
+#: views/developers/addon_status.thtml:126
+msgid "devcp_addon_status_nominate_enabled"
+msgstr ""
+"Klepnutím na tla�ítko níže můžete svůj doplněk nominovat ke <span class=\"status-4\">zveřejnění</span>."
+
+#: views/developers/addon_status.thtml:64
+msgid "devcp_addon_status_public"
+msgstr "Veřejný"
+
+#: views/developers/addon_status.thtml:63
+msgid "devcp_addon_status_sandbox"
+msgstr "Pískoviště"
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:89
+#, fuzzy
+msgid "devcp_addon_status_switch_disabled"
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
+
+#: views/developers/addon_status.thtml:67
+#, fuzzy
+msgid "devcp_addon_status_switch_incomplete"
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
+
+#. %s is a number, perhaps 42.
+#: views/developers/addon_status.thtml:77
+#, fuzzy
+msgid "devcp_addon_status_switch_nominated"
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
+
+#. %s is an email address.
+#: views/developers/addon_status.thtml:81
+#, fuzzy
+msgid "devcp_addon_status_switch_pending"
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
+
+#: views/developers/addon_status.thtml:85
+#, fuzzy
+msgid "devcp_addon_status_switch_public"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
+
+#: views/developers/addon_status.thtml:71
+#: views/developers/addon_status.thtml:75
+#, fuzzy
+msgid "devcp_addon_status_switch_sandbox"
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
+
+#. %s is the add-on name.
+#: views/developers/addon_status_nominate.thtml:43
+#: views/developers/addon_status_confirm.thtml:43
+#: views/developers/addon_status.thtml:43
+msgid "devcp_addon_status_title"
+msgstr "Stav doplňku %s "
+
+#: views/developers/addon_status.thtml:192
+#, fuzzy
+msgid "devcp_addon_status_trusted"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Nyní můžete právě přidaný doplněk %1$s nebo %2$s se vrátit do Ovládacího "
+"panelu vývojáře."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "klepnutím zde"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "ještě upravit"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Přidaná verze doplňku byla umístěna na pískoviště a �eká se na její kontrolu "
+"pověřenými testery a redaktory serveru doplňky Mozilly. O výsledku této "
+"kontroly budete vyrozuměni e-mailem."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Více informací o kontrole doplňků umístěných na pískovišti se dozvíte %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "zde"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Váš doplněk byl umístěn na pískoviště a je dostupný pouze zkušeným "
+"uživatelům. Pokud ho chcete zobrazit i mezi veřejnými doplňky, musíte ho %s "
+"a projít procesem kontroly."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominovat"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Váš doplněk byl úspěšně přidán."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Jelikož je váš doplněk důvěryhodný, byla tato jeho verze automaticky přidána "
+"mezi veřejné doplňky."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Přidat doplněk"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Doplněk úspěšně aktualizován"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Pro zvýšení zájmu o váš doplněk doporu�ujeme %s"
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "nahrát jeho náhledy"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nebyl nalezen autor [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Odebrat"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Zrušit"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Opravdu chcete zrušit přidání doplňku?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Další"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Změnit typ doplňku:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Komentáře vývojářů aktualizovány."
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_active"
+msgstr "Aktivován"
+
+#. %1$s is the add-on type string
+#. %2$s is Inactive or Active in a <span>
+#. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
+#: views/developers/dashboard.thtml:69
+#, fuzzy
+msgid "devcp_dashboard_addontype_status"
+msgstr "%1$s currenty %2$s and %3$s"
+
+#: views/developers/dashboard.thtml:67
+msgid "devcp_dashboard_change_status"
+msgstr "Změnit stav"
+
+#. %s is the addons email address.
+#: views/developers/dashboard.thtml:99
+#, fuzzy
+msgid "devcp_dashboard_disabled_questions"
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
+
+#. %s is the (localized) add-on status string in a span, e.g. "Disabled"
+#: views/developers/dashboard.thtml:98
+msgid "devcp_dashboard_disabled_status"
+msgstr "Stav doplňku: %s"
+
+#: views/developers/dashboard.thtml:43
+msgid "devcp_dashboard_header_main"
+msgstr "Nástěnka vývojáře"
+
+#: views/developers/dashboard.thtml:110
+msgid "devcp_dashboard_header_welcome"
+msgstr "Vítejte na vývojářově nástěnce"
+
+#: views/developers/dashboard.thtml:68
+msgid "devcp_dashboard_inactive"
+msgstr "Deaktivován"
+
+#. %s is a date in the _('date') format
+#: views/developers/dashboard.thtml:65
+msgid "devcp_dashboard_last_edited"
+msgstr "Naposledy upraveno %s"
+
+#: views/developers/dashboard.thtml:111
+#, fuzzy
+msgid "devcp_dashboard_learn"
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
+
+#: views/developers/dashboard.thtml:112
+msgid "devcp_dashboard_start"
+msgstr "Za�ít"
+
+#: views/developers/dashboard.thtml:82
+msgid "devcp_dashboard_versions"
+msgstr "Verze a soubory"
+
+#: views/developers/dashboard.thtml:91
+msgid "devcp_dashboard_versions_new"
+msgstr "Nahrát novou verzi"
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1342
+#, fuzzy
+msgid "devcp_delete_previews_error"
+msgstr "Preview %s could not be deleted from the database. Please try again."
+
+#. %s is the preview ID number.
+#: controllers/developers_controller.php:1340
+#, fuzzy
+msgid "devcp_delete_previews_success"
+msgstr "Preview %s has been deleted successfully."
+
+#: controllers/developers_controller.php:1032
+#, fuzzy
+msgid "devcp_delete_version_priv_error"
+msgstr "You do not have privileges to delete versions or files."
+
+#. %1$s is the count of files, a number
+#. %2$s is a status string like _('Public') or _('Incomplete')
+#: controllers/components/amo.php:548
+msgid "devcp_describe_version_status"
+msgid_plural "devcp_describe_version_status"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Přidat náhled"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autoři"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Není"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategorie"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategorie"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Popis"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Zakázány"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Podrobnosti"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Komentáře vývojářů"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Náhledy"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Verze"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Domovská stránka"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Není"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Bez popisku"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Náhled nenalezen."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Aktualizovat"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "E-mail podpory"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Vývojář neposkytuje e-mailovou podporu"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL podpory"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Vývojář neposkytuje stránku s&nbsp;podporou"
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Důvěryhodný"
+
+#. %s is a version number.  Example:  3.0
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
+#, php-format
+msgid "devcp_details_version"
+msgstr "Verze %s"
+
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Verze nenalezena."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Zrušit a jít zpět"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Ano, zakázat"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Jste si jisti, že chcete zakázat tento doplněk?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Zakázaný doplněk se nezobrazuje ve vyhledávání ani v&nbsp;seznamech. Také ho "
+"nelze ze serveru stáhnout a není ho možno z&nbsp;klientské aplikace "
+"aktualizovat. Doplněk se tedy bude chovat jako smazaný, ale s&nbsp;tím "
+"rozdílem, že ho můžete odsud v&nbsp;budoucnu zase povolit."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Zakázání doplňku %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Ano, povolit"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Jste si jisti, že chcete povolit tento doplněk?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Povolený doplněk se zobrazuje ve vyhledávání a v&nbsp;seznamech. Také ho lze "
+"ze serveru stáhnout a je ho možno z&nbsp;klientské aplikace aktualizovat. "
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Povolení doplňku %s"
+
+#: views/developers/discuss.thtml:68
+msgid "devcp_discuss_addreply_header"
+msgstr "Odpovědět"
+
+#: views/developers/discuss.thtml:57
+msgid "devcp_discuss_allreplies_header"
+msgstr "Odpovědi"
+
+#. notice when an error occurs saving a discussion reply
+#. %1 is the email address (linked) for the amo-editors list
+#: views/developers/discuss.thtml:70
+msgid "devcp_discuss_error_notice"
+msgstr ""
+"Uložení odpovědi se nezdařilo. Kontaktujte prosím %1$s a nahlšte tento "
+"problém."
+
+#. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
+#: views/developers/discuss.thtml:46
+#, fuzzy
+msgid "devcp_discuss_intro"
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
+
+#. %1 is the add-on name
+#: views/developers/discuss.thtml:43
+#, fuzzy
+msgid "devcp_discuss_pagetitle"
+msgstr "Provide More Information For the Add-on Review of %1$s"
+
+#. submit button text
+#: views/developers/discuss.thtml:79
+msgid "devcp_discuss_submit_reply"
+msgstr "Odeslat odpově�"
+
+#: views/developers/discuss.thtml:72
+#, fuzzy
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
+
+#. in an author/editor discussion about an add-on to be reviewed:
+#. %1 is the commenter's user name (linked).
+#. %2 is the full date the comment was made.
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+msgid "devcp_discuss_writtenby"
+msgstr "napsáno %1$s dne %2$s"
+
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Přidat autora"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "E-mailová adresa autora"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Odstranit"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+msgid "devcp_edit_authors_add_author"
+msgstr "Přidat nového autora"
+
+#: views/developers/addon_edit_authors.thtml:94
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Přidat autora"
+
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
+msgid "devcp_edit_authors_add_email"
+msgstr "Author Account Email:"
+
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
+msgid "devcp_edit_authors_add_loading"
+msgstr "Checking account email..."
+
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
+msgid "devcp_edit_authors_click_save"
+msgstr "Click the Update Authors button below to save."
+
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
+msgid "devcp_edit_authors_header_current"
+msgstr "Current Authors"
+
+#: views/developers/addon_edit_authors.thtml:49
+msgid "devcp_edit_authors_header_manage"
+msgstr "Spravovat autory doplňku"
+
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
+msgid "devcp_edit_authors_label_add_listed"
+msgstr "List as author in pubilc display pages"
+
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
+msgid "devcp_edit_authors_label_developer"
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
+
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
+msgid "devcp_edit_authors_label_owner"
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
+
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
+msgid "devcp_edit_authors_label_viewer"
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
+
+#. Placeholder for the empty option in a <select>.
+#: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
+msgid "devcp_edit_authors_option_empty"
+msgstr "----------------"
+
+#: views/developers/addon_edit_authors.thtml:84
+msgid "devcp_edit_authors_select_role"
+msgstr "Zvolte roli autora:"
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:61
+msgid "devcp_edit_authors_th_author"
+msgstr "Autor"
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
+msgid "devcp_edit_authors_th_listed"
+msgstr "Listed"
+
+#. Column name in a table.
+#: views/developers/addon_edit_authors.thtml:62
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+#: views/developers/addon_edit_authors.thtml:75
+msgid "devcp_edit_authors_update_author"
+msgstr "Aktualizovat autory"
+
+#: views/developers/addon_edit_categories.thtml:99
+msgid "devcp_edit_categories_button_update"
+msgstr "Aktualizovat kategorie"
+
+#: views/developers/addon_edit_categories.thtml:88
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "Můj doplněk se nehodí do žádné z dostupných kategorií."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:61
+msgid "devcp_edit_categories_header_application"
+msgstr "Kategorie aplikace %s"
+
+#: views/developers/addon_edit_categories.thtml:49
+msgid "devcp_edit_categories_header_manage"
+msgstr "Spravovat kategori doplňku"
+
+#: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
+msgid "devcp_edit_categories_hover"
+msgstr "Hover over a category to see its description."
+
+#. %s is the category number (1, 2, 3).
+#: views/developers/addon_edit_categories.thtml:67
+msgid "devcp_edit_categories_label_category_num"
+msgstr "Kategorie %s"
+
+#: views/developers/addon_edit_categories.thtml:94
+#: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
+msgid "devcp_edit_categories_none_available"
+msgstr "No categories are available for this add-on type and application."
+
+#: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
+msgid "devcp_edit_categories_other"
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
+
+#. %s is the application name (Firefox, Thunderbird).
+#: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "Select up to three %s categories for your add-on"
+
+#: views/developers/addon_edit.thtml:47
+#, fuzzy
+msgid "devcp_edit_dd_manage_authors"
+msgstr "Add or remove users that can manage this add-on."
+
+#: views/developers/addon_edit.thtml:49
+#, fuzzy
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
+
+#: views/developers/addon_edit.thtml:51
+#, fuzzy
+msgid "devcp_edit_dd_manage_description"
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
+
+#: views/developers/addon_edit.thtml:53
+#, fuzzy
+msgid "devcp_edit_dd_manage_properties"
+msgstr "Change your add-on's name, homepage, icon, and other flags."
+
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
+msgid "devcp_edit_description_button_update"
+msgstr "Update Descriptions"
+
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
+msgid "devcp_edit_description_correct_error"
+msgstr "Please correct the errors above indicated in red."
+
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
+msgid "devcp_edit_descriptions_header"
+msgstr "Edit Add-on Descriptions"
+
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_comments_description"
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
+
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Developer Comments"
+
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_description_description"
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
+
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Add-on Description"
+
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
+
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_eula_name"
+msgstr "End-User License Agreement"
+
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_privacy_description"
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
+
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "Privacy Policy"
+
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
+msgid "devcp_edit_descriptions_transbox_summary_description"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
+
+#: views/developers/addon_edit_descriptions.thtml:76
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Přehled doplňku"
+
+#: views/developers/addon_edit.thtml:46
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Spravovat autory doplňku"
+
+#: views/developers/addon_edit.thtml:48
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Spravovat kategorie doplňku"
+
+#: views/developers/addon_edit.thtml:50
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Spravovat popis doplňku"
+
+#: views/developers/addon_edit.thtml:52
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Spravovat vlastnosti doplňku"
+
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Pro tento typ doplňku nejsou dostupné žádné kategorie."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Přenos přerušen"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Nebyl nahrán žádný soubor"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Překro�ena maximální velikost souboru"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autoři"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Přidat ikonu"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Změnit ikonu"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Povolit uživatelům zobrazit zdrojový kód online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategorie"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Výchozí lokalizace"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
+msgid "devcp_edit_label_externalsoftware"
+msgstr "Tento doplněk vyžaduje externí software"
+
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Pouze vymazat sou�asnou ikonu"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nový soubor s&nbsp;ikonou"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikona"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
+msgid "devcp_edit_label_locale_disambiguation"
+msgstr "Dodate�né lokaliza�ní informace"
+
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
+msgid "devcp_edit_label_prerelease"
+msgstr "Toto je kandidát na vydání doplňku"
+
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
+msgid "devcp_edit_label_sitespecific"
+msgstr "Toto je doplněk pro specifický server"
+
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
+msgid "devcp_edit_label_target_locale"
+msgstr "Cílová lokalizace"
+
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "krátká dodate�ná informace (jako například místní dialekt)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
+msgid "devcp_edit_properties_button_update"
+msgstr "Update Properties"
+
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
+msgid "devcp_edit_properties_change_guid"
+msgstr "Only change if you understand all of the consequences."
+
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
+msgid "devcp_edit_properties_current_icon"
+msgstr "Current Icon"
+
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
+msgid "devcp_edit_properties_default_locale"
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
+
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
+msgid "devcp_edit_properties_flags"
+msgstr "These flags are used to filter and classify add-ons."
+
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
+msgid "devcp_edit_properties_guid"
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
+
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
+msgid "devcp_edit_properties_header"
+msgstr "Edit Add-on Properties"
+
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Add-on Type"
+
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Admin Settings"
+
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
+msgid "devcp_edit_properties_header_flags"
+msgstr "Add-on Flags"
+
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
+msgid "devcp_edit_properties_header_guid"
+msgstr "Add-on GUID"
+
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
+msgid "devcp_edit_properties_header_icon"
+msgstr "Add-on Icon"
+
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
+msgid "devcp_edit_properties_header_other_settings"
+msgstr "Other Settings"
+
+#. A header on the admin page to toggle trusted status.
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
+msgid "devcp_edit_properties_header_trusted"
+msgstr "Trusted Add-on?"
+
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
+msgid "devcp_edit_properties_header_view_source"
+msgstr "View Source Online"
+
+#. %s is a comma-separated list of image extensions ".png, .jpg"
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
+msgid "devcp_edit_properties_icon"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
+
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
+msgid "devcp_edit_properties_label_binary"
+msgstr "This add-on contains binary components"
+
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Not Trusted"
+
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
+msgid "devcp_edit_properties_label_trusted"
+msgstr "Trusted"
+
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
+msgid "devcp_edit_properties_new_icon"
+msgstr "New Icon"
+
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
+msgid "devcp_edit_properties_remove_icon"
+msgstr "Remove Icon"
+
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
+msgid "devcp_edit_properties_transbox_homepage_description"
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
+
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
+msgid "devcp_edit_properties_transbox_homepage_name"
+msgstr "Add-on Homepage"
+
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
+msgid "devcp_edit_properties_transbox_name_description"
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
+
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Add-on Name"
+
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
+msgid "devcp_edit_properties_transbox_supportemail_description"
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
+
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr "Support Email Address"
+
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
+msgid "devcp_edit_properties_transbox_supporturl_description"
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
+
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "Support Website"
+
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
+msgid "devcp_edit_properties_trusted"
+msgstr "Trusted add-ons can become public without Editor review."
+
+#. %s is href="..." and should stay in the <a> tag.
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
+msgid "devcp_edit_properties_undelete"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
+
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
+msgid "devcp_edit_properties_view_source"
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
+
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
+msgid "devcp_edit_properties_view_source_allow"
+msgstr "Allow online source viewing"
+
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
+msgid "devcp_edit_properties_view_source_do_not_allow"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Aktualizovat"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">zjednodušený "
+"název lokalizace</a>, jako například 'en-US'"
+
+#: views/elements/developers/editbox.thtml:46
+msgid "devcp_editbox_authors"
+msgstr "Autoři"
+
+#: views/elements/developers/editbox.thtml:47
+msgid "devcp_editbox_categories"
+msgstr "Kategorie"
+
+#: views/elements/developers/editbox.thtml:52
+msgid "devcp_editbox_change_status"
+msgstr "Změnit stav"
+
+#: views/elements/developers/editbox.thtml:48
+msgid "devcp_editbox_descriptions"
+msgstr "Popis"
+
+#: views/elements/developers/editbox.thtml:43
+msgid "devcp_editbox_edit_addon"
+msgstr "Upravit doplněk"
+
+#: views/elements/developers/editbox.thtml:57
+msgid "devcp_editbox_new_version"
+msgstr "Nová verze"
+
+#: views/elements/developers/editbox.thtml:49
+msgid "devcp_editbox_properties"
+msgstr "Vlastnosti"
+
+#: views/elements/developers/editbox.thtml:60
+msgid "devcp_editbox_screenshots"
+msgstr "Náhledy"
+
+#: views/elements/developers/editbox.thtml:53
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Nástěnka statistik"
+
+#: views/elements/developers/editbox.thtml:54
+msgid "devcp_editbox_versions"
+msgstr "Verze a soubory"
+
+#: views/elements/developers/editbox.thtml:42
+msgid "devcp_editbox_view_listing"
+msgstr "Zobrazit seznamy"
+
+#: views/elements/developers/editorsmenu.thtml:59
+msgid "devcp_editorsqueue_featured"
+msgstr "Uváděné doplňky"
+
+#. %1 is the review count
+#: views/elements/developers/editorsqueue.thtml:42
+#: views/elements/developers/editorsmenu.thtml:56
+#, php-format
+msgid "devcp_editorsqueue_moderatedreviews"
+msgid_plural "devcp_editorsqueue_moderatedreviews"
+msgstr[0] "Moderovaná hodnocení (%s)"
+msgstr[1] "Moderovaná hodnocení (%s)"
+msgstr[2] "Moderovaná hodnocení (%s)"
+
+#. %1 is the nominated addons count
+#: views/elements/developers/editorsqueue.thtml:44
+#: views/elements/developers/editorsmenu.thtml:58
+#, php-format
+msgid "devcp_editorsqueue_nominated"
+msgid_plural "devcp_editorsqueue_nominated"
+msgstr[0] "Nominované doplňky (%s)"
+msgstr[1] "Nominované doplňky (%s)"
+msgstr[2] "Nominované doplňky (%s)"
+
+#. %1 is the update count
+#: views/elements/developers/editorsqueue.thtml:43
+#: views/elements/developers/editorsmenu.thtml:57
+#, php-format
+msgid "devcp_editorsqueue_pendingupdates"
+msgid_plural "devcp_editorsqueue_pendingupdates"
+msgstr[0] "Čekající aktualizace (%s)"
+msgstr[1] "Čekající aktualizace (%s)"
+msgstr[2] "Čekající aktualizace (%s)"
+
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Smazat zaškrtnuté soubory."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Soubory"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Cílová aplikace"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Bez souborů."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Poznámky pro hodnotitele"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Aktualizovat"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
+#: controllers/previews_controller.php:108
+#: controllers/previews_controller.php:211
+#: controllers/previews_controller.php:312
+msgid "devcp_error_addon_access_denied"
+msgstr "K tomuto doplňku nemáte přístup."
+
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Stru�ný popis doplňku je omezen na 250 znaků.\n"
+"(Bylo vloženo %s znaků)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Jméno doplňku již v&nbsp;databázi existuje. Ujistěte se prosím, že: <br /"
+"><li>Váš identifikátor GUID souhlasí. Nej�astější pří�inou této chyby je "
+"nesprávný identifikátor GUIDs.</li><li>Nemáte již v&nbsp;databázi duplicitní "
+"položku. Pokud ano, aktualizujte tuto položku a nebo ji smažte a akci "
+"opakujte.</li>"
+
+#. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
+#. in the <a> tag.  This should be fixed.
+#: controllers/components/developers.php:591
+#, php-format
+msgid "devcp_error_appversion_reference_link"
+msgstr "Více informací viz stránka %s."
+
+#. This is the link text in the <a> for devcp_error_appversion_reference_link.  This
+#. should be fixed.
+#: controllers/components/developers.php:591
+msgid "devcp_error_appversion_reference_link_text"
+msgstr "platných verzí aplikace"
+
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Popište prosím změny v&nbsp;této aktualizaci doplňku."
+
+#. %1$s is the name of the file
+#: controllers/components/developers.php:658
+#, fuzzy
+msgid "devcp_error_file_exists"
+msgstr ""
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#: controllers/components/developers.php:355
+#, php-format
+msgid "devcp_error_file_extension"
+msgstr ""
+"Přípona souboru (%s) není povolena pro tento typ doplňku. Použijte prosím "
+"jednu z&nbsp;následujících: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Některé z&nbsp;identifikátorů GUID nesouhlasí"
+
+#: controllers/components/developers.php:64
+msgid "devcp_error_five_categories"
+msgstr "Nevolte prosím více než 5 kategorií."
+
+#: controllers/components/developers.php:526
+msgid "devcp_error_guid_application"
+msgstr "Id tohoto doplňku je již používáno aplikací."
+
+#: controllers/components/developers.php:337
+#: controllers/components/developers.php:389
+msgid "devcp_error_http_incomplete"
+msgstr "Nekompletní nahrání"
+
+#: controllers/components/developers.php:335
+#: controllers/components/developers.php:336
+#: controllers/components/developers.php:387
+#: controllers/components/developers.php:388
+msgid "devcp_error_http_maxupload"
+msgstr "Překro�ena maximální velikost nahrávaného souboru"
+
+#: controllers/components/developers.php:338
+#: controllers/components/developers.php:390
+msgid "devcp_error_http_nofile"
+msgstr "Nebyl nahrán soubor"
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#: controllers/components/developers.php:401
+#, php-format
+msgid "devcp_error_icon_extension"
+msgstr ""
+"Přípona souboru (%s) není povolena pro ikonu. Použijte prosím jednu z&nbsp;"
+"následujících: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Pro tento doplněk a platformu již existuje totožná verze (%s)."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
+msgid "devcp_error_index_rdf_notfound"
+msgstr "Nebyl nalezen soubor install.rdf."
+
+#: controllers/components/developers.php:601
+msgid "devcp_error_install_manifest"
+msgstr "V souboru install.rdf byly nalezeny následujícící chyby:"
+
+#: controllers/developers_controller.php:1692
+msgid "devcp_error_invalid_addontype"
+msgstr "Zvolte prosím platný typ doplňku."
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#: controllers/components/developers.php:569
+#: controllers/components/developers.php:581
+#, php-format
+msgid "devcp_error_invalid_appversion"
+msgstr "Verze %s není platná pro aplikaci %s"
+
+#. %s is a string
+#: controllers/components/developers.php:521
+#, php-format
+msgid "devcp_error_invalid_guid"
+msgstr "Id doplňku je neplatné: %s"
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#: controllers/components/developers.php:572
+#, php-format
+msgid "devcp_error_invalid_minversion"
+msgstr "%s není platná verze pro %s: minimální verze nesmí obsahovat *"
+
+#: controllers/components/developers.php:536
+msgid "devcp_error_invalid_version"
+msgstr ""
+"Verze doplňku je neplatná: platné verze viz <a href=\"http://developer."
+"mozilla.org/en/docs/Toolkit_version_format\">specifikace</a>"
+
+#: controllers/components/developers.php:531
+msgid "devcp_error_invalid_version_spaces"
+msgstr "Verze doplňku je neplatná: verze nesmí obsahovat mezery."
+
+#. %s is an error message from the parser.
+#: controllers/components/developers.php:501
+#, php-format
+msgid "devcp_error_manifest_parse"
+msgstr "Pří zpracovávání souboru install.rdf nastaly následující chyby: %s"
+
+#: controllers/components/developers.php:373
+msgid "devcp_error_move_file"
+msgstr "Nelze přesunout soubor"
+
+#. %s is the name of a file
+#: controllers/components/developers.php:650
+#: controllers/components/developers.php:662
+#: controllers/components/developers.php:667
+#: controllers/components/developers.php:727
+#: controllers/components/developers.php:738
+#: controllers/components/developers.php:743
+#, php-format
+msgid "devcp_error_moving_file"
+msgstr "Při přesunu %s nastala chyba."
+
+#: controllers/components/developers.php:595
+msgid "devcp_error_mozilla_application"
+msgstr "Je nutné ur�it alespoň jednu platnou cílovou aplikaci Mozilla."
+
+#: controllers/components/developers.php:516
+msgid "devcp_error_no_guid"
+msgstr "V souboru install.rdf nabylo nalezeno Id doplňku."
+
+#: controllers/components/developers.php:287
+msgid "devcp_error_no_platform"
+msgstr "Nebyla zvolena platforma"
+
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Pro odeslání nominace je potřeba poskytnout požadované informace."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nelze nominovat kandidáta na vydání doplňku."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Můžete nominovat pouze doplňky na pískovišti."
+
+#: controllers/components/developers.php:59
+msgid "devcp_error_one_category"
+msgstr "Zvolte prosím alespoň jednu kategorii."
+
+#: controllers/components/developers.php:92
+msgid "devcp_error_one_user"
+msgstr "Doplněk musí mít alespoň jednoho autora."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#: controllers/components/developers.php:1081
+#, php-format
+msgid "devcp_error_preview_extension"
+msgstr ""
+"Přípona souboru (%s) není povolena pro náhledy. Použijte prosím jednu z&nbsp;"
+"následujících: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Při ukládání dat nastala chyba."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "K aktualizaci tohoto doplňku nemáte oprávnění."
+
+#: controllers/components/developers.php:511
+msgid "devcp_error_updatekey"
+msgstr ""
+"Doplňky nesmí používat vlastní klí� updateKey. Odstraňte prosím tuto položku "
+"a nahrání opakujte"
+
+#: controllers/components/developers.php:506
+msgid "devcp_error_updateurl"
+msgstr ""
+"Doplňky nesmí používat externí updateURL. Odstraňte prosím tuto položku ze "
+"souboru install.rdf a nahrání opakujte."
+
+#: controllers/developers_controller.php:416
+#: controllers/components/developers.php:271
+msgid "devcp_error_upload_file"
+msgstr "Nahrajte prosím soubor."
+
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Přidat další soubor závislý na platformě"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Přidat autora"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Odebrat"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Kategorie pro váš nový typ doplňku budou dostupné v&nbsp;dalším kroku."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Pro tento typ doplňku nejsou dostupné žádné kategorie."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Vložte prosím popis doplňku."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Vložte prosím název doplňku."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Zvolte prosím typ doplňku, který přidáváte."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Vložte prosím stru�ný popis doplňku."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Soubor doplňku"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Soubor doplňku 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Soubor doplňku 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Typ doplňku"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Povolit uživatelům zobrazit zdrojový kód online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "E-mailová adresa autora"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autoři"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategorie"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Výchozí lokalizace"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Popis"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Licen�ní smlouva s&nbsp;koncovým uživatelem (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Tento doplněk vyžaduje externí software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Soubory"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Domovská stránka"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Soubor ikony"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Jméno"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Podporované platformy"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Toto je kandidát na vydání"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Zásady ochrany soukromí"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Toto je doplněk pro specifický server"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Stru�ný popis"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-mail podpory"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL podpory"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Cílová aplikace"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Verze"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Poznámky k&nbsp;verzi"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Žádná"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Poznámky pro hodnotitele"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "Jelikož váš doplněk je důvěryhodný, zvolte prosím, kam ho umístit:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Veřejné doplňky"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Pískoviště"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Souhlas vývojáře"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Krok 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Nahrání souboru"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Krok 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detaily doplňku"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Krok 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detaily verze"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Krok 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalizace"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Krok 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Hotovo"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mé doplňky"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
+msgid "devcp_js_a_cancel"
+msgstr "Cancel"
+
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
+msgid "devcp_js_add_email"
+msgstr "Please enter the account email of the author you wish to add."
+
+#. alt text for a down-arrow image.
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
+msgid "devcp_js_img_move_down"
+msgstr "Move Down"
+
+#. alt text for an up-arrow image.
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
+msgid "devcp_js_img_move_up"
+msgstr "Move Up"
+
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
+msgid "devcp_js_img_remove_compat"
+msgstr "Remove Application Compatibility"
+
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
+msgid "devcp_js_input_list_author"
+msgstr "List as author in public listings"
+
+#. <option> text in a <select> for Author role in an add-on.
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
+msgid "devcp_js_option_developer"
+msgstr "Developer"
+
+#. <option> text in a <select> for Author role in an add-on.
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
+msgid "devcp_js_option_owner"
+msgstr "Owner"
+
+#. <option> text in a <select> for Author role in an add-on.
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
+msgid "devcp_js_option_viewer"
+msgstr "Viewer"
+
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
+msgid "devcp_js_remove_author"
+msgstr "Remove Author"
+
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
+msgid "devcp_js_sure_remove"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
+
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
+msgid "devcp_js_upload_alert"
+msgstr "You must select a file to upload."
+
+#: views/elements/developers/localebox.thtml:44
+msgid "devcp_localebox_header_localizedfields"
+msgstr "Položky lokalizace"
+
+#. %1 is the default locale
+#: views/elements/developers/localebox.thtml:48
+#, php-format
+msgid "devcp_localebox_intro"
+msgstr ""
+"Některé z&nbsp;položek na této stránce mohou být lokalizovány a zobrazovat "
+"se tak uživatelům v&nbsp;jejich mateřském jazyce. K&nbsp;úpravě detailů "
+"svého doplňku ve zvolené lokalizaci zvolte v&nbsp;nabídce odpovídající "
+"lokalizaci. Pokud není překlad pro danou lokalizaci dostupný, budou položky "
+"zobrazeny ve zvolené výchozí lokalizaci (%s)."
+
+#: views/elements/developers/sidebar.thtml:68
+#: views/elements/developers/myaddons.thtml:68
+msgid "devcp_myaddons_admincp_link"
+msgstr "Ovládací panel správce"
+
+#: views/elements/developers/sidebar.thtml:65
+#: views/elements/developers/myaddons.thtml:65
+msgid "devcp_myaddons_editorcp_link"
+msgstr "Ovládací panel redaktora"
+
+#: views/elements/developers/myaddons.thtml:52
+msgid "devcp_myaddons_link"
+msgstr "Mé doplňky"
+
+#: views/elements/developers/sidebar.thtml:70
+#: views/elements/developers/myaddons.thtml:70
+msgid "devcp_myaddons_mainpage_link"
+msgstr "Hlavní stránka"
+
+#: views/elements/developers/sidebar.thtml:63
+#: views/elements/developers/myaddons.thtml:63
+msgid "devcp_myaddons_statistics_link"
+msgstr "Stránka statistik"
+
+#: views/elements/developers/sidebar.thtml:62
+#: views/elements/developers/myaddons.thtml:62
+msgid "devcp_myaddons_submitaddon_link"
+msgstr "Přidat doplněk"
+
+#: views/elements/developers/sidebar.thtml:48
+#: views/elements/developers/myaddons.thtml:48
+msgid "devcp_myaddons_title"
+msgstr "Nástroje vývojáře"
+
+#. %1$s is an add-on ID, perhaps 167.
+#. %2$s is a URL.
+#: controllers/developers_controller.php:232
+#, fuzzy
+msgid "devcp_new_addon_error"
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
+
+#: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
+msgid "devcp_nominate_cancel"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Návrat na detaily doplňku"
+
+#. %1 is the add-on name
+#: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
+#, php-format
+msgid "devcp_nominate_submit_nominate"
+msgstr "Nominovat doplněk %s"
+
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automaticky ur�it typ doplňku: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
+#: views/developers/addon_status.thtml:49
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
+msgid "devcp_notice_changes_error"
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
+
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
+#: views/developers/addon_status.thtml:46
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
+#: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
+msgid "devcp_notice_changes_saved"
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
+
+#: controllers/previews_controller.php:252
+msgid "devcp_notice_cleardefault"
+msgstr ""
+"Odstranění výchozího náhledu způsobí, že se další náhled automaticky stane "
+"výchozím náhledem."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Výchozí lokalizace tohoto doplňku (%1$s [%2$s]) je různá od sou�asné "
+"lokalizace (%3$s [%4$s]). Položky níže by měli být dokon�eny v&nbsp;%1$s."
+
+#: controllers/previews_controller.php:184
+#: controllers/previews_controller.php:251
+msgid "devcp_notice_makedefault"
+msgstr ""
+"Nastavením tohoto náhledu jako výchozí odstraníte příznak výchozí ze "
+"sou�asného výchozího náhledu."
+
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
+
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
+#: controllers/previews_controller.php:67
+#: controllers/previews_controller.php:79
+#: controllers/previews_controller.php:82
+msgid "devcp_pagetitle"
+msgstr "Ovládací panel vývojáře"
+
+#: controllers/previews_controller.php:103
+#: controllers/previews_controller.php:104
+msgid "devcp_preview_add_pagetitle"
+msgstr "Přidat náhled"
+
+#: controllers/previews_controller.php:135
+msgid "devcp_preview_added_successfully"
+msgstr "Náhled úspěšně přidán."
+
+#: controllers/previews_controller.php:323
+msgid "devcp_preview_deleted_successfully"
+msgstr "Náhled úspěšně smazán."
+
+#: controllers/previews_controller.php:194
+#: controllers/previews_controller.php:195
+msgid "devcp_preview_edit_pagetitle"
+msgstr "Upravit náhled"
+
+#: controllers/previews_controller.php:237
+msgid "devcp_preview_updated_successfully"
+msgstr "Náhled úspěšně upraven."
+
+#: views/developers/previews.thtml:121
+#, fuzzy
+msgid "devcp_previews_a_another"
+msgstr "Add Another Preview"
+
+#: views/developers/previews.thtml:97
+#, fuzzy
+msgid "devcp_previews_a_delete"
+msgstr "Delete Preview"
+
+#: views/developers/previews.thtml:96
+#, fuzzy
+msgid "devcp_previews_a_replace"
+msgstr "Replace Preview"
+
+#: views/developers/previews.thtml:127
+#, fuzzy
+msgid "devcp_previews_a_update"
+msgstr "Update Previews"
+
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
+msgid "devcp_previews_add_new"
+msgstr "Add New Preview"
+
+#. %s is a list of file extensions, e.g. ".png, .gif"
+#: views/developers/previews.thtml:117
+#, fuzzy
+msgid "devcp_previews_add_select"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
+
+#: views/developers/previews.thtml:122
+#, fuzzy
+msgid "devcp_previews_click_below"
+msgstr "Click Update Previews below to upload."
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/previews.thtml:103
+#, fuzzy
+msgid "devcp_previews_click_update"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/previews.thtml:108
+#, fuzzy
+msgid "devcp_previews_error_message"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
+
+#: views/previews/add.thtml:45
+msgid "devcp_previews_filetype_info"
+msgstr ""
+"Formulář níže lze použít pro nahrání náhledů doplňku ve formátech PNG, JPG "
+"nebo GIF. Obrázky širší než 700 bodů a vyšší něž 525 bodů budou automaticky "
+"zmenšeny."
+
+#: views/previews/add.thtml:43
+msgid "devcp_previews_header_add"
+msgstr "Přidat náhled"
+
+#: views/developers/previews.thtml:79
+#, fuzzy
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
+#: views/previews/edit.thtml:43
+msgid "devcp_previews_header_edit"
+msgstr "Upravit náhled"
+
+#: views/developers/previews.thtml:94
+#, fuzzy
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
+#: views/previews/add.thtml:54
+msgid "devcp_previews_label_file"
+msgstr "Soubor náhledu"
+
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
+msgid "devcp_previews_label_makedefault"
+msgstr "Nastavit jako výchozí náhled"
+
+#: views/developers/previews.thtml:101
+msgid "devcp_previews_label_new"
+msgstr "Nový obrázek:"
+
+#: views/developers/previews.thtml:119
+msgid "devcp_previews_label_upload"
+msgstr "Nahrát náhled: "
+
+#: views/developers/previews.thtml:49
+msgid "devcp_previews_notice_error"
+msgstr "Jeden nebo více náhledů se nepodařilo uloži."
+
+#: views/developers/previews.thtml:46
+msgid "devcp_previews_notice_success"
+msgstr "Náhledy byly úspěšně aktualizovány."
+
+#: views/developers/previews.thtml:58
+#, fuzzy
+msgid "devcp_previews_p_screenshots"
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
+
+#: views/previews/edit.thtml:55
+msgid "devcp_previews_submit_delete"
+msgstr "Smazat náhled"
+
+#: views/previews/edit.thtml:55
+msgid "devcp_previews_submit_delete_confirm"
+msgstr "Opravdu chcete tento náhled smazat?"
+
+#: views/previews/edit.thtml:54
+msgid "devcp_previews_submit_edit"
+msgstr "Upravit náhled"
+
+#: views/previews/add.thtml:63
+msgid "devcp_previews_submit_upload"
+msgstr "Nahrát náhled"
+
+#: views/developers/previews.thtml:77
+#, fuzzy
+msgid "devcp_previews_thumbnail"
+msgstr "Thumbnail"
+
+#. %s is the add-on name.
+#: views/developers/previews.thtml:43
+#, fuzzy
+msgid "devcp_previews_title"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Nesprávný?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Opravdu chcete smazat tento soubor?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
+msgid "devcp_review_agreement_please"
+msgstr "Před pokra�ováním si prosím pře�těte a odsouhlaste následující text."
+
+#: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
+msgid "devcp_rolecheck_no_privs"
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
+
+#: controllers/developers_controller.php:1243
+#, fuzzy
+msgid "devcp_several_hours"
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
+
+#: views/elements/developers/sidebar.thtml:52
+#, fuzzy
+msgid "devcp_sidebar_a_dashboard"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Přesko�it aktualizaci mého aktuálního doplňku"
+
+#. %s is a number
+#: views/elements/developers/statsbar.thtml:45
+#: views/developers/dashboard.thtml:79
+#, php-format
+msgid "devcp_statsbar_adu"
+msgstr "Aktivních uživatelů za den: <em>%s</em> "
+
+#. %s is a number
+#: views/elements/developers/statsbar.thtml:41
+#: views/developers/dashboard.thtml:75
+#, php-format
+msgid "devcp_statsbar_total_downloads"
+msgstr "Celkově stažené: <em>%s</em>"
+
+#. %s is a number
+#: views/elements/developers/statsbar.thtml:43
+#: views/developers/dashboard.thtml:77
+#, php-format
+msgid "devcp_statsbar_weekly_downloads"
+msgstr "Staženo za týden: <em>%s</em>"
+
+#: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
+msgid "devcp_status_confirm_active"
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
+
+#: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
+msgid "devcp_status_confirm_active_sure"
+msgstr "Are you sure you wish to mark this add-on active?"
+
+#: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
+msgid "devcp_status_confirm_header_sure"
+msgstr "Are you sure?"
+
+#: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
+msgid "devcp_status_confirm_inactive"
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
+
+#: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
+msgid "devcp_status_confirm_inactive_sure"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
+
+#: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
+msgid "devcp_status_confirm_no"
+msgstr "No, cancel"
+
+#: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
+msgid "devcp_status_confirm_public"
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
+
+#: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
+msgid "devcp_status_confirm_public_sure"
+msgstr "Are you sure you wish to make this add-on public?"
+
+#: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
+msgid "devcp_status_confirm_sandbox"
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
+
+#: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
+
+#: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
+msgid "devcp_status_confirm_yes"
+msgstr "Yes, I'm Sure"
+
+#: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
+msgid "devcp_status_nominate_error_notice"
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
+
+#: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
+msgid "devcp_status_nominate_header"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Nahrávání doplňků je v&nbsp;sou�asnosti pozastaveno. Opakujte prosím akci "
+"později."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Souhlasím"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Nesouhlasím"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Tento doplněk byl správcem zakázán."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Zakázán"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Důvěryhodný"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
+msgid "devcp_summary_lastversion"
+msgstr "Poslední verze:"
+
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nemáte žádné doplňky. Pro nahrání doplňku klepněte %s."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "zde"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Nezapomeňte prosím u motivu vzhledu %s."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "nahrát náhled"
+
+#. %s is the add-on name.
+#: views/developers/addon_edit.thtml:43
+#: views/developers/addon_edit_authors.thtml:43
+#: views/developers/versions_delete.thtml:43
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
+#: views/developers/addon_edit_categories.thtml:43
+#: views/developers/versions.thtml:43
+#, fuzzy
+msgid "devcp_title_edit_addon"
+msgstr "Edit %s"
+
+#. title attribute for a javascript link that pops up a help dialog.
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
+msgid "devcp_transbox_a_title_help"
+msgstr "Help (does not leave page)"
+
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
+msgid "devcp_transbox_alt_help"
+msgstr "Help"
+
+#. %1$s is <span>17</span>, %2$s is 42.
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
+msgid "devcp_transbox_chars_used"
+msgstr "Characters used: %1$s / %2$s"
+
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
+msgid "devcp_transbox_delete_sure"
+msgstr "Are you sure you wish to delete this translation?"
+
+#. %s is a locale, like en-US.
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
+msgid "devcp_transbox_help_header_tabs"
+msgstr "What are these %s tabs?"
+
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
+msgid "devcp_transbox_help_header_what"
+msgstr "What if I don't have any translations?"
+
+#: views/elements/developers/translationbox.thtml:147
+msgid "devcp_transbox_help_hide"
+msgstr "Skrýt nápovědu"
+
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
+msgid "devcp_transbox_help_if"
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
+
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
+msgid "devcp_transbox_help_transbox"
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
+
+#: views/elements/developers/translationbox.thtml:81
+msgid "devcp_transbox_img_add_trans"
+msgstr "Přidat překlad"
+
+#: views/elements/developers/translationbox.thtml:82
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Odebrat překlad"
+
+#: views/elements/developers/translationbox.thtml:123
+msgid "devcp_transbox_input_add_all"
+msgstr "Přidat lokalizaci ke všem"
+
+#: views/elements/developers/translationbox.thtml:122
+msgid "devcp_transbox_input_add_locale"
+msgstr "Přidat lokalizaci"
+
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+msgid "devcp_transbox_input_cancel"
+msgstr "Zrušit"
+
+#: views/elements/developers/translationbox.thtml:134
+msgid "devcp_transbox_input_delete"
+msgstr "Smazat"
+
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
+msgid "devcp_transbox_select_locale"
+msgstr "Select the locale of the translation to add:"
+
+#. %1$s and %2$s are GUIDs.
+#: controllers/developers_controller.php:311
+#, fuzzy
+msgid "devcp_update_addon_guid_error"
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
+
+#: controllers/developers_controller.php:302
+#, fuzzy
+msgid "devcp_update_addon_priv_error"
+msgstr "You do not have sufficient privileges to update this add-on."
+
+#. %1$s is a version number, %2$s is an add-on ID.
+#: controllers/developers_controller.php:350
+#, fuzzy
+msgid "devcp_update_addon_version_belong_error"
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
+
+#. %1$s is a version number, maybe 1.1.
+#. %2$s is a URL.
+#: controllers/developers_controller.php:319
+#, fuzzy
+msgid "devcp_update_addon_version_exists_error"
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
+
+#. %1$s and %2$s are version numbers.
+#: controllers/developers_controller.php:356
+#, fuzzy
+msgid "devcp_update_addon_version_match_error"
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
+
+#: views/developers/uploader.thtml:68
+#, fuzzy
+msgid "devcp_uploader_a_start"
+msgstr "Get Started"
+
+#: views/developers/uploader.thtml:103
+#, fuzzy
+msgid "devcp_uploader_ajax_loading"
+msgstr "Uploading file..."
+
+#: views/developers/uploader.thtml:123
+#, fuzzy
+msgid "devcp_uploader_button_edit"
+msgstr "Edit My Add-on"
+
+#: views/developers/uploader.thtml:124
+#, fuzzy
+msgid "devcp_uploader_button_later"
+msgstr "I'll complete my add-on later."
+
+#: views/developers/uploader.thtml:134
+#, fuzzy
+msgid "devcp_uploader_button_release"
+msgstr "Add Release Notes"
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/uploader.thtml:122
+#, fuzzy
+msgid "devcp_uploader_created_results"
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
+msgid "devcp_uploader_error_correct"
+msgstr "Please correct this problem and upload your file again."
+
+#. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
+#: views/developers/uploader.thtml:141
+#, fuzzy
+msgid "devcp_uploader_file_created"
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
+
+#: views/developers/uploader.thtml:120
+#, fuzzy
+msgid "devcp_uploader_header_created"
+msgstr "Add-on Created!"
+
+#: views/developers/uploader.thtml:107
+#, fuzzy
+msgid "devcp_uploader_header_error"
+msgstr "Oops! There seems to be a problem with this file..."
+
+#: views/developers/uploader.thtml:139
+#, fuzzy
+msgid "devcp_uploader_header_file_added"
+msgstr "File Added!"
+
+#: views/developers/uploader.thtml:66
+#, fuzzy
+msgid "devcp_uploader_header_how"
+msgstr "How does it all work?"
+
+#. %s is the version number, e.g. 3.2.
+#: views/developers/uploader.thtml:129
+#, fuzzy
+msgid "devcp_uploader_header_update_created"
+msgstr "Version %s Created"
+
+#: views/developers/uploader.thtml:83
+#, fuzzy
+msgid "devcp_uploader_header_upload"
+msgstr "Upload Your File"
+
+#: views/developers/uploader.thtml:67
+#, fuzzy
+msgid "devcp_uploader_how"
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
+msgid "devcp_uploader_label_platformtype"
+msgstr "Supported Platforms:"
+
+#: views/developers/uploader.thtml:90
+#, fuzzy
+msgid "devcp_uploader_label_upload_field"
+msgstr "Add-on File: "
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: views/developers/uploader.thtml:142
+#, fuzzy
+msgid "devcp_uploader_p_pending_file"
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+#: views/developers/uploader.thtml:132
+#, fuzzy
+msgid "devcp_uploader_p_pending_version"
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %s is a status, e.g Public or Incomplete.
+#: views/developers/uploader.thtml:131
+#, fuzzy
+msgid "devcp_uploader_p_update_created"
+msgstr "Your new version has been created and is currently marked as %s."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+#: views/developers/uploader.thtml:143
+#, fuzzy
+msgid "devcp_uploader_p_update_file"
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+#: views/developers/uploader.thtml:133
+#, fuzzy
+msgid "devcp_uploader_p_update_version"
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+#: views/developers/uploader.thtml:84
+#, fuzzy
+msgid "devcp_uploader_p_upload"
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
+msgid "devcp_uploader_platformtype_all"
+msgstr "All"
+
+#: views/developers/uploader.thtml:92
+#, fuzzy
+msgid "devcp_uploader_platformtype_specific"
+msgstr "Specific:"
+
+#. %1$s is the add-on name, %2$s is the version number.
+#: views/developers/uploader.thtml:57
+#, fuzzy
+msgid "devcp_uploader_title_file"
+msgstr "Add File to %1$s %2$s"
+
+#: views/developers/uploader.thtml:50
+#, fuzzy
+msgid "devcp_uploader_title_submit"
+msgstr "Submit New Add-on"
+
+#. %s is the add-on name.
+#: views/developers/uploader.thtml:54
+#, fuzzy
+msgid "devcp_uploader_title_update"
+msgstr "Update %s"
+
+#. %s is a full <a> tag
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
+#, php-format
+msgid "devcp_valid_app_reference"
+msgstr "Více informací naleznete na %s."
+
+#. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
+#. fixed.
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
+msgid "devcp_valid_app_reference_linktext"
+msgstr "této stránce"
+
+#: controllers/developers_controller.php:527
+#, fuzzy
+msgid "devcp_verify_author_error"
+msgstr "No account found for that email address."
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Upravit verzi"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Verze úspěšně upravena."
+
+#: views/developers/versions.thtml:75
+#, fuzzy
+msgid "devcp_versions_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions.thtml:79
+#, fuzzy
+msgid "devcp_versions_a_delete"
+msgstr "Delete Version"
+
+#: views/developers/versions.thtml:74
+#, fuzzy
+msgid "devcp_versions_a_empty"
+msgstr "Remove Empty Version"
+
+#: views/developers/versions.thtml:71
+#, fuzzy
+msgid "devcp_versions_a_remove"
+msgstr "Remove?"
+
+#: views/developers/versions.thtml:91
+#, fuzzy
+msgid "devcp_versions_add"
+msgstr "Add New Version"
+
+#: views/developers/versions_delete.thtml:58
+#, fuzzy
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions_delete.thtml:56
+#, fuzzy
+msgid "devcp_versions_delete_a_delete"
+msgstr "Delete Version"
+
+#. Followed by a list of reviews and files that will be removed.
+#: views/developers/versions_delete.thtml:50
+#, fuzzy
+msgid "devcp_versions_delete_also"
+msgstr "This will also delete:"
+
+#: views/developers/versions_delete.thtml:53
+#, fuzzy
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:48
+#, fuzzy
+msgid "devcp_versions_delete_header"
+msgstr "Delete Version %s?"
+
+#: views/developers/versions_delete.thtml:52
+#, fuzzy
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
+
+#. %s is the version number.
+#: views/developers/versions_delete.thtml:49
+#, fuzzy
+msgid "devcp_versions_delete_sure"
+msgstr "Are you sure you want to permanently delete version %s?"
+
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
+msgid "devcp_versions_edit_a_cancel"
+msgstr "Cancel"
+
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
+msgid "devcp_versions_edit_a_delete"
+msgstr "Delete File"
+
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
+msgid "devcp_versions_edit_a_new_app"
+msgstr "Add New Application"
+
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "Remove Application"
+
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
+msgid "devcp_versions_edit_add"
+msgstr "Add New File"
+
+#. %s is href=... and should stay in the <a> tag.
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
+msgid "devcp_versions_edit_adjust"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
+
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
+msgid "devcp_versions_edit_compat_sure"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
+
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
+msgid "devcp_versions_edit_delete_sure"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
+
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
+msgid "devcp_versions_edit_header_approval"
+msgstr "Approval Information"
+
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
+msgid "devcp_versions_edit_header_compat"
+msgstr "Compatible Applications"
+
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
+msgid "devcp_versions_edit_header_file"
+msgstr "File Information"
+
+#. %s is the version number.
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
+msgid "devcp_versions_edit_header_manage"
+msgstr "Manage Version %s"
+
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
+msgid "devcp_versions_edit_header_notes"
+msgstr "Approval Notes"
+
+#: views/developers/versions_edit.thtml:97
+msgid "devcp_versions_edit_img_delete"
+msgstr "Smazat soubor"
+
+#. %1$s is the file id, e.g. 18723.
+#. %2$s is the platform name, e.g. ALL or Windows.
+#. %3$s is the _('date) created.
+#. %4$s is the status, e.g. "In Sandbox" or "Public".
+#. %5$s is the _('date') status was changed.
+#: views/developers/versions_edit.thtml:190
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
+
+#: views/developers/versions_edit.thtml:110
+msgid "devcp_versions_edit_no_files"
+msgstr "Nebyl nalezen žádný soubor."
+
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
+msgid "devcp_versions_edit_optional"
+msgstr "Optional information for the Editor that reviews this version."
+
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
+msgid "devcp_versions_edit_remove_compat"
+msgstr "Remove Application Compatibility"
+
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
+msgid "devcp_versions_edit_select_app"
+msgstr "Please Select an Application"
+
+#: views/developers/versions_edit.thtml:77
+msgid "devcp_versions_edit_th_file"
+msgstr "Soubor"
+
+#: views/developers/versions_edit.thtml:78
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platforma"
+
+#: views/developers/versions_edit.thtml:79
+msgid "devcp_versions_edit_th_size"
+msgstr "Velikost"
+
+#: views/developers/versions_edit.thtml:80
+msgid "devcp_versions_edit_th_status"
+msgstr "Stav"
+
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
+msgid "devcp_versions_edit_transbox_releasenotes_description"
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
+
+#: views/developers/versions_edit.thtml:181
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Poznámky k vydání"
+
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
+msgid "devcp_versions_edit_unsaved_compat"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
+
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
+msgid "devcp_versions_edit_unsaved_files"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
+
+#: views/developers/versions_edit.thtml:200
+msgid "devcp_versions_edit_update"
+msgstr "Aktualizovat verze"
+
+#: views/developers/versions.thtml:49
+msgid "devcp_versions_header_manage"
+msgstr "Spravovat verze a soubory"
+
+#: views/developers/versions.thtml:87
+msgid "devcp_versions_no_versions"
+msgstr "Bez verzí"
+
+#. %s is a version number, base 10.
+#: views/developers/versions.thtml:46
+#, fuzzy
+msgid "devcp_versions_notice_success"
+msgstr "Version %s deleted successfully."
+
+#: views/developers/versions.thtml:73
+#, fuzzy
+msgid "devcp_versions_p_remove"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
+
+#: views/developers/versions.thtml:58
+#, fuzzy
+msgid "devcp_versions_th_created"
+msgstr "Created"
+
+#: views/developers/versions.thtml:57
+msgid "devcp_versions_th_status"
+msgstr "Stav"
+
+#: views/developers/versions.thtml:56
+msgid "devcp_versions_th_version"
+msgstr "Verze"
+
+#: controllers/downloads_controller.php:90
+msgid "downloads_disable_warning"
+msgstr "Tento doplněk je zakázán"
+
+#: controllers/components/editors.php:57
+msgid "editor_review_error_addon_not_nominated"
+msgstr "Tento doplněk nebyl nominován."
+
+#: controllers/components/editors.php:213
+msgid "editor_review_error_file_not_pending"
+msgstr "Tento soubor ne�eká na hodnocení."
+
+#. Actions are, for example: approving or rejecting
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+msgid "editor_review_error_no_action"
+msgstr "Zvolte prosím akci hodnocení."
+
+#: controllers/components/editors.php:192
+msgid "editor_review_error_no_applications"
+msgstr "Zadejte prosím testovanou aplikací."
+
+#. Comments are required when an editor approves or rejects an add-on.
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+msgid "editor_review_error_no_comments"
+msgstr "Zadejte prosím komentář hodnocení."
+
+#: controllers/components/editors.php:161
+msgid "editor_review_error_no_files"
+msgstr "Zvolte prosím alespoň jeden soubor k hodnocení."
+
+#: controllers/components/editors.php:197
+msgid "editor_review_error_no_operating_system"
+msgstr "Zadejte prosím testovaný opera�ní systém."
+
+#: views/editors/logs.thtml:51
+msgid "editorcp_logs_button_filter"
+msgstr "Filtrovat"
+
+#: views/editors/logs.thtml:44
+msgid "editorcp_logs_filter_by"
+msgstr "Filtrovat podle typu/akce"
+
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
+msgid "editorcp_logs_page_heading"
+msgstr "Záznam událostí"
+
+#: views/elements/developers/editorsmenu.thtml:60
+msgid "editorcp_menu_eventlog_link"
+msgstr "Záznam událostí"
+
+#: views/elements/developers/editorsmenu.thtml:62
+msgid "editorcp_menu_mainpage_link"
+msgstr "Zpět na hlavní stránku"
+
+#: views/elements/developers/editorsmenu.thtml:61
+msgid "editorcp_menu_reviewlog_link"
+msgstr "Záznam hodnocení"
+
+#: views/elements/developers/editorsmenu.thtml:55
+msgid "editorcp_menu_summary_link"
+msgstr "Přehled redaktora"
+
+#: views/elements/developers/editorsmenu.thtml:52
+msgid "editorcp_menu_title"
+msgstr "Nástroje redaktora"
+
+#: views/editors/reviewlog.thtml:49
+msgid "editorcp_reviewlog_button_filter"
+msgstr "Filtrovat"
+
+#: views/editors/reviewlog.thtml:58
+msgid "editorcp_reviewlog_column_action"
+msgstr "Akce"
+
+#: views/editors/reviewlog.thtml:56
+msgid "editorcp_reviewlog_column_addon"
+msgstr "Doplněk"
+
+#: views/editors/reviewlog.thtml:55
+msgid "editorcp_reviewlog_column_date"
+msgstr "Datum"
+
+#: views/editors/reviewlog.thtml:57
+msgid "editorcp_reviewlog_column_editor"
+msgstr "Redaktor"
+
+#: views/editors/reviewlog.thtml:94
+msgid "editorcp_reviewlog_comments_hide"
+msgstr "Skrýt komentáře"
+
+#: views/editors/reviewlog.thtml:93
+msgid "editorcp_reviewlog_comments_show"
+msgstr "Zobrazit komentáře"
+
+#. %1$s and %2$s are full <input> tags for dates
+#: views/editors/reviewlog.thtml:45
+#, php-format
+msgid "editorcp_reviewlog_entries_between"
+msgstr "Zobrazit položky mezi %s a %s"
+
+#: views/editors/reviewlog.thtml:104
+msgid "editorcp_reviewlog_none_found"
+msgstr "Pro toto období nebyla nalezena žádná hodnocení."
+
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
+msgid "editorcp_reviewlog_page_heading"
+msgstr "Záznam hodnocení"
+
+#: views/editors/summary.thtml:61
+msgid "editorcp_summary_monthreviews_heading"
+msgstr "Měsí�ní hodnocení"
+
+#: views/editors/summary.thtml:77
+msgid "editorcp_summary_neweditors_heading"
+msgstr "Noví redaktoři"
+
+#: views/editors/summary.thtml:42
+msgid "editorcp_summary_page_heading"
+msgstr "Přehled redaktora"
+
+#: views/editors/summary.thtml:94
+msgid "editorcp_summary_recentactivity_heading"
+msgstr "Nedávna aktivita redaktora"
+
+#: views/editors/summary.thtml:45
+msgid "editorcp_summary_totalreviews_heading"
+msgstr "Hodnocení celkem"
+
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
+msgid "editors_addon_review_pagetitle"
+msgstr "Hodnotit doplněk"
+
+#: controllers/editors_controller.php:471
+msgid "editors_error_js-formerror"
+msgstr "Vyplňte prosím následující položky:"
+
+#: controllers/editors_controller.php:472
+msgid "editors_error_review_one_file"
+msgstr "Zvolte prosím alespoň jeden soubor k&nbsp;hodnocení."
+
+#: controllers/editors_controller.php:398
+msgid "editors_error_self_reviews_forbidden"
+msgstr "Vlastní hodnocení není povoleno."
+
+#: controllers/editors_controller.php:308
+msgid "editors_external_software"
+msgstr "Externí software"
+
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
+msgid "editors_featured_add_feature"
+msgstr "Přidat vlastnost"
+
+#: views/editors/featured.thtml:126
+msgid "editors_featured_add_feature_submit"
+msgstr "Přidat"
+
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
+msgid "editors_featured_addon_add_failure"
+msgstr "Přidání vlastnosti skon�ilo chybou."
+
+#: controllers/editors_controller.php:694
+msgid "editors_featured_addon_add_success"
+msgstr "Vlastnost byla úspěšně přidána."
+
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
+msgid "editors_featured_addon_edit_failure"
+msgstr "Úprava vlastnosti skon�ilo chybou."
+
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
+msgid "editors_featured_addon_edit_success"
+msgstr "Vlastnost byla úspěšně upravena."
+
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
+msgid "editors_featured_addon_invalid_locale"
+msgstr "Jedna nebo více lokalizací je naplatná."
+
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
+msgid "editors_featured_addon_remove_failure"
+msgstr "Odebrání vlastnosti skon�ilo chybou."
+
+#: controllers/editors_controller.php:744
+msgid "editors_featured_addon_remove_success"
+msgstr "Vlastnost byla úspěšně odebrána."
+
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
+msgid "editors_featured_addons_pagetitle"
+msgstr "Uváděné doplňky"
+
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
+msgid "editors_featured_edit_feature_submit"
+msgstr "Odeslat"
+
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
+msgid "editors_featured_remove_feature"
+msgstr "Odebrat vlastnost"
+
+#: views/editors/queue.thtml:47
+msgid "editors_filter_queue"
+msgstr "Filtr fronty"
+
+#: views/editors/queue.thtml:113
+msgid "editors_helpful_links"
+msgstr "Pomocné odkazy"
+
+#: views/editors/queue.thtml:113
+msgid "editors_link_guide"
+msgstr "Průvodce redaktora"
+
+#: views/editors/queue.thtml:113
+msgid "editors_link_policy"
+msgstr "Zásady užití doplňku"
+
+#: views/editors/queue.thtml:49
+msgid "editors_notice_filter_session"
+msgstr ""
+"Tyto filtry zůstanou aktivní po celou dobu relace nebo dokud nebudou "
+"vymazány."
+
+#. %1 is the queue mode
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
+msgid "editors_notice_none_found"
+msgstr "V sou�asnosti nejsou k&nbsp;hodnocení dostupné žádné doplňky."
+
+#: controllers/editors_controller.php:261
+msgid "editors_one_day"
+msgstr "1 den"
+
+#: controllers/editors_controller.php:269
+msgid "editors_one_hour"
+msgstr "1 hodina"
+
+#: controllers/editors_controller.php:277
+msgid "editors_one_minute"
+msgstr "1 minuta"
+
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
+msgid "editors_pagetitle"
+msgstr "Ovládací panel redaktora"
+
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
+#, php-format
+msgid "editors_platform_x_only"
+msgstr "pouze %s"
+
+#: controllers/editors_controller.php:304
+msgid "editors_pre-release"
+msgstr "kandidát na vydání"
+
+#. %1 is the app name
+#: views/editors/queue.thtml:78
+#, php-format
+msgid "editors_queue_app_compatibility"
+msgstr "%s kompatibilita"
+
+#: views/editors/queue.thtml:65
+msgid "editors_queue_submit_clean"
+msgstr "Vymazat"
+
+#: views/editors/queue.thtml:65
+msgid "editors_queue_submit_filter"
+msgstr "Filtr"
+
+#: controllers/editors_controller.php:136
+msgid "editors_queues_disabled"
+msgstr ""
+"Všechny fronty hodnocení doplňků jsou v&nbsp;sou�asnosti zakázány. Opakujte "
+"prosím akci později."
+
+#: controllers/editors_controller.php:467
+msgid "editors_review_action"
+msgstr "Akce hodnocení"
+
+#: views/editors/review.thtml:153
+msgid "editors_review_action_info"
+msgstr "Požadovat více informací"
+
+#: views/editors/review.thtml:151
+msgid "editors_review_action_public"
+msgstr "Zveřejnit"
+
+#: views/editors/review.thtml:154
+msgid "editors_review_action_request_superreview"
+msgstr "Požádat o super-hodnocení"
+
+#: views/editors/review.thtml:152
+msgid "editors_review_action_sandbox"
+msgstr "Ponechat na pískovišti"
+
+#: controllers/editors_controller.php:468
+msgid "editors_review_comments"
+msgstr "Komentář hodnocení"
+
+#: views/editors/review.thtml:176
+#, fuzzy
+msgid "editors_review_details_info_request"
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
+
+#: views/editors/review.thtml:168
+msgid "editors_review_details_nominated_public"
+msgstr ""
+"Přesune doplněk, jeho sou�asnou verzi a příslušné soubory mezi veřejné "
+"doplňky. Budoucí verze doplňku budou opět umístěny na pískoviště, dokud "
+"nebudou zhodnoceny redaktorem."
+
+#: views/editors/review.thtml:171
+msgid "editors_review_details_nominated_sandbox"
+msgstr "Ponechá doplněk na pískovišti."
+
+#: views/editors/review.thtml:160
+msgid "editors_review_details_pending_public"
+msgstr ""
+"Schválí verzi doplňku z&nbsp;pískoviště již jednou veřejného doplňku k&nbsp;"
+"zobrazení na stránkách veřejných doplňků."
+
+#: views/editors/review.thtml:163
+msgid "editors_review_details_pending_sandbox"
+msgstr ""
+"Ponechá verzi doplňku z&nbsp;pískoviště již jednou veřejného doplňku na "
+"pískovišti."
+
+#: views/editors/review.thtml:181
+msgid "editors_review_details_superreview"
+msgstr ""
+"Pokud máte jakékoliv pochybnosti ohledně bezpe�nosti doplňku, jeho "
+"autorských práv, �i jakékoliv jiné záležitosti, na které by se správci měli "
+"podívat, vepište níže váš komentář. Tento komentář bude zaslán pouze "
+"správcům, ne autorům."
+
+#: views/editors/review.thtml:128
+msgid "editors_review_file_diff_link"
+msgstr "Porovnat s&nbsp;veřejnou verzí"
+
+#: views/editors/review.thtml:125
+msgid "editors_review_file_viewcontents_link"
+msgstr "Zobrazit obsah"
+
+#: views/editors/review.thtml:59
+msgid "editors_review_header_authors"
+msgstr "Autoři:"
+
+#: views/editors/review.thtml:73
+msgid "editors_review_header_categories"
+msgstr "Kategorie:"
+
+#: views/editors/review.thtml:86
+msgid "editors_review_header_compatibility"
+msgstr "Kompatibilita:"
+
+#: views/editors/review.thtml:247
+msgid "editors_review_header_description"
+msgstr "Popis"
+
+#: views/editors/review.thtml:271
+msgid "editors_review_header_devcomments"
+msgstr "Komentáře vývojářů"
+
+#: views/editors/review.thtml:259
+msgid "editors_review_header_eula"
+msgstr "EULA"
+
+#: views/editors/review.thtml:109
+msgid "editors_review_header_files"
+msgstr "Soubory:"
+
+#: views/editors/review.thtml:280
+msgid "editors_review_header_itemhistory"
+msgstr "Položka historie"
+
+#: views/editors/review.thtml:228
+msgid "editors_review_header_nominationmessage"
+msgstr "Nomina�ní zpráva"
+
+#: views/editors/review.thtml:307
+msgid "editors_review_header_previews"
+msgstr "Náhledy"
+
+#: views/editors/review.thtml:265
+msgid "editors_review_header_privacy"
+msgstr "Zásady ochrany soukromí"
+
+#. %1 is the add-on name and version
+#: views/editors/review.thtml:50
+#, php-format
+msgid "editors_review_header_review"
+msgstr "Hodnocení doplňku %s"
+
+#: views/editors/review.thtml:235
+msgid "editors_review_header_reviewernotes"
+msgstr "Poznámky pro hodnotitele"
+
+#: views/editors/review.thtml:241
+msgid "editors_review_header_summary"
+msgstr "Přehled"
+
+#: views/editors/review.thtml:253
+msgid "editors_review_header_versionnotes"
+msgstr "Poznámky k&nbsp;verzi"
+
+#. a noun: shown in an add-on's editor review history
+#: views/elements/developers/editors_review_history_item.thtml:80
+msgid "editors_review_history_info_reply"
+msgstr "Odpovědět"
+
+#: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
+msgid "editors_review_history_info_request"
+msgstr "Information Request"
+
+#: views/elements/developers/editors_review_history_item.thtml:62
+#: views/editors/reviewlog.thtml:77
+msgid "editors_review_history_nominated_adminreview"
+msgstr "Správce hodnocení"
+
+#: views/elements/developers/editors_review_history_item.thtml:56
+#: views/editors/reviewlog.thtml:71
+msgid "editors_review_history_nominated_approved"
+msgstr "Nominace schválena/veřejné doplňky"
+
+#: views/elements/developers/editors_review_history_item.thtml:59
+#: views/editors/reviewlog.thtml:74
+msgid "editors_review_history_nominated_denied"
+msgstr "Nominace zamítnuta/pískoviště"
+
+#: views/editors/review.thtml:299
+msgid "editors_review_history_nonefound"
+msgstr "Nebyly nalezeny žádné záznamy předchozího hodnocení."
+
+#: views/elements/developers/editors_review_history_item.thtml:73
+#: views/editors/reviewlog.thtml:88
+msgid "editors_review_history_pending_adminreview"
+msgstr "Správce hodnocení"
+
+#: views/elements/developers/editors_review_history_item.thtml:67
+#: views/editors/reviewlog.thtml:82
+msgid "editors_review_history_pending_approved"
+msgstr "Schváleno/veřejné doplňky"
+
+#: views/elements/developers/editors_review_history_item.thtml:70
+#: views/editors/reviewlog.thtml:85
+msgid "editors_review_history_pending_denied"
+msgstr "Zamítnuto/Pískoviště"
+
+#. link text in an add-on's editor review history, allowing to hide and show an information request's replies
+#. %1 is the number of replies
+#: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
+msgid "editors_review_history_show_hide_replies"
+msgid_plural "editors_review_history_show_hide_replies"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
+
+#: views/editors/review.thtml:204
+msgid "editors_review_label_applications"
+msgstr "Aplikace:"
+
+#: views/editors/review.thtml:192
+msgid "editors_review_label_cannedresponse"
+msgstr "nebo zvolte některou z&nbsp;připravených odpovědí:"
+
+#: views/editors/review.thtml:186
+msgid "editors_review_label_comments"
+msgstr "Komentáře:"
+
+#: views/editors/review.thtml:200
+msgid "editors_review_label_operating_systems"
+msgstr "Opera�ní systém:"
+
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
+msgid "editors_review_link_pagetop"
+msgstr "Nahoru"
+
+#: views/editors/review.thtml:45
+msgid "editors_review_next_link"
+msgstr "další &raquo;"
+
+#: views/editors/review.thtml:318
+msgid "editors_review_previews_notfound"
+msgstr "Náhledy nenalezeny."
+
+#: views/editors/review.thtml:44
+msgid "editors_review_previous_link"
+msgstr "&laquo; předchozí"
+
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
+msgid "editors_review_queue_pagetitle"
+msgstr "Fronta hodnocení"
+
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
+#: views/editors/review.thtml:43
+msgid "editors_review_rank_in_queue"
+msgstr "<strong># %1$s</strong> z %2$s ve frontÄ›"
+
+#: views/editors/review.thtml:219
+msgid "editors_review_submit_process_action"
+msgstr "Provést akci"
+
+#: views/editors/review.thtml:289
+msgid "editors_review_th_action"
+msgstr "Akce"
+
+#: views/editors/review.thtml:290
+msgid "editors_review_th_comments"
+msgstr "Komentáře"
+
+#: views/editors/review.thtml:287
+msgid "editors_review_th_date"
+msgstr "Datum"
+
+#: views/editors/review.thtml:288
+msgid "editors_review_th_reviewer"
+msgstr "Hodnotitel"
+
+#: views/editors/review.thtml:286
+msgid "editors_review_th_version_file"
+msgstr "Verze/soubor"
+
+#: views/editors/review.thtml:213
+#, fuzzy
+msgid "editors_review_update_notify_once"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
+
+#: controllers/editors_controller.php:422
+msgid "editors_reviewed_successfully"
+msgstr "Hodnocení úspěšně provedeno."
+
+#: views/editors/reviews_queue.thtml:106
+msgid "editors_reviews_action_delete_review"
+msgstr "Smazat hodnocení"
+
+#: views/editors/reviews_queue.thtml:104
+msgid "editors_reviews_action_keep"
+msgstr "Odstranit ozna�ení a ponechat hodnocení"
+
+#: views/editors/reviews_queue.thtml:102
+msgid "editors_reviews_action_skip"
+msgstr "Přesko�it"
+
+#: views/editors/reviews_queue.thtml:100
+msgid "editors_reviews_header_action"
+msgstr "Akce"
+
+#: views/editors/reviews_queue.thtml:67
+msgid "editors_reviews_in_reply_to"
+msgstr "V odpovědi uživatele:"
+
+#: controllers/editors_controller.php:591
+msgid "editors_reviews_processed"
+msgstr "Hodnocení úspěšně provedeny!"
+
+#: views/editors/reviews_queue.thtml:117
+msgid "editors_reviews_queue_empty"
+msgstr "V sou�asnosti nejsou žádné požadavky na hodnocení."
+
+#: views/editors/reviews_queue.thtml:111
+msgid "editors_reviews_submit_process_reviews"
+msgstr "Provést hodnocení"
+
+#: controllers/editors_controller.php:300
+msgid "editors_site_specific"
+msgstr "Pro specifický server"
+
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nový doplněk"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Aktualizace"
+
+#: controllers/editors_controller.php:470
+msgid "editors_tested_app"
+msgstr "Testovaná aplikace"
+
+#: controllers/editors_controller.php:469
+msgid "editors_tested_os"
+msgstr "Testovaný opera�ní systém"
+
+#: views/editors/queue.thtml:82
+msgid "editors_th_additional_info"
+msgstr "Doplňující informace"
+
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
+#: views/admin/flagged_queue.thtml:53
+msgid "editors_th_addon"
+msgstr "Doplněk"
+
+#: views/editors/queue.thtml:74
+msgid "editors_th_addontype"
+msgstr "Typ"
+
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Typy doplňků"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Stáří"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplikace"
+
+#: views/editors/featured.thtml:64
+msgid "editors_th_locales"
+msgstr "Omezit na lokalizace?"
+
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforma"
+
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Typy nahrání"
+
+#. %s is a number
+#: controllers/editors_controller.php:257
+#, php-format
+msgid "editors_x_days"
+msgstr "%s dní"
+
+#. %s is a number
+#: controllers/editors_controller.php:265
+#, php-format
+msgid "editors_x_hours"
+msgstr "%s hodin"
+
+#. %s is a number
+#: controllers/editors_controller.php:273
+#, php-format
+msgid "editors_x_minutes"
+msgstr "%s minut"
+
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
+#: controllers/components/simple_acl.php:82
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
+#: controllers/reviews_controller.php:353
+#: controllers/reviews_controller.php:485
+msgid "error_access_denied"
+msgstr "Přístup zamítnout"
+
+#: views/errors/error401.thtml:52
+msgid "error_access_denied_message"
+msgstr "K zobrazení požadované stránky nemáte dostate�né oprávnění."
+
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
+#: controllers/previews_controller.php:115
+#: controllers/previews_controller.php:206
+#: controllers/previews_controller.php:307
+#: controllers/reviews_controller.php:77
+#: controllers/reviews_controller.php:240
+#: controllers/reviews_controller.php:332
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
+msgid "error_addon_notfound"
+msgstr "Doplněk nenalezen!"
+
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
+msgid "error_addon_notviewable"
+msgstr "Tento doplněk zde nelze zobrazit."
+
+#: controllers/reviews_controller.php:246
+msgid "error_addon_selfreview"
+msgstr "Nelze hodnotit svůj vlastní doplněk."
+
+#: controllers/addons_controller.php:726
+msgid "error_browse_no_addons"
+msgstr "V této kategorii nejsou žádné doplňky."
+
+#: controllers/api_controller.php:424
+msgid "error_collection_feed_notfound"
+msgstr ""
+
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
+msgid "error_email_invalid"
+msgstr "Tato e-mailová adresa není platná."
+
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
+msgid "error_field_required"
+msgstr "Tato položka nesmí být prázdná."
+
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
+msgid "error_file_notfound"
+msgstr "Soubor nebyl nalezen!"
+
+#. %s is a filename
+#: controllers/editors_controller.php:546
+#, php-format
+msgid "error_file_x_notfound"
+msgstr "Chyba souboru: %s neexistuje."
+
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
+msgid "error_formerrors"
+msgstr ""
+"Tento formulář obsahuje chyby. Opravte je prosím a formulář znovu odešlete."
+
+#: views/users/register.thtml:104
+msgid "error_invalid_captcha"
+msgstr "Neplatný ověřovací kód. Zkuste to prosím znovu!"
+
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
+msgid "error_invalid_url"
+msgstr ""
+"Tato adresa nemá platný formát. Platné adresy mají tvar http://moje.domena."
+"cz/moje-stranka/."
+
+#. %s is a string representing what's missing.  Example:  file_id
+#: controllers/downloads_controller.php:65
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
+#: controllers/reviews_controller.php:71
+#: controllers/reviews_controller.php:234
+#: controllers/reviews_controller.php:325
+#: controllers/reviews_controller.php:473
+#: controllers/reviews_controller.php:475
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
+#, php-format
+msgid "error_missing_argument"
+msgstr "Chybějící argument: %s"
+
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
+msgid "error_no_files_in_addon"
+msgstr "Soubory nenalezeny"
+
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Poznámka"
+
+#: controllers/previews_controller.php:200
+msgid "error_preview_notfound"
+msgstr "Náhled nebyl nalezen!"
+
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
+msgid "error_review_rating_required"
+msgstr "Musíte zvolit hodnocení."
+
+#: controllers/users_controller.php:160
+msgid "error_user_already_confirmed"
+msgstr "Tento uživatelský dokument je již aktivován."
+
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
+msgid "error_user_badconfirmationcode"
+msgstr "Špatný aktiva�ní kód!"
+
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
+msgid "error_user_confirmpw_nomatch"
+msgstr "Hesla nesouhlasí."
+
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
+msgid "error_user_email_notunique"
+msgstr "Tuto e-mailovou adresu již používá jiný uživatel."
+
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
+msgid "error_user_emailchange_expired"
+msgstr ""
+"Platnost tohoto potvrzení vypršela. Ve svém profilu si prosím opět změňte "
+"svůj e-mail. Ihned po obdržení potvrzovacího e-mailu, klepněte na zaslaný "
+"odkaz."
+
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
+msgid "error_user_nickname_notunique"
+msgstr "Tuto přezdívku používá již jiný uživatel."
+
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
+msgid "error_user_notfound"
+msgstr "Uživatel nenalezen!"
+
+#: views/users/activatefirst.thtml:47
+msgid "error_user_unconfirmed"
+msgstr ""
+"Nejprve prosím aktivujte svůj uživatelský ú�et pomocí kódu, který jste "
+"obdrželi v&nbsp;e-mailu."
+
+#: views/users/login.thtml:68
+msgid "error_username_or_pw_wrong"
+msgstr "Chybné uživatelské jméno a nebo heslo!"
+
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
+msgid "error_version_notfound"
+msgstr "Verze nenalezena!"
+
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
+msgid "error_wrong_password"
+msgstr "Vloženo chybné heslo!"
+
+#: views/elements/feature.thtml:129
+msgid "feature_learnmore"
+msgstr "Více informací"
+
+#. %1 is the add-on name
+#: views/elements/feature.thtml:130
+#, php-format
+msgid "feature_learnmore_about_addon"
+msgstr "Více informací o doplňku %1$s"
+
+#. %1$s is a number
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
+#, php-format
+msgid "feature_reviews"
+msgid_plural "feature_reviews"
+msgstr[0] "%1$s hodnocení"
+msgstr[1] "%1$s hodnocení"
+msgstr[2] "%1$s hodnocení"
+
+#: views/elements/feature.thtml:134
+msgid "feature_view_more_from_category"
+msgstr "Zobrazit více z&nbsp;kategorie"
+
+#. This appears on a page that views the source of an add-on.  This link will return
+#. the user to the add-on's main page
+#: views/files/browse.thtml:65
+msgid "file_browser_link_addon"
+msgstr "Zpět na stránku doplňku"
+
+#. There is a list of directories and files on the page.  Clicking this will show the
+#. contents of all the directories (normally you would click on each one to see the
+#. contents)
+#: views/files/browse.thtml:67
+msgid "file_browser_link_expand_all"
+msgstr "Rozbalit vše"
+
+#. This appears on a page that views the source of an add-on.  This link will return
+#. the user to the add-on's review page (it only appears if the add-on is being
+#. reviewed)
+#: views/files/browse.thtml:64
+msgid "file_browser_link_review"
+msgstr "Zpět na stránku hodnocení"
+
+#. The title of the page for viewing an add-on's source.
+#. %1$s is the name of the add-on
+#. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
+#: views/files/browse.thtml:46
+msgid "file_browser_title"
+msgstr "%1$s :: Prohlíže� souborů :: Doplňky aplikace %2$s"
+
+#. This appears on a page that views the source of an add-on.  There is a list of
+#. directories and files on the page.  Clicking this link will toggle between an
+#. expanded or a collapsed list.  This string should be kept short.
+#: views/files/browse.thtml:68
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
+#. Link text for the AMO About page.
+#: views/elements/footer.thtml:72
+#, fuzzy
+msgid "footer_a_about"
+msgstr "About"
+
+#. Link text to the AMO blog.
+#: views/elements/footer.thtml:74
+#, fuzzy
+msgid "footer_a_blog"
+msgstr "Blog"
+
+#. Link text to the Frequently Asked Questions page.
+#: views/elements/footer.thtml:73
+#, fuzzy
+msgid "footer_a_faq"
+msgstr "FAQ"
+
+#. Full text for the FAQ abbreviation.
+#: views/elements/footer.thtml:73
+#, fuzzy
+msgid "footer_abbr_faq"
+msgstr "Frequently Asked Questions"
+
+#: views/elements/footer.thtml:67
+msgid "footer_all_rights_reserved"
+msgstr "Všechna práva vyhrazena."
+
+#: views/elements/footer.thtml:67
+msgid "footer_copyright"
+msgstr "Copyright"
+
+#: views/elements/footer.thtml:71
+msgid "footer_credits"
+msgstr "Autoři"
+
+#: views/elements/footer.thtml:76
+msgid "footer_disclaimer"
+msgstr ""
+"Mozilla poskytuje rozcestník na tyto aplikace v&nbsp;dobré vůli. Nezastupuje "
+"autory těchto aplikací ani neposkytuje žádné informace, které se jich "
+"týkají. Jakékoliv dotazy, stížnosti, �i požadavky týkající se těchto "
+"aplikací musí být adresovány příslušným poskytovatelům daného software."
+
+#: views/elements/footer.thtml:61
+msgid "footer_lang_form_lang_submit_go"
+msgstr "Přejít"
+
+#: views/elements/footer.thtml:70
+msgid "footer_legal_notices"
+msgstr "Zákonná omezení"
+
+#: views/elements/footer.thtml:50
+msgid "footer_other_languages"
+msgstr "Další jazyky:"
+
+#: views/elements/footer.thtml:69
+msgid "footer_privacy_policy"
+msgstr "Zásady ochrany soukromí"
+
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Uložit"
+
+#: models/addontype.php:89
+msgid "general_addontype_dict"
+msgstr "Slovník"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:110
+msgid "general_addontype_dict_plural"
+msgstr "Slovníky"
+
+#: models/addontype.php:85
+msgid "general_addontype_extension"
+msgstr "Rozšíření"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:108
+msgid "general_addontype_extension_plural"
+msgstr "Rozšíření"
+
+#: models/addontype.php:95
+msgid "general_addontype_lpaddon"
+msgstr "Jazykový balí�ek (doplněk)"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:113
+msgid "general_addontype_lpaddon_plural"
+msgstr "Jazykové balí�ky (doplněk)"
+
+#: models/addontype.php:93
+msgid "general_addontype_lpapp"
+msgstr "Jazykový balí�ek (aplikace)"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:112
+msgid "general_addontype_lpapp_plural"
+msgstr "Jazykové balí�ky (aplikace)"
+
+#: models/addontype.php:97
+msgid "general_addontype_plugin"
+msgstr "Zásuvný modul"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:114
+msgid "general_addontype_plugin_plural"
+msgstr "Zásuvné moduly"
+
+#: models/addontype.php:91
+msgid "general_addontype_search"
+msgstr "Vyhledávací modul"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:111
+msgid "general_addontype_search_plural"
+msgstr "Vyhledávací moduly"
+
+#: models/addontype.php:87
+msgid "general_addontype_theme"
+msgstr "Motiv vzhledu"
+
+#. Plural in this context means many of the add-on type
+#: models/addontype.php:109
+msgid "general_addontype_theme_plural"
+msgstr "Motivy vzhledu"
+
+#. %1$s is the application name.  Example:  Firefox
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
+#, php-format
+msgid "header_home_tooltip"
+msgstr "Návrat na úvodní stránku doplňků aplikace %1$s"
+
+#: views/elements/header.thtml:87
+msgid "header_main_firefox_header"
+msgstr "Doplňky Firefoxu"
+
+#: views/elements/header.thtml:99
+msgid "header_main_header"
+msgstr "Doplňky"
+
+#: views/elements/header.thtml:90
+msgid "header_main_seamonkey_header"
+msgstr "Doplňky Seamonkey"
+
+#: views/elements/header.thtml:93
+msgid "header_main_sunbird_header"
+msgstr "Doplňky Sunbirdu"
+
+#: views/elements/header.thtml:96
+msgid "header_main_thunderbird_header"
+msgstr "Doplňky Thunderbirdu"
+
+#: views/elements/header.thtml:62
+msgid "header_navlink_addons"
+msgstr "Doplňky"
+
+#: views/elements/developers/sidebar.thtml:72
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
+msgid "header_navlink_login"
+msgstr "Přihlášení"
+
+#: views/elements/header.thtml:156
+msgid "header_navlink_logout"
+msgstr "Odhlášení"
+
+#: views/elements/header.thtml:145
+msgid "header_navlink_myaccount"
+msgstr "Můj ú�et"
+
+#: views/elements/header.thtml:158
+msgid "header_navlink_register"
+msgstr "Registrace"
+
+#. %s is the add-on name
+#: views/elements/collections_interactive_addon.thtml:62
+#: views/elements/fyf_promotion.thtml:46
+#: views/elements/addon_discussionheader.thtml:62
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
+#, php-format
+msgid "img_preview_of"
+msgstr "Náhledy doplňku %s"
+
+#. %1 is the login URL for the link tag
+#. %2 is the link to an explanatory page.
+#: views/elements/install.thtml:229
+msgid "install_a_login_to_install"
+msgstr "Pro instalaci tohoto doplňku se musíte <a href=\"%1$s\">přihlásit</a>."
+
+#. %1$s is the application name.  Example:  Firefox
+#. %2$s is an optional string used to specify a platform.  Example:  (Windows)
+#: views/elements/install.thtml:71
+#, php-format
+msgid "install_button_text"
+msgstr "Přidat do aplikace %s %s"
+
+#. %1 is the add-on name, %2 is the app name
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
+#, php-format
+msgid "install_button_title"
+msgstr "Přidá doplněk %1$s do aplikace %2$s"
+
+#. %1$s is the add-on name
+#: views/elements/install.thtml:158
+#, php-format
+msgid "install_download"
+msgstr "Stáhnout doplněk %1$s"
+
+#: views/elements/install.thtml:90
+msgid "install_error_addon_not_found"
+msgstr "Tento doplněk není dostupný."
+
+#: views/addons/dictionaries.thtml:61
+msgid "langtools_a11y_tablesummary"
+msgstr "Přehled slovníků a jazykových balí�ků."
+
+#: views/addons/dictionaries.thtml:47
+msgid "langtools_download_dictionary"
+msgstr "Stáhnout slovník"
+
+#: views/addons/dictionaries.thtml:48
+msgid "langtools_download_langpack"
+msgstr "Stáhnout jazykový balí�ek"
+
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
+msgid "langtools_header_dicts_and_langpacks"
+msgstr "Slovníky a jazykové balí�ky"
+
+#: views/addons/dictionaries.thtml:44
+msgid "langtools_install_dictionary"
+msgstr "Instalovat slovník"
+
+#: views/addons/dictionaries.thtml:45
+msgid "langtools_install_langpack"
+msgstr "Instalovat jazykový balí�ek"
+
+#: views/addons/dictionaries.thtml:65
+msgid "langtools_tableheader_dictionary"
+msgstr "Slovníky"
+
+#: views/addons/dictionaries.thtml:66
+msgid "langtools_tableheader_langpack"
+msgstr "Jazykový balí�ek"
+
+#: views/addons/dictionaries.thtml:64
+msgid "langtools_tableheader_language"
+msgstr "Jazyk"
+
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
+msgid "link_return_to_front_page"
+msgstr "Klepnutím zde se vrátíte na úvodní stránku."
+
+#: views/elements/addon_list_options.thtml:46
+msgid "list_sortby_date"
+msgstr "Datum"
+
+#: views/elements/addon_list_options.thtml:47
+msgid "list_sortby_downloads"
+msgstr "Stažení"
+
+#: views/elements/addon_list_options.thtml:45
+msgid "list_sortby_name"
+msgstr "Jméno"
+
+#: views/elements/addon_list_options.thtml:48
+msgid "list_sortby_rating"
+msgstr "Hodnocení"
+
+#: config/bootstrap.php:278
+msgid "main_prettyname_fennec"
+msgstr "Fennec"
+
+#: config/bootstrap.php:274
+msgid "main_prettyname_firefox"
+msgstr "Firefox"
+
+#: config/bootstrap.php:277
+msgid "main_prettyname_seamonkey"
+msgstr "SeaMonkey"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
+#: config/bootstrap.php:275
+msgid "main_prettyname_thunderbird"
+msgstr "Thunderbird"
+
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
+msgid "nav_category_dicts_langpacks"
+msgstr "Slovníky a jazykové balí�ky"
+
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Zásuvné moduly"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
+msgid "nav_category_themes"
+msgstr "Motivy vzhledu"
+
+#: views/elements/app_chooser.thtml:47
+msgid "other_apps_tooltip"
+msgstr "Zobrazí doplňky pro ostatní aplikace"
+
+#. In a user list: user 1, user 2, "others"
+#: views/helpers/addons_html.php:214
+msgid "other_users"
+msgstr "další"
+
+#: controllers/pages_controller.php:90
+msgid "page_title_appversions"
+msgstr "Verze aplikace"
+
+#: controllers/pages_controller.php:92
+msgid "page_title_credits"
+msgstr "Autoři"
+
+msgid "page_title_experimental_addons"
+msgstr "Experimentální doplňky"
+
+#: controllers/pages_controller.php:111
+msgid "page_title_faq"
+msgstr "Často kladené otázky"
+
+#: controllers/pages_controller.php:94
+msgid "page_title_fashionyourfirefox_faq"
+msgstr "Vytvořte si své Firefox FAQ"
+
+#: controllers/pages_controller.php:101
+msgid "page_title_policy"
+msgstr "Zásady doplňků"
+
+#: controllers/pages_controller.php:103
+msgid "page_title_privacy"
+msgstr "Zásady ochrany soukromí Mozilly"
+
+#: controllers/pages_controller.php:105
+msgid "page_title_review_guide"
+msgstr "Příru�ka hodnotitele"
+
+#: controllers/pages_controller.php:107
+msgid "page_title_sandbox"
+msgstr "Systém pískoviště"
+
+#: controllers/pages_controller.php:109
+msgid "page_title_submissionhelp"
+msgstr "Nápověda k odeslání"
+
+#: views/pages/appversions.thtml:86
+msgid "pages_appversions_guid"
+msgstr "GUID"
+
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
+msgid "pages_appversions_header"
+msgstr "Platné verze aplikace"
+
+#: views/pages/appversions.thtml:79
+msgid "pages_appversions_intro"
+msgstr ""
+"Všechny doplňky serveru doplňky Mozilly musí obsahovat soubor install.rdf "
+"obsahující alespoň jednu níže podporovanou aplikaci. Pro tyto aplikace jsou "
+"pak podporovány pouze verze uvedené níže."
+
+#. %s is a full <a> tag
+#: views/pages/appversions.thtml:92
+#, php-format
+msgid "pages_appversions_required_files"
+msgstr ""
+"Soubor install.rdf s&nbsp;požadovanými vlastnostmi, které jsou specifikovány "
+"%s, je do doplňku nutné zahrnout i v&nbsp;případě, že vámi podporovaná "
+"aplikace tento soubor nevyžaduje."
+
+#. this is the text inside of an <a> tag for pages_appversions_required_files.  This
+#. should be fixed.
+#: views/pages/appversions.thtml:92
+msgid "pages_appversions_required_files_link"
+msgstr "zde"
+
+#: views/pages/appversions.thtml:87
+msgid "pages_appversions_versions"
+msgstr "Verze"
+
+msgid "pages_experimental_addons_backbutton"
+msgstr "Zpět na předchozí stránku"
+
+#: views/pages/policy.thtml:50
+msgid "pages_policy_sandbox_link"
+msgstr "Informa�ní stránka pískoviště"
+
+#: views/elements/pagination.thtml:53
+msgid "pagination_next_page"
+msgstr "následující"
+
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Toto je stránka %1$s z&nbsp;%2$s"
+
+#: views/elements/pagination.thtml:52
+msgid "pagination_previous_page"
+msgstr "předchozí"
+
+#: views/elements/recaptcha.thtml:65
+msgid "recaptcha_enter_both_words"
+msgstr "Vložte prosím níže <strong>obě slova oddělená mezerou</strong>."
+
+#: views/elements/recaptcha.thtml:83
+msgid "recaptcha_enter_here"
+msgstr "Zde vložte odpově�"
+
+#: views/elements/recaptcha.thtml:74
+msgid "recaptcha_enter_whatyouhear"
+msgstr "Vložte prosím, co jste slyšeli."
+
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to a text captcha
+#: views/elements/recaptcha.thtml:77
+#, fuzzy
+msgid "recaptcha_hardtohear_text"
+msgstr ""
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
+
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to an audio captcha
+#: views/elements/recaptcha.thtml:68
+#, fuzzy
+msgid "recaptcha_hardtoread_text"
+msgstr ""
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
+
+#: views/users/register.thtml:100
+msgid "recaptcha_label"
+msgstr "Jste �lověk?"
+
+#: views/users/register.thtml:101
+msgid "recaptcha_whatsthis"
+msgstr "Copak je to?"
+
+#: controllers/reviews_controller.php:561
+msgid "review_flag_error"
+msgstr "Chyba při ozna�ení hodnocení!"
+
+#: models/reviews_moderation_flag.php:69
+msgid "review_flag_reason_bug_support"
+msgstr "Nevhodné hlášení chyby nebo žádost o podporu"
+
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
+msgid "review_flag_reason_instructions"
+msgstr "Nahlásit toto hodnocení (zvolte důvod)"
+
+#: models/reviews_moderation_flag.php:67
+msgid "review_flag_reason_language"
+msgstr "Nevhodný jazyk/chování"
+
+#: models/reviews_moderation_flag.php:71
+msgid "review_flag_reason_other"
+msgstr "Jiné (prosím konkretizujte)"
+
+#: models/reviews_moderation_flag.php:65
+msgid "review_flag_reason_spam"
+msgstr "Nevyžádaný příspěvek �i obsah nesouvisící s hodnocením"
+
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
+msgid "review_flag_success"
+msgstr "Děkujeme. Hodnocení bude zkontrolována redaktorem."
+
+#: views/reviews/display.thtml:41
+msgid "review_flag_this"
+msgstr "Nahlásit hodnocení"
+
+#: views/reviews/display.thtml:42
+msgid "review_flag_this_titletip"
+msgstr ""
+"Je toto hodnocení nevhodné, chybné �i se jedná o nevyžádanou zprávu? "
+"Klepněte zde a ozna�te ji, abyji zkontroloval redaktor."
+
+#. %1 is the URL of the support section, %2 for the review guidelines
+#: views/reviews/add.thtml:48
+msgid "review_guidelines_short"
+msgstr ""
+"<p>Pře�těte si prosím následující tipy:</p><ul><li>Pište, jako byste se "
+"ptali přítele na jeho zkušenost s&nbsp;doplňkem. Poskytujte detailní a "
+"užite�né informace, jako jsou vlastnosti, které máte �i nemáte rádi, jak "
+"snadno se vám doplněk používá a popis nedostatků, které má. Vyvarujte se "
+"obecných hlášek typu \"Skvělé\" �i \"Špatné\" bez toho, abyste sdělili "
+"důvod, pro� tomu tak je.</li><li>Nepřidávejte prosím do hodnocení příspěvky "
+"s&nbsp;hlášením chyb. Vaše e-mailová adresa není viditelná ani vývojářům "
+"doplňků, kteří vás mohou chtít kontaktovat pro vyřešení vašeho problému. "
+"Podívejte se do <a href=\"%1$s\">sekce podpory</a>, kde naleznete, jak se "
+"vám může dostat podpory pro konkrétní doplněk.</li><li>Hodnocení pište "
+"prosím �istě, vyhýbejte se neslušným výrazům a nezadávejte do nich žádné "
+"osobní informace.</li></ul><p>Pře�těte si prosím <a href=\"%2$s\">pravidla "
+"pro přidávání hodnocení</a>, kde naleznete více informaci o tom, jak psát "
+"hodnocení.</p>"
+
+#. %1 is the add-on name
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
+#, php-format
+msgid "reviews_header"
+msgstr "Hodnocení doplňku %s"
+
+#: controllers/addons_controller.php:363
+msgid "rss_featuredaddons"
+msgstr "Zajímavé doplňky"
+
+#: controllers/addons_controller.php:361
+msgid "rss_newestaddons"
+msgstr "Nejnovější doplňky"
+
+#: controllers/addons_controller.php:362
+msgid "rss_updatedaddons"
+msgstr "Aktualizované doplňky"
+
+#: controllers/search_controller.php:99
+msgid "search_disabled"
+msgstr "Hledání je nyní zakázáno. Prosím zkuste to znovu později."
+
+#: views/elements/search.thtml:186
+msgid "search_form_all_addons"
+msgstr "všechny doplňky"
+
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
+msgid "search_form_default_text"
+msgstr "hledat doplňky"
+
+#: views/elements/search.thtml:201
+msgid "search_form_submit_tooltip"
+msgstr "Vyhledá doplňky"
+
+#: views/elements/search.thtml:182
+msgid "search_form_tooltip"
+msgstr "Klepněte a zadejte název hledaného doplňku"
+
+#: views/elements/search.thtml:184
+msgid "search_form_within"
+msgstr "v kategorii"
+
+#: views/addons/searchengines.thtml:124
+msgid "search_landing_all_search_engines"
+msgstr "Vyhledávací moduly"
+
+#: views/addons/searchengines.thtml:120
+msgid "search_landing_browse_search_engines"
+msgstr "Vyhledávací moduly dle typu"
+
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s odpovídající doplněk"
+msgstr[1] "%s odpovídající doplňky"
+msgstr[2] "%s odpovídajících doplňků"
+
+#: views/search/index.thtml:49
+msgid "search_nothing_found"
+msgstr "Nic nebylo nalezeno."
+
+#: controllers/search_controller.php:178
+msgid "search_pagetitle"
+msgstr "Vyhledávání doplňků"
+
+#: controllers/search_controller.php:235
+msgid "search_rss_description"
+msgstr "Kanál s&nbsp;výsledky hledání"
+
+#. %s is the terms the user is searching for (a string)
+#: controllers/search_controller.php:234
+#, php-format
+msgid "search_rss_results_for"
+msgstr "Výsledky hledání pro: %s"
+
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
+msgid "sidebar_navlink_admin_tools"
+msgstr "Nástroje správce"
+
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
+msgid "sidebar_navlink_developer_tools"
+msgstr "Nástroje vývojáře"
+
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
+msgid "sidebar_navlink_editor_tools"
+msgstr "Nástroje redaktora"
+
+#: views/addons/home.thtml:162
+msgid "sidebar_navlink_welcome"
+msgstr "Vítejte"
+
+#. %s is the user's name
+#: views/addons/home.thtml:162
+#, php-format
+msgid "sidebar_navlink_welcome_name"
+msgstr "Vítejte uživateli %s"
+
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
+msgid "sidebar_pitch_dictionary"
+msgstr "Slovník"
+
+#: views/elements/pitch.thtml:73
+msgid "sidebar_pitch_featured_addons"
+msgstr "Doporu�ované doplňky"
+
+#: views/elements/pitch.thtml:61
+msgid "sidebar_pitch_looking_for"
+msgstr "Hledám:"
+
+#: views/elements/pitch.thtml:71
+msgid "sidebar_pitch_newest_addons"
+msgstr "Nejnovější doplňky"
+
+#: views/elements/pitch.thtml:49
+msgid "sidebar_pitch_search"
+msgstr "Vyhledávací modul"
+
+#: views/elements/pitch.thtml:70
+msgid "sidebar_pitch_subscribe_to"
+msgstr "Odebírat"
+
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
+msgid "sidebar_pitch_theme"
+msgstr "Motiv vzhledu"
+
+#: views/elements/pitch.thtml:72
+msgid "sidebar_pitch_updated_addons"
+msgstr "Aktualizované doplňky"
+
+#. %1$s is a number
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
+#, php-format
+msgid "size_kb"
+msgstr "%1$s KB"
+
+#: views/elements/stars.thtml:63
+msgid "stars_not_yet_rated"
+msgstr "Nehodnoceno"
+
+#. %1 is the number of stars this add-on has
+#: views/elements/stars.thtml:54
+#, php-format
+msgid "stars_rated_x_outof_5"
+msgstr "Hodnoceno %s z&nbsp;5 hvězdi�ek"
+
+#: views/statistics/addon.thtml:59
+msgid "statistics_addon_dashboard_link"
+msgstr "Stránka statistik"
+
+#: views/statistics/addon.thtml:58
+msgid "statistics_addon_developertools_link"
+msgstr "Nástroje vývojáře"
+
+#: views/statistics/addon.thtml:53
+msgid "statistics_addon_switch"
+msgstr "Přepnout doplněk"
+
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
+msgid "statistics_date_shortmonth"
+msgstr "%e. %b."
+
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
+msgid "statistics_date_shortmonthwithyear"
+msgstr "%e. %b. %Y"
+
+#. This is a date format.
+#. http://php.net/strftime
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
+msgid "statistics_date_weekdayshortmonth"
+msgstr "%A %e. %b."
+
+#. %1$s is an add-on name and version.  Example:  Add-on 3.5
+#: controllers/components/stats.php:517
+#, php-format
+msgid "statistics_events_addon_created"
+msgstr "Doplněk %1$s vytvořen"
+
+#. %1$s is an application name and version.  Example:  Firefox 3.5
+#: controllers/components/stats.php:498
+#, php-format
+msgid "statistics_events_app_released"
+msgstr "Aplikace %1$s vydána"
+
+#: views/statistics/addon.thtml:71
+msgid "statistics_help_close_link"
+msgstr "Zavřít"
+
+#: views/statistics/addon.thtml:60
+msgid "statistics_help_link"
+msgstr "Nápověda"
+
+#: views/statistics/index.thtml:57
+msgid "statistics_index_anotheraddon"
+msgstr " a nebo zvolte jiný doplněk"
+
+#: views/statistics/index.thtml:59
+msgid "statistics_index_anotheraddon_public"
+msgstr " a nebo zvolte jiný doplněk s&nbsp;veřejnými statistikami"
+
+#: views/statistics/index.thtml:45
+msgid "statistics_index_myaddons"
+msgstr "Pro zobrazení statistik zvolte některý ze&nbsp;svých doplňků"
+
+#: views/statistics/index.thtml:63
+msgid "statistics_index_selectaddon"
+msgstr "Pro zobrazení statistik zvolte některý z&nbsp;doplňků"
+
+#: views/statistics/index.thtml:65
+msgid "statistics_index_selectaddon_public"
+msgstr "Zvolte doplněk z&nbsp;veřejnými statistikami"
+
+#: views/statistics/index.thtml:43
+msgid "statistics_index_title"
+msgstr "Stránka statistik"
+
+#: views/statistics/index.thtml:71
+msgid "statistics_index_view_button"
+msgstr "Zobrazit statistiky"
+
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
+msgid "statistics_js_download_csv"
+msgstr "Zobrazit tuto tabulku ve formátu CSV"
+
+#: controllers/statistics_controller.php:222
+msgid "statistics_js_dropdowns_none"
+msgstr "žádný"
+
+#: controllers/statistics_controller.php:221
+msgid "statistics_js_dropdowns_removeplot"
+msgstr "Odstranit diagram"
+
+#: controllers/statistics_controller.php:224
+msgid "statistics_js_groupby_selector_date"
+msgstr "Seskupit podle dne"
+
+#: controllers/statistics_controller.php:227
+msgid "statistics_js_groupby_selector_month"
+msgstr "Seskupit podle měsíce"
+
+#: controllers/statistics_controller.php:225
+msgid "statistics_js_groupby_selector_week"
+msgstr "Seskupit podle týdnek"
+
+#: controllers/statistics_controller.php:226
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Porovnat podle týdne"
+
+#: controllers/statistics_controller.php:236
+msgid "statistics_js_plotselection_foundinrange"
+msgstr "%s nalezen v&nbsp;rozsahu"
+
+#: controllers/statistics_controller.php:246
+msgid "statistics_js_plotselection_options_addplot_name"
+msgstr "Přidat diagram"
+
+#: controllers/statistics_controller.php:247
+msgid "statistics_js_plotselection_options_addplot_tooltip"
+msgstr "Přidá další diagram do tohoto grafu"
+
+#: controllers/statistics_controller.php:237
+msgid "statistics_js_plotselection_options_count_name_checked"
+msgstr "Skrýt celkový po�et"
+
+#: controllers/statistics_controller.php:238
+msgid "statistics_js_plotselection_options_count_name_unchecked"
+msgstr "Zobrazit celkový po�et"
+
+#: controllers/statistics_controller.php:239
+msgid "statistics_js_plotselection_options_count_tooltip"
+msgstr "Vykreslí na tento graf celkový po�et"
+
+#: controllers/statistics_controller.php:251
+msgid "statistics_js_plotselection_options_csv_name"
+msgstr "Zobrazit data (CSV)"
+
+#: controllers/statistics_controller.php:252
+msgid "statistics_js_plotselection_options_csv_tooltip"
+msgstr "Zobrazí �árkou oddělené hodnoty pro tyto data"
+
+#: controllers/statistics_controller.php:243
+msgid "statistics_js_plotselection_options_events_addon_name_checked"
+msgstr "Skrýt události doplňku %s"
+
+#: controllers/statistics_controller.php:244
+msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
+msgstr "Zobrazit události doplňku %s"
+
+#: controllers/statistics_controller.php:245
+msgid "statistics_js_plotselection_options_events_addon_tooltip"
+msgstr "Vyzna�í do diagramu datumy vydání doplňku"
+
+#: controllers/statistics_controller.php:240
+msgid "statistics_js_plotselection_options_events_firefox_name_checked"
+msgstr "Skrýt události Firefoxu"
+
+#: controllers/statistics_controller.php:241
+msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
+msgstr "Zobrazit události Firefoxu"
+
+#: controllers/statistics_controller.php:242
+msgid "statistics_js_plotselection_options_events_firefox_tooltip"
+msgstr "Vyzna�í do diagramu datumy vydání Firefoxu"
+
+#: controllers/statistics_controller.php:248
+msgid "statistics_js_plotselection_options_resize_name_checked"
+msgstr "Zmenšit graf"
+
+#: controllers/statistics_controller.php:249
+msgid "statistics_js_plotselection_options_resize_name_unchecked"
+msgstr "Zvětšit graf"
+
+#: controllers/statistics_controller.php:250
+msgid "statistics_js_plotselection_options_resize_tooltip"
+msgstr "Změní velikost grafu"
+
+#: controllers/statistics_controller.php:230
+msgid "statistics_js_plotselection_selector_adu"
+msgstr "Aktivní uživaté za den"
+
+#: controllers/statistics_controller.php:232
+msgid "statistics_js_plotselection_selector_application"
+msgstr "Aplikace"
+
+#: controllers/statistics_controller.php:235
+msgid "statistics_js_plotselection_selector_custom"
+msgstr "Vlastní"
+
+#: controllers/statistics_controller.php:229
+msgid "statistics_js_plotselection_selector_downloads"
+msgstr "Stažení"
+
+#: controllers/statistics_controller.php:234
+msgid "statistics_js_plotselection_selector_os"
+msgstr "Opera�ní systém"
+
+#: controllers/statistics_controller.php:233
+msgid "statistics_js_plotselection_selector_status"
+msgstr "Stav doplňku"
+
+#: controllers/statistics_controller.php:228
+msgid "statistics_js_plotselection_selector_summary"
+msgstr "Celkový přehled"
+
+#: controllers/statistics_controller.php:231
+msgid "statistics_js_plotselection_selector_version"
+msgstr "Verze doplňku"
+
+#: controllers/components/stats.php:396
+msgid "statistics_longnames_application"
+msgstr "Aplikace"
+
+#: controllers/components/stats.php:398
+msgid "statistics_longnames_os"
+msgstr "Opera�ní systém"
+
+#: controllers/components/stats.php:397
+msgid "statistics_longnames_status"
+msgstr "Stav doplňku"
+
+#: controllers/components/stats.php:399
+msgid "statistics_longnames_unknown"
+msgstr "Neznámý"
+
+#: controllers/components/stats.php:395
+msgid "statistics_longnames_version"
+msgstr "Verze doplňku"
+
+#: views/statistics/addon.thtml:118
+msgid "statistics_notice_data_insufficient"
+msgstr ""
+"Pro zobrazení tohoto grafu stále není dostatek dat. Zkuste to prosím později."
+
+#: views/statistics/addon.thtml:130
+msgid "statistics_notice_data_none"
+msgstr ""
+"Pro zobrazení grafu toho doplňku nejsou žádná data. Zkuste to prosím za pár "
+"dní."
+
+#: views/statistics/addon.thtml:41
+msgid "statistics_notice_data_updating"
+msgstr ""
+"Statistiky doplňku jsou nyní aktualizovány. Zobrazovaná data můžou být proto "
+"nekompletní. Zkuste to prosím později."
+
+#: views/statistics/addon.thtml:136
+msgid "statistics_notice_disabled"
+msgstr "Stránka statistik je momentálně zakázánaná. Zkuste to prosím později."
+
+#: views/statistics/addon.thtml:123
+msgid "statistics_notice_nojavascript"
+msgstr "Pro zobrazení grafů na stránce statistik je vyžadován JavaScript."
+
+#: views/statistics/addon.thtml:44
+msgid "statistics_notice_settings_updated"
+msgstr "Nastavení bylo aktualizováno!"
+
+#: controllers/statistics_controller.php:60
+#: controllers/statistics_controller.php:71
+#: controllers/statistics_controller.php:74
+#: controllers/statistics_controller.php:216
+msgid "statistics_pagetitle"
+msgstr "Stránka statistik"
+
+#: views/statistics/addon.thtml:99
+msgid "statistics_plot_legend_adu"
+msgstr "Po�et aktivních uživatelů za den"
+
+#: views/statistics/addon.thtml:95
+msgid "statistics_plot_legend_downloads"
+msgstr "Po�et stažení za den"
+
+#: views/statistics/addon.thtml:107
+msgid "statistics_plot_options_zoomin_alt"
+msgstr "Zvětšit velikost"
+
+#: views/statistics/addon.thtml:106
+msgid "statistics_plot_options_zoomin_title"
+msgstr "Zvětšit velikost na jeden měsíc"
+
+#: views/statistics/addon.thtml:110
+msgid "statistics_plot_options_zoomout_alt"
+msgstr "Zmenšit velikost"
+
+#: views/statistics/addon.thtml:109
+msgid "statistics_plot_options_zoomout_title"
+msgstr "Zmenšit velikost na jeden měsíc"
+
+#: controllers/statistics_controller.php:259
+#, php-format
+msgid "statistics_rss_description"
+msgstr "Denní přehled statistik doplňku %1$s"
+
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS kanál přehledu statistik"
+
+#: views/statistics/rss/summary.thtml:75
+msgid "statistics_rss_title_fulldate"
+msgstr "%A, %e. %B %Y"
+
+#: views/statistics/rss/summary.thtml:75
+#, php-format
+msgid "statistics_rss_title_statsfordate"
+msgstr "Statistiky doplňku %1$s"
+
+#: views/statistics/settings.thtml:46
+msgid "statistics_settings_access_description"
+msgstr ""
+"Ve výchozím nastavení může tyto statistiky vidět pouze Mozilla a vy. Tyto "
+"statistiky lze ale zveřejnit a umožnit tak komukoliv vidět data vašeho "
+"doplňku."
+
+#: views/statistics/settings.thtml:45
+msgid "statistics_settings_access_heading"
+msgstr "Přístup ke statistikám"
+
+#: views/statistics/settings.thtml:48
+msgid "statistics_settings_access_private"
+msgstr "Soukromý"
+
+#: views/statistics/settings.thtml:48
+msgid "statistics_settings_access_private_description"
+msgstr "Pouze vy a Mozilla si může zobrazit statistiky tohoto doplňku"
+
+#: views/statistics/settings.thtml:49
+msgid "statistics_settings_access_public"
+msgstr "Veřejný"
+
+#: views/statistics/settings.thtml:49
+msgid "statistics_settings_access_public_description"
+msgstr "Kdokoliv si může zobrazit statistiky tohoto doplňku"
+
+#: views/statistics/addon.thtml:253
+msgid "statistics_settings_change_link"
+msgstr "Změnit nastavení"
+
+#: views/statistics/addon.thtml:255
+msgid "statistics_settings_confidential"
+msgstr "Považujte prosím tyto informace za důvěrné."
+
+#: views/statistics/addon.thtml:247
+msgid "statistics_settings_currently_private"
+msgstr "Tato stránka je v&nbsp;sou�asnosti <b>soukromá</b>."
+
+#: views/statistics/addon.thtml:243
+msgid "statistics_settings_currently_public"
+msgstr "Tato stránka je v&nbsp;sou�asnosti <b>veřejná</b>."
+
+#: views/statistics/addon.thtml:248
+msgid "statistics_settings_locked_alt"
+msgstr "Zamknuto"
+
+#: views/statistics/settings.thtml:54
+msgid "statistics_settings_return_link"
+msgstr "Návrat na stránku statistik"
+
+#: views/statistics/settings.thtml:53
+msgid "statistics_settings_save_button"
+msgstr "Uložit nastavení"
+
+#: views/statistics/settings.thtml:43
+#, php-format
+msgid "statistics_settings_title"
+msgstr "Nastavení stránky statistik pro doplněk %1$s"
+
+#: views/statistics/addon.thtml:244
+msgid "statistics_settings_unlocked_alt"
+msgstr "Odemknuto"
+
+#: controllers/components/stats.php:403
+msgid "statistics_shortnames_application"
+msgstr "Apl"
+
+#: controllers/components/stats.php:405
+msgid "statistics_shortnames_os"
+msgstr "OS"
+
+#: controllers/components/stats.php:404
+msgid "statistics_shortnames_status"
+msgstr "St"
+
+#: controllers/components/stats.php:406
+msgid "statistics_shortnames_unknown"
+msgstr "Nz"
+
+#: controllers/components/stats.php:402
+msgid "statistics_shortnames_version"
+msgstr "Vrz"
+
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
+msgid "statistics_summary_downloads_average"
+msgstr "Průměrný po�et stažení za den"
+
+#: views/statistics/rss/summary.thtml:39
+msgid "statistics_summary_downloads_heading"
+msgstr "Stažení"
+
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
+msgid "statistics_summary_downloads_lastcount"
+msgstr "Po�et za poslední den"
+
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
+msgid "statistics_summary_downloads_lastweek"
+msgstr "Po�et stažení za poslední týden"
+
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
+msgid "statistics_summary_downloads_total"
+msgstr "Celkový po�et stažení"
+
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
+#, php-format
+msgid "statistics_summary_downloads_total_sincedate"
+msgstr "Od %1$s"
+
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
+msgid "statistics_summary_nodata"
+msgstr "Chybí data"
+
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
+msgid "statistics_summary_updatepings_average"
+msgstr "Průměrný po�et aktivních uživatelů za den"
+
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
+msgid "statistics_summary_updatepings_changefromprevious"
+msgstr "Změna z&nbsp;předchozího po�tu"
+
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
+#, php-format
+msgid "statistics_summary_updatepings_changefromprevious_ondate"
+msgstr "%1$s v&nbsp;%2$s"
+
+#: views/statistics/rss/summary.thtml:45
+msgid "statistics_summary_updatepings_heading"
+msgstr "Aktivní uživatelé za den"
+
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
+msgid "statistics_summary_updatepings_total"
+msgstr "Po�et aktivních uživatelů za den"
+
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
+#, php-format
+msgid "statistics_summary_updatepings_total_ondate"
+msgstr "%1$s"
+
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
+#, php-format
+msgid "statistics_title_addon_stats"
+msgstr "Statistika doplňku %1$s"
+
+#: views/addons/themes_landing.thtml:119
+msgid "themes_landing_all_themes"
+msgstr "VÅ¡echny motivy vzhledu"
+
+#: views/addons/themes_landing.thtml:115
+msgid "themes_landing_browse_themes"
+msgstr "Procházet motivy vzhledu"
+
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
+msgid "user_change_email"
+msgstr "Změnit e-mailovou adresu"
+
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
+msgid "user_change_password"
+msgstr "Změnit heslo"
+
+#: controllers/users_controller.php:197
+msgid "user_confirmationcode_resent"
+msgstr "Aktiva�ní kód byl znovu poslán!"
+
+#. %1 is the email address, %2 is the URL of the user registration page
+#: views/users/delete.thtml:49
+msgid "user_del_account_deleted"
+msgstr ""
+"Váš uživatelský ú�et %1$s byl úspěšně smazán. Pakliže se budete chtít někdy "
+"později vrátit, můžete se znovu registrovat na <a href=\"%2$s\">stránce "
+"registrace nového uživatele</a>."
+
+#: views/users/delete.thtml:95
+msgid "user_del_community_sad"
+msgstr "Komunitu Mozilla Add-ons mrzí, že odcházíte."
+
+#: views/users/delete.thtml:116
+msgid "user_del_confirm_password"
+msgstr "Potvrzení hesla"
+
+#: views/users/delete.thtml:127
+msgid "user_del_deletenow"
+msgstr "Smazat můj uživatelský ú�et"
+
+#. %1 is the URL of the user's info page
+#: views/users/delete.thtml:62
+msgid "user_del_error_addons"
+msgstr ""
+"Pokud jste veden jako <a href=\"%1$s\">autor některého doplňku</a>, nemůže "
+"být váš uživatelský ú�et smazán. Před smazáním svého ú�tu pověřte jinou "
+"osobou ve vašem vývojovém týmu odstraněním vaší osoby ze seznamu autorů "
+"doplňků. Poté již budete schopen svůj uživatelský ú�et odstranit."
+
+#. %1 is a link to the amo-editors mailing list
+#: views/users/delete.thtml:69
+msgid "user_del_error_addons_more_questions"
+msgstr "Pokud máte další otázky, kontaktujte prosím pro asistenci %1$s."
+
+#: views/users/delete.thtml:74
+msgid "user_del_error_checkbox"
+msgstr ""
+"Předtím, než budete moci smazat váš ú�et, musíte zaškrtnout pole "
+"\"Souhlasím...\""
+
+#: views/users/delete.thtml:78
+msgid "user_del_error_password"
+msgstr "Pro provedení tohoto kroku zadejte platné heslo."
+
+#. %1 is a link to the amo-admins mailing list
+#: views/users/delete.thtml:83
+msgid "user_del_error_unknown"
+msgstr ""
+"Při mazání ú�tu došlo k neznámé chybě. Kontaktujte prosím %1$s  s informací "
+"o chybě a my váš ú�et odstraníme. Omlouváme se za problémy."
+
+#: views/users/delete.thtml:103
+msgid "user_del_header_confirm_deletion"
+msgstr "Potvrzení smazání ú�tu"
+
+#. %1 is the user's email address
+#: views/users/delete.thtml:93
+msgid "user_del_header_delete_account"
+msgstr "Smazat uživatelský ú�et %1$s"
+
+#: views/users/delete.thtml:48
+msgid "user_del_header_farewell"
+msgstr "Sbohem!"
+
+#: views/users/delete.thtml:108
+msgid "user_del_nologin"
+msgstr "Nebudete již schopen se přihlásit na Mozilla Add-ons."
+
+#: views/users/delete.thtml:105
+msgid "user_del_permanently_removed_means"
+msgstr ""
+"Klepnutím na \"smazat\" bude váš ú�et <strong>natrvalo odstraněn</strong>. "
+"To znamená:"
+
+#: views/users/delete.thtml:109
+msgid "user_del_reviews_anonymized"
+msgstr "Vaše hodnocení nebudou smazána, ale již s vámi nebudou provázána."
+
+#. %1 is a link to the amo-editors mailing list
+#: views/users/delete.thtml:97
+msgid "user_del_specific_problem_editors"
+msgstr ""
+"Pokud máte konkrétní problém, s kterým vám můžeme pomoci, pak svůj ú�et "
+"nemažte a namísto toho nás kontaktujte na adrese %1$s. My se pokusíme váš "
+"problém vyřešit."
+
+#: views/users/delete.thtml:123
+msgid "user_del_understand_permanent"
+msgstr "Rozumím, že tento krok je nevratný."
+
+#: views/helpers/addons_html.php:184
+msgid "user_deleted_nickname"
+msgstr "Smazat uživatele"
+
+#. %1 is the new email address
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
+msgid "user_edit_confirm_email_sent"
+msgstr ""
+"Pro potvrzení nové e-mailové adresy byl odeslán e-mail na adresu %1$s. Pro "
+"potvrzení změny bude potřeba, abyste klepli na odkaz uvedený v&nbsp;tomto e-"
+"mailu. Do té doby zůstane přihlašování spojené s&nbsp;vaší aktuální e-"
+"mailovou adresou."
+
+#: views/users/edit.thtml:183
+msgid "user_edit_delete_user"
+msgstr "Smazat uživatelský ú�et"
+
+#. This contains the email sent to users when they signed up for a new
+#. account:
+#. %1 is the confirmation URL, %2 is the current app
+#: views/users/email/confirm_plain.thtml:6
+#, php-format
+msgid "user_email_confirm_account_nopass"
+msgstr ""
+"Vítejte na serveru doplňky Mozilly.\n"
+"\n"
+"Před tím, než budete moci za�ít využívat váš ú�et, je nutné ho aktivovat - "
+"to zaru�í, že e-mailová adresa, kterou jste použily, je platná a je vaše.\n"
+"K aktivaci ú�tu sta�í klepnout na následující odkaz, �i tento odkaz "
+"zkopírovat do adresního řádku ve svém prohlíže�i:\n"
+"\n"
+"%1$s\n"
+"\n"
+"Po úspěšné aktivaci svého ú�tu můžete tento e-mail smazat.\n"
+"\n"
+"Děkujeme za registraci na serveru doplňky Mozilly.\n"
+"-- Tým serveru doplňky Mozilly"
+
+#. %1 is the confirmation url, %2 is the application name
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
+msgid "user_email_confirm_emailchange"
+msgstr ""
+"Požádali jste o změnu e-mailové adresy u vašeho ú�tu na %2$s Add-ons.\n"
+"\n"
+"Pokud chcete novou adresu potvrdit, klepnete na odkaz níže nebo jej "
+"zkopírujte a vložte do adresního řádku svého prohlíže�e:\n"
+"\n"
+"%1$s\n"
+"\n"
+"Na potvrzení nové adresy máte 48 hodin. Pokud si již adresu nepřejete změnit "
+"posta�í, když tento e-mail budete ignorovat.\n"
+"\n"
+"Díky!\n"
+"-- Tým %2$s Add-ons"
+
+#: controllers/users_controller.php:168
+#, php-format
+msgid "user_email_confirm_subject"
+msgstr "Doplňky Mozilly - aktivace ú�tu"
+
+#. This is the password reset email
+#. %1 is the pw reset URL, %2 is the application
+#: views/users/email/pwreset_plain.thtml:5
+#, php-format
+msgid "user_email_pwreset"
+msgstr ""
+"Žádost o obnovení hesla na serveru doplňky Mozilly\n"
+"\n"
+"Server doplňky Mozilly obdržel žádost na obnovení hesla ú�tu, který je "
+"provázán s&nbsp;tímto e-mailem. Pokud si přejete heslo změnit, klepněte "
+"prosím na následující odkaz nebo tento odkaz vložte do svého prohlíže�e:\n"
+"\n"
+"%1$s\n"
+"\n"
+"Pokud jste změnu hesla nepožadovali, tento e-mail prosím ignorujte.\n"
+"\n"
+"S pozdravem,\n"
+"-- Tým serveru doplňky Mozilly"
+
+#: controllers/users_controller.php:244
+#, php-format
+msgid "user_email_pwreset_subject"
+msgstr "Doplňky Mozilly - obnovení hesla"
+
+#: views/users/emailchange.thtml:53
+msgid "user_emailchange_error"
+msgstr "Chyba!"
+
+#. %1 is the application name
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
+msgid "user_emailchange_subject"
+msgstr "Potvr�te prosím změnu své e-mailové adresy na stránkách %1$s doplňky"
+
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
+msgid "user_emailchange_success"
+msgstr "Úspěch!"
+
+#. %1 is the new email address
+#: views/users/emailchange.thtml:52
+#, php-format
+msgid "user_emailchange_successful_description"
+msgstr ""
+"Vaše e-mailová adresa byla úspěšně změněna. Odte� prosím používejte pro "
+"příhlášení %1$s."
+
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
+msgid "user_form_confirmpassword"
+msgstr "Heslo znova"
+
+#: views/users/edit.thtml:89
+#, php-format
+msgid "user_form_editprofile"
+msgstr "Upravit profil uživatele %s"
+
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
+msgid "user_form_email"
+msgstr "E-mailová adresa"
+
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
+msgid "user_form_firstname"
+msgstr "Křestní jméno"
+
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
+msgid "user_form_hideemail"
+msgstr "Skrýt e-mailovou adresu"
+
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
+msgid "user_form_homepage"
+msgstr "Adresa webové stránky"
+
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
+msgid "user_form_lastname"
+msgstr "Příjmení"
+
+#: controllers/users_controller.php:322
+msgid "user_form_login"
+msgstr "Přihlášení"
+
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
+msgid "user_form_newpassword"
+msgstr "Nové heslo"
+
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
+msgid "user_form_nickname"
+msgstr "Přezdívka"
+
+#: views/users/edit.thtml:150
+msgid "user_form_oldpassword"
+msgstr "Původní heslo"
+
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
+msgid "user_form_otheractions"
+msgstr "Další akce"
+
+#: views/users/login.thtml:85 views/users/register.thtml:63
+msgid "user_form_password"
+msgstr "Heslo"
+
+#: controllers/users_controller.php:93
+msgid "user_form_registration"
+msgstr "Registrace nového uživatele"
+
+#: views/users/login.thtml:92
+msgid "user_form_remember_me"
+msgstr "Zapamatovat si mě na tomto po�íta�i"
+
+#: views/admin/users_edit.thtml:80
+msgid "user_form_showsandbox"
+msgstr "Zobrazit pískoviště"
+
+#: views/users/edit.thtml:187
+msgid "user_form_submit_edit"
+msgstr "Uložit"
+
+#: views/users/login.thtml:96
+msgid "user_form_submit_login"
+msgstr "Přihlášení"
+
+#: views/users/register.thtml:108
+msgid "user_form_submit_register"
+msgstr "Založit ú�et"
+
+#: views/users/info.thtml:69
+#, php-format
+msgid "user_info_usersince"
+msgstr "Uživatelem serveru doplňky Mozilly od"
+
+#: views/users/login.thtml:107
+msgid "user_login_register_link"
+msgstr "Založit nový ú�et"
+
+#: views/users/edit.thtml:139
+#, fuzzy
+msgid "user_notifications_item_compat"
+msgstr "Add-on Compatibility (strongly recommended)"
+
+#: views/users/edit.thtml:140
+#, fuzzy
+msgid "user_notifications_item_events"
+msgstr "Upcoming events and contests"
+
+#: views/users/edit.thtml:135
+#, fuzzy
+msgid "user_notifications_none_available"
+msgstr "There are currently no notifications available for you to configure."
+
+#: views/users/edit.thtml:137
+#, fuzzy
+msgid "user_notifications_select_topics"
+msgstr ""
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
+
+#: views/users/edit.thtml:143
+#, fuzzy
+msgid "user_notifications_specific_contact"
+msgstr ""
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
+
+#: controllers/users_controller.php:526
+msgid "user_profile_edit_error"
+msgstr ""
+"Změněné údaje obsahují chyby. Opravte je prosím a formulář znovu odešlete."
+
+#: controllers/users_controller.php:523
+msgid "user_profile_saved"
+msgstr "Profil aktualizován."
+
+#: views/users/pwreset.thtml:65
+#, php-format
+msgid "user_pwreset_for_email"
+msgstr "Heslo uživatele %s obnoveno"
+
+#: controllers/users_controller.php:226
+msgid "user_pwreset_header"
+msgstr "Obnovení hesla"
+
+#: views/users/login.thtml:108
+msgid "user_pwreset_link"
+msgstr "Zapomněli jste heslo?"
+
+#: controllers/users_controller.php:247
+msgid "user_pwreset_link_sent"
+msgstr "Odkaz pro obnovení hesla vám byl odeslán e-mailem."
+
+#: controllers/users_controller.php:293
+msgid "user_pwreset_okay"
+msgstr "Heslo úspěšně obnoveno."
+
+#: views/users/pwreset.thtml:82
+msgid "user_pwreset_submit_changepw"
+msgstr "Odeslat změněné heslo"
+
+#: views/users/pwreset.thtml:57
+msgid "user_pwreset_submit_sendlink"
+msgstr "Poslat odkaz na obnovení hesla"
+
+#: views/users/register_complete.thtml:52
+#, php-format
+msgid "user_register_amo_link"
+msgstr "doplňky Mozilly"
+
+#. %1 is the user's email address, %2 is the current app
+#: views/users/activatefirst.thtml:49
+#, php-format
+msgid "user_register_click_confirm_link"
+msgstr ""
+"Na vaši adresu %1$s byl odeslán e-mail obsahující odkaz k&nbsp;aktivaci "
+"ú�tu. Před tím než se budete moci přihlásit, si musíte svůj ú�et aktivovat "
+"klepnutím na tento odkaz."
+
+#. %1 is the user's email address
+#: views/users/register_complete.thtml:50
+#, php-format
+msgid "user_register_confirm_email_sent"
+msgstr ""
+"Na vaši adresu %1$s byl odeslán e-mail obsahující odkaz k&nbsp;aktivaci "
+"ú�tu. Před tím než se budete moci přihlásit, si musíte svůj ú�et aktivovat "
+"klepnutím na tento odkaz."
+
+#: views/users/activatefirst.thtml:51
+msgid "user_register_confirmation_link_text"
+msgstr "znovu poslat aktiva�ní e-mail"
+
+#: views/users/register_complete.thtml:48
+msgid "user_register_congratulations"
+msgstr "Gratulujeme! Váš ú�et byl úspěšně vytvořen."
+
+#. %1 is the link to the "resend confirmation code" page
+#: views/users/activatefirst.thtml:51
+#, php-format
+msgid "user_register_resend_confirmation_link"
+msgstr ""
+"Pokud jste neobdrželi aktiva�ní e-mail, zkontrolujte prosím, zda ho váš "
+"poštovní klient neozna�il jako \"nevyžádanou poštu\". Pokud potřebujete, "
+"můžete si na svoji e-mailovou adresu uvedenou výše nechat %1$s."
+
+#. %1 is the link to the Mozilla Add-ons front page
+#: views/users/register_complete.thtml:52
+#, php-format
+msgid "user_register_welcome"
+msgstr "Děkujeme za zaregistrování a vítejte na serveru %1$s!"
+
+#: views/users/register.thtml:76 views/users/edit.thtml:109
+msgid "user_required_firstlast_or_nickname"
+msgstr "Je vyžadováno jméno, příjmení �i přezdívka."
+
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
+msgid "user_tab_notifications"
+msgstr "Upozornění"
+
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
+msgid "user_tab_profile"
+msgstr "Uživatelský profil"
+
+#: controllers/users_controller.php:209
+msgid "user_verified_okay"
+msgstr "Úspěšně ověřeno!"
+
+#: controllers/users_controller.php:698
+msgid "users_delete_pagetitle"
+msgstr "Smazat uživatelský ú�et"
+
+#: controllers/users_controller.php:403
+msgid "users_edit_pagetitle"
+msgstr "Úprava uživatelského ú�tu"
+
+#: views/users/info.thtml:90
+#, php-format
+msgid "users_info_addons_by_user"
+msgstr "Doplňky od uživatele %1$s"
+
+#: views/users/info.thtml:50
+msgid "users_info_author_name"
+msgstr "Jméno"
+
+#: views/users/info.thtml:47
+msgid "users_info_author_profile"
+msgstr "Profil autora"
+
+#: views/users/info.thtml:65
+msgid "users_info_email"
+msgstr "E-mailová adresa"
+
+#: views/users/info.thtml:60
+msgid "users_info_homepage"
+msgstr "Domovská stránka"
+
+#: views/users/info.thtml:55
+msgid "users_info_nickname"
+msgstr "Přezdívka"
+
+#: controllers/users_controller.php:682
+#, php-format
+msgid "users_info_pagetitle"
+msgstr "Profil uživatele %1$s"
+
+#. %1 is the user's name
+#: views/users/info.thtml:110
+msgid "users_info_reviews_by_user"
+msgstr "Hodnoceno uživatelem %s"
+
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
+msgid "users_login_pagetitle"
+msgstr "Přihlášení uživatele"
+
+#. %1 is the link to the sandbox/policy explanation page
+#. This message is for a specific add-on not found
+#: views/users/login.thtml:53
+#, php-format
+msgid "users_login_sandbox_display_warning"
+msgstr ""
+"Doplněk, který hledáte, je v&nbsp;sou�asnosti na pískovišti. Pokud máte na "
+"serveru doplňky Mozilly ú�et, pak se prosím přihlaste, a nebo si zjistěte o "
+"pískovišti <a href=\"%1$s\">více informací.</a>"
+
+#. %1 is the link to the sandbox/policy explanation page
+#. This message is for any given sandbox-related page not found
+#: views/users/login.thtml:56
+#, php-format
+msgid "users_login_sandbox_page_warning"
+msgstr ""
+"Stránka, kterou hledáte, je sou�ástí pískoviště. Pokud máte na serveru "
+"doplňky Mozilly ú�et, pak se prosím přihlaste, a nebo si zjistěte o "
+"pískovišti <a href=\"%1$s\">více informací.</a>"
+
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
+msgid "users_pwreset_pagetitle"
+msgstr "Obnovení uživatelského hesla"
+
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
+msgid "users_register_pagetitle"
+msgstr "Registrace nového uživatele"
diff --git a/site/app/locale/cy/LC_MESSAGES/messages.po b/site/app/locale/cy/LC_MESSAGES/messages.po
index 5df8931..cf9e736 100644
--- a/site/app/locale/cy/LC_MESSAGES/messages.po
+++ b/site/app/locale/cy/LC_MESSAGES/messages.po
@@ -17,169 +17,160 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Bookmarks: 363,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Diddymu'r Gosod"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Llwytho %s Nawr"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Derbyn a Llwytho i Lawr"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Derbyn a Gosod"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Cyhoeddus"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Blwch Tywod"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Diweddaru %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Fersiwn %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "Llwythi"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Y llwythi i gyd"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "llwythi wythnosol"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s add-on"
 msgstr[1] "%1$s add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "y dudalen"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Trefnu yn ôl"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "arbrofol"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "argymell"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "Nid yw %1$s ar gael ar gyfer %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Nôl i %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Nôl i'r adolygiadau..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Graddio:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Adolygiad:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Cyflwyno dy adolygiad"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Ychwanegu adolygiad ar %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Teitl/Crynodeb:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Dileu"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Ateb"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Wyt ti'n siŵr dy fod am ddileu'r adolygiad?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Na"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Iawn"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Dileu'r Adolygiad"
 
@@ -188,7 +179,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Wedi dileu'r adolygiad yn llwyddiannus."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Golygu’r adolygiad ar %s"
@@ -202,18 +193,18 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Sylw: Cyn i dy adolygiad ymddangos ar y safle cyhoeddus bydd yn cael ei "
 "gymedroli gan olygydd."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Datblygwr i ateb i:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -230,31 +221,46 @@ msgid "addon_review_pagetitle"
 msgstr "Adolygiadau ar gyfer %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Ateb gan %1$s ynghylch %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Ateb Datblygwr:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Cafodd dy adolygiad ei gadw'n llwyddiannus. Diolch!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "gan %1$s ynghylch %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "gan %1$s ynghylch %2$s (gradd %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -262,144 +268,91 @@ msgstr "Permanent link to this version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Mynd"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Pori %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Ychwanegu adolygiad"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Manylion Uwch"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorïau"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "adolygiad manwl"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Dim yn ei hoffi"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Golygu dy adolygiad"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Mae gan yr ychwanegyn bolisi preifatrwydd"
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Casáu"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Sylw Datblygwr"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Tudalen cartref"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Adolygiadau"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Cefnogaeth"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Hoffi"
 
@@ -407,23 +360,19 @@ msgstr "Hoffi"
 msgid "addons_display_long_description"
 msgstr "Disgrifiad Hir"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Gwych"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Rhagor o Ddelweddau"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -433,21 +382,21 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Mae cefnogaeth ar gyfer yr ychwanegyn ar gael gan y datblygwr yn %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -455,67 +404,72 @@ msgstr ""
 "anfon e-bost at %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Mae cefnogaeth ar gyfer yr ychwanegyn ar gael gan y datblygwr yn %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Grafddio Hwn"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Hoffi'n fawr"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Paid cofnodi gwallau mewn adolygiadau. Nid ydym yn rhoi dy gyfeiriad e-bost "
 "i ddatblygwyr ychwanegion a gall fod angen iddyn gysylltu a thi."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Cadw"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Gweld Holl Ychwanegion %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Gweld pob adolygiad (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Gweld Pob Fersiwn"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Hanes Llawn Bob Fersiwn"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Gweld y ffynhonnell"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Gweld yr ystadegau"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Beth wyt ti'n feddwl?"
 
@@ -523,95 +477,24 @@ msgstr "Beth wyt ti'n feddwl?"
 msgid "addons_display_workswith"
 msgstr "Mae'n gweithio gyda:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "gan"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Argymellion"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -619,133 +502,88 @@ msgstr ""
 "pori rwyt ti am ei gael. Cymer olwg o gwmpas a gwna dy hun yn gysurus gyda%1"
 "$s."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
+#: views/addons/home.thtml:201
 #, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Rhaglenni Eraill"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Ychwanegyn"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Mwyaf Poblogaidd:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Y Goreuon:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+#, fuzzy
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Gweld popeth"
+
+#: views/addons/home.thtml:209
 #, fuzzy
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Gweld yr ychwanegion mwyaf poblogaidd"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Gweld yr holl ychwanegion gorau"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 #, fuzzy
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -753,12 +591,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Rho glic de i'r cyswllt isod a dewis \"Cadw'r Cyswllt Fel...\" ti "
@@ -767,42 +605,39 @@ msgstr ""
 "Gosod, a chanfod/dewis y ffeil rwyt ti wedi ei lwytho i lawr a chlicio \"Iawn"
 "\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Sut mae ei osod o fewn Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "dangos ychwanegion arbrofol"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Mynd"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Gan"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "ar gyfer Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "ar gyfer y Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "ar gyfer Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -810,11 +645,11 @@ msgstr ""
 "dudalen hon. Am fwy o wybodaeth ar ategynnau eraill ar gyfer porwyr sy'n "
 "seiliedig ar Mozilla, gwêl %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Chwilio am ategyn sydd heb ei restru yma?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Mae ategynnau yn cynorthwyo dy borwr i gyflawni tasgau penodol fel dangos "
@@ -823,24 +658,24 @@ msgstr ""
 "swyddogaethau presennol."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Ategynnau Cyffredin ar gyfer %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Ategynnau"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Dogfennau Cymorth:"
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -848,41 +683,36 @@ msgstr ""
 "cychwyn gosod:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Rhagolwg %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Gan fod yna gymaint o ychwanegion rhagorol ar gael, mae yna rhywbeth ar "
 "gyfer pawb. I gychwyn, dyma restr o'r rhai mwyaf poblogaidd. Mwynha!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Ychwanegion Gorau"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Ychwanegion Gorau"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Adnoddau Ychwanegol"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Canolfan Datblygwyr Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Ymddiheuriadau, mae angen porwr wedi ei sylfaeni ar Mozilla (e.e. Firefox) i "
@@ -896,42 +726,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Dysgu sut i %1$s yn y %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "creu dy rhai dy hun"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Pori drwy ragor o beiriannau chwilio yn %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Peiriannau Chwilio"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Diolch arbennig i Broject Mycroft am eu gwaith ar y Peiriant Chwilio Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -976,19 +807,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -999,39 +830,27 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Bydd Ofalus gyda Hen Fersiynau"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Mae'r fersiynau hyn yn cael eu dangos er mwyn gwybodaeth a chynnal "
 "arbrofion. Dylet ddefnyddio'r fersiwn diweddaraf bob tro."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Hanes y Fersiwn a'r Cofnodion Newid"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Hanes Fersiwn %1$s"
@@ -1066,148 +885,136 @@ msgstr "Gweinyddiaeth Grŵp"
 msgid "admin_group_saved"
 msgstr "Mae'r Grŵp wedi ei gadw"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 #, fuzzy
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 #, fuzzy
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 #, fuzzy
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 #, fuzzy
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 #, fuzzy
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 #, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 #, fuzzy
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 #, fuzzy
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 #, fuzzy
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 #, fuzzy
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 #, fuzzy
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 #, fuzzy
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 #, fuzzy
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 #, fuzzy
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 #, fuzzy
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 #, fuzzy
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 #, fuzzy
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 #, fuzzy
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 #, fuzzy
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 #, fuzzy
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 #, fuzzy
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 #, fuzzy
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 #, fuzzy
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Anwybyddu gwirio'r fersiwn"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Mae'r ychwanegyn ar gyfer fersiynau hÅ·n o Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1215,347 +1022,45 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Efallai bydd <a href=\"%1$s\">fersiwn hÅ·n</a> yn gweithio"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Diweddaru Firefox</a> er mwyn defnyddio’r "
 "ychwanegyn hwn"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1565,862 +1070,47 @@ msgid "categories_current_title"
 msgstr "Categori Presennol"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorïau"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Dewis categori"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Gweld Popeth %1$s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Gweld yr Ychwanegion Gorau"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Gradd Uchaf yn Gyntaf"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Diweddarwyd Diwethaf yn Gyntaf"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Mwyaf Poblogaidd yn Gyntaf"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Gweld Popeth %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2428,71 +1118,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2501,26 +1191,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2528,107 +1218,107 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Am wybodaeth ar gyfrannu, gwel %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "tudalen wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Hoffai Mozilla ddiolch i'r canlynol am eu cyfraniad i broject addons.mozilla."
 "org project dros y blynyddoedd:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Datblygwyr"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Golygyddion"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Lleoleiddwyr"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Cyfranwyr Eraill"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Datblygwyr Blaenorol"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Meddalwedd a Delweddau"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Mae rhai eiconau yn dod o <a href=\"http://www.famfamfam.com/lab/icons/silk/"
@@ -2636,7 +1326,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2647,20 +1337,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%B %e, %Y"
 
@@ -2695,25 +1382,25 @@ msgstr "Bwrdd Gwybodaeth Ystadegau"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2722,6 +1409,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(awto ganfod)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Nid yw'r fersiwn yma o dy ychwanegyn yn honni cytunedd gyda Firefox %1$s. "
+"Mae Mozilla yn disgwyl fersiwn nesaf o Firefox i gael ei ryddhau yn fuan, "
+"felly profa'r ychwanegyn gyda'r fersiwn newydd a diweddaru'r wybodaeth "
+"cytunedd. Mae modd cael mwy o wybodaeth yn fan <a href=\"%2$s\">hyn</a>. Dim "
+"ond er gwybodaeth yw hyn ac mae modd parhau i gyflwyno'r fersiwn i addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Agor mewn ffenestr newydd"
@@ -2758,76 +1458,141 @@ msgstr "Cam 5: Llwyddiant"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Cymorth ar gyfer Cyflwyno"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Ychwanegyn wedi ei anablu'n llwyddiannus"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Golygu Ychwanegyn"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Ychwanegyn wedi ei alluogi'n llwyddiannus"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Disgrifiad o Ychwanegyn"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Ychwanegu Tiudalen Cartref"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Enw'r Ychwanegyn"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Rhagolwg o'r Pennawd"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Polisi Preifatrwydd"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Crynodeb Ychwanegion"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Cynnal E-bost"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Cynnal URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Nodiadau'r Fersiwn"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Enwebu Ychwanegyn"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Enwebwyd Ychwanegyn yn llwyddiannus!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2863,7 +1628,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2873,6 +1638,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2884,13 +1654,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2900,7 +1670,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2910,12 +1680,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2924,14 +1694,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3010,13 +1780,123 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Dos i dudalen %1$s  i wneud newidiadau i dy gyflwyniad, neu i %2$s i "
+"ddychwelyd i Offer Datblygwyr."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "clicia yma"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Golygu Ychwanegyn"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Mae'r fersiwn yma wedi ei osod yn y blwch tywod tra ei fod yn disgwyl "
+"adolygiad gan brofwyr y blwch tywod a golygydd Ychwanegion Mozilla. Byddi'n "
+"cael dy hysbysu pan fydd gweithred wedi digwydd."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Gelli ddarllen mwy am System Adolygu Blwch Tywod %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "yma"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Mae'r fersiwn yma wedi ei osod yn y blwch tywod ar gyfer Datblygwyr Uwch. Er "
+"mwyn iddo gael ei ddangos ar y safle cyhoeddus, rhaid %s dy ychwanegyn a "
+"mynd drwy broses adolygu."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "enwebu"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Mae dy gyflwyniad o ychwanegyn wedi bod yn llwyddiant."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Gan ein bod yn ymddiried yn dy ychwanegyn, mae'r fersiwn wedi cael ei "
+"dderbyn yn awtomatig ar gyfer y man cyhoeddus."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Cyflwyno Ychwanegyn"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Ychwanegyn wedi ei ddiweddaru'n llwyddiannus"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"Efallai y byddwch yn awyddus i %s gynyddu diddordeb yn eich ychwanegyn."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "llwytho'r rhagolwg"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Heb ganfod awdur [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Tynnu"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Diddymu"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Ydych chi'n siŵr eich bod am ddiddymu eich cyflwyniad?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Nesaf"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Newid y math o ychwanegyn:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Diweddarwyd Sylwadau Datblygwyr"
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3093,37 +1973,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Ychwanegu Rhagolwg"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Awdur"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Awduron"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Dim"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorïau"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categori"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Disgrifiad"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Anablu"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Manylion"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Sylwadau Datblygwyr"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Rhagolygon"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Fersiynau"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Tudalen Cartref"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Dim"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Dim pennawd"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Heb ganfod rhagolygon"
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Diweddaru"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Cynnal E-bost"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Dim e-bost cefnogi wedi ei ddarparu gan y datblygwr."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL Cefnogi"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Dim url cefnogi wedi ei ddarparu gan y datblygwr."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Ymddiriedir"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Fersiwn %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Heb ganfod fersiwn."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Diddymu a mynd nôl"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Iawn, ei anablu"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Wyt ti'n siŵr dy fod am anablu'r ychwanegyn?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Bydd anablu'r ychwanegyn yn ei guddio rhag y chwilio a'r rhestrau. Ni fydd "
+"modd ei lwytho i lawr o'r wefan ac ni fydd yn cael ei ddychwelyd mewn "
+"gwiriad gan raglen diweddaru. Bydd yr ychwanegyn wedi ei ddileu i bob "
+"pwrpas, er y bydd modd dychwelyd yma a'i ail alluogi."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Anablu %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Iawn, ei alluogi"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Wyt ti'n siŵr dy fod am alluogi yr ychwanegyn?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Bydd galluogi'r ychwanegyn yn achosi ei fod yn ymddangos wrth chwilio ac "
+"mewn rhestrau. Bydd ar gael i'w lwytho i lawr o'r wefan a drwy wiriad "
+"diweddaru'r rhaglen."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Galluogi %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3177,62 +2200,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Ychwanegu Awdur"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Cyfeiriad E-bost yr Awdur"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Tynnu"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3245,30 +2280,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3347,22 +2382,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3371,12 +2406,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3384,12 +2419,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3398,24 +2433,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3423,7 +2458,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3448,42 +2483,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Does dim categorïau ar gael ar gyfer y math yma o ychwanegyn."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Awduron"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Ychwanegu Eicon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Newid Eicon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Caniatáu i ddefnyddwyr weld y ffeiliau ffynhonnell ar-lein"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categoriau"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Lleoliad Rhagosodedig"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Mae'r ychwanegyn angen meddalwedd allanol"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Dim ond tynnu'r eicon cyfredol"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Ffeil Eicon Newydd"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Eicon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Gwybodaeth Lleoliad ychwanegol"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Mae hwn cyn y rhyddhad"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Mae hwn yn ychwanegyn gwefan benodol"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Lleoliad Targed"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "gwybodaeth ychwanegol gryno (megis enw 'r lleoliad targed)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3491,12 +2591,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3504,60 +2604,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3566,32 +2666,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3599,22 +2699,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3622,12 +2722,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3635,39 +2735,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Diweddaru"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">enw lleoliad "
+"syml</a>, megis 'cy-GB'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3754,14 +2864,68 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Diweddariad yn Disgwyl (%s)"
 msgstr[1] "Diweddariadau'n Disgwyl (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "bydd ffeiliau wedi eu ticio'n cael eu dilwu"
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Ffeiliau"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Rhaglenni Targed"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Dim ffeiliau."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Nodiadau ar gyfer Adolygwyr"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Diweddaru"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nid oes gen ti fynediad at yr ychwanegyn hwn."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Mae crynodebau wedi eu cyfyngu i ddim mwy na 250 nod.\n"
+"(Rwyt wedi rhoi %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Mae enw dy ychwanegyn eisoes yn y gronfa ddata. Gwna'n siŵr: <br /><li>Bod "
+"dy GUIDau'n cyd-fynd. Y rheswm mwyaf cyffredin am y gwall hwn yw nad yw'r "
+"GUIDau'n cyd-fynd.</li><li>Nad oes gennyt ddau gofnod yn y gronfa ddata. Os "
+"oes, dylet ddiweddaru'r cofnod neu ei ddileu a cheisio eto.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3775,10 +2939,9 @@ msgstr "Gwel %s am gyfeirnod"
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "yn y dudalen"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Disgrifia'r newidiadau sydd yn bodoli yn y diweddariad."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3797,6 +2960,10 @@ msgstr ""
 "Nid yw'r estyniad ffeil yma (%s) i'w ddefnyddio ar gyfer y math yma o "
 "ychwanegyn. Defnyddia'r canlynol: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nid yw pob ffeil GUIDau'n cyd-fynd"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Dewisa llai na phum categori"
@@ -3832,7 +2999,16 @@ msgstr ""
 "Nid yw'r estyniad ffeil yma (%s) i'w ddefnyddio ar gyfer eicon. Defnyddia'r "
 "canlynol: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Mae fersiwn yn union yr un peth (%s) yn bodoli eisoes ar gyfer yr ychwanegyn "
+"a'r platfform hwn."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Dim install.rdf ar gael."
 
@@ -3840,7 +3016,7 @@ msgstr "Dim install.rdf ar gael."
 msgid "devcp_error_install_manifest"
 msgstr "Roedd y gwallau canlynol yn yr install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Dewisa math o ychwanegyn dilys"
 
@@ -3911,6 +3087,19 @@ msgstr "Nid oed modd canfod dynodiad ar gyfer yr ychwanegyn ar install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Heb ddewis platfform"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Rhaid darparu'r wybodaeth gofynnwyd amdano ar gyfer enwebiad."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nid oes modd enwebu ychwanegyn cyn ei ryddhau."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Dim ond ychwanegion sydd eisoes yn y blwch tywod y mae modd eu henwebu."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Dewis o leiaf un categori"
@@ -3928,6 +3117,16 @@ msgstr ""
 "Nid oes modd defnyddio'r estyniad ffeil (%s) ar gyfer yr estyniad ar gyfer "
 "rhagolwg. Defnyddio un o'r canlynol: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Digwyddodd gwall wrth geisio cadw dy ddata."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Nid oes gennyt ganiatâd i ddiweddaru'r ychwanegyn."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3940,98 +3139,293 @@ msgstr ""
 "Nid oes modd i ychwanegyn ddefnyddio updateURL allanol. Tynna hwn o'r ffeil "
 "install.rdf a cheisio eto."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Llwytha ffeil i fyny."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Ychwanega Ffeil Platfform Arall"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Ychwanegu Awdur"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Tynnu"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Bydd categorïau ar gyfer dy fath newydd o ychwanegyn ar gael yn y cam nesaf."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Nid oes categori ar gael ar gyfer y math yma o ychwanegyn."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Rhowch ddisgrifiad o dy ategyn."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Rho enw ar gyfer dy ychwanegyn."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Dewis y math o ychwanegyn rwyt ti'n ei gyflwyno."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Rho grynodeb o dy ychwanegyn."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Ffeil Ychwanegyn"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Ffeil Ychwanegyn 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Ffeil Ychwanegyn 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Math o Ychwanegyn"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Caniatáu i ddefnyddwyr weld ffeiliau'r ffynhonnell ar-lein."
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Cyfeiriad E-bost yr Awdur"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Awduron"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorïau"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Lleoliad Rhagosodedig"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Disgrifiad"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Cytundeb Trwydded Defnyddiwr (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Mae'r ychwanegyn hwn angen meddalwedd allanol"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Ffeiliau"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Tudalen Cartref"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Ffeil Eicon"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Enw"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Platfform sy'n Cael eu Cynnal"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Fersiwn cyn rhyddhad yw hwn"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Polisi Preifatrwydd"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Mae hwn yn ychwanegyn gwefan benodol"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Crynodeb"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-bost Cefnogi"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL Cefnogi"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Rhaglenni Targed"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Fersiwn"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Nodiadau Fersiwn"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Dim"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Nodiadau ar gyfer yr Adolygwr"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Gan fod dy ychwanegyn yn un dibynadwy, dewisa lle ddylai'r fersiwn yma fynd:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Cyhoeddus"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Blwch Tywod"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Cytundeb Datblygwr"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Cam 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Llwytho Ffeil i Fyny"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Cam 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Manylion Ychwanegyn"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Cam 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Manylion y Fersiwn"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Cam 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lleoleiddio"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Cam 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Llwyddiant"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Fy Ychwanegion"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Meysydd Lleoleiddiwyd"
@@ -4047,12 +3441,12 @@ msgstr ""
 "lleoliad, bydd yn ddibynnol ar y lleoliad cynhenid (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Offer Gweinyddol"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Offer Golygu"
 
@@ -4061,28 +3455,28 @@ msgid "devcp_myaddons_link"
 msgstr "Fy Ychwanegion"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Nôl i'r Brif Dudalen"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Bwrdd Data Ystadegau"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Cyflwyno'r Ychwanegyn"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Offer Datblygwr"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4094,26 +3488,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Nôl i fanylion ychwanegyn"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Enwebu %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Wedi canfod yna awtomatig y math o ychwanegyn: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4127,6 +3532,17 @@ msgstr ""
 "Bydd tynnu hwn fel rhagolwg rhagosodedig yn achosi i ragolwg arall i ddod yn "
 "rhagolwg rhagosodedig yn awtomatig."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Mae locale'r ychwanegyn (%1$s [%2$s]) yn wahanol i'r locale rwyt ti wedi ei "
+"ddewis (%3$s [%4$s]). Rhaid llawn y meysydd %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4134,14 +3550,14 @@ msgstr ""
 "Bydd gwneud hyn yn rhagolwg rhagosodedig yn tynnu statws rhagosodedig o'r "
 "rhagolwg rhagosodedig presennol."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4170,46 +3586,46 @@ msgstr "Golygu'r Rhagolwg"
 msgid "devcp_preview_updated_successfully"
 msgstr "Mae'r rhagolwg wedi ei ddiweddaru'n llwyddiannus."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4217,7 +3633,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4235,7 +3651,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Ychwanegu Rhagolwg"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4244,7 +3660,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Golygu Rhagolwg"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4257,27 +3673,27 @@ msgstr "Rhagolwg Ffeil"
 msgid "devcp_previews_label_makedefault"
 msgstr "Gwneud hyn yn ddelwedd rhagosodedig"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4301,18 +3717,26 @@ msgstr "Golygu'r Rhagolwg"
 msgid "devcp_previews_submit_upload"
 msgstr "Llwytho'r Rhagolwg"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Anghywir?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Wyt ti'n siŵr dy fod am ddileu'r ffeil?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "Darllena'r adolygiad a derbyn y Cytundeb Datblygu cyn mynd ymhellach"
 
@@ -4323,7 +3747,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4335,6 +3759,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Hepgor diweddaru fy ngwybodaeth gyfredol ar yr ychwanegyn"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4438,17 +3866,61 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Mae cyflwyno ychwanegion wedi eu hanablu ar hyn o bryd. Dewch nôl eto."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Rwy'n Derbyn"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Rwy'n Gwrthod"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Mae'r ychwanegyn wedi ei anablu gan y gweinyddwr."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Anablwyd"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Ymddiriedwyr"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Fersiwn Diweddaraf:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nid oes gennyt ychwanegion. Clicia %s i gyflwyno un."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "yma"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Gwnewch yn siŵr eich bod %s ar gyfer eich thema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "llwytho rhagolwg i fyny"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4456,44 +3928,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4503,7 +3975,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4511,64 +3983,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4577,7 +4049,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4589,33 +4061,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4628,29 +4095,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4661,12 +4128,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4690,23 +4157,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4715,7 +4177,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4724,14 +4186,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4741,7 +4203,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4749,7 +4211,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4757,22 +4219,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4791,29 +4247,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Gw. %s ar gyfer cyfeiriad"
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "y dudalen hon"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Golygu Fersiwn"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Diweddarwyd y fersiwn yn llwyddiannus."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4882,34 +4341,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4917,49 +4376,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4969,59 +4423,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5030,26 +4477,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5092,7 +4539,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Mae'r ychwanegyn wedi ei anablu'n llwyddiannus"
 
@@ -5143,7 +4590,7 @@ msgstr "Hidl"
 msgid "editorcp_logs_filter_by"
 msgstr "Hidlo yn ôl math/gweithred"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Cofnod Digwyddiad"
 
@@ -5205,7 +4652,7 @@ msgstr "Gweld cofnodion rhwng %s a %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Dim adolygiadau wedi eu canfod ar gyfer y cyfnod yma"
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Cofnod Adolygu"
 
@@ -5229,24 +4676,24 @@ msgstr "Gweithgaredd Golygyddol Diweddar"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Cyfanswm Adolygiadau"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Adolygiad Ychwanegyn"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Cwblha'r meysydd canlynol:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Dewisa o leiaf un ffeil i'w adolygu."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Dim caniatâd ar gyfer hunan adolygu"
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Meddalwedd Allanol"
 
@@ -5258,39 +4705,39 @@ msgstr "Ychwanegu nodwedd"
 msgid "editors_featured_add_feature_submit"
 msgstr "Ychwanegu"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Methu ychwanegu nodwedd"
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Wedi ychwanegu nodwedd yn llwyddiannus"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Methu golygu nodwedd."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Wedi golygu nodwedd yn llwyddiannus."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Mae un neu fwy o locales yn annilys."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Methu tynnu nodwedd."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Wedi tynnu nodwedd yn llwyddiannus."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Nodweddion Gorau"
 
@@ -5302,168 +4749,105 @@ msgstr "Mynd"
 msgid "editors_featured_remove_feature"
 msgstr "Tynnu nodwedd"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Hidlo Rhes"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Cyswll Defnyddiol"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Canllaw Golygydd"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Polisi Ychwanegion"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Bydd yr hidlau yn aros yn eu lle ar gyfer y sesiwn neu tan eu bod wedi eu "
 "clirio."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Nid oes ychwanegion o'r math yma i'w hadolygu."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 diwrnod"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 awr"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 munud"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Offer Golygydd"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s yn unig"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Cyn rhyddhau"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Cytunedd"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Clirio"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Hidl"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Mae pob rhes adolygu wedi eu hanablu. Ceisia eto yn hwyrach."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Gweithred Adolygu"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Gwthio i'r Cyhoeddus"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Gofyn am Uwch Adolygiad"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Cadw yn y Blwch Tywod"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Sylwadau Adolygu"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5471,104 +4855,104 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Bydd hyn yn nodi'r ychwanegyn a'r fersiwn mwyaf diweddar a'r ffeiliau fel "
 "rhai cyhoeddus. Bydd fersiynau’r dyfodol yn mynd i'r blwch tywod nes eu bod "
 "wedi eu hadolygu gan olygydd."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Bydd hyn yn cadw'r ychwanegyn yn y blwch tywod."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Bydd hyn yn cadarnhau'r fersiwn yn y blwch tywod o fersiwn o ychwanegyn "
 "cyhoeddus i ymddangos ar yr ochr gyhoeddus."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Bydd hyn yn achosi i fersiwn yn y blwch tywod o ychwanegyn cyhoeddus i aros "
 "yn y blwch tywod."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Os oes gennych bryderon am ddiogelwch, materion hawlfraint neu bryderon "
 "eraill y dylai'r gweinyddwr edrych arnynt, rhowch eich sylwadau yn y maes "
 "isod. Byddant yn cael eu hanfon at y gweinyddwyr nid yr awdur."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Darllen Sylwadau"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Awduron:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categoriau:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Cytunedd:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Disgrifiad"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Sylwadau Datblygwyr"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Ffeiliau:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Hanes Eitemau"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Neges Enwebu"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Rhagolwg"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Polisi Preifatrwydd"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Adolygu %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Nodiadau Adolygu"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Crynodeb"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Nodiadau'r Fersiwn"
 
@@ -5598,7 +4982,7 @@ msgstr "Enwebiad Cytunwyd/Cyhoeddus"
 msgid "editors_review_history_nominated_denied"
 msgstr "Enwebiad Gwrthod/Blwch Tywod"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Methu canfod cofnod adolygu blaenorol."
 
@@ -5626,96 +5010,83 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Rhaglenni:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "neu ddewis ymateb parod:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Sylwadau:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systemau Gweithredu:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Brig"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Heb ganfod rhagolwg."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Rhes Adolygu"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Gweithred Prosesu"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Gweithred"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Sylwadau"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dyddiad"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Adolygwr"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Fersiwn/Ffeil"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Adolygiad wedi ei brosesu'n llwyddiannus"
 
@@ -5741,7 +5112,7 @@ msgstr "Gweithred"
 msgid "editors_reviews_in_reply_to"
 msgstr "Mewn ymateb i:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Adolygiadau wedi eu prosesu'n llwyddiannus!"
 
@@ -5753,82 +5124,87 @@ msgstr "Nid oes adolygiadau'n disgwyl cymedroli ar hyn o bryd."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Adolygiadau'r Proses"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Gwefan Benodol"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Newydd"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Diewddarwyd"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Rhaglenni wedi eu Profi"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Systemau Gweithredu wedi eu Profi"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Gwybodaeth Ychwanegol"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Ychwanegyn"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Math"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Math o Ychwanegyn"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Oed"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Rhaglenni"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Cyfyngu i locales?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platfform"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Math o Gyflwyno"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dwrnod"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s awr"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minud"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Gwrthod Mynediad"
 
@@ -5836,19 +5212,17 @@ msgstr "Gwrthod Mynediad"
 msgid "error_access_denied_message"
 msgstr "Nid oes gennyt ganiatâd i ddarllen y dudalen hon."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5857,14 +5231,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Heb ganfod ychwanegyn!"
 
@@ -5877,55 +5248,59 @@ msgstr "Nid yw'r ychwanegyn i'w weld yma."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Dim ychwanegion yn y categori hwn!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Nid yw hwn yn gyfeiriad e-bost dilys."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Rhaid i'r maes beidio â bod yn wag."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Heb ganfod y ffeil!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Gwall ffeil: Nid yw %s yn bodoli."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Mae gwallau yn y ffurflen. Cywira nhw a'i ailgyflwyno."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Mae i'r URL fformat annilys. Dyali URLau dilys edrych fel http://esiampl.com/"
@@ -5933,47 +5308,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Ymresymiad coll: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Hysbysiad"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Heb ganfod rhagolwg!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Rhaid dewis gradd."
 
@@ -5981,24 +5344,24 @@ msgstr "Rhaid dewis gradd."
 msgid "error_user_already_confirmed"
 msgstr "Mae'r cyfrif defnyddiwr eisoes wedi ei gadarnhau."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Cod cadarnhau annilys!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Mae'r cyfeiriad e-bost yn cael ei ddefnyddio gan ddefnyddiwr arall."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6006,23 +5369,14 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Mae'r llys enw yn cael ei ddefnyddio gan rywun arall."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Heb ganfod defnyddiwr!"
 
@@ -6032,42 +5386,39 @@ msgstr ""
 "Cadarnha dy gyfrif yn gyntaf gyda'r cod rwyt ti wedi ei dderbyn drwy'r e-"
 "bost."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Enw defnyddiwr neu gyfrinair anghywir!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Heb ganfod y fersiwn!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Cyfrinair anghywir wedi ei gynnig!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Dysgu mwy"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Dysgu mwy am %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s adolygiad"
 msgstr[1] "%1$s adolygiad"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Gweld mwy o"
 
@@ -6111,43 +5462,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Cedwir pob hawl."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Hawlfraint"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Diolchiadau"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mae Mozilla yn darparu cyswllt i'r rhaglenni hyn fel cwrteisi ac nid yw'n "
@@ -6155,112 +5505,105 @@ msgstr ""
 "cyfeirio unrhyw gwestiwn, cwyn neu geisiadau at y darparwr meddalwedd "
 "penodol."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Mynd"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Hysbysiad Cyfreithiol"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Ieithoedd Eraill"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Polisi Preifatrwydd"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Cadw"
+
+#: models/addontype.php:89
 #, fuzzy
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 #, fuzzy
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 #, fuzzy
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Add-on)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 #, fuzzy
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 #, fuzzy
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 #, fuzzy
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 #, fuzzy
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 #, fuzzy
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Dychwelyd i dudalen cartref Ychwanegion %1$s"
@@ -6269,95 +5612,37 @@ msgstr "Dychwelyd i dudalen cartref Ychwanegion %1$s"
 msgid "header_main_firefox_header"
 msgstr "Ychwanegion Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Ychwanegion"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Ychwanegion Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Ychwanegion Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Ychwanegion Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Ychwanegion"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Mewngofnodi"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Allgofnodi"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Cyfrif"
 
@@ -6365,70 +5650,47 @@ msgstr "Cyfrif"
 msgid "header_navlink_register"
 msgstr "Cofrestru"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Rhagolwg Delwedd %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Mewngofnodi</a> i osod yr ychwanegyn"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Ychwaneu at %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Ychwanegu %1$s at %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Llwytho %1$s i Lawr"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Nid yw'r ychwanegyn yma ar gael"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Rhestr o becynnau iaith a geiriaduron."
 
@@ -6440,8 +5702,8 @@ msgstr "Llwytho Geiriadur i Lawr"
 msgid "langtools_download_langpack"
 msgstr "Llwytho Pecyn Iaith i Lawr"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Geiriaduron a Phecynnau Iaith"
 
@@ -6453,81 +5715,37 @@ msgstr "Gosod Geiriadur"
 msgid "langtools_install_langpack"
 msgstr "Gosod Pecyn Iaith"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Geiriadur"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pecyn Iaith"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Iaith"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dyddiad"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Llwythi"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Enw Ychwanegyn"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Gradd"
@@ -6553,23 +5771,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
-#, fuzzy
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
-msgstr "Dictionaries & Language Packs"
+msgstr ""
 
-#: views/elements/addon_categories.thtml:55
-#, fuzzy
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr ""
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
-msgstr "Themes"
+msgstr ""
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "eraill"
 
@@ -6578,35 +5801,14 @@ msgstr "eraill"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6643,15 +5845,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Fersiynau Rhaglenni Dilys"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Rhaid i Ychwanegion sy'n cael eu cyflwyno i Ychwanegion Mozilla gael ffeil "
@@ -6659,7 +5861,7 @@ msgstr ""
 "fersiynau isod sydd ar gael i'r rhaglenni."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6668,15 +5870,19 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "yma"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Fersiynnau"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Tudalen Gwybodaeth y Blwch Tywod"
 
@@ -6684,6 +5890,12 @@ msgstr "Tudalen Gwybodaeth y Blwch Tywod"
 msgid "pagination_next_page"
 msgstr "nesaf"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Dyma dudalen %1$s o %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "blaenorol"
@@ -6723,17 +5935,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -6743,7 +5955,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6763,8 +5975,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -6782,7 +5994,7 @@ msgstr ""
 "editor review."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -6800,134 +6012,104 @@ msgstr ""
 "Guidelines</a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Adolygiadau o %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Ychwanegion Gorau"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Ychwanegion Diweddaraf"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Mae chwilio wedi ei anablu. Ceisiwch eto."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "pob ychwanegyn"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "chwilio am ychwanegion"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "o fewn"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Pob Peiriant Chwilio"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Pori'r Peiriannau Chwilio"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s ychwanegyn sy'n cydweddu"
+msgstr[1] "%s ychwanegyn sy'n cydweddu"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Heb ganfod canlyniad"
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Chwilio Ychwanegion"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Chwilio llif canlyniadau"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Canlyniadau chwilio am: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Offer Gweinyddol"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Offer Datblygu"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Offer Golygu"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Croeso"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Croeso, %s"
@@ -6936,7 +6118,7 @@ msgstr "Croeso, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Geiriadur"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Ychwanegion Gorau"
 
@@ -6944,7 +6126,7 @@ msgstr "Ychwanegion Gorau"
 msgid "sidebar_pitch_looking_for"
 msgstr "Rwy'n edrych am:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Ychwanegion Diweddaraf"
 
@@ -6952,7 +6134,7 @@ msgstr "Ychwanegion Diweddaraf"
 msgid "sidebar_pitch_search"
 msgstr "Ategyn Chwilio"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Tanysgrifio i"
 
@@ -6960,24 +6142,25 @@ msgstr "Tanysgrifio i"
 msgid "sidebar_pitch_theme"
 msgstr "Thema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Heb ei raddio eto"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Gradd o %s allan o 5 seren"
@@ -7014,13 +6197,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "Crëwyd %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "Ryddhawyd %1$s"
@@ -7033,185 +6216,185 @@ msgstr "Cau"
 msgid "statistics_help_link"
 msgstr "Cymorth"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "neu, ddewis ychwanegyn arall"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "neu, ddewis ychwanegyn gydag ystadegau cyhoeddus"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Dewis un o dy ychwanegion er mwyn gweld yr ystadegau"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Dewis ystadegyn i weld ei ystadegau"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Dewis ystadegyn gydag ystadegau cyhoeddus"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Bwrdd Gwybodaeth Ystadegau"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Gweld yr Ystadegau"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "dim"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Tynnu'r plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Wedi canfod %s dewis"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Ychwanebu Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Ychwanegu plot arall i'r graff"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Cuddio Cyfanswm y Cyfrif"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Dangos Cyfanswm y Cyfrif"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Gweld y Data (CVS)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Estyn ffeil CVS o'r data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Cuddio %s Digwyddiad"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Dangos %s Digwyddiad"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Gosod troshaen o ddyddiadau ryddhau ychwanegion ar y plotiau"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Cuddio Digwyddiadau Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Dangos Digwyddiadau Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Gosod troshaen o ddyddiadau ryddhau Firefox ar y plotiau"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Cau'r Graff"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Ehangu'r Graff"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Newid y graff"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Defnyddwyr Gweithredol Dyddiol"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Rhaglen"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Addasu"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Llwythi"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Systemau Gweithredu"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Statws Ychwanegyn"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Crynodeb"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Fersiwn yr Ychwanegyn"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Rhaglen"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "System Weithredu"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Statws Ychwanegyn"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Anhysbys"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Fersiwn yr Ychwanegyn"
 
@@ -7248,7 +6431,7 @@ msgstr "Mae dy osodiadau wedi eu diweddaru"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Bwrdd Gwybodaeth Ystadegau"
 
@@ -7276,105 +6459,109 @@ msgstr "Chwyddo Allan"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Chwyddo allan un mis"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Crynodeb dyddiol o ystadegau %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Llif RSS o grynodeb y data"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Ystadegau %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Drwy ragosodiad, dim ond ti a Mozilla sy'n cael mynediad at y wybodaeth ar "
 "dy fwrdd gwybodaeth. Gelli agor hwn i'r cyhoedd fel bod modd i bawb weld "
 "data dy ychwanegyn."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Mynediad i'r Bwrdd Gwybodaeth"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Preifat"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Dim ond ti a Mozilla sy'n gallu gweld ystadegau'r ychwanegyn"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Cyhoeddus"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Gall unrhyw un weld ystadegau'r ychwanegyn"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Newid y Gosodiadau"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Cofia drin y wybodaeth fel un cyfrinachol."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Mae'r bwrdd gwybodaeth yn un <b>preifat</b> ar hyn o bryd."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Mae'r bwrdd gwybodaeth yn <b>gyhoeddus</b> ar hyn o bryd."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Wedi Cloi"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Nôl i'r Bwrdd Gwybodaeth"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Cadw'r Gosodiadau"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Gosodiadau Bwrdd Gwybodaeth Ystadegau %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ddim ar Glo"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Rhaglen"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SW"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "ah"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Fer"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Cyfartaledd Llwythi Dyddiol"
 
@@ -7386,7 +6573,7 @@ msgstr "Llwythi"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Cyfri'r Diwrnod Diwethaf"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Llwythi yn ystod y 7 diwrnod diwethaf"
 
@@ -7404,7 +6591,7 @@ msgstr "Ers %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Dim data eto"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Cyfartaledd Defnyddwyr Dyddiol Gweithredol"
 
@@ -7430,52 +6617,35 @@ msgstr "Defnyddwyr Dyddiol Gweithredol"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Ar %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Ystadegau %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Pob Thema"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Pori'r Themâu"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Newid cyfrinair"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Mae'r cod cadarnhau wedi ei ail anfon!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7483,23 +6653,23 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7509,60 +6679,60 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7570,7 +6740,7 @@ msgstr ""
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7578,18 +6748,18 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -7597,7 +6767,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7626,8 +6796,9 @@ msgstr ""
 "-- Staff Ychwanegion %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -7667,116 +6838,93 @@ msgstr ""
 "Diolch,\n"
 "-- Staff Ychwanegion %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Ailosod dy gyfrinair Ychwanegion %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Cadarnhau'r cyfrinair"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Golygu proffil defnyddiwr ar gyfer %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Cyfeiriad e-bost"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Enw cyntaf"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Cuddio'r cyfeiriad e-bost"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL y wefan"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Enw olaf"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Mewngofnod Defnyddiwr"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Cyfrinair newydd"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Llys enw"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Hen gyfrinair"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Cyfrinair"
 
@@ -7784,70 +6932,70 @@ msgstr "Cyfrinair"
 msgid "user_form_registration"
 msgstr "Cofrestriad defnyddiwr Newydd"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Dangos y blwch tywod?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Cadw"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Mewngofnodi"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Cofrestru"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s defnyddiwr Ychwanegion ers"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Creu cyfrif defnyddiwr newydd"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "Roedd gwallau yn y newidiadau wnes ti. Cywira nhw a'u hail gyflwyno."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Diweddarwyd y proffil"
 
@@ -7860,15 +7008,15 @@ msgstr "Ailosod y cyfrinair ar gyfer %s"
 msgid "user_pwreset_header"
 msgstr "Ailosod y Cyfrinair"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Wedi anghofio dy gyfrinair?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Mae cyswllt ailosod dy gyfrinair wedi ei anfon at dy gyfeiriad e-bost."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Mae'r cyfrinair wedi ei ailosod yn llwyddiannus."
 
@@ -7880,7 +7028,7 @@ msgstr "Cyflwyno newid i'r cyfrinair"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Anfon cyswllt ailosod y cyfrinair"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Ychanegyn"
@@ -7894,7 +7042,7 @@ msgstr ""
 "Rhaid i ti glicio arno cyn bod modd mewngofnodi i Ychwanegion %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7906,25 +7054,11 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "ailanfon y neges cadarnhau"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr ""
 "Llongyfarchiadau! Mae dy gyfrif defnyddiwr wedi ei greu yn llwyddiannus."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7935,32 +7069,22 @@ msgstr ""
 "cysylltu â %1$s ar yr e-bost uchod."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Diolch am gofrestru a chroeso i %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -7969,68 +7093,52 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Wedi ei ddilysu'n llwyddiannus!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Golygu Cyfrif Defnyddiwr"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Ychwanegion gan %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Enw"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Proffil Defnyddiwr"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Cyfeiriad E-bost"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Tudalen Cartref"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Llys Enw"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Gwybodaeth Defnyddiwr %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Mewngofnod Defnyddiwr"
 
@@ -8062,708 +7170,5 @@ msgstr "Ailosod Cyfrinair Defnyddiwr"
 msgid "users_register_pagetitle"
 msgstr "Cofrestru defnyddiwr Newydd"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Y fersiwn cydnaws diweddar yw"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Hanes Llawn Bob Fersiwn"
-
-#, fuzzy
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Newest:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Mwyaf Poblogaidd:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Y Goreuon:"
-
-#, fuzzy
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Recently Updated:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Gweld popeth"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Gweld yr Ychwanegion Gorau"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Gradd Uchaf yn Gyntaf"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Diweddarwyd Diwethaf yn Gyntaf"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Mwyaf Poblogaidd yn Gyntaf"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Nid yw'r fersiwn yma o dy ychwanegyn yn honni cytunedd gyda Firefox %1$s. "
-#~ "Mae Mozilla yn disgwyl fersiwn nesaf o Firefox i gael ei ryddhau yn fuan, "
-#~ "felly profa'r ychwanegyn gyda'r fersiwn newydd a diweddaru'r wybodaeth "
-#~ "cytunedd. Mae modd cael mwy o wybodaeth yn fan <a href=\"%2$s\">hyn</a>. "
-#~ "Dim ond er gwybodaeth yw hyn ac mae modd parhau i gyflwyno'r fersiwn i "
-#~ "addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Ychwanegyn wedi ei anablu'n llwyddiannus"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Golygu Ychwanegyn"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Ychwanegyn wedi ei alluogi'n llwyddiannus"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Disgrifiad o Ychwanegyn"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Ychwanegu Tiudalen Cartref"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Enw'r Ychwanegyn"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Polisi Preifatrwydd"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Crynodeb Ychwanegion"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Cynnal E-bost"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Cynnal URL"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Nodiadau'r Fersiwn"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Enwebu Ychwanegyn"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Enwebwyd Ychwanegyn yn llwyddiannus!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Dos i dudalen %1$s  i wneud newidiadau i dy gyflwyniad, neu i %2$s i "
-#~ "ddychwelyd i Offer Datblygwyr."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "clicia yma"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Golygu Ychwanegyn"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Mae'r fersiwn yma wedi ei osod yn y blwch tywod tra ei fod yn disgwyl "
-#~ "adolygiad gan brofwyr y blwch tywod a golygydd Ychwanegion Mozilla. "
-#~ "Byddi'n cael dy hysbysu pan fydd gweithred wedi digwydd."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Gelli ddarllen mwy am System Adolygu Blwch Tywod %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "yma"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Mae'r fersiwn yma wedi ei osod yn y blwch tywod ar gyfer Datblygwyr Uwch. "
-#~ "Er mwyn iddo gael ei ddangos ar y safle cyhoeddus, rhaid %s dy ychwanegyn "
-#~ "a mynd drwy broses adolygu."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "enwebu"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Mae dy gyflwyniad o ychwanegyn wedi bod yn llwyddiant."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Gan ein bod yn ymddiried yn dy ychwanegyn, mae'r fersiwn wedi cael ei "
-#~ "dderbyn yn awtomatig ar gyfer y man cyhoeddus."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Cyflwyno Ychwanegyn"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Ychwanegyn wedi ei ddiweddaru'n llwyddiannus"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr ""
-#~ "Efallai y byddwch yn awyddus i %s gynyddu diddordeb yn eich ychwanegyn."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "llwytho'r rhagolwg"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Heb ganfod awdur [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Tynnu"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Diddymu"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Ydych chi'n siŵr eich bod am ddiddymu eich cyflwyniad?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Nesaf"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Newid y math o ychwanegyn:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Diweddarwyd Sylwadau Datblygwyr"
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Ychwanegu Rhagolwg"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Awdur"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Awduron"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Dim"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categorïau"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Categori"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Disgrifiad"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Anablu"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Manylion"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Sylwadau Datblygwyr"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Rhagolygon"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Fersiynau"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Tudalen Cartref"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Dim"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Dim pennawd"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Heb ganfod rhagolygon"
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Diweddaru"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Cynnal E-bost"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Dim e-bost cefnogi wedi ei ddarparu gan y datblygwr."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL Cefnogi"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Dim url cefnogi wedi ei ddarparu gan y datblygwr."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Ymddiriedir"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Heb ganfod fersiwn."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Diddymu a mynd nôl"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Iawn, ei anablu"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Wyt ti'n siŵr dy fod am anablu'r ychwanegyn?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Bydd anablu'r ychwanegyn yn ei guddio rhag y chwilio a'r rhestrau. Ni "
-#~ "fydd modd ei lwytho i lawr o'r wefan ac ni fydd yn cael ei ddychwelyd "
-#~ "mewn gwiriad gan raglen diweddaru. Bydd yr ychwanegyn wedi ei ddileu i "
-#~ "bob pwrpas, er y bydd modd dychwelyd yma a'i ail alluogi."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Anablu %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Iawn, ei alluogi"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Wyt ti'n siŵr dy fod am alluogi yr ychwanegyn?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Bydd galluogi'r ychwanegyn yn achosi ei fod yn ymddangos wrth chwilio ac "
-#~ "mewn rhestrau. Bydd ar gael i'w lwytho i lawr o'r wefan a drwy wiriad "
-#~ "diweddaru'r rhaglen."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Galluogi %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Ychwanegu Awdur"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Cyfeiriad E-bost yr Awdur"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Tynnu"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Does dim categorïau ar gael ar gyfer y math yma o ychwanegyn."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Awduron"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Ychwanegu Eicon"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Newid Eicon"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Caniatáu i ddefnyddwyr weld y ffeiliau ffynhonnell ar-lein"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categoriau"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Lleoliad Rhagosodedig"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Dim ond tynnu'r eicon cyfredol"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Ffeil Eicon Newydd"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Eicon"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "gwybodaeth ychwanegol gryno (megis enw 'r lleoliad targed)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Diweddaru"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">enw lleoliad "
-#~ "syml</a>, megis 'cy-GB'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "bydd ffeiliau wedi eu ticio'n cael eu dilwu"
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Ffeiliau"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Rhaglenni Targed"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Dim ffeiliau."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Nodiadau ar gyfer Adolygwyr"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Diweddaru"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Mae crynodebau wedi eu cyfyngu i ddim mwy na 250 nod.\n"
-#~ "(Rwyt wedi rhoi %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Mae enw dy ychwanegyn eisoes yn y gronfa ddata. Gwna'n siŵr: <br /"
-#~ "><li>Bod dy GUIDau'n cyd-fynd. Y rheswm mwyaf cyffredin am y gwall hwn yw "
-#~ "nad yw'r GUIDau'n cyd-fynd.</li><li>Nad oes gennyt ddau gofnod yn y "
-#~ "gronfa ddata. Os oes, dylet ddiweddaru'r cofnod neu ei ddileu a cheisio "
-#~ "eto.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Disgrifia'r newidiadau sydd yn bodoli yn y diweddariad."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Nid yw pob ffeil GUIDau'n cyd-fynd"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Mae fersiwn yn union yr un peth (%s) yn bodoli eisoes ar gyfer yr "
-#~ "ychwanegyn a'r platfform hwn."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Rhaid darparu'r wybodaeth gofynnwyd amdano ar gyfer enwebiad."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Nid oes modd enwebu ychwanegyn cyn ei ryddhau."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Dim ond ychwanegion sydd eisoes yn y blwch tywod y mae modd eu henwebu."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Digwyddodd gwall wrth geisio cadw dy ddata."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Nid oes gennyt ganiatâd i ddiweddaru'r ychwanegyn."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Ychwanega Ffeil Platfform Arall"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Ychwanegu Awdur"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Tynnu"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Bydd categorïau ar gyfer dy fath newydd o ychwanegyn ar gael yn y cam "
-#~ "nesaf."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Nid oes categori ar gael ar gyfer y math yma o ychwanegyn."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Rhowch ddisgrifiad o dy ategyn."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Rho enw ar gyfer dy ychwanegyn."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Dewis y math o ychwanegyn rwyt ti'n ei gyflwyno."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Rho grynodeb o dy ychwanegyn."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Ffeil Ychwanegyn"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Ffeil Ychwanegyn 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Ffeil Ychwanegyn 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Math o Ychwanegyn"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Caniatáu i ddefnyddwyr weld ffeiliau'r ffynhonnell ar-lein."
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Cyfeiriad E-bost yr Awdur"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Awduron"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categorïau"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Lleoliad Rhagosodedig"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Disgrifiad"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Cytundeb Trwydded Defnyddiwr (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Mae'r ychwanegyn hwn angen meddalwedd allanol"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Ffeiliau"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Tudalen Cartref"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Ffeil Eicon"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Enw"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Platfform sy'n Cael eu Cynnal"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Fersiwn cyn rhyddhad yw hwn"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Polisi Preifatrwydd"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Mae hwn yn ychwanegyn gwefan benodol"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Crynodeb"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "E-bost Cefnogi"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL Cefnogi"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Rhaglenni Targed"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Fersiwn"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Nodiadau Fersiwn"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Dim"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Nodiadau ar gyfer yr Adolygwr"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Gan fod dy ychwanegyn yn un dibynadwy, dewisa lle ddylai'r fersiwn yma "
-#~ "fynd:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Cyhoeddus"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Blwch Tywod"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Cytundeb Datblygwr"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Cam 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Llwytho Ffeil i Fyny"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Cam 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Manylion Ychwanegyn"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Cam 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Manylion y Fersiwn"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Cam 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Lleoleiddio"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Cam 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Llwyddiant"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Fy Ychwanegion"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Nôl i fanylion ychwanegyn"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Wedi canfod yna awtomatig y math o ychwanegyn: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Mae locale'r ychwanegyn (%1$s [%2$s]) yn wahanol i'r locale rwyt ti wedi "
-#~ "ei ddewis (%3$s [%4$s]). Rhaid llawn y meysydd %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Anghywir?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Wyt ti'n siŵr dy fod am ddileu'r ffeil?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Hepgor diweddaru fy ngwybodaeth gyfredol ar yr ychwanegyn"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Mae cyflwyno ychwanegion wedi eu hanablu ar hyn o bryd. Dewch nôl eto."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Rwy'n Derbyn"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Rwy'n Gwrthod"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Mae'r ychwanegyn wedi ei anablu gan y gweinyddwr."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Anablwyd"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Ymddiriedwyr"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Nid oes gennyt ychwanegion. Clicia %s i gyflwyno un."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "yma"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Gwnewch yn siŵr eich bod %s ar gyfer eich thema."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "llwytho rhagolwg i fyny"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Golygu Fersiwn"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Diweddarwyd y fersiwn yn llwyddiannus."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Newydd"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Diewddarwyd"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Math o Ychwanegyn"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Oed"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Rhaglenni"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platfform"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Math o Gyflwyno"
-
-#~ msgid "error_notice"
-#~ msgstr "Hysbysiad"
-
-#~ msgid "forum_save"
-#~ msgstr "Cadw"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Dyma dudalen %1$s o %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s ychwanegyn sy'n cydweddu"
-#~ msgstr[1] "%s ychwanegyn sy'n cydweddu"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Llif RSS o grynodeb y data"
diff --git a/site/app/locale/da/LC_MESSAGES/da.txt b/site/app/locale/da/LC_MESSAGES/da.txt
index 5690fe4..667dcd3 100644
--- a/site/app/locale/da/LC_MESSAGES/da.txt
+++ b/site/app/locale/da/LC_MESSAGES/da.txt
@@ -171,6 +171,7 @@ msgstr "Svar fra udvikleren:"
 msgid "addon_review_saved_successfully"
 msgstr "Din anmeldelse er gemt. Tak!"
 
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "af %1$s den %2$s"
 
@@ -213,9 +214,6 @@ msgstr "Gennemse %s"
 msgid "addons_browse_categories_header_theme"
 msgstr "Gennemse temaer i kategorien %1$s :: %2$s Add-ons"
 
-msgid "addons_display_a_license_what"
-msgstr "Hvad er dette?"
-
 msgid "addons_display_add_review"
 msgstr "Tilføj en anmeldelse"
 
@@ -246,9 +244,6 @@ msgstr "Kommentarer fra udvikleren"
 msgid "addons_display_header_homepage"
 msgstr "Hjemmeside"
 
-msgid "addons_display_header_license"
-msgstr "Licens for kildekode"
-
 msgid "addons_display_header_reviews"
 msgstr "Anmeldelser"
 
@@ -317,6 +312,7 @@ msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Retningslinjer for anmeldelser</a>"
 
 #. %1 is the support section link
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Se <a href=\"%1$s\">supportafsnittet</a> for at finde ud af hvor du kan få "
@@ -337,6 +333,9 @@ msgstr "Vis alle anmeldelser (%1$s)"
 msgid "addons_display_see_all_versions"
 msgstr "Vis alle versioner"
 
+msgid "addons_display_version_history"
+msgstr "Fuldstændig versionshistorik"
+
 msgid "addons_display_view_source"
 msgstr "Vis kildekoden"
 
@@ -474,9 +473,6 @@ msgstr ""
 msgid "addons_previews_pagetitle"
 msgstr "Skærmbilleder af %s"
 
-msgid "addons_recently_added"
-msgstr "Tilføjet fornyligt"
-
 msgid "addons_recommended_introduction"
 msgstr ""
 "Med så mange fantastiske tilføjelser er der noget for enhver smag. Her er en "
@@ -508,6 +504,7 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Lær hvordan du %1$s hos %2$s."
 
@@ -520,6 +517,7 @@ msgid "addons_searchengines_makeyourown_link"
 msgstr "laver din egen"
 
 #. %1 is the link to mycroft.mozdev.org
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Find flere søgetjenester hos %1$s"
 
@@ -577,12 +575,6 @@ msgstr "Ukendt"
 msgid "addons_title_tooltip"
 msgstr "Lær mere om denne tilføjelse"
 
-msgid "addons_top_downloads"
-msgstr "Flest downloads"
-
-msgid "addons_top_rated"
-msgstr "Bedste bedømmelse"
-
 msgid "addons_versions_careful"
 msgstr "Pas på med gamle versioner"
 
@@ -744,19 +736,23 @@ msgstr "Kategorier"
 msgid "categories_header_title"
 msgstr "Vælg en kategori"
 
+msgid "category_extra_allrecommended"
+msgstr "Se alle anbefalede tilføjelser"
+
+msgid "category_extra_highestrated"
+msgstr "Bedst bedømte først"
+
+msgid "category_extra_lastupdated"
+msgstr "Sidst opdaterede først"
+
+msgid "category_extra_mostpopular"
+msgstr "Mest populære først"
+
 #. %1$s is the category name
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Se alle tilføjelser i kategorien %1$s"
 
-#. %1$s is a number.
-msgid "collection_description_limit"
-msgstr "Beskrivelsen bør være mindre end %1$s tegn."
-
-#. %1$s is a number.
-msgid "collection_name_limit"
-msgstr "Navnet bør være mindre end %1$s tegn."
-
 msgid "collection_not_found"
 msgstr "Samlingen findes ikke!"
 
@@ -911,10 +907,7 @@ msgstr ""
 "Licens</a>."
 
 msgid "credits_software_timeplot"
-msgstr ""
-"Nogle sider bruger elementer fra <a href=\"http://www.simile-widgets.org/timeplot/"
-"\">Timeplot</a>, givet i licens under en <a href=\"http://simile.mit.edu/license."
-"html\">BSD-licens</a>."
+msgstr "Nogle sider bruger elementer fra <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, givet i licens under en <a href=\"http://simile.mit.edu/license.html\">BSD-licens</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
@@ -926,9 +919,2654 @@ msgstr "%e. %B %Y"
 msgid "datetime"
 msgstr "%e. %B %Y, %H:%M"
 
+msgid "devcp_actionbar_link_details"
+msgstr "Detailed Info"
+
+msgid "devcp_actionbar_link_edit"
+msgstr "Edit Add-on"
+
+msgid "devcp_actionbar_link_newversion"
+msgstr "Upload New Version"
+
+msgid "devcp_actionbar_link_stats"
+msgstr "Statistics Dashboard"
+
+#. %1$s is a filename, e.g. "foo.txt"
+#. %2$s is the extension, e.g. ".txt"
+#. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
+msgid "devcp_add_previews_extension_error"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
+
+#. %s is the filename.
+msgid "devcp_add_previews_save_error"
+msgstr "File %s could not be saved to the database. Please try again."
+
+#. %1$s is the preview ID number, %2$s is the filename.
+msgid "devcp_add_previews_success_replace"
+msgstr "Preview %1$s was replaced with file %2$s successfully."
+
+#. %s is the filename.
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
+msgid "devcp_additem_addontype_autodetect"
+msgstr "(auto-detect)"
+
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
+msgid "devcp_additem_linktitle_opensin_newwindow"
+msgstr "Opens in a new window"
+
+msgid "devcp_additem_sidebar_title"
+msgstr "Submit Add-on"
+
+msgid "devcp_additem_step0_newlink"
+msgstr "Developer Agreement"
+
+msgid "devcp_additem_step1_link"
+msgstr "Step 1: Upload"
+
+msgid "devcp_additem_step2_link"
+msgstr "Step 2: Add-on Details"
+
+msgid "devcp_additem_step3_link"
+msgstr "Step 3: Version Details"
+
+msgid "devcp_additem_step4_link"
+msgstr "Step 4: Localization"
+
+msgid "devcp_additem_step5_link"
+msgstr "Step 5: Success"
+
+msgid "devcp_additem_submissionhelp_link"
+msgstr "Submission Help"
+
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
+msgid "devcp_addon_field_preview_caption_displaytitle"
+msgstr "Preview Caption"
+
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL" 
+
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+msgid "devcp_addon_status_action_activate_description"
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
+
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+msgid "devcp_addon_status_action_complete_description"
+msgstr "Complete your add-on and move to the Sandbox"
+
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
+
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+msgid "devcp_addon_status_action_move_description"
+msgstr "Move your add-on back to the Sandbox. This is reversible."
+
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "Nominate your add-on to become Public"
+
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+msgid "devcp_addon_status_action_public_description"
+msgstr "Make your add-on Public again."
+
+msgid "devcp_addon_status_active"
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
+
+msgid "devcp_addon_status_completion_disabled"
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
+
+msgid "devcp_addon_status_completion_enabled"
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
+
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Add-on is not marked as pre-release."
+
+msgid "devcp_addon_status_criteria_preview"
+msgstr "At least one preview image required for extensions and themes."
+
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
+msgid "devcp_addon_status_criteria_summary"
+msgstr "Add-on Summary required"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+msgid "devcp_addon_status_header"
+msgstr "Add-on Status: %s"
+
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+msgid "devcp_addon_status_header_active"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
+
+msgid "devcp_addon_status_header_criteria"
+msgstr "Add-on Completion Criteria"
+
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+msgid "devcp_addon_status_header_trusted"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
+
+msgid "devcp_addon_status_inactive"
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
+
+msgid "devcp_addon_status_nominate_disabled"
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
+
+msgid "devcp_addon_status_nominate_enabled"
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
+
+msgid "devcp_addon_status_public"
+msgstr "Public"
+
+msgid "devcp_addon_status_sandbox"
+msgstr "Sandbox"
+
+#. %s is an email address.
+msgid "devcp_addon_status_switch_disabled"
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
+
+msgid "devcp_addon_status_switch_incomplete"
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
+
+#. %s is a number, perhaps 42.
+msgid "devcp_addon_status_switch_nominated"
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
+
+#. %s is an email address.
+msgid "devcp_addon_status_switch_pending"
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
+
+msgid "devcp_addon_status_switch_public"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
+
+msgid "devcp_addon_status_switch_sandbox"
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
+
+#. %s is the add-on name.
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+msgid "devcp_addon_status_trusted"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+#. %1 is the link to the sandbox information page
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+#. %1 is the "nominate" link
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+#. %1 is the link to the preview upload page
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+#. #1 is the author email
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+msgid "devcp_button_next"
+msgstr "Next"
+
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
+msgid "devcp_dashboard_active"
+msgstr "Active"
+
+#. %1$s is the add-on type string
+#. %2$s is Inactive or Active in a <span>
+#. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
+msgid "devcp_dashboard_addontype_status"
+msgstr "%1$s currently %2$s and %3$s"
+
+msgid "devcp_dashboard_change_status"
+msgstr "Change Status"
+
+#. %s is the addons email address.
+msgid "devcp_dashboard_disabled_questions"
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
+
+#. %s is the (localized) add-on status string in a span, e.g. "Disabled"
+msgid "devcp_dashboard_disabled_status"
+msgstr "Add-on Status: %s"
+
+msgid "devcp_dashboard_header_main"
+msgstr "Developer Dashboard"
+
+msgid "devcp_dashboard_header_welcome"
+msgstr "Welcome to the Developer Dashboard"
+
+msgid "devcp_dashboard_inactive"
+msgstr "Inactive"
+
+#. %s is a date in the _('date') format
+msgid "devcp_dashboard_last_edited"
+msgstr "Last edited on %s"
+
+msgid "devcp_dashboard_learn"
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
+
+msgid "devcp_dashboard_start"
+msgstr "Get Started"
+
+msgid "devcp_dashboard_versions"
+msgstr "Versions and Files"
+
+msgid "devcp_dashboard_versions_new"
+msgstr "Upload a new version"
+
+#. %s is the preview ID number.
+msgid "devcp_delete_previews_error"
+msgstr "Preview %s could not be deleted from the database. Please try again."
+
+#. %s is the preview ID number.
+msgid "devcp_delete_previews_success"
+msgstr "Preview %s has been deleted successfully."
+
+msgid "devcp_delete_version_priv_error"
+msgstr "You do not have privileges to delete versions or files."
+
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+msgid "devcp_details_author"
+msgstr "Author"
+
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+msgid "devcp_details_category"
+msgstr "Category"
+
+msgid "devcp_details_description"
+msgstr "Description"
+
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
+#. %s is a version number.  Example:  3.0
+#, php-format
+msgid "devcp_details_version"
+msgstr "Version %s"
+
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
+msgid "devcp_discuss_addreply_header"
+msgstr "Add Reply"
+
+msgid "devcp_discuss_allreplies_header"
+msgstr "Replies"
+
+#. notice when an error occurs saving a discussion reply
+#. %1 is the email address (linked) for the amo-editors list
+msgid "devcp_discuss_error_notice"
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
+
+#. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
+msgid "devcp_discuss_intro"
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
+
+#. %1 is the add-on name
+msgid "devcp_discuss_pagetitle"
+msgstr "Provide More Information For the Add-on Review of %1$s"
+
+#. submit button text
+msgid "devcp_discuss_submit_reply"
+msgstr "Submit Reply"
+
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
+
+#. in an author/editor discussion about an add-on to be reviewed:
+#. %1 is the commenter's user name (linked).
+#. %2 is the full date the comment was made.
+msgid "devcp_discuss_writtenby"
+msgstr "written by %1$s on %2$s"
+
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+msgid "devcp_edit_authors_add_author"
+msgstr "Add New Author"
+
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+msgid "devcp_edit_authors_add_email"
+msgstr "Author Account Email:"
+
+msgid "devcp_edit_authors_add_loading"
+msgstr "Checking account email..."
+
+msgid "devcp_edit_authors_click_save"
+msgstr "Click the Update Authors button below to save."
+
+msgid "devcp_edit_authors_header_current"
+msgstr "Current Authors"
+
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+msgid "devcp_edit_authors_label_add_listed"
+msgstr "List as author in public display pages"
+
+msgid "devcp_edit_authors_label_developer"
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
+
+msgid "devcp_edit_authors_label_owner"
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
+
+msgid "devcp_edit_authors_label_viewer"
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
+
+#. Placeholder for the empty option in a <select>.
+msgid "devcp_edit_authors_option_empty"
+msgstr "----------------"
+
+msgid "devcp_edit_authors_select_role"
+msgstr "Select a role for the author:"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_listed"
+msgstr "Listed"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "My add-on doesn't fit into any available categories."
+
+#. %s is the application name (Firefox, Thunderbird).
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+msgid "devcp_edit_categories_hover"
+msgstr "Hover over a category to see its description."
+
+#. %s is the category number (1, 2, 3).
+msgid "devcp_edit_categories_label_category_num"
+msgstr "Category %s"
+
+msgid "devcp_edit_categories_none_available"
+msgstr "No categories are available for this add-on type and application."
+
+msgid "devcp_edit_categories_other"
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
+
+#. %s is the application name (Firefox, Thunderbird).
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "Select up to three %s categories for your add-on"
+
+msgid "devcp_edit_dd_manage_authors"
+msgstr "Add or remove users that can manage this add-on."
+
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
+
+msgid "devcp_edit_dd_manage_description"
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
+
+msgid "devcp_edit_dd_manage_properties"
+msgstr "Change your add-on's name, homepage, icon, and other flags."
+
+msgid "devcp_edit_description_button_update"
+msgstr "Update Descriptions"
+
+msgid "devcp_edit_description_correct_error"
+msgstr "Please correct the errors above indicated in red."
+
+msgid "devcp_edit_descriptions_header"
+msgstr "Edit Add-on Descriptions"
+
+msgid "devcp_edit_descriptions_transbox_comments_description"
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
+
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Developer Comments"
+
+msgid "devcp_edit_descriptions_transbox_description_description"
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
+
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Add-on Description"
+
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
+
+msgid "devcp_edit_descriptions_transbox_eula_name"
+msgstr "End-User License Agreement"
+
+msgid "devcp_edit_descriptions_transbox_privacy_description"
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
+
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "Privacy Policy"
+
+msgid "devcp_edit_descriptions_transbox_summary_description"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
+
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+msgid "devcp_edit_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+msgid "devcp_edit_label_locale_disambiguation"
+msgstr "Additional Locale Info"
+
+msgid "devcp_edit_label_prerelease"
+msgstr "This is a pre-release"
+
+msgid "devcp_edit_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+msgid "devcp_edit_label_target_locale"
+msgstr "Target Locale"
+
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+msgid "devcp_edit_properties_button_update"
+msgstr "Update Properties"
+
+msgid "devcp_edit_properties_change_guid"
+msgstr "Only change if you understand all of the consequences."
+
+msgid "devcp_edit_properties_current_icon"
+msgstr "Current Icon"
+
+msgid "devcp_edit_properties_default_locale"
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
+
+msgid "devcp_edit_properties_flags"
+msgstr "These flags are used to filter and classify add-ons."
+
+msgid "devcp_edit_properties_guid"
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
+
+msgid "devcp_edit_properties_header"
+msgstr "Edit Add-on Properties"
+
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Add-on Type"
+
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Admin Settings"
+
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Default Locale"
+
+msgid "devcp_edit_properties_header_flags"
+msgstr "Add-on Flags"
+
+msgid "devcp_edit_properties_header_guid"
+msgstr "Add-on GUID"
+
+msgid "devcp_edit_properties_header_icon"
+msgstr "Add-on Icon"
+
+msgid "devcp_edit_properties_header_other_settings"
+msgstr "Other Settings"
+
+#. A header on the admin page to toggle trusted status.
+msgid "devcp_edit_properties_header_trusted"
+msgstr "Trusted Add-on?"
+
+msgid "devcp_edit_properties_header_view_source"
+msgstr "View Source Online"
+
+#. %s is a comma-separated list of image extensions ".png, .jpg"
+msgid "devcp_edit_properties_icon"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
+
+msgid "devcp_edit_properties_label_binary"
+msgstr "This add-on contains binary components"
+
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Not Trusted"
+
+msgid "devcp_edit_properties_label_trusted"
+msgstr "Trusted"
+
+msgid "devcp_edit_properties_new_icon"
+msgstr "New Icon"
+
+msgid "devcp_edit_properties_remove_icon"
+msgstr "Remove Icon"
+
+msgid "devcp_edit_properties_transbox_homepage_description"
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
+
+msgid "devcp_edit_properties_transbox_homepage_name"
+msgstr "Add-on Homepage"
+
+msgid "devcp_edit_properties_transbox_name_description"
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
+
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Add-on Name"
+
+msgid "devcp_edit_properties_transbox_supportemail_description"
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
+
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr "Support Email Address"
+
+msgid "devcp_edit_properties_transbox_supporturl_description"
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
+
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "Support Website"
+
+msgid "devcp_edit_properties_trusted"
+msgstr "Trusted add-ons can become public without Editor review."
+
+#. %s is href="..." and should stay in the <a> tag.
+msgid "devcp_edit_properties_undelete"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
+
+msgid "devcp_edit_properties_view_source"
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
+
+msgid "devcp_edit_properties_view_source_allow"
+msgstr "Allow online source viewing"
+
+msgid "devcp_edit_properties_view_source_do_not_allow"
+msgstr "Do not allow online source viewing"
+
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
+msgid "devcp_editbox_authors"
+msgstr "Authors"
+
+msgid "devcp_editbox_categories"
+msgstr "Categories"
+
+msgid "devcp_editbox_change_status"
+msgstr "Change Status"
+
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
+msgid "devcp_editorsqueue_featured"
+msgstr "Featured Add-ons"
+
+#. %1 is the review count
+#, php-format
+msgid "devcp_editorsqueue_moderatedreviews"
+msgid_plural "devcp_editorsqueue_moderatedreviews"
+msgstr[0] "Moderated Reviews (%s)"
+msgstr[1] "Moderated Reviews (%s)"
+
+#. %1 is the nominated addons count
+#, php-format
+msgid "devcp_editorsqueue_nominated"
+msgid_plural "devcp_editorsqueue_nominated"
+msgstr[0] "Nominated Add-ons (%s)"
+msgstr[1] "Nominated Add-ons (%s)"
+
+#. %1 is the update count
+#, php-format
+msgid "devcp_editorsqueue_pendingupdates"
+msgid_plural "devcp_editorsqueue_pendingupdates"
+msgstr[0] "Pending Updates (%s)"
+msgstr[1] "Pending Updates (%s)"
+
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+msgid "devcp_error_addon_access_denied"
+msgstr "You do not have access to that add-on."
+
+#. %s is a number
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
+#. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
+#. in the <a> tag.  This should be fixed.
+#, php-format
+msgid "devcp_error_appversion_reference_link"
+msgstr "Please see %s for reference."
+
+#. This is the link text in the <a> for devcp_error_appversion_reference_link.  This
+#. should be fixed.
+msgid "devcp_error_appversion_reference_link_text"
+msgstr "this page"
+
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
+
+#. %1$s is the name of the file
+#, php-format
+msgid "devcp_error_file_exists"
+msgstr ""
+"A version of that add-on already exists. To replace it, you must delete the "
+"file %1$s first."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_file_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for the selected add-on type. "
+"Please use one of the following: %2$s"
+
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
+msgid "devcp_error_five_categories"
+msgstr "Please select no more than five categories."
+
+msgid "devcp_error_guid_application"
+msgstr "The ID of this add-on is already used by an application."
+
+msgid "devcp_error_http_incomplete"
+msgstr "Incomplete transfer"
+
+msgid "devcp_error_http_maxupload"
+msgstr "Exceeds maximum upload size"
+
+msgid "devcp_error_http_nofile"
+msgstr "No file uploaded"
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_icon_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for an icon. Please use one of the "
+"following: %2$s"
+
+#. %s is a version number.  Example:  3.1.1
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+msgid "devcp_error_index_rdf_notfound"
+msgstr "No install.rdf present."
+
+msgid "devcp_error_install_manifest"
+msgstr "The following errors were found in install.rdf:"
+
+msgid "devcp_error_invalid_addontype"
+msgstr "Please select a valid add-on type."
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#, php-format
+msgid "devcp_error_invalid_appversion"
+msgstr "%1$s is not a valid version for %2$s"
+
+#. %s is a string
+#, php-format
+msgid "devcp_error_invalid_guid"
+msgstr "The ID of this add-on is invalid: %s"
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#, php-format
+msgid "devcp_error_invalid_minversion"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
+
+msgid "devcp_error_invalid_version"
+msgstr ""
+"The version of this add-on is invalid: please see the <a href=\"http://"
+"developer.mozilla.org/en/docs/Toolkit_version_format\">specification</a>"
+
+msgid "devcp_error_invalid_version_spaces"
+msgstr "The version of this add-on is invalid: versions cannot contain spaces."
+
+#. %s is an error message from the parser.
+#, php-format
+msgid "devcp_error_manifest_parse"
+msgstr "The following error occurred while parsing install.rdf: %s"
+
+msgid "devcp_error_move_file"
+msgstr "Could not move file"
+
+#. %s is the name of a file
+#, php-format
+msgid "devcp_error_moving_file"
+msgstr "An error occurred moving %s."
+
+msgid "devcp_error_mozilla_application"
+msgstr "You must have at least one valid Mozilla target application."
+
+msgid "devcp_error_no_guid"
+msgstr "No ID could be found for this add-on in install.rdf."
+
+msgid "devcp_error_no_platform"
+msgstr "No platform selected"
+
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
+msgid "devcp_error_one_category"
+msgstr "Please select at least one category."
+
+msgid "devcp_error_one_user"
+msgstr "There must be at least one author for this add-on."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_preview_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for a preview. Please use one of "
+"the following: %2$s"
+
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
+msgid "devcp_error_updatekey"
+msgstr ""
+"Add-ons cannot use an updateKey. Please remove this from install.rdf and try "
+"again."
+
+msgid "devcp_error_updateurl"
+msgstr ""
+"Add-ons cannot use an external updateURL. Please remove this from install."
+"rdf and try again."
+
+msgid "devcp_error_upload_file"
+msgstr "Please upload a file."
+
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+msgid "devcp_js_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_js_add_email"
+msgstr "Please enter the account email of the author you wish to add."
+
+#. alt text for a down-arrow image.
+msgid "devcp_js_img_move_down"
+msgstr "Move Down"
+
+#. alt text for an up-arrow image.
+msgid "devcp_js_img_move_up"
+msgstr "Move Up"
+
+msgid "devcp_js_img_remove_compat"
+msgstr "Remove Application Compatibility"
+
+msgid "devcp_js_input_list_author"
+msgstr "List as author in public listings"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_developer"
+msgstr "Developer"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_owner"
+msgstr "Owner"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_viewer"
+msgstr "Viewer"
+
+msgid "devcp_js_remove_author"
+msgstr "Remove Author"
+
+msgid "devcp_js_sure_remove"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
+
+msgid "devcp_js_upload_alert"
+msgstr "You must select a file to upload."
+
+msgid "devcp_localebox_header_localizedfields"
+msgstr "Localized Fields"
+
+#. %1 is the default locale
+#, php-format
+msgid "devcp_localebox_intro"
+msgstr ""
+"Some of the fields on this page are localized to appear in the end-user's "
+"native language. Select a locale below to edit your add-on's details in that "
+"language. If a translation for a locale is not available, it will fall back "
+"to the selected default locale (%s)."
+
+msgid "devcp_myaddons_admincp_link"
+msgstr "Admin Tools"
+
+msgid "devcp_myaddons_editorcp_link"
+msgstr "Editor Tools"
+
+msgid "devcp_myaddons_link"
+msgstr "My Add-ons"
+
+msgid "devcp_myaddons_mainpage_link"
+msgstr "Back to Main"
+
+msgid "devcp_myaddons_statistics_link"
+msgstr "Statistics Dashboard"
+
+msgid "devcp_myaddons_submitaddon_link"
+msgstr "Submit Add-on"
+
+msgid "devcp_myaddons_title"
+msgstr "Developer Tools"
+
+#. %1$s is an add-on ID, perhaps 167.
+#. %2$s is a URL.
+msgid "devcp_new_addon_error"
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
+
+msgid "devcp_nominate_cancel"
+msgstr "Cancel and return"
+
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
+#. %1 is the add-on name
+#, php-format
+msgid "devcp_nominate_submit_nominate"
+msgstr "Nominate %s"
+
+#. %1 is the autodetected add-on type
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+msgid "devcp_notice_changes_error"
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
+
+msgid "devcp_notice_changes_saved"
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
+
+msgid "devcp_notice_cleardefault"
+msgstr ""
+"Removing this as the default preview will cause another preview to "
+"automatically become the default preview."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
+msgid "devcp_notice_makedefault"
+msgstr ""
+"Making this the default preview will remove default status from the current "
+"default preview."
+
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
+
+msgid "devcp_pagetitle"
+msgstr "Developer Tools"
+
+msgid "devcp_preview_add_pagetitle"
+msgstr "Add Preview"
+
+msgid "devcp_preview_added_successfully"
+msgstr "Preview added successfully."
+
+msgid "devcp_preview_deleted_successfully"
+msgstr "Preview deleted successfully."
+
+msgid "devcp_preview_edit_pagetitle"
+msgstr "Edit Preview"
+
+msgid "devcp_preview_updated_successfully"
+msgstr "Preview updated successfully."
+
+msgid "devcp_previews_a_another"
+msgstr "Add Another Preview"
+
+msgid "devcp_previews_a_delete"
+msgstr "Delete Preview"
+
+msgid "devcp_previews_a_replace"
+msgstr "Replace Preview"
+
+msgid "devcp_previews_a_update"
+msgstr "Update Previews"
+
+msgid "devcp_previews_add_new"
+msgstr "Add New Preview"
+
+#. %s is a list of file extensions, e.g. ".png, .gif"
+msgid "devcp_previews_add_select"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
+
+msgid "devcp_previews_click_below"
+msgstr "Click Update Previews below to upload."
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_previews_click_update"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_previews_error_message"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
+
+msgid "devcp_previews_filetype_info"
+msgstr ""
+"Use the form below to upload a PNG, JPG, or GIF screenshot of your add-on. "
+"Images larger than 700 pixels wide and 525 pixels high will automatically be "
+"resized."
+
+msgid "devcp_previews_header_add"
+msgstr "Add Preview"
+
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
+msgid "devcp_previews_header_edit"
+msgstr "Edit Preview"
+
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
+msgid "devcp_previews_label_file"
+msgstr "Preview File"
+
+msgid "devcp_previews_label_makedefault"
+msgstr "Make this the default preview image"
+
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+msgid "devcp_previews_notice_error"
+msgstr "One or more of your new previews could not be saved."
+
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+msgid "devcp_previews_p_screenshots"
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
+
+msgid "devcp_previews_submit_delete"
+msgstr "Delete Preview"
+
+msgid "devcp_previews_submit_delete_confirm"
+msgstr "Are you sure you wish to delete this preview?"
+
+msgid "devcp_previews_submit_edit"
+msgstr "Edit Preview"
+
+msgid "devcp_previews_submit_upload"
+msgstr "Upload Preview"
+
+msgid "devcp_previews_thumbnail"
+msgstr "Thumbnail"
+
+#. %s is the add-on name.
+msgid "devcp_previews_title"
+msgstr "%s Preview Manager"
+
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+msgid "devcp_review_agreement_please"
+msgstr ""
+"Please review and accept the following Developer Agreement before proceeding."
+
+msgid "devcp_rolecheck_no_privs"
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
+
+msgid "devcp_several_hours"
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
+
+msgid "devcp_sidebar_a_dashboard"
+msgstr "Dashboard"
+
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_adu"
+msgstr "<em>%s</em> Active Daily Users"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_total_downloads"
+msgstr "<em>%s</em> Total Downloads"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_weekly_downloads"
+msgstr "<em>%s</em> Weekly Downloads"
+
+msgid "devcp_status_confirm_active"
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
+
+msgid "devcp_status_confirm_active_sure"
+msgstr "Are you sure you wish to mark this add-on active?"
+
+msgid "devcp_status_confirm_header_sure"
+msgstr "Are you sure?"
+
+msgid "devcp_status_confirm_inactive"
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
+
+msgid "devcp_status_confirm_inactive_sure"
+msgstr "Are you sure you wish to mark this add-on inactive?"
+
+msgid "devcp_status_confirm_no"
+msgstr "No, cancel"
+
+msgid "devcp_status_confirm_public"
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
+
+msgid "devcp_status_confirm_public_sure"
+msgstr "Are you sure you wish to make this add-on public?"
+
+msgid "devcp_status_confirm_sandbox"
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
+
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
+
+msgid "devcp_status_confirm_yes"
+msgstr "Yes, I'm Sure"
+
+msgid "devcp_status_nominate_error_notice"
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
+
+msgid "devcp_status_nominate_header"
+msgstr "Add-on Nomination"
+
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+msgid "devcp_summary_lastversion"
+msgstr "Latest Version:"
+
+#. %1 is a link to the add-on submit page
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+#. %1 is the link to the preview upload page
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
+#. %s is the add-on name.
+msgid "devcp_title_edit_addon"
+msgstr "Edit %s"
+
+#. title attribute for a javascript link that pops up a help dialog.
+msgid "devcp_transbox_a_title_help"
+msgstr "Help (does not leave page)"
+
+msgid "devcp_transbox_alt_help"
+msgstr "Help"
+
+#. %1$s is <span>17</span>, %2$s is 42.
+msgid "devcp_transbox_chars_used"
+msgstr "Characters used: %1$s / %2$s"
+
+msgid "devcp_transbox_delete_sure"
+msgstr "Are you sure you wish to delete this translation?"
+
+#. %s is a locale, like en-US.
+msgid "devcp_transbox_help_header_tabs"
+msgstr "What are these %s tabs?"
+
+msgid "devcp_transbox_help_header_what"
+msgstr "What if I don't have any translations?"
+
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+msgid "devcp_transbox_help_if"
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
+
+msgid "devcp_transbox_help_transbox"
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
+
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+msgid "devcp_transbox_select_locale"
+msgstr "Select the locale of the translation to add:"
+
+#. %1$s and %2$s are GUIDs.
+msgid "devcp_update_addon_guid_error"
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
+
+msgid "devcp_update_addon_priv_error"
+msgstr "You do not have sufficient privileges to update this add-on."
+
+#. %1$s is a version number, %2$s is an add-on ID.
+msgid "devcp_update_addon_version_belong_error"
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
+
+#. %1$s is a version number, maybe 1.1.
+#. %2$s is a URL.
+msgid "devcp_update_addon_version_exists_error"
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
+
+#. %1$s and %2$s are version numbers.
+msgid "devcp_update_addon_version_match_error"
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
+
+msgid "devcp_uploader_a_start"
+msgstr "Get Started"
+
+msgid "devcp_uploader_ajax_loading"
+msgstr "Uploading file..."
+
+msgid "devcp_uploader_button_edit"
+msgstr "Edit My Add-on"
+
+msgid "devcp_uploader_button_later"
+msgstr "I'll complete my add-on later."
+
+msgid "devcp_uploader_button_release"
+msgstr "Add Release Notes"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_uploader_created_results"
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+msgid "devcp_uploader_error_correct"
+msgstr "Please correct this problem and upload your file again."
+
+#. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
+msgid "devcp_uploader_file_created"
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
+
+msgid "devcp_uploader_header_created"
+msgstr "Add-on Created!"
+
+msgid "devcp_uploader_header_error"
+msgstr "Oops! There seems to be a problem with this file..."
+
+msgid "devcp_uploader_header_file_added"
+msgstr "File Added!"
+
+msgid "devcp_uploader_header_how"
+msgstr "How does it all work?"
+
+#. %s is the version number, e.g. 3.2.
+msgid "devcp_uploader_header_update_created"
+msgstr "Version %s Created"
+
+msgid "devcp_uploader_header_upload"
+msgstr "Upload Your File"
+
+msgid "devcp_uploader_how"
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+msgid "devcp_uploader_label_platformtype"
+msgstr "Supported Platforms:"
+
+msgid "devcp_uploader_label_upload_field"
+msgstr "Add-on File: "
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+msgid "devcp_uploader_p_pending_file"
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+msgid "devcp_uploader_p_pending_version"
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %s is a status, e.g Public or Incomplete.
+msgid "devcp_uploader_p_update_created"
+msgstr "Your new version has been created and is currently marked as %s."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+msgid "devcp_uploader_p_update_file"
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+msgid "devcp_uploader_p_update_version"
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+msgid "devcp_uploader_p_upload"
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
+
+msgid "devcp_uploader_platformtype_all"
+msgstr "All"
+
+msgid "devcp_uploader_platformtype_specific"
+msgstr "Specific:"
+
+#. %1$s is the add-on name, %2$s is the version number.
+msgid "devcp_uploader_title_file"
+msgstr "Add File to %1$s %2$s"
+
+msgid "devcp_uploader_title_submit"
+msgstr "Submit New Add-on"
+
+#. %s is the add-on name.
+msgid "devcp_uploader_title_update"
+msgstr "Update %s"
+
+#. %s is a full <a> tag
+#, php-format
+msgid "devcp_valid_app_reference"
+msgstr "Please see %s for reference."
+
+#. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
+#. fixed.
+msgid "devcp_valid_app_reference_linktext"
+msgstr "this page"
+
+msgid "devcp_verify_author_error"
+msgstr "No account found for that email address."
+
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
+
+msgid "devcp_versions_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_a_delete"
+msgstr "Delete Version"
+
+msgid "devcp_versions_a_empty"
+msgstr "Remove Empty Version"
+
+msgid "devcp_versions_a_remove"
+msgstr "Remove?"
+
+msgid "devcp_versions_add"
+msgstr "Add New Version"
+
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_delete_a_delete"
+msgstr "Delete Version"
+
+#. Followed by a list of reviews and files that will be removed.
+msgid "devcp_versions_delete_also"
+msgstr "This will also delete:"
+
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
+
+#. %s is the version number.
+msgid "devcp_versions_delete_header"
+msgstr "Delete Version %s?"
+
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
+
+#. %s is the version number.
+msgid "devcp_versions_delete_sure"
+msgstr "Are you sure you want to permanently delete version %s?"
+
+msgid "devcp_versions_edit_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_edit_a_delete"
+msgstr "Delete File"
+
+msgid "devcp_versions_edit_a_new_app"
+msgstr "Add New Application"
+
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "Remove Application"
+
+msgid "devcp_versions_edit_add"
+msgstr "Add New File"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_versions_edit_adjust"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
+
+msgid "devcp_versions_edit_compat_sure"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
+
+msgid "devcp_versions_edit_delete_sure"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
+
+msgid "devcp_versions_edit_header_approval"
+msgstr "Approval Information"
+
+msgid "devcp_versions_edit_header_compat"
+msgstr "Compatible Applications"
+
+msgid "devcp_versions_edit_header_file"
+msgstr "File Information"
+
+#. %s is the version number.
+msgid "devcp_versions_edit_header_manage"
+msgstr "Manage Version %s"
+
+msgid "devcp_versions_edit_header_notes"
+msgstr "Approval Notes"
+
+msgid "devcp_versions_edit_img_delete"
+msgstr "Delete File"
+
+#. %1$s is the file id, e.g. 18723.
+#. %2$s is the platform name, e.g. ALL or Windows.
+#. %3$s is the _('date) created.
+#. %4$s is the status, e.g. "In Sandbox" or "Public".
+#. %5$s is the _('date') status was changed.
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
+
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+msgid "devcp_versions_edit_optional"
+msgstr "Optional information for the Editor that reviews this version."
+
+msgid "devcp_versions_edit_remove_compat"
+msgstr "Remove Application Compatibility"
+
+msgid "devcp_versions_edit_select_app"
+msgstr "Please Select an Application"
+
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+msgid "devcp_versions_edit_transbox_releasenotes_description"
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
+
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+msgid "devcp_versions_edit_unsaved_compat"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
+
+msgid "devcp_versions_edit_unsaved_files"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
+
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %s is a version number, base 10.
+msgid "devcp_versions_notice_success"
+msgstr "Version %s deleted successfully."
+
+msgid "devcp_versions_p_remove"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
+
+msgid "devcp_versions_th_created"
+msgstr "Created"
+
+msgid "devcp_versions_th_status"
+msgstr "Status"
+
+msgid "devcp_versions_th_version"
+msgstr "Version"
+
 msgid "downloads_disable_warning"
 msgstr "Denne tilføjelse er deaktiveret"
 
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+msgid "editor_review_error_file_not_pending"
+msgstr "This file is not pending review."
+
+#. Actions are, for example: approving or rejecting
+msgid "editor_review_error_no_action"
+msgstr "Please select a review action."
+
+msgid "editor_review_error_no_applications"
+msgstr "Please enter the applications you tested."
+
+#. Comments are required when an editor approves or rejects an add-on.
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
+msgid "editorcp_logs_button_filter"
+msgstr "Filter"
+
+msgid "editorcp_logs_filter_by"
+msgstr "Filter by type/action"
+
+msgid "editorcp_logs_page_heading"
+msgstr "Event Log"
+
+msgid "editorcp_menu_eventlog_link"
+msgstr "Event Log"
+
+msgid "editorcp_menu_mainpage_link"
+msgstr "Back to Main"
+
+msgid "editorcp_menu_reviewlog_link"
+msgstr "Review Log"
+
+msgid "editorcp_menu_summary_link"
+msgstr "Editor Summary"
+
+msgid "editorcp_menu_title"
+msgstr "Editor Tools"
+
+msgid "editorcp_reviewlog_button_filter"
+msgstr "Filter"
+
+msgid "editorcp_reviewlog_column_action"
+msgstr "Action"
+
+msgid "editorcp_reviewlog_column_addon"
+msgstr "Add-on"
+
+msgid "editorcp_reviewlog_column_date"
+msgstr "Date"
+
+msgid "editorcp_reviewlog_column_editor"
+msgstr "Editor"
+
+msgid "editorcp_reviewlog_comments_hide"
+msgstr "Hide Comments"
+
+msgid "editorcp_reviewlog_comments_show"
+msgstr "Show Comments"
+
+#. %1$s and %2$s are full <input> tags for dates
+#, php-format
+msgid "editorcp_reviewlog_entries_between"
+msgstr "View entries between %1$s and %2$s"
+
+msgid "editorcp_reviewlog_none_found"
+msgstr "No reviews found for this period."
+
+msgid "editorcp_reviewlog_page_heading"
+msgstr "Review Log"
+
+msgid "editorcp_summary_monthreviews_heading"
+msgstr "Month Reviews"
+
+msgid "editorcp_summary_neweditors_heading"
+msgstr "New Editors"
+
+msgid "editorcp_summary_page_heading"
+msgstr "Editor Summary"
+
+msgid "editorcp_summary_recentactivity_heading"
+msgstr "Recent Editor Activity"
+
+msgid "editorcp_summary_totalreviews_heading"
+msgstr "Total Reviews"
+
+msgid "editors_addon_review_pagetitle"
+msgstr "Review Add-on"
+
+msgid "editors_error_js-formerror"
+msgstr "Please complete the following fields:"
+
+msgid "editors_error_review_one_file"
+msgstr "Please select at least one file to review."
+
+msgid "editors_error_self_reviews_forbidden"
+msgstr "Self-reviews are not allowed."
+
+msgid "editors_external_software"
+msgstr "External Software"
+
+msgid "editors_featured_add_feature"
+msgstr "Add feature"
+
+msgid "editors_featured_add_feature_submit"
+msgstr "Add"
+
+msgid "editors_featured_addon_add_failure"
+msgstr "Failed to add feature."
+
+msgid "editors_featured_addon_add_success"
+msgstr "Successfully added feature."
+
+msgid "editors_featured_addon_edit_failure"
+msgstr "Failed to edit feature."
+
+msgid "editors_featured_addon_edit_success"
+msgstr "Successfully edited feature."
+
+msgid "editors_featured_addon_invalid_locale"
+msgstr "One or more locales are invalid."
+
+msgid "editors_featured_addon_remove_failure"
+msgstr "Failed to remove feature."
+
+msgid "editors_featured_addon_remove_success"
+msgstr "Successfully removed feature."
+
+msgid "editors_featured_addons_pagetitle"
+msgstr "Featured Add-ons"
+
+msgid "editors_featured_edit_feature_submit"
+msgstr "Go"
+
+msgid "editors_featured_remove_feature"
+msgstr "Remove feature"
+
+msgid "editors_filter_queue"
+msgstr "Filter Queue"
+
+msgid "editors_helpful_links"
+msgstr "Helpful Links"
+
+msgid "editors_link_guide"
+msgstr "Editors' Guide"
+
+msgid "editors_link_policy"
+msgstr "Add-on Policy"
+
+msgid "editors_notice_filter_session"
+msgstr "These filters will remain in place for this session or until cleared."
+
+#. %1 is the queue mode
+msgid "editors_notice_none_found"
+msgstr "There are currently no add-ons of this type to review."
+
+msgid "editors_one_day"
+msgstr "1 day"
+
+msgid "editors_one_hour"
+msgstr "1 hour"
+
+msgid "editors_one_minute"
+msgstr "1 minute"
+
+msgid "editors_pagetitle"
+msgstr "Editor Tools"
+
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
+#, php-format
+msgid "editors_platform_x_only"
+msgstr "%s only"
+
+msgid "editors_pre-release"
+msgstr "Pre-release"
+
+#. %1 is the app name
+#, php-format
+msgid "editors_queue_app_compatibility"
+msgstr "%s Compatibility"
+
+msgid "editors_queue_submit_clean"
+msgstr "Clear"
+
+msgid "editors_queue_submit_filter"
+msgstr "Filter"
+
+msgid "editors_queues_disabled"
+msgstr ""
+"All review queues are currently disabled. Please check back at a later time."
+
+msgid "editors_review_action"
+msgstr "Review Action"
+
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
+msgid "editors_review_action_public"
+msgstr "Push to Public"
+
+msgid "editors_review_action_request_superreview"
+msgstr "Request Super-Review"
+
+msgid "editors_review_action_sandbox"
+msgstr "Retain in Sandbox"
+
+msgid "editors_review_comments"
+msgstr "Review Comments"
+
+msgid "editors_review_details_info_request"
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
+
+msgid "editors_review_details_nominated_public"
+msgstr ""
+"This will mark the add-on and its most recent version and files as public. "
+"Future versions will go into the sandbox until they are reviewed by an "
+"editor."
+
+msgid "editors_review_details_nominated_sandbox"
+msgstr "This will retain the add-on in the sandbox."
+
+msgid "editors_review_details_pending_public"
+msgstr ""
+"This will approve a sandboxed version of a public add-on to appear on the "
+"public side."
+
+msgid "editors_review_details_pending_sandbox"
+msgstr ""
+"This will cause a sandboxed version of a public add-on to remain in the "
+"sandbox."
+
+msgid "editors_review_details_superreview"
+msgstr ""
+"If you have concerns about this add-on's security, copyright issues, or "
+"other concerns that an administrator should look into, enter your comments "
+"in the area below. They will be sent to administrators, not the author."
+
+msgid "editors_review_file_diff_link"
+msgstr "Compare with public version"
+
+msgid "editors_review_file_viewcontents_link"
+msgstr "View Contents"
+
+msgid "editors_review_header_authors"
+msgstr "Authors:"
+
+msgid "editors_review_header_categories"
+msgstr "Categories:"
+
+msgid "editors_review_header_compatibility"
+msgstr "Compatibility:"
+
+msgid "editors_review_header_description"
+msgstr "Description"
+
+msgid "editors_review_header_devcomments"
+msgstr "Developer Comments"
+
+msgid "editors_review_header_eula"
+msgstr "EULA"
+
+msgid "editors_review_header_files"
+msgstr "Files:"
+
+msgid "editors_review_header_itemhistory"
+msgstr "Item History"
+
+msgid "editors_review_header_nominationmessage"
+msgstr "Nomination Message"
+
+msgid "editors_review_header_previews"
+msgstr "Previews"
+
+msgid "editors_review_header_privacy"
+msgstr "Privacy Policy"
+
+#. %1 is the add-on name and version
+#, php-format
+msgid "editors_review_header_review"
+msgstr "Review %s"
+
+msgid "editors_review_header_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "editors_review_header_summary"
+msgstr "Summary"
+
+msgid "editors_review_header_versionnotes"
+msgstr "Version Notes"
+
+#. a noun: shown in an add-on's editor review history
+msgid "editors_review_history_info_reply"
+msgstr "Reply"
+
+msgid "editors_review_history_info_request"
+msgstr "Information Request"
+
+msgid "editors_review_history_nominated_adminreview"
+msgstr "Admin Review"
+
+msgid "editors_review_history_nominated_approved"
+msgstr "Nomination Approved/Public"
+
+msgid "editors_review_history_nominated_denied"
+msgstr "Nomination Denied/Sandbox"
+
+msgid "editors_review_history_nonefound"
+msgstr "No previous review entries could be found."
+
+msgid "editors_review_history_pending_adminreview"
+msgstr "Admin Review"
+
+msgid "editors_review_history_pending_approved"
+msgstr "Approved/Public"
+
+msgid "editors_review_history_pending_denied"
+msgstr "Denied/Sandbox"
+
+#. link text in an add-on's editor review history, allowing to hide and show an information request's replies
+#. %1 is the number of replies
+msgid "editors_review_history_show_hide_replies"
+msgid_plural "editors_review_history_show_hide_replies"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
+
+msgid "editors_review_label_applications"
+msgstr "Applications:"
+
+msgid "editors_review_label_cannedresponse"
+msgstr "or select a canned response:"
+
+msgid "editors_review_label_comments"
+msgstr "Comments:"
+
+msgid "editors_review_label_operating_systems"
+msgstr "Operating Systems:"
+
+msgid "editors_review_link_pagetop"
+msgstr "Top"
+
+msgid "editors_review_next_link"
+msgstr "next &raquo;"
+
+msgid "editors_review_previews_notfound"
+msgstr "No previews found."
+
+msgid "editors_review_previous_link"
+msgstr "&laquo; prev"
+
+msgid "editors_review_queue_pagetitle"
+msgstr "Review Queue"
+
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
+msgid "editors_review_rank_in_queue"
+msgstr "<strong># %1$s</strong> of %2$s in queue"
+
+msgid "editors_review_submit_process_action"
+msgstr "Process Action"
+
+msgid "editors_review_th_action"
+msgstr "Action"
+
+msgid "editors_review_th_comments"
+msgstr "Comments"
+
+msgid "editors_review_th_date"
+msgstr "Date"
+
+msgid "editors_review_th_reviewer"
+msgstr "Reviewer"
+
+msgid "editors_review_th_version_file"
+msgstr "Version/File"
+
+msgid "editors_review_update_notify_once"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
+
+msgid "editors_reviewed_successfully"
+msgstr "Review successfully processed."
+
+msgid "editors_reviews_action_delete_review"
+msgstr "Delete review"
+
+msgid "editors_reviews_action_keep"
+msgstr "Remove flags; keep review"
+
+msgid "editors_reviews_action_skip"
+msgstr "Skip"
+
+msgid "editors_reviews_header_action"
+msgstr "Action"
+
+msgid "editors_reviews_in_reply_to"
+msgstr "In reply to:"
+
+msgid "editors_reviews_processed"
+msgstr "Reviews processed successfully!"
+
+msgid "editors_reviews_queue_empty"
+msgstr "There are currently no reviews in moderation."
+
+msgid "editors_reviews_submit_process_reviews"
+msgstr "Process Reviews"
+
+msgid "editors_site_specific"
+msgstr "Site Specific"
+
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+msgid "editors_tested_app"
+msgstr "Tested Application"
+
+msgid "editors_tested_os"
+msgstr "Tested Operating Systems"
+
+msgid "editors_th_additional_info"
+msgstr "Additional Information"
+
+msgid "editors_th_addon"
+msgstr "Add-on"
+
+msgid "editors_th_addontype"
+msgstr "Type"
+
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+msgid "editors_th_age"
+msgstr "Age"
+
+msgid "editors_th_applications"
+msgstr "Applications"
+
+msgid "editors_th_locales"
+msgstr "Restrict to locales?"
+
+msgid "editors_th_platforms"
+msgstr "Platforms"
+
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_days"
+msgstr "%s days"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_hours"
+msgstr "%s hours"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_minutes"
+msgstr "%s minutes"
+
 msgid "error_access_denied"
 msgstr "Ingen adgang"
 
@@ -983,6 +3621,9 @@ msgstr "Manglende argument: %s"
 msgid "error_no_files_in_addon"
 msgstr "Ingen filer"
 
+msgid "error_notice"
+msgstr "Bemærk"
+
 msgid "error_preview_notfound"
 msgstr "Skærmbillede ikke fundet!"
 
@@ -1117,6 +3758,9 @@ msgstr "Andre sprog:"
 msgid "footer_privacy_policy"
 msgstr "Privatlivspolitik"
 
+msgid "forum_save"
+msgstr "Gem"
+
 msgid "general_addontype_dict"
 msgstr "Ordbog"
 
@@ -1201,9 +3845,6 @@ msgstr "Min konto"
 msgid "header_navlink_register"
 msgstr "Registrer"
 
-msgid "home"
-msgstr "hjem"
-
 #. %s is the add-on name
 #, php-format
 msgid "img_preview_of"
@@ -1216,11 +3857,6 @@ msgstr ""
 "<a href=\"%1$s\">Log ind</a> for at installere denne tilføjelse. <a href=\"%2"
 "$s\">Hvorfor</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Lad mig installere denne eksperimentelle tilføjelse. <a href=\"%1$s\">Hvad er det?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
 #, php-format
@@ -1267,30 +3903,6 @@ msgstr "Sprogpakke"
 msgid "langtools_tableheader_language"
 msgstr "Sprog"
 
-msgid "license_custom"
-msgstr "Anden licens"
-
-msgid "licenses_bsd"
-msgstr "BSD-licens"
-
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-msgid "licenses_mit"
-msgstr "MIT/X11-licens"
-
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
 msgid "link_return_to_front_page"
 msgstr "Klik her for at komme tilbage til forsiden."
 
@@ -1324,6 +3936,9 @@ msgstr "Thunderbird"
 msgid "nav_category_dicts_langpacks"
 msgstr "Ordbøger & sprogpakker"
 
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
 msgid "nav_category_themes"
 msgstr "Temaer"
 
@@ -1340,9 +3955,6 @@ msgstr "Application Versions"
 msgid "page_title_credits"
 msgstr "Tak til"
 
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
-
 msgid "page_title_faq"
 msgstr "Ofte stillede spørgsmål"
 
@@ -1495,9 +4107,6 @@ msgstr "Nyeste tilføjelser"
 msgid "rss_updatedaddons"
 msgstr "Opdaterede tilføjelser"
 
-msgid "search"
-msgstr "Søg"
-
 msgid "search_disabled"
 msgstr "Søgning er deaktiveret i øjeblikket. Prøv igen senere."
 
@@ -1597,6 +4206,347 @@ msgstr "Ikke bedømt endnu"
 msgid "stars_rated_x_outof_5"
 msgstr "Bedømmelse: %s ud af 5 stjerner"
 
+msgid "statistics_addon_dashboard_link"
+msgstr "Dashboard Home"
+
+msgid "statistics_addon_developertools_link"
+msgstr "Developer Tools"
+
+msgid "statistics_addon_switch"
+msgstr "Switch Add-on"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_shortmonth"
+msgstr "%b. %e"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_shortmonthwithyear"
+msgstr "%b. %e, %Y"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_weekdayshortmonth"
+msgstr "%A, %b. %e"
+
+#. %1$s is an add-on name and version.  Example:  Add-on 3.5
+#, php-format
+msgid "statistics_events_addon_created"
+msgstr "%1$s created"
+
+#. %1$s is an application name and version.  Example:  Firefox 3.5
+#, php-format
+msgid "statistics_events_app_released"
+msgstr "%1$s released"
+
+msgid "statistics_help_close_link"
+msgstr "Close"
+
+msgid "statistics_help_link"
+msgstr "Help"
+
+msgid "statistics_index_anotheraddon"
+msgstr "or, select another add-on"
+
+msgid "statistics_index_anotheraddon_public"
+msgstr "or, select an add-on with public statistics"
+
+msgid "statistics_index_myaddons"
+msgstr "Select one of your add-ons to view its statistics"
+
+msgid "statistics_index_selectaddon"
+msgstr "Select an add-on to view its statistics"
+
+msgid "statistics_index_selectaddon_public"
+msgstr "Select an add-on with public statistics"
+
+msgid "statistics_index_title"
+msgstr "Statistics Dashboard"
+
+msgid "statistics_index_view_button"
+msgstr "View Statistics"
+
+msgid "statistics_js_download_csv"
+msgstr "View this table in CSV format"
+
+msgid "statistics_js_dropdowns_none"
+msgstr "none"
+
+msgid "statistics_js_dropdowns_removeplot"
+msgstr "Remove this plot"
+
+msgid "statistics_js_groupby_selector_date"
+msgstr "Group by: Day"
+
+msgid "statistics_js_groupby_selector_month"
+msgstr "Group by: Month"
+
+msgid "statistics_js_groupby_selector_week"
+msgstr "Group by: Week"
+
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+msgid "statistics_js_plotselection_foundinrange"
+msgstr "%s found in range"
+
+msgid "statistics_js_plotselection_options_addplot_name"
+msgstr "Add Plot"
+
+msgid "statistics_js_plotselection_options_addplot_tooltip"
+msgstr "Add another plot to this graph"
+
+msgid "statistics_js_plotselection_options_count_name_checked"
+msgstr "Hide Total Count"
+
+msgid "statistics_js_plotselection_options_count_name_unchecked"
+msgstr "Show Total Count"
+
+msgid "statistics_js_plotselection_options_count_tooltip"
+msgstr "Plot the total count on this graph"
+
+msgid "statistics_js_plotselection_options_csv_name"
+msgstr "View Data (CSV)"
+
+msgid "statistics_js_plotselection_options_csv_tooltip"
+msgstr "Get a Comma Separated Values file of this data"
+
+msgid "statistics_js_plotselection_options_events_addon_name_checked"
+msgstr "Hide %s Events"
+
+msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
+msgstr "Show %s Events"
+
+msgid "statistics_js_plotselection_options_events_addon_tooltip"
+msgstr "Overlay add-on release dates on the plots"
+
+msgid "statistics_js_plotselection_options_events_firefox_name_checked"
+msgstr "Hide Firefox Events"
+
+msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
+msgstr "Show Firefox Events"
+
+msgid "statistics_js_plotselection_options_events_firefox_tooltip"
+msgstr "Overlay Firefox release dates on the plots"
+
+msgid "statistics_js_plotselection_options_resize_name_checked"
+msgstr "Collapse Graph"
+
+msgid "statistics_js_plotselection_options_resize_name_unchecked"
+msgstr "Expand Graph"
+
+msgid "statistics_js_plotselection_options_resize_tooltip"
+msgstr "Resize the graph"
+
+msgid "statistics_js_plotselection_selector_adu"
+msgstr "Active Daily Users"
+
+msgid "statistics_js_plotselection_selector_application"
+msgstr "Application"
+
+msgid "statistics_js_plotselection_selector_custom"
+msgstr "Custom"
+
+msgid "statistics_js_plotselection_selector_downloads"
+msgstr "Downloads"
+
+msgid "statistics_js_plotselection_selector_os"
+msgstr "Operating System"
+
+msgid "statistics_js_plotselection_selector_status"
+msgstr "Add-on Status"
+
+msgid "statistics_js_plotselection_selector_summary"
+msgstr "Summary"
+
+msgid "statistics_js_plotselection_selector_version"
+msgstr "Add-on Version"
+
+msgid "statistics_longnames_application"
+msgstr "Application"
+
+msgid "statistics_longnames_os"
+msgstr "Operating System"
+
+msgid "statistics_longnames_status"
+msgstr "Add-on Status"
+
+msgid "statistics_longnames_unknown"
+msgstr "Unknown"
+
+msgid "statistics_longnames_version"
+msgstr "Add-on Version"
+
+msgid "statistics_notice_data_insufficient"
+msgstr ""
+"There is not yet enough data to display this graph. Please check back later."
+
+msgid "statistics_notice_data_none"
+msgstr ""
+"We don't have any data for your add-on yet. Please check back in a few days."
+
+msgid "statistics_notice_data_updating"
+msgstr ""
+"Add-on statistics are currently in the process of being updated. Recent data "
+"may be incomplete as our scripts work to update this information. Please "
+"check back in a few minutes."
+
+msgid "statistics_notice_disabled"
+msgstr ""
+"The Statistics Dashboard is currently disabled. Please check back later."
+
+msgid "statistics_notice_nojavascript"
+msgstr "JavaScript is required to view the Statistics Dashboard graphs."
+
+msgid "statistics_notice_settings_updated"
+msgstr "Your settings have been updated!"
+
+msgid "statistics_pagetitle"
+msgstr "Statistics Dashboard"
+
+msgid "statistics_plot_legend_adu"
+msgstr "Active Daily Users"
+
+msgid "statistics_plot_legend_downloads"
+msgstr "Daily Downloads"
+
+msgid "statistics_plot_options_zoomin_alt"
+msgstr "Zoom In"
+
+msgid "statistics_plot_options_zoomin_title"
+msgstr "Zoom in one month"
+
+msgid "statistics_plot_options_zoomout_alt"
+msgstr "Zoom Out"
+
+msgid "statistics_plot_options_zoomout_title"
+msgstr "Zoom out one month"
+
+#, php-format
+msgid "statistics_rss_description"
+msgstr "Daily summary of statistics for %1$s"
+
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+msgid "statistics_rss_title_fulldate"
+msgstr "%A, %B %e, %Y"
+
+#, php-format
+msgid "statistics_rss_title_statsfordate"
+msgstr "Statistics for %1$s"
+
+msgid "statistics_settings_access_description"
+msgstr ""
+"By default, only you and Mozilla can access the information in your "
+"dashboard. You can open this up to the public so that anyone can view your "
+"add-on's data."
+
+msgid "statistics_settings_access_heading"
+msgstr "Dashboard Access"
+
+msgid "statistics_settings_access_private"
+msgstr "Private"
+
+msgid "statistics_settings_access_private_description"
+msgstr "Only you and Mozilla can view this add-on's statistics"
+
+msgid "statistics_settings_access_public"
+msgstr "Public"
+
+msgid "statistics_settings_access_public_description"
+msgstr "Anyone can view this add-on's statistics"
+
+msgid "statistics_settings_change_link"
+msgstr "Change Settings"
+
+msgid "statistics_settings_confidential"
+msgstr "Please treat this information as confidential."
+
+msgid "statistics_settings_currently_private"
+msgstr "This dashboard is currently <b>private</b>."
+
+msgid "statistics_settings_currently_public"
+msgstr "This dashboard is currently <b>public</b>."
+
+msgid "statistics_settings_locked_alt"
+msgstr "Locked"
+
+msgid "statistics_settings_return_link"
+msgstr "Return to Dashboard"
+
+msgid "statistics_settings_save_button"
+msgstr "Save Settings"
+
+#, php-format
+msgid "statistics_settings_title"
+msgstr "Statistics Dashboard Settings for %1$s"
+
+msgid "statistics_settings_unlocked_alt"
+msgstr "Unlocked"
+
+msgid "statistics_shortnames_application"
+msgstr "App"
+
+msgid "statistics_shortnames_os"
+msgstr "OS"
+
+msgid "statistics_shortnames_status"
+msgstr "St"
+
+msgid "statistics_shortnames_unknown"
+msgstr "Uk"
+
+msgid "statistics_shortnames_version"
+msgstr "Ver"
+
+msgid "statistics_summary_downloads_average"
+msgstr "Average Daily Downloads"
+
+msgid "statistics_summary_downloads_heading"
+msgstr "Downloads"
+
+msgid "statistics_summary_downloads_lastcount"
+msgstr "Last Day Count"
+
+msgid "statistics_summary_downloads_lastweek"
+msgstr "Downloads in the last 7 days"
+
+msgid "statistics_summary_downloads_total"
+msgstr "Total Downloads"
+
+#, php-format
+msgid "statistics_summary_downloads_total_sincedate"
+msgstr "Since %1$s"
+
+msgid "statistics_summary_nodata"
+msgstr "No data yet"
+
+msgid "statistics_summary_updatepings_average"
+msgstr "Average Daily Active Users"
+
+msgid "statistics_summary_updatepings_changefromprevious"
+msgstr "Change from previous count"
+
+#, php-format
+msgid "statistics_summary_updatepings_changefromprevious_ondate"
+msgstr "%1$s on %2$s"
+
+msgid "statistics_summary_updatepings_heading"
+msgstr "Active Daily Users"
+
+msgid "statistics_summary_updatepings_total"
+msgstr "Active Daily Users"
+
+#, php-format
+msgid "statistics_summary_updatepings_total_ondate"
+msgstr "On %1$s"
+
+#, php-format
+msgid "statistics_title_addon_stats"
+msgstr "%1$s Statistics"
+
 msgid "themes_landing_all_themes"
 msgstr "Alle temaer"
 
@@ -1722,6 +4672,7 @@ msgstr ""
 "-- %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Du anmodede om at ændre din e-mail-adresse hos %2$s Add-ons.\n"
@@ -1767,6 +4718,7 @@ msgid "user_emailchange_error"
 msgstr "Fejl!"
 
 #. %1 is the application name
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Bekræft ændring af e-mail-adresse hos %1$s Add-ons"
 
@@ -1774,20 +4726,12 @@ msgid "user_emailchange_success"
 msgstr "Succes!"
 
 #. %1 is the new email address
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Din e-mail-adresse blev ændret. Fra nu af skal du bruge "
 "%1$s for at logge ind."
 
-msgid "user_form_bio"
-msgstr "Om mig"
-
-msgid "user_form_bio_description"
-msgstr ""
-"Introducer dig selv til fællesskabet, hvis du vil! Denne tekst vil blive vist "
-"offentligt op din brugerside. Linjeskift bevares, men HTML "
-"tillades ikke."
-
 msgid "user_form_confirmpassword"
 msgstr "Bekræft adgangskode"
 
@@ -1926,18 +4870,6 @@ msgstr "sende bekræftelsesmeddelelsen igen"
 msgid "user_register_congratulations"
 msgstr "Tillykke! Din brugerkonto er nu oprettet."
 
-msgid "user_register_details"
-msgstr ""
-"<p>Registrering på AMO er <strong>ikke påkrævet</strong> hvis du bare vil "
-"hente og installere offentlige tilføjelser.</p><p>Du behøver kun at registrere, hvis:</"
-"p><ul><li>Du vil indsende anmeldelser af tilføjelser</li><li>Du er udvikler af en tilføjelse "
-"og ønsker at uploade den til hosting på AMO</li></ul><p>Ved "
-"succesfuld registrering vil du få tilsendt en bekræftelsesmail til den "
-"adresse du opgav. Følg instruktionerne i mailen for at bekræfte din "
-"konto.</p><p>Hvis du vil, kan du læse vores <a href='%1$s' title='Juridiske "
-"betingelser'>juridiske betingelser</a> og <a href='%2$s' title='Privatlivspolitik'>privatlivspolitik"
-"</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #, php-format
 msgid "user_register_resend_confirmation_link"
@@ -1951,9 +4883,6 @@ msgstr ""
 msgid "user_register_welcome"
 msgstr "Tak fordi du registrerede dig og velkommen til %1$s!"
 
-msgid "user_register_welcome_header"
-msgstr "Velkommen til addons.mozilla.org (AMO)!"
-
 msgid "user_required_firstlast_or_nickname"
 msgstr "Et fornavn, efternavn eller kaldenavn skal angives."
 
@@ -1972,9 +4901,6 @@ msgstr "Slet konto"
 msgid "users_edit_pagetitle"
 msgstr "Redigering af brugerkonto"
 
-msgid "users_info_aboutme"
-msgstr "Om mig"
-
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Tilføjelser fra %1$s"
@@ -2028,17 +4954,3 @@ msgstr "Nulstilling af adgangskode"
 
 msgid "users_register_pagetitle"
 msgstr "Registrering af ny bruger"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-msgid "versions_license_header_source"
-msgstr "Licens for kildekoden til %1$s %2$s"
-
-msgid "view_recently_added"
-msgstr "Vis alle som blev tilføjet fornyligt"
-
-msgid "view_top_downloads"
-msgstr "Vis alle med flest downloads"
-
-msgid "view_top_rated"
-msgstr "Vis alle med de bedste bedømmelser"
diff --git a/site/app/locale/da/LC_MESSAGES/en-US.txt b/site/app/locale/da/LC_MESSAGES/en-US.txt
index 5b18f24..036abd9 100644
--- a/site/app/locale/da/LC_MESSAGES/en-US.txt
+++ b/site/app/locale/da/LC_MESSAGES/en-US.txt
@@ -1,2044 +1,4962 @@
-# Language en-US translations for addons.mozilla.org package.
-# Copyright (C) 2009 THE addons.mozilla.org'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the addons.mozilla.org package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-02-26 15:08-0800\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "a_cancel_installation"
-msgstr "Cancel Installation"
-
-#. This is the text that appears on buttons to download add-ons.
-#. %$1s is an optional string that only appears if the add-on is only available for
-#. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parenthesis are included in the string. :(
-#, php-format
-msgid "a_download"
-msgstr "Download Now %s"
-
-msgid "a_eula_download"
-msgstr "Accept and Download"
-
-msgid "a_eula_install"
-msgstr "Accept and Install"
-
-msgid "a_header_public"
-msgstr "Public"
-
-msgid "a_header_sandbox"
-msgstr "Sandbox"
-
-#. %s is a date in the _('date') format
-msgid "addon_detail_last_updated"
-msgstr "Updated %s"
-
-#. %s is the version of the add-on.  Example:  3.2a1
-#, php-format
-msgid "addon_display_header_version"
-msgstr "Version %s"
-
-msgid "addon_downloads"
-msgstr "downloads"
-
-msgid "addon_downloads_total"
-msgstr "total downloads"
-
-msgid "addon_downloads_weekly"
-msgstr "weekly downloads"
-
-#. %1 is the add-on count, %2 the category name
-#, php-format
-msgid "addon_list_category_totalcount"
-msgid_plural "addon_list_category_totalcount"
-msgstr[0] "%1$s add-on"
-msgstr[1] "%1$s add-ons"
-
-msgid "addon_list_perpage"
-msgstr "per page"
-
-msgid "addon_list_sortby"
-msgstr "Sort by:"
-
-msgid "addon_listitem_flag_experimental"
-msgstr "experimental"
-
-msgid "addon_listitem_flag_recommended"
-msgstr "recommended"
-
-#. %1 is the add-on name, %2 is the platform
-msgid "addon_not_available_for_platform"
-msgstr "%1$s is not available for %2$s."
-
-#. %1 is the add-on name
-#, php-format
-msgid "addon_review_a_back_to_addon_x"
-msgstr "Back to %1$s..."
-
-#. %1 is the add-on name
-#, php-format
-msgid "addon_review_a_back_to_reviews"
-msgstr "Back to the reviews..."
-
-msgid "addon_review_add_rating_field"
-msgstr "Rating:"
-
-msgid "addon_review_add_review_field"
-msgstr "Review:"
-
-msgid "addon_review_add_submit"
-msgstr "Submit your review"
-
-#. %s is the name of the add-on
-#, php-format
-msgid "addon_review_add_title"
-msgstr "Add a review for %s"
-
-msgid "addon_review_add_title_field"
-msgstr "Title/Summary:"
-
-msgid "addon_review_admin_delete"
-msgstr "Delete"
-
-msgid "addon_review_author_reply_link"
-msgstr "Reply"
-
-msgid "addon_review_confirm_delete"
-msgstr "Are you sure you wish to delete this review?"
-
-msgid "addon_review_confirm_no"
-msgstr "No"
-
-msgid "addon_review_confirm_yes"
-msgstr "Yes"
-
-msgid "addon_review_delete_header"
-msgstr "Delete Review"
-
-msgid "addon_review_deleted_successfully"
-msgstr "Review deleted successfully."
-
-#. %s is the name of the add-on
-#, php-format
-msgid "addon_review_edit_title"
-msgstr "Edit Review for %s"
-
-#. %1 is the count of characters entered as notes for the review flag reason.
-msgid "addon_review_flag_error_other_length"
-msgstr ""
-"Problem flagging review: Notes for flagged reviews are limited to between 10 "
-"and 100 characters; your character length was %1$s."
-
-#. Removing an extra comma
-msgid "addon_review_in_moderation"
-msgstr ""
-"Please note: Before your review shows up on the public site it will be "
-"moderated by an editor."
-
-msgid "addon_review_in_reply_to"
-msgstr "Developer reply to:"
-
-#. %1 is the review count, %2 is the nickname or full name of the user.
-#, php-format
-msgid "addon_review_others_by_user"
-msgid_plural "addon_review_others_by_user"
-msgstr[0] "See %1$s previous review submitted by %2$s for this add-on."
-msgstr[1] "See %1$s previous reviews submitted by %2$s for this add-on."
-
-#. %1 is the add-on name
-#, php-format
-msgid "addon_review_pagetitle"
-msgstr "Reviews for %s"
-
-#. %1 is the user, %2 is the (localized) date
-#, php-format
-msgid "addon_review_reply_on_x_by_y"
-msgstr "Reply by %1$s on %2$s"
-
-msgid "addon_review_reply_prefix"
-msgstr "Developer Reply:"
-
-msgid "addon_review_saved_successfully"
-msgstr "Your review was saved successfully. Thanks!"
-
-msgid "addon_reviewed_by_u_on_d"
-msgstr "by %1$s on %2$s"
-
-#. %1 is the user, %2 is the (localized) date, %3 is the rating
-#, php-format
-msgid "addon_reviewed_on_x_rated_y"
-msgstr "by %1$s on %2$s (rated %3$s)"
-
-msgid "addon_slider_tooltip_next"
-msgstr "Next Add-on"
-
-msgid "addon_slider_tooltip_previous"
-msgstr "Previous Add-on"
-
-msgid "addon_version_permalink"
-msgstr "Permanent link to this version"
-
-#. %1 is the current Application name (e.g. Firefox)
-#. %2 is the Application's version number
-msgid "addon_versions_getlatestversion"
-msgstr "The most recent version compatible with %1$s %2$s"
-
-msgid "addons_author_addons_submit"
-msgstr "Go"
-
-msgid "addons_author_tooltip"
-msgstr "View Author's Profile"
-
-#. %1 is the name of the Application (eg. Firefox)
-msgid "addons_browse_all_themes_title"
-msgstr "Browse all Themes :: %1$s Add-ons"
-
-#. %s is the name of the category
-#, php-format
-msgid "addons_browse_browse_category"
-msgstr "Browse %s"
-
-#. %1 is the name of the theme category (eg. Modern)
-#. %2 is the name of the Application (eg. Firefox)
-msgid "addons_browse_categories_header_theme"
-msgstr "Browse %1$s Themes :: %2$s Add-ons"
-
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-msgid "addons_display_add_review"
-msgstr "Add a review"
-
-msgid "addons_display_advanced_details"
-msgstr "Advanced Details"
-
-msgid "addons_display_categories"
-msgstr "Categories"
-
-msgid "addons_display_detailed_review"
-msgstr "detailed review"
-
-msgid "addons_display_dont_like_it"
-msgstr "Don't like it"
-
-msgid "addons_display_edit_review"
-msgstr "Edit your review"
-
-msgid "addons_display_has_privacy"
-msgstr "This add-on has a privacy policy."
-
-msgid "addons_display_hate_it"
-msgstr "Hate it"
-
-msgid "addons_display_header_developer_comments"
-msgstr "Developer Comments"
-
-msgid "addons_display_header_homepage"
-msgstr "Homepage"
-
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-msgid "addons_display_header_reviews"
-msgstr "Reviews"
-
-msgid "addons_display_header_support"
-msgstr "Support"
-
-msgid "addons_display_like_it"
-msgstr "Like it"
-
-msgid "addons_display_long_description"
-msgstr "Long Description"
-
-msgid "addons_display_love_it"
-msgstr "Love it"
-
-msgid "addons_display_more_images"
-msgstr "More Images"
-
-#. %1$s is either an author's name or a comma separated list of authors. Using
-#. the list doesn't make sense in the English plural form so we ignore the
-#. variable.
-msgid "addons_display_other_addons_by"
-msgid_plural "addons_display_other_addons_by"
-msgstr[0] "Other add-ons by %1$s"
-msgstr[1] "Other add-ons by these authors"
-
-#. %s is the name of the add-on and the add-on section.  Example:
-#.   Some Add-on :: Firefox Add-ons
-#. This should not be concatenated in the code and should be fixed.
-#, php-format
-msgid "addons_display_pagetitle"
-msgstr "%s"
-
-#. %s is an email address
-#, php-format
-msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Support for this add-on is provided by the developer at %s"
-
-#. %$1s is a URL
-#. %$2s is an email address
-#, php-format
-msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr ""
-"Support for this add-on is provided by the developer at %1$s or by sending "
-"an e-mail to %2$s"
-
-#. %s is a URL
-#, php-format
-msgid "addons_display_paragraph_supportinfourl"
-msgstr "Support for this add-on is provided by the developer at %s"
-
-msgid "addons_display_rate_it"
-msgstr "Rate It"
-
-msgid "addons_display_really_like_it"
-msgstr "Really like it"
-
-msgid "addons_display_review_etiquette"
-msgstr ""
-"Please do not post bug reports in reviews. We do not make your email address "
-"available to add-on developers and they may need to contact you to help "
-"resolve your issue."
-
-#. %1 is the review guidelines link
-msgid "addons_display_review_guidelines_link"
-msgstr "<a href=\"%s\">Review Guidelines</a>"
-
-#. %1 is the support section link
-msgid "addons_display_review_see_support"
-msgstr ""
-"See the <a href=\"%1$s\">support section</a> to find out where to get "
-"assistance for this add-on."
-
-msgid "addons_display_review_submit"
-msgstr "Save"
-
-#, php-format
-msgid "addons_display_see_all_addons"
-msgstr "See All %1$s Add-ons"
-
-#. %1 is the number of reviews
-#, php-format
-msgid "addons_display_see_all_reviews"
-msgstr "See all reviews (%1$s)"
-
-msgid "addons_display_see_all_versions"
-msgstr "See All Versions"
-
-msgid "addons_display_view_source"
-msgstr "View the source"
-
-msgid "addons_display_view_stats"
-msgstr "View statistics"
-
-msgid "addons_display_what_do_you_think"
-msgstr "What do you think?"
-
-msgid "addons_display_workswith"
-msgstr "Works with:"
-
-msgid "addons_home_by"
-msgstr "by"
-
-msgid "addons_home_feature_head"
-msgstr "We Recommend"
-
-#, php-format
-msgid "addons_home_header_details"
-msgstr ""
-"Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
-"a look around and make %1$s your own."
-
-msgid "addons_home_newest_header"
-msgstr "Newest:"
-
-msgid "addons_home_other_applications"
-msgstr "Other Applications"
-
-#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
-#. Sunbird
-#, php-format
-msgid "addons_home_pagetitle"
-msgstr "%1$s Add-ons"
-
-msgid "addons_home_popular_header"
-msgstr "Most Popular:"
-
-msgid "addons_home_recommended_header"
-msgstr "We Recommend:"
-
-msgid "addons_home_updated_header"
-msgstr "Recently Updated:"
-
-msgid "addons_home_view_all"
-msgstr "View all"
-
-msgid "addons_home_view_all_newest_title"
-msgstr "View all newly created add-ons"
-
-msgid "addons_home_view_all_popular_title"
-msgstr "View all popular add-ons"
-
-msgid "addons_home_view_all_recommended_title"
-msgstr "View all recommended add-ons"
-
-msgid "addons_home_view_all_updated_title"
-msgstr "View all recently updated add-ons"
-
-msgid "addons_install_in_sunbird"
-msgstr ""
-"<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, "
-"open Add-ons from the Tools menu.</li><li>Click the Install button, and "
-"locate/select the file you downloaded and click \"OK\".</li></ol>"
-
-msgid "addons_install_in_sunbird_title"
-msgstr "How to Install in Sunbird"
-
-msgid "addons_install_in_thunderbird"
-msgstr ""
-"<ol><li>Right-click the link below and choose \"Save Link As...\" to "
-"download and save the file to your hard disk.</li><li>In Mozilla "
-"Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
-"button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
-
-msgid "addons_install_in_thunderbird_title"
-msgstr "How to Install in Thunderbird"
-
-msgid "addons_options_show_experimental"
-msgstr "show experimental add-ons"
-
-msgid "addons_options_submit"
-msgstr "Go"
-
-msgid "addons_plugins_by"
-msgstr "By"
-
-msgid "addons_plugins_for_linux"
-msgstr "for Linux"
-
-msgid "addons_plugins_for_macosx"
-msgstr "for Mac OS X"
-
-msgid "addons_plugins_for_windows"
-msgstr "for Windows"
-
-#. %1$s is a URL
-#, php-format
-msgid "addons_plugins_looking_for_more"
-msgstr ""
-"This page only lists some of the most common and most popular plugins. For "
-"more information about other plugins available for Mozilla-based Browsers, "
-"visit %1$s"
-
-msgid "addons_plugins_looking_for_plugin"
-msgstr "Looking for a plugin not listed here?"
-
-msgid "addons_plugins_main_description"
-msgstr ""
-"Plugins help your browser perform specific functions like viewing special "
-"graphic formats or playing multimedia files. Plugins are slightly different "
-"from extensions, which modify or add to existing functionality."
-
-#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#, php-format
-msgid "addons_plugins_main_header"
-msgstr "Common Plugins for %1$s"
-
-msgid "addons_plugins_pagetitle"
-msgstr "Plugins"
-
-msgid "addons_plugins_support_documentation"
-msgstr "Support Documentation: "
-
-#. %s is the name of the add-on
-#, php-format
-msgid "addons_policy_eula_require"
-msgstr ""
-"%s requires that you accept the following End-User License Agreement before "
-"installation can proceed:"
-
-#. %1 is the add-on name
-#, php-format
-msgid "addons_previews_pagetitle"
-msgstr "Previews for %s"
-
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-msgid "addons_recommended_introduction"
-msgstr ""
-"With so many great add-ons available, there's something for everyone. To get "
-"you started, here's a list of some of the most popular. Enjoy!"
-
-msgid "addons_recommended_pagetitle"
-msgstr "Recommended Add-ons"
-
-msgid "addons_recommended_title"
-msgstr "Recommended Add-ons"
-
-msgid "addons_searchengines_additional_resources"
-msgstr "Additional Resources"
-
-#. link text devmo
-msgid "addons_searchengines_devmo_link"
-msgstr "Mozilla Developer Center"
-
-msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr ""
-"Sorry, you need a Mozilla-based browser (such as Firefox) to install a "
-"search plugin."
-
-msgid "addons_searchengines_error_nojavascript"
-msgstr ""
-"JavaScript is required to install plugins, but it looks like you have it "
-"disabled.  Please enable JavaScript before trying to install any of the "
-"search plugins below."
-
-#. %1 is "make your own" link
-#. %2 is MDC link
-msgid "addons_searchengines_learn_howto"
-msgstr "Learn how to %1$s at the %2$s."
-
-#. link path to search plugins instructions, relative to devmo
-msgid "addons_searchengines_makeyourown_href"
-msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
-
-#. link text for "make your own" (opensearch engine)
-msgid "addons_searchengines_makeyourown_link"
-msgstr "make your own"
-
-#. %1 is the link to mycroft.mozdev.org
-msgid "addons_searchengines_more"
-msgstr "Browse through more search engines at %1$s"
-
-#. link text to mycroft.mozdev.org
-msgid "addons_searchengines_mycroft_link"
-msgstr "mycroft.mozdev.org"
-
-msgid "addons_searchengines_pagetitle"
-msgstr "Search Engines"
-
-msgid "addons_searchengines_thanks"
-msgstr ""
-"Special thanks to the Mycroft Project for their work on Firefox Search "
-"Engines."
-
-msgid "addons_share_button_text"
-msgstr "Share this"
-
-msgid "addons_share_label_delicious"
-msgstr "Add to Delicious"
-
-msgid "addons_share_label_digg"
-msgstr "Digg this!"
-
-msgid "addons_share_label_facebook"
-msgstr "Post to Facebook"
-
-msgid "addons_share_label_friendfeed"
-msgstr "Share on FriendFeed"
-
-msgid "addons_share_label_myspace"
-msgstr "Post to MySpace"
-
-msgid "addons_status_disabled"
-msgstr "Disabled"
-
-msgid "addons_status_incomplete"
-msgstr "Incomplete Version"
-
-msgid "addons_status_nominated"
-msgstr "In Sandbox; Public Nomination"
-
-msgid "addons_status_pending"
-msgstr "In Sandbox; Pending Review"
-
-msgid "addons_status_public"
-msgstr "Public"
-
-msgid "addons_status_sandbox"
-msgstr "In Sandbox"
-
-msgid "addons_status_unknown"
-msgstr "Unknown"
-
-msgid "addons_title_tooltip"
-msgstr "Learn more about this add-on"
-
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-msgid "addons_versions_careful"
-msgstr "Be Careful With Old Versions"
-
-msgid "addons_versions_careful_introduction"
-msgstr ""
-"These versions are displayed for reference and testing purposes. You should "
-"always use the latest version of an add-on."
-
-msgid "addons_versions_history"
-msgstr "Version History with Changelogs"
-
-#. %1$s is the add-on name
-#, php-format
-msgid "addons_versions_pagetitle"
-msgstr "%1$s Version History"
-
-msgid "admin_group_add_pagetitle"
-msgstr "Add Group"
-
-msgid "admin_group_delete_pagetitle"
-msgstr "Delete Group"
-
-#. %s is a number to identify the group
-#, php-format
-msgid "admin_group_deleted"
-msgstr "The Group with id %s was deleted"
-
-msgid "admin_group_edit_pagetitle"
-msgstr "Edit Group"
-
-msgid "admin_group_error_invalid_id"
-msgstr "Invalid id for Group"
-
-msgid "admin_group_pagetitle"
-msgstr "Group Admin"
-
-msgid "admin_group_saved"
-msgstr "The Group has been saved"
-
-msgid "advanced_search_form"
-msgstr "Advanced"
-
-msgid "advanced_search_form_any_time"
-msgstr "Any time"
-
-msgid "advanced_search_form_any_type"
-msgstr "Any"
-
-msgid "advanced_search_form_any_version"
-msgstr "Any"
-
-msgid "advanced_search_form_application"
-msgstr "Application"
-
-msgid "advanced_search_form_keyword_match"
-msgstr "Keyword Match"
-
-msgid "advanced_search_form_lastupdate"
-msgstr "Last Updated"
-
-msgid "advanced_search_form_name"
-msgstr "Name"
-
-msgid "advanced_search_form_newest"
-msgstr "Newest"
-
-msgid "advanced_search_form_past_3_months"
-msgstr "Past 3 months"
-
-msgid "advanced_search_form_past_6_months"
-msgstr "Past 6 months"
-
-msgid "advanced_search_form_past_day"
-msgstr "Past Day"
-
-msgid "advanced_search_form_past_month"
-msgstr "Past month"
-
-msgid "advanced_search_form_past_week"
-msgstr "Past week"
-
-msgid "advanced_search_form_past_year"
-msgstr "Past year"
-
-msgid "advanced_search_form_perpage"
-msgstr "Per Page"
-
-msgid "advanced_search_form_platform"
-msgstr "Platform"
-
-msgid "advanced_search_form_popularity"
-msgstr "Popularity"
-
-msgid "advanced_search_form_rating"
-msgstr "Rating"
-
-msgid "advanced_search_form_sortby"
-msgstr "Sort By"
-
-msgid "advanced_search_form_to"
-msgstr "to"
-
-msgid "advanced_search_form_toggle_tooltip"
-msgstr "Toggle advanced search mode"
-
-msgid "advanced_search_form_type"
-msgstr "Type"
-
-msgid "advanced_search_form_version"
-msgstr "version"
-
-msgid "app_compat_ignore_check"
-msgstr "Ignore version check"
-
-msgid "app_compat_older_firefox_only"
-msgstr "This add-on is for older versions of Firefox"
-
-#. %1$s and %2$s are URLs
-msgid "app_compat_older_version_or_ignore_check"
-msgstr ""
-"You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
-"\"%2$s\">ignore this check</a>"
-
-#. %1$s is a URL
-msgid "app_compat_try_old_version"
-msgstr "An <a href=\"%1$s\">older version</a> may work"
-
-#. %1$s is a URL
-#. %2$s is a version number.  Example: 3.1
-msgid "app_compat_unreleased_version"
-msgstr ""
-"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
-
-msgid "app_compat_update_firefox"
-msgstr ""
-"<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
-
-msgid "browse_addons_name"
-msgstr "Add-ons by Name"
-
-msgid "browse_addons_newest"
-msgstr "Newest Add-ons"
-
-msgid "browse_addons_popular"
-msgstr "Popular Add-ons"
-
-msgid "browse_addons_rated"
-msgstr "Add-ons by Rating"
-
-msgid "browse_addons_updated"
-msgstr "Recently Updated Add-ons"
-
-msgid "categories_current_title"
-msgstr "Current Category"
-
-msgid "categories_header"
-msgstr "Categories"
-
-msgid "categories_header_title"
-msgstr "Choose a category"
-
-#. %1$s is the category name
-#, php-format
-msgid "category_extra_see_all"
-msgstr "See All %1$s"
-
-#. %1$s is a number.
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is a number.
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-msgid "collection_not_found"
-msgstr "Collection not found!"
-
-#. %s is a date in the _('date') format
-#, php-format
-msgid "collections_interactive_addon_added"
-msgstr "Added %s"
-
-msgid "compatibility_dashboard_center_header"
-msgstr "Add-on Compatibility Center"
-
-#. %1$s is the name of an application and a version.  Example: Firefox 3.0
-#. %2$s is the name of an application.  Example: Firefox
-msgid "compatibility_dashboard_intro"
-msgstr ""
-"Be prepared for the release of %1$s with the tools and information available "
-"for the %2$s Add-ons community found below."
-
-msgid "compatibility_dashboard_loading"
-msgstr "Loading data..."
-
-msgid "compatibility_dashboard_main_link"
-msgstr "Back to Main"
-
-msgid "compatibility_dashboard_report"
-msgstr "Add-on Compatibility Report"
-
-msgid "compatibility_developer_info"
-msgstr "Information for Add-on Developers"
-
-msgid "compatibility_developers_adjust_maxversion"
-msgstr "Adjust maxVersion without uploading"
-
-msgid "compatibility_developers_check_status"
-msgstr "Check Status of My Add-ons"
-
-#. %1$s is a URL
-#. %2$s is an application and version.  Example:  Firefox 3.0
-msgid "compatibility_developers_login_first"
-msgstr ""
-"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please log "
-"in</a> to analyze the status of your add-ons for %2$s."
-
-msgid "compatibility_developers_mdclogo_alt"
-msgstr "Mozilla Developer Center Logo"
-
-msgid "compatibility_developers_no_addons"
-msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
-
-msgid "compatibility_developers_results"
-msgstr "Add-on Status Check Results"
-
-msgid "compatibility_developers_retrieving"
-msgstr "Retrieving status of hosted add-ons..."
-
-#. %1$s is a number
-#. %2$s is an application name  
-#. %3$s is a number.
-#. Full example:   50 Firefox users (10% of total)
-msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s users (%3$s&#37; of total)"
-
-msgid "compatibility_report_detail_intro"
-msgstr ""
-"The add-ons below make up 95% of add-on usage known to Mozilla and are "
-"ordered by their usage size."
-
-msgid "compatibility_report_detailed_link"
-msgstr "View Detailed Report"
-
-#. %1$s and %2$s are numbers
-#. %3$s is an application name and version.  Example: Firefox 3.1
-msgid "compatibility_report_intro"
-msgstr ""
-"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
-"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
-"of %3$s."
-
-msgid "compatibility_report_legend_alpha"
-msgstr "Alpha Versions"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-msgid "compatibility_report_legend_alpha_description"
-msgstr "Add-ons compatible with an alpha version of %1$s"
-
-msgid "compatibility_report_legend_beta"
-msgstr "Beta Versions"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-msgid "compatibility_report_legend_beta_description"
-msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
-
-msgid "compatibility_report_legend_latest"
-msgstr "Latest Version"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-msgid "compatibility_report_legend_latest_description"
-msgstr "Add-ons up-to-date with the latest builds of %1$s"
-
-msgid "compatibility_report_legend_other"
-msgstr "Other Versions"
-
-#. %1$s is an application name and version.  Example: Firefox 3.1
-msgid "compatibility_report_legend_other_description"
-msgstr "Add-ons not compatible with any version of %1$s"
-
-msgid "compatibility_report_title"
-msgstr "Add-on Compatibility Report"
-
-msgid "compatibility_user_info"
-msgstr "Information for Add-on Users"
-
-msgid "compatibility_view_report"
-msgstr "View Compatibility Report"
-
-#. %s is a URL
-#, php-format
-msgid "credits_contributing"
-msgstr "For information on contributing, please see our %s."
-
-msgid "credits_contributing_wikipage"
-msgstr "wiki page"
-
-msgid "credits_intro"
-msgstr ""
-"Mozilla would like to thank the following people for their contributions to "
-"the addons.mozilla.org project over the years:"
-
-msgid "credits_section_developers"
-msgstr "Developers"
-
-msgid "credits_section_editors"
-msgstr "Editors"
-
-msgid "credits_section_localizers"
-msgstr "Localizers"
-
-msgid "credits_section_other_contributors"
-msgstr "Other Contributors"
-
-msgid "credits_section_past_developers"
-msgstr "Past Developers"
-
-msgid "credits_section_software"
-msgstr "Software and Images"
-
-msgid "credits_software_famfamfam"
-msgstr ""
-"Some icons used are from the <a href=\"http://www.famfamfam.com/lab/icons/"
-"silk/\">famfamfam Silk Icon Set</a>, licensed under a <a href=\"http://"
-"creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
-"License</a>."
-
-msgid "credits_software_timeplot"
-msgstr ""
-"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
-"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
-"html\">BSD License</a>."
-
-#. date format string as used in PHP's strftime():
-#. http://php.net/strftime
-msgid "date"
-msgstr "%B %e, %Y"
-
-#. date and time format string (strftime)
-#. http://php.net/strftime
-msgid "datetime"
-msgstr "%B %e, %Y, %I:%M %p"
-
-msgid "downloads_disable_warning"
-msgstr "This add-on is disabled"
-
-msgid "error_access_denied"
-msgstr "Access Denied"
-
-msgid "error_access_denied_message"
-msgstr "You are not authorized to view this page."
-
-msgid "error_addon_notfound"
-msgstr "Add-on not found!"
-
-msgid "error_addon_notviewable"
-msgstr "This add-on is not viewable here."
-
-msgid "error_addon_selfreview"
-msgstr "You cannot review your own add-on."
-
-msgid "error_browse_no_addons"
-msgstr "No add-ons in this category!"
-
-msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
-
-msgid "error_email_invalid"
-msgstr "This is not a valid email address."
-
-msgid "error_field_required"
-msgstr "This field must not be empty."
-
-msgid "error_file_notfound"
-msgstr "File not found!"
-
-#. %s is a filename
-#, php-format
-msgid "error_file_x_notfound"
-msgstr "File error: %s does not exist."
-
-msgid "error_formerrors"
-msgstr "There are errors in this form. Please correct them and resubmit."
-
-msgid "error_invalid_captcha"
-msgstr "Invalid captcha, please try again!"
-
-msgid "error_invalid_url"
-msgstr ""
-"This URL has an invalid format. Valid URLs look like http://example.com/"
-"my_page."
-
-#. %s is a string representing what's missing.  Example:  file_id
-#, php-format
-msgid "error_missing_argument"
-msgstr "Missing argument: %s"
-
-msgid "error_no_files_in_addon"
-msgstr "No Files"
-
-msgid "error_preview_notfound"
-msgstr "Preview not found!"
-
-msgid "error_review_rating_required"
-msgstr "You must select a rating."
-
-msgid "error_user_already_confirmed"
-msgstr "This user account is already confirmed."
-
-msgid "error_user_badconfirmationcode"
-msgstr "Invalid confirmation code!"
-
-msgid "error_user_confirmpw_nomatch"
-msgstr "The passwords did not match."
-
-msgid "error_user_email_notunique"
-msgstr "This email address is already taken by another user."
-
-msgid "error_user_emailchange_expired"
-msgstr ""
-"The email change has expired. Please change your email address again in your "
-"user profile and click the link in the confirmation email as soon as you "
-"receive it."
-
-msgid "error_user_nickname_notunique"
-msgstr "This nickname is already taken."
-
-msgid "error_user_notfound"
-msgstr "User not found!"
-
-msgid "error_user_unconfirmed"
-msgstr ""
-"Please confirm your user account first with the code you received by email."
-
-msgid "error_username_or_pw_wrong"
-msgstr "Wrong username or password!"
-
-msgid "error_version_notfound"
-msgstr "Version not found!"
-
-msgid "error_wrong_password"
-msgstr "Wrong password entered!"
-
-msgid "feature_learnmore"
-msgstr "Learn more"
-
-#. %1 is the add-on name
-#, php-format
-msgid "feature_learnmore_about_addon"
-msgstr "Learn more about %1$s"
-
-#. %1$s is a number
-#, php-format
-msgid "feature_reviews"
-msgid_plural "feature_reviews"
-msgstr[0] "%1$s review"
-msgstr[1] "%1$s reviews"
-
-msgid "feature_view_more_from_category"
-msgstr "View more from"
-
-#. This appears on a page that views the source of an add-on.  This link will return
-#. the user to the add-on's main page
-msgid "file_browser_link_addon"
-msgstr "Back to add-on"
-
-#. There is a list of directories and files on the page.  Clicking this will show the
-#. contents of all the directories (normally you would click on each one to see the
-#. contents)
-msgid "file_browser_link_expand_all"
-msgstr "Expand all"
-
-#. This appears on a page that views the source of an add-on.  This link will return
-#. the user to the add-on's review page (it only appears if the add-on is being
-#. reviewed)
-msgid "file_browser_link_review"
-msgstr "Back to review"
-
-#. The title of the page for viewing an add-on's source.
-#. %1$s is the name of the add-on
-#. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
-msgid "file_browser_title"
-msgstr "%1$s :: File Browser :: %2$s Add-ons"
-
-#. This appears on a page that views the source of an add-on.  There is a list of
-#. directories and files on the page.  Clicking this link will toggle between an
-#. expanded or a collapsed list.  This string should be kept short.
-msgid "file_browser_toggle_expand_collapse"
-msgstr "+/-"
-
-#. Link text for the AMO About page.
-msgid "footer_a_about"
-msgstr "About"
-
-#. Link text to the AMO blog.
-msgid "footer_a_blog"
-msgstr "Blog"
-
-#. Link text to the Frequently Asked Questions page.
-msgid "footer_a_faq"
-msgstr "FAQ"
-
-#. Full text for the FAQ abbreviation.
-msgid "footer_abbr_faq"
-msgstr "Frequently Asked Questions"
-
-msgid "footer_all_rights_reserved"
-msgstr "All rights reserved."
-
-msgid "footer_copyright"
-msgstr "Copyright"
-
-msgid "footer_credits"
-msgstr "Credits"
-
-msgid "footer_disclaimer"
-msgstr ""
-"Mozilla is providing links to these applications as a courtesy, and makes no "
-"representations regarding the applications or any information related there "
-"to. Any questions, complaints or claims regarding the applications must be "
-"directed to the appropriate software vendor."
-
-msgid "footer_lang_form_lang_submit_go"
-msgstr "Go"
-
-msgid "footer_legal_notices"
-msgstr "Legal Notices"
-
-msgid "footer_other_languages"
-msgstr "Other languages:"
-
-msgid "footer_privacy_policy"
-msgstr "Privacy Policy"
-
-msgid "general_addontype_dict"
-msgstr "Dictionary"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_dict_plural"
-msgstr "Dictionaries"
-
-msgid "general_addontype_extension"
-msgstr "Extension"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_extension_plural"
-msgstr "Extensions"
-
-msgid "general_addontype_lpaddon"
-msgstr "Language Pack (Add-on)"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_lpaddon_plural"
-msgstr "Language Packs (Add-on)"
-
-msgid "general_addontype_lpapp"
-msgstr "Language Pack (Application)"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_lpapp_plural"
-msgstr "Language Packs (Application)"
-
-msgid "general_addontype_plugin"
-msgstr "Plugin"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_plugin_plural"
-msgstr "Plugins"
-
-msgid "general_addontype_search"
-msgstr "Search Engine"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_search_plural"
-msgstr "Search Engines"
-
-msgid "general_addontype_theme"
-msgstr "Theme"
-
-#. Plural in this context means many of the add-on type
-msgid "general_addontype_theme_plural"
-msgstr "Themes"
-
-#. %1$s is the application name.  Example:  Firefox
-#, php-format
-msgid "header_home_tooltip"
-msgstr "Return to the %1$s Add-ons homepage"
-
-msgid "header_main_firefox_header"
-msgstr "Firefox Add-ons"
-
-msgid "header_main_header"
-msgstr "Add-ons"
-
-msgid "header_main_seamonkey_header"
-msgstr "SeaMonkey Add-ons"
-
-msgid "header_main_sunbird_header"
-msgstr "Sunbird Add-ons"
-
-msgid "header_main_thunderbird_header"
-msgstr "Thunderbird Add-ons"
-
-msgid "header_navlink_addons"
-msgstr "Add-ons"
-
-msgid "header_navlink_login"
-msgstr "Log in"
-
-msgid "header_navlink_logout"
-msgstr "Log out"
-
-msgid "header_navlink_myaccount"
-msgstr "My Account"
-
-msgid "header_navlink_register"
-msgstr "Register"
-
-msgid "home"
-msgstr "home"
-
-#. %s is the add-on name
-#, php-format
-msgid "img_preview_of"
-msgstr "Preview Image of %s"
-
-#. %1 is the login URL for the link tag
-#. %2 is the link to an explanatory page.
-msgid "install_a_login_to_install"
-msgstr ""
-"<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2"
-"$s\">Why</a>?"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
-#. %1$s is the application name.  Example:  Firefox
-#. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#, php-format
-msgid "install_button_text"
-msgstr "Add to %1$s %2$s"
-
-#. %1 is the add-on name, %2 is the app name
-#, php-format
-msgid "install_button_title"
-msgstr "Add %1$s to %2$s"
-
-#. %1$s is the add-on name
-#, php-format
-msgid "install_download"
-msgstr "Download %1$s"
-
-msgid "install_error_addon_not_found"
-msgstr "This add-on is not available."
-
-msgid "langtools_a11y_tablesummary"
-msgstr "List of language packs and dictionaries."
-
-msgid "langtools_download_dictionary"
-msgstr "Download Dictionary"
-
-msgid "langtools_download_langpack"
-msgstr "Download Language Pack"
-
-msgid "langtools_header_dicts_and_langpacks"
-msgstr "Dictionaries & Language Packs"
-
-msgid "langtools_install_dictionary"
-msgstr "Install Dictionary"
-
-msgid "langtools_install_langpack"
-msgstr "Install Language Pack"
-
-msgid "langtools_tableheader_dictionary"
-msgstr "Dictionary"
-
-msgid "langtools_tableheader_langpack"
-msgstr "Language Pack"
-
-msgid "langtools_tableheader_language"
-msgstr "Language"
-
-msgid "license_custom"
-msgstr "Custom License"
-
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-msgid "link_return_to_front_page"
-msgstr "Click here to return to the front page."
-
-msgid "list_sortby_date"
-msgstr "Date"
-
-msgid "list_sortby_downloads"
-msgstr "Downloads"
-
-msgid "list_sortby_name"
-msgstr "Add-on Name"
-
-msgid "list_sortby_rating"
-msgstr "Rating"
-
-msgid "main_prettyname_fennec"
-msgstr "Fennec"
-
-msgid "main_prettyname_firefox"
-msgstr "Firefox"
-
-msgid "main_prettyname_seamonkey"
-msgstr "SeaMonkey"
-
-msgid "main_prettyname_sunbird"
-msgstr "Sunbird"
-
-msgid "main_prettyname_thunderbird"
-msgstr "Thunderbird"
-
-msgid "nav_category_dicts_langpacks"
-msgstr "Dictionaries & Language Packs"
-
-msgid "nav_category_themes"
-msgstr "Themes"
-
-msgid "other_apps_tooltip"
-msgstr "Find add-ons for other applications"
-
-#. In a user list: user 1, user 2, "others"
-msgid "other_users"
-msgstr "others"
-
-msgid "page_title_appversions"
-msgstr "Application Versions"
-
-msgid "page_title_credits"
-msgstr "Credits"
-
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
-
-msgid "page_title_faq"
-msgstr "Frequently Asked Questions"
-
-msgid "page_title_fashionyourfirefox_faq"
-msgstr "Fashion your Firefox FAQ"
-
-msgid "page_title_policy"
-msgstr "Add-ons Policy"
-
-msgid "page_title_privacy"
-msgstr "Mozilla Privacy Policy"
-
-msgid "page_title_review_guide"
-msgstr "Review Guidelines"
-
-msgid "page_title_sandbox"
-msgstr "Sandbox Review System"
-
-msgid "page_title_submissionhelp"
-msgstr "Submission Help"
-
-msgid "pages_appversions_guid"
-msgstr "GUID"
-
-msgid "pages_appversions_header"
-msgstr "Valid Application Versions"
-
-msgid "pages_appversions_intro"
-msgstr ""
-"Add-ons submitted to Mozilla Add-ons must have an install.rdf file with at "
-"least one of the below applications supported. Only the versions listed "
-"below are allowed for these applications."
-
-#. %s is a full <a> tag
-#, php-format
-msgid "pages_appversions_required_files"
-msgstr ""
-"If your supported application does not require an install.rdf file, you "
-"still must include one with the required properties as specified %s."
-
-#. this is the text inside of an <a> tag for pages_appversions_required_files.  This
-#. should be fixed.
-msgid "pages_appversions_required_files_link"
-msgstr "here"
-
-msgid "pages_appversions_versions"
-msgstr "Versions"
-
-msgid "pages_policy_sandbox_link"
-msgstr "Sandbox Information Page"
-
-msgid "pagination_next_page"
-msgstr "next"
-
-#. %1 is page number, %2 is total page count
-#, php-format
-msgid "pagination_page_number_title"
-msgstr "This is page %1$s of %2$s"
-
-msgid "pagination_previous_page"
-msgstr "previous"
-
-msgid "recaptcha_enter_both_words"
-msgstr ""
-"Please enter <strong>both words</strong> below, <strong>separated by a "
-"space</strong>."
-
-msgid "recaptcha_enter_here"
-msgstr "Enter your answer here:"
-
-msgid "recaptcha_enter_whatyouhear"
-msgstr "Please type what you hear."
-
-#. %1 is the link switching refreshing the captcha
-#. %2 is the link switching to a text captcha
-msgid "recaptcha_hardtohear_text"
-msgstr ""
-"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
-"else</a> or <a href=\"%2$s\">switch back to text</a>."
-
-#. %1 is the link switching refreshing the captcha
-#. %2 is the link switching to an audio captcha
-msgid "recaptcha_hardtoread_text"
-msgstr ""
-"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
-"<a href=\"%2$s\">listen to something</a> instead."
-
-msgid "recaptcha_label"
-msgstr "Are you human?"
-
-msgid "recaptcha_whatsthis"
-msgstr "What's this?"
-
-msgid "review_flag_error"
-msgstr "Error flagging this review!"
-
-msgid "review_flag_reason_bug_support"
-msgstr "Misplaced bug report or support request"
-
-msgid "review_flag_reason_instructions"
-msgstr "Report this review (select a reason)"
-
-msgid "review_flag_reason_language"
-msgstr "Inappropriate language/dialog"
-
-msgid "review_flag_reason_other"
-msgstr "Other (please specify)"
-
-msgid "review_flag_reason_spam"
-msgstr "Spam or otherwise non-review content"
-
-msgid "review_flag_success"
-msgstr "Thanks; this review has been flagged for editor approval."
-
-msgid "review_flag_this"
-msgstr "Report this review"
-
-msgid "review_flag_this_titletip"
-msgstr ""
-"Is this review inappropriate, inaccurate or spam? Click here to flag it for "
-"editor review."
-
-#. %1 is the URL of the support section, %2 for the review guidelines
-msgid "review_guidelines_short"
-msgstr ""
-"<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
-"about your experience with the add-on.  Give specifics and helpful details, "
-"such as what features you liked and/or disliked, how easy to use it is, and "
-"any disadvantages it has.  Avoid generic language such as calling it \"Great"
-"\" or \"Bad\" unless you can give reasons why you believe this is so.</"
-"li><li>Please do not post bug reports in reviews. We do not make your email "
-"address available to add-on developers and they may need to contact you to "
-"help resolve your issue. See the <a href=\"%1$s\">support section</a> to "
-"find out where to get assistance for this add-on.</li><li>Please keep "
-"reviews clean, avoid the use of improper language and do not post any "
-"personal information.</li></ul><p>Please read the <a href=\"%2$s\">Review "
-"Guidelines</a> for more detail about user add-on reviews.</p>"
-
-#. %1 is the add-on name
-#, php-format
-msgid "reviews_header"
-msgstr "Reviews for %s"
-
-msgid "rss_featuredaddons"
-msgstr "Featured Add-ons"
-
-msgid "rss_newestaddons"
-msgstr "Newest Add-ons"
-
-msgid "rss_updatedaddons"
-msgstr "Updated Add-ons"
-
-msgid "search"
-msgstr "Search"
-
-msgid "search_disabled"
-msgstr "Search is currently disabled. Please try again later."
-
-msgid "search_form_all_addons"
-msgstr "all add-ons"
-
-msgid "search_form_default_text"
-msgstr "search for add-ons"
-
-msgid "search_form_submit_tooltip"
-msgstr "Search for add-ons"
-
-msgid "search_form_tooltip"
-msgstr "Click to enter search terms"
-
-msgid "search_form_within"
-msgstr "within"
-
-msgid "search_landing_all_search_engines"
-msgstr "All Search Engines"
-
-msgid "search_landing_browse_search_engines"
-msgstr "Browse Search Engines"
-
-#. %s is a number
-#, php-format
-msgid "search_matching_addons_number"
-msgid_plural "search_matching_addons_number"
-msgstr[0] "%s matching add-on"
-msgstr[1] "%s matching add-ons"
-
-msgid "search_nothing_found"
-msgstr "No results found."
-
-msgid "search_pagetitle"
-msgstr "Search Add-ons"
-
-msgid "search_rss_description"
-msgstr "Search results feed"
-
-#. %s is the terms the user is searching for (a string)
-#, php-format
-msgid "search_rss_results_for"
-msgstr "Search results for: %s"
-
-msgid "sidebar_navlink_admin_tools"
-msgstr "Admin Tools"
-
-msgid "sidebar_navlink_developer_tools"
-msgstr "Developer Tools"
-
-msgid "sidebar_navlink_editor_tools"
-msgstr "Editor Tools"
-
-msgid "sidebar_navlink_welcome"
-msgstr "Welcome"
-
-#. %s is the user's name
-#, php-format
-msgid "sidebar_navlink_welcome_name"
-msgstr "Welcome, %s"
-
-msgid "sidebar_pitch_dictionary"
-msgstr "Dictionary"
-
-msgid "sidebar_pitch_featured_addons"
-msgstr "Featured Add-ons"
-
-msgid "sidebar_pitch_looking_for"
-msgstr "I am looking for a:"
-
-msgid "sidebar_pitch_newest_addons"
-msgstr "Newest Add-ons"
-
-msgid "sidebar_pitch_search"
-msgstr "Search Plugin"
-
-msgid "sidebar_pitch_subscribe_to"
-msgstr "Subscribe to"
-
-msgid "sidebar_pitch_theme"
-msgstr "Theme"
-
-msgid "sidebar_pitch_updated_addons"
-msgstr "Updated Add-ons"
-
-#. %1$s is a number
-#, php-format
-msgid "size_kb"
-msgstr "%1$s KB"
-
-msgid "stars_not_yet_rated"
-msgstr "Not yet rated"
-
-#. %1 is the number of stars this add-on has
-#, php-format
-msgid "stars_rated_x_outof_5"
-msgstr "Rated %s out of 5 stars"
-
-msgid "themes_landing_all_themes"
-msgstr "All Themes"
-
-msgid "themes_landing_browse_themes"
-msgstr "Browse Themes"
-
-msgid "user_change_email"
-msgstr "Change Email Address"
-
-msgid "user_change_password"
-msgstr "Change password"
-
-msgid "user_confirmationcode_resent"
-msgstr "The confirmation code was resent!"
-
-#. %1 is the email address, %2 is the URL of the user registration page
-msgid "user_del_account_deleted"
-msgstr ""
-"Your user account %1$s has been successfully deleted. If you want to come "
-"back some time, you can re-register on the <a href=\"%2$s\">user "
-"registration page</a>."
-
-msgid "user_del_community_sad"
-msgstr "The Mozilla Add-ons community is sad to see you go."
-
-msgid "user_del_confirm_password"
-msgstr "Confirm Password"
-
-msgid "user_del_deletenow"
-msgstr "Delete my user account now"
-
-#. %1 is the URL of the user's info page
-msgid "user_del_error_addons"
-msgstr ""
-"You cannot delete your account if you are listed as an <a href=\"%1$s"
-"\">author of any add-ons</a>. To delete your account, please have another "
-"person in your development group delete you from the list of authors for "
-"your add-ons. Afterwards you will be able to delete your account here."
-
-#. %1 is a link to the amo-editors mailing list
-msgid "user_del_error_addons_more_questions"
-msgstr "If you have additional questions, please contact %1$s for assistance."
-
-msgid "user_del_error_checkbox"
-msgstr ""
-"You need to check the box \"I understand...\" before we can delete your "
-"account."
-
-msgid "user_del_error_password"
-msgstr "Please enter your password correctly in order to perform this step."
-
-#. %1 is a link to the amo-admins mailing list
-msgid "user_del_error_unknown"
-msgstr ""
-"An unknown error occured deleting your account. Please contact %1$s with the "
-"issue and we will delete it for you. We apologize for the inconvenience."
-
-msgid "user_del_header_confirm_deletion"
-msgstr "Confirm account deletion"
-
-#. %1 is the user's email address
-msgid "user_del_header_delete_account"
-msgstr "Delete User Account %1$s"
-
-msgid "user_del_header_farewell"
-msgstr "Farewell!"
-
-msgid "user_del_nologin"
-msgstr "You will not be able to log into Mozilla Add-ons anymore."
-
-msgid "user_del_permanently_removed_means"
-msgstr ""
-"By clicking \"delete\" your account is going to be <strong>permanently "
-"removed</strong>. That means:"
-
-msgid "user_del_reviews_anonymized"
-msgstr ""
-"Your reviews and ratings will not be deleted, but they will no longer be "
-"associated with you."
-
-#. %1 is a link to the amo-editors mailing list
-msgid "user_del_specific_problem_editors"
-msgstr ""
-"If you have a specific problem we may help you with, please do not delete "
-"your account now, but contact us at %1$s and we will do our best to assist "
-"you in solving it."
-
-msgid "user_del_understand_permanent"
-msgstr "I understand that this step cannot be undone."
-
-msgid "user_deleted_nickname"
-msgstr "Deleted User"
-
-#. %1 is the new email address
-msgid "user_edit_confirm_email_sent"
-msgstr ""
-"An email has been sent to %1$s to confirm your new email address. For the "
-"change to take effect, you need to click on the link provided in this email. "
-"Until then, you can keep logging in with your current email address."
-
-msgid "user_edit_delete_user"
-msgstr "Delete user account"
-
-#. This contains the email sent to users when they signed up for a new
-#. account:
-#. %1 is the confirmation URL, %2 is the current app
-#, php-format
-msgid "user_email_confirm_account_nopass"
-msgstr ""
-"Welcome to %2$s Add-ons.\n"
-"\n"
-"Before you can use your new account you must activate it - this ensures the "
-"e-mail address you used is valid and belongs to you.\n"
-"To activate your account, click the link below or copy and paste the whole "
-"thing into your browser's location bar:\n"
-"\n"
-"%1$s\n"
-"\n"
-"Once you successfully activated your account, you can throw away this e-"
-"mail.\n"
-"\n"
-"Thanks for joining %2$s Add-ons\n"
-"-- %2$s Add-ons Staff"
-
-#. %1 is the confirmation url, %2 is the application name
-msgid "user_email_confirm_emailchange"
-msgstr ""
-"You requested a change to your email address at %2$s Add-ons.\n"
-"\n"
-"In order to confirm the new address, please click the link below or copy and "
-"paste the whole thing into your browser's location bar:\n"
-"\n"
-"%1$s\n"
-"\n"
-"You have 48 hours to confirm the new address. If you do not want to change "
-"the address anymore, you can just ignore this email.\n"
-"\n"
-"Thanks!\n"
-"-- %2$s Add-ons Staff"
-
-#, php-format
-msgid "user_email_confirm_subject"
-msgstr "Thanks for joining %s Add-ons"
-
-#. This is the password reset email
-#. %1 is the pw reset URL, %2 is the application
-#, php-format
-msgid "user_email_pwreset"
-msgstr ""
-"%2$s Add-ons Password Reset\n"
-"\n"
-"A request was received to reset the password for this account on addons."
-"mozilla.org. To change this password please click on the following link, or "
-"paste it into your browser's location bar:\n"
-"\n"
-"%1$s\n"
-"\n"
-"If you did not request this email there is no need for further action.\n"
-"\n"
-"Thanks,\n"
-"-- %2$s Add-ons Staff"
-
-#, php-format
-msgid "user_email_pwreset_subject"
-msgstr "Reset your %s Add-ons password"
-
-msgid "user_emailchange_error"
-msgstr "Error!"
-
-#. %1 is the application name
-msgid "user_emailchange_subject"
-msgstr "Please confirm your email address change at %1$s Add-ons"
-
-msgid "user_emailchange_success"
-msgstr "Success!"
-
-#. %1 is the new email address
-msgid "user_emailchange_successful_description"
-msgstr ""
-"Your email address was changed successfully. From now on, please use %1$s to "
-"log in."
-
-msgid "user_form_bio"
-msgstr "About me"
-
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-msgid "user_form_confirmpassword"
-msgstr "Confirm password"
-
-#, php-format
-msgid "user_form_editprofile"
-msgstr "Edit user profile for %s"
-
-msgid "user_form_email"
-msgstr "Email address"
-
-msgid "user_form_firstname"
-msgstr "First name"
-
-msgid "user_form_hideemail"
-msgstr "Hide email address"
-
-msgid "user_form_homepage"
-msgstr "Website URL"
-
-msgid "user_form_lastname"
-msgstr "Last name"
-
-msgid "user_form_login"
-msgstr "User Login"
-
-msgid "user_form_newpassword"
-msgstr "New password"
-
-msgid "user_form_nickname"
-msgstr "Nickname"
-
-msgid "user_form_oldpassword"
-msgstr "Old password"
-
-msgid "user_form_otheractions"
-msgstr "Other Actions"
-
-msgid "user_form_password"
-msgstr "Password"
-
-msgid "user_form_registration"
-msgstr "New User Registration"
-
-msgid "user_form_remember_me"
-msgstr "Remember me on this computer"
-
-msgid "user_form_showsandbox"
-msgstr "Show sandbox?"
-
-msgid "user_form_submit_edit"
-msgstr "Save"
-
-msgid "user_form_submit_login"
-msgstr "Log in"
-
-msgid "user_form_submit_register"
-msgstr "Register"
-
-#, php-format
-msgid "user_info_usersince"
-msgstr "%s Add-ons user since"
-
-msgid "user_login_register_link"
-msgstr "Create a new user account"
-
-msgid "user_notifications_item_compat"
-msgstr "Add-on Compatibility (strongly recommended)"
-
-msgid "user_notifications_item_events"
-msgstr "Upcoming events and contests"
-
-msgid "user_notifications_none_available"
-msgstr "There are currently no notifications available for you to configure."
-
-msgid "user_notifications_select_topics"
-msgstr ""
-"From time to time, Mozilla may send you email about upcoming releases and "
-"add-on events. Please select the topics you are interested in below:"
-
-msgid "user_notifications_specific_contact"
-msgstr ""
-"Mozilla reserves the right to contact you individually about specific "
-"concerns with your hosted add-ons."
-
-msgid "user_profile_edit_error"
-msgstr ""
-"There were errors in the changes you made. Please correct them and resubmit."
-
-msgid "user_profile_saved"
-msgstr "Profile updated."
-
-#, php-format
-msgid "user_pwreset_for_email"
-msgstr "Password reset for %s"
-
-msgid "user_pwreset_header"
-msgstr "Password Reset"
-
-msgid "user_pwreset_link"
-msgstr "Forgot your password?"
-
-msgid "user_pwreset_link_sent"
-msgstr "The password reset link was sent to your email address."
-
-msgid "user_pwreset_okay"
-msgstr "Password successfully reset."
-
-msgid "user_pwreset_submit_changepw"
-msgstr "Submit password change"
-
-msgid "user_pwreset_submit_sendlink"
-msgstr "Send password reset link"
-
-#, php-format
-msgid "user_register_amo_link"
-msgstr "%s Add-ons"
-
-#. %1 is the user's email address, %2 is the current app
-#, php-format
-msgid "user_register_click_confirm_link"
-msgstr ""
-"A link to activate your user account was sent by email to your address %1$s. "
-"You have to click it before you can log into %2$s Add-ons."
-
-#. %1 is the user's email address
-#, php-format
-msgid "user_register_confirm_email_sent"
-msgstr ""
-"An email has been sent to your address %1$s to confirm your account. Before "
-"you can log in, you have to activate your account by clicking on the link "
-"provided in this email."
-
-msgid "user_register_confirmation_link_text"
-msgstr "resend the confirmation message"
-
-msgid "user_register_congratulations"
-msgstr "Congratulations! Your user account was successfully created."
-
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
-#. %1 is the link to the "resend confirmation code" page
-#, php-format
-msgid "user_register_resend_confirmation_link"
-msgstr ""
-"If you did not receive the confirmation email, make sure your email service "
-"did not mark it as \"junk mail\" or \"spam\". If you need to, you can have "
-"us %1$s to your email address mentioned above."
-
-#. %1 is the link to the Mozilla Add-ons front page
-#, php-format
-msgid "user_register_welcome"
-msgstr "Thanks for registering and welcome to %1$s!"
-
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-msgid "user_required_firstlast_or_nickname"
-msgstr "A first name, last name or nickname is required."
-
-msgid "user_tab_notifications"
-msgstr "Notifications"
-
-msgid "user_tab_profile"
-msgstr "User Profile"
-
-msgid "user_verified_okay"
-msgstr "Successfully verified!"
-
-msgid "users_delete_pagetitle"
-msgstr "Delete User Account"
-
-msgid "users_edit_pagetitle"
-msgstr "User Account Editing"
-
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#, php-format
-msgid "users_info_addons_by_user"
-msgstr "Add-ons by %1$s"
-
-msgid "users_info_author_name"
-msgstr "Name"
-
-msgid "users_info_author_profile"
-msgstr "User Profile"
-
-msgid "users_info_email"
-msgstr "Email address"
-
-msgid "users_info_homepage"
-msgstr "Homepage"
-
-msgid "users_info_nickname"
-msgstr "Nickname"
-
-#, php-format
-msgid "users_info_pagetitle"
-msgstr "User Info for %1$s"
-
-#. %1 is the user's name
-msgid "users_info_reviews_by_user"
-msgstr "Reviews by %s"
-
-msgid "users_login_pagetitle"
-msgstr "User Login"
-
-#. %1 is the link to the sandbox/policy explanation page
-#. This message is for a specific add-on not found
-#, php-format
-msgid "users_login_sandbox_display_warning"
-msgstr ""
-"The add-on you're looking for is currently in the sandbox. If you already "
-"have an account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn "
-"more about the sandbox.</a>"
-
-#. %1 is the link to the sandbox/policy explanation page
-#. This message is for any given sandbox-related page not found
-#, php-format
-msgid "users_login_sandbox_page_warning"
-msgstr ""
-"The page you're looking for is part of the sandbox. If you already have an "
-"account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn more "
-"about the sandbox.</a>"
-
-msgid "users_pwreset_pagetitle"
-msgstr "User Password Reset"
-
-msgid "users_register_pagetitle"
-msgstr "New User Registration"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-msgid "view_top_rated"
-msgstr "View all top rated"
+# Language en-US translations for addons.mozilla.org package.
+# Copyright (C) 2009 THE addons.mozilla.org'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the addons.mozilla.org package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-16 11:45-0800\n"
+"PO-Revision-Date: 2009-02-26 15:08-0800\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "a_cancel_installation"
+msgstr "Cancel Installation"
+
+#. This is the text that appears on buttons to download add-ons.
+#. %$1s is an optional string that only appears if the add-on is only available for
+#. a certain platform.  Examples:  (Windows)  or  (Linux)
+#. Note that the parenthesis are included in the string. :(
+#, php-format
+msgid "a_download"
+msgstr "Download Now %s"
+
+msgid "a_eula_download"
+msgstr "Accept and Download"
+
+msgid "a_eula_install"
+msgstr "Accept and Install"
+
+msgid "a_header_public"
+msgstr "Public"
+
+msgid "a_header_sandbox"
+msgstr "Sandbox"
+
+#. %s is a date in the _('date') format
+msgid "addon_detail_last_updated"
+msgstr "Updated %s"
+
+#. %s is the version of the add-on.  Example:  3.2a1
+#, php-format
+msgid "addon_display_header_version"
+msgstr "Version %s"
+
+msgid "addon_downloads"
+msgstr "downloads"
+
+msgid "addon_downloads_total"
+msgstr "total downloads"
+
+msgid "addon_downloads_weekly"
+msgstr "weekly downloads"
+
+#. %1 is the add-on count, %2 the category name
+#, php-format
+msgid "addon_list_category_totalcount"
+msgid_plural "addon_list_category_totalcount"
+msgstr[0] "%1$s add-on"
+msgstr[1] "%1$s add-ons"
+
+msgid "addon_list_perpage"
+msgstr "per page"
+
+msgid "addon_list_sortby"
+msgstr "Sort by:"
+
+msgid "addon_listitem_flag_experimental"
+msgstr "experimental"
+
+msgid "addon_listitem_flag_recommended"
+msgstr "recommended"
+
+#. %1 is the add-on name, %2 is the platform
+msgid "addon_not_available_for_platform"
+msgstr "%1$s is not available for %2$s."
+
+#. %1 is the add-on name
+#, php-format
+msgid "addon_review_a_back_to_addon_x"
+msgstr "Back to %1$s..."
+
+#. %1 is the add-on name
+#, php-format
+msgid "addon_review_a_back_to_reviews"
+msgstr "Back to the reviews..."
+
+msgid "addon_review_add_rating_field"
+msgstr "Rating:"
+
+msgid "addon_review_add_review_field"
+msgstr "Review:"
+
+msgid "addon_review_add_submit"
+msgstr "Submit your review"
+
+#. %s is the name of the add-on
+#, php-format
+msgid "addon_review_add_title"
+msgstr "Add a review for %s"
+
+msgid "addon_review_add_title_field"
+msgstr "Title/Summary:"
+
+msgid "addon_review_admin_delete"
+msgstr "Delete"
+
+msgid "addon_review_author_reply_link"
+msgstr "Reply"
+
+msgid "addon_review_confirm_delete"
+msgstr "Are you sure you wish to delete this review?"
+
+msgid "addon_review_confirm_no"
+msgstr "No"
+
+msgid "addon_review_confirm_yes"
+msgstr "Yes"
+
+msgid "addon_review_delete_header"
+msgstr "Delete Review"
+
+msgid "addon_review_deleted_successfully"
+msgstr "Review deleted successfully."
+
+#. %s is the name of the add-on
+#, php-format
+msgid "addon_review_edit_title"
+msgstr "Edit Review for %s"
+
+#. %1 is the count of characters entered as notes for the review flag reason.
+msgid "addon_review_flag_error_other_length"
+msgstr ""
+"Problem flagging review: Notes for flagged reviews are limited to between 10 "
+"and 100 characters; your character length was %1$s."
+
+#. Removing an extra comma
+msgid "addon_review_in_moderation"
+msgstr ""
+"Please note: Before your review shows up on the public site it will be "
+"moderated by an editor."
+
+msgid "addon_review_in_reply_to"
+msgstr "Developer reply to:"
+
+#. %1 is the review count, %2 is the nickname or full name of the user.
+#, php-format
+msgid "addon_review_others_by_user"
+msgid_plural "addon_review_others_by_user"
+msgstr[0] "See %1$s previous review submitted by %2$s for this add-on."
+msgstr[1] "See %1$s previous reviews submitted by %2$s for this add-on."
+
+#. %1 is the add-on name
+#, php-format
+msgid "addon_review_pagetitle"
+msgstr "Reviews for %s"
+
+#. %1 is the user, %2 is the (localized) date
+#, php-format
+msgid "addon_review_reply_on_x_by_y"
+msgstr "Reply by %1$s on %2$s"
+
+msgid "addon_review_reply_prefix"
+msgstr "Developer Reply:"
+
+msgid "addon_review_saved_successfully"
+msgstr "Your review was saved successfully. Thanks!"
+
+#, php-format
+msgid "addon_reviewed_by_u_on_d"
+msgstr "by %1$s on %2$s"
+
+#. %1 is the user, %2 is the (localized) date, %3 is the rating
+#, php-format
+msgid "addon_reviewed_on_x_rated_y"
+msgstr "by %1$s on %2$s (rated %3$s)"
+
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
+msgid "addon_version_permalink"
+msgstr "Permanent link to this version"
+
+#. %1 is the current Application name (e.g. Firefox)
+#. %2 is the Application's version number
+msgid "addon_versions_getlatestversion"
+msgstr "The most recent version compatible with %1$s %2$s"
+
+msgid "addons_author_addons_submit"
+msgstr "Go"
+
+msgid "addons_author_tooltip"
+msgstr "View Author's Profile"
+
+#. %1 is the name of the Application (eg. Firefox)
+msgid "addons_browse_all_themes_title"
+msgstr "Browse all Themes :: %1$s Add-ons"
+
+#. %s is the name of the category
+#, php-format
+msgid "addons_browse_browse_category"
+msgstr "Browse %s"
+
+#. %1 is the name of the theme category (eg. Modern)
+#. %2 is the name of the Application (eg. Firefox)
+msgid "addons_browse_categories_header_theme"
+msgstr "Browse %1$s Themes :: %2$s Add-ons"
+
+msgid "addons_display_add_review"
+msgstr "Add a review"
+
+msgid "addons_display_advanced_details"
+msgstr "Advanced Details"
+
+msgid "addons_display_categories"
+msgstr "Categories"
+
+msgid "addons_display_detailed_review"
+msgstr "detailed review"
+
+msgid "addons_display_dont_like_it"
+msgstr "Don't like it"
+
+msgid "addons_display_edit_review"
+msgstr "Edit your review"
+
+msgid "addons_display_has_privacy"
+msgstr "This add-on has a privacy policy."
+
+msgid "addons_display_hate_it"
+msgstr "Hate it"
+
+msgid "addons_display_header_developer_comments"
+msgstr "Developer Comments"
+
+msgid "addons_display_header_homepage"
+msgstr "Homepage"
+
+msgid "addons_display_header_reviews"
+msgstr "Reviews"
+
+msgid "addons_display_header_support"
+msgstr "Support"
+
+msgid "addons_display_like_it"
+msgstr "Like it"
+
+msgid "addons_display_long_description"
+msgstr "Long Description"
+
+msgid "addons_display_love_it"
+msgstr "Love it"
+
+msgid "addons_display_more_images"
+msgstr "More Images"
+
+#. %1$s is either an author's name or a comma separated list of authors. Using
+#. the list doesn't make sense in the English plural form so we ignore the
+#. variable.
+msgid "addons_display_other_addons_by"
+msgid_plural "addons_display_other_addons_by"
+msgstr[0] "Other add-ons by %1$s"
+msgstr[1] "Other add-ons by these authors"
+
+#. %s is the name of the add-on and the add-on section.  Example:
+#.   Some Add-on :: Firefox Add-ons
+#. This should not be concatenated in the code and should be fixed.
+#, php-format
+msgid "addons_display_pagetitle"
+msgstr "%s"
+
+#. %s is an email address
+#, php-format
+msgid "addons_display_paragraph_supportinfoemail"
+msgstr "Support for this add-on is provided by the developer at %s"
+
+#. %$1s is a URL
+#. %$2s is an email address
+#, php-format
+msgid "addons_display_paragraph_supportinfoemailurl"
+msgstr ""
+"Support for this add-on is provided by the developer at %1$s or by sending "
+"an e-mail to %2$s"
+
+#. %s is a URL
+#, php-format
+msgid "addons_display_paragraph_supportinfourl"
+msgstr "Support for this add-on is provided by the developer at %s"
+
+msgid "addons_display_rate_it"
+msgstr "Rate It"
+
+msgid "addons_display_really_like_it"
+msgstr "Really like it"
+
+msgid "addons_display_review_etiquette"
+msgstr ""
+"Please do not post bug reports in reviews. We do not make your email address "
+"available to add-on developers and they may need to contact you to help "
+"resolve your issue."
+
+#. %1 is the review guidelines link
+msgid "addons_display_review_guidelines_link"
+msgstr "<a href=\"%s\">Review Guidelines</a>"
+
+#. %1 is the support section link
+#, php-format
+msgid "addons_display_review_see_support"
+msgstr ""
+"See the <a href=\"%1$s\">support section</a> to find out where to get "
+"assistance for this add-on."
+
+msgid "addons_display_review_submit"
+msgstr "Save"
+
+#, php-format
+msgid "addons_display_see_all_addons"
+msgstr "See All %1$s Add-ons"
+
+#. %1 is the number of reviews
+#, php-format
+msgid "addons_display_see_all_reviews"
+msgstr "See all reviews (%1$s)"
+
+msgid "addons_display_see_all_versions"
+msgstr "See All Versions"
+
+msgid "addons_display_version_history"
+msgstr "Complete Version History"
+
+msgid "addons_display_view_source"
+msgstr "View the source"
+
+msgid "addons_display_view_stats"
+msgstr "View statistics"
+
+msgid "addons_display_what_do_you_think"
+msgstr "What do you think?"
+
+msgid "addons_display_workswith"
+msgstr "Works with:"
+
+msgid "addons_home_by"
+msgstr "by"
+
+msgid "addons_home_feature_head"
+msgstr "We Recommend"
+
+#, php-format
+msgid "addons_home_header_details"
+msgstr ""
+"Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
+"a look around and make %1$s your own."
+
+msgid "addons_home_newest_header"
+msgstr "Newest:"
+
+msgid "addons_home_other_applications"
+msgstr "Other Applications"
+
+#. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
+#. Sunbird
+#, php-format
+msgid "addons_home_pagetitle"
+msgstr "%1$s Add-ons"
+
+msgid "addons_home_popular_header"
+msgstr "Most Popular:"
+
+msgid "addons_home_recommended_header"
+msgstr "We Recommend:"
+
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
+
+msgid "addons_home_view_all"
+msgstr "View all"
+
+msgid "addons_home_view_all_newest_title"
+msgstr "View all newly created add-ons"
+
+msgid "addons_home_view_all_popular_title"
+msgstr "View all popular add-ons"
+
+msgid "addons_home_view_all_recommended_title"
+msgstr "View all recommended add-ons"
+
+msgid "addons_home_view_all_updated_title"
+msgstr "View all recently updated add-ons"
+
+msgid "addons_install_in_sunbird"
+msgstr ""
+"<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, "
+"open Add-ons from the Tools menu.</li><li>Click the Install button, and "
+"locate/select the file you downloaded and click \"OK\".</li></ol>"
+
+msgid "addons_install_in_sunbird_title"
+msgstr "How to Install in Sunbird"
+
+msgid "addons_install_in_thunderbird"
+msgstr ""
+"<ol><li>Right-click the link below and choose \"Save Link As...\" to "
+"download and save the file to your hard disk.</li><li>In Mozilla "
+"Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
+"button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
+
+msgid "addons_install_in_thunderbird_title"
+msgstr "How to Install in Thunderbird"
+
+msgid "addons_options_show_experimental"
+msgstr "show experimental add-ons"
+
+msgid "addons_options_submit"
+msgstr "Go"
+
+msgid "addons_plugins_by"
+msgstr "By"
+
+msgid "addons_plugins_for_linux"
+msgstr "for Linux"
+
+msgid "addons_plugins_for_macosx"
+msgstr "for Mac OS X"
+
+msgid "addons_plugins_for_windows"
+msgstr "for Windows"
+
+#. %1$s is a URL
+#, php-format
+msgid "addons_plugins_looking_for_more"
+msgstr ""
+"This page only lists some of the most common and most popular plugins. For "
+"more information about other plugins available for Mozilla-based Browsers, "
+"visit %1$s"
+
+msgid "addons_plugins_looking_for_plugin"
+msgstr "Looking for a plugin not listed here?"
+
+msgid "addons_plugins_main_description"
+msgstr ""
+"Plugins help your browser perform specific functions like viewing special "
+"graphic formats or playing multimedia files. Plugins are slightly different "
+"from extensions, which modify or add to existing functionality."
+
+#. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
+#, php-format
+msgid "addons_plugins_main_header"
+msgstr "Common Plugins for %1$s"
+
+msgid "addons_plugins_pagetitle"
+msgstr "Plugins"
+
+msgid "addons_plugins_support_documentation"
+msgstr "Support Documentation: "
+
+#. %s is the name of the add-on
+#, php-format
+msgid "addons_policy_eula_require"
+msgstr ""
+"%s requires that you accept the following End-User License Agreement before "
+"installation can proceed:"
+
+#. %1 is the add-on name
+#, php-format
+msgid "addons_previews_pagetitle"
+msgstr "Previews for %s"
+
+msgid "addons_recommended_introduction"
+msgstr ""
+"With so many great add-ons available, there's something for everyone. To get "
+"you started, here's a list of some of the most popular. Enjoy!"
+
+msgid "addons_recommended_pagetitle"
+msgstr "Recommended Add-ons"
+
+msgid "addons_recommended_title"
+msgstr "Recommended Add-ons"
+
+msgid "addons_searchengines_additional_resources"
+msgstr "Additional Resources"
+
+#. link text devmo
+msgid "addons_searchengines_devmo_link"
+msgstr "Mozilla Developer Center"
+
+msgid "addons_searchengines_error_mozilla_browser_required"
+msgstr ""
+"Sorry, you need a Mozilla-based browser (such as Firefox) to install a "
+"search plugin."
+
+msgid "addons_searchengines_error_nojavascript"
+msgstr ""
+"JavaScript is required to install plugins, but it looks like you have it "
+"disabled.  Please enable JavaScript before trying to install any of the "
+"search plugins below."
+
+#. %1 is "make your own" link
+#. %2 is MDC link
+#, php-format
+msgid "addons_searchengines_learn_howto"
+msgstr "Learn how to %1$s at the %2$s."
+
+#. link path to search plugins instructions, relative to devmo
+msgid "addons_searchengines_makeyourown_href"
+msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
+
+#. link text for "make your own" (opensearch engine)
+msgid "addons_searchengines_makeyourown_link"
+msgstr "make your own"
+
+#. %1 is the link to mycroft.mozdev.org
+#, php-format
+msgid "addons_searchengines_more"
+msgstr "Browse through more search engines at %1$s"
+
+#. link text to mycroft.mozdev.org
+msgid "addons_searchengines_mycroft_link"
+msgstr "mycroft.mozdev.org"
+
+msgid "addons_searchengines_pagetitle"
+msgstr "Search Engines"
+
+msgid "addons_searchengines_thanks"
+msgstr ""
+"Special thanks to the Mycroft Project for their work on Firefox Search "
+"Engines."
+
+msgid "addons_share_button_text"
+msgstr "Share this"
+
+msgid "addons_share_label_delicious"
+msgstr "Add to Delicious"
+
+msgid "addons_share_label_digg"
+msgstr "Digg this!"
+
+msgid "addons_share_label_facebook"
+msgstr "Post to Facebook"
+
+msgid "addons_share_label_friendfeed"
+msgstr "Share on FriendFeed"
+
+msgid "addons_share_label_myspace"
+msgstr "Post to MySpace"
+
+msgid "addons_status_disabled"
+msgstr "Disabled"
+
+msgid "addons_status_incomplete"
+msgstr "Incomplete Version"
+
+msgid "addons_status_nominated"
+msgstr "In Sandbox; Public Nomination"
+
+msgid "addons_status_pending"
+msgstr "In Sandbox; Pending Review"
+
+msgid "addons_status_public"
+msgstr "Public"
+
+msgid "addons_status_sandbox"
+msgstr "In Sandbox"
+
+msgid "addons_status_unknown"
+msgstr "Unknown"
+
+msgid "addons_title_tooltip"
+msgstr "Learn more about this add-on"
+
+msgid "addons_versions_careful"
+msgstr "Be Careful With Old Versions"
+
+msgid "addons_versions_careful_introduction"
+msgstr ""
+"These versions are displayed for reference and testing purposes. You should "
+"always use the latest version of an add-on."
+
+msgid "addons_versions_history"
+msgstr "Version History with Changelogs"
+
+#. %1$s is the add-on name
+#, php-format
+msgid "addons_versions_pagetitle"
+msgstr "%1$s Version History"
+
+msgid "admin_group_add_pagetitle"
+msgstr "Add Group"
+
+msgid "admin_group_delete_pagetitle"
+msgstr "Delete Group"
+
+#. %s is a number to identify the group
+#, php-format
+msgid "admin_group_deleted"
+msgstr "The Group with id %s was deleted"
+
+msgid "admin_group_edit_pagetitle"
+msgstr "Edit Group"
+
+msgid "admin_group_error_invalid_id"
+msgstr "Invalid id for Group"
+
+msgid "admin_group_pagetitle"
+msgstr "Group Admin"
+
+msgid "admin_group_saved"
+msgstr "The Group has been saved"
+
+msgid "advanced_search_form"
+msgstr "Advanced"
+
+msgid "advanced_search_form_any_time"
+msgstr "Any time"
+
+msgid "advanced_search_form_any_type"
+msgstr "Any"
+
+msgid "advanced_search_form_any_version"
+msgstr "Any"
+
+msgid "advanced_search_form_application"
+msgstr "Application"
+
+msgid "advanced_search_form_keyword_match"
+msgstr "Keyword Match"
+
+msgid "advanced_search_form_lastupdate"
+msgstr "Last Updated"
+
+msgid "advanced_search_form_name"
+msgstr "Name"
+
+msgid "advanced_search_form_newest"
+msgstr "Newest"
+
+msgid "advanced_search_form_past_3_months"
+msgstr "Past 3 months"
+
+msgid "advanced_search_form_past_6_months"
+msgstr "Past 6 months"
+
+msgid "advanced_search_form_past_day"
+msgstr "Past Day"
+
+msgid "advanced_search_form_past_month"
+msgstr "Past month"
+
+msgid "advanced_search_form_past_week"
+msgstr "Past week"
+
+msgid "advanced_search_form_past_year"
+msgstr "Past year"
+
+msgid "advanced_search_form_perpage"
+msgstr "Per Page"
+
+msgid "advanced_search_form_platform"
+msgstr "Platform"
+
+msgid "advanced_search_form_popularity"
+msgstr "Popularity"
+
+msgid "advanced_search_form_rating"
+msgstr "Rating"
+
+msgid "advanced_search_form_sortby"
+msgstr "Sort By"
+
+msgid "advanced_search_form_to"
+msgstr "to"
+
+msgid "advanced_search_form_toggle_tooltip"
+msgstr "Toggle advanced search mode"
+
+msgid "advanced_search_form_type"
+msgstr "Type"
+
+msgid "advanced_search_form_version"
+msgstr "version"
+
+msgid "app_compat_ignore_check"
+msgstr "Ignore version check"
+
+msgid "app_compat_older_firefox_only"
+msgstr "This add-on is for older versions of Firefox"
+
+#. %1$s and %2$s are URLs
+msgid "app_compat_older_version_or_ignore_check"
+msgstr ""
+"You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
+"\"%2$s\">ignore this check</a>"
+
+#. %1$s is a URL
+msgid "app_compat_try_old_version"
+msgstr "An <a href=\"%1$s\">older version</a> may work"
+
+#. %1$s is a URL
+#. %2$s is a version number.  Example: 3.1
+msgid "app_compat_unreleased_version"
+msgstr ""
+"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
+
+msgid "app_compat_update_firefox"
+msgstr ""
+"<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
+
+msgid "browse_addons_name"
+msgstr "Add-ons by Name"
+
+msgid "browse_addons_newest"
+msgstr "Newest Add-ons"
+
+msgid "browse_addons_popular"
+msgstr "Popular Add-ons"
+
+msgid "browse_addons_rated"
+msgstr "Add-ons by Rating"
+
+msgid "browse_addons_updated"
+msgstr "Recently Updated Add-ons"
+
+msgid "categories_current_title"
+msgstr "Current Category"
+
+msgid "categories_header"
+msgstr "Categories"
+
+msgid "categories_header_title"
+msgstr "Choose a category"
+
+msgid "category_extra_allrecommended"
+msgstr "See All Recommended Add-ons"
+
+msgid "category_extra_highestrated"
+msgstr "Highest Rated First"
+
+msgid "category_extra_lastupdated"
+msgstr "Last Updated First"
+
+msgid "category_extra_mostpopular"
+msgstr "Most Popular First"
+
+#. %1$s is the category name
+#, php-format
+msgid "category_extra_see_all"
+msgstr "See All %1$s"
+
+msgid "collection_not_found"
+msgstr "Collection not found!"
+
+#. %s is a date in the _('date') format
+#, php-format
+msgid "collections_interactive_addon_added"
+msgstr "Added %s"
+
+msgid "compatibility_dashboard_center_header"
+msgstr "Add-on Compatibility Center"
+
+#. %1$s is the name of an application and a version.  Example: Firefox 3.0
+#. %2$s is the name of an application.  Example: Firefox
+msgid "compatibility_dashboard_intro"
+msgstr ""
+"Be prepared for the release of %1$s with the tools and information available "
+"for the %2$s Add-ons community found below."
+
+msgid "compatibility_dashboard_loading"
+msgstr "Loading data..."
+
+msgid "compatibility_dashboard_main_link"
+msgstr "Back to Main"
+
+msgid "compatibility_dashboard_report"
+msgstr "Add-on Compatibility Report"
+
+msgid "compatibility_developer_info"
+msgstr "Information for Add-on Developers"
+
+msgid "compatibility_developers_adjust_maxversion"
+msgstr "Adjust maxVersion without uploading"
+
+msgid "compatibility_developers_check_status"
+msgstr "Check Status of My Add-ons"
+
+#. %1$s is a URL
+#. %2$s is an application and version.  Example:  Firefox 3.0
+msgid "compatibility_developers_login_first"
+msgstr ""
+"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
+"login</a> to analyze the status of your add-ons for %2$s."
+
+msgid "compatibility_developers_mdclogo_alt"
+msgstr "Mozilla Developer Center Logo"
+
+msgid "compatibility_developers_no_addons"
+msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
+
+msgid "compatibility_developers_results"
+msgstr "Add-on Status Check Results"
+
+msgid "compatibility_developers_retrieving"
+msgstr "Retrieving status of hosted add-ons..."
+
+#. %1$s is a number
+#. %2$s is an application name  
+#. %3$s is a number.
+#. Full example:   50 Firefox users (10% of total)
+msgid "compatibility_developers_user_count"
+msgstr "%1$s %2$s users (%3$s&#37; of total)"
+
+msgid "compatibility_report_detail_intro"
+msgstr ""
+"The add-ons below make up 95% of add-on usage known to Mozilla and are "
+"ordered by their usage size."
+
+msgid "compatibility_report_detailed_link"
+msgstr "View Detailed Report"
+
+#. %1$s and %2$s are numbers
+#. %3$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_intro"
+msgstr ""
+"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
+"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
+"of %3$s."
+
+msgid "compatibility_report_legend_alpha"
+msgstr "Alpha Versions"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_alpha_description"
+msgstr "Add-ons compatible with an alpha version of %1$s"
+
+msgid "compatibility_report_legend_beta"
+msgstr "Beta Versions"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_beta_description"
+msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
+
+msgid "compatibility_report_legend_latest"
+msgstr "Latest Version"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_latest_description"
+msgstr "Add-ons up-to-date with the latest builds of %1$s"
+
+msgid "compatibility_report_legend_other"
+msgstr "Other Versions"
+
+#. %1$s is an application name and version.  Example: Firefox 3.1
+msgid "compatibility_report_legend_other_description"
+msgstr "Add-ons not compatible with any version of %1$s"
+
+msgid "compatibility_report_title"
+msgstr "Add-on Compatibility Report"
+
+msgid "compatibility_user_info"
+msgstr "Information for Add-on Users"
+
+msgid "compatibility_view_report"
+msgstr "View Compatibility Report"
+
+#. %s is a URL
+#, php-format
+msgid "credits_contributing"
+msgstr "For information on contributing, please see our %s."
+
+msgid "credits_contributing_wikipage"
+msgstr "wiki page"
+
+msgid "credits_intro"
+msgstr ""
+"Mozilla would like to thank the following people for their contributions to "
+"the addons.mozilla.org project over the years:"
+
+msgid "credits_section_developers"
+msgstr "Developers"
+
+msgid "credits_section_editors"
+msgstr "Editors"
+
+msgid "credits_section_localizers"
+msgstr "Localizers"
+
+msgid "credits_section_other_contributors"
+msgstr "Other Contributors"
+
+msgid "credits_section_past_developers"
+msgstr "Past Developers"
+
+msgid "credits_section_software"
+msgstr "Software and Images"
+
+msgid "credits_software_famfamfam"
+msgstr ""
+"Some icons used are from the <a href=\"http://www.famfamfam.com/lab/icons/"
+"silk/\">famfamfam Silk Icon Set</a>, licensed under a <a href=\"http://"
+"creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
+"License</a>."
+
+msgid "credits_software_timeplot"
+msgstr "Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license.html\">BSD License</a>."
+
+#. date format string as used in PHP's strftime():
+#. http://php.net/strftime
+msgid "date"
+msgstr "%B %e, %Y"
+
+#. date and time format string (strftime)
+#. http://php.net/strftime
+msgid "datetime"
+msgstr "%B %e, %Y, %I:%M %p"
+
+msgid "devcp_actionbar_link_details"
+msgstr "Detailed Info"
+
+msgid "devcp_actionbar_link_edit"
+msgstr "Edit Add-on"
+
+msgid "devcp_actionbar_link_newversion"
+msgstr "Upload New Version"
+
+msgid "devcp_actionbar_link_stats"
+msgstr "Statistics Dashboard"
+
+#. %1$s is a filename, e.g. "foo.txt"
+#. %2$s is the extension, e.g. ".txt"
+#. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
+msgid "devcp_add_previews_extension_error"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
+
+#. %s is the filename.
+msgid "devcp_add_previews_save_error"
+msgstr "File %s could not be saved to the database. Please try again."
+
+#. %1$s is the preview ID number, %2$s is the filename.
+msgid "devcp_add_previews_success_replace"
+msgstr "Preview %1$s was replaced with file %2$s successfully."
+
+#. %s is the filename.
+msgid "devcp_add_previews_success_upload"
+msgstr "File %s was uploaded successfully. You can add a caption below."
+
+msgid "devcp_additem_addontype_autodetect"
+msgstr "(auto-detect)"
+
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
+msgid "devcp_additem_linktitle_opensin_newwindow"
+msgstr "Opens in a new window"
+
+msgid "devcp_additem_sidebar_title"
+msgstr "Submit Add-on"
+
+msgid "devcp_additem_step0_newlink"
+msgstr "Developer Agreement"
+
+msgid "devcp_additem_step1_link"
+msgstr "Step 1: Upload"
+
+msgid "devcp_additem_step2_link"
+msgstr "Step 2: Add-on Details"
+
+msgid "devcp_additem_step3_link"
+msgstr "Step 3: Version Details"
+
+msgid "devcp_additem_step4_link"
+msgstr "Step 4: Localization"
+
+msgid "devcp_additem_step5_link"
+msgstr "Step 5: Success"
+
+msgid "devcp_additem_submissionhelp_link"
+msgstr "Submission Help"
+
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
+msgid "devcp_addon_field_preview_caption_displaytitle"
+msgstr "Preview Caption"
+
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+msgid "devcp_addon_status_action_activate_description"
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
+
+msgid "devcp_addon_status_action_complete"
+msgstr "Complete Add-on"
+
+msgid "devcp_addon_status_action_complete_description"
+msgstr "Complete your add-on and move to the Sandbox"
+
+msgid "devcp_addon_status_action_deactivate"
+msgstr "Make Inactive"
+
+msgid "devcp_addon_status_action_deactivate_description"
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
+
+msgid "devcp_addon_status_action_move"
+msgstr "Move to Sandbox"
+
+msgid "devcp_addon_status_action_move_description"
+msgstr "Move your add-on back to the Sandbox. This is reversible."
+
+msgid "devcp_addon_status_action_nominate"
+msgstr "Nominate for Public"
+
+msgid "devcp_addon_status_action_nominate_description"
+msgstr "Nominate your add-on to become Public"
+
+msgid "devcp_addon_status_action_public"
+msgstr "Make Public"
+
+msgid "devcp_addon_status_action_public_description"
+msgstr "Make your add-on Public again."
+
+msgid "devcp_addon_status_active"
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
+
+msgid "devcp_addon_status_completion_disabled"
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
+
+msgid "devcp_addon_status_completion_enabled"
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
+
+msgid "devcp_addon_status_criteria_category"
+msgstr "At least one category selected"
+
+msgid "devcp_addon_status_criteria_description"
+msgstr "Add-on Description required"
+
+msgid "devcp_addon_status_criteria_name"
+msgstr "Add-on Name required"
+
+msgid "devcp_addon_status_criteria_prerelease"
+msgstr "Add-on is not marked as pre-release."
+
+msgid "devcp_addon_status_criteria_preview"
+msgstr "At least one preview image required for extensions and themes."
+
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
+msgid "devcp_addon_status_criteria_summary"
+msgstr "Add-on Summary required"
+
+#. %s is the status in a span, e.g. "<span>_('Public')</span>".
+msgid "devcp_addon_status_header"
+msgstr "Add-on Status: %s"
+
+msgid "devcp_addon_status_header_actions"
+msgstr "Available Actions"
+
+msgid "devcp_addon_status_header_active"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
+
+msgid "devcp_addon_status_header_criteria"
+msgstr "Add-on Completion Criteria"
+
+msgid "devcp_addon_status_header_inactive"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
+
+msgid "devcp_addon_status_header_nomination"
+msgstr "Public Nomination Criteria"
+
+msgid "devcp_addon_status_header_trusted"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
+
+msgid "devcp_addon_status_inactive"
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
+
+msgid "devcp_addon_status_nominate_disabled"
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
+
+msgid "devcp_addon_status_nominate_enabled"
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
+
+msgid "devcp_addon_status_public"
+msgstr "Public"
+
+msgid "devcp_addon_status_sandbox"
+msgstr "Sandbox"
+
+#. %s is an email address.
+msgid "devcp_addon_status_switch_disabled"
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
+
+msgid "devcp_addon_status_switch_incomplete"
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
+
+#. %s is a number, perhaps 42.
+msgid "devcp_addon_status_switch_nominated"
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
+
+#. %s is an email address.
+msgid "devcp_addon_status_switch_pending"
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
+
+msgid "devcp_addon_status_switch_public"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
+
+msgid "devcp_addon_status_switch_sandbox"
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
+
+#. %s is the add-on name.
+msgid "devcp_addon_status_title"
+msgstr "%s Status"
+
+msgid "devcp_addon_status_trusted"
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+#. %1 is the link to the sandbox information page
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+#. %1 is the "nominate" link
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+#. %1 is the link to the preview upload page
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+#. #1 is the author email
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+msgid "devcp_button_next"
+msgstr "Next"
+
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
+msgid "devcp_dashboard_active"
+msgstr "Active"
+
+#. %1$s is the add-on type string
+#. %2$s is Inactive or Active in a <span>
+#. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
+msgid "devcp_dashboard_addontype_status"
+msgstr "%1$s currently %2$s and %3$s"
+
+msgid "devcp_dashboard_change_status"
+msgstr "Change Status"
+
+#. %s is the addons email address.
+msgid "devcp_dashboard_disabled_questions"
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
+
+#. %s is the (localized) add-on status string in a span, e.g. "Disabled"
+msgid "devcp_dashboard_disabled_status"
+msgstr "Add-on Status: %s"
+
+msgid "devcp_dashboard_header_main"
+msgstr "Developer Dashboard"
+
+msgid "devcp_dashboard_header_welcome"
+msgstr "Welcome to the Developer Dashboard"
+
+msgid "devcp_dashboard_inactive"
+msgstr "Inactive"
+
+#. %s is a date in the _('date') format
+msgid "devcp_dashboard_last_edited"
+msgstr "Last edited on %s"
+
+msgid "devcp_dashboard_learn"
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
+
+msgid "devcp_dashboard_start"
+msgstr "Get Started"
+
+msgid "devcp_dashboard_versions"
+msgstr "Versions and Files"
+
+msgid "devcp_dashboard_versions_new"
+msgstr "Upload a new version"
+
+#. %s is the preview ID number.
+msgid "devcp_delete_previews_error"
+msgstr "Preview %s could not be deleted from the database. Please try again."
+
+#. %s is the preview ID number.
+msgid "devcp_delete_previews_success"
+msgstr "Preview %s has been deleted successfully."
+
+msgid "devcp_delete_version_priv_error"
+msgstr "You do not have privileges to delete versions or files."
+
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+msgid "devcp_details_author"
+msgstr "Author"
+
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+msgid "devcp_details_category"
+msgstr "Category"
+
+msgid "devcp_details_description"
+msgstr "Description"
+
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
+#. %s is a version number.  Example:  3.0
+#, php-format
+msgid "devcp_details_version"
+msgstr "Version %s"
+
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
+msgid "devcp_discuss_addreply_header"
+msgstr "Add Reply"
+
+msgid "devcp_discuss_allreplies_header"
+msgstr "Replies"
+
+#. notice when an error occurs saving a discussion reply
+#. %1 is the email address (linked) for the amo-editors list
+msgid "devcp_discuss_error_notice"
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
+
+#. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
+msgid "devcp_discuss_intro"
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
+
+#. %1 is the add-on name
+msgid "devcp_discuss_pagetitle"
+msgstr "Provide More Information For the Add-on Review of %1$s"
+
+#. submit button text
+msgid "devcp_discuss_submit_reply"
+msgstr "Submit Reply"
+
+msgid "devcp_discuss_success_message"
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
+
+#. in an author/editor discussion about an add-on to be reviewed:
+#. %1 is the commenter's user name (linked).
+#. %2 is the full date the comment was made.
+msgid "devcp_discuss_writtenby"
+msgstr "written by %1$s on %2$s"
+
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+msgid "devcp_edit_authors_add_author"
+msgstr "Add New Author"
+
+msgid "devcp_edit_authors_add_author_button"
+msgstr "Add Author"
+
+msgid "devcp_edit_authors_add_email"
+msgstr "Author Account Email:"
+
+msgid "devcp_edit_authors_add_loading"
+msgstr "Checking account email..."
+
+msgid "devcp_edit_authors_click_save"
+msgstr "Click the Update Authors button below to save."
+
+msgid "devcp_edit_authors_header_current"
+msgstr "Current Authors"
+
+msgid "devcp_edit_authors_header_manage"
+msgstr "Manage Add-on Authors"
+
+msgid "devcp_edit_authors_label_add_listed"
+msgstr "List as author in public display pages"
+
+msgid "devcp_edit_authors_label_developer"
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
+
+msgid "devcp_edit_authors_label_owner"
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
+
+msgid "devcp_edit_authors_label_viewer"
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
+
+#. Placeholder for the empty option in a <select>.
+msgid "devcp_edit_authors_option_empty"
+msgstr "----------------"
+
+msgid "devcp_edit_authors_select_role"
+msgstr "Select a role for the author:"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_author"
+msgstr "Author"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_listed"
+msgstr "Listed"
+
+#. Column name in a table.
+msgid "devcp_edit_authors_th_role"
+msgstr "Role"
+
+msgid "devcp_edit_authors_update_author"
+msgstr "Update authors"
+
+msgid "devcp_edit_categories_button_update"
+msgstr "Update Categories"
+
+msgid "devcp_edit_categories_does_not_fit"
+msgstr "My add-on doesn't fit into any available categories."
+
+#. %s is the application name (Firefox, Thunderbird).
+msgid "devcp_edit_categories_header_application"
+msgstr "%s Categories"
+
+msgid "devcp_edit_categories_header_manage"
+msgstr "Manage Add-on Categories"
+
+msgid "devcp_edit_categories_hover"
+msgstr "Hover over a category to see its description."
+
+#. %s is the category number (1, 2, 3).
+msgid "devcp_edit_categories_label_category_num"
+msgstr "Category %s"
+
+msgid "devcp_edit_categories_none_available"
+msgstr "No categories are available for this add-on type and application."
+
+msgid "devcp_edit_categories_other"
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
+
+#. %s is the application name (Firefox, Thunderbird).
+msgid "devcp_edit_categories_select_application_categories"
+msgstr "Select up to three %s categories for your add-on"
+
+msgid "devcp_edit_dd_manage_authors"
+msgstr "Add or remove users that can manage this add-on."
+
+msgid "devcp_edit_dd_manage_categories"
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
+
+msgid "devcp_edit_dd_manage_description"
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
+
+msgid "devcp_edit_dd_manage_properties"
+msgstr "Change your add-on's name, homepage, icon, and other flags."
+
+msgid "devcp_edit_description_button_update"
+msgstr "Update Descriptions"
+
+msgid "devcp_edit_description_correct_error"
+msgstr "Please correct the errors above indicated in red."
+
+msgid "devcp_edit_descriptions_header"
+msgstr "Edit Add-on Descriptions"
+
+msgid "devcp_edit_descriptions_transbox_comments_description"
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
+
+msgid "devcp_edit_descriptions_transbox_comments_name"
+msgstr "Developer Comments"
+
+msgid "devcp_edit_descriptions_transbox_description_description"
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
+
+msgid "devcp_edit_descriptions_transbox_description_name"
+msgstr "Add-on Description"
+
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
+
+msgid "devcp_edit_descriptions_transbox_eula_name"
+msgstr "End-User License Agreement"
+
+msgid "devcp_edit_descriptions_transbox_privacy_description"
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
+
+msgid "devcp_edit_descriptions_transbox_privacy_name"
+msgstr "Privacy Policy"
+
+msgid "devcp_edit_descriptions_transbox_summary_description"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
+
+msgid "devcp_edit_descriptions_transbox_summary_name"
+msgstr "Add-on Summary"
+
+msgid "devcp_edit_dt_manage_authors"
+msgstr "Manage Add-on Authors"
+
+msgid "devcp_edit_dt_manage_categories"
+msgstr "Manage Add-on Categories"
+
+msgid "devcp_edit_dt_manage_descriptions"
+msgstr "Manage Add-on Descriptions"
+
+msgid "devcp_edit_dt_manage_properties"
+msgstr "Manage Add-on Properties"
+
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+msgid "devcp_edit_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+msgid "devcp_edit_label_locale_disambiguation"
+msgstr "Additional Locale Info"
+
+msgid "devcp_edit_label_prerelease"
+msgstr "This is a pre-release"
+
+msgid "devcp_edit_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+msgid "devcp_edit_label_target_locale"
+msgstr "Target Locale"
+
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+msgid "devcp_edit_properties_button_update"
+msgstr "Update Properties"
+
+msgid "devcp_edit_properties_change_guid"
+msgstr "Only change if you understand all of the consequences."
+
+msgid "devcp_edit_properties_current_icon"
+msgstr "Current Icon"
+
+msgid "devcp_edit_properties_default_locale"
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
+
+msgid "devcp_edit_properties_flags"
+msgstr "These flags are used to filter and classify add-ons."
+
+msgid "devcp_edit_properties_guid"
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
+
+msgid "devcp_edit_properties_header"
+msgstr "Edit Add-on Properties"
+
+msgid "devcp_edit_properties_header_addon_type"
+msgstr "Add-on Type"
+
+msgid "devcp_edit_properties_header_admin_settings"
+msgstr "Admin Settings"
+
+msgid "devcp_edit_properties_header_default_locale"
+msgstr "Default Locale"
+
+msgid "devcp_edit_properties_header_flags"
+msgstr "Add-on Flags"
+
+msgid "devcp_edit_properties_header_guid"
+msgstr "Add-on GUID"
+
+msgid "devcp_edit_properties_header_icon"
+msgstr "Add-on Icon"
+
+msgid "devcp_edit_properties_header_other_settings"
+msgstr "Other Settings"
+
+#. A header on the admin page to toggle trusted status.
+msgid "devcp_edit_properties_header_trusted"
+msgstr "Trusted Add-on?"
+
+msgid "devcp_edit_properties_header_view_source"
+msgstr "View Source Online"
+
+#. %s is a comma-separated list of image extensions ".png, .jpg"
+msgid "devcp_edit_properties_icon"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
+
+msgid "devcp_edit_properties_label_binary"
+msgstr "This add-on contains binary components"
+
+msgid "devcp_edit_properties_label_not_trusted"
+msgstr "Not Trusted"
+
+msgid "devcp_edit_properties_label_trusted"
+msgstr "Trusted"
+
+msgid "devcp_edit_properties_new_icon"
+msgstr "New Icon"
+
+msgid "devcp_edit_properties_remove_icon"
+msgstr "Remove Icon"
+
+msgid "devcp_edit_properties_transbox_homepage_description"
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
+
+msgid "devcp_edit_properties_transbox_homepage_name"
+msgstr "Add-on Homepage"
+
+msgid "devcp_edit_properties_transbox_name_description"
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
+
+msgid "devcp_edit_properties_transbox_name_name"
+msgstr "Add-on Name"
+
+msgid "devcp_edit_properties_transbox_supportemail_description"
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
+
+msgid "devcp_edit_properties_transbox_supportemail_name"
+msgstr "Support Email Address"
+
+msgid "devcp_edit_properties_transbox_supporturl_description"
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
+
+msgid "devcp_edit_properties_transbox_supporturl_name"
+msgstr "Support Website"
+
+msgid "devcp_edit_properties_trusted"
+msgstr "Trusted add-ons can become public without Editor review."
+
+#. %s is href="..." and should stay in the <a> tag.
+msgid "devcp_edit_properties_undelete"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
+
+msgid "devcp_edit_properties_view_source"
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
+
+msgid "devcp_edit_properties_view_source_allow"
+msgstr "Allow online source viewing"
+
+msgid "devcp_edit_properties_view_source_do_not_allow"
+msgstr "Do not allow online source viewing"
+
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
+msgid "devcp_editbox_authors"
+msgstr "Authors"
+
+msgid "devcp_editbox_categories"
+msgstr "Categories"
+
+msgid "devcp_editbox_change_status"
+msgstr "Change Status"
+
+msgid "devcp_editbox_descriptions"
+msgstr "Descriptions"
+
+msgid "devcp_editbox_edit_addon"
+msgstr "Edit Add-on"
+
+msgid "devcp_editbox_new_version"
+msgstr "New Version"
+
+msgid "devcp_editbox_properties"
+msgstr "Properties"
+
+msgid "devcp_editbox_screenshots"
+msgstr "Preview Screenshots"
+
+msgid "devcp_editbox_statistics_dashboard"
+msgstr "Statistics Dashboard"
+
+msgid "devcp_editbox_versions"
+msgstr "Versions and Files"
+
+msgid "devcp_editbox_view_listing"
+msgstr "View Listing"
+
+msgid "devcp_editorsqueue_featured"
+msgstr "Featured Add-ons"
+
+#. %1 is the review count
+#, php-format
+msgid "devcp_editorsqueue_moderatedreviews"
+msgid_plural "devcp_editorsqueue_moderatedreviews"
+msgstr[0] "Moderated Reviews (%s)"
+msgstr[1] "Moderated Reviews (%s)"
+
+#. %1 is the nominated addons count
+#, php-format
+msgid "devcp_editorsqueue_nominated"
+msgid_plural "devcp_editorsqueue_nominated"
+msgstr[0] "Nominated Add-ons (%s)"
+msgstr[1] "Nominated Add-ons (%s)"
+
+#. %1 is the update count
+#, php-format
+msgid "devcp_editorsqueue_pendingupdates"
+msgid_plural "devcp_editorsqueue_pendingupdates"
+msgstr[0] "Pending Updates (%s)"
+msgstr[1] "Pending Updates (%s)"
+
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+msgid "devcp_error_addon_access_denied"
+msgstr "You do not have access to that add-on."
+
+#. %s is a number
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
+#. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
+#. in the <a> tag.  This should be fixed.
+#, php-format
+msgid "devcp_error_appversion_reference_link"
+msgstr "Please see %s for reference."
+
+#. This is the link text in the <a> for devcp_error_appversion_reference_link.  This
+#. should be fixed.
+msgid "devcp_error_appversion_reference_link_text"
+msgstr "this page"
+
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
+
+#. %1$s is the name of the file
+#, php-format
+msgid "devcp_error_file_exists"
+msgstr ""
+"A version of that add-on already exists. To replace it, you must delete the "
+"file %1$s first."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_file_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for the selected add-on type. "
+"Please use one of the following: %2$s"
+
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
+msgid "devcp_error_five_categories"
+msgstr "Please select no more than five categories."
+
+msgid "devcp_error_guid_application"
+msgstr "The ID of this add-on is already used by an application."
+
+msgid "devcp_error_http_incomplete"
+msgstr "Incomplete transfer"
+
+msgid "devcp_error_http_maxupload"
+msgstr "Exceeds maximum upload size"
+
+msgid "devcp_error_http_nofile"
+msgstr "No file uploaded"
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_icon_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for an icon. Please use one of the "
+"following: %2$s"
+
+#. %s is a version number.  Example:  3.1.1
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+msgid "devcp_error_index_rdf_notfound"
+msgstr "No install.rdf present."
+
+msgid "devcp_error_install_manifest"
+msgstr "The following errors were found in install.rdf:"
+
+msgid "devcp_error_invalid_addontype"
+msgstr "Please select a valid add-on type."
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#, php-format
+msgid "devcp_error_invalid_appversion"
+msgstr "%1$s is not a valid version for %2$s"
+
+#. %s is a string
+#, php-format
+msgid "devcp_error_invalid_guid"
+msgstr "The ID of this add-on is invalid: %s"
+
+#. %$1s is a version.  Example: 3.1.1
+#. %$2s is an add-on name.
+#, php-format
+msgid "devcp_error_invalid_minversion"
+msgstr ""
+"%1$s is not a valid version for %2$s: minimum versions cannot contain *"
+
+msgid "devcp_error_invalid_version"
+msgstr ""
+"The version of this add-on is invalid: please see the <a href=\"http://"
+"developer.mozilla.org/en/docs/Toolkit_version_format\">specification</a>"
+
+msgid "devcp_error_invalid_version_spaces"
+msgstr "The version of this add-on is invalid: versions cannot contain spaces."
+
+#. %s is an error message from the parser.
+#, php-format
+msgid "devcp_error_manifest_parse"
+msgstr "The following error occurred while parsing install.rdf: %s"
+
+msgid "devcp_error_move_file"
+msgstr "Could not move file"
+
+#. %s is the name of a file
+#, php-format
+msgid "devcp_error_moving_file"
+msgstr "An error occurred moving %s."
+
+msgid "devcp_error_mozilla_application"
+msgstr "You must have at least one valid Mozilla target application."
+
+msgid "devcp_error_no_guid"
+msgstr "No ID could be found for this add-on in install.rdf."
+
+msgid "devcp_error_no_platform"
+msgstr "No platform selected"
+
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
+msgid "devcp_error_one_category"
+msgstr "Please select at least one category."
+
+msgid "devcp_error_one_user"
+msgstr "There must be at least one author for this add-on."
+
+#. %1$s is a file extension.  Example:  .exe
+#. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
+#, php-format
+msgid "devcp_error_preview_extension"
+msgstr ""
+"That file extension (%1$s) is not allowed for a preview. Please use one of "
+"the following: %2$s"
+
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
+msgid "devcp_error_updatekey"
+msgstr ""
+"Add-ons cannot use an updateKey. Please remove this from install.rdf and try "
+"again."
+
+msgid "devcp_error_updateurl"
+msgstr ""
+"Add-ons cannot use an external updateURL. Please remove this from install."
+"rdf and try again."
+
+msgid "devcp_error_upload_file"
+msgstr "Please upload a file."
+
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+msgid "devcp_js_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_js_add_email"
+msgstr "Please enter the account email of the author you wish to add."
+
+#. alt text for a down-arrow image.
+msgid "devcp_js_img_move_down"
+msgstr "Move Down"
+
+#. alt text for an up-arrow image.
+msgid "devcp_js_img_move_up"
+msgstr "Move Up"
+
+msgid "devcp_js_img_remove_compat"
+msgstr "Remove Application Compatibility"
+
+msgid "devcp_js_input_list_author"
+msgstr "List as author in public listings"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_developer"
+msgstr "Developer"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_owner"
+msgstr "Owner"
+
+#. <option> text in a <select> for Author role in an add-on.
+msgid "devcp_js_option_viewer"
+msgstr "Viewer"
+
+msgid "devcp_js_remove_author"
+msgstr "Remove Author"
+
+msgid "devcp_js_sure_remove"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
+
+msgid "devcp_js_upload_alert"
+msgstr "You must select a file to upload."
+
+msgid "devcp_localebox_header_localizedfields"
+msgstr "Localized Fields"
+
+#. %1 is the default locale
+#, php-format
+msgid "devcp_localebox_intro"
+msgstr ""
+"Some of the fields on this page are localized to appear in the end-user's "
+"native language. Select a locale below to edit your add-on's details in that "
+"language. If a translation for a locale is not available, it will fall back "
+"to the selected default locale (%s)."
+
+msgid "devcp_myaddons_admincp_link"
+msgstr "Admin Tools"
+
+msgid "devcp_myaddons_editorcp_link"
+msgstr "Editor Tools"
+
+msgid "devcp_myaddons_link"
+msgstr "My Add-ons"
+
+msgid "devcp_myaddons_mainpage_link"
+msgstr "Back to Main"
+
+msgid "devcp_myaddons_statistics_link"
+msgstr "Statistics Dashboard"
+
+msgid "devcp_myaddons_submitaddon_link"
+msgstr "Submit Add-on"
+
+msgid "devcp_myaddons_title"
+msgstr "Developer Tools"
+
+#. %1$s is an add-on ID, perhaps 167.
+#. %2$s is a URL.
+msgid "devcp_new_addon_error"
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
+
+msgid "devcp_nominate_cancel"
+msgstr "Cancel and return"
+
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
+#. %1 is the add-on name
+#, php-format
+msgid "devcp_nominate_submit_nominate"
+msgstr "Nominate %s"
+
+#. %1 is the autodetected add-on type
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+msgid "devcp_notice_changes_error"
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
+
+msgid "devcp_notice_changes_saved"
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
+
+msgid "devcp_notice_cleardefault"
+msgstr ""
+"Removing this as the default preview will cause another preview to "
+"automatically become the default preview."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
+msgid "devcp_notice_makedefault"
+msgstr ""
+"Making this the default preview will remove default status from the current "
+"default preview."
+
+msgid "devcp_notice_unsaved_changes"
+msgstr "You have unsaved changes."
+
+msgid "devcp_pagetitle"
+msgstr "Developer Tools"
+
+msgid "devcp_preview_add_pagetitle"
+msgstr "Add Preview"
+
+msgid "devcp_preview_added_successfully"
+msgstr "Preview added successfully."
+
+msgid "devcp_preview_deleted_successfully"
+msgstr "Preview deleted successfully."
+
+msgid "devcp_preview_edit_pagetitle"
+msgstr "Edit Preview"
+
+msgid "devcp_preview_updated_successfully"
+msgstr "Preview updated successfully."
+
+msgid "devcp_previews_a_another"
+msgstr "Add Another Preview"
+
+msgid "devcp_previews_a_delete"
+msgstr "Delete Preview"
+
+msgid "devcp_previews_a_replace"
+msgstr "Replace Preview"
+
+msgid "devcp_previews_a_update"
+msgstr "Update Previews"
+
+msgid "devcp_previews_add_new"
+msgstr "Add New Preview"
+
+#. %s is a list of file extensions, e.g. ".png, .gif"
+msgid "devcp_previews_add_select"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
+
+msgid "devcp_previews_click_below"
+msgstr "Click Update Previews below to upload."
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_previews_click_update"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_previews_error_message"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
+
+msgid "devcp_previews_filetype_info"
+msgstr ""
+"Use the form below to upload a PNG, JPG, or GIF screenshot of your add-on. "
+"Images larger than 700 pixels wide and 525 pixels high will automatically be "
+"resized."
+
+msgid "devcp_previews_header_add"
+msgstr "Add Preview"
+
+msgid "devcp_previews_header_caption"
+msgstr "Preview Caption"
+
+msgid "devcp_previews_header_edit"
+msgstr "Edit Preview"
+
+msgid "devcp_previews_label_default"
+msgstr "Default Preview"
+
+msgid "devcp_previews_label_file"
+msgstr "Preview File"
+
+msgid "devcp_previews_label_makedefault"
+msgstr "Make this the default preview image"
+
+msgid "devcp_previews_label_new"
+msgstr "New image:"
+
+msgid "devcp_previews_label_upload"
+msgstr "Upload Preview: "
+
+msgid "devcp_previews_notice_error"
+msgstr "One or more of your new previews could not be saved."
+
+msgid "devcp_previews_notice_success"
+msgstr "Your previews have been updated successfully."
+
+msgid "devcp_previews_p_screenshots"
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
+
+msgid "devcp_previews_submit_delete"
+msgstr "Delete Preview"
+
+msgid "devcp_previews_submit_delete_confirm"
+msgstr "Are you sure you wish to delete this preview?"
+
+msgid "devcp_previews_submit_edit"
+msgstr "Edit Preview"
+
+msgid "devcp_previews_submit_upload"
+msgstr "Upload Preview"
+
+msgid "devcp_previews_thumbnail"
+msgstr "Thumbnail"
+
+#. %s is the add-on name.
+msgid "devcp_previews_title"
+msgstr "%s Preview Manager"
+
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+msgid "devcp_review_agreement_please"
+msgstr ""
+"Please review and accept the following Developer Agreement before proceeding."
+
+msgid "devcp_rolecheck_no_privs"
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
+
+msgid "devcp_several_hours"
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
+
+msgid "devcp_sidebar_a_dashboard"
+msgstr "Dashboard"
+
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_adu"
+msgstr "<em>%s</em> Active Daily Users"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_total_downloads"
+msgstr "<em>%s</em> Total Downloads"
+
+#. %s is a number
+#, php-format
+msgid "devcp_statsbar_weekly_downloads"
+msgstr "<em>%s</em> Weekly Downloads"
+
+msgid "devcp_status_confirm_active"
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
+
+msgid "devcp_status_confirm_active_sure"
+msgstr "Are you sure you wish to mark this add-on active?"
+
+msgid "devcp_status_confirm_header_sure"
+msgstr "Are you sure?"
+
+msgid "devcp_status_confirm_inactive"
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
+
+msgid "devcp_status_confirm_inactive_sure"
+msgstr "Are you sure you wish to mark this add-on inactive?"
+
+msgid "devcp_status_confirm_no"
+msgstr "No, cancel"
+
+msgid "devcp_status_confirm_public"
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
+
+msgid "devcp_status_confirm_public_sure"
+msgstr "Are you sure you wish to make this add-on public?"
+
+msgid "devcp_status_confirm_sandbox"
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
+
+msgid "devcp_status_confirm_sandbox_sure"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
+
+msgid "devcp_status_confirm_yes"
+msgstr "Yes, I'm Sure"
+
+msgid "devcp_status_nominate_error_notice"
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
+
+msgid "devcp_status_nominate_header"
+msgstr "Add-on Nomination"
+
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+msgid "devcp_summary_lastversion"
+msgstr "Latest Version:"
+
+#. %1 is a link to the add-on submit page
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+#. %1 is the link to the preview upload page
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
+#. %s is the add-on name.
+msgid "devcp_title_edit_addon"
+msgstr "Edit %s"
+
+#. title attribute for a javascript link that pops up a help dialog.
+msgid "devcp_transbox_a_title_help"
+msgstr "Help (does not leave page)"
+
+msgid "devcp_transbox_alt_help"
+msgstr "Help"
+
+#. %1$s is <span>17</span>, %2$s is 42.
+msgid "devcp_transbox_chars_used"
+msgstr "Characters used: %1$s / %2$s"
+
+msgid "devcp_transbox_delete_sure"
+msgstr "Are you sure you wish to delete this translation?"
+
+#. %s is a locale, like en-US.
+msgid "devcp_transbox_help_header_tabs"
+msgstr "What are these %s tabs?"
+
+msgid "devcp_transbox_help_header_what"
+msgstr "What if I don't have any translations?"
+
+msgid "devcp_transbox_help_hide"
+msgstr "Hide Help"
+
+msgid "devcp_transbox_help_if"
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
+
+msgid "devcp_transbox_help_transbox"
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
+
+msgid "devcp_transbox_img_add_trans"
+msgstr "Add Translation"
+
+msgid "devcp_transbox_img_remove_trans"
+msgstr "Remove Translation"
+
+msgid "devcp_transbox_input_add_all"
+msgstr "Add Locale to All"
+
+msgid "devcp_transbox_input_add_locale"
+msgstr "Add Locale"
+
+msgid "devcp_transbox_input_cancel"
+msgstr "Cancel"
+
+msgid "devcp_transbox_input_delete"
+msgstr "Delete It"
+
+msgid "devcp_transbox_select_locale"
+msgstr "Select the locale of the translation to add:"
+
+#. %1$s and %2$s are GUIDs.
+msgid "devcp_update_addon_guid_error"
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
+
+msgid "devcp_update_addon_priv_error"
+msgstr "You do not have sufficient privileges to update this add-on."
+
+#. %1$s is a version number, %2$s is an add-on ID.
+msgid "devcp_update_addon_version_belong_error"
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
+
+#. %1$s is a version number, maybe 1.1.
+#. %2$s is a URL.
+msgid "devcp_update_addon_version_exists_error"
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
+
+#. %1$s and %2$s are version numbers.
+msgid "devcp_update_addon_version_match_error"
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
+
+msgid "devcp_uploader_a_start"
+msgstr "Get Started"
+
+msgid "devcp_uploader_ajax_loading"
+msgstr "Uploading file..."
+
+msgid "devcp_uploader_button_edit"
+msgstr "Edit My Add-on"
+
+msgid "devcp_uploader_button_later"
+msgstr "I'll complete my add-on later."
+
+msgid "devcp_uploader_button_release"
+msgstr "Add Release Notes"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_uploader_created_results"
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+msgid "devcp_uploader_error_correct"
+msgstr "Please correct this problem and upload your file again."
+
+#. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
+msgid "devcp_uploader_file_created"
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
+
+msgid "devcp_uploader_header_created"
+msgstr "Add-on Created!"
+
+msgid "devcp_uploader_header_error"
+msgstr "Oops! There seems to be a problem with this file..."
+
+msgid "devcp_uploader_header_file_added"
+msgstr "File Added!"
+
+msgid "devcp_uploader_header_how"
+msgstr "How does it all work?"
+
+#. %s is the version number, e.g. 3.2.
+msgid "devcp_uploader_header_update_created"
+msgstr "Version %s Created"
+
+msgid "devcp_uploader_header_upload"
+msgstr "Upload Your File"
+
+msgid "devcp_uploader_how"
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+msgid "devcp_uploader_label_platformtype"
+msgstr "Supported Platforms:"
+
+msgid "devcp_uploader_label_upload_field"
+msgstr "Add-on File: "
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+msgid "devcp_uploader_p_pending_file"
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
+msgid "devcp_uploader_p_pending_version"
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+
+#. %s is a status, e.g Public or Incomplete.
+msgid "devcp_uploader_p_update_created"
+msgstr "Your new version has been created and is currently marked as %s."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+msgid "devcp_uploader_p_update_file"
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+#. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
+#. %2$s is href="..." and should stay in the 'current status' <a> tag.
+msgid "devcp_uploader_p_update_version"
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
+
+msgid "devcp_uploader_p_upload"
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
+
+msgid "devcp_uploader_platformtype_all"
+msgstr "All"
+
+msgid "devcp_uploader_platformtype_specific"
+msgstr "Specific:"
+
+#. %1$s is the add-on name, %2$s is the version number.
+msgid "devcp_uploader_title_file"
+msgstr "Add File to %1$s %2$s"
+
+msgid "devcp_uploader_title_submit"
+msgstr "Submit New Add-on"
+
+#. %s is the add-on name.
+msgid "devcp_uploader_title_update"
+msgstr "Update %s"
+
+#. %s is a full <a> tag
+#, php-format
+msgid "devcp_valid_app_reference"
+msgstr "Please see %s for reference."
+
+#. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
+#. fixed.
+msgid "devcp_valid_app_reference_linktext"
+msgstr "this page"
+
+msgid "devcp_verify_author_error"
+msgstr "No account found for that email address."
+
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
+
+msgid "devcp_versions_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_a_delete"
+msgstr "Delete Version"
+
+msgid "devcp_versions_a_empty"
+msgstr "Remove Empty Version"
+
+msgid "devcp_versions_a_remove"
+msgstr "Remove?"
+
+msgid "devcp_versions_add"
+msgstr "Add New Version"
+
+msgid "devcp_versions_delete_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_delete_a_delete"
+msgstr "Delete Version"
+
+#. Followed by a list of reviews and files that will be removed.
+msgid "devcp_versions_delete_also"
+msgstr "This will also delete:"
+
+msgid "devcp_versions_delete_files"
+msgid_plural "devcp_versions_delete_files"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
+
+#. %s is the version number.
+msgid "devcp_versions_delete_header"
+msgstr "Delete Version %s?"
+
+msgid "devcp_versions_delete_reviews"
+msgid_plural "devcp_versions_delete_reviews"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
+
+#. %s is the version number.
+msgid "devcp_versions_delete_sure"
+msgstr "Are you sure you want to permanently delete version %s?"
+
+msgid "devcp_versions_edit_a_cancel"
+msgstr "Cancel"
+
+msgid "devcp_versions_edit_a_delete"
+msgstr "Delete File"
+
+msgid "devcp_versions_edit_a_new_app"
+msgstr "Add New Application"
+
+msgid "devcp_versions_edit_a_remove_app"
+msgstr "Remove Application"
+
+msgid "devcp_versions_edit_add"
+msgstr "Add New File"
+
+#. %s is href=... and should stay in the <a> tag.
+msgid "devcp_versions_edit_adjust"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
+
+msgid "devcp_versions_edit_compat_sure"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
+
+msgid "devcp_versions_edit_delete_sure"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
+
+msgid "devcp_versions_edit_header_approval"
+msgstr "Approval Information"
+
+msgid "devcp_versions_edit_header_compat"
+msgstr "Compatible Applications"
+
+msgid "devcp_versions_edit_header_file"
+msgstr "File Information"
+
+#. %s is the version number.
+msgid "devcp_versions_edit_header_manage"
+msgstr "Manage Version %s"
+
+msgid "devcp_versions_edit_header_notes"
+msgstr "Approval Notes"
+
+msgid "devcp_versions_edit_img_delete"
+msgstr "Delete File"
+
+#. %1$s is the file id, e.g. 18723.
+#. %2$s is the platform name, e.g. ALL or Windows.
+#. %3$s is the _('date) created.
+#. %4$s is the status, e.g. "In Sandbox" or "Public".
+#. %5$s is the _('date') status was changed.
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
+
+msgid "devcp_versions_edit_no_files"
+msgstr "No files found."
+
+msgid "devcp_versions_edit_optional"
+msgstr "Optional information for the Editor that reviews this version."
+
+msgid "devcp_versions_edit_remove_compat"
+msgstr "Remove Application Compatibility"
+
+msgid "devcp_versions_edit_select_app"
+msgstr "Please Select an Application"
+
+msgid "devcp_versions_edit_th_file"
+msgstr "File"
+
+msgid "devcp_versions_edit_th_platform"
+msgstr "Platform"
+
+msgid "devcp_versions_edit_th_size"
+msgstr "Size"
+
+msgid "devcp_versions_edit_th_status"
+msgstr "Status"
+
+msgid "devcp_versions_edit_transbox_releasenotes_description"
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
+
+msgid "devcp_versions_edit_transbox_releasenotes_name"
+msgstr "Release Notes"
+
+msgid "devcp_versions_edit_unsaved_compat"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
+
+msgid "devcp_versions_edit_unsaved_files"
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
+
+msgid "devcp_versions_edit_update"
+msgstr "Update Versions"
+
+msgid "devcp_versions_header_manage"
+msgstr "Manage Versions and Files"
+
+msgid "devcp_versions_no_versions"
+msgstr "No versions."
+
+#. %s is a version number, base 10.
+msgid "devcp_versions_notice_success"
+msgstr "Version %s deleted successfully."
+
+msgid "devcp_versions_p_remove"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
+
+msgid "devcp_versions_th_created"
+msgstr "Created"
+
+msgid "devcp_versions_th_status"
+msgstr "Status"
+
+msgid "devcp_versions_th_version"
+msgstr "Version"
+
+msgid "downloads_disable_warning"
+msgstr "This add-on is disabled"
+
+msgid "editor_review_error_addon_not_nominated"
+msgstr "This add-on has not been nominated."
+
+msgid "editor_review_error_file_not_pending"
+msgstr "This file is not pending review."
+
+#. Actions are, for example: approving or rejecting
+msgid "editor_review_error_no_action"
+msgstr "Please select a review action."
+
+msgid "editor_review_error_no_applications"
+msgstr "Please enter the applications you tested."
+
+#. Comments are required when an editor approves or rejects an add-on.
+msgid "editor_review_error_no_comments"
+msgstr "Please enter review comments."
+
+msgid "editor_review_error_no_files"
+msgstr "Please select at least one file to review."
+
+msgid "editor_review_error_no_operating_system"
+msgstr "Please enter the operating systems you tested."
+
+msgid "editorcp_logs_button_filter"
+msgstr "Filter"
+
+msgid "editorcp_logs_filter_by"
+msgstr "Filter by type/action"
+
+msgid "editorcp_logs_page_heading"
+msgstr "Event Log"
+
+msgid "editorcp_menu_eventlog_link"
+msgstr "Event Log"
+
+msgid "editorcp_menu_mainpage_link"
+msgstr "Back to Main"
+
+msgid "editorcp_menu_reviewlog_link"
+msgstr "Review Log"
+
+msgid "editorcp_menu_summary_link"
+msgstr "Editor Summary"
+
+msgid "editorcp_menu_title"
+msgstr "Editor Tools"
+
+msgid "editorcp_reviewlog_button_filter"
+msgstr "Filter"
+
+msgid "editorcp_reviewlog_column_action"
+msgstr "Action"
+
+msgid "editorcp_reviewlog_column_addon"
+msgstr "Add-on"
+
+msgid "editorcp_reviewlog_column_date"
+msgstr "Date"
+
+msgid "editorcp_reviewlog_column_editor"
+msgstr "Editor"
+
+msgid "editorcp_reviewlog_comments_hide"
+msgstr "Hide Comments"
+
+msgid "editorcp_reviewlog_comments_show"
+msgstr "Show Comments"
+
+#. %1$s and %2$s are full <input> tags for dates
+#, php-format
+msgid "editorcp_reviewlog_entries_between"
+msgstr "View entries between %1$s and %2$s"
+
+msgid "editorcp_reviewlog_none_found"
+msgstr "No reviews found for this period."
+
+msgid "editorcp_reviewlog_page_heading"
+msgstr "Review Log"
+
+msgid "editorcp_summary_monthreviews_heading"
+msgstr "Month Reviews"
+
+msgid "editorcp_summary_neweditors_heading"
+msgstr "New Editors"
+
+msgid "editorcp_summary_page_heading"
+msgstr "Editor Summary"
+
+msgid "editorcp_summary_recentactivity_heading"
+msgstr "Recent Editor Activity"
+
+msgid "editorcp_summary_totalreviews_heading"
+msgstr "Total Reviews"
+
+msgid "editors_addon_review_pagetitle"
+msgstr "Review Add-on"
+
+msgid "editors_error_js-formerror"
+msgstr "Please complete the following fields:"
+
+msgid "editors_error_review_one_file"
+msgstr "Please select at least one file to review."
+
+msgid "editors_error_self_reviews_forbidden"
+msgstr "Self-reviews are not allowed."
+
+msgid "editors_external_software"
+msgstr "External Software"
+
+msgid "editors_featured_add_feature"
+msgstr "Add feature"
+
+msgid "editors_featured_add_feature_submit"
+msgstr "Add"
+
+msgid "editors_featured_addon_add_failure"
+msgstr "Failed to add feature."
+
+msgid "editors_featured_addon_add_success"
+msgstr "Successfully added feature."
+
+msgid "editors_featured_addon_edit_failure"
+msgstr "Failed to edit feature."
+
+msgid "editors_featured_addon_edit_success"
+msgstr "Successfully edited feature."
+
+msgid "editors_featured_addon_invalid_locale"
+msgstr "One or more locales are invalid."
+
+msgid "editors_featured_addon_remove_failure"
+msgstr "Failed to remove feature."
+
+msgid "editors_featured_addon_remove_success"
+msgstr "Successfully removed feature."
+
+msgid "editors_featured_addons_pagetitle"
+msgstr "Featured Add-ons"
+
+msgid "editors_featured_edit_feature_submit"
+msgstr "Go"
+
+msgid "editors_featured_remove_feature"
+msgstr "Remove feature"
+
+msgid "editors_filter_queue"
+msgstr "Filter Queue"
+
+msgid "editors_helpful_links"
+msgstr "Helpful Links"
+
+msgid "editors_link_guide"
+msgstr "Editors' Guide"
+
+msgid "editors_link_policy"
+msgstr "Add-on Policy"
+
+msgid "editors_notice_filter_session"
+msgstr "These filters will remain in place for this session or until cleared."
+
+#. %1 is the queue mode
+msgid "editors_notice_none_found"
+msgstr "There are currently no add-ons of this type to review."
+
+msgid "editors_one_day"
+msgstr "1 day"
+
+msgid "editors_one_hour"
+msgstr "1 hour"
+
+msgid "editors_one_minute"
+msgstr "1 minute"
+
+msgid "editors_pagetitle"
+msgstr "Editor Tools"
+
+#. %s is a comma separated list of platforms.  Example:  Windows, OS X
+#, php-format
+msgid "editors_platform_x_only"
+msgstr "%s only"
+
+msgid "editors_pre-release"
+msgstr "Pre-release"
+
+#. %1 is the app name
+#, php-format
+msgid "editors_queue_app_compatibility"
+msgstr "%s Compatibility"
+
+msgid "editors_queue_submit_clean"
+msgstr "Clear"
+
+msgid "editors_queue_submit_filter"
+msgstr "Filter"
+
+msgid "editors_queues_disabled"
+msgstr ""
+"All review queues are currently disabled. Please check back at a later time."
+
+msgid "editors_review_action"
+msgstr "Review Action"
+
+msgid "editors_review_action_info"
+msgstr "Request More Information"
+
+msgid "editors_review_action_public"
+msgstr "Push to Public"
+
+msgid "editors_review_action_request_superreview"
+msgstr "Request Super-Review"
+
+msgid "editors_review_action_sandbox"
+msgstr "Retain in Sandbox"
+
+msgid "editors_review_comments"
+msgstr "Review Comments"
+
+msgid "editors_review_details_info_request"
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
+
+msgid "editors_review_details_nominated_public"
+msgstr ""
+"This will mark the add-on and its most recent version and files as public. "
+"Future versions will go into the sandbox until they are reviewed by an "
+"editor."
+
+msgid "editors_review_details_nominated_sandbox"
+msgstr "This will retain the add-on in the sandbox."
+
+msgid "editors_review_details_pending_public"
+msgstr ""
+"This will approve a sandboxed version of a public add-on to appear on the "
+"public side."
+
+msgid "editors_review_details_pending_sandbox"
+msgstr ""
+"This will cause a sandboxed version of a public add-on to remain in the "
+"sandbox."
+
+msgid "editors_review_details_superreview"
+msgstr ""
+"If you have concerns about this add-on's security, copyright issues, or "
+"other concerns that an administrator should look into, enter your comments "
+"in the area below. They will be sent to administrators, not the author."
+
+msgid "editors_review_file_diff_link"
+msgstr "Compare with public version"
+
+msgid "editors_review_file_viewcontents_link"
+msgstr "View Contents"
+
+msgid "editors_review_header_authors"
+msgstr "Authors:"
+
+msgid "editors_review_header_categories"
+msgstr "Categories:"
+
+msgid "editors_review_header_compatibility"
+msgstr "Compatibility:"
+
+msgid "editors_review_header_description"
+msgstr "Description"
+
+msgid "editors_review_header_devcomments"
+msgstr "Developer Comments"
+
+msgid "editors_review_header_eula"
+msgstr "EULA"
+
+msgid "editors_review_header_files"
+msgstr "Files:"
+
+msgid "editors_review_header_itemhistory"
+msgstr "Item History"
+
+msgid "editors_review_header_nominationmessage"
+msgstr "Nomination Message"
+
+msgid "editors_review_header_previews"
+msgstr "Previews"
+
+msgid "editors_review_header_privacy"
+msgstr "Privacy Policy"
+
+#. %1 is the add-on name and version
+#, php-format
+msgid "editors_review_header_review"
+msgstr "Review %s"
+
+msgid "editors_review_header_reviewernotes"
+msgstr "Notes to Reviewer"
+
+msgid "editors_review_header_summary"
+msgstr "Summary"
+
+msgid "editors_review_header_versionnotes"
+msgstr "Version Notes"
+
+#. a noun: shown in an add-on's editor review history
+msgid "editors_review_history_info_reply"
+msgstr "Reply"
+
+msgid "editors_review_history_info_request"
+msgstr "Information Request"
+
+msgid "editors_review_history_nominated_adminreview"
+msgstr "Admin Review"
+
+msgid "editors_review_history_nominated_approved"
+msgstr "Nomination Approved/Public"
+
+msgid "editors_review_history_nominated_denied"
+msgstr "Nomination Denied/Sandbox"
+
+msgid "editors_review_history_nonefound"
+msgstr "No previous review entries could be found."
+
+msgid "editors_review_history_pending_adminreview"
+msgstr "Admin Review"
+
+msgid "editors_review_history_pending_approved"
+msgstr "Approved/Public"
+
+msgid "editors_review_history_pending_denied"
+msgstr "Denied/Sandbox"
+
+#. link text in an add-on's editor review history, allowing to hide and show an information request's replies
+#. %1 is the number of replies
+msgid "editors_review_history_show_hide_replies"
+msgid_plural "editors_review_history_show_hide_replies"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
+
+msgid "editors_review_label_applications"
+msgstr "Applications:"
+
+msgid "editors_review_label_cannedresponse"
+msgstr "or select a canned response:"
+
+msgid "editors_review_label_comments"
+msgstr "Comments:"
+
+msgid "editors_review_label_operating_systems"
+msgstr "Operating Systems:"
+
+msgid "editors_review_link_pagetop"
+msgstr "Top"
+
+msgid "editors_review_next_link"
+msgstr "next &raquo;"
+
+msgid "editors_review_previews_notfound"
+msgstr "No previews found."
+
+msgid "editors_review_previous_link"
+msgstr "&laquo; prev"
+
+msgid "editors_review_queue_pagetitle"
+msgstr "Review Queue"
+
+#. %1 is the add-ons rank in the queue, %2 is the total queue length
+msgid "editors_review_rank_in_queue"
+msgstr "<strong># %1$s</strong> of %2$s in queue"
+
+msgid "editors_review_submit_process_action"
+msgstr "Process Action"
+
+msgid "editors_review_th_action"
+msgstr "Action"
+
+msgid "editors_review_th_comments"
+msgstr "Comments"
+
+msgid "editors_review_th_date"
+msgstr "Date"
+
+msgid "editors_review_th_reviewer"
+msgstr "Reviewer"
+
+msgid "editors_review_th_version_file"
+msgstr "Version/File"
+
+msgid "editors_review_update_notify_once"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
+
+msgid "editors_reviewed_successfully"
+msgstr "Review successfully processed."
+
+msgid "editors_reviews_action_delete_review"
+msgstr "Delete review"
+
+msgid "editors_reviews_action_keep"
+msgstr "Remove flags; keep review"
+
+msgid "editors_reviews_action_skip"
+msgstr "Skip"
+
+msgid "editors_reviews_header_action"
+msgstr "Action"
+
+msgid "editors_reviews_in_reply_to"
+msgstr "In reply to:"
+
+msgid "editors_reviews_processed"
+msgstr "Reviews processed successfully!"
+
+msgid "editors_reviews_queue_empty"
+msgstr "There are currently no reviews in moderation."
+
+msgid "editors_reviews_submit_process_reviews"
+msgstr "Process Reviews"
+
+msgid "editors_site_specific"
+msgstr "Site Specific"
+
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+msgid "editors_tested_app"
+msgstr "Tested Application"
+
+msgid "editors_tested_os"
+msgstr "Tested Operating Systems"
+
+msgid "editors_th_additional_info"
+msgstr "Additional Information"
+
+msgid "editors_th_addon"
+msgstr "Add-on"
+
+msgid "editors_th_addontype"
+msgstr "Type"
+
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+msgid "editors_th_age"
+msgstr "Age"
+
+msgid "editors_th_applications"
+msgstr "Applications"
+
+msgid "editors_th_locales"
+msgstr "Restrict to locales?"
+
+msgid "editors_th_platforms"
+msgstr "Platforms"
+
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_days"
+msgstr "%s days"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_hours"
+msgstr "%s hours"
+
+#. %s is a number
+#, php-format
+msgid "editors_x_minutes"
+msgstr "%s minutes"
+
+msgid "error_access_denied"
+msgstr "Access Denied"
+
+msgid "error_access_denied_message"
+msgstr "You are not authorized to view this page."
+
+msgid "error_addon_notfound"
+msgstr "Add-on not found!"
+
+msgid "error_addon_notviewable"
+msgstr "This add-on is not viewable here."
+
+msgid "error_addon_selfreview"
+msgstr "You cannot review your own add-on."
+
+msgid "error_browse_no_addons"
+msgstr "No add-ons in this category!"
+
+msgid "error_collection_feed_notfound"
+msgstr "Add-on feed not found."
+
+msgid "error_email_invalid"
+msgstr "This is not a valid email address."
+
+msgid "error_field_required"
+msgstr "This field must not be empty."
+
+msgid "error_file_notfound"
+msgstr "File not found!"
+
+#. %s is a filename
+#, php-format
+msgid "error_file_x_notfound"
+msgstr "File error: %s does not exist."
+
+msgid "error_formerrors"
+msgstr "There are errors in this form. Please correct them and resubmit."
+
+msgid "error_invalid_captcha"
+msgstr "Invalid captcha, please try again!"
+
+msgid "error_invalid_url"
+msgstr ""
+"This URL has an invalid format. Valid URLs look like http://example.com/"
+"my_page."
+
+#. %s is a string representing what's missing.  Example:  file_id
+#, php-format
+msgid "error_missing_argument"
+msgstr "Missing argument: %s"
+
+msgid "error_no_files_in_addon"
+msgstr "No Files"
+
+msgid "error_notice"
+msgstr "Notice"
+
+msgid "error_preview_notfound"
+msgstr "Preview not found!"
+
+msgid "error_review_rating_required"
+msgstr "You must select a rating."
+
+msgid "error_user_already_confirmed"
+msgstr "This user account is already confirmed."
+
+msgid "error_user_badconfirmationcode"
+msgstr "Invalid confirmation code!"
+
+msgid "error_user_confirmpw_nomatch"
+msgstr "The passwords did not match."
+
+msgid "error_user_email_notunique"
+msgstr "This email address is already taken by another user."
+
+msgid "error_user_emailchange_expired"
+msgstr ""
+"The email change has expired. Please change your email address again in your "
+"user profile and click the link in the confirmation email as soon as you "
+"receive it."
+
+msgid "error_user_nickname_notunique"
+msgstr "This nickname is already taken."
+
+msgid "error_user_notfound"
+msgstr "User not found!"
+
+msgid "error_user_unconfirmed"
+msgstr ""
+"Please confirm your user account first with the code you received by email."
+
+msgid "error_username_or_pw_wrong"
+msgstr "Wrong username or password!"
+
+msgid "error_version_notfound"
+msgstr "Version not found!"
+
+msgid "error_wrong_password"
+msgstr "Wrong password entered!"
+
+msgid "feature_learnmore"
+msgstr "Learn more"
+
+#. %1 is the add-on name
+#, php-format
+msgid "feature_learnmore_about_addon"
+msgstr "Learn more about %1$s"
+
+#. %1$s is a number
+#, php-format
+msgid "feature_reviews"
+msgid_plural "feature_reviews"
+msgstr[0] "%1$s review"
+msgstr[1] "%1$s reviews"
+
+msgid "feature_view_more_from_category"
+msgstr "View more from"
+
+#. This appears on a page that views the source of an add-on.  This link will return
+#. the user to the add-on's main page
+msgid "file_browser_link_addon"
+msgstr "Back to add-on"
+
+#. There is a list of directories and files on the page.  Clicking this will show the
+#. contents of all the directories (normally you would click on each one to see the
+#. contents)
+msgid "file_browser_link_expand_all"
+msgstr "Expand all"
+
+#. This appears on a page that views the source of an add-on.  This link will return
+#. the user to the add-on's review page (it only appears if the add-on is being
+#. reviewed)
+msgid "file_browser_link_review"
+msgstr "Back to review"
+
+#. The title of the page for viewing an add-on's source.
+#. %1$s is the name of the add-on
+#. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
+msgid "file_browser_title"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
+
+#. This appears on a page that views the source of an add-on.  There is a list of
+#. directories and files on the page.  Clicking this link will toggle between an
+#. expanded or a collapsed list.  This string should be kept short.
+msgid "file_browser_toggle_expand_collapse"
+msgstr "+/-"
+
+#. Link text for the AMO About page.
+msgid "footer_a_about"
+msgstr "About"
+
+#. Link text to the AMO blog.
+msgid "footer_a_blog"
+msgstr "Blog"
+
+#. Link text to the Frequently Asked Questions page.
+msgid "footer_a_faq"
+msgstr "FAQ"
+
+#. Full text for the FAQ abbreviation.
+msgid "footer_abbr_faq"
+msgstr "Frequently Asked Questions"
+
+msgid "footer_all_rights_reserved"
+msgstr "All rights reserved."
+
+msgid "footer_copyright"
+msgstr "Copyright"
+
+msgid "footer_credits"
+msgstr "Credits"
+
+msgid "footer_disclaimer"
+msgstr ""
+"Mozilla is providing links to these applications as a courtesy, and makes no "
+"representations regarding the applications or any information related there "
+"to. Any questions, complaints or claims regarding the applications must be "
+"directed to the appropriate software vendor."
+
+msgid "footer_lang_form_lang_submit_go"
+msgstr "Go"
+
+msgid "footer_legal_notices"
+msgstr "Legal Notices"
+
+msgid "footer_other_languages"
+msgstr "Other languages:"
+
+msgid "footer_privacy_policy"
+msgstr "Privacy Policy"
+
+msgid "forum_save"
+msgstr "Save"
+
+msgid "general_addontype_dict"
+msgstr "Dictionary"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_dict_plural"
+msgstr "Dictionaries"
+
+msgid "general_addontype_extension"
+msgstr "Extension"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_extension_plural"
+msgstr "Extensions"
+
+msgid "general_addontype_lpaddon"
+msgstr "Language Pack (Add-on)"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_lpaddon_plural"
+msgstr "Language Packs (Add-on)"
+
+msgid "general_addontype_lpapp"
+msgstr "Language Pack (Application)"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_lpapp_plural"
+msgstr "Language Packs (Application)"
+
+msgid "general_addontype_plugin"
+msgstr "Plugin"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_plugin_plural"
+msgstr "Plugins"
+
+msgid "general_addontype_search"
+msgstr "Search Engine"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_search_plural"
+msgstr "Search Engines"
+
+msgid "general_addontype_theme"
+msgstr "Theme"
+
+#. Plural in this context means many of the add-on type
+msgid "general_addontype_theme_plural"
+msgstr "Themes"
+
+#. %1$s is the application name.  Example:  Firefox
+#, php-format
+msgid "header_home_tooltip"
+msgstr "Return to the %1$s Add-ons homepage"
+
+msgid "header_main_firefox_header"
+msgstr "Firefox Add-ons"
+
+msgid "header_main_header"
+msgstr "Add-ons"
+
+msgid "header_main_seamonkey_header"
+msgstr "SeaMonkey Add-ons"
+
+msgid "header_main_sunbird_header"
+msgstr "Sunbird Add-ons"
+
+msgid "header_main_thunderbird_header"
+msgstr "Thunderbird Add-ons"
+
+msgid "header_navlink_addons"
+msgstr "Add-ons"
+
+msgid "header_navlink_login"
+msgstr "Log in"
+
+msgid "header_navlink_logout"
+msgstr "Log out"
+
+msgid "header_navlink_myaccount"
+msgstr "My Account"
+
+msgid "header_navlink_register"
+msgstr "Register"
+
+#. %s is the add-on name
+#, php-format
+msgid "img_preview_of"
+msgstr "Preview Image of %s"
+
+#. %1 is the login URL for the link tag
+#. %2 is the link to an explanatory page.
+msgid "install_a_login_to_install"
+msgstr ""
+"<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2"
+"$s\">Why</a>?"
+
+#. %1$s is the application name.  Example:  Firefox
+#. %2$s is an optional string used to specify a platform.  Example:  (Windows)
+#, php-format
+msgid "install_button_text"
+msgstr "Add to %1$s %2$s"
+
+#. %1 is the add-on name, %2 is the app name
+#, php-format
+msgid "install_button_title"
+msgstr "Add %1$s to %2$s"
+
+#. %1$s is the add-on name
+#, php-format
+msgid "install_download"
+msgstr "Download %1$s"
+
+msgid "install_error_addon_not_found"
+msgstr "This add-on is not available."
+
+msgid "langtools_a11y_tablesummary"
+msgstr "List of language packs and dictionaries."
+
+msgid "langtools_download_dictionary"
+msgstr "Download Dictionary"
+
+msgid "langtools_download_langpack"
+msgstr "Download Language Pack"
+
+msgid "langtools_header_dicts_and_langpacks"
+msgstr "Dictionaries & Language Packs"
+
+msgid "langtools_install_dictionary"
+msgstr "Install Dictionary"
+
+msgid "langtools_install_langpack"
+msgstr "Install Language Pack"
+
+msgid "langtools_tableheader_dictionary"
+msgstr "Dictionary"
+
+msgid "langtools_tableheader_langpack"
+msgstr "Language Pack"
+
+msgid "langtools_tableheader_language"
+msgstr "Language"
+
+msgid "link_return_to_front_page"
+msgstr "Click here to return to the front page."
+
+msgid "list_sortby_date"
+msgstr "Date"
+
+msgid "list_sortby_downloads"
+msgstr "Downloads"
+
+msgid "list_sortby_name"
+msgstr "Add-on Name"
+
+msgid "list_sortby_rating"
+msgstr "Rating"
+
+msgid "main_prettyname_fennec"
+msgstr "Fennec"
+
+msgid "main_prettyname_firefox"
+msgstr "Firefox"
+
+msgid "main_prettyname_seamonkey"
+msgstr "SeaMonkey"
+
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
+msgid "main_prettyname_thunderbird"
+msgstr "Thunderbird"
+
+msgid "nav_category_dicts_langpacks"
+msgstr "Dictionaries & Language Packs"
+
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+msgid "nav_category_themes"
+msgstr "Themes"
+
+msgid "other_apps_tooltip"
+msgstr "Find add-ons for other applications"
+
+#. In a user list: user 1, user 2, "others"
+msgid "other_users"
+msgstr "others"
+
+msgid "page_title_appversions"
+msgstr "Application Versions"
+
+msgid "page_title_credits"
+msgstr "Credits"
+
+msgid "page_title_faq"
+msgstr "Frequently Asked Questions"
+
+msgid "page_title_fashionyourfirefox_faq"
+msgstr "Fashion your Firefox FAQ"
+
+msgid "page_title_policy"
+msgstr "Add-ons Policy"
+
+msgid "page_title_privacy"
+msgstr "Mozilla Privacy Policy"
+
+msgid "page_title_review_guide"
+msgstr "Review Guidelines"
+
+msgid "page_title_sandbox"
+msgstr "Sandbox Review System"
+
+msgid "page_title_submissionhelp"
+msgstr "Submission Help"
+
+msgid "pages_appversions_guid"
+msgstr "GUID"
+
+msgid "pages_appversions_header"
+msgstr "Valid Application Versions"
+
+msgid "pages_appversions_intro"
+msgstr ""
+"Add-ons submitted to Mozilla Add-ons must have an install.rdf file with at "
+"least one of the below applications supported. Only the versions listed "
+"below are allowed for these applications."
+
+#. %s is a full <a> tag
+#, php-format
+msgid "pages_appversions_required_files"
+msgstr ""
+"If your supported application does not require an install.rdf file, you "
+"still must include one with the required properties as specified %s."
+
+#. this is the text inside of an <a> tag for pages_appversions_required_files.  This
+#. should be fixed.
+msgid "pages_appversions_required_files_link"
+msgstr "here"
+
+msgid "pages_appversions_versions"
+msgstr "Versions"
+
+msgid "pages_policy_sandbox_link"
+msgstr "Sandbox Information Page"
+
+msgid "pagination_next_page"
+msgstr "next"
+
+#. %1 is page number, %2 is total page count
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "This is page %1$s of %2$s"
+
+msgid "pagination_previous_page"
+msgstr "previous"
+
+msgid "recaptcha_enter_both_words"
+msgstr ""
+"Please enter <strong>both words</strong> below, <strong>separated by a "
+"space</strong>."
+
+msgid "recaptcha_enter_here"
+msgstr "Enter your answer here:"
+
+msgid "recaptcha_enter_whatyouhear"
+msgstr "Please type what you hear."
+
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to a text captcha
+msgid "recaptcha_hardtohear_text"
+msgstr ""
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
+
+#. %1 is the link switching refreshing the captcha
+#. %2 is the link switching to an audio captcha
+msgid "recaptcha_hardtoread_text"
+msgstr ""
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
+
+msgid "recaptcha_label"
+msgstr "Are you human?"
+
+msgid "recaptcha_whatsthis"
+msgstr "What's this?"
+
+msgid "review_flag_error"
+msgstr "Error flagging this review!"
+
+msgid "review_flag_reason_bug_support"
+msgstr "Misplaced bug report or support request"
+
+msgid "review_flag_reason_instructions"
+msgstr "Report this review (select a reason)"
+
+msgid "review_flag_reason_language"
+msgstr "Inappropriate language/dialog"
+
+msgid "review_flag_reason_other"
+msgstr "Other (please specify)"
+
+msgid "review_flag_reason_spam"
+msgstr "Spam or otherwise non-review content"
+
+msgid "review_flag_success"
+msgstr "Thanks; this review has been flagged for editor approval."
+
+msgid "review_flag_this"
+msgstr "Report this review"
+
+msgid "review_flag_this_titletip"
+msgstr ""
+"Is this review inappropriate, inaccurate or spam? Click here to flag it for "
+"editor review."
+
+#. %1 is the URL of the support section, %2 for the review guidelines
+msgid "review_guidelines_short"
+msgstr ""
+"<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
+"about your experience with the add-on.  Give specifics and helpful details, "
+"such as what features you liked and/or disliked, how easy to use it is, and "
+"any disadvantages it has.  Avoid generic language such as calling it \"Great"
+"\" or \"Bad\" unless you can give reasons why you believe this is so.</"
+"li><li>Please do not post bug reports in reviews. We do not make your email "
+"address available to add-on developers and they may need to contact you to "
+"help resolve your issue. See the <a href=\"%1$s\">support section</a> to "
+"find out where to get assistance for this add-on.</li><li>Please keep "
+"reviews clean, avoid the use of improper language and do not post any "
+"personal information.</li></ul><p>Please read the <a href=\"%2$s\">Review "
+"Guidelines</a> for more detail about user add-on reviews.</p>"
+
+#. %1 is the add-on name
+#, php-format
+msgid "reviews_header"
+msgstr "Reviews for %s"
+
+msgid "rss_featuredaddons"
+msgstr "Featured Add-ons"
+
+msgid "rss_newestaddons"
+msgstr "Newest Add-ons"
+
+msgid "rss_updatedaddons"
+msgstr "Updated Add-ons"
+
+msgid "search_disabled"
+msgstr "Search is currently disabled. Please try again later."
+
+msgid "search_form_all_addons"
+msgstr "all add-ons"
+
+msgid "search_form_default_text"
+msgstr "search for add-ons"
+
+msgid "search_form_submit_tooltip"
+msgstr "Search for add-ons"
+
+msgid "search_form_tooltip"
+msgstr "Click to enter search terms"
+
+msgid "search_form_within"
+msgstr "within"
+
+msgid "search_landing_all_search_engines"
+msgstr "All Search Engines"
+
+msgid "search_landing_browse_search_engines"
+msgstr "Browse Search Engines"
+
+#. %s is a number
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matching add-on"
+msgstr[1] "%s matching add-ons"
+
+msgid "search_nothing_found"
+msgstr "No results found."
+
+msgid "search_pagetitle"
+msgstr "Search Add-ons"
+
+msgid "search_rss_description"
+msgstr "Search results feed"
+
+#. %s is the terms the user is searching for (a string)
+#, php-format
+msgid "search_rss_results_for"
+msgstr "Search results for: %s"
+
+msgid "sidebar_navlink_admin_tools"
+msgstr "Admin Tools"
+
+msgid "sidebar_navlink_developer_tools"
+msgstr "Developer Tools"
+
+msgid "sidebar_navlink_editor_tools"
+msgstr "Editor Tools"
+
+msgid "sidebar_navlink_welcome"
+msgstr "Welcome"
+
+#. %s is the user's name
+#, php-format
+msgid "sidebar_navlink_welcome_name"
+msgstr "Welcome, %s"
+
+msgid "sidebar_pitch_dictionary"
+msgstr "Dictionary"
+
+msgid "sidebar_pitch_featured_addons"
+msgstr "Featured Add-ons"
+
+msgid "sidebar_pitch_looking_for"
+msgstr "I am looking for a:"
+
+msgid "sidebar_pitch_newest_addons"
+msgstr "Newest Add-ons"
+
+msgid "sidebar_pitch_search"
+msgstr "Search Plugin"
+
+msgid "sidebar_pitch_subscribe_to"
+msgstr "Subscribe to"
+
+msgid "sidebar_pitch_theme"
+msgstr "Theme"
+
+msgid "sidebar_pitch_updated_addons"
+msgstr "Updated Add-ons"
+
+#. %1$s is a number
+#, php-format
+msgid "size_kb"
+msgstr "%1$s KB"
+
+msgid "stars_not_yet_rated"
+msgstr "Not yet rated"
+
+#. %1 is the number of stars this add-on has
+#, php-format
+msgid "stars_rated_x_outof_5"
+msgstr "Rated %s out of 5 stars"
+
+msgid "statistics_addon_dashboard_link"
+msgstr "Dashboard Home"
+
+msgid "statistics_addon_developertools_link"
+msgstr "Developer Tools"
+
+msgid "statistics_addon_switch"
+msgstr "Switch Add-on"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_shortmonth"
+msgstr "%b. %e"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_shortmonthwithyear"
+msgstr "%b. %e, %Y"
+
+#. This is a date format.
+#. http://php.net/strftime
+msgid "statistics_date_weekdayshortmonth"
+msgstr "%A, %b. %e"
+
+#. %1$s is an add-on name and version.  Example:  Add-on 3.5
+#, php-format
+msgid "statistics_events_addon_created"
+msgstr "%1$s created"
+
+#. %1$s is an application name and version.  Example:  Firefox 3.5
+#, php-format
+msgid "statistics_events_app_released"
+msgstr "%1$s released"
+
+msgid "statistics_help_close_link"
+msgstr "Close"
+
+msgid "statistics_help_link"
+msgstr "Help"
+
+msgid "statistics_index_anotheraddon"
+msgstr "or, select another add-on"
+
+msgid "statistics_index_anotheraddon_public"
+msgstr "or, select an add-on with public statistics"
+
+msgid "statistics_index_myaddons"
+msgstr "Select one of your add-ons to view its statistics"
+
+msgid "statistics_index_selectaddon"
+msgstr "Select an add-on to view its statistics"
+
+msgid "statistics_index_selectaddon_public"
+msgstr "Select an add-on with public statistics"
+
+msgid "statistics_index_title"
+msgstr "Statistics Dashboard"
+
+msgid "statistics_index_view_button"
+msgstr "View Statistics"
+
+msgid "statistics_js_download_csv"
+msgstr "View this table in CSV format"
+
+msgid "statistics_js_dropdowns_none"
+msgstr "none"
+
+msgid "statistics_js_dropdowns_removeplot"
+msgstr "Remove this plot"
+
+msgid "statistics_js_groupby_selector_date"
+msgstr "Group by: Day"
+
+msgid "statistics_js_groupby_selector_month"
+msgstr "Group by: Month"
+
+msgid "statistics_js_groupby_selector_week"
+msgstr "Group by: Week"
+
+msgid "statistics_js_groupby_selector_week_over_week"
+msgstr "Compare by: Week"
+
+msgid "statistics_js_plotselection_foundinrange"
+msgstr "%s found in range"
+
+msgid "statistics_js_plotselection_options_addplot_name"
+msgstr "Add Plot"
+
+msgid "statistics_js_plotselection_options_addplot_tooltip"
+msgstr "Add another plot to this graph"
+
+msgid "statistics_js_plotselection_options_count_name_checked"
+msgstr "Hide Total Count"
+
+msgid "statistics_js_plotselection_options_count_name_unchecked"
+msgstr "Show Total Count"
+
+msgid "statistics_js_plotselection_options_count_tooltip"
+msgstr "Plot the total count on this graph"
+
+msgid "statistics_js_plotselection_options_csv_name"
+msgstr "View Data (CSV)"
+
+msgid "statistics_js_plotselection_options_csv_tooltip"
+msgstr "Get a Comma Separated Values file of this data"
+
+msgid "statistics_js_plotselection_options_events_addon_name_checked"
+msgstr "Hide %s Events"
+
+msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
+msgstr "Show %s Events"
+
+msgid "statistics_js_plotselection_options_events_addon_tooltip"
+msgstr "Overlay add-on release dates on the plots"
+
+msgid "statistics_js_plotselection_options_events_firefox_name_checked"
+msgstr "Hide Firefox Events"
+
+msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
+msgstr "Show Firefox Events"
+
+msgid "statistics_js_plotselection_options_events_firefox_tooltip"
+msgstr "Overlay Firefox release dates on the plots"
+
+msgid "statistics_js_plotselection_options_resize_name_checked"
+msgstr "Collapse Graph"
+
+msgid "statistics_js_plotselection_options_resize_name_unchecked"
+msgstr "Expand Graph"
+
+msgid "statistics_js_plotselection_options_resize_tooltip"
+msgstr "Resize the graph"
+
+msgid "statistics_js_plotselection_selector_adu"
+msgstr "Active Daily Users"
+
+msgid "statistics_js_plotselection_selector_application"
+msgstr "Application"
+
+msgid "statistics_js_plotselection_selector_custom"
+msgstr "Custom"
+
+msgid "statistics_js_plotselection_selector_downloads"
+msgstr "Downloads"
+
+msgid "statistics_js_plotselection_selector_os"
+msgstr "Operating System"
+
+msgid "statistics_js_plotselection_selector_status"
+msgstr "Add-on Status"
+
+msgid "statistics_js_plotselection_selector_summary"
+msgstr "Summary"
+
+msgid "statistics_js_plotselection_selector_version"
+msgstr "Add-on Version"
+
+msgid "statistics_longnames_application"
+msgstr "Application"
+
+msgid "statistics_longnames_os"
+msgstr "Operating System"
+
+msgid "statistics_longnames_status"
+msgstr "Add-on Status"
+
+msgid "statistics_longnames_unknown"
+msgstr "Unknown"
+
+msgid "statistics_longnames_version"
+msgstr "Add-on Version"
+
+msgid "statistics_notice_data_insufficient"
+msgstr ""
+"There is not yet enough data to display this graph. Please check back later."
+
+msgid "statistics_notice_data_none"
+msgstr ""
+"We don't have any data for your add-on yet. Please check back in a few days."
+
+msgid "statistics_notice_data_updating"
+msgstr ""
+"Add-on statistics are currently in the process of being updated. Recent data "
+"may be incomplete as our scripts work to update this information. Please "
+"check back in a few minutes."
+
+msgid "statistics_notice_disabled"
+msgstr ""
+"The Statistics Dashboard is currently disabled. Please check back later."
+
+msgid "statistics_notice_nojavascript"
+msgstr "JavaScript is required to view the Statistics Dashboard graphs."
+
+msgid "statistics_notice_settings_updated"
+msgstr "Your settings have been updated!"
+
+msgid "statistics_pagetitle"
+msgstr "Statistics Dashboard"
+
+msgid "statistics_plot_legend_adu"
+msgstr "Active Daily Users"
+
+msgid "statistics_plot_legend_downloads"
+msgstr "Daily Downloads"
+
+msgid "statistics_plot_options_zoomin_alt"
+msgstr "Zoom In"
+
+msgid "statistics_plot_options_zoomin_title"
+msgstr "Zoom in one month"
+
+msgid "statistics_plot_options_zoomout_alt"
+msgstr "Zoom Out"
+
+msgid "statistics_plot_options_zoomout_title"
+msgstr "Zoom out one month"
+
+#, php-format
+msgid "statistics_rss_description"
+msgstr "Daily summary of statistics for %1$s"
+
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+msgid "statistics_rss_title_fulldate"
+msgstr "%A, %B %e, %Y"
+
+#, php-format
+msgid "statistics_rss_title_statsfordate"
+msgstr "Statistics for %1$s"
+
+msgid "statistics_settings_access_description"
+msgstr ""
+"By default, only you and Mozilla can access the information in your "
+"dashboard. You can open this up to the public so that anyone can view your "
+"add-on's data."
+
+msgid "statistics_settings_access_heading"
+msgstr "Dashboard Access"
+
+msgid "statistics_settings_access_private"
+msgstr "Private"
+
+msgid "statistics_settings_access_private_description"
+msgstr "Only you and Mozilla can view this add-on's statistics"
+
+msgid "statistics_settings_access_public"
+msgstr "Public"
+
+msgid "statistics_settings_access_public_description"
+msgstr "Anyone can view this add-on's statistics"
+
+msgid "statistics_settings_change_link"
+msgstr "Change Settings"
+
+msgid "statistics_settings_confidential"
+msgstr "Please treat this information as confidential."
+
+msgid "statistics_settings_currently_private"
+msgstr "This dashboard is currently <b>private</b>."
+
+msgid "statistics_settings_currently_public"
+msgstr "This dashboard is currently <b>public</b>."
+
+msgid "statistics_settings_locked_alt"
+msgstr "Locked"
+
+msgid "statistics_settings_return_link"
+msgstr "Return to Dashboard"
+
+msgid "statistics_settings_save_button"
+msgstr "Save Settings"
+
+#, php-format
+msgid "statistics_settings_title"
+msgstr "Statistics Dashboard Settings for %1$s"
+
+msgid "statistics_settings_unlocked_alt"
+msgstr "Unlocked"
+
+msgid "statistics_shortnames_application"
+msgstr "App"
+
+msgid "statistics_shortnames_os"
+msgstr "OS"
+
+msgid "statistics_shortnames_status"
+msgstr "St"
+
+msgid "statistics_shortnames_unknown"
+msgstr "Uk"
+
+msgid "statistics_shortnames_version"
+msgstr "Ver"
+
+msgid "statistics_summary_downloads_average"
+msgstr "Average Daily Downloads"
+
+msgid "statistics_summary_downloads_heading"
+msgstr "Downloads"
+
+msgid "statistics_summary_downloads_lastcount"
+msgstr "Last Day Count"
+
+msgid "statistics_summary_downloads_lastweek"
+msgstr "Downloads in the last 7 days"
+
+msgid "statistics_summary_downloads_total"
+msgstr "Total Downloads"
+
+#, php-format
+msgid "statistics_summary_downloads_total_sincedate"
+msgstr "Since %1$s"
+
+msgid "statistics_summary_nodata"
+msgstr "No data yet"
+
+msgid "statistics_summary_updatepings_average"
+msgstr "Average Daily Active Users"
+
+msgid "statistics_summary_updatepings_changefromprevious"
+msgstr "Change from previous count"
+
+#, php-format
+msgid "statistics_summary_updatepings_changefromprevious_ondate"
+msgstr "%1$s on %2$s"
+
+msgid "statistics_summary_updatepings_heading"
+msgstr "Active Daily Users"
+
+msgid "statistics_summary_updatepings_total"
+msgstr "Active Daily Users"
+
+#, php-format
+msgid "statistics_summary_updatepings_total_ondate"
+msgstr "On %1$s"
+
+#, php-format
+msgid "statistics_title_addon_stats"
+msgstr "%1$s Statistics"
+
+msgid "themes_landing_all_themes"
+msgstr "All Themes"
+
+msgid "themes_landing_browse_themes"
+msgstr "Browse Themes"
+
+msgid "user_change_email"
+msgstr "Change Email Address"
+
+msgid "user_change_password"
+msgstr "Change password"
+
+msgid "user_confirmationcode_resent"
+msgstr "The confirmation code was resent!"
+
+#. %1 is the email address, %2 is the URL of the user registration page
+msgid "user_del_account_deleted"
+msgstr ""
+"Your user account %1$s has been successfully deleted. If you want to come "
+"back some time, you can re-register on the <a href=\"%2$s\">user "
+"registration page</a>."
+
+msgid "user_del_community_sad"
+msgstr "The Mozilla Add-ons community is sad to see you go."
+
+msgid "user_del_confirm_password"
+msgstr "Confirm Password"
+
+msgid "user_del_deletenow"
+msgstr "Delete my user account now"
+
+#. %1 is the URL of the user's info page
+msgid "user_del_error_addons"
+msgstr ""
+"You cannot delete your account if you are listed as an <a href=\"%1$s"
+"\">author of any add-ons</a>. To delete your account, please have another "
+"person in your development group delete you from the list of authors for "
+"your add-ons. Afterwards you will be able to delete your account here."
+
+#. %1 is a link to the amo-editors mailing list
+msgid "user_del_error_addons_more_questions"
+msgstr "If you have additional questions, please contact %1$s for assistance."
+
+msgid "user_del_error_checkbox"
+msgstr ""
+"You need to check the box \"I understand...\" before we can delete your "
+"account."
+
+msgid "user_del_error_password"
+msgstr "Please enter your password correctly in order to perform this step."
+
+#. %1 is a link to the amo-admins mailing list
+msgid "user_del_error_unknown"
+msgstr ""
+"An unknown error occured deleting your account. Please contact %1$s with the "
+"issue and we will delete it for you. We apologize for the inconvenience."
+
+msgid "user_del_header_confirm_deletion"
+msgstr "Confirm account deletion"
+
+#. %1 is the user's email address
+msgid "user_del_header_delete_account"
+msgstr "Delete User Account %1$s"
+
+msgid "user_del_header_farewell"
+msgstr "Farewell!"
+
+msgid "user_del_nologin"
+msgstr "You will not be able to log into Mozilla Add-ons anymore."
+
+msgid "user_del_permanently_removed_means"
+msgstr ""
+"By clicking \"delete\" your account is going to be <strong>permanently "
+"removed</strong>. That means:"
+
+msgid "user_del_reviews_anonymized"
+msgstr ""
+"Your reviews and ratings will not be deleted, but they will no longer be "
+"associated with you."
+
+#. %1 is a link to the amo-editors mailing list
+msgid "user_del_specific_problem_editors"
+msgstr ""
+"If you have a specific problem we may help you with, please do not delete "
+"your account now, but contact us at %1$s and we will do our best to assist "
+"you in solving it."
+
+msgid "user_del_understand_permanent"
+msgstr "I understand that this step cannot be undone."
+
+msgid "user_deleted_nickname"
+msgstr "Deleted User"
+
+#. %1 is the new email address
+msgid "user_edit_confirm_email_sent"
+msgstr ""
+"An email has been sent to %1$s to confirm your new email address. For the "
+"change to take effect, you need to click on the link provided in this email. "
+"Until then, you can keep logging in with your current email address."
+
+msgid "user_edit_delete_user"
+msgstr "Delete user account"
+
+#. This contains the email sent to users when they signed up for a new
+#. account:
+#. %1 is the confirmation URL, %2 is the current app
+#, php-format
+msgid "user_email_confirm_account_nopass"
+msgstr ""
+"Welcome to %2$s Add-ons.\n"
+"\n"
+"Before you can use your new account you must activate it - this ensures the "
+"e-mail address you used is valid and belongs to you.\n"
+"To activate your account, click the link below or copy and paste the whole "
+"thing into your browser's location bar:\n"
+"\n"
+"%1$s\n"
+"\n"
+"Once you successfully activated your account, you can throw away this e-"
+"mail.\n"
+"\n"
+"Thanks for joining %2$s Add-ons\n"
+"-- %2$s Add-ons Staff"
+
+#. %1 is the confirmation url, %2 is the application name
+#, php-format
+msgid "user_email_confirm_emailchange"
+msgstr ""
+"You requested a change to your email address at %2$s Add-ons.\n"
+"\n"
+"In order to confirm the new address, please click the link below or copy and "
+"paste the whole thing into your browser's location bar:\n"
+"\n"
+"%1$s\n"
+"\n"
+"You have 48 hours to confirm the new address. If you do not want to change "
+"the address anymore, you can just ignore this email.\n"
+"\n"
+"Thanks!\n"
+"-- %2$s Add-ons Staff"
+
+#, php-format
+msgid "user_email_confirm_subject"
+msgstr "Thanks for joining %s Add-ons"
+
+#. This is the password reset email
+#. %1 is the pw reset URL, %2 is the application
+#, php-format
+msgid "user_email_pwreset"
+msgstr ""
+"%2$s Add-ons Password Reset\n"
+"\n"
+"A request was received to reset the password for this account on addons."
+"mozilla.org. To change this password please click on the following link, or "
+"paste it into your browser's location bar:\n"
+"\n"
+"%1$s\n"
+"\n"
+"If you did not request this email there is no need for further action.\n"
+"\n"
+"Thanks,\n"
+"-- %2$s Add-ons Staff"
+
+#, php-format
+msgid "user_email_pwreset_subject"
+msgstr "Reset your %s Add-ons password"
+
+msgid "user_emailchange_error"
+msgstr "Error!"
+
+#. %1 is the application name
+#, php-format
+msgid "user_emailchange_subject"
+msgstr "Please confirm your email address change at %1$s Add-ons"
+
+msgid "user_emailchange_success"
+msgstr "Success!"
+
+#. %1 is the new email address
+#, php-format
+msgid "user_emailchange_successful_description"
+msgstr ""
+"Your email address was changed successfully. From now on, please use %1$s to "
+"log in."
+
+msgid "user_form_confirmpassword"
+msgstr "Confirm password"
+
+#, php-format
+msgid "user_form_editprofile"
+msgstr "Edit user profile for %s"
+
+msgid "user_form_email"
+msgstr "Email address"
+
+msgid "user_form_firstname"
+msgstr "First name"
+
+msgid "user_form_hideemail"
+msgstr "Hide email address"
+
+msgid "user_form_homepage"
+msgstr "Website URL"
+
+msgid "user_form_lastname"
+msgstr "Last name"
+
+msgid "user_form_login"
+msgstr "User Login"
+
+msgid "user_form_newpassword"
+msgstr "New password"
+
+msgid "user_form_nickname"
+msgstr "Nickname"
+
+msgid "user_form_oldpassword"
+msgstr "Old password"
+
+msgid "user_form_otheractions"
+msgstr "Other Actions"
+
+msgid "user_form_password"
+msgstr "Password"
+
+msgid "user_form_registration"
+msgstr "New User Registration"
+
+msgid "user_form_remember_me"
+msgstr "Remember me on this computer"
+
+msgid "user_form_showsandbox"
+msgstr "Show sandbox?"
+
+msgid "user_form_submit_edit"
+msgstr "Save"
+
+msgid "user_form_submit_login"
+msgstr "Log in"
+
+msgid "user_form_submit_register"
+msgstr "Register"
+
+#, php-format
+msgid "user_info_usersince"
+msgstr "%s Add-ons user since"
+
+msgid "user_login_register_link"
+msgstr "Create a new user account"
+
+msgid "user_notifications_item_compat"
+msgstr "Add-on Compatibility (strongly recommended)"
+
+msgid "user_notifications_item_events"
+msgstr "Upcoming events and contests"
+
+msgid "user_notifications_none_available"
+msgstr "There are currently no notifications available for you to configure."
+
+msgid "user_notifications_select_topics"
+msgstr ""
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
+
+msgid "user_notifications_specific_contact"
+msgstr ""
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
+
+msgid "user_profile_edit_error"
+msgstr ""
+"There were errors in the changes you made. Please correct them and resubmit."
+
+msgid "user_profile_saved"
+msgstr "Profile updated."
+
+#, php-format
+msgid "user_pwreset_for_email"
+msgstr "Password reset for %s"
+
+msgid "user_pwreset_header"
+msgstr "Password Reset"
+
+msgid "user_pwreset_link"
+msgstr "Forgot your password?"
+
+msgid "user_pwreset_link_sent"
+msgstr "The password reset link was sent to your email address."
+
+msgid "user_pwreset_okay"
+msgstr "Password successfully reset."
+
+msgid "user_pwreset_submit_changepw"
+msgstr "Submit password change"
+
+msgid "user_pwreset_submit_sendlink"
+msgstr "Send password reset link"
+
+#, php-format
+msgid "user_register_amo_link"
+msgstr "%s Add-ons"
+
+#. %1 is the user's email address, %2 is the current app
+#, php-format
+msgid "user_register_click_confirm_link"
+msgstr ""
+"A link to activate your user account was sent by email to your address %1$s. "
+"You have to click it before you can log into %2$s Add-ons."
+
+#. %1 is the user's email address
+#, php-format
+msgid "user_register_confirm_email_sent"
+msgstr ""
+"An email has been sent to your address %1$s to confirm your account. Before "
+"you can log in, you have to activate your account by clicking on the link "
+"provided in this email."
+
+msgid "user_register_confirmation_link_text"
+msgstr "resend the confirmation message"
+
+msgid "user_register_congratulations"
+msgstr "Congratulations! Your user account was successfully created."
+
+#. %1 is the link to the "resend confirmation code" page
+#, php-format
+msgid "user_register_resend_confirmation_link"
+msgstr ""
+"If you did not receive the confirmation email, make sure your email service "
+"did not mark it as \"junk mail\" or \"spam\". If you need to, you can have "
+"us %1$s to your email address mentioned above."
+
+#. %1 is the link to the Mozilla Add-ons front page
+#, php-format
+msgid "user_register_welcome"
+msgstr "Thanks for registering and welcome to %1$s!"
+
+msgid "user_required_firstlast_or_nickname"
+msgstr "A first name, last name or nickname is required."
+
+msgid "user_tab_notifications"
+msgstr "Notifications"
+
+msgid "user_tab_profile"
+msgstr "User Profile"
+
+msgid "user_verified_okay"
+msgstr "Successfully verified!"
+
+msgid "users_delete_pagetitle"
+msgstr "Delete User Account"
+
+msgid "users_edit_pagetitle"
+msgstr "User Account Editing"
+
+#, php-format
+msgid "users_info_addons_by_user"
+msgstr "Add-ons by %1$s"
+
+msgid "users_info_author_name"
+msgstr "Name"
+
+msgid "users_info_author_profile"
+msgstr "User Profile"
+
+msgid "users_info_email"
+msgstr "Email address"
+
+msgid "users_info_homepage"
+msgstr "Homepage"
+
+msgid "users_info_nickname"
+msgstr "Nickname"
+
+#, php-format
+msgid "users_info_pagetitle"
+msgstr "User Info for %1$s"
+
+#. %1 is the user's name
+msgid "users_info_reviews_by_user"
+msgstr "Reviews by %s"
+
+msgid "users_login_pagetitle"
+msgstr "User Login"
+
+#. %1 is the link to the sandbox/policy explanation page
+#. This message is for a specific add-on not found
+#, php-format
+msgid "users_login_sandbox_display_warning"
+msgstr ""
+"The add-on you're looking for is currently in the sandbox. If you already "
+"have an account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn "
+"more about the sandbox.</a>"
+
+#. %1 is the link to the sandbox/policy explanation page
+#. This message is for any given sandbox-related page not found
+#, php-format
+msgid "users_login_sandbox_page_warning"
+msgstr ""
+"The page you're looking for is part of the sandbox. If you already have an "
+"account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn more "
+"about the sandbox.</a>"
+
+msgid "users_pwreset_pagetitle"
+msgstr "User Password Reset"
+
+msgid "users_register_pagetitle"
+msgstr "New User Registration"
+
+#~ msgid "page_title_experimental_addons"
+#~ msgstr "Experimental Add-ons"
+
+#~ msgid "pages_experimental_addons_backbutton"
+#~ msgstr "Back to the previous page"
diff --git a/site/app/locale/da/LC_MESSAGES/messages.po b/site/app/locale/da/LC_MESSAGES/messages.po
index c0ee94d..ccc14d3 100644
--- a/site/app/locale/da/LC_MESSAGES/messages.po
+++ b/site/app/locale/da/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
-# Language en-US translations for addons.mozilla.org package.
-# Copyright (C) 2009 THE addons.mozilla.org'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the addons.mozilla.org package.
-# Automatically generated, 2009.
-# 
+# Language en-US translations for addons.mozilla.org package.
+# Copyright (C) 2009 THE addons.mozilla.org'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the addons.mozilla.org package.
+# Automatically generated, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: addons\n"
@@ -16,169 +16,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Annuller installation"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Download nu %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accepter og download"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accepter og installer"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Offentlig"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandkasse"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Opdateret %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "downloads i alt"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "downloads pr. uge"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s tilføjelse"
 msgstr[1] "%1$s tilføjelser"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "pr. side"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sorter efter:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "eksperimentel"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "anbefalet"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s er ikke tilgængelig til %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Tilbage til %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Tilbage til anmeldelser..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Bedømmelse:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Anmeldelse:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Indsend din anmeldelse"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Tilføj en anmeldelse af %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titel/resumé:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Slet"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Svar"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Er du sikker på, at du vil slette denne anmeldelse?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nej"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ja"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Slet anmeldelse"
 
@@ -187,7 +178,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Anmeldelsen blev slettet."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Ret anmeldelse af %s"
@@ -200,18 +191,18 @@ msgstr ""
 "anmeldelser skal være på mellem 10 og 100 tegn. Du har skrevet %1$s tegn."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Bemærk: Din anmeldelse vil blive gennemgået af en redaktør, før den kan ses "
 "på den offentlige side."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Udviklersvar til:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -229,169 +220,131 @@ msgid "addon_review_pagetitle"
 msgstr "Anmeldelser af %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Svar fra %1$s den %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Svar fra udvikleren:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Din anmeldelse er gemt. Tak!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "af %1$s den %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "af %1$s den %2$s (bedømmelse %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Næste tilføjelse"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Forrige tilføjelse"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Permanent link til denne version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Seneste version, som er kompatibel med %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Vis"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Vis forfatterens profil"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Gennemse alle temaer :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Gennemse %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Gennemse temaer i kategorien %1$s :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Hvad er dette?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Tilføj en anmeldelse"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Avancerede detaljer"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategorier"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "detaljeret anmeldelse"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Synes ikke om den"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Rediger din anmeldelse"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Denne tilføjelse har en privatlivspolitik."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Hader den"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Kommentarer fra udvikleren"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Hjemmeside"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licens for kildekode"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Anmeldelser"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Synes om den"
 
@@ -399,23 +352,19 @@ msgstr "Synes om den"
 msgid "addons_display_long_description"
 msgstr "Lang beskrivelse"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Er vild med den"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Flere billeder"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Andre tilføjelser fra %1$s"
@@ -424,21 +373,21 @@ msgstr[1] "Andre tilføjelser fra samme forfattere"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support af denne tilføjelse tilbydes af udvikleren ved at kontakte %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -446,20 +395,21 @@ msgstr ""
 "kontakte %2$s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support af denne tilføjelse tilbydes af udvikleren på %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Bedømmelse"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Synes vældigt godt om den"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Lad venligst være med at sende fejlrapporter som anmeldelser. Vi videregiver "
@@ -467,45 +417,50 @@ msgstr ""
 "at kontakte dig for at løse problemet."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Retningslinjer for anmeldelser</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Se <a href=\"%1$s\">supportafsnittet</a> for at finde ud af hvor du kan få "
 "hjælp til denne udvidelse."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Gem"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Alle tilføjelser i kategorien %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Vis alle anmeldelser (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Vis alle versioner"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Fuldstændig versionshistorik"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Vis kildekoden"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Vis statistik"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Hvad synes du?"
 
@@ -513,237 +468,119 @@ msgstr "Hvad synes du?"
 msgid "addons_display_workswith"
 msgstr "Virker med:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "af"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Vi anbefaler"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Tilføjelser udvider %1$s og giver dig mulighed for at skræddersy den efter "
 "dine behov. Se dig omkring, og gør %1$s til din egen."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Nyeste:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Andre programmer"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Mest populære:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Vi anbefaler:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Opdateret for nylig:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Vis alle"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Vis alle nyoprettede tilføjelser"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Vis alle populære tilføjelser"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Vis alle anbefalede tilføjelser"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Vis alle nyligt opdaterede tilføjelser"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Klik på linket herunder for at gemme filen.</li><li>Åbn Mozilla "
 "Sunbird, og åbn Tilføjelser fra menuen Funktioner.</li><li>Klik på knappen "
 "Installer, find/marker filen, som du downloadede, og klik \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Hvordan du installerer i Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Klik på linket herunder for at gemme filen.</li><li>Åbn Mozilla "
@@ -751,42 +588,39 @@ msgstr ""
 "knappen Installer, find/marker filen, som du downloadede, og klik \"OK\".</"
 "li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Hvordan du installerer i Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Vis eksperimentelle tilføjelser"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Opdater"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Af"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "til Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "til Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "til Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -794,11 +628,11 @@ msgstr ""
 "Besøg %1$s for at få mere at vide om andre plugins til Mozillabaserede "
 "browsere."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Leder du efter et plugin, som ikke er på listen?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins hjælper din browser med specifikke funktioner, som fx at vise "
@@ -807,24 +641,24 @@ msgstr ""
 "funktionalitet."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Almindelige plugins til %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Hjælp og dokumentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -832,40 +666,36 @@ msgstr ""
 "installationen kan fortsætte:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Skærmbilleder af %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Tilføjet fornyligt"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Med så mange fantastiske tilføjelser er der noget for enhver smag. Her er en "
 "liste over nogle af de mest populære, så du kan komme godt i gang."
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Anbefalede tilføjelser"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Anbefalede tilføjelser"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Yderligere kilder"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Desværre, du skal bruge en Mozillabaseret browser (eksempelvis Firefox) for "
@@ -880,42 +710,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Lær hvordan du %1$s hos %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "laver din egen"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Find flere søgetjenester hos %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Søgemasikner"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Særligt tak til Mycroftprojektet for deres arbejder med søgetjenester til "
 "Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Del dette"
 
@@ -951,17 +782,17 @@ msgstr "Inkompatibel version"
 msgid "addons_status_nominated"
 msgstr "I sandkassen; Nomineret til at blive offentliggjort"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "I sandkassen; Venter på anmeldelser"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Offentliggjort"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "I sandkassen"
@@ -970,36 +801,26 @@ msgstr "I sandkassen"
 msgid "addons_status_unknown"
 msgstr "Ukendt"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Lær mere om denne tilføjelse"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Flest downloads"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Bedste bedømmelse"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Pas på med gamle versioner"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Disse versioner vises som reference og til brug for test. Du bør altid "
 "anvende den nyeste udgave af en tilføjelse."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Versionshistorik med beskrivelse af ændringer"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Versionshistorik for %1$s"
@@ -1034,426 +855,153 @@ msgstr "Gruppeadministration"
 msgid "admin_group_saved"
 msgstr "Gruppen er gemt"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avanceret"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "NÃ¥r som helst"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Enhver"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Enhver"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Program"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Relevans for søgningen"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Sidst opdateret"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Navn"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Nyeste"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "under 3 måneder siden"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "under 6 måneder siden"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "under et døgn siden"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "under en måned siden"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "under en uge siden"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "under et år siden"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Pr. side"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitet"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Bedømmelse"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sorter efter"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "til"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Skift mellem avanceret og simpel søgning"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorer versionskontrol"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Denne tilføjelse er til ældre versioner af Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Du kan <a href=\"%1$s\">prøve en ældre version</a> eller <a href=\"#\" "
 "onclick=\"%2$s\">ignorere denne test</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "En <a href=\"%1$s\">ældre version</a> vil måske virke"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Denne tilføjelse kræver <a href=\"%1$s\">Firefox %2$s</a>, som endnu ikke er "
 "udgivet"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Opdater Firefox</a> for at bruge denne "
 "tilføjelse"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Tilføjelser efter navn"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Nyeste tilføjelser"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Populære tilføjelser"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Tilføjelser efter bedømmelse"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Nyligt opdaterede tilføjelser"
 
@@ -1462,918 +1010,105 @@ msgid "categories_current_title"
 msgstr "Nuværende kategori"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategorier"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Vælg en kategori"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Se alle tilføjelser i kategorien %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Beskrivelsen bør være mindre end %1$s tegn."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Se alle anbefalede tilføjelser"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Bedst bedømte først"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Sidst opdaterede først"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Mest populære først"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Navnet bør være mindre end %1$s tegn."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Se alle tilføjelser i kategorien %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Samlingen findes ikke!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Tilføjet %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Kompatibilitetscenter for tilføjelser"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Vær klar til udgivelsen af %1$s med værktøjerne og informationerne herunder."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Indlæser data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Tilbage til hovedsiden"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Kompatibilitetsrapport for tilføjelser"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Information til udviklere af tilføjelser"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Juster maxVersion uden at uploade"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Kontroller status for mine tilføjelser"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Hvis du har tilføjelser hostet på Mozilla Add-ons, kan du <a href=\"%1$s"
 "\">logge ind</a> for at se status for dine tilføjelser relateret til %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo for Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Du har ingen tilføjelser, som hostes af Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Resultat af statustjek"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Indlæser status for tilføjelser..."
 
@@ -2381,121 +1116,121 @@ msgstr "Indlæser status for tilføjelser..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s brugere af %2$s (%3$s&#37; af alle)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Tilføjelserne herunder udgør 95% af den del af tilføjelsesbrugen som Mozilla "
 "kender til og er ordnet efter antal brugere."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Vis detaljeret rapport"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Af de %1$s tilføjelser, som udgør 95&#37; af den del af tilføjelsesbrugen "
 "som Mozilla kender til, er <b>%2$s&#37;</b> i øjeblikket kompatible med de "
 "seneste udgaver af %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alfaversioner"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Tilføjelser som er kompatible med en alfaversion af %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Betaversioner"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "Tilføjelser som er kompatible med en betaversion eller release candidate af %"
 "1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Seneste version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Tilføjelser som er opdateret til de seneste udgaver af %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Andre versioner"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Tilføjelser som ikke er kompatible med nogen versioner af %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Kompatibilitetsrapport for tilføjelser"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Information til brugere af tilføjelser"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Vis kompatibilitetsrapport"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Se hvodan du selv kan bidrage på %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "vores wikiside"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla vil gerne takke følgende personer for deres bidrag til addons."
 "mozilla.org gennem årene:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Udviklere"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Redaktører"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Oversættere"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Andre bidragydere"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Forhenværende udviklere"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software og billeder"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Visse ikoner på siden er fra <a href=\"http://www.famfamfam.com/lab/icons/"
@@ -2503,7 +1238,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Navngivelse 2.5 "
 "Licens</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
 "Nogle sider bruger elementer fra <a href=\"http://www.simile-widgets.org/"
@@ -2513,20 +1248,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e. %B %Y"
 
@@ -2561,22 +1293,22 @@ msgstr "Statistics Dashboard"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
 
@@ -2584,6 +1316,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detect)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Opens in a new window"
@@ -2620,64 +1365,129 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
 "Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
@@ -2707,7 +1517,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
 
@@ -2715,6 +1525,10 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Add-on Summary required"
@@ -2724,12 +1538,12 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
@@ -2737,7 +1551,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
@@ -2745,11 +1559,11 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
 "Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
@@ -2757,13 +1571,13 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 "You may now nominate your add-on for <span class=\"status-4\">Public</span> "
@@ -2832,12 +1646,121 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Next"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "Active"
@@ -2901,33 +1824,177 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Author"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Category"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Add Reply"
@@ -2973,52 +2040,64 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in public display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 "<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
@@ -3029,26 +2108,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
 
@@ -3113,19 +2192,19 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 "Any information end users may want to know that isn't necessarily applicable "
@@ -3133,22 +2212,22 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 "The description of your add-on is a longer explanation of features, "
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 "If your add-on has an End-User License Agreement (EULA), please enter its "
@@ -3156,28 +2235,28 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 "The summary is a short explanation of your add-on's basic functionality that "
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
 
@@ -3197,100 +2276,162 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "This add-on requires external software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "This is a site-specific add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 "An add-on's default locale is the main locale in which translations must be "
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 "The GUID of your add-on is specified in its install.rdf and uniquely "
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 "The add-on icon is a small image that is displayed next to your add-on's "
@@ -3298,90 +2439,100 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 "If your add-on has another homepage, enter its address here. Adding other "
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 "If you have an email address for support inquiries, enter it here. Adding "
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 "If your add-on has a support website or forum, enter its address here. "
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Authors"
@@ -3457,14 +2608,68 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Pending Updates (%s)"
 msgstr[1] "Pending Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "You do not have access to that add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3478,9 +2683,9 @@ msgstr "Please see %s for reference."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3498,6 +2703,10 @@ msgstr ""
 "That file extension (%1$s) is not allowed for the selected add-on type. "
 "Please use one of the following: %2$s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Please select no more than five categories."
@@ -3532,7 +2741,14 @@ msgstr ""
 "That file extension (%1$s) is not allowed for an icon. Please use one of the "
 "following: %2$s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
@@ -3540,9 +2756,9 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Please select a valid add-on type."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3609,6 +2825,18 @@ msgstr "No ID could be found for this add-on in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Please select at least one category."
@@ -3626,6 +2854,16 @@ msgstr ""
 "That file extension (%1$s) is not allowed for a preview. Please use one of "
 "the following: %2$s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3638,82 +2876,281 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
@@ -3729,12 +3166,12 @@ msgstr ""
 "to the selected default locale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Tools"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Tools"
 
@@ -3743,28 +3180,28 @@ msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Back to Main"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submit Add-on"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 "This add-on ID (%1$s) already exists in the database. If this is your add-"
@@ -3774,25 +3211,36 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3805,6 +3253,18 @@ msgstr ""
 "Removing this as the default preview will cause another preview to "
 "automatically become the default preview."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3812,13 +3272,13 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3847,46 +3307,46 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 "Click the Update Previews button below to save this image. (<a %s>Cancel?</"
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 "This preview will be deleted when Update Previews is clicked below. (<a %"
@@ -3903,7 +3363,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
 
@@ -3911,7 +3371,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
 
@@ -3923,23 +3383,23 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 "The preview screenshots for your add-on are shown below. You can make "
@@ -3962,16 +3422,24 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
@@ -3982,7 +3450,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 "Please note that some changes may take several hours to appear in all areas "
@@ -3992,6 +3460,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4059,7 +3531,7 @@ msgstr "Are you sure you wish to make this add-on public?"
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Moving this add-on back to the sandbox will require users to log in before "
+"Moving this add-on back to the sandbox will require users to login before "
 "downloading and updates will no longer be offered to existing users. Because "
 "your add-on is currently public, you will be able to return here at any time "
 "to make it public again."
@@ -4082,54 +3554,99 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
 msgstr ""
 "If a user browses the site and a translation isn't available in their own "
@@ -4138,61 +3655,61 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
 msgstr ""
 "This is a <i>Translation Box</i>. It allows you to localize a specific field "
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
 "The version number uploaded (%1$s) already exists for this add-on. If you "
@@ -4200,7 +3717,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
 "The uploaded version number (%1$s) does not match the existing version "
@@ -4210,28 +3727,24 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
 msgstr ""
 "<p>Your add-on listing has been successfully created. The basic information "
@@ -4243,25 +3756,25 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
 
@@ -4270,11 +3783,11 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
 
@@ -4296,20 +3809,16 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 "The new file will be available to the public as soon as an editor is able to "
@@ -4317,7 +3826,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 "The new version will be available to the public as soon as an editor is able "
@@ -4325,13 +3834,13 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 "View your new file in the <a %1$s>Versions and Files page</a>, check out "
@@ -4340,33 +3849,28 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 "View your new version in the <a %1$s>Versions and Files page</a>, check out "
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
 msgstr ""
 "Upload your add-on file using the form below. If you have multiple, platform-"
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4382,27 +3886,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4459,70 +3967,66 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
 msgstr ""
 "Adjusting application information here will allow users to install your add-"
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
 
@@ -4531,49 +4035,43 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
 "Information about changes in this release, new features, known bugs, and "
@@ -4581,23 +4079,23 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
 
@@ -4632,7 +4130,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Denne tilføjelse er deaktiveret"
 
@@ -4676,7 +4174,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
 
@@ -4738,7 +4236,7 @@ msgstr "View entries between %1$s and %2$s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
 
@@ -4762,24 +4260,24 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "External Software"
 
@@ -4791,39 +4289,39 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
 
@@ -4835,264 +4333,206 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "There are currently no add-ons of this type to review."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "Use this form to request more information from the author. They will receive "
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "This will mark the add-on and its most recent version and files as public. "
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public add-on to appear on the "
 "public side."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public add-on to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "If you have concerns about this add-on's security, copyright issues, or "
 "other concerns that an administrator should look into, enter your comments "
 "in the area below. They will be sent to administrators, not the author."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
@@ -5120,7 +4560,7 @@ msgstr "Nomination Approved/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
@@ -5147,91 +4587,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
 
@@ -5255,7 +4683,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
@@ -5267,81 +4695,87 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Age"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
-
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Ingen adgang"
 
@@ -5349,19 +4783,17 @@ msgstr "Ingen adgang"
 msgid "error_access_denied_message"
 msgstr "Du har ikke adgang til at se denne side."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5370,14 +4802,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Tilføjelse ikke fundet!"
 
@@ -5389,7 +4818,7 @@ msgstr "Tilføjelsen kan ikke vises her."
 msgid "error_addon_selfreview"
 msgstr "Du kan ikke anmelde din egen tilføjelse."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Ingen tilføjelser i denne kategori!"
 
@@ -5397,47 +4826,52 @@ msgstr "Ingen tilføjelser i denne kategori!"
 msgid "error_collection_feed_notfound"
 msgstr "Tilføjelsesfeed ikke fundet."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Dette er ikke en gyldig e-mail-adresse."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Dette felt skal udfyldes."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Fil ikke fundet!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fejl: Filen %s eksisterer ikke."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Der er fejl i denne formular. Ret dem venligst og indsend igen."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr ""
 "Vi var ikke i stand til at finde ud af, om du er et menneske eller en robot. "
 "Prøv igen."
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Denne URL har et ugyldigt format. Gyldige URLs ligner http://example.com/"
@@ -5445,46 +4879,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Manglende argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Ingen filer"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Bemærk"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Skærmbillede ikke fundet!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Du skal give en bedømmelse."
 
@@ -5492,47 +4914,38 @@ msgstr "Du skal give en bedømmelse."
 msgid "error_user_already_confirmed"
 msgstr "Brugerkontoen er allerede bekræftet."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Ugyldig bekræftelseskode!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Adgangskoderne matchede ikke."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Denne e-mail-adresse anvendes allerede af en anden bruger."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "E-mail ændringen er udløbet. Du bedes rette din e-mail-adresse igen i din "
 "brugerprofil og klikke på linket i bekræftelsesmailen så snart du modtager "
 "den."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Kaldenavnet er allerede i brug."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Bruger ikke fundet!"
 
@@ -5541,42 +4954,39 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "Bekræft venligst først din brugerkonto med koden, du modtog via e-mail."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Forkert brugernavn eller adgangskode!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version ikke fundet!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Forkert adgangskode!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Lær mere"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lær mere om %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s anmeldelse"
 msgstr[1] "%1$s anmeldelser"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Vis mere fra"
 
@@ -5615,39 +5025,38 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 msgid "footer_a_about"
 msgstr "Om"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alle rettigheder forbeholdes."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Tak til"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla linker til disse programmer som en ekstra service og repræsenterer "
@@ -5655,98 +5064,91 @@ msgstr ""
 "spørgsmål, klager eller krav vedrørende programmerne skal sendes til "
 "softwareudgiveren."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Skift"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Juridiske betingelser"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Andre sprog:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Privatlivspolitik"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Gem"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Ordbog"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Ordbøger"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Udvidelse"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Udvidelser"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Sprogpakke (tilføjelse)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Sprogpakker (tilføjelse)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Sprogpakke (program)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Sprogpakker (program)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Søgetjeneste"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Søgetjenester"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Temaer"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Tilbage til startsiden for %1$s Add-ons"
@@ -5755,95 +5157,37 @@ msgstr "Tilbage til startsiden for %1$s Add-ons"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Tilføjelser"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "SeaMonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Tilføjelser"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Log ind"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Log ud"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Min konto"
 
@@ -5851,72 +5195,49 @@ msgstr "Min konto"
 msgid "header_navlink_register"
 msgstr "Registrer"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Skærmbillede af %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log ind</a> for at installere denne tilføjelse. <a href=\"%2"
 "$s\">Hvorfor</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Lad mig installere denne eksperimentelle tilføjelse. <a href=\"%1$s\">Hvad "
-"er det?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Tilføj til %1$s %2$s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Tilføj %1$s til %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Denne tilføjelse er ikke tilgængelig."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Liste over sprogpakker og ordbøger."
 
@@ -5928,8 +5249,8 @@ msgstr "Download ordbog"
 msgid "langtools_download_langpack"
 msgstr "Download sprogpakke"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Ordbøger & sprogpakker"
 
@@ -5941,72 +5262,36 @@ msgstr "Installer ordbog"
 msgid "langtools_install_langpack"
 msgstr "Installer sprogpakke"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Ordbog"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Sprogpakke"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Sprog"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Anden licens"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD-licens"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11-licens"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klik her for at komme tilbage til forsiden."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dato"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Navn"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Bedømmelse"
@@ -6031,20 +5316,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Ordbøger & sprogpakker"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temaer"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Find tilføjelser til andre programmer"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "andre"
 
@@ -6052,33 +5344,13 @@ msgstr "andre"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Tak til"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+#, fuzzy
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6108,15 +5380,15 @@ msgstr "Sandkassegodkendelsessystemet"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Valid Application Versions"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Add-ons submitted to Mozilla Add-ons must have an install.rdf file with at "
@@ -6124,7 +5396,7 @@ msgstr ""
 "below are allowed for these applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6133,15 +5405,19 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "here"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
 
@@ -6149,6 +5425,12 @@ msgstr "Sandbox Information Page"
 msgid "pagination_next_page"
 msgstr "næste"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Dette er side %1$s af %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "forrige"
@@ -6183,15 +5465,15 @@ msgstr ""
 "Hvis ordene er svære at læse, kan du <a href=\"%1$s\">prøve med andre ord</"
 "a> eller <a href=\"%2$s\">lytte til noget</a> i stedet."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Er du et menneske eller en robot?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Hvad er dette?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Der opstod en fejl under rapporteringen af denne anmeldelse!"
 
@@ -6199,7 +5481,7 @@ msgstr "Der opstod en fejl under rapporteringen af denne anmeldelse!"
 msgid "review_flag_reason_bug_support"
 msgstr "Fejlplaceret fejlrapport eller support-spørgsmål"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Rapporter denne anmeldelse (vælg en begrundelse)"
 
@@ -6215,8 +5497,8 @@ msgstr "Andet (angiv hvad)"
 msgid "review_flag_reason_spam"
 msgstr "Spam eller på anden måde ikke en anmeldelse"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Tak; denne anmeldelse er rapporteret til redaktørerne."
 
@@ -6231,7 +5513,7 @@ msgstr ""
 "rapportere den til redaktørerne."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Bemærk disse råd:</p><ul><li>Skriv som hvis du fortalte en ven om din "
@@ -6249,130 +5531,101 @@ msgstr ""
 "brugeranmeldelser af tilføjelser.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Anmeldelser af %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Udmærkede tilføjelser"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Nyeste tilføjelser"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Opdaterede tilføjelser"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Søg"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Søgning er deaktiveret i øjeblikket. Prøv igen senere."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "Alle tilføjelser"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "søg efter tilføjelser"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Søg efter tilføjelser"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klik for at indtaste søgeord"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "i"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Alle søgemaskiner"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Gennemse søgemaskiner"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matchende tilføjelse"
+msgstr[1] "%s matchende tilføjelser"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Ingen resultater fundet."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Søg i tilføjelser"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed med søgeresultater"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Søgeresulteter for: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Administrationsværktøjer"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Udviklingsværktøjer"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Velkommen"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Velkommen %s"
@@ -6381,7 +5634,7 @@ msgstr "Velkommen %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "en ordbog"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Anbefalede tilføjelser"
 
@@ -6389,7 +5642,7 @@ msgstr "Anbefalede tilføjelser"
 msgid "sidebar_pitch_looking_for"
 msgstr "Jeg leder efter:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Nyeste tilføjelser"
 
@@ -6397,7 +5650,7 @@ msgstr "Nyeste tilføjelser"
 msgid "sidebar_pitch_search"
 msgstr "en søgetjeneste"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Abonner på"
 
@@ -6405,23 +5658,24 @@ msgstr "Abonner på"
 msgid "sidebar_pitch_theme"
 msgstr "et tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Opdaterede tilføjelser"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ikke bedømt endnu"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Bedømmelse: %s ud af 5 stjerner"
@@ -6458,13 +5712,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s created"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
@@ -6477,179 +5731,179 @@ msgstr "Close"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
@@ -6686,7 +5940,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
@@ -6714,105 +5968,109 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "By default, only you and Mozilla can access the information in your "
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
@@ -6824,7 +6082,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
@@ -6842,7 +6100,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
@@ -6868,69 +6126,54 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Alle temaer"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Gennemse temaer"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Skift e-mail-adresse"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Skift adgangskode"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Bekræftelseskoden er sendt igen!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Din konto, %1$s, er nu slettet. Hvis du ønsker at vende tilbage en anden "
 "gang, kan du registrere dig igen på <a href=\"%2$s"
 "\">brugerregistreringssiden</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Fællesskabet omkring Mozilla Add-ons er kede af at se dig gå."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Bekræft adgangskode"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Slet min konto nu"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Du kan ikke slette din konto, hvis du står listet som en <a href=\"%1$s"
@@ -6940,83 +6183,83 @@ msgstr ""
 "konto her."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Har du yderligere spørgsmål, kan du kontakte %1$s for mere information."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Du skal sætte markering i boksen \"Jeg forstår...\" før vi kan slette din "
 "konto."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Kontoen blev ikke slettet, da den angivne adgangskode er forkert."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "En ukendt fejl opstod under sletningen af din konto. Kontakt venligst %1$s "
 "vedrørende dette problem, og vi vil slette kontoen for dig. Vi beklager "
 "ulejligheden."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Bekræft sletning af konto"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Slet kontoen %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Farvel!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Du vil fremover ikke kunne logge ind på Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Ved at klikke på \"slet\" vil du slette din konto <strong>permanent</"
 "strong>. Dette betyder:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Dine anmeldelser og bedømmelser vil ikke blive slettet, men de vil ikke "
 "længere være knyttet til dig."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Har du et specifikt problem, som vi kan hjælpe med, bør du ikke slette din "
 "konto nu, men i stedet kontakte os på %1$s, og vi vil gøre vores bedste for "
 "at hjælpe dig med at løse problemet."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Jeg forstår at dette trin ikke kan annulleres."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Slettet bruger"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "En e-mail er sendt til %1$s for at bekræfte din nye e-mail-adresse. Før "
 "ændringen kan gennemføres, skal du klikke på linket i denne mail. Indtil da "
 "skal du fortsat bruge din nuværende e-mail-adresse til at logge ind."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Slet konto"
 
@@ -7042,7 +6285,9 @@ msgstr ""
 "-- %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Du anmodede om at ændre din e-mail-adresse hos %2$s Add-ons.\n"
@@ -7083,109 +6328,90 @@ msgstr ""
 "Tak,\n"
 "-- %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Nulstil din adgangskode til %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Fejl!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Bekræft ændring af e-mail-adresse hos %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Din e-mail-adresse blev ændret. Fra nu af skal du bruge %1$s for at logge "
 "ind."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Om mig"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Introducer dig selv til fællesskabet, hvis du vil! Denne tekst vil blive "
-"vist offentligt op din brugerside. Linjeskift bevares, men HTML tillades "
-"ikke."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Bekræft adgangskode"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Ret brugerprofil for %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-mail-adresse"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Fornavn"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Skjul e-mail-adresse"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Website URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Efternavn"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Brugerlogin"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Ny adgangskode"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Kaldenavn"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Gammel adgangskode"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Andre muligheder"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Adgangskode"
 
@@ -7193,66 +6419,66 @@ msgstr "Adgangskode"
 msgid "user_form_registration"
 msgstr "Registrering af ny bruger"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Husk mig på denne computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Vis sandkasse?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Gem"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Log ind"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registrer"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Bruger af %s Add-ons siden"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Opret ny brugerkonto"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kompatibilitet vedrørende tilføjelser (anbefales kraftigt)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Kommende begivenheder og konkurrencer"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Der er i øjeblikket ingen beskeder, som du kan kan konfigurere."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Mozilla kan af og til sende e-mails vedrørende kommende udgivelser og "
 "begivenheder relateret til tilføjelser. Vælg hvad du er interesseret i "
 "herunder:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla forbeholder sig retten til at kontakte dig individuelt vedrørende "
 "dine tilføjelser, som er hostet her."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Der var fejl i de indtastede ændringer. Ret dem venligst og indsend igen."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil opdateret."
 
@@ -7265,15 +6491,15 @@ msgstr "Adgangskode nulstillet for %s"
 msgid "user_pwreset_header"
 msgstr "Adgangskode nulstillet"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Har du glemt din adgangskode?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Linket til nulstilling af adgangskode er sendt til din e-mail-adresse."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Adgangskoden blev nulstillet."
 
@@ -7285,7 +6511,7 @@ msgstr "Indsend ændring af adgangskode"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Send link til ændring af adgangskode"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7300,7 +6526,7 @@ msgstr ""
 "ind på %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7312,23 +6538,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "sende bekræftelsesmeddelelsen igen"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Tillykke! Din brugerkonto er nu oprettet."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registrering på AMO er <strong>ikke påkrævet</strong> hvis du bare vil "
-"hente og installere offentlige tilføjelser.</p><p>Du behøver kun at "
-"registrere, hvis:</p><ul><li>Du vil indsende anmeldelser af tilføjelser</"
-"li><li>Du er udvikler af en tilføjelse og ønsker at uploade den til hosting "
-"på AMO</li></ul><p>Ved succesfuld registrering vil du få tilsendt en "
-"bekræftelsesmail til den adresse du opgav. Følg instruktionerne i mailen for "
-"at bekræfte din konto.</p><p>Hvis du vil, kan du læse vores <a href='%1$s' "
-"title='Juridiske betingelser'>juridiske betingelser</a> og <a href='%2$s' "
-"title='Privatlivspolitik'>privatlivspolitik</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7339,29 +6552,20 @@ msgstr ""
 "$s til din e-mail-adresse, som står herover."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Tak fordi du registrerede dig og velkommen til %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Velkommen til addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Et fornavn, efternavn eller kaldenavn skal angives."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Beskeder"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Brugerprofil"
 
@@ -7369,65 +6573,50 @@ msgstr "Brugerprofil"
 msgid "user_verified_okay"
 msgstr "Godkendt!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Slet konto"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Redigering af brugerkonto"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Om mig"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Tilføjelser fra %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Navn"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Brugerprofil"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-mail-adresser"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Hjemmeside"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Kaldenavn"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Brugerinfo om %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Anmeldelser skrevet af %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Log ind"
 
@@ -7458,82 +6647,3 @@ msgstr "Nulstilling af adgangskode"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrering af ny bruger"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licens for kildekoden til %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Vis alle som blev tilføjet fornyligt"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Vis alle med flest downloads"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Vis alle med de bedste bedømmelser"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Næste tilføjelse"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Forrige tilføjelse"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Nyeste:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Mest populære:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Vi anbefaler:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Opdateret for nylig:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Vis alle"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "New"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Updated"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Add-on Types"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Applications"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platforms"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Submission Types"
-
-#~ msgid "home"
-#~ msgstr "hjem"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Dette er side %1$s af %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s matchende tilføjelse"
-#~ msgstr[1] "%s matchende tilføjelser"
diff --git a/site/app/locale/da/glossary.txt b/site/app/locale/da/glossary.txt
index 22ddf50..d04bc9f 100644
--- a/site/app/locale/da/glossary.txt
+++ b/site/app/locale/da/glossary.txt
@@ -15,11 +15,4 @@ edit            rediger
 author          forfatter
 (user) account  konto
 flag review     rapporter anmeldelse
-notifications   beskeder
-community       fællesskab
-
-BANDWAGON
-collection      samling
-directory       oversigt
-enter           indtast
-review          godkend
\ No newline at end of file
+notifications   beskeder
\ No newline at end of file
diff --git a/site/app/locale/de/LC_MESSAGES/messages.po b/site/app/locale/de/LC_MESSAGES/messages.po
index e51169b..8ce11f1 100644
--- a/site/app/locale/de/LC_MESSAGES/messages.po
+++ b/site/app/locale/de/LC_MESSAGES/messages.po
@@ -16,169 +16,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Installation abbrechen"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Herunterladen %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Zustimmen und Herunterladen"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Zustimmen und installieren"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Öffentliche Seite"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandkasten"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Aktualisiert am %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "mal heruntergeladen"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Downloads insgesamt"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "Downloads wöchentlich"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s Add-on in \"%2$s\""
 msgstr[1] "%1$s Add-ons in \"%2$s\""
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "pro Seite"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sortieren nach:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimentell"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "empfohlen"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ist für %2$s nicht verfügbar."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Zurück zu %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Zurück zu den Bewertungen..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Bewertung"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Bewertungstext"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Abschicken"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Bewertung für %s schreiben"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titel/Zusammenfassung"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Löschen"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Antworten"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Wollen Sie diese Bewertung wirklich löschen?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nein"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ja"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Bewertung löschen"
 
@@ -187,7 +178,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Die Bewertung wurde gelöscht."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Bewertung für %s editieren"
@@ -200,18 +191,18 @@ msgstr ""
 "10 und 100 Zeichen lang sein. Ihre Beschreibung umfasste %1$s Zeichen."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Bitte beachten Sie: Bevor Ihre Bewertung auf der Seite veröffentlicht wird, "
 "muss sie von einem Moderator freigeschaltet werden."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Antwort des Entwicklers auf:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -228,161 +219,131 @@ msgid "addon_review_pagetitle"
 msgstr "Bewertungen für %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Antwort von %1$s am %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Entwickler-Antwort:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Die Bewertung wurde erfolgreich gespeichert!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "von %1$s am %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "von %1$s am %2$s (Note %3$d)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Nächstes Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Vorheriges Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Direkter Link zu dieser Version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Die neueste Version, die mit %1$s %2$s kompatibel ist"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Anzeigen"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Das Profil des Autors anzeigen"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Alle Themes anzeigen :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Kategorie %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Alle %1$s Themes anzeigen :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Was ist das?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Eine Bewertung schreiben"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Weitere Details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategorien"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Zu einer Sammlung hinzufügen:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Neue Sammlung..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Eine Sammlung auswählen..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Los!"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s wurde zur Sammlung %2$s hinzugefügt."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Was ist das?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "und %1$s weitere Sammlung"
-msgstr[1] "und %1$s weitere Sammlungen"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Detaillierte Bewertung"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nicht so gut"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Ihre Bewertung editieren"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Dieses Add-on hat eine Datenschutzerklärung."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Schlecht"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Sammlungen mit diesem Add-on"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Entwickler-Kommentare"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Quellcode-Lizenz"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Bewertungen"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hilfe"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Okay"
 
@@ -390,38 +351,35 @@ msgstr "Okay"
 msgid "addons_display_long_description"
 msgstr "Ausführliche Beschreibung"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Ausgezeichnet"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Weitere Bilder"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Dieses Add-on ist noch in keiner Sammlung."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Weitere Add-ons von %1$s"
-msgstr[1] "Weitere Add-ons von diesen Autoren"
+msgstr[1] "Weitere add-ons von diesen Autoren"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -430,7 +388,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -438,20 +396,21 @@ msgstr ""
 "der E-Mail-Adresse %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Unterstützung für diese Erweiterung gibt der Entwickler unter %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Bewertung"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Sehr gut"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Bitte schreiben Sie keine Fehlerberichte oder Support-Anfragen als "
@@ -460,45 +419,50 @@ msgstr ""
 "Problems notwendig ist."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Richtlinien für Bewertungen</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Im Abschnitt <a href=\"%1$s\">\"Hilfe\"</a> erfahren Sie, wo Sie "
 "Unterstützung für dieses Add-on bekommen können."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Speichern"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Alle %1$s-Add-ons anzeigen"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Alle Bewertungen anzeigen (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Alle Versionen anzeigen"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Gesamte Versionsgeschichte"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Quelltext anzeigen"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statistiken"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Was halten Sie davon?"
 
@@ -506,84 +470,24 @@ msgstr "Was halten Sie davon?"
 msgid "addons_display_workswith"
 msgstr "Kompatibel mit:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Gerade hinzugefügt"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Beliebt"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Empfohlen"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Abonnieren"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Add-ons durchstöbern"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Aktualisiert"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "von"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Beliebte Sammlungen"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Sammlungen"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> Add-on"
-msgstr[1] "<strong>%1$s</strong> Add-ons"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Alle Sammlungen anzeigen"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Sammlungen geben Ihnen die Möglichkeit, Add-ons zu gruppieren, kombinieren "
-"und nach Belieben zu vermischen. Abonnieren Sie Sammlungen anderer Benutzer "
-"oder erstellen Sie Ihre eigenen Sammlungen!"
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> Abonnent"
-msgstr[1] "<strong>%1$s</strong> Abonnenten"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Empfohlenes Add-on:"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -591,183 +495,138 @@ msgstr ""
 "persönliche Note zu geben. Sehen Sie sich ruhig um und erweitern Sie %1$s "
 "nach Belieben."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Mögen Sie diese? Finden Sie weitere Add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Ãœber 5000 kostenlose Erweiterungen</strong>, mit denen Sie Firefox "
-"nach Belieben anpassen und erweitern können, damit er genau das tut, was Sie "
-"brauchen."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Was sind Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Leicht zu installieren</strong>, und wenn es eine Aktualisierung "
-"gibt, werden Sie automatisch benachrichtigt."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Einführung"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, Themes und Suchmaschinen, die Ihnen dabei helfen, "
-"<strong>alltägliche Aufgaben zu erfüllen.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Neueste:"
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NEU!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Andere Anwendungen"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>Add-on heruntergeladen</span>"
-msgstr[1] "<strong>%1$s</strong> <span>Add-ons heruntergeladen</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Am beliebtesten:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>aktives Add-on</span>"
-msgstr[1] "<strong>%1$s</strong> <span>aktive Add-ons</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Von uns empfohlen:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Aktualisiert:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Alle anzeigen"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Alle neuen Add-ons anzeigen"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Alle beliebten Add-ons"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Alle empfohlenen Add-ons"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Alle jüngst aktualisierten Add-ons anzeigen"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Klicken Sie den unten stehenden Link, um die Datei herunterzuladen.</"
 "li><li>In Mozilla Sunbird, öffnen Sie im Menü \"Extras\" den Punkt \"Add-ons"
-"\".</li><li>Klicken Sie auf die Schaltfläche \"Installieren\", wählen Sie "
-"die heruntergeladene Datei aus, und klicken Sie \"OK\".</li></ol>"
+"\".</li><li>Klicken Sie auf die Taste \"Installieren\", wählen Sie die "
+"heruntergeladene Datei aus, und klicken Sie \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Wie installiere ich ein Add-on in Thunderbird?"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Klicken Sie mit der rechten Maustaste auf den unten stehenden Link "
 "und wählen Sie \"Speichern unter...\", um die Datei herunterzuladen und auf "
 "der Festplatte zu speichern.</li><li>In Mozilla Thunderbird, öffnen Sie im "
-"Menü \"Extras\" den Punkt \"Add-ons\".</li><li>Klicken Sie auf die "
-"Schaltfläche \"Installieren\", wählen Sie die heruntergeladene Datei aus und "
-"klicken Sie \"OK\".</li></ol>"
+"Menü \"Extras\" den Punkt \"Add-ons\".</li><li>Klicken Sie auf die Taste "
+"\"Installieren\", wählen Sie die heruntergeladene Datei aus und klicken Sie "
+"\"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Wie installiere ich ein Add-on in Thunderbird?"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Experimentelle Add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Okay"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Von"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "für Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "für Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "für Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -775,11 +634,11 @@ msgstr ""
 "weiteren Informationen über zusätzliche Plugins, die mit Browsern aus dem "
 "Hause Mozilla kompatibel sind, besuchen Sie %1$s."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Suchen Sie nach weiteren Plugins?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins helfen Ihrem Browser dabei, bestimmte Funktionen auszuführen, wie "
@@ -788,24 +647,24 @@ msgstr ""
 "die existierende Funktionen des Browsers verändern oder neue hinzufügen."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Übliche Plugins für %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Benutzer-Dokumentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -813,41 +672,37 @@ msgstr ""
 "müssen Sie diesem zustimmen:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Vorschaubilder für %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Neu hinzugefügt"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Bei der riesigen Auswahl an Add-ons ist sicher für jeden etwas dabei. Um den "
 "Einstieg zu erleichtern, haben wir eine Liste mit ein paar der beliebtesten "
 "Add-ons zusammengestellt. Viel Spaß!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Empfohlene Add-ons"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Empfohlene Add-ons"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Weiterführende Links"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Um weitere Suchmaschinen zu installieren, benötigen Sie einen Mozilla-"
@@ -862,42 +717,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Im %2$s erfahren Sie, wie Sie Ihr eigenes %1$s können."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "Suchmaschinen-Plugin erstellen"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Viele weitere Suchmaschinen können Sie auf %1$s finden."
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Suchmaschinen-Plugins"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Ein besonderes Dankeschön an das Mycroft-Projekt für seinen Beitrag zu den "
 "Firefox Suchmaschinen-Plugins."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Weiterempfehlen"
 
@@ -933,17 +789,17 @@ msgstr "Unvollständige Version"
 msgid "addons_status_nominated"
 msgstr "Im Sandkasten; Zur Veröffentlichung nominiert"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Im Sandkasten; Wartet auf Moderation"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Öffentlich"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Im Sandkasten"
@@ -952,37 +808,27 @@ msgstr "Im Sandkasten"
 msgid "addons_status_unknown"
 msgstr "Unbekannt"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Erfahren Sie mehr über dieses Add-on"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Am häufigsten heruntergeladen"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Am höchsten bewertet"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Seien Sie vorsichtig mit alten Versionen"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Diese Versionen werden als Referenz und zu Testzwecken auf dieser Seite "
 "angezeigt. Sie sollten jedoch stets die neueste Version eines Add-ons "
 "installieren."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Versionsgeschichte mit Entwickler-Kommentaren"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Versionsgeschichte von %1$s"
@@ -1017,426 +863,153 @@ msgstr "Gruppenadministrator"
 msgid "admin_group_saved"
 msgstr "Die Gruppe wurde gespeichert"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Erweiterte Suche"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Egal"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Egal"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Egal"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Anwendung"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Suchbegriff"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Letzte Aktualisierung"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Am neuesten"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "letzte 3 Wochen"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "letzte 6 Monate"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "innerhalb eines Tages"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "letzten Monat"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "letzte Woche"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "letztes Jahr"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "pro Seite"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Betriebssystem"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Downloads"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Bewertung"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sortieren nach"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "bis"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Die erweiterte Suche an-/ausschalten"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Typ"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "Version"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Nächste Seite"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Vorherige Seite"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Versionsüberprüfung nicht beachten"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Dieses Add-on ist für ältere Versionen von Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Sie können <a href=\"%1$s\">eine ältere Version versuchen</a> oder <a href="
 "\"#\" onclick=\"%2$s\">diese Überprüfung ignorieren</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Eine <a href=\"%1$s\">ältere Version</a> könnte funktionieren"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Dieses Add-on benötigt den noch nicht veröffentlichten <a href=\"%1$s"
 "\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Aktualisieren Sie Firefox</a>, um dieses "
 "Add-on zu verwenden"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s änderte den Status von %2$s zu %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s führte die unbekannte Admin-Aktion %2$s auf ID %3$s aus"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s entfernte Empfehlung %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s erstellte Anwendung %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s bearbeitete Anwendung %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s legte Version %2$s für %3$s an"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s löschte Version %2$s für %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s änderte Konfigurationseinstellung '%2$s' von '%3$s' nach '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s führte unbekannte Editor-Aktion %2$s auf ID %3$s aus"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s entfernte Add-on %2$s von der Liste der Empfehlungen"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s fügte Add-on %2$s zur Liste der Empfehlungen hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s änderte eine Empfehlung für die Sprache %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s änderte die Sprachen für das Add-on %2$s auf der Empfehlungsliste"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s berechnete den Hash neu für das Add-on %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s fügte %2$s zur Gruppe %3$s hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s fügte sich selbst zur Gruppe %2$s hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s legte die Gruppe %2$s an"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s löschte die Gruppe %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s editierte die Gruppe %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s entfernte %2$s von der Gruppe %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s führte die unbekannte Aktion %2$s auf %3$s aus"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s versuchte, die geschützte Gruppe %2$s zu verändern"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr ""
-"%1$s versuchte, Ãœbersetzungen in der Sprache %2$s ohne Berechtigung zu "
-"verändern"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s fügte Betriebssystem %2$s hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s löschte Betriebssystem %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s editierte Betriebssystem %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s loggte sich nicht korrekt erneut ein, um auf %2$s zuzugreifen."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s fügte Antwort %2$s hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s löschte Antwort %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s editierte Antwort %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s gab Bewertung %2$s frei"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s löschte Bewertung %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s führte unbekannte Sicherheits-Aktion %2$s auf ID %3$s aus"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s fügte Kategorie %2$s hinzu"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s löschte Kategorie %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s editierte Kategorie %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s veränderte die Anwendungs-Übersetzungen für %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s veränderte die Blog-Übersetzungen für %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s veränderte die Betriebssystem-Übersetzungen für %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s veränderte die Kategorie-Übersetzungen für %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s editierte die Benutzerdaten von Benutzer %2$s"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Add-ons nach Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Neueste Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Beliebte Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Add-ons nach Bewertung"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Aktualisierte Add-ons"
 
@@ -1445,799 +1018,106 @@ msgid "categories_current_title"
 msgstr "Aktuelle Kategorie"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategorien"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Wählen Sie eine Kategorie"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Alle %1$s anzeigen"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Die Beschreibung sollte nicht mehr als %1$s Zeichen lang sein."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Sammlung: %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Alle empfohlenen Add-ons"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Fehler beim Löschen des Add-ons!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Nach Bewertung"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Fehler beim Speichern des Add-ons!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Nach Aktualität"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Fehler beim Speichern des Kommentars!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Nach Beliebtheit"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Der Name sollte nicht mehr als %1$s Zeichen lang sein."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Alle %1$s anzeigen"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Liste nicht gefunden!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Wenn Sie bereits wissen, welche Add-ons Ihre Sammlung enthalten soll, geben "
-"Sie einfach deren Namen hier ein. Wenn Sie noch ein wenig warten möchten und "
-"Ihre Add-ons erst später hinzufügen wollen, klicken Sie einfach unten auf %1"
-"$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Wählen Sie Ihre ersten Add-ons"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Eine Sammlung anlegen"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Gewählte Add-ons"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"Ihre eigene Sammlung anzulegen ist ganz einfach. Füllen Sie einfach die "
-"folgenden, wenigen Felder aus."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Sammlung anlegen"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Sammlungen"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "mehr erfahren..."
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Zu Favoriten hinzufügen"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Als Favorit entfernen"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>Unten sehen Sie Ihre neue Sammlung. Wenn Sie der Sammlung einen Kurznamen "
-"geben möchten, ein Icon hochladen oder weitere Einstellungen ändern wollen, "
-"verwenden Sie bitte die Seite \"<a href=\"%1$s\">Sammlung bearbeiten</a>\"</"
-"p><p>Die neue Adresse Ihrer Sammlung ist: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Ihre Sammlung ist nun fertig!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Ãœber diese Sammlung"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in dieser Sammlung"
-msgstr[1] "%1$s Add-ons in dieser Sammlung"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Angelegt von:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Aktualisiert:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Zu Favoriten hinzufügen&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Aus Favoriten entfernen&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr ""
-"<a href=\"%1$s\">Loggen Sie sich ein</a>, um diese Sammlung zu Ihren "
-"Favoriten hinzuzufügen."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Sammlung bearbeiten"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Hinzugefügt am"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Beliebtheit"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s Download diese Woche"
-msgstr[1] "%1$s Downloads diese Woche"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Die gewählten Add-ons werden beim Speichern gelöscht"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"Um dieser Sammlung neue Add-ons hinzuzufügen, geben Sie deren Namen unten ein"
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"Um dieser Sammlung neue Add-ons hinzuzufügen, geben Sie eine komma-getrennte "
-"Liste von Add-on ID-Nummern ein."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Sie können Add-ons auch von deren Add-on-Infoseite aus hinzufügen."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Hinzugefügt am %1$s von %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Kommentar hinzufügen"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Kommentar entfernen"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Kommentar editieren"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Hinweis: Der Kommentar wird so aussehen, als sei er von dem veröffentlicht "
-"worden, der das Add-on dieser Sammlung hinzugefügt hat."
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Kommentar speichern"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Entfernen"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Zur Sammlung hinzufügen"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Verfügbarkeit prüfen"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Ja, ich möchte diese Sammlung löschen."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-"Setzen Sie den Haken, dann klicken Sie auf \"%1$s\" um diese Sammlung zu "
-"löschen."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Wenn Sie auf \"%1$s\" klicken, wird Ihre Sammlung gelöscht werden. Wenn Sie "
-"Ihre Sammlung nicht löschen möchten, entfernen Sie den Haken im Abschnitt \"%"
-"2$s\" und fahren Sie mit dem Bearbeiten Ihrer Sammlung fort. Wenn Sie diese "
-"Seite verlassen, ohne zu speichern, so wird Ihre Sammlung ebenfalls nicht "
-"gelöscht."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Ihre Sammlung ist zum Löschen markiert!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Sie müssen eine Beschreibung für Ihre Sammlung eingeben."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Beim Hochladen Ihres Icons ist ein Fehler aufgetreten."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Sie müssen Ihrer Sammlung einen Namen geben."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr ""
-"Wenn Sie Ihrer Sammlung einen Spitznamen geben, so darf er noch nicht "
-"vergebensein."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on-Name:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Zugeordnete Anwendung"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Wählen Sie die Anwendung, die Ihre Sammlung unterstützt."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Sammlungs-Typ"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Sammlung löschen"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Das Löschen Ihrer Sammlung kann nicht rückgängig gemacht werden."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Beschreibung der Sammlung"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr ""
-"Beschreiben Sie Ihre Sammlung kurz nennen Sie, welche Art Add-ons sich darin "
-"befindet."
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"Sie können ein Icon im JPG-, GIF- oder PNG-Format hochladen. Es wird auf die "
-"Größe 32x32 Pixel skaliert werden."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Wer kann Ihre Sammlung ansehen?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"Standardmäßig erscheinen Sammlungen im öffentlichen Verzeichnis von "
-"Sammlungen und können von jedermann gesehen werden. Wenn Sie den Zugriff auf "
-"Ihre Sammlung nur auf die Leute beschränken möchten, denen Sie einen "
-"speziellen Link geben, so treffen Sie unten die entsprechende Auswahl."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Nur Leute, die ich einlade, können meine Sammlung sehen"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Jedermann kann meine Sammlung im Verzeichnis sehen"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Wer kann Ihre Sammlung bearbeiten?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Diese Benutzer können Add-ons zu Ihrer Sammlung hinzufügen, alle dort "
-"enthaltenen Add-on-Einträge bearbeiten, alle Einstellungen der Sammlung "
-"verändern, sowie weiteren Benutzern Zugriff darauf verschaffen."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Name der Sammlung"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Geben Sie Ihrer Sammlung einen erläuternden Namen, wie zum Beispiel "
-"\"Daniels Liste von Reise-Add-ons\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Spitzname der Sammlung"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-"Optional können Sie Ihrer Sammlung einen Spitznamen geben, um auf diese "
-"bequemer zugreifen zu können:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Wer kann Ihrer Sammlung Add-ons hinzufügen?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Diese Benutzer können Ihrer Sammlung Add-ons hinzufügen und nur diejenigen "
-"Add-ons wieder entfernen, die sie selbst hinzugefügt haben."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr ""
-"Geben Sie eine E-Mail-Adresse an, die einem Benutzerkonto bei Firefox Add-"
-"ons entspricht:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Ausgewählte Benutzer werden beim Speichern aus der Liste gelöscht."
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Geben Sie eine durch Kommata getrennte Liste von E-Mail-Adressen ein, die "
-"einem Benutzerkonto bei Firefox Add-ons entsprechen."
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Nur ich selbst"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Ich und folgende Benutzer:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Hinzufügen"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "%1$s bearbeiten"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Inhalt der Sammlung bearbeiten"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Gegenwärtig enthaltene Add-ons:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Besondere Einstellungen"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Zugriffsrechte bearbeiten"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Abbrechen"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Icon löschen"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Icon ersetzen"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Das Icon wird entfernt werden, wenn Sie auf \"%1$s\" klicken"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Spitzname verfügbar"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Ihr Spitzname enthielt ungültige Zeichen und wurde angepasst. Bitte "
-"versuchen Sie es erneut."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Spitzname bereits vergeben"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Ihre Sammlung kann unter der folgenden Adresse abgerufen werden:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Ihre Sammlung wurde erfolgreich gespeichert!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Sammlung speichern"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Sammlung löschen"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Sonstiges"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Zugriffsrechte"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Achten Sie auf Ihre Kinder und auf Ihren Kalender"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Familie"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Probieren Sie den Add-on-Sammler aus"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Eine Sammlung anlegen"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Los"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>Sie haben noch keine Sammlungen zu Favoriten erklärt.</strong></"
-"p> <p>Auf Sammlungen, die Sie als Favoriten markieren, können bequem von "
-"dieser Seite aus zugreifen, und sie werden im <a href='%1$s'>Add-on-Sammler</"
-"a> angezeigt, falls Sie ihn installiert haben.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>Sie haben noch keine Sammlungen angelegt. Es ist ganz einfach, Sammlungen "
-"zu erstellen und sie mit Ihren Lieblings-Add-ons zu füllen. <a href=\"%1$s"
-"\">Versuchen Sie's!</a></p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Sammlungen"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on-Sammler"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "erstellt von %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Was sind Sammlungen?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sortieren nach"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Empfohlene Sammlungen"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Meine Favoriten"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Eigene Sammlungen"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Beliebte Sammlungen"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Am beliebtesten aller Zeiten"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Am beliebtesten diesen Monat"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Neueste"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Am beliebtesten diese Woche"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Sammlungen sind ein neuer Weg für Sie, Ihre Lieblings-Add-ons zu verwalten "
-"und neue Add-ons zu entdecken. Kommentieren Sie Sammlungen, empfehlen Sie "
-"sie weiter und bleiben Sie stets auf dem Laufenden, alles direkt von Ihrem "
-"Browser aus."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"Sammlungen sind Gruppen von Add-ons, die zum einfachen Verteilen gebündelt "
-"werden."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Hinzugefügt am %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Recherchieren Sie online, was auch immer Sie möchten"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Recherchieren"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Verwalten Sie Ihr Sozialnetzwerk"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Sozial"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Schließen"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"Beim Speichern der Sammlung als Favoriten ist ein Fehler aufgetreten. Ist "
-"diese Sammlung bereits ein Favorit?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Diese Nachricht nicht erneut anzeigen."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s wurde zu Ihren Favoriten hinzugefügt."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"Sie können diese Sammlung nun ganz schnell im Abschnitt <a href=\"%1$s\">%2"
-"$s</a> des Verzeichnisses finden. Um Ihre Sammlungen noch leichter zu "
-"verwalten, versuchen Sie doch einmal die Erweiterung <a href=\"%3$s\">Add-on-"
-"Sammler</a> für Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Diese Sammlung wurde gelöscht."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Planen Sie Geschäftsreisen und unvergessliche Urlaube"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Reisen"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Auto-Veröffentlichung"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Empfohlen"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"Beim Entfernen dieser Sammlung aus den Favoriten ist ein Fehler aufgetreten. "
-"Ist diese Sammlung bereits kein Favorit mehr?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s wurde aus Ihren Favoriten entfernt."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Bauen Sie eine perfekte Webseite"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Web-Entwicklung"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Was sind Sammlungen?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Häufige Fragen lesen"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Sammlungen sind ein neuer Weg für Sie, Ihre Lieblings-Add-ons zu verwalten "
-"und neue Add-ons zu entdecken. Kommentieren Sie Sammlungen, empfehlen Sie "
-"sie weiter und bleiben Sie stets auf dem Laufenden, alles direkt von Ihrem "
-"Browser aus."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Add-on-Sammler Homepage"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Laden Sie den Add-on-Sammler herunter:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo des Add-on-Sammlers"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Add-on Kompatibilitäts-Zentrum"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Freuen Sie sich auf das Release von %1$s, mit den folgenden Werkzeugen und "
 "Informationen exklusiv für die %2$s Add-ons Community."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Daten werden geladen..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Zurück zur Hauptseite"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Add-on-Kompatibilitäts-Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informationen für Add-on-Entwickler"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "maxVersion anpassen ohne Hochladen"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Status meiner Add-ons prüfen"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Wenn Sie Add-ons auf Mozilla Add-ons besitzen, <a href=\"%1$s\">loggen Sie "
 "sich bitte ein</a>, um den Status Ihrer Add-ons für %2$s zu sehen."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Sie haben keine Add-ons auf Mozilla Add-ons hochgeladen."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Ergebnisse der Add-on-Statusprüfung"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Status Ihrer Add-ons wird geladen..."
 
@@ -2245,120 +1125,120 @@ msgstr "Status Ihrer Add-ons wird geladen..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s Benutzer (%3$s&#37; von allen)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Die folgenden Add-ons machen 95% der Add-on-Benutzung aus, die Mozilla "
 "bekannt ist. Sie sind nach ihrer Benutzungsmenge sortiert."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Detailierten Report anzeigen"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Von den %1%s Add-ons, die 95&#37; der Add-on-Benutzung ausmachen, die "
 "Mozilla bekannt ist, sind <b>%2$s&#37;</b> gegenwärtig mit den jüngsten "
 "Versionen von %3$2 kompatibel."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha-Versionen"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons, die mit einer Alpha-Version von %1$s kompatibel sind"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Beta-Versionen"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons, die mit einer Beta-Version von %1$s kompatibel sind"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Neueste Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons, die mit den neuesten Versionen von %1$s kompatibel sind"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Andere Versionen"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons, die mit keiner Version von %1$s kompatibel sind"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Add-on-Kompatibilitäts-Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informationen für Add-on-Benutzer"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Kompatibilitäts-Report anzeigen"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr ""
 "Wenn Sie auch einen Beitrag leisten möchten, sehen Sie sich diese %s an."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki-Seite"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla dankt den folgenden Personen für Ihre Beiträge zum addons.mozilla."
 "org-Projekt im Laufe der Jahre:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Entwickler"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Moderatoren"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Ãœbersetzer"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Andere Helfer"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Ehemalige Entwickler"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software and Bilder"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Einige Icons stammen aus der <a href=\"http://www.famfamfam.com/lab/icons/"
@@ -2366,7 +1246,7 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/deed.de\">Creative Commons "
 "Attribution 2.5 Lizenz</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
 "Manche Seiten verwenden Elemente von <a href=\"http://www.simile-widgets.org/"
@@ -2376,20 +1256,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e.%m.%Y"
 
@@ -2424,25 +1301,25 @@ msgstr "Statistiken"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr ""
 "Die Datei %1$s hat eine ungültige Erweiterung (%2$s). Erlaubte "
 "Erweiterungen: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr ""
 "Die Datei %s konnte nicht gespeichert werden. Bitte versuchen Sie es erneut."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Vorschau %1$s wurde erfolgreich durch die Datei %2$s ersetzt."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr ""
 "Die Datei %s wurde erfolgreich hochgeladen. Sie können nun eine Beschreibung "
@@ -2452,6 +1329,19 @@ msgstr ""
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(automatisch)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Diese Version Ihres Add-ons ist nicht mit Firefox %1$s kompatibel. Mozilla "
+"wird bald die nächste Version von Firefox herausgeben. Testen Sie daher "
+"bitte Ihr Add-on mit der neuen Version und aktualisieren Sie dann die "
+"Kompatibilitäts-Informationen. Sie können mehr darüber erfahren, wenn Sie <a "
+"href=\"%2$s\">hier</a> klicken. Dies ist nur ein Hinweis und Sie können "
+"damit fortfahren, diese Version zu addons.mozilla.org hochzuladen."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Öffnet in einem neuen Fenster"
@@ -2488,66 +1378,131 @@ msgstr "Schritt 5: Erfolreicher Abschluss"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ãœbermittlungshilfe"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on wurde erfolgreich deaktiviert"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Add-on bearbeiten"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on wurde erfolgreich aktiviert"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on-Beschreibung"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "Endbenutzer-Lizenzerklärung"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on-Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on-Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Vorschauuntertitel"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Datenschutzerklärung"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on-Zusammenfassung"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support-E-Mail"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support-URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Versionshinweise"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Add-on nominieren"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on wurde erfolgreich nominiert!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Aktivieren"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Aktivieren Sie Ihr Add-on, damit es auf öffentlichen Bereichen der Seite "
 "angezeigt wird, und damit Benutzer automatisch Updates erhalten können."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Add-on vervollständigen"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Vervollständigen Sie Ihr Add-on und bringen Sie es in den Sandkasten"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Deaktivieren"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Deaktivieren Sie Ihr Add-on, um es von öffentlichen Bereichen der Seite "
 "verschwindet, und damit Benutzer keine Updates mehr erhalten."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "In den Sandkasten"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr ""
 "Schicken Sie Ihr Add-on zurück in den Sandkasten. Dies kann rückgängig "
 "gemacht werden."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Zur Veröffentlichung nominieren"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominieren Sie Ihr Add-on für die Veröffentlichung"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Veröffentlichen"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Veröffentlichen Sie Ihr Add-on erneut."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
 "Ihr Add-on ist <span class=\"inactive-0\">aktiv</span>. Das bedeutet, dass "
@@ -2565,8 +1520,8 @@ msgstr ""
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
 "Sie können Ihr Add-on nun vervollständigen und es in den <span class="
-"\"status-1\">Sandkasten</span> bewegen, indem Sie auf die unten stehende "
-"Schaltfläche klicken."
+"\"status-1\">Sandkasten</span> bewegen, indem Sie die unten stehende Taste "
+"drücken."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2580,14 +1535,20 @@ msgstr "Add-on-Beschreibung benötigt"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on-Name benötigt"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Add-on ist nicht als Testversion markiert."
+msgstr "Add-on ist als Testversion markiert."
 
 #: views/developers/addon_status.thtml:119
 msgid "devcp_addon_status_criteria_preview"
 msgstr "Erweiterungen und Themes müssen mindestens ein Vorschaubild haben."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr ""
+"Ihr Add-on benötigt mehrer Benutzer-Bewertungen (diese dürfen auch externe "
+"Webadressen sein)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Add-on-Zusammenfassung benötigt"
@@ -2597,12 +1558,12 @@ msgstr "Add-on-Zusammenfassung benötigt"
 msgid "devcp_addon_status_header"
 msgstr "Add-on-Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Verfügbare Aktionen"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Aktivitäts-Status: <span class=\"inactive-0\">Aktiv</span>"
 
@@ -2610,7 +1571,7 @@ msgstr "Aktivitäts-Status: <span class=\"inactive-0\">Aktiv</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Kriterien zur Vervollständigung"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Aktivitäts-Status: <span class=\"inactive-1\">Deaktiviert</span>"
 
@@ -2618,11 +1579,11 @@ msgstr "Aktivitäts-Status: <span class=\"inactive-1\">Deaktiviert</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Kriterien zur Veröffentlichung"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Vertrauens-Status: <span class=\"status-4\">Vertraut</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
 "Ihr Add-on ist <span class=\"inactive-1\">deaktiviert</span>. Das bedeutet, "
@@ -2630,17 +1591,17 @@ msgstr ""
 "genannten Status. Benutzer des Add-ons erhalten <strong>keine</strong> "
 "automatischen Updates."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Bitte erfüllen Sie die oben genannten Kriterien, bevor Sie Ihr Add-on für "
 "die <span class=\"status-4\">Veröffentlichung</span> nominieren."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 "Sie können Ihr Add-on nun für die <span class=\"status-4\">Veröffentlichung</"
-"span> nominieren, indem Sie auf die unten stehende Schaltfläche klicken."
+"span> nominieren, indem Sie die unten stehende Taste drücken."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2673,8 +1634,8 @@ msgstr ""
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
 "Ihr Add-on ist gegenwärtig zur <span class=\"status-4\">Veröffentlichung</"
-"span> nominiert und wartet auf die Bewertung durch einen Moderator. Zurzeit "
-"warten noch %s weitere Add-ons auf eine Bewertung."
+"span> nominiert und wartet auf die Bewertung durch einen Moderator. Im "
+"Moment warten noch %s weitere Add-ons auf eine Bewertung."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
@@ -2709,13 +1670,125 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "Status von %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Ihrem Add-on wird <span class=\"status-4\">vertraut</span>. Das bedeutet, "
 "Sie können Updates für Ihr Add-on übermitteln ohne die Bewertung eines "
 "Moderators."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Besuchen Sie die %1$s-Seite, um Änderungen an Ihrer Übermittelung "
+"vorzunehmen, oder klicken Sie %2$s um zur Übersichtsseite für Entwickler "
+"zurückzukehren."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "hier"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Add-on bearbeiten"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Diese Version wurde im Sandkasten gespeichert und wartet dort auf "
+"Bewertungen von Sandkastentestern und auf die Untersuchung durch einen "
+"Moderator. Ãœber den Abschluss dieses Prozesses werden Sie per E-Mail "
+"informiert."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "%s können Sie mehr über das Sandkastenprinzip zur Bewertung erfahren."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "Hier"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Diese Version wurde im Sandkasten für erfahrere Benutzer gespeichert. Um sie "
+"in den öffentlichen Seiten anzuzeigen, müssen Sie die Version für einen "
+"Moderationsprozess %s."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominieren"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Die Ãœbermittelung Ihres Add-ons wurde erfolgreich abgeschlossen."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Da Ihrem Add-on vertraut wird, wurde es automatisch für die öffentlichen "
+"Seiten genehmigt."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Add-on hochladen"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on wurde erfolgreich aktualisiert"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"Sie möchten vielleicht %s, um das Interesse an Ihrem Add-on zu steigern."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "eine Vorschau hochladen"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Kein weiterer Entwickler [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Löschen"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Abbrechen"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Sind Sie sicher, dass Sie ihre Ãœbermittelung abbrechen wollen?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Weiter"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Add-on-Typ ändern:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Entwicklerkommentare aktualisiert."
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "Aktiv"
@@ -2781,36 +1854,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Neue Version hochladen"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr ""
 "Die Vorschau Nummer %s konnte nicht aus der Datenbank gelöscht werden. Bitte "
 "versuchen Sie es erneut."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Die Vorschau Nummer %s wurde erfolgreich gelöscht."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr ""
 "Sie haben nicht das die Berechtigung dazu, Versionen oder Dateien zu löschen."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s Datei ist %2$s"
 msgstr[1] "%1$s Dateien sind %2$s"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Vorschau hinzufügen"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Entwickler"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Entwickler"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Keine"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategorien"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategorie"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Beschreibung"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Deaktiviert"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Entwicklerkommentare"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Vorschaubilder"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versionen"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Keine"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Kein Untertitel"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Keine Vorschaubilder gefunden."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Aktualisieren"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Support-E-Mail"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Dieser Entwickler hat keine Support-E-Mail-Adresse hinterlegt."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Support-URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Dieser Entwickler hat keine Support-URL hinterlegt."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Vertraut"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Keine Versionen gefunden."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Abbrechen und zurück"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Ja, Add-on deaktivieren"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Sind Sie sicher, dass Sie dieses Add-on deaktivieren möchten?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Das Deaktivieren dieses Add-ons lässt es nicht mehr in Suchergebnissen und "
+"den Auflistungen erscheinen. Es wird sich nicht von der Webseite "
+"herunterladen lassen und installierte Versionen bei den Benutzern erhalten "
+"keine Updates mehr. Das entspricht einem Löschen mit der Einschränkung, dass "
+"Sie es jederzeit hier wieder aktivieren können."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Deaktivieren von %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Ja, aktiviere es"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Sind Sie sicher, dass Sie dieses Add-on aktivieren wollen?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Das Aktivieren dieses Add-ons lässt es in den Suchergebnisen und den "
+"Auflistungen erscheinen. Es wird sowohl über die Webseite als auch über "
+"Updates herunterladbar sein."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Aktivierne von %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Einen Kommentar schreiben"
@@ -2857,54 +2074,66 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "geschrieben von %1$s am %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Entwickler hinzufügen"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "E-Mail-Adresse des Entwicklers"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Löschen"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Einen neuen Autor hinzufügen"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Autor hinzufügen"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "E-Mail-Adresse des Autors:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "E-Mail-Adresse wird geprüft..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr ""
 "Klicken Sie unten auf \"aktualisieren\", um die Liste der Autoren zu "
 "speichern."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Aktuelle Autoren"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Add-on-Autoren bearbeiten"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "Als Autor auf den öffentlichen Seiten anzeigen"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Entwickler</strong> - Kann alle Aspekte eines Add-ons verändern, "
 "außer dem Hinzufügen oder Löschen anderer Autoren."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Eigentümer</strong> - Kann alle Aspekte eines Add-ons verändern, "
 "inklusive dem Hinzufügen und Löschen anderer Autoren."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 "<strong>Beobachter</strong> - Kann Entwickler-Informationen und Statistiken "
@@ -2915,26 +2144,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Wählen Sie eine Rolle für diesen Autor aus:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Autor"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Angezeigt"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Rolle"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Aktualisieren"
 
@@ -3006,19 +2235,19 @@ msgstr ""
 "Ändern des Namens, der Homepage, des Icons und anderer Einstellungen Ihres "
 "Add-ons."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Beschreibungen ändern"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Bitte korrigieren Sie die Fehler, die oben in rot angezeigt werden."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Beschreibungen des Add-ons ändern"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 "Jede Information, die Endbenutzer möglicherweise wissen möchten, die aber "
@@ -3027,11 +2256,11 @@ msgstr ""
 "Informationen zum Melden von gefundenen Fehlern, der beabsichtigte "
 "Erscheinungstermin der nächsten Add-on-Version, und ähnliches."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Entwickler-Kommentare"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 "Die Beschreibung Ihres Add-ons ist eine längere Erklärung seiner "
@@ -3039,11 +2268,11 @@ msgstr ""
 "unterhalb der Zusammenfassung auf der öffentlichen Seite Ihres Add-ons "
 "angezeigt."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on-Beschreibung"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 "Wenn Ihr Add-on einen Endbenutzer-Lizenzvertrag (EULA) besitzt, dann geben "
@@ -3052,21 +2281,21 @@ msgstr ""
 "Achtung: Ein Endbenutzer-Lizenzvertrag ist nicht dasselbe wie eine Code-"
 "Lizenz, also etwa GPL oder MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Endbenutzer-Lizenzvertrag"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "Wenn Ihr Add-on eine Datenschutzerklärung hat, geben Sie sie bitte hier ein. "
 "Auf der Webseite Ihres Add-ons wird ein Link darauf erscheinen."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Datenschutzerklärung"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 "Die Zusammenfassung ist eine kurze Erklärung zur grundsätzlichen "
@@ -3074,7 +2303,7 @@ msgstr ""
 "Add-on-Listen angezeigt, außerdem oben auf der Webseite Ihres Add-ons. "
 "<strong>Höchstens 250 Zeichen.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on-Zusammenfassung"
 
@@ -3094,39 +2323,101 @@ msgstr "Add-on-Beschreibungen bearbeiten"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Add-on-Eigenschaften bearbeiten"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Keine Kategorien verfügbar für diesen Add-on-Typ"
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Unvollständige Übermittlung"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Keine Datei hochgeladen"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Maximale Dateigröße überschritten"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Entwickler"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Symbol hinzufügen"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Symbol ändern"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Den Benutzern das Betrachten des Quelltextes online erlauben."
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategorien"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Standard-Sprache"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Dieses Add-on benötigt externe Software."
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Nur bestehendes Symbol löschen"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Neue Symboldatei"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Symbol"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Weiterer Hinweis"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Dies ist keine Endversion"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Dies ist ein seitenabhängiges Add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Zielsprache"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "kurzer weiterer Hinweis (etwa Name des Dialekts)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Eigenschaften bearbeiten"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Ändern Sie dies nur, falls Sie sich aller Konsequenzen bewusst sind."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Aktuelles Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 "Die Standard-Sprache eines Add-ons ist seine Haupt-Ãœbersetzung. Falls eine "
@@ -3134,63 +2425,63 @@ msgstr ""
 "Benutzers nicht verfügbar ist, so wird ihm stattdessen die Übersetzung in "
 "der hier gewählen Sprache angezeigt."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr ""
 "Diese Eigenschaften werden verwendet, um Add-ons zu filtern und zu "
 "klassifizieren."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 "Die GUID Ihres Add-ons wird in der Datei install.rdf festgelegt und "
 "identifiziert das Add-on eindeutig. Sie können die GUID eines Add-ons nicht "
 "mehr ändern, wenn es einmal zu Mozilla Add-ons übermittelt wurde."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Add-on-Eigenschaften bearbeiten"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on-Typ"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin-Einstellungen"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Standard-Sprache"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on-Markierungen"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on-GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on-Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Andere Einstellungen"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Vertrautes Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Quellcode online anzeigen"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 "Das Add-on-Icon ist ein kleines Bild, das neben dem Namen Ihres Add-ons in "
@@ -3199,48 +2490,48 @@ msgstr ""
 "die Größe 32x32 Pixel skaliert. Bitte verwenden Sie einen der folgenden "
 "Dateitypen: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Dieses Add-on enthält binäre Komponenten"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Nicht vertraut"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Vertraut"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Neues Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Icon entfernen"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 "Wenn Ihr Add-on noch über eine weitere Homepage verfügt, geben Sie diese "
 "Adresse bitte hier ein. Das Hinzufügen weiterer Übersetzungen ist nicht "
 "notwendig, es sei denn Ihre Webseite ist in verschiedene Sprachen übersetzt."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on-Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr ""
 "Der Name Ihres Add-ons wird überall angezeigt, wo Ihr Add-on dargestellt "
 "wird."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on-Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 "Wenn Sie E-Mail-Adressen haben, an die Support-Anfragen gerichtet werden "
@@ -3248,45 +2539,55 @@ msgstr ""
 "ist nicht notwendig, es sei denn Sie haben unterschiedliche E-Mail-Adressen "
 "für unterschiedliche Sprachen."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support-E-Mail-Adresse"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 "Wenn Ihr Add-on eine Support-Webseite oder ein Benutzerforum hat, geben Sie "
 "diese Adresse hier ein. Das Hinzufügen weiterer Übersetzungen ist nicht "
 "notwendig, es sei denn Ihre Webseite ist in verschiedene Sprachen übersetzt."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support-Webseite"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr ""
 "Vertraute Add-ons können ohne Moderator-Bewertung öffentlich gemacht werden."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Das Icon wird gelöscht, wenn Sie nun speichern. <a %s>Abbrechen?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "Wenn Sie die Anzeige des Quellcodes Ihrer Add-on-Dateien zulassen, so kann "
 "jeder eingeloggte Benutzer sie online ansehen."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Online-Anzeige des Quellcodes zulassen"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Online-Anzeige des Quellcodes nicht zulassen"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Aktualisieren"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names"
+"\">Standardisierter Sprachcode</a>, wie zum Beispiel 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Autoren"
@@ -3362,14 +2663,70 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Ein wartendes Update"
 msgstr[1] "Wartende Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Ausgewählte Dateien werden gelöscht."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Dateien"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Für folgende Anwendungen"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Keine Dateien."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Hinweise an die Moderatoren"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Ãœbermitteln"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Sie haben keine Zugriff auf dieses Add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Zusammenfassungen dürfen höchstens 250 Zeichen umfassen.\n"
+"(Sie haben %s eingegeben.)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Der Name für Ihr Add-on existiert bereits in der Datenbank. Gehen Sie "
+"sicher, dass: <br /><li>die GUID gegenüber der Vorgängerversion nicht "
+"verändert wurde. Die häufigste Fehlerursache sind unterschiedliche GUIDs.</"
+"li><li>Sie nicht einen doppelten Eintrag in der Datenbank haben. Falls doch, "
+"so aktualisieren Sie bitte diesen Eintrag oder löschen ihn und versuchen es "
+"erneut.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3383,9 +2740,11 @@ msgstr "Bitte beachten Sie auch %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "diese Seite"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Ihr Add-on muss mindestens einen Eigentümer haben."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Bitte beschreiben Sie die in dieser Add-on-Aktualisierung gemachten "
+"Änderungen."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3403,6 +2762,10 @@ msgstr ""
 "Diese Dateinamen-Erweiterung (%s) ist für diesen Add-on-Typ nicht zulässig. "
 "Bitte benutzen Sie eine der folgenden Erweiterungen: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nicht alle GUIDs stimmen überein."
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Bitte wählen Sie nicht mehr als fünf Kategorien aus."
@@ -3437,7 +2800,16 @@ msgstr ""
 "Diese Dateinamen-Erweiterung (%s) ist für ein Icon nicht erlaubt. Bitte "
 "verwenden Sie eine der folgenden: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Eine identische Version (%s) existiert bereits für dieses Add-on und diese "
+"Betriebssystemart."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Keine install.rdf gefunden."
 
@@ -3445,9 +2817,9 @@ msgstr "Keine install.rdf gefunden."
 msgid "devcp_error_install_manifest"
 msgstr "Die folgenden Fehler wurden in der Datei install.rdf gefunden:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "Die ID dieses Add-ons ist ungültig: %s"
+msgstr "Bitte wählen Sie einen Add-on-Typ."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3518,6 +2890,19 @@ msgstr "Die Datei install.rdf enthielt keine ID für dieses Add-on."
 msgid "devcp_error_no_platform"
 msgstr "Kein Betriebssystem gewählt"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Für die Nominierung müssen Sie die geforderten Details angeben."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Sie können keine Testversion eines Add-ons nominieren."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Sie können nur Add-ons nominieren, die sich momentan im Sandkasten befinden."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Bitte wählen Sie mindestens eine Kategorie aus."
@@ -3535,6 +2920,16 @@ msgstr ""
 "Diese Dateinamen-Erweiterung (%s) ist für eine Vorschau nicht erlaubt. Bitte "
 "verwenden Sie eine der folgenden: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Beim Speichern Ihrer Daten trat ein Fehler auf."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Sie haben keine Berechtigung dieses Add-on zu aktualisieren."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3547,84 +2942,280 @@ msgstr ""
 "Add-ons dürfen keine externe updateURL verwenden. Bitte entfernen Sie diese "
 "aus der Datei install.rdf und versuchen Sie es erneut."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Bitte laden Sie eine Datei hoch."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Datei für andere Betriebssystemart hinzufügen"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Entwickler hinzufügen"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Löschen"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Kategorien für Ihr Add-on werden im nächsten Schritt verfügbar sein."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Für diesen Add-on-Typ sind keine Kategorien verfügbar."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Bitte fügen Sie eine Beschreibung Ihres Add-ons ein."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Bitte geben Sie den Namen Ihres Add-ons ein."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Bitte wählen Sie den Add-on-Typ Ihrer Übermittelung."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Bitte geben Sie eine Zusammenfassung über Ihr Add-on an."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on-Datei"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on-Datei 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on-Datei 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Add-on-Typ"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Den Benutzern die Betrachtung des Quelltexts online erlauben"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "E-Mail-Adresse des Entwicklers"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Entwickler"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategorien"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Standard-Sprache"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Beschreibung"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Endbenutzer-Lizenzvertrag (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Dieses Add-on benötigt externe Software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Dateien"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Symboldatei"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Unterstützte Betriebssystemarten"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Dies ist keine Endversion"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Datenschutzerklärung"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Dies ist ein seitenabhängiges Add-on"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Zusammenfassung"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Support-E-Mail"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Support-URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Für folgende Anwendungen"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Versionshinweise"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Keine"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Hinweise an die Moderatoren"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Da Ihrem Add-on vertraut wird, wählen Sie bitte, wohin Ihr Add-on "
+"übermittelt werden soll:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Öffentliche Seiten"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandkasten"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Einverständniserklärung der Entwickler"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Schritt 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Datei hochladen"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Schritt 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on-Details"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Schritt 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Versionsdetails"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Schritt 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Ãœbersetzung"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Schritt 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Die Ãœbermittelung Ihres Add-ons wurde erfolgreich abgeschlossen."
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Meine Add-ons"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "Datei hochladen"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Abbrechen"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
-msgstr ""
-"Bitte geben Sie die E-Mail des Benutzers ein, den Sie hinzufügen möchten."
+msgstr "Bitte geben Sie die E-Mail des Benutzers ein, den Sie hinzufügen möchten."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "Nach unten"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "Nach oben"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "Anwendungs-Kompatibilität entfernen"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "Autor auf öffentlichen Seiten anzeigen"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Bitte wählen Sie eine Lizenz aus."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Bitte geben Sie einen Text für Ihre Lizenz ein."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Entwickler"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Eigentümer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Beobachter"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Autor entfernen"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
-msgstr ""
-"Sind Sie <strong>sicher</strong>, dass Sie diesen Autor entfernen möchten?"
+msgstr "Sind Sie <strong>sicher</strong>, dass Sie diesen Autor entfernen möchten?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "Sie müssen eine Datei auswählen, um sie hochzuladen."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Benutzerdefinierte Lizenz für Add-on %1$s Version %2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Ãœbersetzte Felder"
@@ -3640,12 +3231,12 @@ msgstr ""
 "Ãœbersetzung vorhanden ist, so wird die Standard-Sprache (%s) angezeigt."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Adminwerkzeuge"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Moderatorenwerkzeuge"
 
@@ -3654,28 +3245,28 @@ msgid "devcp_myaddons_link"
 msgstr "Meine Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Zurück zur Hauptseite"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistische Auswertung"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Add-on hochladen"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Entwickler"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 "Diese Add-on-ID (%1$s) existiert bereits in der Datenbank. Falls dies Ihr "
@@ -3686,26 +3277,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Abbrechen und zurückkehren"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Zurück zu den Add-on-Details"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s nominieren"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatisch erkannter Add-on-Typ: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>Eine oder mehrere Ihrer Änderungen konnten nicht gespeichert werden.</"
 "span><br />Bitte sehen Sie sich die unten stehenden Fehler an. Der Rest "
 "Ihrer Änderungen wurde erfolgreich gespeichert."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3719,6 +3321,18 @@ msgstr ""
 "Das Löschen dieser Grafik als Standardvorschau führt automatisch zur "
 "Ernennung einer anderen Vorschau als Standardvorschau."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Die Standard-Sprache dieses Add-ons (%1$s [%2$s]) unterscheidet sich von "
+"Ihrer momentan ausgewählten Sprache (%3$s [%4$s]). Diese Felder sollte in %1"
+"$s ausgefüllt werden."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3726,13 +3340,13 @@ msgstr ""
 "Die Ernennung dieser Grafik zur Standardvorschau entfernt den Status der "
 "Standardvorschau von der derzeitigen Standardvorschau."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Es sind noch nicht alle Änderungen gespeichert."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3761,49 +3375,49 @@ msgstr "Vorschau bearbeiten"
 msgid "devcp_preview_updated_successfully"
 msgstr "Vorschau erfolgreich aktualisiert."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Vorschaubild hinzufügen"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Vorschaubild löschen"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Vorschaubild ersetzen"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Vorschaubilder aktualisieren"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Ein neues Vorschaubild hinzufügen"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 "Wählen Sie bitte ein Bild aus, um es hochzuladen. Bilder, die breiter als "
 "700 oder höher als 525 Pixel sind, werden automatisch verkleinert. Erlaubte "
 "Dateitypen: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr ""
 "Klicken Sie auf \"Vorschaubilder aktualisieren\", um das Hochladen zu "
 "starten."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 "Klicken Sie auf den Knopf \"Vorschaubilder aktualisieren\", um das Bild zu "
 "speichern. (<a %s>Abbrechen?</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 "Dieses Vorschaubild wird gelöscht, wenn Sie auf \"Vorschaubilder "
@@ -3820,7 +3434,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Vorschau hinzufügen"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Beschreibungstext"
 
@@ -3828,7 +3442,7 @@ msgstr "Beschreibungstext"
 msgid "devcp_previews_header_edit"
 msgstr "Vorschau bearbeiten"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Standard-Vorschaubild"
 
@@ -3840,24 +3454,24 @@ msgstr "Vorschaudatei"
 msgid "devcp_previews_label_makedefault"
 msgstr "Diese Grafik zur Standardvorschau machen."
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Neues Bild:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Bild hochladen: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr ""
 "Mindestens eines Ihrer neuen Vorschaubilder konnte nicht gespeichert werden."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Ihre Vorschaubilder wurden erfolgreich aktualisiert."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 "Die Vorschaubilder für Ihr Add-on werden unten angezeigt. Dort können Sie "
@@ -3880,16 +3494,24 @@ msgstr "Vorschau bearbeiten"
 msgid "devcp_previews_submit_upload"
 msgstr "Vorschau hochladen"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniaturbild"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "Vorschaubilder für %s"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Falsch?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Sind Sie sicher, dass Sie diese Datei löschen möchten?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Bitte lesen und akzeptieren Sie die folgende Einverständniserklärung für "
@@ -3902,7 +3524,7 @@ msgstr ""
 "Veränderungen vorzunehmen.</span><br />Kontaktieren Sie bitte den Eigentümer "
 "des Add-ons, wenn Sie hier etwas verändern müssen."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 "Achtung: Bei manchen Veränderungen kann es bis zu wenigen Stunden dauern, "
@@ -3912,6 +3534,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Ãœbersicht"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Die Überarbeitung meiner derzeitigen Add-on-Informationen überspringen"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4006,54 +3632,101 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on-Nominierung"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Das Ãœbermitteln von Add-ons ist momentan deaktiviert. Bitte versuchen Sie es "
+"später noch einmal."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Ich akzeptiere"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Ich lehne ab"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Dieses Add-on wurde von einem Administrator deaktiviert."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Deaktiviert"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Vertraut"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Neueste Version:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr ""
+"Sie besitzen keine Add-ons. Klicken Sie %s um eine Erweiterung hochzuladen."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "hier"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Bitte stellen Sie sicher, dass Sie %s für Ihr Theme hochladen."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "eine Vorschau"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "%s bearbeiten"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Hilfe (verlässt die Seite nicht)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Hilfe"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Buchstaben: %1$s von %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Sind Sie sicher, dass Sie diese Übersetzung löschen möchten?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "Was bedeuten die \"%s\" Tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "Was ist, wenn ich keine Ãœbersetzungen habe?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Hilfe verstecken"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
 msgstr ""
 "Wenn ein Benutzer auf der Webseite unterwegs ist, und eine Ãœbersetzung in "
@@ -4063,63 +3736,63 @@ msgstr ""
 "Übersetzungen für Ihr Add-on haben, geben Sie nur Text in Ihrer Standard-"
 "Sprache ein, wobei es sich um eine Sprache handeln sollte, die Sie verstehen."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
 msgstr ""
 "Dies ist ein <em>Ãœbersetzungsfeld</em>. Es erlaubt Ihnen, ein bestimmtes "
 "Feld in verschiedene Sprachen zu übersetzen. Mit Hilfe der Sprach-Tabs "
 "können Sie Übersetzungen hinzufügen, bearbeiten oder löschen."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Übersetzung hinzufügen"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Ãœbersetzung entfernen"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Sprache überall hinzufügen"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Sprache hinzufügen"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Abbrechen"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Löschen"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Bitte wählen Sie die Sprache, die Sie hinzufügen möchten:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "Die GUID, in der hochgeladenen Datei (%1$s) entspricht nicht der bereits in "
 "der Datenbank gespeicherten GUID dieses Add-ons (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr ""
 "Sie haben nicht die erforderlichen Berechtigungen, um dieses Add-on zu "
 "bearbeiten."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "Die gewählte Version (%1$s) gehört nicht zu diesem Add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
 "Die hochgeladene Version (%1$s) existiert bereits für dieses Add-on. Wenn "
@@ -4127,7 +3800,7 @@ msgstr ""
 "\">klicken Sie hier</a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
 "Die hochgeladene Versionsnummer (%1$s) stimmt nicht mit der existierenden "
@@ -4137,28 +3810,24 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Los geht's!"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Datei wird hochgeladen..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Zustimmen und fortfahren"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Mein Add-on bearbeiten"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Ich werde mein Add-on später vervollständigen."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Versionshinweise hinzufügen"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
 msgstr ""
 "<p>Ihr Add-on-Eintrag wurde erfolgreich angelegt. Einige allgemeine "
@@ -4172,26 +3841,26 @@ msgstr ""
 "Sie dem unten stehenden Link folgen. Den Status Ihres Add-ons können Sie "
 "jederzeit auf der <a %s>Status-Seite</a> prüfen."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Bitte beheben Sie dieses Problem und laden Sie Ihre Datei erneut hoch."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Ihre neue Datei wurde zur Version %1$s hinzugefügt und ist gegenwärtig als %2"
 "$s markiert."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Add-on angelegt!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Hoppla! Mit dieser Datei scheint es ein Problem zu geben..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "Datei hinzugefügt!"
 
@@ -4200,11 +3869,11 @@ msgid "devcp_uploader_header_how"
 msgstr "Wie funktioniert das alles?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s angelegt"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Datei hochladen"
 
@@ -4230,20 +3899,16 @@ msgstr ""
 "Sie Ihr Add-on-Paket für das Hochladen vorbereitet haben, klicken Sie auf "
 "\"Los geht's\"!"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Unterstützte Betriebssysteme:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on-Datei: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "andere"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 "Die neue Datei wird öffentlich verfügbar sein, sobald ein Moderator sie "
@@ -4252,7 +3917,7 @@ msgstr ""
 "$s>ein Moderator werden</a>?"
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 "Die neue Version wird öffentlich verfügbar sein, sobald ein Moderator sie "
@@ -4261,13 +3926,13 @@ msgstr ""
 "$s>ein Moderator werden</a>?"
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "Ihre neue Version wurde angelegt und ist gegenwärtig als %s markiert."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 "Sehen Sie sich Ihre neue Datei auf der <a %1$s>Seite für Versionen und "
@@ -4277,7 +3942,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 "Sehen Sie sich Ihre neue Version auf der <a %1$s>Seite für Versionen und "
@@ -4285,7 +3950,7 @@ msgstr ""
 "ons</a> or <b>fügen Sie Versionsinformationen hinzu</b>, indem Sie auf den "
 "unten stehenden Knopf drücken (sehr empfohlen)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
 msgstr ""
 "Laden Sie die Datei für Ihr Add-on mit dem unten stehenden Formular hoch. "
@@ -4293,19 +3958,14 @@ msgstr ""
 "eine der Dateien und laden Sie die übrigen auf der \"Versionen und Dateien\"-"
 "Seite hoch."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Alle"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Spezifisch:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Bitte wählen..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4321,28 +3981,31 @@ msgid "devcp_uploader_title_update"
 msgstr "%s aktualisieren"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Bitte lesen Sie %s für weitere Informationen."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "diese Seite"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Mit dieser E-Mail-Adresse wurde kein Benutzerkonto gefunden."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Entweder das XML hat einen Fehler, oder benötigte Felder fehlen. Bitte <a "
-"href=\"https://developer.mozilla.org/en/"
-"Creating_OpenSearch_plugins_for_Firefox\">lesen Sie die Dokumentation</a>, "
-"überprüfen Sie Ihr Add-on und versuchen Sie esanschließend erneut."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Version bearbeiten"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Version erfolgreich aktualisiert."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4399,29 +4062,29 @@ msgstr[1] "%s Bewertungen"
 msgid "devcp_versions_delete_sure"
 msgstr "Sind Sie sicher, dass Sie Version %s permanent löschen möchten?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Abbrechen"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Datei löschen"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Neue Anwendung hinzufügen"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Anwendung entfernen"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Neue Datei hinzufügen"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
 msgstr ""
 "Wenn Sie die Anwendungs-Informationen hier ändern, können Benuzer Ihr Add-on "
@@ -4429,43 +4092,39 @@ msgstr ""
 "Datei gegenteilige Informationen enthält. <a %s>Liste unterstützter "
 "Anwendungen</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Sind Sie <b>sicher</b>, dass Sie die Kompatibilität mit dieser Anwendung "
 "entfernen möchten?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr ""
 "Sind Sie <b>sicher</b>, dass Sie diese Datei dauerhaft löschen möchten?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Freischaltungs-Informationen"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Kompatible Anwendungen"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Datei-Informationen"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Lizenz"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Version %s bearbeiten"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Hinweise zur Begutachtung"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Datei löschen"
 
@@ -4474,51 +4133,45 @@ msgstr "Datei löschen"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "Datei %1$s (%2$s), angelegt am %3$s und verändert zu \"%4$s\" am %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Bitte wählen Sie die anwendbare Lizenz für Ihr Add-on. Diese Lizenz legt "
-"fest, welche Rechte Sie an Ihrem Quellcode gewähren möchten."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Keine Dateien gefunden."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr ""
 "Optionale Informationen für den Moderator, der diese Version begutachten "
 "wird."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Anwendungs-Kompatibilität entfernen"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Bitte wählen Sie eine Anwendung"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Datei"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Betriebssystem"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Größe"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
 "Informationen über Veränderungen in dieser Version, neue Funktionen, "
@@ -4526,25 +4179,25 @@ msgstr ""
 "Version beziehen. Diese Information wird für alle Benutzern sichtbar sein, "
 "wenn sie das Add-on über den Firefox&nbsp;3 Add-on Manager aktualisieren."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Versionshinweise"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>Sie haben noch ungespeicherte Änderungen.</strong> Die "
 "Kompatibilität wird nicht gelöscht werden, bevor Sie unten auf \"Version "
 "aktualisieren\" klicken."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>Sie haben noch ungespeicherte Änderungen.</strong> Es werden keine "
 "Dateien gelöscht werden, bevor Sie unten auf \"Version aktualisieren\" "
 "klicken."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Versionen aktualisieren"
 
@@ -4579,7 +4232,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Dieses Add-on ist deaktiviert."
 
@@ -4625,7 +4278,7 @@ msgstr "Filtern"
 msgid "editorcp_logs_filter_by"
 msgstr "Nach Typ/Aktion filtern"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Bewertungslogbuch"
 
@@ -4687,7 +4340,7 @@ msgstr "Einträge zwischen %s und %s anzeigen"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Keine Bewertungen in diesem Zeitraum gefunden."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Moderationslogbuch"
 
@@ -4711,24 +4364,24 @@ msgstr "Aktuellste Moderationen"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Bewertungen gesamt"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Add-on moderieren"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Bitte vervollständigen Sie die folgenden Felder:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Bitte wählen Sie mindestens eine Datei zur Moderation aus."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Selbstmoderation ist nicht erlaubt."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externe Software"
 
@@ -4740,39 +4393,39 @@ msgstr "Empfehlung hinzufügen"
 msgid "editors_featured_add_feature_submit"
 msgstr "Hinzufügen"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Hinzufügen fehlgeschlagen."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Erfolgreich hinzugefügt."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Editieren fehlgeschlagen."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Erfolgreich gespeichert."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Ein oder mehrere Sprachen sind ungültig."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Entfernen fehlgeschlagen."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Erfolgreich entfernt."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Empfohlene Add-ons"
 
@@ -4784,156 +4437,105 @@ msgstr "Absenden"
 msgid "editors_featured_remove_feature"
 msgstr "Entfernen"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Warteliste filtern"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Nützliche Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Moderatorenhandbuch"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Rechtliche Hinweise zum Add-on"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Diese Filter bleiben für diese Sitzung aktiv oder bis sie gelöscht werden."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Momentan sind keine %s Add-ons zu moderieren."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 Tag"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 Stunde"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 Minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Moderatorenwerkzeuge"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "nur %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Testversion"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Kompatibilität"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on oder Autor-E-Mail"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on-Typen"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Anwendung"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Betriebssystem"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Zeit in Liste (Tage)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Ergebnis Ihrer Filter-Suche: <strong>%1$s</strong> Add-on"
-msgstr[1] "Ergebnis Ihrer Filter-Suche: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Löschen"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Alle Moderationslisten sind momentan deaktiviert. Bitte versuchen Sie es "
 "später noch einmal."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Editieren"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Versionsgeschichte"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Homepage"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Ãœbersicht"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Vorschaubilder"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Moderationsauftrag"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Mehr Infos anfordern"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Veröffentlichen"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Intensive Untersuchung anfordern"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Im Sandkasten belassen"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Bewertungen bearbeiten"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "Verwenden Sie dieses Formular, um vom Autor mehr Informationen anzufordern. "
@@ -4941,29 +4543,29 @@ msgstr ""
 "antworten. Wenn der Autor das getan hat, erhalten Sie einen Hinweis per E-"
 "Mail."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Damit werden das Add-on und seine neuesten Dateien veröffentlicht. Spätere "
 "Versionen werden in den Sandkasten übermittelt bis sie von einem Moderator "
 "getestet worden."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Das Add-on wird im Sandkasten belassen"
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Damit wird ein Add-on aus dem Sandkasten in den öffentlichen Seiten "
 "veröffentlicht."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Damit wird die Version im Sandkasten eines öffentlichen Add-on dort belassen."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Im Falle von Unsicherheit über die Sicherheit des Add-ons, "
@@ -4971,73 +4573,73 @@ msgstr ""
 "nachgehen soll, so geben Sie Ihre Kommentare bitte im folgenden Feld an. Sie "
 "werden an die Administratoren, nicht die Entwickler, übermitterlt."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Code mit letzter öffentlicher Version vergleichen"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Inhalte anzeigen"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Entwickler:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategorien:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilität:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beschreibung"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Entwicklerkommentare"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Endbenutzer-Lizenzvereinbarung (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Dateien:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Add-on-Historie"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nominierungs-Nachricht"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Vorschaubilder"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Datenschutzerklärung"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Moderiere %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Hinweise an den Moderator"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Zusammenfassung"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versionshinweise"
 
@@ -5065,7 +4667,7 @@ msgstr "Nominierung genehmigt/Öffentlich"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominierung abgelehnt/Sandkasten"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Es wurden bisher keine Moderationen für dieses Add-on durchgeführt."
 
@@ -5092,90 +4694,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Antwort zeigen/verstecken (%1$s)"
 msgstr[1] "Antworten zeigen/verstecken (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Anwendungen:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "oder wählen Sie eine Antwortvorlage:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentare:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Betriebssysteme:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Nach oben"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Hinweis: Bitte bewerten Sie nur dann mehr als eine Datei, wenn Sie JEDE "
-"dieser Dateien überprüft haben."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "weiter &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Keine Vorschau gefunden."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; zurück"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Moderationswarteliste"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong>Nr. %1$s</strong> von %2$s Add-ons in der Liste"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong>Nr. %1$s</strong> von %2$s in der Liste (gefiltert)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Aktion ausführen"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Aktion"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentare"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Moderator"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Datei"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Benachrichtigen Sie mich das nächste mal, wenn dieses Add-on aktualisiert "
 "wird (Einmalig: Nachfolgende Updates erzeugen keine weiteren E-Mails.)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Moderation erfolgreich übermittelt"
 
@@ -5199,7 +4790,7 @@ msgstr "Aktion"
 msgid "editors_reviews_in_reply_to"
 msgstr "Antwort auf:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Moderationen erfolgreich übermittelt!"
 
@@ -5211,79 +4802,87 @@ msgstr "Im Moment sind keine Bewertungen zu moderieren."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Moderation übermitteln"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Seitenabhängig"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Neu"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Aktualisiert"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Getestete Anwendungen"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Getestete Betriebssysteme"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Zusätzliche Informationen"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Typ"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Add-on-Typen"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Alter"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Anwendungen"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Nur für einige Sprachen?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Zeit in Liste"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Betriebssystemart"
 
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Aufsteigend"
-
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Absteigend"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Ãœbermittelungstypen"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s Tage"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s Stunden"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s Minuten"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Zugriff verweigert"
 
@@ -5293,18 +4892,17 @@ msgstr ""
 "Sie haben nicht die erforderlichen Berechtigungen, um diese Seite angezeigt "
 "zu bekommen."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Add-on existiert bereits!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5313,14 +4911,11 @@ msgstr "Add-on existiert bereits!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Add-on nicht gefunden!"
 
@@ -5332,55 +4927,60 @@ msgstr "Dieses Add-on kann hier nicht angezeigt werden."
 msgid "error_addon_selfreview"
 msgstr "Sie dürfen keine Bewertungen für Ihre eigenen Add-ons abgeben."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Keine Add-ons in dieser Kategorie gefunden!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Add-on-Feed nicht gefunden."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Dies ist keine korrekte E-Mail-Adresse!"
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Dieses Feld darf nicht leer sein."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Datei nicht gefunden!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Dateifehler: %s existiert nicht."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr ""
 "Dieses Formular enthält Fehler. Bitte korrigieren Sie diese und schicken Sie "
 "es erneut ab."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Ungültige Zeichenfolge: Bitte erneut versuchen!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Dies ist keine gültige URL. Erlaubte URLs sehen etwa wie folgt aus: http://"
@@ -5388,46 +4988,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Fehlender Parameter: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Keine Dateien"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Hinweis"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Vorschau nicht gefunden!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Sie müssen eine Bewertung abgeben."
 
@@ -5435,46 +5023,38 @@ msgstr "Sie müssen eine Bewertung abgeben."
 msgid "error_user_already_confirmed"
 msgstr "Der Benutzeraccount ist bereits bestätigt worden."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Falscher Bestätigungscode!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Die Passwörter stimmten nicht überein."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Diese E-Mail-Adresse ist bereits vergeben!"
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Der Bestätigungscode für die Adressänderung ist verfallen. Bitte ändern Sie "
 "Ihre E-Mail-Adresse erneut auf Ihrer Profilseite und klicken Sie den Link in "
 "der Bestätigungsmail an, sobald Sie diese erhalten."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Benutzer können je nur eine Rolle innehaben. Bitte entfernen Sie den "
-"Benutzer von allen anderen Rollen bevor Sie fortfahren."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Dieser Spitzname ist bereits vergeben."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Benutzer wurde nicht gefunden!"
 
@@ -5484,42 +5064,39 @@ msgstr ""
 "Bitte bestätigen Sie Ihr Konto zuerst mit den Daten, die Sie per Mail "
 "erhalten haben."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Benutzername oder Passwort falsch!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version nicht gefunden!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Falsches Passwort!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Mehr erfahren"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Erfahren Sie mehr über %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "Eine Bewertung"
 msgstr[1] "%s Bewertungen"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Mehr aus"
 
@@ -5558,39 +5135,38 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 msgid "footer_a_about"
-msgstr "Ãœber Mozilla Add-ons"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_a_faq"
-msgstr "Häufige Fragen"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_abbr_faq"
-msgstr "Häufig gestellte Fragen"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alle Rechte vorbehalten."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Danksagungen"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla veröffentlicht Links zu diesen Anwendungen als unverbindlichen "
@@ -5598,96 +5174,91 @@ msgstr ""
 "zueigen. Alle Fragen, Beschwerden und Ansprüche hinsichtlich dieser "
 "Anwendungen müssen direkt an den jeweiligen Hersteller gerichtet werden."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Aufrufen"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Rechtliche Hinweise"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Andere Sprachen:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Datenschutzhinweise"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Speichern"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Wörterbuch"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Wörterbücher"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Erweiterung"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Erweiterungen"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Sprachpaket (Add-on)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Sprachpakete (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Sprachpaket (Anwendung)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Sprachpakete (Anwendung)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Suchmaschine"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Suchmaschinen"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Alle Sprachen"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Zurück zur %1$s-Add-ons-Startseite"
@@ -5696,86 +5267,37 @@ msgstr "Zurück zur %1$s-Add-ons-Startseite"
 msgid "header_main_firefox_header"
 msgstr "Firefox-Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>für</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "SeaMonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>für</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird-Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>für</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird-Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>für</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Zum \"Andere Anwendungen\"-Menü springen"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Zum \"Kategorien\"-Menü springen"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Zum Inhalt springen"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Zum Suchfeld springen"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Einloggen"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Ausloggen"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Mein Konto"
 
@@ -5783,71 +5305,48 @@ msgstr "Mein Konto"
 msgid "header_navlink_register"
 msgstr "Neu anmelden"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr ""
-"<a href=\"%1$s\">Registrieren Sie ich</a> oder <a href=\"%2$s\">loggen Sie "
-"sich ein</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Werkzeuge"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Vorschaubild von %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Einloggen</a> zum Installieren. <a href=\"%2$s\">Warum?</a>"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Lassen Sie mich dieses experimentelle Add-on installieren <a href=\"%1$s"
-"\">Was bedeutet das?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Zu %s %s hinzufügen"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s zu %2$s hinzufügen"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s herunterladen"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Add-on nicht gefunden!"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Liste von Wörterbüchern und Sprachpaketen."
 
@@ -5859,8 +5358,8 @@ msgstr "Wörterbuch herunterladen"
 msgid "langtools_download_langpack"
 msgstr "Sprachpaket herunterladen"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Wörterbücher und Sprachpakete"
 
@@ -5872,72 +5371,36 @@ msgstr "Wörterbuch installieren"
 msgid "langtools_install_langpack"
 msgstr "Sprachpaket installieren"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Wörterbuch"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Sprachpaket"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Sprache"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Benutzerdefinierte Lizenz"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD-Lizenz"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, Version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, Version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, Version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, Version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11-Lizenz"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, Version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klicken Sie hier, um zur Hauptseite zurückzukehren."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Datum"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Add-on-Name"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Bewertung"
@@ -5962,20 +5425,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Wörterbücher & Sprachpakete"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Add-ons für andere Anwendungen finden"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "andere"
 
@@ -5983,29 +5453,12 @@ msgstr "andere"
 msgid "page_title_appversions"
 msgstr "Anwendungs-Versionen"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on-Sammler"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Häufige Fragen zum Add-on-Sammler"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Fähigkeiten des Add-on-Sammlers"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Willkommen beim Add-on-Sammler"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Danksagungen"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Entwickler-FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimentelle Add-ons"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6035,15 +5488,15 @@ msgstr "Das \"Sandkasten\"-System"
 msgid "page_title_submissionhelp"
 msgstr "Hilfe beim Hochladen"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Gültige Anwendungsversionen"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "An Mozilla Add-ons übermittelte Add-ons müssen die Datei install.rdf "
@@ -6051,7 +5504,7 @@ msgstr ""
 "hat. Nur die aufgelisteten Versionen der Anwendungen sind erlaubt."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6060,15 +5513,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "hier"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versionen"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Zurück zur vorherigen Seite"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Der Sandkasten - Wissenswertes"
 
@@ -6076,6 +5532,12 @@ msgstr "Der Sandkasten - Wissenswertes"
 msgid "pagination_next_page"
 msgstr "nächste Seite"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Dies ist Seite %1$s von %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "vorige Seite"
@@ -6112,15 +5574,15 @@ msgstr ""
 "Wörter anzeigen lassen</a> oder sich stattdessen <a href=\"%2$s\">etwas "
 "ansagen lassen</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Sind Sie ein Mensch?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Was ist das?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Fehler beim Markieren dieser Bewertung!"
 
@@ -6128,7 +5590,7 @@ msgstr "Fehler beim Markieren dieser Bewertung!"
 msgid "review_flag_reason_bug_support"
 msgstr "Unpassender Fehlerbericht, oder Unterstützungs-Anfrage"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Diese Bewertung als unpassend melden (wählen Sie eine Begründung aus)"
 
@@ -6144,8 +5606,8 @@ msgstr "Anderes (bitte eine Begründung angeben)"
 msgid "review_flag_reason_spam"
 msgstr "Spam oder anderweitiger Inhalt, der keine Bewertung ist"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Danke; diese Bewertung wurde zur Moderation markiert."
 
@@ -6160,7 +5622,7 @@ msgstr ""
 "zur Überprüfung durch einen Moderator zu markieren."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Bitte achten Sie auf folgendes:</p><ul><li>Schreiben Sie so, als würden "
@@ -6181,127 +5643,103 @@ msgstr ""
 "a> für genauere Informationen über Add-on-Bewertungen von Benutzern.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Bewertungen für %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Empfohlene Add-ons"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Die neuesten Add-ons"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Beliebte Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Aktualisierte Add-ons"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Suchen"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Sammlungen: Suchergebnisse"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Sammlungen: Suchergebnisse"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr ""
 "Die Suche ist momentan deaktiviert. Bitte versuchen Sie es später noch "
 "einmal."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "Alle Add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "Alle Sammlungen"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "Suche nach Add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "nach Sammlungen suchen"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Nach Add-ons suchen"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klicken Sie hier, um Suchbegriffe einzugeben"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "in"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Alle Suchmaschinen"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Alle Suchmaschinen durchsuchen"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s passendes Add-on"
+msgstr[1] "%s passende Add-ons"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Es wurde nichts gefunden."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Add-on-Suche"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Die aktuellen Suchergebnisse für Ihre Anfrage als RSS-Feed"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Suchergebnisse für: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Administration"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Entwickler"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Moderatoren"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Herzlich Willkommen"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Herzlich Willkommen, %s"
@@ -6310,7 +5748,7 @@ msgstr "Herzlich Willkommen, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Wörterbüchern"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Empfohlene Add-ons"
 
@@ -6318,7 +5756,7 @@ msgstr "Empfohlene Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "Ich bin auf der Suche nach:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Neueste Add-ons"
 
@@ -6326,7 +5764,7 @@ msgstr "Neueste Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Suchmaschinen"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "RSS-Feeds abonnieren:"
 
@@ -6334,23 +5772,24 @@ msgstr "RSS-Feeds abonnieren:"
 msgid "sidebar_pitch_theme"
 msgstr "Themes"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aktualisierte Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Noch nicht bewertet"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Mit %s von 5 Sternen bewertet"
@@ -6387,13 +5826,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e. %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s erstellt"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s veröffentlicht"
@@ -6406,180 +5845,180 @@ msgstr "Schließen"
 msgid "statistics_help_link"
 msgstr "Hilfe"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "oder wählen Sie ein anderes Add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "oder wählen Sie ein Add-on mit öffentlicher statistischer Auswertung"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr ""
 "Wählen Sie eines Ihrer Add-ons, um die zugehörigen Statistiken zu sehen"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Wählen Sie ein Add-on, um seine Statistiken zu sehen"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Wählen Sie ein Add-on mit öffentlichen Statistiken"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistische Auswertung"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Statistiken anzeigen"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Diese Tabelle im CSV-Format anzeigen"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "keine"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Diesen Graph entfernen"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Gruppieren nach: Tag"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Gruppieren nach: Monat"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Gruppieren nach: Woche"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Vergleichen nach: Woche"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s im Bereich gefunden"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Graph hinzufügen"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Weiteren Graph zur Grafik hinzufügen"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Gesamtzahl ausblenden"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Gesamtzahl anzeigen"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Gesamtzahl hier aufzeichnen"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Daten anzeigen (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Zeigt eine kommaseparierte Liste dieser Daten"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s-Ereignisse ausblenden"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s-Ereignisse anzeigen"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Veröffentlichungsdaten des Add-ons in den Grafiken anzeigen"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox-Ereignisse ausblenden"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox-Ereignisse anzeigen"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Veröffentlichungsdaten von Firefox in den Grafiken anzeigen"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Grafik verkleinern"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Grafik erweitern"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Größe der Grafik ändern"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Tägliche Nutzer"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Anwendung"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Benutzerdefiniert"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Betriebssystem"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status des Add-on"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Zusammenfassung"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version des Add-ons"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Anwendung"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Betriebssystem"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Status des Add-ons"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Unbekannt"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Version des Add-ons"
 
@@ -6619,7 +6058,7 @@ msgstr "Ihre Einstellungen wurden aktualisiert."
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistische Auswertung"
 
@@ -6647,21 +6086,25 @@ msgstr "Herauszoomen"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Um einen Monat herauszoomen"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Tägliche Zusammenfassung der Statistiken für %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS-Feed der Zusammenfassung"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e. %b. %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistiken für %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Standardmäßig sind nur Sie und Mozilla dazu in berechtigt, Ihre Add-on-"
@@ -6669,84 +6112,84 @@ msgstr ""
 "Öffentlichkeit freigeben, sodass jedermann die statistischen Daten Ihres Add-"
 "ons betrachten kann."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Zugangsberechtigung für die statische Auswertung"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privat"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Nur Sie und Mozilla können auf die Add-on-Statistiken zugreifen"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Öffentlich"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Jeder kann auf die Add-on-Statistiken zugreifen"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Einstellungen ändern"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Bitte beachten Sie diese Einstellung als vertraulich"
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Die Statistiken sind derzeit <b>privat</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Die Statistiken sind derzeit <b>öffentlich</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "privat"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Zurück zur Statistikübersicht"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Einstellungen speichern"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Einstellungen der statistischen Auswertung für %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "öffentlich"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Anw"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "BS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Durchschnitt Downloads pro Tag"
 
@@ -6758,7 +6201,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Am letzten gezählten Tag"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in den letzten sieben Tagen"
 
@@ -6776,7 +6219,7 @@ msgstr "Seit %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Noch keine Daten"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Durchschnitt tägliche Nutzer"
 
@@ -6802,68 +6245,54 @@ msgstr "Aktive tägliche Nutzer"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Für %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Durchschnittliche Benutzerzahl pro Tag in dieser Woche"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s gegenüber letzter Woche"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistiken für %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Alle Themes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Themes durchsuchen"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "E-Mail-Adresse ändern"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Passwort ändern"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Passwort oder E-Mail ändern"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Bestätigungscode erneut versandt!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Ihr Benutzerkonto wurde erfolgreich gelöscht. Wenn Sie eines Tages "
 "zurückkommen möchten, können Sie sich auf der <a href=\"%2$s"
 "\">Registrierungsseite</a> erneut anmelden."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Schade, dass Sie die Mozilla Add-ons Gemeinschaft verlassen möchten."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Passwort bestätigen"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Löschen Sie mein Benutzerkonto jetzt"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Sie können Ihr Benutzerkonto nicht löschen, falls Sie bei irgendwelchen Add-"
@@ -6873,60 +6302,60 @@ msgstr ""
 "hier Ihr Konto zu löschen."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Wenn Sie noch Fragen haben, kontaktieren Sie bitte %1$s."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Sie müssen den Haken bei \"Ich verstehe...\" setzen, bevor wir Ihr "
 "Benutzerkonto löschen können."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr ""
 "Bitte geben Sie Ihr Passwort korrekt ein, um diesen Schritt durchzuführen."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Beim Löschen Ihres Benutzerkontos ist ein unbekannter Fehler aufgetreten. "
 "Bitte Bitte setzen Sie sich mit %1$s in Verbindung, und wir werden Ihr Konto "
 "für Sie löschen. Entschuldingen Sie die Unannehmlichkeiten."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Löschung bestätigen"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Benutzerkonto \"%1$s\" löschen"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Auf Wiedersehen!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Sie werden sich nicht mehr bei Mozilla Add-ons anmelden können."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Wenn Sie \"jetzt löschen\" klicken, wird Ihr Benutzerkonto "
 "<strong>unwiederbringlich entfernt</strong>. Das bedeutet:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Ihre Bewertungen für Add-ons werden nicht gelöscht werden, aber sie sind "
 "nicht mehr mit Ihrem Namen verbunden."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Falls Sie ein bestimmtes Problem haben, bei dem wir Ihnen helfen können, "
@@ -6934,17 +6363,17 @@ msgstr ""
 "sich mit uns unter %1$s in Verbindung, und wir werden unser bestes tun, "
 "Ihnen bei der Lösung des Problems behilflich zu sein."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr ""
 "Ich verstehe, dass dieser Schritt nicht rückgängig gemacht werden kann."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Gelöschter Benutzer"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Wir haben eine E-Mail an %1$s gesendet, um Ihre neue E-Mail-Adresse zu "
@@ -6952,7 +6381,7 @@ msgstr ""
 "bitte auf den Link, der sich in dieser E-Mail befindet. Bis das geschehen "
 "ist, können Sie sich weiterhin mit Ihrer gegenwärtigen Adresse anmelden."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Benutzerkonto löschen"
 
@@ -6978,7 +6407,9 @@ msgstr ""
 "-- das %2$s Add-ons Team"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Sie haben eine E-Mail-Adressänderung bei %2$s Add-ons angefordert.\n"
@@ -7021,107 +6452,90 @@ msgstr ""
 "Danke,\n"
 "-- das %2$s Add-ons Team"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Zurücksetzen Ihres %s Add-ons-Passworts"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Fehler!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Bitte bestätigen Sie Ihre E-Mail-Adressänderung bei %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Erfolgreich durchgeführt!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Ihre E-Mail-Adresse wurde erfolgreich geändert. Verwenden Sie bitte von nun "
 "an %1$s, um sich auf der Seite anzumelden."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Ãœber mich"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Stellen Sie sich den Benutzern gegenüber vor, wenn Sie möchten! Dieser Text "
-"wird öffentlich angezeigt auf Ihrer Benutzer-Infoseite. Zeilenumbrüche "
-"bleiben erhalten, aber HTML ist nicht erlaubt."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Passwort bestätigen"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Meine eigenen Sammlungen in meinem Benutzerprofil anzeigen"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Meine Favoriten unter den Sammlungen in meinem Benutzerprofil anzeigen"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Benutzerprofil von %s bearbeiten"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-Mail"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Vorname"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "E-Mail nicht anzeigen"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Homepage"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Nachname"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Benutzer-Login"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
-msgstr "neues Passwort"
+msgstr "Neues Passwort"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Spitzname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "altes Passwort"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Weitere Aktionen"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Passwort"
 
@@ -7129,65 +6543,65 @@ msgstr "Passwort"
 msgid "user_form_registration"
 msgstr "Benutzerkonto anlegen"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Auf diesem Computer angemeldet bleiben"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Sandkasten anzeigen?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Speichern"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Einloggen"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Abschicken"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Angemeldet bei %1$s Add-ons seit"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Neues Benutzerkonto anlegen"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Add-on-Kompatibilität (strengstens empfohlen)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Baldige Ereignisse und Wettbewerbe"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
-msgstr "Gegenwärtig können Sie keine Benachrichtigungen an- oder ausschalten."
+msgstr "Gegenwärtig können Sie keine Benachrichtigungen an oder ausschalten."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Von Zeit zu Zeit kann Mozilla Ihnen E-Mails bezüglich bald erscheinender "
 "Softwareversionen und Add-on-bezogener Ereignisse senden. Bitte wählen Sie "
 "diejenigen Themes aus, die Sie interessieren:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla behält sich vor, Ihnen persönliche E-Mails zu schreiben, wenn es um "
 "bestimmte Angelegenheiten im Bezug auf Ihre hier beherbergten Add-ons geht."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "Fehler beim Bearbeiten des Benutzerprofils!"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Benutzerprofil geändert."
 
@@ -7200,17 +6614,17 @@ msgstr "Passwort für %s zurücksetzen"
 msgid "user_pwreset_header"
 msgstr "Passwort zurücksetzen"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Passwort vergessen?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "Ein Link zum Zurücksetzen Ihres Passworts wurde an Ihre E-Mail-Adresse "
 "gesendet."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Passwort erfolgreich geändert."
 
@@ -7222,7 +6636,7 @@ msgstr "Neues Passwort speichern"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Link per E-Mail senden"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7237,7 +6651,7 @@ msgstr ""
 "enthaltenen Link aufrufen, um Ihr Konto zu aktivieren."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7249,24 +6663,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "erneut zuschicken lassen"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Glückwunsch, Ihr Benutzerkonto wurde erfolgreich angelegt!"
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Es ist <strong>nicht zwingend notwendig</strong>, sich auf Mozilla Add-"
-"ons zu registrieren, wenn Sie nur öffentliche Add-ons herunterladen und "
-"installieren möchten.</p><p>Sie müssen sich nur registrieren, um folgendes "
-"zu tun:</p><ul><li>Sie möchten Bewertungen für Add-ons schreiben</li><li>Sie "
-"sind ein Entwickler und möchten Ihr Add-on auf Mozilla Add-ons anbieten</"
-"li></ul><p>Wenn Sie sich erfolgreich registriert haben, erhalten Sie eine "
-"Bestätigungs-E-Mail an die Adresse, die Sie eingegeben haben. Bitte folgen "
-"Sie den darin enthaltenen Informationen, um Ihr Benutzerkonto zu aktivieren."
-"</p><p>Wenn Sie möchten, lesen Sie ruhig unsere <a href=\"%1$s\">rechtlichen "
-"Hinweise</a> und <a href=\"%2$s\">Datenschutzerklärung</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7278,28 +6678,20 @@ msgstr ""
 "Sie sich die E-Mail an ihre o.g. Adresse %1$s."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Danke für Ihre Anmeldung und willkommen zu %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Wilkommen bei Mozilla Add-ons (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Ein Vorname, Nachname oder Spitzname wird benötigt."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Sammlungen"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Benachrichtigungen"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Benutzerprofil"
 
@@ -7307,63 +6699,50 @@ msgstr "Benutzerprofil"
 msgid "user_verified_okay"
 msgstr "Benutzerkonto erfolgreich bestätigt."
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Benutzerkonto löschen"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Benutzerkonto bearbeiten"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Ãœber mich"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons von Benutzer %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Name"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Benutzerprofil"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Sammlungen von %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-Mail"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Lieblings-Sammlungen"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Homepage"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Spitzname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Benutzer-Info über %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Bewertungen von %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Benutzer-Login"
 
@@ -7396,105 +6775,5 @@ msgstr "Passwort zurücksetzen"
 msgid "users_register_pagetitle"
 msgstr "Benutzerkonto anlegen"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Quellcode-Lizenz für %1$s Version %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Alle neu hinzugefügten Add-ons"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Alle häufig heruntergeladenen Add-ons"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Alle am höchsten bewerteten Add-ons"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Nächstes Add-on"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Vorheriges Add-on"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Gesamte Versionsgeschichte"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Neueste:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Am beliebtesten:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Von uns empfohlen:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Aktualisiert:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Alle anzeigen"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Alle empfohlenen Add-ons"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Nach Bewertung"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Nach Aktualität"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Nach Beliebtheit"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Lädt..."
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Mehr Infos anzeigen"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Ihr Add-on benötigt mehrere Benutzer-Bewertungen (diese dürfen auch "
-#~ "externe Webadressen sein)."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Neu"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Aktualisiert"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Add-on-Alter"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Add-on-Typen"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Anwendungen"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Betriebssystemart"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Ãœbermittelungstypen"
-
-#~ msgid "forum_save"
-#~ msgstr "Speichern"
-
-#~ msgid "home"
-#~ msgstr "Hauptseite"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Dies ist Seite %1$s von %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s passendes Add-on"
-#~ msgstr[1] "%s passende Add-ons"
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Die neueste Version, die kompatibel ist mit: "
diff --git a/site/app/locale/el/LC_MESSAGES/messages.po b/site/app/locale/el/LC_MESSAGES/messages.po
index 43a0fe2..d454c59 100644
--- a/site/app/locale/el/LC_MESSAGES/messages.po
+++ b/site/app/locale/el/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-08 17:52+0200\n"
+"PO-Revision-Date: 2009-03-25 20:27+0200\n"
 "Last-Translator: Γιώ�γος Φιωτάκης <fiotakis@otenet.gr>\n"
 "Language-Team: el-GR <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,194 +13,164 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Ακ��ωση εγκατάστασης"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Λήψη τώ�α %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Αποδοχή και λήψη"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Αποδοχή κι εγκατάσταση"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "Δημόσιος χώ�ος"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Ενημε�ώθηκε %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Έκδοση %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "λήψεις"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "συνολικές λήψεις"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "εβδομαδιαίες λήψεις"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s π�όσθετο"
 msgstr[1] "%1$s π�όσθετα"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "ανά σελίδα"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ταξινόμηση κατά :"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "πει�αματικό"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "συνιστάται"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "Δεν είναι διαθέσιμο το %1$s για %2$s."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Πίσω στο %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Πίσω στις αξιολογήσεις..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Βαθμολογία:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Αξιολόγηση:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Υποβολή αξιολόγησης"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Π�οσθήκη αξιολόγησης για το %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Τίτλος/πε�ίληψη:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Διαγ�αφή"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Απάντηση"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Θέλετε να διαγ�άψετε την αξιολόγηση;"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Όχι"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "�αι"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Διαγ�αφή αξιολόγησης"
 
@@ -209,7 +179,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Διαγ�άφτηκε με επιτυχία η αξιολόγηση."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Επεξε�γασία αξιολόγησης για το %s"
@@ -218,25 +188,31 @@ msgstr "Επεξε�γασία αξιολόγησης για το %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Σφάλμα αναφο�άς αξιολόγησης: Οι σημειώσεις αναφο�άς αξιολόγησης θα π�έπει να έχουν μήκος από 10 εως 100 χα�ακτή�ες. Το μήκος της σημείωσης σας ήταν %1$s χα�ακτή�ες."
+msgstr ""
+"Σφάλμα αναφο�άς αξιολόγησης: Οι σημειώσεις αναφο�άς αξιολόγησης θα π�έπει να "
+"έχουν μήκος από 10 εως 100 χα�ακτή�ες. Το μήκος της σημείωσης σας ήταν %1$s "
+"χα�ακτή�ες."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Σημείωση: Π�ιν εμφανιστεί στο κοινό, η αξιολόγησή σας θα επεξε�γαστεί από κάποιον συντάκτη μας."
+msgstr ""
+"Σημείωση: Π�ιν εμφανιστεί στο κοινό, η αξιολόγησή σας θα επεξε�γαστεί από "
+"κάποιον συντάκτη μας."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Απάντηση δημιου�γο� π�ος:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "Δείτε τη %1$s παλιότε�η αξιολόγηση του χ�ήστη %2$s για το π�όσθετο."
-msgstr[1] "Δείτε τις %1$s παλιότε�ες αξιολογήσεις του χ�ήστη %2$s για το π�όσθετο."
+msgstr[1] ""
+"Δείτε τις %1$s παλιότε�ες αξιολογήσεις του χ�ήστη %2$s για το π�όσθετο."
 
 # %1 is the addon name
 #. %1 is the add-on name
@@ -250,35 +226,45 @@ msgstr "Αξιολογήσεις για το %s"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Απάντηση από %1$s την %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Απάντηση δημιου�γο�:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Ευχα�ιστο�με! η αξιολόγησή σας αποθηκε�θηκε με επιτυχία"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "από %1$s την %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "από το χ�ήστη %1$s στις %2$s (βαθμολόγηση %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Επόμενο π�όσθετο"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Π�οηγο�μενο π�όσθετο"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Μόνιμος δεσμός αυτής της έκδοσης."
@@ -287,27 +273,26 @@ msgstr "Μόνιμος δεσμός αυτής της έκδοσης."
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Η πιο π�όσφατη συμβατή έκδοση  με τον %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Μετάβαση"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Εμφάνιση π�οφίλ δημιου�γο�"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Πε�ιήγηση σε όλα τα θέματα :: Π�όσθετα %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Πε�ιήγηση σε %s"
@@ -316,109 +301,62 @@ msgstr "Πε�ιήγηση σε %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Πε�ιήγηση σε θέματα: %1$s :: Π�όσθετα %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Τι είναι αυτό;"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Π�οσθήκη αξιολόγησης"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Αναλυτικές λεπτομέ�ειες"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Κατηγο�ίες"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Π�οσθήκη σε συλλογή:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "�έα συλλογή..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Επιλογή συλλογής..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Δημοσίευση"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "Το %1$s π�οστέθηκε στη συλλογή %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Τι είναι αυτό;"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "συν  %1$s ακόμα συλλογή"
-msgstr[1] "συν  %1$s ακόμα συλλογές"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "λεπτομε�ής αξιολόγηση"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Δε μου α�έσει"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Επεξε�γασία αξιολόγησης"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Αυτό το π�όσθετο συνοδε�εται από ξεχω�ιστή πολιτική απο��ήτου."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Το σιχαίνομαι"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Σχετικές συλλογές"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Σχόλια δημιου�γο�"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Α�χική σελίδα"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Άδεια πηγαίου κώδικα"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Αξιολογήσεις"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Υποστή�ιξη"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Μου α�έσει"
 
@@ -426,26 +364,22 @@ msgstr "Μου α�έσει"
 msgid "addons_display_long_description"
 msgstr "Αναλυτική πε�ιγ�αφή"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Το λατ�ε�ω"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Πε�ισσότε�ες εικόνες"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Αυτό το π�όσθετο δεν συμπε�ιλαμβάνεται ακόμα σε καμία συλλογή."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Άλλα π�όσθετα από:  %1$s"
@@ -454,87 +388,100 @@ msgstr[1] "Άλλα Ï€Ï�όσθετα απ' αυτοÏ�Ï‚ τους δημιουÏ�Î
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %s."
+msgstr ""
+"Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στη διε�θυνση ηλεκτ�ονικο� "
+"ταχυδ�ομείου %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s ή στη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %s."
+msgstr ""
+"Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s ή στη διε�θυνση "
+"ηλεκτ�ονικο� ταχυδ�ομείου %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Υποστή�ιξη γι' αυτή την επέκταση θα β�είτε στο %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Βαθμολόγηση"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Μου α�έσει π�αγματικά"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Πα�ακαλο�με μη χ�ησιμοποιείτε τις αξιολογήσεις για αναφο�ά σφαλμάτων. Οι δημιου�γοί είναι πιθανό να χ�ειαστεί να επικοινωνήσουν μαζί σας για να επιλυθεί το π�όβλημα κι εμείς δεν τους γνωστοποιο�με τη διε�θυνση του ηλεκτ�ονικο� σας ταχυδ�ομείου."
+msgstr ""
+"Πα�ακαλο�με μη χ�ησιμοποιείτε τις αξιολογήσεις για αναφο�ά σφαλμάτων. Οι "
+"δημιου�γοί είναι πιθανό να χ�ειαστεί να επικοινωνήσουν μαζί σας για να "
+"επιλυθεί το π�όβλημα κι εμείς δεν τους γνωστοποιο�με τη διε�θυνση του "
+"ηλεκτ�ονικο� σας ταχυδ�ομείου."
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Οδηγίες σ�νταξης αξιολόγησης</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</a> για πλη�οφο�ίες σχετικά με το που θα  β�είτε βοήθεια γι' αυτό το π�όσθετο."
+msgstr ""
+"Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</a> για πλη�οφο�ίες σχετικά με "
+"το που θα  β�είτε βοήθεια γι' αυτό το π�όσθετο."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Υποβολή"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Δείτε όλα τα π�όσθετα: %1$s"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Δείτε όλες τις αξιολογήσεις (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Δείτε όλες τις εκδόσεις"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Ολοκλη�ωμένο ιστο�ικό εκδόσεων"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Δείτε τον πηγαίο κώδικα"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Εμφάνιση στατιστικών"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Πώς σας φαίνεται;"
 
@@ -542,455 +489,349 @@ msgstr "Πώς σας φαίνεται;"
 msgid "addons_display_workswith"
 msgstr "Συμβατό με:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Μόλις π�οστέθηκαν"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Δημοφιλή"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Συνιστώμενα"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Συνδ�ομή"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Πε�ιήγηση στα π�όσθετα"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Ενημε�ωμένα"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "από"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "δημοφιλείς συλλογές"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Συλλογές"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> π�όσθετο"
-msgstr[1] "<strong>%1$s</strong> π�όσθετα"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Εμφάνιση όλων των συλλογών"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Οι συλλογές είναι ένας τ�όπος για να κατηγο�ιοποιήσετε, να συνδυάσετε και να ται�ιάξετε π�όσθετα. Γ�αφτείτε συνδ�ομητές σε συλλογές που έχουν δημιου�γήσει άλλοι ή δημιου�γήστε τη δική σας!"
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> συνδ�ομητής"
-msgstr[1] "<strong>%1$s</strong> συνδ�ομητές"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Συνιστο�με"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Τα π�όσθετα επεκτείνουν τον %1$s και σας επιτ�έπουν να π�οσα�μόσετε την πε�ιήγηση στα μέτ�α σας.  Ρίξτε μια ματιά και κάντε τον  %1$s κτήμα σας."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Σας α�έσουν; Β�είτε κι άλλα π�όσθετα στη σελίδα %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Πάνω από 5000 δω�εάν π�όσθετα</strong> για να π�οσα�μόσετε και να φέ�ετε τον Firefox στα μέτ�α σας."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Τι είναι τα π�όσθετα;"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Ε�κολη εγκατάσταση</strong> και ενημέ�ωση."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Εισαγωγή"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Ε�γαλειοθήκες, θέματα και μηχανές αναζήτησης που σας <strong>βοηθο�ν σε καθημε�ινές ε�γασίες.</strong>"
+msgstr ""
+"Τα π�όσθετα επεκτείνουν τον %1$s και σας επιτ�έπουν να π�οσα�μόσετε την "
+"πε�ιήγηση στα μέτ�α σας.  Ρίξτε μια ματιά και κάντε τον  %1$s κτήμα σας."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "�ΕΟ!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "�εότε�α:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Άλλα π�ογ�άμματα"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Π�όσθετα %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>λήψη π�όσθετου</span>"
-msgstr[1] "<strong>%1$s</strong> <span>λήψεις π�όσθετων</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Δημοφιλέστε�α:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>π�όσθετο σε χ�ήση</span>"
-msgstr[1] "<strong>%1$s</strong> <span>π�όσθετα σε χ�ήση</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Συνιστο�με:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Πιο π�όσφατα ενημε�ωμένα:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Εμφάνιση όλων"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Δείτε όλα τα π�όσθετα που δημιου�γήθηκαν π�όσφατα"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Εμφάνιση όλων των δημοφιλών π�όσθετων"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Εμφάνιση όλων των συνιστώμενων π�όσθετων"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Δείτε όλα τα π�όσθετα που ενημε�ώθηκαν π�όσφατα"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Κάντε κλικ στον πα�ακάτω δεσμό για να αποθηκε�σετε το α�χείο.</li><li>Στο Mozilla Sunbird, ανοίξτε τα «Π�όσθετα» από το μενο� «Ε�γαλεία».</li><li>Κάντε κλικ στο κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το α�χείο που αποθηκε�σατε κάντε κλικ στο «OK».</li></ol>"
+msgstr ""
+"<ol><li>Κάντε κλικ στον πα�ακάτω δεσμό για να αποθηκε�σετε το α�χείο.</"
+"li><li>Στο Mozilla Sunbird, ανοίξτε τα «Π�όσθετα» από το μενο� «Ε�γαλεία».</"
+"li><li>Κάντε κλικ στο κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το "
+"α�χείο που αποθηκε�σατε κάντε κλικ στο «OK».</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Πως να κάνετε εγκατάσταση στο Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>κάντε δεξί κλικ πα�ακάτω και επιλέξτε «Αποθήκευση δεσμο� ως...» για να αποθηκε�σετε το α�χείο στο δίσκο σας.</li><li>Στον Mozilla Thunderbird, ανοίξτε τα «Π�όσθετα» μέσα από το μενο� «Ε�γαλεία».</li><li>Κάντε κλικ στο κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το α�χείο που αποθηκε�σατε κάντε κλικ στο «OK».</li></ol>"
+msgstr ""
+"<ol><li>κάντε δεξί κλικ πα�ακάτω και επιλέξτε «Αποθήκευση δεσμο� ως...» για "
+"να αποθηκε�σετε το α�χείο στο δίσκο σας.</li><li>Στον Mozilla Thunderbird, "
+"ανοίξτε τα «Π�όσθετα» μέσα από το μενο� «Ε�γαλεία».</li><li>Κάντε κλικ στο "
+"κουμπί «Εγκατάσταση» και αφο� εντοπίσετε/επιλέξετε το α�χείο που "
+"αποθηκε�σατε κάντε κλικ στο «OK».</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Εγκατάσταση στον Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "π�οβολή πει�αματικών π�όσθετων"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Μετάβαση"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Από"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "για Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "για Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "για Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Αυτή η σελίδα αναφέ�ει με�ικές μόνο από τις πιο συνηθισμένες και δημοφιλείς π�όσθετες λειτου�γίες. Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με άλλες π�όσθετες λειτου�γίες, διαθέσιμες για πε�ιηγητές της οικογένειας Mozilla, επισκεφθείτε το  %1$s"
+msgstr ""
+"Αυτή η σελίδα αναφέ�ει με�ικές μόνο από τις πιο συνηθισμένες και δημοφιλείς "
+"π�όσθετες λειτου�γίες. Για πε�ισσότε�ες πλη�οφο�ίες σχετικά με άλλες "
+"π�όσθετες λειτου�γίες, διαθέσιμες για πε�ιηγητές της οικογένειας Mozilla, "
+"επισκεφθείτε το  %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Ψάχνετε για μια π�όσθετη λειτου�γία που δεν αναφέ�εται εδώ;"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Οι π�όσθετες λειτου�γίες βοηθο�ν τον πε�ιηγητή να εκτελέσει συγκεκ�ιμένες λειτου�γίες, όπως την εμφάνιση  ειδικών τ�πων γ�αφικών ή την αναπα�αγωγή α�χείων πολυμέσων. Οι π�όσθετες λειτου�γίες είναι ελαφ�ώς διαφο�ετικές από τις επεκτάσεις, οι οποίες τ�οποποιο�ν ή π�οσθέτουν χα�ακτη�ιστικά."
+msgstr ""
+"Οι π�όσθετες λειτου�γίες βοηθο�ν τον πε�ιηγητή να εκτελέσει συγκεκ�ιμένες "
+"λειτου�γίες, όπως την εμφάνιση  ειδικών τ�πων γ�αφικών ή την αναπα�αγωγή "
+"α�χείων πολυμέσων. Οι π�όσθετες λειτου�γίες είναι ελαφ�ώς διαφο�ετικές από "
+"τις επεκτάσεις, οι οποίες τ�οποποιο�ν ή π�οσθέτουν χα�ακτη�ιστικά."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Δημοφιλείς π�όσθετες λειτου�γίες για τον %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Π�όσθετες λειτου�γίες"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Έγγ�αφα υποστή�ιξης: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "Το %s απαιτεί να αποδεχτείτε το πα�ακάτω Συμφωνητικό Αδειδότησης Τελικο� Χ�ήστη για να ξεκκινήσει η εγκατάσταση:"
+msgstr ""
+"Το %s απαιτεί να αποδεχτείτε το πα�ακάτω Συμφωνητικό Αδειδότησης Τελικο� "
+"Χ�ήστη για να ξεκκινήσει η εγκατάσταση:"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Εικόνες π�οεπισκόπησης για το %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Π�οστεθηκαν π�οσφατα"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Με τόσα πολλά διαθέσιμα π�όσθετα, σίγου�α θα υπά�χει κάτι που να σας ται�ιάζει. Για να ξεκινήσετε, ιδο� μια λίστα με τα πιο δημοφιλή! "
+msgstr ""
+"Με τόσα πολλά διαθέσιμα π�όσθετα, σίγου�α θα υπά�χει κάτι που να σας "
+"ται�ιάζει. Για να ξεκκινήσετε, ιδο� μια λίστα με τα πιο δημοφιλή! "
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Π�όσθετοι πό�οι"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Κέντ�ο δημιου�γών Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Απαιτείται πε�ιηγητής της οικογένειας Mozilla (όπως ο Firefox) για να εγκαταστήσετε μια π�όσθετη λειτου�γία αναζήτησης."
+msgstr ""
+"Απαιτείται πε�ιηγητής της οικογένειας Mozilla (όπως ο Firefox) για να "
+"εγκαταστήσετε μια π�όσθετη λειτου�γία αναζήτησης."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "Απαιτείται η ενε�γοποίηση της JavaScript για να εγκαταστήσετε π�όσθετες λειτου�γίες, αλλά φαίνεται πως την έχετε απενε�γοποιήσει. Πα�ακαλο�με ενε�γοποιήστε την JavaScript π�ιν π�οσπαθήσετε να εγκαταστήσετε κάποια από τις πα�ακάτω π�όσθετες λειτου�γίες."
+msgstr ""
+"Απαιτείται η ενε�γοποίηση της JavaScript για να εγκαταστήσετε π�όσθετες "
+"λειτου�γίες, αλλά φαίνεται πως την έχετε απενε�γοποιήσει. Πα�ακαλο�με "
+"ενε�γοποιήστε την JavaScript π�ιν π�οσπαθήσετε να εγκαταστήσετε κάποια από "
+"τις πα�ακάτω π�όσθετες λειτου�γίες."
 
 # %1 is "make your own" link
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Μάθετε πώς να %1$s στο %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "δημιου�γήστε το δικό σας"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Πε�ιηγηθείτε σε πε�ισσότε�ες μηχανές αναζήτησης στο %1$s"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Μηχανές αναζήτησης"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Ευχα�ιστο�με ειδικά τους συντελεστές του εγχει�ήματος Mycroft για τη δουλειά τους σχετικά με τις μηχανές αναζήτησης του Firefox."
+msgstr ""
+"Ευχα�ιστο�με ειδικά τους συντελεστές του εγχει�ήματος Mycroft για τη δουλειά "
+"τους σχετικά με τις μηχανές αναζήτησης του Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Μοι�αστείτε το"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Π�οσθήκη στο Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Π�οσθήκη στο Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Δημοσίευση στο Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Διαμοι�ασμός στο FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Δημοσίευση στο MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Απενε�γοποιημένο"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Ατελής έκδοση"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "Στο Sandbox; Υποψηφιότητα για το δημόσιο χώ�ο"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Στο Sandbox; αναμονή αξιολόγησης"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Δημόσιος χώ�ος"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Στο Sandbox"
@@ -999,34 +840,27 @@ msgstr "Στο Sandbox"
 msgid "addons_status_unknown"
 msgstr "Άγνωστο"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Μάθετε πε�ισσότε�α για το π�όσθετο"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Κο�υφαια σε ληψεις"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Κο�υφαια σε βαθμολογια"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Συνιστάται π�οσοχή για τις παλαιότε�ες εκδόσεις"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Αυτές οι εκδόσεις υπά�χουν για αναφο�ά και πει�αματικο�ς σκοπο�ς. Σας συμβουλε�ουμε να χ�ησιμοποιείτε πάντα την πιο π�όσφατα ενημε�ωμένη έκδοση ενός π�όσθετου."
+msgstr ""
+"Αυτές οι εκδόσεις υπά�χουν για αναφο�ά και πει�αματικο�ς σκοπο�ς. Σας "
+"συμβουλε�ουμε να χ�ησιμοποιείτε πάντα την πιο π�όσφατα ενημε�ωμένη έκδοση "
+"ενός π�όσθετου."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Ιστο�ικό αλλαγών εκδόσεων "
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Ιστο�ικό εκδόσεων %1$s "
@@ -1049,8 +883,7 @@ msgstr "Διαγ�άφηκε η ομάδα με αναγνω�ιστικό %s"
 msgid "admin_group_edit_pagetitle"
 msgstr "Επεξε�γασία ομάδας"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Μη έγκυ�ο αναγνω�ιστικό ομάδας"
 
@@ -1058,1359 +891,419 @@ msgstr "Μη έγκυ�ο αναγνω�ιστικό ομάδας"
 msgid "admin_group_pagetitle"
 msgstr "Διαχει�ιστής ομάδας"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Η ομάδα αποθηκε�θηκε"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Πε�ισσότε�α"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Χω�ίς ό�ιο"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Χω�ίς ό�ιο"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Χω�ίς ό�ιο"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Π�όγ�αμμα"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "ταί�ιασμα λέξης-κλειδιο�"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Τελευταία ενημέ�ωση"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Όνομα"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "πιο π�όσφατα"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "π�ιν 3 μήνες "
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "π�ιν 6 μήνες"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "π�ιν 1 ήμε�α"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "π�ιν 1 μήνα"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "π�ιν 1 εβδομάδα"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "π�ιν 1 χ�όνο"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Αποτελέσματα ανά σελίδα"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Πλατφό�μα"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "πιο δημοφιλή"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "αξιολογήσεις"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ταξινόμηση"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "έως"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Εναλλαγή σε/από σ�νθετη αναζήτηση"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Τ�πος"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "έκδοση"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Επόμενο"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Π�οηγο�μενο"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "αγνόηση ελέγχου έκδοσης"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Αυτό το π�όσθετο λειτου�γεί με παλιότε�ες εκδόσεις του Firefox."
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Μπο�είτε να <a href=\"%1$s\">δοκιμάσετε μια παλιότε�η έκδοση</a> ή να <a href=\"#\" onclick=\"%2$s\">αγνοήσετε αυτό τον έλεγχο</a>."
+msgstr ""
+"Μπο�είτε να <a href=\"%1$s\">δοκιμάσετε μια παλιότε�η έκδοση</a> ή να <a "
+"href=\"#\" onclick=\"%2$s\">αγνοήσετε αυτό τον έλεγχο</a>."
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Πιθανότατα μια <a href=\"%1$s\">παλιότε�η έκδοση</a> να δουλέψει."
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Το π�όσθετο αυτό απαιτεί την έκδοση <a href=\"%1$s\"> %2$s</a> του Firefox η οποία δεν είναι ακόμα επίσημα διαθέσιμη."
+msgstr ""
+"Το π�όσθετο αυτό απαιτεί την έκδοση <a href=\"%1$s\"> %2$s</a> του Firefox η "
+"οποία δεν είναι ακόμα επίσημα διαθέσιμη."
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Ενημε�ώστε τον Firefox</a> για να χ�ησιμοποιήσετε αυτό το π�όσθετο."
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "Ο/Η %1$s άλλαξε την κατάσταση του %2$s σε %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "Ο/Η %1$s υπέβαλε άγνωστη δ�αστη�ιότητα διαχει�ιστή  %2$s στο ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "Ο/Η %1$s αφαί�εσε το χα�ακτη�ιστικό %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "Ο/Η %1$s δημιο��γησε την εφα�μογή %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "Ο/Η %1$s επεξε�γάστηκε την εφα�μογή %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "Ο/Η %1$s δημιο��γησε την έκδοση %2$s για τον %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την έκδοση %2$s για τον %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "Ο/Η %1$s άλλαξε τη ��θμιση «%2$s» από «%3$s» σε «%4$s»"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "Ο/Η %1$s υπέβαλε την άγνωστη ενέ�γεια συντάκτη %2$s στο ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "Ο/Η %1$s αφαί�εσε το π�όσθετο %2$s από τη λίστα συνιστώμενων"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "Ο/Η %1$s π�όσθεσε το π�όσθετο %2$s στη λίστα συνιστώμενων"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "Ο/Η %1$s άλλαξε ένα χα�ακτη�ιστικό για τη γλώσσαr %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "Ο/Η %1$s άλλαξε τις τοπικοποιήσεις για το π�όσθετο %2$s στη λίστα συνιστώμενων"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "Ο/Η %1$s επαναπ�οσδιό�ισε το hash για το α�χείο %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "Ο/Η %1$s π�όσθεσε τον/την %2$s στην ομάδα %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "Ο/Η %1$s έγινε μέλος της ομάδας %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "Ο/Η %1s δημιο��γησε την ομάδα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την ομάδα %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "Ο/Η %1$s επεξε�γάστηκε την ομάδα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "Ο/Η %1$s διέγ�αψε τον/την %2$s από την ομάδα %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "Ο/Η %1$s υπέβαλε την άγνωστη ενέ�γεια %2$s για το %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "Ο/Η %1$s π�οσπάθησε να τ�οποποιήσει την κλειδωμένη ομάδα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "Ο/Η %1$s π�οσπάθησε να τ�οποποιήσει τη μετάφ�αση για τη γλώσσα %2$s χω�ίς να έχει εξουσιοδότηση"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "Ο/Η %1$s δημιο��γησε την πλατφό�μα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την πλατφό�μα %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "Ο/η %1$s επεξε�γάστηκε την πλατφό�μα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "Ο/Η %1$s απέτυχε να πιστοποιηθεί ξανά για να αποκτήσει π�όσβαση στο τμήμα %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "Ο/Η %1$s δημιο��γησε την απόκ�ιση %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την απόκ�ιση %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "Ο/Η %1$s επεξε�γάστηκε την απόκ�ιση %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "Ο/Η %1$s ενέκ�ινε την αξιολόγηση %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την αξιολόγηση %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "Ο/Η %1$s υπέβαλε την άγνωστη ενέ�γεια ασφαλείας %2$s στο ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "Ο/Η %1$s δημιο��γησε την ετικέτα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "Ο/Η %1$s διέγ�αψε την κατηγο�ίαy %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "Ο/Η %1$s επεξε�γάστηκε την κατηγο�ία %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "Ο/Η %1$s ενημέ�ωσε τις μεταφ�άσεις εφα�μογών για τη γλώσσα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "Ο/Η %1$s ενημέ�ωσε τις μεταφ�άσεις δημοσιε�σεων ιστολόγιου για τη γλώσσα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "Ο/Η %1$s ενημέ�ωσε τις μεταφ�άσεις πλατφό�μας για τη γλώσσα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "Ο/Η %1$s ενημέ�ωσε τις μεταφ�άσεις κατηγο�ιών για τη γλώσσα %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "Ο/Η %1$s επεξε�γάστηκε τις πλη�οφο�ίες χ�ήστη του/της %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Ενημε�ώστε τον Firefox</a> για να "
+"χ�ησιμοποιήσετε αυτό το π�όσθετο."
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Π�όσθετα κατά όνομα"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "�εότε�α π�όσθετα"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Δημοφιλή π�όσθετα"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Π�όσθετα κατά βαθμολογία"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Π�όσφατα ενημε�ωμένα π�όσθετα"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Τ�έχουσα κατηγο�ία"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Κατηγο�ίες"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Επιλογή κατηγο�ίας"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Δείτε όλα τα συνιστώμενα π�όσθετα"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Π�ώτα τα βαθμολογημένα υψηλότε�α"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Π�ώτα τα π�όσφατα ενημε�ωμένα"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Π�ώτα τα πιο δημοφιλή"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Εμφάνιση όλων σε %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Η πε�ιγ�αφή θα π�έπει να έχει λιγότε�ους από  %1$s χα�ακτή�ες."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Συλλογή %s "
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Συνέβη σφάλμα κατά τη διαγ�αφή του π�όσθετου!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά την αποθήκευση του π�όσθετου!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά την αποθήκευση του σχόλιου!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Το όνομα θα π�έπει να έχει λιγότε�ους από %1$s χα�ακτή�ες."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Δε β�έθηκε η συλλογή!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Αν ξέ�ετε ήδη ποια π�όσθετα θέλετε να π�οσθέσετε στη συλλογή σας, απλά πληκτ�ολογήστε τα ονόματα τους πα�ακάτω. Αν θέλετε να πε�ιμένετε και να το κάνετε α�γότε�α, κάντε κλικ στο %1$s για την ώ�α."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Επιλέξτε τα π�ώτα σας π�όσθετα"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Δημιου�γήστε μια συλλογή"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Επιλεγμένα π�όσθετα"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Μπο�είτε να δημιου�γήσετε τη δική σας συλλογή π�όσθετων, συμπλη�ώνοντας με�ικά απ' τα πα�ακάτω πεδία."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Δημιου�γία συλλογής"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Συλλογές"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Μάθετε πε�ισσότε�α"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Π�οσθήκη στις αγαπημένες"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Αφαί�εση από τις αγαπημένες"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Μπο�είτε να δείτε τη νέα σας συλλογή πα�ακάτω. Αν θέλετε να της δώσετε ένα ψευδώνυμο, να αποστείλετε ένα εικονίδιο, ή να αλλάξετε άλλες �υθμίσεις, πα�ακαλο�με επισκεφθείτε τη σελίδα <a href='%1$s'>διαχεί�ισης συλλογών</a>.</p><p>Μπο�είτε να έχετε π�όσβαση στη σελίδα της συλλογής σας σ' αυτή την τοποθεσία: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Η συλλογή σας είναι έτοιμη!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Πε�ί της συλλογής"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s π�όσθετο σ' αυτή τη συλλογή"
-msgstr[1] "%1$s π�όσθετα σ' αυτή τη συλλογή"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Δημιου�γήθηκε από:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Ενημε�ώθηκε:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Γίνεται π�οσθήκη στις αγαπημένες&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Αφαι�είται από τις αγαπημένες&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Συνδεθείτε</a> για να π�οσθέσετε αυτή τη συλλογή στις αγαπημένες σας."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Διαχεί�ιση συλλογής"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Ημε�ομηνία π�οσθήκης"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Όνομα"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Δημοτικότητα"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s λήψη αυτή την εβδομάδα"
-msgstr[1] "%1$s λήψεις αυτή την εβδομάδα"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Τα επιλεγμένα π�όσθετα θα αφαι�εθο�ν κατά την αποθήκευση"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Για να δημοσιε�σετε νέα π�όσθετα σ' αυτή τη συλλογή, πληκτ�ολογήστε τα ονόματα τους πα�ακάτω."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Για να δημοσιε�σετε νέα π�όσθετα σ' αυτή τη συλλογή, εισάγετε πα�ακάτω μια λίστα αναγνω�ιστικών (ID) π�όσθετων διαχω�ισμένων με κόμματα."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Μπο�είτε επίσης να δημοσιε�σετε ένα π�όσθετο από την κανονική σελίδα πα�ουσίασης του."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Π�οστέθηκε στι %1$s από %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Π�οσθήκη σχολίου εκδότη"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Διαγ�αφή σχολίου εκδότη"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Επεξε�γασία σχολίου εκδότη"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Σημείωση: Το σχόλιο θα εμφανιστεί ως σχόλιο του α�χικο� εκδότη με την π�αγματική ημε�ομηνία έκδοσης"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Αποθήκευση σχολίου"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Αφαί�εση"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Π�οσθήκη σε συλλογή"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Έλεγχος διαθεσιμότητας"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "�αι, θέλω να διαγ�άψω αυτή τη συλλογή."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Επιλέξτε το πλαίσιο και μετά κάντε κλικ στο «%1$s» για να διαγ�άψετε τη συλλογή."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Κάνοντας κλικ στο  κουμπί  «%1$s» πα�ακάτω, η συλλογή σας θα διαγ�αφεί. Αν δεν θέλετε να διαγ�αφεί η συλλογή σας, απεπιλέξτε το πλαίσιο επιβεβαίωσης στην κα�τέλα «%2$s» και συνεχίστε την επεξε�γασία της συλλογής σας. Αν αποχω�ήσετε από τη σελίδα χω�ίς να αποθηκε�σετε τις αλλαγές, η συλλογή σας δεν θα διαγ�αφεί."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Η συλλογή σας π�όκειται να διαγ�αφεί!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Π�έπει να δώσετε μια πε�ιγ�αφή της συλλογής σας."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά τη μεταφο�ά του εικονιδίου σας."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Π�έπει να δώσετε ένα όνομα στη συλλογή σας."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Αν επιλέξετε ψευδώνυμο, θα π�έπει να είναι μοναδικό."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Όνομα π�όσθετου:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Σχετιζόμενο π�όγ�αμμα"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Επιλέξτε το π�όγ�αμμα που υποστη�ίζει η συλλογή σας."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Τ�πος συλλογής"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Διαγ�αφή συλλογής"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Η διαγ�αφή της συλλογής σας θα είναι ο�ιστική."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Πε�ιγ�αφή συλλογής"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Πε�ιγ�άψτε συνοπτικά τη συλλογή σας και τους τ�πους π�όσθετων που πε�ιέχει"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Εικονίδιο"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Μπο�είτε να αποστείλετε ένα εικονίδιο σε μο�φή JPG, GIF ή PNG του οποίου το μέγεθος θα μετατ�απεί σε  32x32 πίξελ."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Σε ποιους θα είναι ο�ατή η συλλογή σας;"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Σαν α�χική επιλογή, οι συλλογές εμφανίζονται στον δημόσιο κατάλογο συλλογών και μπο�εί να τις δει οποιοσδήποτε. Αν θέλετε να πε�ιο�ίσετε την έκθεση της συλλογής σας σε ανθ�ώπους που θα έχουν λάβε ένα δεσμό π�ος αυτή, επιλέξτε την πα�ακάτω επιλογή."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Μόνο όσοι π�οσκαλώ θα μπο�ο�ν να δουν τη συλλογή μου"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Οποιοσδήποτε μπο�εί να δει τη συλλογή μου στον κατάλογο"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Ποιος μπο�εί να διαχει�ιστεί τη συλλογή μου;"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Αυτοί οι χ�ήστες θα μπο�ο�ν να δημοσιε�σουν π�όσθετα στη συλλογή σας, να διαχει�ιστο�ν όλα τα π�όσθετα που πε�ιέχει και να πα�έχουν δικαιώματα σε άλλους χ�ήστες."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Όνομα συλλογής"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Δώστε στη συλλογή σας ένα πε�ιγ�αφικό όνομα, όπως πχ «Η συλλογή για π�ογ�αμματισμό του Γιάννη»"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Ψευδώνυμο συλλογής"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Π�οαι�ετικά, μπο�είτε να δώσετε ένα ψευδώνυμο στη συλλογή σας για πιο ε�κολη π�όσβαση σ' αυτή:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Ποιος μπο�εί να δημοσιε�σει π�όσθετα στη συλλογή σας;"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Αυτοί οι χ�ήστες θα μπο�ο�ν να δημοσιε�σουν π�όσθετα στη συλλογή σας και να αφαι�έσουν όσα π�οσθέτουν."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Εισάγετε τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου λογα�ισαμο� στα π�όσθετα Firefox:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Οι επιλεγμένοι λογα�ιασμοί θα αφαι�εθο�νκατά την «Αποθήκευση»"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Εισάγετε μια λίστα διευθ�νσεων ηλ. ταχυδ�ομείου χ�ηστών των π�όσθετων Firefox διαχω�ισμένη με κόμματα"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Μόνο εγώ"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Εγώ και αυτοί οι χ�ήστες:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Π�οσθήκη"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Διαχεί�ιση συλλογής %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Διαχεί�ιση πε�ιεχομένων συλλογής"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Τ�έχοντα π�όσθετα:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Επιλογές για π�οχω�ημένους"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Διαχεί�ιση δικαιωμάτων συλλογής"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Ακ��ωση"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Διαγ�αφή εικονιδίου"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Αντικατάσταση εικονιδίου"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Το εικονίδιο θα αφαι�εθεί όταν κάνετε κλικ στο κουμπί «%1$s» πα�ακάτω"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Το ψευδώνυμο είναι διαθέσιμο"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Το ψευδώνυμο σας πε�ιείχε μη αποδεκτο�ς χα�ακτή�ες και διο�θώθηκε. Πα�ακαλο�με π�οσπαθήστε ξανά."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Το ψευδώνυμο χ�ησιμοποιείται ήδη"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Μπο�είτε να δείτε τη συλλογή σας σ' αυτή τη διε�θυνση:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Η συλλογή σας αποθηκε�τηκε με επιτυχία!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Ενημέ�ωση συλλογής"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Διαγ�αφή συλλογής"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Π�όσθετα"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Για π�οχω�ημένους"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Όνομα &amp; Λεπτομέ�ειες"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Δικαιώματα"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Π�όσθετα που μπο�ο�ν να π�οσέχουν τις δ�αστη�ιότητες των παιδιών σας και το ημε�ολόγιο σας."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Οικογενειακά"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Δείτε το Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Δημιου�γία συλλογής"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Εμπ�ός"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Δεν έχετε καμία συλλογή στις αγαπημένες σας ακόμη.</strong></p> <p>Μπο�είτε να έχετε ε�κολη π�όσβαση στις συλλογές που επισημαίνετε σαν αγαπημένες απ' αυτή τη σελίδα και επίσης θα εμφανίζονται στο π�όσθετο <a href='%1$s'>Add-on Collector</a> αν το έχετε εγκαταστήσει.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Δεν έχετε δημιου�γήσει ακόμη καμία συλλογή. Είναι ε�κολο να δημιου�γήσετε συλλογές και να π�οσθέσετε τα αγαπημένα σας π�όσθετα σ' αυτές.  <a href='%1$s'>Δοκιμάστε το</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Συλλογές"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "δημιου�γήθηκε από %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Τι είναι οι συλλογές;"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Ταξινόμηση με βάση"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Επιλογές συντακτών"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Οι αγαπημένες μου"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Οι συλλογές μου"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Δημοφιλείς"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Πιο δημοφιλείς όλων των και�ών"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Πιο δημοφιλείς αυτό τον μήνα"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Πιο π�όσφατες"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Πιο δημοφιλείς αυτή την εβδομάδα"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Υπά�χει ένας νέος τ�όπος να διαχει�ιστείτε και να β�είτε ενδιαφέ�οντα π�όσθετα. Σχολιάστε, μοι�αστείτε και συγχ�ονίστε συλλογές και όλα αυτά μέσα απ' τον πε�ιηγητή σας."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Οι συλλογές είναι σ�νολα σχετικών π�όσθετων που ομαδοποιο�νται για να μπο�ο�ν να μοι�αστο�ν ε�κολα."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Π�οστέθηκε"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Π�όσθετα που μπο�ο�ν να βελτιστοποιήσουν τις αναζητήσεις στο διαδίκτυο."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Πλη�οφο�ίες"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Π�όσθετα που μπο�ο�ν να διαχει�ιστο�ν τα κοινωνικά σας δίκτυα."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Κοινωνικά"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Κλείσιμο"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά την π�οσθήκη συλλογής στις αγαπημένες. Μήπως ήταν ήδη στις αγαπημένες η συλλογή;"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "�α μην εμφανιστεί ξανά."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "Η συλλογή «%1$s» π�οστέθηκε στις αγαπημένες σας."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Μπο�είτε τώ�α να εντοπίσετε γ�ήγο�α αυτή τη συλλογή από την κα�τέλα <a href=\"%1$s\">%2$s</a> του καταλόγου. Για ένα ακόμα πιο ε�κολο τ�όπο πα�ακολο�θησης των αγαπημένων σας συλλογών, δοκιμάστε την επέκταση <a href=\"%3$s\">Add-on Collector</a> για τον Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Η συλλογή διαγ�άφηκε."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Π�όσθετα που μπο�ο�ν να σας μετατ�έψουν σε ταξιδιωτικό π�άκτο�α."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Ταξιδιωτικά"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Αυτόματη δημοσίευση"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Επιλογές συντακτών"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Κανονική"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά την αφαί�εση συλλογής από τις αγαπημένες. Μήπως δεν άνηκε στις αγαπημένες η συλλογή;"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "Η συλλογή «%1$s» αφαι�έθηκε από τις αγαπημένες σας."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Π�όσθετα που θα σας διευκολ�νουν να φτιάξετε την τέλεια ιστοσελίδα."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Δημιου�γικά"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Τι είναι οι συλλογές;"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Διαβάστε τις συχνές ε�ωτήσεις"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Υπά�χει ένας νέος τ�όπος να διαχει�ιστείτε και να β�είτε ενδιαφέ�οντα π�όσθετα. Σχολιάστε, μοι�αστείτε και συγχ�ονίστε συλλογές και όλα αυτά μέσα απ' τον πε�ιηγητή σας."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Α�χική σελίδα του Add-on Collector"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Λήψη του Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Λογότυπο Add-on Collector"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Κέντ�ο συμβατότητας π�όσθετων"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Π�οετοιμαστείτε για την έκδοση του %1$s με τα ε�γαλεία και τις πλη�οφο�ίες που διαθέτουμε για την κοινότητα π�όσθετων του %2$s  και θα β�είτε πα�ακάτω."
+msgstr ""
+"Π�οετοιμαστείτε για την έκδοση του %1$s με τα ε�γαλεία και τις πλη�οφο�ίες "
+"που διαθέτουμε για την κοινότητα π�όσθετων του %2$s  και θα β�είτε πα�ακάτω."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Φό�τωση δεδομένων..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Πίσω στην κεντ�ική"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Αναφο�ά συμβατότητας π�όσθετου"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Πλη�οφο�ίες για δημιου�γο�ς π�όσθετων"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Π�οσα�μογή του maxVersion χω�ίς αποστολή"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Έλεγχος κατάστασης των π�όσθετων μου"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Αν φιλοξενο�νται π�όσθετα σας στον ιστότοπο π�όσθετων Mozilla, <a href=\"%1$s\">πα�ακαλο�με συνδεθείτε</a> για να δείτε την ανάλυση της κατάστασης του π�οσθέτου σας σε σχέση με τον %2$s."
+msgstr ""
+"Αν φιλοξενο�νται π�όσθετα σας στον ιστότοπο π�όσθετων Mozilla, <a href=\"%1$s"
+"\">πα�ακαλο�με συνδεθείτε</a> για να δείτε την ανάλυση της κατάστασης του "
+"π�οσθέτου σας σε σχέση με τον %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Λογότυπο κέντ�ου δημιου�γών Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Δεν φιλοξενείται κανένα π�όσθετο σας στον ιστότοπο π�όσθετων Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Αποτελέσματα ελέγχου κατάστασης π�όσθετου"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Ανάκτηση κατάστασης φιλοξενο�μενων π�όσθετων..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s χ�ήστες του %2$s  (%3$s&#37; του συνόλου)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Τα πα�ακάτω π�όσθετα αποτελο�ν το 95% των π�όσθετων σε χ�ήση που γνω�ίζει ο ο�γανισμός Mozilla και είναι ταξινομημένα κατά ποσοστό χ�ηστών."
+msgstr ""
+"Τα πα�ακάτω π�όσθετα αποτελο�ν το 95% των π�όσθετων σε χ�ήση που γνω�ίζει ο "
+"ο�γανισμός Mozilla και είναι ταξινομημένα κατά ποσοστό χ�ηστών."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Π�οβολή αναλυτικής αναφο�άς"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Από τα %1$s π�όσθετα που συνθέτουν το 95&#37; της χ�ήσης π�όσθετων που γνω�ίζει ο ο�γανισμός Mozilla, το <b>%2$s&#37;</b> θεω�είται π�ος το πα�όν συμβατό με τις πιο π�όσφατες εκδόσεις του %3$s."
+msgstr ""
+"Από τα %1$s π�όσθετα που συνθέτουν το 95&#37; της χ�ήσης π�όσθετων που "
+"γνω�ίζει ο ο�γανισμός Mozilla, το <b>%2$s&#37;</b> θεω�είται π�ος το πα�όν "
+"συμβατό με τις πιο π�όσφατες εκδόσεις του %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Δοκιμαστικές εκδόσεις άλφα"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Π�όσθετα συμβατά με  δοκιμαστική έκδοση άλφα του %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Δοκιμαστικές εκδόσεις βήτα"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Π�όσθετα συμβατά με δοκιμαστικές βήτα ή υποψήφιες για κυκλοφο�ία εκδόσεις του %1$s"
+msgstr ""
+"Π�όσθετα συμβατά με δοκιμαστικές βήτα ή υποψήφιες για κυκλοφο�ία εκδόσεις "
+"του %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Πιο π�όσφατη έκδοση"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Π�όσθετα που συμβαδίζουν με τις πιο π�όσφατες εκδόσεις του %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Άλλες εκδόσεις"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Π�όσθετα που δεν είναι συμβατά με καμία έκδοση του %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Αναφο�ά συμβατότητας π�όσθετου"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Πλη�οφο�ίες για τους χ�ήστες του π�όσθετου"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Π�οβολή αναφο�άς συμβατότητας"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Για πλη�οφο�ίες σχετικές με συνεισφο�ές, πα�ακαλο�με δείτε τη %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "σελίδα wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Ο ο�γανισμός Mozilla ευχα�ιστεί τους ακόλουθους ανθ�ώπους για τη συνεισφο�ά τους στο έ�γο addons.mozilla.org:"
+msgstr ""
+"Ο ο�γανισμός Mozilla ευχα�ιστεί τους ακόλουθους ανθ�ώπους για τη συνεισφο�ά "
+"τους στο έ�γο addons.mozilla.org:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Δημιου�γοί"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Συντάκτες"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Μεταφ�αστές"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Άλλες συνεισφο�ές"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Πα�ελθόντες δημιου�γοί"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Λογισμικό και γ�αφικά"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Με�ικά από τα εικονίδια που χ�ησιμοποιο�νται είναι τμήμα του <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, και φέ�ουν την άδεια χ�ήσης <a href=\"http://creativecommons.org/licenses/by/2.5/deed.el\">Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Με�ικά από τα εικονίδια που χ�ησιμοποιο�νται είναι τμήμα του <a href="
+"\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, "
+"και φέ�ουν την άδεια χ�ήσης <a href=\"http://creativecommons.org/licenses/"
+"by/2.5/deed.el\">Creative Commons Attribution 2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
-msgstr "Με�ικές σελίδες χ�ησιμοποιο�ν στοιχεία του <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, που εκδίδεται σ�μφωνα με την <a href=\"http://simile.mit.edu/license.html\">άδεια BSD</a>."
+msgstr ""
+"Με�ικές σελίδες χ�ησιμοποιο�ν στοιχεία του <a href=\"http://www.simile-"
+"widgets.org/timeplot/\">Timeplot</a>, που εκδίδεται σ�μφωνα με την <a href="
+"\"http://simile.mit.edu/license.html\">άδεια BSD</a>."
 
 # date format string as used in PHP's strftime():
 # http://php.net/strftime
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2418,8 +1311,7 @@ msgstr "%e %B %Y"
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e %B  %Y, %I:%M %p"
@@ -2447,29 +1339,50 @@ msgstr "Ταμπλό στατιστικών"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
-msgstr "Το α�χείο  %1$s έχει μη έγκυ�η κατάληξη (%2$s). Επιτ�επόμενες καταλήξεις: %3$s"
+msgstr ""
+"Το α�χείο  %1$s έχει μη έγκυ�η κατάληξη (%2$s). Επιτ�επόμενες καταλήξεις: %3"
+"$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
-msgstr "Το α�χείο %s δεν ήταν δυνατό να αποθηκευθεί στη βάση δεδομένων. Πα�ακαλο�με π�οσπαθήστε ξανά."
+msgstr ""
+"Το α�χείο %s δεν ήταν δυνατό να αποθηκευθεί στη βάση δεδομένων. Πα�ακαλο�με "
+"π�οσπαθήστε ξανά."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
-msgstr "Η εικόνα π�οεπισκόπησης %1$s αντικαταστάθηκε με επιτυχία από το α�χείο %2$s successfully."
+msgstr ""
+"Η εικόνα π�οεπισκόπησης %1$s αντικαταστάθηκε με επιτυχία από το α�χείο %2$s "
+"successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
-msgstr "Το α�χείο %s μεταφέ�θηκε με επιτυχία. Πα�ακάτω, μπο�είτε να π�οσθέσετε μια λεζάντα."
+msgstr ""
+"Το α�χείο %s μεταφέ�θηκε με επιτυχία. Πα�ακάτω, μπο�είτε να π�οσθέσετε μια "
+"λεζάντα."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(αυτόματος εντοπισμός)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Αυτή η έκδοση του π�οσθέτου σας δεν φαίνεται να είναι συμβατή με τον Firefox "
+"%1$s. Η επόμενη έκδοση του Firefox θα εκδοθεί σ�ντομα από τον ο�γανισμό "
+"Mozilla, οπότε σας πα�ακαλο�με να δοκιμάσετε το π�όσθετό σας  με τη νέα "
+"έκδοση και να ελέγξετε τη συμβατότητά του. Μπο�είτε να β�είτε πε�ισσότε�ες "
+"πλη�οφο�ίες <a href=\"%2$s\">εδώ</a>. Αυτή είναι μια απλή ειδοποίηση, "
+"μπο�είτε να υποβάλετε κανονικά αυτή την έκδοση στο addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Άνοιγμα σε νέο πα�άθυ�ο"
@@ -2506,70 +1419,150 @@ msgstr "Βήμα 5ο: Επιτυχία"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Βοήθεια υποβολής"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Το π�όσθετο απενε�γοποιήθηκε επιτυχώς"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Επεξε�γασία π�όσθετου"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Το π�όσθετο ενε�γοποιήθηκε επιτυχώς"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Πε�ιγ�αφή π�όσθετου"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "Συμφωνητικό αδειοδότησης τελικο� χ�ήστη"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Α�χική σελίδα π�όσθετου"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Όνομα π�όσθετου"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Λεζάντα π�οεπισκόπησης"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Πολιτική απο��ήτου"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Σ�νοψη π�όσθετου"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Διε�θυνση ηλ. ταχυδ�ομείου υποστή�ιξης"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL υποστή�ιξης"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Σημειώσεις έκδοσης"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Υποψηφιότητα π�όσθετου"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Το π�όσθετο τέθηκε σε υποψηφιότητα επιτυχώς"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Ενε�γοποίηση"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Κάντε το π�όσθετο σας ενε�γό για να πα�ουσιάζεται στις δημόσιες λίστες και να ανταποκ�ίνεται στον έλεγχο αυτόματων ενημε�ώσεων."
+msgstr ""
+"Κάντε το π�όσθετο σας ενε�γό για να πα�ουσιάζεται στις δημόσιες λίστες και "
+"να ανταποκ�ίνεται στον έλεγχο αυτόματων ενημε�ώσεων."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Ολοκλή�ωση π�όσθετου"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Ολοκλη�ώστε το π�όσθετο σας και μεταφέ�ετε το στο Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Απενε�γοποίηση"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Απενε�γοποιήστε το π�όσθετο σας, αποκ��ψετε το έτσι από όλες τις δημόσιες λίστες και απενε�γοποιήστε την ανταπόκ�ιση στην υπη�εσία ελέγχου για ενημε�ώσεις."
+msgstr ""
+"Απενε�γοποιήστε το π�όσθετο σας, αποκ��ψετε το έτσι από όλες τις δημόσιες "
+"λίστες και απενε�γοποιήστε την ανταπόκ�ιση στην υπη�εσία ελέγχου για "
+"ενημε�ώσεις."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Μεταφο�ά στο Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
-msgstr "Μεταφέ�ετε το π�όσθετο σας πίσω στο Sandbox. Η ενέ�γεια είναι αναστ�έψιμη."
+msgstr ""
+"Μεταφέ�ετε το π�όσθετο σας πίσω στο Sandbox. Η ενέ�γεια είναι αναστ�έψιμη."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Θέστε υποψηφιότητα για το δημόσιο χώ�ο"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Θέστε το π�όσθετο σας σε υποψηφιότητα για να π�οστεθεί στο δημόσιο χώ�ο."
+msgstr ""
+"Θέστε το π�όσθετο σας σε υποψηφιότητα για να π�οστεθεί στο δημόσιο χώ�ο."
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Μεταφο�ά στο δημόσιο χώ�ο"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Μεταφέ�ετε το π�όσθετο σας και πάλι στο δημόσιο χώ�ο."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
-msgstr "Το π�όσθετο σας είναι <span class=\"inactive-0\">ενε�γό</span>. Αυτό σημαίνει ωπς θα εμφανίζεται σε όλους τους διαθέσιμους χώ�ους που αναλογο�ν στην κατάσταση του."
+msgstr ""
+"Το π�όσθετο σας είναι <span class=\"inactive-0\">ενε�γό</span>. Αυτό "
+"σημαίνει ωπς θα εμφανίζεται σε όλους τους διαθέσιμους χώ�ους που αναλογο�ν "
+"στην κατάσταση του."
 
 #: views/developers/addon_status.thtml:111
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Πα�ακαλο�με φ�οντίστε το π�όσθετο σας να πλη�εί τα πα�απάνω κ�ιτή�ια για να μπο�έσετε να το ολοκλη�ώσετε και να το μεταφέ�ετε στο <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"Πα�ακαλο�με φ�οντίστε το π�όσθετο σας να πλη�εί τα πα�απάνω κ�ιτή�ια για να "
+"μπο�έσετε να το ολοκλη�ώσετε και να το μεταφέ�ετε στο <span class=\"status-1"
+"\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Μπο�είτε τώ�α να ολοκλη�ώσετε το π�όσθετο σας και να το μετακινήσετε στο <span class=\"status-1\">Sandbox</span> κάνωντας κλικ στο πα�ακάτω κουμπί."
+msgstr ""
+"Μπο�είτε τώ�α να ολοκλη�ώσετε το π�όσθετο σας και να το μετακινήσετε στο "
+"<span class=\"status-1\">Sandbox</span> κάνωντας κλικ στο πα�ακάτω κουμπί."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2583,13 +1576,19 @@ msgstr "Απαιτείται πε�ιγ�αφή του π�όσθετου"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Απαιτείται όνομα για το π�όσθετο"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Το π�όσθετο δεν έχει ο�ιστεί σαν π�ο-έκδοση."
 
 #: views/developers/addon_status.thtml:119
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Απαιτείται τουλάχιστον μια εικόνα π�οεπισκόπησης για επεκτάσεις και θέματα."
+msgstr ""
+"Απαιτείται τουλάχιστον μια εικόνα π�οεπισκόπησης για επεκτάσεις και θέματα."
+
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr ""
+"Α�κετές αξιολογήσεις από χ�ήστες για το π�όσθετο (Πιθανόν εκτός ιστοτόπου)."
 
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
@@ -2600,12 +1599,12 @@ msgstr "Απαιτείται σ�νοψη για το π�όσθετο"
 msgid "devcp_addon_status_header"
 msgstr "Κατάσταση π�όσθετου: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Διαθέσιμες ενέ�γειες"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Κατάσταση ενε�γοποίησης: <span class=\"inactive-0\">Ενε�γό</span>"
 
@@ -2613,7 +1612,7 @@ msgstr "Κατάσταση ενε�γοποίησης: <span class=\"inactive-0\
 msgid "devcp_addon_status_header_criteria"
 msgstr "Κ�ιτή�ια ολοκλή�ωσης π�όσθετου"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Κατάσταση ενε�γοποίησης: <span class=\"inactive-1\">Ανενε�γό</span>"
 
@@ -2621,21 +1620,29 @@ msgstr "Κατάσταση ενε�γοποίησης: <span class=\"inactive-1\
 msgid "devcp_addon_status_header_nomination"
 msgstr "Κ�ιτή�ια υποψηφιότητας για το δημόσιο χώ�ο"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Κατάσταση εμπιστοσ�νης: <span class=\"status-4\">Έμπιστο</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
-msgstr "Το π�όσθετο σας είναι <span class=\"inactive-1\">ανενε�γό</span>. Αυτό σημαίνει ότι το π�όσθετο σας δεν θα εμφανίζεται πουθενά, άσχετα με την πα�απάνω κατάσταση του.  <b>Δεν</b> θα πα�έχονται ενημε�ώσεις για το π�όσθετο σας από το σ�στημα αυτόματου ελέγχου ενημε�ώσεων."
+msgstr ""
+"Το π�όσθετο σας είναι <span class=\"inactive-1\">ανενε�γό</span>. Αυτό "
+"σημαίνει ότι το π�όσθετο σας δεν θα εμφανίζεται πουθενά, άσχετα με την "
+"πα�απάνω κατάσταση του.  <b>Δεν</b> θα πα�έχονται ενημε�ώσεις για το "
+"π�όσθετο σας από το σ�στημα αυτόματου ελέγχου ενημε�ώσεων."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Πα�ακαλο�με φ�οντίστε το π�όσθετο σας να πλη�εί τα πα�απάνω κ�ιτή�ια π�ιν το θέσετε σε υποψηφιότητα για τον <span class=\"status-4\">δημόσιο χώ�ο</span>."
+msgstr ""
+"Πα�ακαλο�με φ�οντίστε το π�όσθετο σας να πλη�εί τα πα�απάνω κ�ιτή�ια π�ιν το "
+"θέσετε σε υποψηφιότητα για τον <span class=\"status-4\">δημόσιο χώ�ο</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Μπο�είτε τώ�α να θέσετε το π�όσθετο σας σε υποψηφιότητα για τον <span class=\"status-4\">δημόσιο χώ�ο</span> κάνοντας κλικ στο πα�ακάτω κουμπί."
+msgstr ""
+"Μπο�είτε τώ�α να θέσετε το π�όσθετο σας σε υποψηφιότητα για τον <span class="
+"\"status-4\">δημόσιο χώ�ο</span> κάνοντας κλικ στο πα�ακάτω κουμπί."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2648,30 +1655,56 @@ msgstr "Sandbox"
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Το π�όσθετο σας <span class=\"status-5\">απενε�γοποιήθηκε</span> από κάποιον διαχει�ιστή και δεν μπο�εί να χ�ησιμοποιηθεί. Αν θέλετε να μαθέτε το λόγο, πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %s."
+msgstr ""
+"Το π�όσθετο σας <span class=\"status-5\">απενε�γοποιήθηκε</span> από κάποιον "
+"διαχει�ιστή και δεν μπο�εί να χ�ησιμοποιηθεί. Αν θέλετε να μαθέτε το λόγο, "
+"πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %s."
 
 #: views/developers/addon_status.thtml:67
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Το π�όσθετο σας είναι π�ος το πα�όν <span class=\"status-0\">ημιτελές</span>. Αυτό σημαίνει ότι το π�όσθετο σας δεν εμφανίζεται σε κανένα χώ�ο του ιστότοπου η στην υπη�εσία  ελέγχου για ενημε�ώσεις. Μπο�είτε να επιστ�έψετε σ' αυτή τη σελίδα για να ολοκλη�ώσετε το π�όσθετο σας όταν θα πλη�εί τα πα�ακάτω κ�ιτή�ια για να θεω�ηθεί ολοκλη�ωμένο και να το μεταφέ�ετε στο <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"Το π�όσθετο σας είναι π�ος το πα�όν <span class=\"status-0\">ημιτελές</"
+"span>. Αυτό σημαίνει ότι το π�όσθετο σας δεν εμφανίζεται σε κανένα χώ�ο του "
+"ιστότοπου η στην υπη�εσία  ελέγχου για ενημε�ώσεις. Μπο�είτε να επιστ�έψετε "
+"σ' αυτή τη σελίδα για να ολοκλη�ώσετε το π�όσθετο σας όταν θα πλη�εί τα "
+"πα�ακάτω κ�ιτή�ια για να θεω�ηθεί ολοκλη�ωμένο και να το μεταφέ�ετε στο "
+"<span class=\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Το π�όσθετο σας β�ίσκεται σε κατάσταση υποψηφιότητας για να μεταφε�θεί στο <span class=\"status-4\">δημόσιο χώ�ο</span> και πε�ιμένει την αξιολόγηση του από κάποιον συντάκτη. Υπά�χουν π�ος το πα�όν %s άλλα υποψήφια π�όσθετα στην ου�ά αναμονής."
+msgstr ""
+"Το π�όσθετο σας β�ίσκεται σε κατάσταση υποψηφιότητας για να μεταφε�θεί στο "
+"<span class=\"status-4\">δημόσιο χώ�ο</span> και πε�ιμένει την αξιολόγηση "
+"του από κάποιον συντάκτη. Υπά�χουν π�ος το πα�όν %s άλλα υποψήφια π�όσθετα "
+"στην ου�ά αναμονής."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 msgid "devcp_addon_status_switch_pending"
-msgstr "Το π�όσθετο σας είναι σε αναμονή. Αυτό είναι κάτι που δεν θα έπ�επε να συμβεί κανονικά. Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %s, δώστε το αναγνω�ιστικό (ID) του π�όσθετου σας και αναφέ�ετε αυτό το σφάλμα."
+msgstr ""
+"Το π�όσθετο σας είναι σε αναμονή. Αυτό είναι κάτι που δεν θα έπ�επε να "
+"συμβεί κανονικά. Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %s, δώστε το "
+"αναγνω�ιστικό (ID) του π�όσθετου σας και αναφέ�ετε αυτό το σφάλμα."
 
 #: views/developers/addon_status.thtml:85
 msgid "devcp_addon_status_switch_public"
-msgstr "Το π�όσθετο σας είναι στο <span class=\"status-4\">δημόσιο χώ�ο</span>, που σημαίνει ότι θα εμφανίζεται σε όλες τις λίστες και στα αποτελέσματα αναζήτησης και θα μπο�εί να γίνει λήψη του χω�ίς πε�ιο�ισμο�ς. Επίσης, θα πα�έχονται ενημε�ώσεις για το π�όσθετο σας μέσω της ενσωματωμένης υπη�εσίας αυτόματου ελέγχου για ενημε�ώσεις."
+msgstr ""
+"Το π�όσθετο σας είναι στο <span class=\"status-4\">δημόσιο χώ�ο</span>, που "
+"σημαίνει ότι θα εμφανίζεται σε όλες τις λίστες και στα αποτελέσματα "
+"αναζήτησης και θα μπο�εί να γίνει λήψη του χω�ίς πε�ιο�ισμο�ς. Επίσης, θα "
+"πα�έχονται ενημε�ώσεις για το π�όσθετο σας μέσω της ενσωματωμένης υπη�εσίας "
+"αυτόματου ελέγχου για ενημε�ώσεις."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Το π�όσθετο σας β�ίσκεται στο <span class=\"status-1\">Sandbox</span>, π�άγμα που σημαίνει ότι θα εμφανίζεται στην πε�ιήγηση και στα αποτελέσματα, αλλά οι χ�ήστες θα π�έπει να συνδεθο�ν για να το εγκαταστήσουν. <b>Δεν</b> πα�έχονται ενημε�ώσεις στους χ�ήστες μέσω του συστήματος αυτόματου ελέγχου ενημε�ώσεων."
+msgstr ""
+"Το π�όσθετο σας β�ίσκεται στο <span class=\"status-1\">Sandbox</span>, "
+"π�άγμα που σημαίνει ότι θα εμφανίζεται στην πε�ιήγηση και στα αποτελέσματα, "
+"αλλά οι χ�ήστες θα π�έπει να συνδεθο�ν για να το εγκαταστήσουν. <b>Δεν</b> "
+"πα�έχονται ενημε�ώσεις στους χ�ήστες μέσω του συστήματος αυτόματου ελέγχου "
+"ενημε�ώσεων."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2680,9 +1713,132 @@ msgstr "Το π�όσθετο σας β�ίσκεται στο <span class=\"sta
 msgid "devcp_addon_status_title"
 msgstr "Κατάσταση %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
-msgstr "Το π�όσθετο σας είναι <span class=\"status-4\">έμπιστο</span>. Αυτό σημαίνει ότι μπο�είτε να υποβάλετε νέες εκδόσεις για το π�όσθετο σας χω�ίς να πε�άσουν από αξιολόγηση συντάκτη."
+msgstr ""
+"Το π�όσθετο σας είναι <span class=\"status-4\">έμπιστο</span>. Αυτό σημαίνει "
+"ότι μπο�είτε να υποβάλετε νέες εκδόσεις για το π�όσθετο σας χω�ίς να "
+"πε�άσουν από αξιολόγηση συντάκτη."
+
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Επισκεφθείτε τη σελίδα %1$s για να κάνετε αλλαγές στην εισαγωγή σας, ή %2$s "
+"για να επιστ�έψετε στον πίνακα ελέγχου δημιου�γών."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "κάντε κλικ εδώ"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Επεξε�γασία π�όσθετου"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Η έκδοση αυτή έχει τοποθετηθεί στο sandbox και αναμένεται αξιολόγησή της από "
+"τους ελεγκτές του καθώς και από κάποιον συντάκτη π�όσθετων του ο�γανισμο� "
+"Mozilla. Θα ενημε�ωθείτε με μήνυμα ηλ. ταχυδ�ομείου όταν π�αγματοποιηθο�ν οι "
+"ενέ�γειες αυτές."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Μπο�είτε να διαβάσετε πε�ισσότε�α για το σ�στημα αξιολογήσεων του Sandbox %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "εδώ"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Αυτή η έκδοση έχει τοποθετηθεί στο sandbox και θα μπο�εί να χ�ησιμοποιηθεί "
+"μόνο από έμπει�ους χ�ήστες. Για να εμφανιστεί στο δημόσιο χώ�ο, θα π�έπει να "
+"υποβάλετε  %s για το π�όσθετό σας και να πε�άσει από μια διαδικασία "
+"αξιολόγησης."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "υποψηφιότητα"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Η υποβολή του π�οσθέτου σας ολοκλη�ώθηκε επιτυχώς."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Επειδή το π�όσθετό σας θεω�είται έμπιστο, αυτή η έκδοση εγκ�ίθηκε αυτόματα "
+"για το δημόσιο χώ�ο."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Υποβολή π�όσθετου"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Το π�όσθετο ενημε�ώθηκε επιτυχώς"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"Καλό θα ήταν να π�οχω�ήσετε σε %s για να αυξήσετε το ενδιαφέ�ον σχετικά με "
+"το π�όσθετό σας."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "αποστολή π�οεπισκόπησης"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Δε β�έθηκε ο δημιου�γός [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Αφαί�εση"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Ακ��ωση"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Θέλετε να ακυ�ωθεί το αίτημα υποβολής;"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Επόμενο"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Αλλαγή τ�που π�όσθετου:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Ενημε�ώθηκαν τα σχόλια δημιου�γο�."
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
@@ -2702,7 +1858,10 @@ msgstr "Αλλαγή κατάστασης"
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Το π�όσθετο σας απενε�γοποιήθηκε από κάποιον διαχει�ιστή μας και δεν μπο�εί να χ�ησιμοποιηθεί. Για οποιαδήποτε απο�ία  πα�ακαλο�με στείλτε ένα μήνυμα στη διε�θυνση ηλ. ταχυδ�ομείου %s."
+msgstr ""
+"Το π�όσθετο σας απενε�γοποιήθηκε από κάποιον διαχει�ιστή μας και δεν μπο�εί "
+"να χ�ησιμοποιηθεί. Για οποιαδήποτε απο�ία  πα�ακαλο�με στείλτε ένα μήνυμα "
+"στη διε�θυνση ηλ. ταχυδ�ομείου %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2728,7 +1887,10 @@ msgstr "Τελευταία επεξε�γασία στις %s"
 
 #: views/developers/dashboard.thtml:111
 msgid "devcp_dashboard_learn"
-msgstr "Δεν φιλοξενείται π�ος το πα�όν κανένα π�όσθετο σας στον ιστότοπο π�όσθετων του Mozilla.  Για να μάθετε τη διαδικασία και να υποβάλετε το π�ώτο σας π�όσθετο, κάντε κλικ στο πα�ακάτω κουμπί «Ξεκινήστε»."
+msgstr ""
+"Δεν φιλοξενείται π�ος το πα�όν κανένα π�όσθετο σας στον ιστότοπο π�όσθετων "
+"του Mozilla.  Για να μάθετε τη διαδικασία και να υποβάλετε το π�ώτο σας "
+"π�όσθετο, κάντε κλικ στο πα�ακάτω κουμπί «Ξεκινήστε»."
 
 #: views/developers/dashboard.thtml:112
 msgid "devcp_dashboard_start"
@@ -2743,33 +1905,182 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Αποστολή νέας έκδοσης"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
-msgstr "Η εικόνα π�οεπισκόπησης  %s δεν ήταν δυνατό να διαγ�αφεί από τη βάση δεδομένων. Πα�ακαλο�με π�οσπαθήστε ξανά."
+msgstr ""
+"Η εικόνα π�οεπισκόπησης  %s δεν ήταν δυνατό να διαγ�αφεί από τη βάση "
+"δεδομένων. Πα�ακαλο�με π�οσπαθήστε ξανά."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Η εικόνα π�οεπισκόπησης %s διαγ�άφηκε με επιτυχία."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "Δεν έχετε τα δικαιώματα για να διαγ�άψετε εκδόσεις ή α�χεία."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s %2$s α�χείο"
-msgstr[1] "%1$s %2$s α�χεία"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Π�οσθήκη εικόνας π�οεπισκόπησης"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Δημιου�γός"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Δημιου�γοί"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Κανείς"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Κατηγο�ίες"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Κατηγο�ία"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Πε�ιγ�αφή"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Απενε�γοποιημένο"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Λεπτομέ�ειες"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Σχόλια δημιου�γο�"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Εικόνες π�οεπισκόπησης"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Εκδόσεις"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Α�χική σελίδα"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Δεν υπά�χει"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Χω�ίς λεζάντα"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Δε β�έθηκαν εικόνες π�οεπισκόπησης."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Ενημέ�ωση"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Διε�θυνση ηλ. ταχυδ�ομείου υποστή�ιξης"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr ""
+"Ο δημιου�γός δεν πα�έχει διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για υποστή�ιξη."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL υποστή�ιξης"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Ο δημιου�γός δεν πα�έχει url υποστή�ιξης."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Έμπιστο"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Έκδοση %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Δε β�έθηκε α�ιθμός έκδοσης."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Ακ��ωση και επιστ�οφή"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "�αι , απενε�γοποίηση"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Θέλετε σίγου�α να απενε�γοποιηθεί αυτό το π�όσθετο;"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Η απενε�γοποίηση αυτο� του π�όσθετου θα το αποκ��ψει από τη δυνατότητα "
+"αναζήτησης και την πα�ουσίαση. Δεν θα είναι δυνατή η λήψη του από τον "
+"ιστότοπο και δε θα εμφανίζεται στους ελέγχους ενημε�ώσεων από την πλευ�ά των "
+"χ�ηστών. Το π�όσθετο θα διαγ�αφεί αλλά θα έχετε τη δυνατότητα να επιστ�έψετε "
+"εδώ και να το ενε�γοποιήσετε εκ νέου όταν επιθυμείτε."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Απενε�γοποίηση του %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "�αι, ενε�γοποίηση"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Θέλετε σίγου�α να ενε�γοποιηθεί αυτό το π�όσθετο;"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Η ενε�γοποιήση του π�όσθετου σημαίνει ότι θα εμφανίζεται ξανά στις "
+"αναζητήσεις και τις πα�ουσιάσεις. Θα είναι δυνατή η λήψη του και από τον "
+"ιστότοπο αλλά και μέσω του συστήματος ελέγχου για ενημε�ώσεις π�όσθετων του "
+"πε�ιηγητή."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Ενε�γοποίηση του %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Π�οσθήκη απάντησης"
@@ -2782,17 +2093,23 @@ msgstr "Απαντήσεις"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "Πα�ουσιάστηκε σφάλμα κατά την αποθήκευση της απάντησης σας. Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %1$s για να επιλυθεί το π�όβλημα."
+msgstr ""
+"Πα�ουσιάστηκε σφάλμα κατά την αποθήκευση της απάντησης σας. Πα�ακαλο�με "
+"επικοινωνήστε με τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου %1$s για να επιλυθεί "
+"το π�όβλημα."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "Ένας από τους συντάκτες αξιολογήσεων του ιστότοπου π�όσθετων Mozilla  ζήτησε πε�αιτέ�ω πλη�οφο�ίες σχετικά με την έκδοση %2$s του π�όσθετου %1$s."
+msgstr ""
+"Ένας από τους συντάκτες αξιολογήσεων του ιστότοπου π�όσθετων Mozilla  ζήτησε "
+"πε�αιτέ�ω πλη�οφο�ίες σχετικά με την έκδοση %2$s του π�όσθετου %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
 msgid "devcp_discuss_pagetitle"
-msgstr "Πα�αθέστε πε�ισσότε�ες πλη�οφο�ίες για την αξιολόγηση του π�όσθετου %1$s"
+msgstr ""
+"Πα�αθέστε πε�ισσότε�ες πλη�οφο�ίες για την αξιολόγηση του π�όσθετου %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
@@ -2801,86 +2118,105 @@ msgstr "Υποβολή απάντησης"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "Η απάντηση σας αποθηκε�θηκε με επιτυχία. Όσοι συμμετέχουν στη συζήτηση θα ειδοποιηθο�ν με μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου."
+msgstr ""
+"Η απάντηση σας αποθηκε�θηκε με επιτυχία. Όσοι συμμετέχουν στη συζήτηση θα "
+"ειδοποιηθο�ν με μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "Συντάχθηκε από  %1$s στις %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Π�οσθήκη δημιου�γο�"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου δημιου�γο�"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Αφαί�εση"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Π�οσθήκη νέου δημιου�γο�"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Π�οσθήκη δημιου�γο�"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "Διε�θυνση ηλ. ταχυδ�ομείου δημιου�γο�:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Γίνεται έλεγχος διε�θυνσης ηλ. ταχυδ�ομείου λογα�ιασμο�..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Κάντε κλικ στο «Ενημέ�ωση δημιου�γών» πα�ακάτω για αποθήκευση."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Τ�έχοντες δημιου�γοί"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Διαχεί�ιση δημιου�γών π�όσθετου"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "�α εμφανίζεται ως δημιου�γός στις δημόσιες σελίδες"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Δημιου�γός</strong> - Μπο�εί να διαχει�ιστεί όλες τις ιδιότητες του π�όσθετου, εκτός από το να π�οσθαφαι�έσει άλλους δημιου�γο�ς."
+msgstr ""
+"<strong>Δημιου�γός</strong> - Μπο�εί να διαχει�ιστεί όλες τις ιδιότητες του "
+"π�όσθετου, εκτός από το να π�οσθαφαι�έσει άλλους δημιου�γο�ς."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Ιδιοκτήτης</strong> - Μπο�εί να διαχει�ιστεί όλες τις ιδιότητες του π�όσθετου, συμπε�ιλαμβανομένης και της π�οσθαφαί�εσης δημιου�γών."
+msgstr ""
+"<strong>Ιδιοκτήτης</strong> - Μπο�εί να διαχει�ιστεί όλες τις ιδιότητες του "
+"π�όσθετου, συμπε�ιλαμβανομένης και της π�οσθαφαί�εσης δημιου�γών."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Θεατής</strong> - Μπο�εί να δει τις καταχω�ήσεις και τα στατιστικά όπως και οι δημιου�γοί αλλά δεν μπο�εί να κάνει αλλαγές."
+msgstr ""
+"<strong>Θεατής</strong> - Μπο�εί να δει τις καταχω�ήσεις και τα στατιστικά "
+"όπως και οι δημιου�γοί αλλά δεν μπο�εί να κάνει αλλαγές."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Επιλέξτε �όλο για τον δημιου�γό:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Δημιου�γός"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Δηλωμένοι"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Ρόλος"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Ενημέ�ωση δημιου�γών"
 
@@ -2903,7 +2239,8 @@ msgstr "Διαχεί�ιση κατηγο�ιών π�όσθετου"
 
 #: views/developers/addon_edit_categories.thtml:91
 msgid "devcp_edit_categories_hover"
-msgstr "Μετακινήστε το ποντίκι πάνω από μια κατηγο�ία για να δείτε την πε�ιγ�αφή της."
+msgstr ""
+"Μετακινήστε το ποντίκι πάνω από μια κατηγο�ία για να δείτε την πε�ιγ�αφή της."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
@@ -2913,11 +2250,14 @@ msgstr "%s κατηγο�ία"
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
 msgid "devcp_edit_categories_none_available"
-msgstr "Δεν υπά�χουν διαθέσιμες κατηγο�ίες γι' αυτό τον τ�πο π�όσθετου και εφα�μογής."
+msgstr ""
+"Δεν υπά�χουν διαθέσιμες κατηγο�ίες γι' αυτό τον τ�πο π�όσθετου και εφα�μογής."
 
 #: views/developers/addon_edit_categories.thtml:86
 msgid "devcp_edit_categories_other"
-msgstr "Βάλτε το π�όσθετο σας σ' αυτή την κατηγο�ία μόνο αν δεν ται�ιάζει σε καμία από τις διαθέσιμες."
+msgstr ""
+"Βάλτε το π�όσθετο σας σ' αυτή την κατηγο�ία μόνο αν δεν ται�ιάζει σε καμία "
+"από τις διαθέσιμες."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -2926,69 +2266,96 @@ msgstr "Επιλέξτε μέχ�ι 3 κατηγο�ίες του %s για το
 
 #: views/developers/addon_edit.thtml:47
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Π�οσθέστε ή αφαι�έστε χ�ήστες που θα μπο�ο�ν να διαχει�ιστο�ν αυτό το π�όσθετο."
+msgstr ""
+"Π�οσθέστε ή αφαι�έστε χ�ήστες που θα μπο�ο�ν να διαχει�ιστο�ν αυτό το "
+"π�όσθετο."
 
 #: views/developers/addon_edit.thtml:49
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Επιλέξτε τις σχετικές κατηγο�ίες για κάθε εφα�μογή που υποστη�ίζεται από το π�όσθετο σας."
+msgstr ""
+"Επιλέξτε τις σχετικές κατηγο�ίες για κάθε εφα�μογή που υποστη�ίζεται από το "
+"π�όσθετο σας."
 
 #: views/developers/addon_edit.thtml:51
 msgid "devcp_edit_dd_manage_description"
-msgstr "Π�οσθέστε και επεξε�γαστείτε μεταφ�άσεις για τη σ�νοψη, την πε�ιγ�αφή, την αδειοδότηση τελικο� χ�ήστη και την πολιτική απο��ήτου του π�όσθετου σας."
+msgstr ""
+"Π�οσθέστε και επεξε�γαστείτε μεταφ�άσεις για τη σ�νοψη, την πε�ιγ�αφή, την "
+"αδειοδότηση τελικο� χ�ήστη και την πολιτική απο��ήτου του π�όσθετου σας."
 
 #: views/developers/addon_edit.thtml:53
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Αλλάξτε το όνομα του π�όσθετου σας, την α�χική του σελίδα, το εικονίδιο του και άλλoυς διακόπτες."
+msgstr ""
+"Αλλάξτε το όνομα του π�όσθετου σας, την α�χική του σελίδα, το εικονίδιο του "
+"και άλλoυς διακόπτες."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Ενημέ�ωση πε�ιγ�αφών"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Πα�ακαλο�με διο�θώστε τα πα�απάνω σημειωμένα με κόκκινο σφάλματα."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Επεξε�γασία πε�ιγ�αφών π�όσθετου"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Οποιαδήποτε πλη�οφο�ία μπο�εί να ενδιαφέ�ει τους τελικο�ς χ�ήστες και δεν είναι απα�αίτητη στη σ�νοψη ή την πε�ιγ�αφή του π�όσθετου. Χ�ησιμοποιείται συχνά για την αναφο�ά σημαντικών π�οβλημάτων,  πλη�οφο�ίες για το πως μπο�εί να γίνει αναφο�ά π�οβλημάτων, αναμενόμενες ημε�ομηνίες νέων εκδόσεων κλπ."
+msgstr ""
+"Οποιαδήποτε πλη�οφο�ία μπο�εί να ενδιαφέ�ει τους τελικο�ς χ�ήστες και δεν "
+"είναι απα�αίτητη στη σ�νοψη ή την πε�ιγ�αφή του π�όσθετου. Χ�ησιμοποιείται "
+"συχνά για την αναφο�ά σημαντικών π�οβλημάτων,  πλη�οφο�ίες για το πως μπο�εί "
+"να γίνει αναφο�ά π�οβλημάτων, αναμενόμενες ημε�ομηνίες νέων εκδόσεων κλπ."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Σχόλια δημιου�γο�"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "Η πε�ιγ�αφή του π�όσθετου σας είναι μια εκτενέστε�η επεξήγηση των χα�ακτη�ιστικών του, της λειτου�γίας του και άλλων πλη�οφο�ιών. Εμφανίζεται κάτω από τη σ�νοψη στη σελίδα του π�όσθετου."
+msgstr ""
+"Η πε�ιγ�αφή του π�όσθετου σας είναι μια εκτενέστε�η επεξήγηση των "
+"χα�ακτη�ιστικών του, της λειτου�γίας του και άλλων πλη�οφο�ιών. Εμφανίζεται "
+"κάτω από τη σ�νοψη στη σελίδα του π�όσθετου."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Πε�ιγ�αφή π�όσθετου"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Αν το π�όσθετο σας συνοδε�εται από συμφωνητικό αδειοδότησης τελικο� χ�ήστη (EULA), πα�ακαλο�με εισάγετε το κείμενο του πα�ακάτω. Αν ο�ιστεί, οι χ�ήστες θα π�έπει να δώσουν τη συγκατάθεση τους για να εγκαταστήσουν το π�όσθετο σας. Πα�ακαλο�με σημειώστε πως   ένα EULA iδεν είναι το ίδιο με μια άδεια λογισμικο� όπως οι GPL ή  MPL."
+msgstr ""
+"Αν το π�όσθετο σας συνοδε�εται από συμφωνητικό αδειοδότησης τελικο� χ�ήστη "
+"(EULA), πα�ακαλο�με εισάγετε το κείμενο του πα�ακάτω. Αν ο�ιστεί, οι χ�ήστες "
+"θα π�έπει να δώσουν τη συγκατάθεση τους για να εγκαταστήσουν το π�όσθετο "
+"σας. Πα�ακαλο�με σημειώστε πως   ένα EULA iδεν είναι το ίδιο με μια άδεια "
+"λογισμικο� όπως οι GPL ή  MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Αδειοδότηση τελικο� χ�ήστη (EULA)"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Αν το π�όσθετο σας έχει ξεχω�ιστή πολιτική απο��ήτου εισάγετε το κείμενο της εδώ. Στη σελίδα του π�όσθετου, θα εμφανίζεται δεσμός γι' αυτή την πολιτική απο��ήτου."
+msgstr ""
+"Αν το π�όσθετο σας έχει ξεχω�ιστή πολιτική απο��ήτου εισάγετε το κείμενο της "
+"εδώ. Στη σελίδα του π�όσθετου, θα εμφανίζεται δεσμός γι' αυτή την πολιτική "
+"απο��ήτου."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Πολιτική απο��ήτου"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Η σ�νοψη είναι μια σ�ντομη επεξήγηση των βασικών λειτου�γιών του π�όσθετου σας που εμφανίζεται στις λίστες αναζήτησης και πε�ιήγησης, καθώς και στην κο�υφή της σελίδας του π�όσθετου σας. <strong>Πε�ιο�ίζεται σε 250 χα�ακτή�ες.</strong>"
+msgstr ""
+"Η σ�νοψη είναι μια σ�ντομη επεξήγηση των βασικών λειτου�γιών του π�όσθετου "
+"σας που εμφανίζεται στις λίστες αναζήτησης και πε�ιήγησης, καθώς και στην "
+"κο�υφή της σελίδας του π�όσθετου σας. <strong>Πε�ιο�ίζεται σε 250 χα�ακτή�ες."
+"</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Σ�νοψη π�όσθετου"
 
@@ -3008,170 +2375,273 @@ msgstr "Διαχεί�ιση πε�ιγ�αφών π�όσθετου"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Διαχεί�ιση ιδιοτήτων π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Δεν υπά�χει αντίστοιχη κατηγο�ία για αυτό τον τ�πο π�όσθετου."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Ημιτελής μεταφο�ά"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Δεν αποστάλθηκε α�χείο"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Πα�αβαίνει το μέγιστο επιτ�επτό ό�ιο αποστολής"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Δημιου�γοί"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Π�οσθήκη εικονιδίου"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Αλλαγή εικονιδίου"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "�α επιτ�έπεται στους χ�ήστες να δουν τον πηγαίο κώδικα στο διαδίκτυο"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Κατηγο�ίες"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Α�χική τοπική ��θμιση γλώσσας"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Αυτό το π�όσθετο απαιτεί επιπ�όσθετο λογισμικό "
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Εκκαθά�ιση μόνο του υπά�χοντος εικονιδίου"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "�έο α�χείο εικονιδίου"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Εικονίδιο"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Συμπλη�ωματικές πλη�οφο�ίες π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Π�όκειται για π�οέκδοση"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Αυτό το π�όσθετο δουλε�ει με συγκεκ�ιμένους ιστότοπους"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Επιθυμητή τοπική ��θμιση γλώσσας"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr ""
+"σ�ντομες συμπλη�ωματικές πλη�οφο�ίες (όπως πχ το όνομα μιας τοπικής "
+"διαλέκτου)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Ενημέ�ωση ιδιοτήτων"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
-msgstr "Κάντε αλλαγές μόνο αν καταλαβαίνετε  όλες τις συνέπειες των αλλαγών σας."
+msgstr ""
+"Κάντε αλλαγές μόνο αν καταλαβαίνετε  όλες τις συνέπειες των αλλαγών σας."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Τ�έχον εικονίδιο"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
-msgstr "Η α�χική γλώσσα ενός π�όσθετου είναι η βασική γλώσσα στην οποία θα π�έπει να έχει μεταφ�αστεί. Αν δεν υπά�χει διαθέσιμη μετάφ�αση για τις πε�ιγ�αφές του π�όσθετου στη γλώσσα κάποιου χ�ήστη, θα χ�ησιμοποιηθεί αυτή."
+msgstr ""
+"Η α�χική γλώσσα ενός π�όσθετου είναι η βασική γλώσσα στην οποία θα π�έπει να "
+"έχει μεταφ�αστεί. Αν δεν υπά�χει διαθέσιμη μετάφ�αση για τις πε�ιγ�αφές του "
+"π�όσθετου στη γλώσσα κάποιου χ�ήστη, θα χ�ησιμοποιηθεί αυτή."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
-msgstr "Αυτοί οι διακόπτες χ�ησιμοποιο�νται για το φιλτ�ά�ισμα και την κατηγο�ιοποίηση των π�όσθετων."
+msgstr ""
+"Αυτοί οι διακόπτες χ�ησιμοποιο�νται για το φιλτ�ά�ισμα και την "
+"κατηγο�ιοποίηση των π�όσθετων."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
-msgstr "Το GUID του π�όσθετου σας έχει ο�ιστεί στο install.rdf του και αποτελεί μοναδιαίο αναγνω�ιστικό του. Δεν μπο�είτε να αλλάξετε το GUID μετά που αυτό θα συμπε�ιληφθεί στον ιστότοπο π�όσθετων του Mozilla."
+msgstr ""
+"Το GUID του π�όσθετου σας έχει ο�ιστεί στο install.rdf του και αποτελεί "
+"μοναδιαίο αναγνω�ιστικό του. Δεν μπο�είτε να αλλάξετε το GUID μετά που αυτό "
+"θα συμπε�ιληφθεί στον ιστότοπο π�όσθετων του Mozilla."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Επεξε�γασία ιδιοτήτων π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Τ�πος π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Ρυθμίσεις διαχει�ιστή"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Α�χικές �υθμίσεις γλώσσας"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Σημαίες π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "GUID π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Εικονίδιο π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Άλλες �υθμίσεις"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Έμπιστο π�όσθετο;"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Εμφάνιση πηγαίου κώδικα στο δίκτυο"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
-msgstr "Το εικονίδιο του π�όσθετου είναι μια μικ�ή εικόνα που εμφανίζεται δίπλα στο όνομα του π�όσθετου σας στην πε�ιήγηση και στα αποτελέσματα αναζήτησης, στη σελίδα του και στο διάλογο εγκατάστασης. Η εικόνα θα σμικ�υνθεί αυτόματα σε μέγεθος 32 x 32 πίξελ.  Πα�ακαλο�με χ�ησιμοποιείστε μια από τις ακόλουθες μο�φές α�χείου: %s"
+msgstr ""
+"Το εικονίδιο του π�όσθετου είναι μια μικ�ή εικόνα που εμφανίζεται δίπλα στο "
+"όνομα του π�όσθετου σας στην πε�ιήγηση και στα αποτελέσματα αναζήτησης, στη "
+"σελίδα του και στο διάλογο εγκατάστασης. Η εικόνα θα σμικ�υνθεί αυτόματα σε "
+"μέγεθος 32 x 32 πίξελ.  Πα�ακαλο�με χ�ησιμοποιείστε μια από τις ακόλουθες "
+"μο�φές α�χείου: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Αυτό το π�όσθετο πε�ιέχει δυαδικά εκτελέσιμα στοιχεία"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Μη έμπιστο"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Έμπιστο"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "�έο εικονίδιο"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Αφαί�εση εικονιδίου"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Αν έχετε κι άλλο ιστότοπο για το π�όσθετο σας, εισάγετε τη διε�θυνση του εδώ. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν ο ιστότοπος σας είναι μεταφ�ασμένος και σε άλλες γλώσσες."
+msgstr ""
+"Αν έχετε κι άλλο ιστότοπο για το π�όσθετο σας, εισάγετε τη διε�θυνση του "
+"εδώ. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν ο ιστότοπος σας "
+"είναι μεταφ�ασμένος και σε άλλες γλώσσες."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Ιστότοπος π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Το όνομα του π�όσθετου σας θα εμφανίζεται παντο� όπου θα εμφανίζεται και το π�όσθετο σας."
+msgstr ""
+"Το όνομα του π�όσθετου σας θα εμφανίζεται παντο� όπου θα εμφανίζεται και το "
+"π�όσθετο σας."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Όνομα π�όσθετου"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Αν έχετε μια διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για θέματα, εισάγετε την έδω. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν χ�ησιμοποιείτε διάφο�ες διευθ�νσεις για διάφο�ες γλώσσες."
+msgstr ""
+"Αν έχετε μια διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για θέματα, εισάγετε την "
+"έδω. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν χ�ησιμοποιείτε "
+"διάφο�ες διευθ�νσεις για διάφο�ες γλώσσες."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου για υποστή�ιξη"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Αν έχετε ιστότοπο ή φό�ουμ υποστή�ιξης για το π�όσθετο σας, εισάγετε εδώ τη διε�θυνση του. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν ο ιστότοπος σας έχει μεταφ�αστεί σε άλλες γλώσσες."
+msgstr ""
+"Αν έχετε ιστότοπο ή φό�ουμ υποστή�ιξης για το π�όσθετο σας, εισάγετε εδώ τη "
+"διε�θυνση του. Δεν χ�ειάζεται να π�οσθέσετε μεταφ�άσεις, εκτός κι αν ο "
+"ιστότοπος σας έχει μεταφ�αστεί σε άλλες γλώσσες."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Ιστότοπος υποστή�ιξης"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
-msgstr "Τα έμπιστα π�όσθετα μπο�ο�ν να μεταφε�θο�ν στο δημόσιο χώ�ο χω�ίς να αξιολογηθο�ν από συντάκτες."
+msgstr ""
+"Τα έμπιστα π�όσθετα μπο�ο�ν να μεταφε�θο�ν στο δημόσιο χώ�ο χω�ίς να "
+"αξιολογηθο�ν από συντάκτες."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Το εικονίδιο θα διαγ�αφεί κατά την αποθήκευση. <a %s>Ακ��ωση;</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
-msgstr "Οποιοσδήποτε συνδεδεμένος χ�ήστης θα μπο�εί να δει τον πηγαίο κώδικα των α�χείων του π�όσθετου σας αν το θέλετε."
+msgstr ""
+"Οποιοσδήποτε συνδεδεμένος χ�ήστης θα μπο�εί να δει τον πηγαίο κώδικα των "
+"α�χείων του π�όσθετου σας αν το θέλετε."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "�α επιτ�έπεται η εμφάνιση του πηγαίου κώδικα στο δίκτυο"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "�α μην επιτ�έπεται η εμφάνιση του πηγαίου κώδικα στο δίκτυο"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Ενημέ�ωση"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, όπως «el-GR»"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Δημιου�γοί"
@@ -3214,7 +2684,7 @@ msgstr "Εκδόσεις και α�χεία"
 
 #: views/elements/developers/editbox.thtml:42
 msgid "devcp_editbox_view_listing"
-msgstr "Σελίδα π�όσθετου"
+msgstr "Δείτε τη λίστα"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3250,14 +2720,71 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Εκκ�εμεί %s ενημέ�ωση"
 msgstr[1] "Εκκ�εμο�ν %s ενημε�ώσεις"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Τα επιλεγμένα α�χεία θα διαγ�αφο�ν."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Α�χεία"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Εφα�μογές π�οο�ισμο�"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Μηδενικά α�χεία."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Σημειώσεις στο συντάκτη της αξιολόγησης"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Ενημέ�ωση"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Δεν έχετε π�όσβαση σε αυτό το π�όσθετο."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Οι πε�ιλήψεις πε�ιο�ίζονται σε 250 χα�ακτή�ες.\n"
+"(Δώσατε %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Το όνομα του π�οαθέτου σας υπά�χει ήδη στη βάση δεδομένων. Πα�ακαλο�με "
+"σιγου�ευτείτε πως: <br /><li>Ται�ιάζουν τα GUID. Η πιο συχνή αιτία αυτο� του "
+"σφάλματος είναι GUID που δεν ται�ιάζουν.</li><li>Δεν έχετε διπλότυπη εγγ�αφή "
+"στη βάση δεδομένων. Αν έχετε, θα π�έπει να ενημε�ώσετε την εγγ�αφή ή να την "
+"διαγ�άψετε και να π�οσπαθήσετε ξανά.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3271,21 +2798,31 @@ msgstr "Πα�ακαλο�με δείτε για αναφο�ά %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "αυτή τη σελίδα"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Το π�όσθετο σας θα π�έπει να έχει τουλάχιστον ένα ιδιοκτήτη."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Πα�ακαλο�με πε�ιγ�άψτε τις αλλαγές που έχουν γίνει στην ενημε�ωμένη έκδοση "
+"του π�όσθετου."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 msgid "devcp_error_file_exists"
-msgstr "Υπά�χει ήδη μια έκδοση αυτο� του π�όσθετου. Για να το αντικαταστήσετε, θα π�έπει π�ώτα να διαγ�άψετε το α�χείο %1$s."
+msgstr ""
+"Υπά�χει ήδη μια έκδοση αυτο� του π�όσθετου. Για να το αντικαταστήσετε, θα "
+"π�έπει π�ώτα να διαγ�άψετε το α�χείο %1$s."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για αυτό τον τ�πο π�όσθετου. Πα�ακαλο�με επιλέξτε μια από τις ακόλουθες: %s"
+msgstr ""
+"Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για αυτό τον τ�πο π�όσθετου. "
+"Πα�ακαλο�με επιλέξτε μια από τις ακόλουθες: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Δεν ται�ιάζουν όλα τα GUID των α�χείων"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3317,9 +2854,19 @@ msgstr "Δεν έγινε αποστολή α�χείου"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για α�χείο εικονιδίου. Πα�ακαλο�με επιλέξτε μία από τις ακόλουθες: %s"
+msgstr ""
+"Η π�οέκταση α�χείου (%s) δεν επιτ�έπεται για α�χείο εικονιδίου. Πα�ακαλο�με "
+"επιλέξτε μία από τις ακόλουθες: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Υπά�χει ήδη μια ταυτόσημη έκδοση (%s) για το π�όσθετο και την πλατφό�μα αυτή."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Δεν υπά�χει α�χείο install.rdf."
 
@@ -3327,9 +2874,9 @@ msgstr "Δεν υπά�χει α�χείο install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Τα ακόλουθα σφάλματα εντοπίστηκαν στο α�χείο install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "Δεν είναι έγκυ�ο το αναγνω�ιστικό (ID) του π�όσθετου: %s"
+msgstr "Πα�ακαλο�με επιλέξτε τ�πο π�όσθετου."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3350,21 +2897,29 @@ msgstr "Δεν είναι έγκυ�ο το ανανγω�ιστικό (ID) το
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "Δεν είναι έγκυ�ο το %s s σαν α�ιθμός έκδοσης για το %s: η ελάχιστη απαιτο�μενη έκδοση δεν επιτ�έπεται να πε�ιέχει *"
+msgstr ""
+"Δεν είναι έγκυ�ο το %s s σαν α�ιθμός έκδοσης για το %s: η ελάχιστη "
+"απαιτο�μενη έκδοση δεν επιτ�έπεται να πε�ιέχει *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "Δεν είναι έγκυ�ος ο α�ιθμός έκδοσης του π�όσθετου: πα�ακαλο�με δείτε τις <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">π�οδιαγ�αφές</a>"
+msgstr ""
+"Δεν είναι έγκυ�ος ο α�ιθμός έκδοσης του π�όσθετου: πα�ακαλο�με δείτε τις <a "
+"href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format"
+"\">π�οδιαγ�αφές</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "Δεν είναι έγκυ�ος ο α�ιθμός έκδοσης του π�όσθετου: οι α�ιθμοί εκδόσεων δεν επιτ�έπεται να πε�ιέχουν κενά διαστήματα."
+msgstr ""
+"Δεν είναι έγκυ�ος ο α�ιθμός έκδοσης του π�όσθετου: οι α�ιθμοί εκδόσεων δεν "
+"επιτ�έπεται να πε�ιέχουν κενά διαστήματα."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
-msgstr "Συνέβει το ακόλουθο σφάλμα κατά την ανάλυση του α�χείου install.rdf: %s"
+msgstr ""
+"Συνέβει το ακόλουθο σφάλμα κατά την ανάλυση του α�χείου install.rdf: %s"
 
 #: controllers/components/developers.php:373
 msgid "devcp_error_move_file"
@@ -3383,7 +2938,9 @@ msgstr "Συνέβη σφάλμα κατά τη μεταφο�ά του %s."
 
 #: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
-msgstr "Π�έπει να υπά�χει τουλάχιστον μια έγκυ�η δήλωση εφα�μογής π�οο�ισμο� της οικογένειας  Mozilla."
+msgstr ""
+"Π�έπει να υπά�χει τουλάχιστον μια έγκυ�η δήλωση εφα�μογής π�οο�ισμο� της "
+"οικογένειας  Mozilla."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
@@ -3393,6 +2950,21 @@ msgstr "Δε β�έθηκε αναγνω�ιστικό (ID) για το π�όσ
 msgid "devcp_error_no_platform"
 msgstr "Δεν έχει επιλεγεί πλατφό�μα"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr ""
+"Π�έπει να πα�έχετε τις απα�αίτητες πλη�οφο�ίες για την υποβολή υποψηφιότητας."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Δεν μπο�είτε να θέσετε σε υποψηφιότητα την π�οέκδοση ενός π�όσθετου."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Μπο�είτε να υποβάλετε υποψηφιότητα μόνο για π�όσθετα που β�ίσκονται ήδη στο "
+"sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Πα�ακαλο�με επιλέξτε τουλάχιστον μια κατηγο�ία."
@@ -3406,91 +2978,321 @@ msgstr "Θα π�έπει να δηλωθεί τουλάχιστον ένας δ
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Δεν επιτ�έπεται αυτή η π�οέκταση α�χείου (%s) για εικόνα π�οεπισκόπησης. Πα�ακαλο�με επιλέξτε μία από τις ακόλουθες: %s"
+msgstr ""
+"Δεν επιτ�έπεται αυτή η π�οέκταση α�χείου (%s) για εικόνα π�οεπισκόπησης. "
+"Πα�ακαλο�με επιλέξτε μία από τις ακόλουθες: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Συνέβη σφάλμα κατά την π�οσπάθεια αποθήκευσης των δεδομένων σας."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Δεν έχετε δικαιώματα ενημέ�ωσης αυτο� του π�όσθετου."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Το updateKey  δεν μπο�εί να χ�ησιμοποιηθεί στον ιστότοπο Add-ons. Αφαι�έστε το από το α�χείο install.rdf και π�οσπαθήστε ξανά."
+msgstr ""
+"Το updateKey  δεν μπο�εί να χ�ησιμοποιηθεί στον ιστότοπο Add-ons. Αφαι�έστε "
+"το από το α�χείο install.rdf και π�οσπαθήστε ξανά."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Τα π�όσθετα δεν επιτ�έπεται να χ�ησιμοποιο�ν εξωτε�ικά updateURL. Πα�ακαλο�με αφαι�έστε την οδηγία από το α�χείο install.rdf και π�οσπαθήστε ξανά."
+msgstr ""
+"Τα π�όσθετα δεν επιτ�έπεται να χ�ησιμοποιο�ν εξωτε�ικά updateURL. "
+"Πα�ακαλο�με αφαι�έστε την οδηγία από το α�χείο install.rdf και π�οσπαθήστε "
+"ξανά."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Πα�ακαλο�με αποστείλατε α�χείο."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Π�οσθήκη α�χείου για διαφο�ετική πλατφό�μα"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Π�οσθήκη δημιου�γο�"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Αφαί�εση"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Στο επόμενο βήμα θα σας είναι διαθέσιμες κατηγο�ίες για να κατατάξετε το "
+"π�όσθετό σας."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Δεν υπά�χουν διαθέσιμες κατηγο�ίες για τον τ�που αυτο� του π�όσθετου."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Πα�ακαλο�με εισάγετε μια πε�ιγ�αφή του π�οσθέτου σας."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Πα�ακαλο�με εισάγετε το όνομα του π�οσθέτου σας."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Πα�ακαλο�με επιλέξτε τον τ�πο του π�όσθετου που υποβάλλετε."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Πα�ακαλο�με εισάγετε μια πε�ίληψη του π�οσθέτου σας."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Α�χείο π�όσθετου"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Α�χείο π�όσθετου 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Α�χείο π�όσθετου 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Τ�πος π�όσθετου"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "�α επιτ�έπεται στους χ�ήστες να δουν τον πηγαίο κώδικα στο διαδίκτυο"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου του δημιου�γο�"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Δημιου�γοί"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Κατηγο�ίες"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Α�χική ��θμιση γλώσσας"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Πε�ιγ�αφή"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Συμφωνητικό Αδειοδότησης Τελικο� Χ�ήστη (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Αυτό το π�όσθετο απαιτεί τη χ�ήση λογισμικο� τ�ίτων"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Α�χεία"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Α�χική σελίδα"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Α�χείο εικονιδίου"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Όνομα"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Υποστη�ιζόμενες πλατφό�μες"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Π�όκειται για π�οέκδοση"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Πολιτική απο��ήτου"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Το π�όσθετο σχετίζεται άμεσα με ιστοχώ�ο"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Πε�ίληψη"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Διε�θυνση ηλ. ταχυδ�ομείου υποστή�ιξης"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL υποστή�ιξης"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Εφα�μογές π�οο�ισμο�"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Έκδοση"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Σημειώσεις έκδοσης"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Καμία"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Σημειώσεις για συντάκτες αξιολόγησης"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Αφο� το π�όσθετό σας θεω�είται έμπιστο, επιλέξτε πο� θέλετε να τοποθετηθεί "
+"αυτή η έκδοση:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Στο δημόσιο χώ�ο"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Στο Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Συμφωνητικό δημιου�γο�"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1ο Βήμα"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Αποστολή α�χείου"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2ο βήμα"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Λεπτομέ�ειες π�όσθετου"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3ο βήμα"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Λεπτομέ�ειες έκδοσης"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4ο βήμα"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Τοπικοποίηση"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5ο βήμα"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Επιτυχία"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Τα π�όσθετά μου"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Ακ��ωση"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Πα�ακαλο�με εισάγετε το email του λογα�ιασμο� του δημιου�γο� που θέλετε να π�οσθέσετε."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Μετακίνηση κάτω"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Μετακίνηση πάνω"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Αφαί�εση συμβατότητας με εφα�μογή"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Εμφάνιση ως δημιου�γο� στις δημόσιες σελίδες"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Πα�ακαλο�με επιλέξτε μια άδεια."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Πα�ακαλο�με εισάγετε κείμενο για την άδεια σας."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Δημιου�γός"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Ιδιοκτήτης"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Θεατής"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Αφαί�εση συντάκτη"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Θέλετε <strong>σίγου�α</strong> να αφαι�έσετε αυτόν τον συντάκτη;"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Π�έπει να επιλέξετε α�χείο για αποστολή."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Π�οσα�μοσμένη άδεια για το π�όσθετο %1$s εκδ. %2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3501,15 +3303,20 @@ msgstr "Τοπικοποιημένα πεδία"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Με�ικά από τα πεδία της σελίδας έχουν τοπικοποιηθεί και εμφανίζονται στη μητ�ική γλώσσα του τελικο� χ�ήστη.  Επιλέξτε μια από τις πα�ακάτω τοπικές �υθμίσεις για να επεξε�γαστείτε τις λεπτομέ�ειες του π�οσθέτου σας σ' αυτή τη γλώσσα. Αν δεν υπά�χει διαθέσιμη μετάφ�αση για κάποια από τις τοπικές �υθμίσεις, θα χ�ησιμοποιηθεί η α�χική ��θμιση γλώσσας (%s)."
+msgstr ""
+"Με�ικά από τα πεδία της σελίδας έχουν τοπικοποιηθεί και εμφανίζονται στη "
+"μητ�ική γλώσσα του τελικο� χ�ήστη.  Επιλέξτε μια από τις πα�ακάτω τοπικές "
+"�υθμίσεις για να επεξε�γαστείτε τις λεπτομέ�ειες του π�οσθέτου σας σ' αυτή "
+"τη γλώσσα. Αν δεν υπά�χει διαθέσιμη μετάφ�αση για κάποια από τις τοπικές "
+"�υθμίσεις, θα χ�ησιμοποιηθεί η α�χική ��θμιση γλώσσας (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Ε�γαλεία διαχει�ιστή"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Ε�γαλεία συντακτών"
 
@@ -3518,73 +3325,113 @@ msgid "devcp_myaddons_link"
 msgstr "Τα π�όσθετά μου"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Πίσω στο κεντ�ικό"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Ταμπλό στατιστικών"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Υποβολή π�όσθετου"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Ε�γαλεία δημιου�γών"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
-msgstr "Το  ID  του π�όσθετου (%1$s) υπά�χει ήδη στη βάση δεδομένων. Αν το π�όσθετο αυτό είναι δικό σας, μπο�είτε να <a href=\"%2$s\">αποστείλετε νέα έκδοση</a>."
+msgstr ""
+"Το  ID  του π�όσθετου (%1$s) υπά�χει ήδη στη βάση δεδομένων. Αν το π�όσθετο "
+"αυτό είναι δικό σας, μπο�είτε να <a href=\"%2$s\">αποστείλετε νέα έκδοση</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 msgid "devcp_nominate_cancel"
 msgstr "Ακ��ωση και επιστ�οφή"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Επιστ�οφή στις λεπτομέ�ειες του π�όσθετου"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Υποψηφιότητα του %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Ανιχνε�τηκε αυτόματα ο τ�πος π�όσθετου: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
-msgstr "<span>Μια ή πε�ισσότε�ες από τις αλλαγές σας δεν ήταν δυνατό να αποθηκευτεί.</span><br />Πα�ακαλο�με δείτε τις αναφο�ές σφαλμάτων πα�ακάτω. Οι υπόλοιπες αλλαγές σας αποθηκε�τηκαν με επιτυχία."
+msgstr ""
+"<span>Μια ή πε�ισσότε�ες από τις αλλαγές σας δεν ήταν δυνατό να αποθηκευτεί."
+"</span><br />Πα�ακαλο�με δείτε τις αναφο�ές σφαλμάτων πα�ακάτω. Οι υπόλοιπες "
+"αλλαγές σας αποθηκε�τηκαν με επιτυχία."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Οι αλλαγές σας αποθηκε�τηκαν .</span><br />Πα�ακαλο�με σημειώστε ότι με�ικές αλλαγές ίσως χ�ειαστο�ν α�κετές ώ�ες για να πα�ουσιαστο�ν σε όλους τους χώ�ους του ιστότοπου."
+msgstr ""
+"<span>Οι αλλαγές σας αποθηκε�τηκαν .</span><br />Πα�ακαλο�με σημειώστε ότι "
+"με�ικές αλλαγές ίσως χ�ειαστο�ν α�κετές ώ�ες για να πα�ουσιαστο�ν σε όλους "
+"τους χώ�ους του ιστότοπου."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Ο αποχα�ακτη�ισμός αυτής της εικόνας ως α�χικής εικόνας π�οεπισκόπησης θα έχει ως αποτέλεσμα τον αυτόματο ο�ισμό μιας άλλης ως α�χικής."
+msgstr ""
+"Ο αποχα�ακτη�ισμός αυτής της εικόνας ως α�χικής εικόνας π�οεπισκόπησης θα "
+"έχει ως αποτέλεσμα τον αυτόματο ο�ισμό μιας άλλης ως α�χικής."
+
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Η α�χική ��θμιση γλώσσας του π�όσθετου (%1$s [%2$s]) είναι διαφο�ετική από "
+"την τ�έχουσα επιλεγμένη ��θμιση γλώσσας (%3$s [%4$s]). Τα πα�ακάτω πεδία θα "
+"π�έπει να συμπλη�ωθο�ν με %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "Ο ο�ισμός αυτής της εικόνας π�οεπισκόπησης ως α�χικής θα αφαι�έσει αυτή την ιδιότητα από την τ�έχουσα ο�ισμένη ως α�χική."
+msgstr ""
+"Ο ο�ισμός αυτής της εικόνας π�οεπισκόπησης ως α�χικής θα αφαι�έσει αυτή την "
+"ιδιότητα από την τ�έχουσα ο�ισμένη ως α�χική."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Υπά�χουν μη αποθηκευμένες αλλαγές."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3613,55 +3460,64 @@ msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 msgid "devcp_preview_updated_successfully"
 msgstr "Η εικόνα π�οεπισκόπησης ενημε�ώθηκε με επιτυχία."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Π�οσθήκη κι άλλης εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Διαγ�αφή εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Αντικατάσταση εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Ενημέ�ωση εικόνων π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Π�οσθήκη εικόνας π�οεπισκόπησης"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
-msgstr "Επιλέξτε πα�ακάτω μια εικόνα για αποστολή. Εικόνες μεγαλ�τε�ες από τη μέγιστη επιτ�επόμενη διάσταση των  700 πίξελ σε πλάτος επί  525 πίξελ σε �ψος θα σμικ�υνθο�ν. Επιτ�επόμενες μο�φές α�χείων: %s"
+msgstr ""
+"Επιλέξτε πα�ακάτω μια εικόνα για αποστολή. Εικόνες μεγαλ�τε�ες από τη "
+"μέγιστη επιτ�επόμενη διάσταση των  700 πίξελ σε πλάτος επί  525 πίξελ σε "
+"�ψος θα σμικ�υνθο�ν. Επιτ�επόμενες μο�φές α�χείων: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Κάντε κλικ στο κουμπί «Ενημέ�ωση εικόνων π�οεπισκόπησης» για αποστολή."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
-msgstr "Κάντε κλικ στο κουμπί «Ενημέ�ωση εικόνων π�οεπισκόπησης» πα�ακάτω για να αποθηκευθεί η εικόνα. (<a %s>Ακ��ωση;</a>)"
+msgstr ""
+"Κάντε κλικ στο κουμπί «Ενημέ�ωση εικόνων π�οεπισκόπησης» πα�ακάτω για να "
+"αποθηκευθεί η εικόνα. (<a %s>Ακ��ωση;</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
-msgstr "Αυτή η εικόνα π�οεπισκόπησης θα διαγ�αφεί όταν κάνετε κλικ στο κουμπί «Ενημέ�ωση  εικόνων π�οεπισκόπησης πα�ακάτω. (<a %s>Ακ��ωση;</a>)"
+msgstr ""
+"Αυτή η εικόνα π�οεπισκόπησης θα διαγ�αφεί όταν κάνετε κλικ στο κουμπί "
+"«Ενημέ�ωση  εικόνων π�οεπισκόπησης πα�ακάτω. (<a %s>Ακ��ωση;</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Χ�ησιμοποιήστε την πα�ακάτω φό�μα για να αποστείλετε εικόνες π�οεπισκόπησης του π�οσθέτου σας σε τ�πο α�χείου PNG, JPG, ή GIF. Εικόνες μεγαλ�τε�ες από 700 πίξελ σε πλάτος και  525 πίξελ σε �ψος, θα αλλάξουν μέγεθος αυτόματα."
+msgstr ""
+"Χ�ησιμοποιήστε την πα�ακάτω φό�μα για να αποστείλετε εικόνες π�οεπισκόπησης "
+"του π�οσθέτου σας σε τ�πο α�χείου PNG, JPG, ή GIF. Εικόνες μεγαλ�τε�ες από "
+"700 πίξελ σε πλάτος και  525 πίξελ σε �ψος, θα αλλάξουν μέγεθος αυτόματα."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Π�οσθήκη εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Λεζάντα εικόνας π�οεπισκόπησης"
 
@@ -3669,7 +3525,7 @@ msgstr "Λεζάντα εικόνας π�οεπισκόπησης"
 msgid "devcp_previews_header_edit"
 msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Α�χική εικόνα π�οεπισκόπησης"
 
@@ -3677,30 +3533,35 @@ msgstr "Α�χική εικόνα π�οεπισκόπησης"
 msgid "devcp_previews_label_file"
 msgstr "Α�χείο εικόνας π�οεπισκόπησης"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Ο�ισμός εικόνας ως α�χικής εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "�έα εικόνα:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Αποστολή εικόνας π�οεπισκόπησης: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
-msgstr "Μια ή πε�ισσότε�ες από τις νέες εικόνες π�οεπισκόπησης δεν ήταν δυνατό να αποθηκευθο�ν."
+msgstr ""
+"Μια ή πε�ισσότε�ες από τις νέες εικόνες π�οεπισκόπησης δεν ήταν δυνατό να "
+"αποθηκευθο�ν."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Οι εικόνες π�οεπισκόπησης ενημε�ώθηκαν με επιτυχία."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
-msgstr "Πα�ακάτω εμφανίζονται οι εικόνες π�οεπισκόπησης του π�όσθετου σας. Μπο�είτε να κάνετε αλλαγές στις πα�ακάτω εικόνες ή λεζάντες. Η α�χική εικόνα π�οεπισκόπησης είναι αυτή που θα π�οβάλλεται δίπλα από το όνομα του π�όσθετου σας στις λίστες πε�ιήγησης και αναζήτησης."
+msgstr ""
+"Πα�ακάτω εμφανίζονται οι εικόνες π�οεπισκόπησης του π�όσθετου σας. Μπο�είτε "
+"να κάνετε αλλαγές στις πα�ακάτω εικόνες ή λεζάντες. Η α�χική εικόνα "
+"π�οεπισκόπησης είναι αυτή που θα π�οβάλλεται δίπλα από το όνομα του "
+"π�όσθετου σας στις λίστες πε�ιήγησης και αναζήτησης."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3718,31 +3579,50 @@ msgstr "Επεξε�γασία εικόνας π�οεπισκόπησης"
 msgid "devcp_previews_submit_upload"
 msgstr "Αποστολή εικόνας π�οεπισκόπησης"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Μικ�ογ�αφία"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "Διαχει�ιστής π�οεπισκόπησης %s"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Λάθος;"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Θέλετε να διαγ�αφεί το α�χείο;"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Πα�ακαλο�με διαβάστε και αποδεχτείτε το ακόλουθο συμφωνητικό δημιου�γο� π�ιν π�οχω�ήσετε."
+msgstr ""
+"Πα�ακαλο�με διαβάστε και αποδεχτείτε το ακόλουθο συμφωνητικό δημιου�γο� π�ιν "
+"π�οχω�ήσετε."
 
 #: views/elements/developers/rolecheck.thtml:42
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Δεν έχετε επα�κή δικαιώματα για να κάνετε αλλαγές σ' αυτή τη σελίδα.</span><br />Επικοινωνήστε με τον ιδιοκτήτη του π�όσθετου αν θέλετε να κάνετε αλλαγές."
+msgstr ""
+"<span>Δεν έχετε επα�κή δικαιώματα για να κάνετε αλλαγές σ' αυτή τη σελίδα.</"
+"span><br />Επικοινωνήστε με τον ιδιοκτήτη του π�όσθετου αν θέλετε να κάνετε "
+"αλλαγές."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
-msgstr "Πα�ακαλο�με σημειώστε ότι με�ικές αλλαγές μπο�εί να χ�ειαστο�ν α�κετές ώ�ες μέχ�ι να εμφανιστο�ν σε όλους τους χώ�ους του ιστότοπου."
+msgstr ""
+"Πα�ακαλο�με σημειώστε ότι με�ικές αλλαγές μπο�εί να χ�ειαστο�ν α�κετές ώ�ες "
+"μέχ�ι να εμφανιστο�ν σε όλους τους χώ�ους του ιστότοπου."
 
 #: views/elements/developers/sidebar.thtml:52
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Ταμπλό"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Πα�άβλεψη ενημέ�ωσης τ�εχουσών πλη�οφο�ιών του π�όσθετου"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3766,7 +3646,14 @@ msgstr "<em>%s</em> εβδομαδιαίες λήψεις"
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active"
-msgstr "Η σημείωση αυτο� του π�όσθετου ως «ενε�γό» σημαίνει ότι θα εμφανίζεται δημόσια σε κατάλληλους χώ�ους ανάλογα με την  κατάσταση του, συμπε�ιλαμβανομένων της αναζήτησης και της λίστας πε�ιήγησης. Θα είναι δυνατή η λήψη του από τον ιστότοπο και θα επιστ�έφεται σαν αποτέλεσμα σε ελέγχους διαθέσιμων ενημε�ώσεων της εφα�μογής ανάλογα με την κατάσταση του. Θα μπο�είτε να επιστ�έψετε εδώ και να το απενε�γοποιήσετε ξανά αν το θελήσετε."
+msgstr ""
+"Η σημείωση αυτο� του π�όσθετου ως «ενε�γό» σημαίνει ότι θα εμφανίζεται "
+"δημόσια σε κατάλληλους χώ�ους ανάλογα με την  κατάσταση του, "
+"συμπε�ιλαμβανομένων της αναζήτησης και της λίστας πε�ιήγησης. Θα είναι "
+"δυνατή η λήψη του από τον ιστότοπο και θα επιστ�έφεται σαν αποτέλεσμα σε "
+"ελέγχους διαθέσιμων ενημε�ώσεων της εφα�μογής ανάλογα με την κατάσταση του. "
+"Θα μπο�είτε να επιστ�έψετε εδώ και να το απενε�γοποιήσετε ξανά αν το "
+"θελήσετε."
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active_sure"
@@ -3778,7 +3665,13 @@ msgstr "Είστε σίγου�οι;"
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive"
-msgstr "Η σημείωση αυτο� του π�όσθετου ως «ανενε�γό» θα εμποδίσει την εμφάνιση του σε οποιοδήποτε χώ�ο, συμπε�ιλαμβανομένων της αναζήτησης και της λίστας πε�ιήγησης. Δεν θα είναι δυνατή η λήψη του από τον ιστότοπο και δεν θα επιστ�έφονται αποτελέσματα σε έλεγχους διαθέσιμων ενημε�ώσεων της εφα�μογής. Θα μπο�είτε όμως να επιστ�έψετε εδώ και να το ενε�γοποιήσετε ξανά όταν θελήσετε."
+msgstr ""
+"Η σημείωση αυτο� του π�όσθετου ως «ανενε�γό» θα εμποδίσει την εμφάνιση του "
+"σε οποιοδήποτε χώ�ο, συμπε�ιλαμβανομένων της αναζήτησης και της λίστας "
+"πε�ιήγησης. Δεν θα είναι δυνατή η λήψη του από τον ιστότοπο και δεν θα "
+"επιστ�έφονται αποτελέσματα σε έλεγχους διαθέσιμων ενημε�ώσεων της εφα�μογής. "
+"Θα μπο�είτε όμως να επιστ�έψετε εδώ και να το ενε�γοποιήσετε ξανά όταν "
+"θελήσετε."
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive_sure"
@@ -3790,7 +3683,10 @@ msgstr "Όχι, ακ��ωση"
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public"
-msgstr "Η μεταφο�ά αυτο� του π�όσθετου στο δημόσιο χώ�ο σημαίνει ότι θα είναι διαθέσιμο για λήψη από τον καθένα και θα πα�έχονται ενημε�ώσεις σε όσους το χ�ησιμοποιο�ν ήδη."
+msgstr ""
+"Η μεταφο�ά αυτο� του π�όσθετου στο δημόσιο χώ�ο σημαίνει ότι θα είναι "
+"διαθέσιμο για λήψη από τον καθένα και θα πα�έχονται ενημε�ώσεις σε όσους το "
+"χ�ησιμοποιο�ν ήδη."
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public_sure"
@@ -3798,7 +3694,12 @@ msgstr "Θέλετε να μεταφε�θεί αυτό το π�όσθετο σ
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
-msgstr "Η μετακίνηση αυτο� του π�όσθετου πίσω στο sandbox σημαίνει πως οι χ�ήστες θα π�έπει να συνδεθο�ν για να κάνουν λήψη και δεν θα π�οσφέ�ουμε ενημε�ώσεις σε όσους το χ�ησιμοποιο�ν ήδη. Επειδή το π�όσθετο σας β�ίσκεται αυτή τη στιγμή στο δημόσιο χώ�ο, θα μπο�είτε να επιστ�έψετε εδώ οποιαδήποτε στιγμή και να το μεταφέ�ετε στο δημόσιο χώ�ο ξανά."
+msgstr ""
+"Η μετακίνηση αυτο� του π�όσθετου πίσω στο sandbox σημαίνει πως οι χ�ήστες θα "
+"π�έπει να συνδεθο�ν για να κάνουν λήψη και δεν θα π�οσφέ�ουμε ενημε�ώσεις σε "
+"όσους το χ�ησιμοποιο�ν ήδη. Επειδή το π�όσθετο σας β�ίσκεται αυτή τη στιγμή "
+"στο δημόσιο χώ�ο, θα μπο�είτε να επιστ�έψετε εδώ οποιαδήποτε στιγμή και να "
+"το μεταφέ�ετε στο δημόσιο χώ�ο ξανά."
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox_sure"
@@ -3810,168 +3711,242 @@ msgstr "�αι, είμαι σίγου�ος"
 
 #: views/developers/addon_status_nominate.thtml:46
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Απαιτείται μήνυμα υποψηφιότητας.</span><br />Πα�ακαλο�με συμπλη�ώστε το πα�ακάτω πεδίο κειμένου με τις απα�αίτητες πλη�οφο�ίες και π�οσπαθήστε ξανά."
+msgstr ""
+"<span>Απαιτείται μήνυμα υποψηφιότητας.</span><br />Πα�ακαλο�με συμπλη�ώστε "
+"το πα�ακάτω πεδίο κειμένου με τις απα�αίτητες πλη�οφο�ίες και π�οσπαθήστε "
+"ξανά."
 
 #: views/developers/addon_status_nominate.thtml:55
 msgid "devcp_status_nominate_header"
 msgstr "Υποψηφιότητα π�όσθετου"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Η υποβολή π�όσθετων έχει απενε�γοποιηθεί π�ος το πα�όν. Πα�ακαλο�με "
+"π�οσπαθήστε ξανά α�γότε�α."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Αποδεκτό"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Μη αποδεκτό"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Το π�όσθετο αυτό έχει απενε�γοποιηθεί από κάποιο διαχει�ιστή."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Απενε�γοποιημένο"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Έμπιστο"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Πιο π�όσφατη έκδοση:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Δεν έχετε κανένα π�όσθετο. Κάντε κλικ %s για να υποβάλετε ένα."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "εδώ"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Πα�ακαλο�με  %s για το θέμα σας."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "αποστείλετε εικόνα π�οεπισκόπησης"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Επεξε�γασία %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Βοήθεια (δεν αλλάζει σελίδα)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Βοήθεια"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Χα�ακτή�ες που χ�ησιμοποιο�νται: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Θέλετε σίγου�α να διαγ�άψετε αυτή τη μετάφ�αση;"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "Τι είναι αυτές οι  %s κα�τέλες;"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "Τι γίνεται αν δεν έχω μεταφ�άσεις;"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Απόκ�υψη βοήθειας"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
-msgstr "Αν κάποιος χ�ήστης πε�ιηγήται στον ιστότοπο και δεν υπά�χει μετάφ�αση για τη γλώσσα του, θα χ�ησιμοποιηθεί η α�χική γλωσσική ��θμιση του π�όσθετου σας που έχετε ο�ίσει στην πε�ιοχή επεξε�γασίας ιδιοτήτων π�όσθετου. Αν δεν έχετε καμία μετάφ�αση, απλά εισάγετε τις πλη�οφο�ίες που θέλετε στην «Α�χική γλώσσα» χ�ησιμοποιώντας τη γλώσσα που μιλάτε."
+msgstr ""
+"Αν κάποιος χ�ήστης πε�ιηγήται στον ιστότοπο και δεν υπά�χει μετάφ�αση για τη "
+"γλώσσα του, θα χ�ησιμοποιηθεί η α�χική γλωσσική ��θμιση του π�όσθετου σας "
+"που έχετε ο�ίσει στην πε�ιοχή επεξε�γασίας ιδιοτήτων π�όσθετου. Αν δεν έχετε "
+"καμία μετάφ�αση, απλά εισάγετε τις πλη�οφο�ίες που θέλετε στην «Α�χική "
+"γλώσσα» χ�ησιμοποιώντας τη γλώσσα που μιλάτε."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
-msgstr "Είναι <i>πλαίσιο μετάφ�ασης</i>. Σας επιτ�έπει να μεταφ�άσετε συγκεκ�ιμένα πεδία σε οποιαδήποτε γλώσσα μπο�είτε. Μπο�είτε να π�οσθέσετε, να επεξε�γαστείτε και να αφαι�έσετε μεταφ�άσεις μέσα από τις κα�τέλες μετάφ�ασης."
+msgstr ""
+"Είναι <i>πλαίσιο μετάφ�ασης</i>. Σας επιτ�έπει να μεταφ�άσετε συγκεκ�ιμένα "
+"πεδία σε οποιαδήποτε γλώσσα μπο�είτε. Μπο�είτε να π�οσθέσετε, να "
+"επεξε�γαστείτε και να αφαι�έσετε μεταφ�άσεις μέσα από τις κα�τέλες "
+"μετάφ�ασης."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Π�οσθήκη μετάφ�ασης"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Αφαί�εση μετάφ�ασης"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Π�οσθήκη γλώσσας σε όλες"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Π�οσθήκη γλώσσας"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Ακ��ωση"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Διαγ�αφή"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Επιλέξτε τη γλώσσα της μετάφ�ασης που θα π�οστεθεί:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
-msgstr "Το GUID του π�όσθετου που υπά�χει σ' αυτό το α�χείο (%1$s) dδεν ται�ιάζει με το υπά�χον  GUID αυτο� του π�όσθετου (%2$s)."
+msgstr ""
+"Το GUID του π�όσθετου που υπά�χει σ' αυτό το α�χείο (%1$s) dδεν ται�ιάζει με "
+"το υπά�χον  GUID αυτο� του π�όσθετου (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "Δεν έχετε επα�κή δικαιώματα για να ενημε�ώσετε αυτό το π�όσθετο."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "Η συγκεκ�ιμένη έκδοση (%1$s) δεν ανήκει σ' αυτό το π�όσθετο (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Ο α�ιθμός έκδοσης που αποστείλατε (%1$s) υπά�χει ήδη σ' αυτό το π�όσθετο. Αν θέλετε να π�οσθέσετε κάποιο α�χείο γι' αυτή την έκδοση, κάντε κλικ <a href=\"%2$s\">εδώ</a>."
+msgstr ""
+"Ο α�ιθμός έκδοσης που αποστείλατε (%1$s) υπά�χει ήδη σ' αυτό το π�όσθετο. Αν "
+"θέλετε να π�οσθέσετε κάποιο α�χείο γι' αυτή την έκδοση, κάντε κλικ <a href="
+"\"%2$s\">εδώ</a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
-msgstr "Ο α�ιθμός έκδοσης που αποστείλατε (%1$s) δεν ται�ιάζει με τον τ�έχοντα α�ιθμό έκδοσης (%2$s)."
+msgstr ""
+"Ο α�ιθμός έκδοσης που αποστείλατε (%1$s) δεν ται�ιάζει με τον τ�έχοντα "
+"α�ιθμό έκδοσης (%2$s)."
 
 #: views/developers/uploader.thtml:68
 msgid "devcp_uploader_a_start"
 msgstr "Ξεκινήστε"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Γίνεται μεταφο�ά α�χείου..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Αποδοχή και συνέχεια"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Επεξε�γασία του π�όσθετου μου"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Θα ολοκλη�ώσω το π�όσθετο μου α�γότε�α."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Π�οσθήκη σημειώσεων έκδοσης"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
-msgstr "<p>Η εγγ�αφή του π�όσθετου σας δημιου�γήθηκε με επιτυχία. Οι βασικές πλη�οφο�ίες που αποκτήθηκαν από το α�χείο που μεταφέ�ατε έχουν αποθηκευθεί, αλλά υπά�χουν πολλά ακόμα που μπο�είτε να δηλώσετε.</p><p>Το π�όσθετο σας έχει σημειωθεί π�ος το πα�όν ως <strong>ημιτελές</strong>. Για να ολοκλη�ώσετε το π�όσθετο σας, θα π�έπει να φ�οντίσετε να έχει ένα ακ�ιβές όνομα, μια σ�νοψη και μια πε�ιγ�αφή, καθώς και να έχετε επιλέξει τουλάχιστον μια κατηγο�ία. Μπο�είτε να επεξε�γαστείτε τις πλη�οφο�ίες του π�όσθετου σας χ�ησιμοποιώντας τον πα�ακάτω δεσμό και να ελέγξετε την κατάσταση του οποιαδήποτε στιγμή στη <a %s>σελίδα κατάστασης</a>."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Η εγγ�αφή του π�όσθετου σας δημιου�γήθηκε με επιτυχία. Οι βασικές "
+"πλη�οφο�ίες που αποκτήθηκαν από το α�χείο που μεταφέ�ατε έχουν αποθηκευθεί, "
+"αλλά υπά�χουν πολλά ακόμα που μπο�είτε να δηλώσετε.</p><p>Το π�όσθετο σας "
+"έχει σημειωθεί π�ος το πα�όν ως <strong>ημιτελές</strong>. Για να "
+"ολοκλη�ώσετε το π�όσθετο σας, θα π�έπει να φ�οντίσετε να έχει ένα ακ�ιβές "
+"όνομα, μια σ�νοψη και μια πε�ιγ�αφή, καθώς και να έχετε επιλέξει τουλάχιστον "
+"μια κατηγο�ία. Μπο�είτε να επεξε�γαστείτε τις πλη�οφο�ίες του π�όσθετου σας "
+"χ�ησιμοποιώντας τον πα�ακάτω δεσμό και να ελέγξετε την κατάσταση του "
+"οποιαδήποτε στιγμή στη <a %s>σελίδα κατάστασης</a>."
+
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Πα�ακαλο�με διο�θώστε αυτό το π�όβλημα και αποστείλετε το α�χείο ξανά."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
-msgstr "Το νέο σας α�χείο π�οστέθηκε στην έκδοση %1$s και η κατάσταση του έχει π�ος το πα�όν χα�ακτη�ιστεί ως «%2$s»."
+msgstr ""
+"Το νέο σας α�χείο π�οστέθηκε στην έκδοση %1$s και η κατάσταση του έχει π�ος "
+"το πα�όν χα�ακτη�ιστεί ως «%2$s»."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Το π�όσθετο δημιου�γήθηκε!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Το α�χείο αυτό μάλλον έχει κάποιο π�όβλημα..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "Το α�χείο π�οστέθηκε!"
 
@@ -3980,74 +3955,102 @@ msgid "devcp_uploader_header_how"
 msgstr "Πως δουλε�ει το σ�στημα;"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Δημιου�γήθηκε η έκδοση %s"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Αποστολή του α�χείου σας"
 
 #: views/developers/uploader.thtml:67
 msgid "devcp_uploader_how"
-msgstr "<p>Ευχα�ιστο�με για το ενδιαφέ�ον σας να υποβάλετε το π�όσθετο σας στον ιστότοπο π�όσθετων του Mozilla. Η φιλοξενία του π�όσθετου σας στον ιστότοπο π�όσθετων του είναι ο ευκολότε�ος τ�όπος να διαχει�ιστείτε τη διανομή του. Τι π�οσφέ�ουμε:</p><ul><li>Κάθε π�όσθετο εμφανίζεται δημόσια σε μια σελίδα με πλη�οφο�ίες που μας δίνετε, όπως μια συνοπτική πε�ιγ�αφή των λειτου�γιών του, μια π�οαι�ετικά πιο λεπτομε�ή πε�ιγ�αφή και μια σει�ά εικόνων π�οεπισκόπησης του π�όσθετου σας.</li><li>Το π�όσθετο σας θα εμφανίζεται στη μηχανή αναζήτησης και τις λίστες πε�ιήγησης του ιστότοπου και μέσα στον ενσωματωμένο διαχει�ιστή π�όσθετων του Firefox 3.</li><li>Φ�οντίζουμε για τη λήψη του π�όσθετου σας και πα�έχουμε αυτόματες ενημε�ώσεις στους χ�ήστες του όταν μας αποστείλετε νέα έκδοση.</li><li>Σας πα�έχουμε π�όσβαση σε ένα ταμπλό στατιστικών με αναλυτικές λεπτομέ�ειες για τη βάση χ�ηστών σας.</li></ul><p> Τα π�όσθετα που φιλοξενο�με στον ιστότοπο αυτό, θα π�έπει να αξιολογήθουν από κάποιο συντάκτη του ιστότοπου για να αποκτήσουν όλα όσα αναφέ�αμε πα�απάνω. Αν είστε έτοιμοι να ξεκινήσετε τη διαδικασία και έχετε ετοιμάσει το πακέτο  του π�όσθετου σας για αποστολή, απλά κάντε κλικ στο πα�ακάτω κουμπί «Ξεκινήστε τώ�α»!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Ευχα�ιστο�με για το ενδιαφέ�ον σας να υποβάλετε το π�όσθετο σας στον "
+"ιστότοπο π�όσθετων του Mozilla. Η φιλοξενία του π�όσθετου σας στον ιστότοπο "
+"π�όσθετων του είναι ο ευκολότε�ος τ�όπος να διαχει�ιστείτε τη διανομή του. "
+"Τι π�οσφέ�ουμε:</p><ul><li>Κάθε π�όσθετο εμφανίζεται δημόσια σε μια σελίδα "
+"με πλη�οφο�ίες που μας δίνετε, όπως μια συνοπτική πε�ιγ�αφή των λειτου�γιών "
+"του, μια π�οαι�ετικά πιο λεπτομε�ή πε�ιγ�αφή και μια σει�ά εικόνων "
+"π�οεπισκόπησης του π�όσθετου σας.</li><li>Το π�όσθετο σας θα εμφανίζεται στη "
+"μηχανή αναζήτησης και τις λίστες πε�ιήγησης του ιστότοπου και μέσα στον "
+"ενσωματωμένο διαχει�ιστή π�όσθετων του Firefox 3.</li><li>Φ�οντίζουμε για τη "
+"λήψη του π�όσθετου σας και πα�έχουμε αυτόματες ενημε�ώσεις στους χ�ήστες του "
+"όταν μας αποστείλετε νέα έκδοση.</li><li>Σας πα�έχουμε π�όσβαση σε ένα "
+"ταμπλό στατιστικών με αναλυτικές λεπτομέ�ειες για τη βάση χ�ηστών σας.</li></"
+"ul><p> Τα π�όσθετα που φιλοξενο�με στον ιστότοπο αυτό, θα π�έπει να "
+"αξιολογήθουν από κάποιο συντάκτη του ιστότοπου για να αποκτήσουν όλα όσα "
+"αναφέ�αμε πα�απάνω. Αν είστε έτοιμοι να ξεκινήσετε τη διαδικασία και έχετε "
+"ετοιμάσει το πακέτο  του π�όσθετου σας για αποστολή, απλά κάντε κλικ στο "
+"πα�ακάτω κουμπί «Ξεκινήστε τώ�α»!</p>"
+
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Υποστη�ιζόμενες πλατφό�μες:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Α�χείο π�όσθετου: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Άλλο"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
-msgstr "Το νέο σας α�χείο θα είναι διαθέσιμο στο δημόσιο χώ�ο όταν θα μπο�έσει να το αξιολογήσει κάποιος συντάκτης. Υπά�χουν π�ος το πα�όν %1$s άλλα π�όσθετα σε ου�ά αναμονής. Θέλετε να επιταχ�νετε τη διαδικασία αξιολόγησης; Σκεφτείτε την πιθανότητα να <a %2$s>γίνετε συντάκτης</a> κι εσείς."
+msgstr ""
+"Το νέο σας α�χείο θα είναι διαθέσιμο στο δημόσιο χώ�ο όταν θα μπο�έσει να το "
+"αξιολογήσει κάποιος συντάκτης. Υπά�χουν π�ος το πα�όν %1$s άλλα π�όσθετα σε "
+"ου�ά αναμονής. Θέλετε να επιταχ�νετε τη διαδικασία αξιολόγησης; Σκεφτείτε "
+"την πιθανότητα να <a %2$s>γίνετε συντάκτης</a> κι εσείς."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
-msgstr "Η νέα έκδοση θα είναι διαθέσιμη στο δημόσιο χώ�ο όταν θα μπο�έσει να την αξιολογήσει κάποιος συντάκτης. Υπά�χουν π�ος το πα�όν %1$s άλλα π�όσθετα σε ου�ά αναμονής. Θέλετε να επιταχ�νετε τη διαδικασία αξιολόγησης; Σκεφτείτε την πιθανότητα να <a %2$s>γίνετε συντάκτης</a> κι εσείς."
+msgstr ""
+"Η νέα έκδοση θα είναι διαθέσιμη στο δημόσιο χώ�ο όταν θα μπο�έσει να την "
+"αξιολογήσει κάποιος συντάκτης. Υπά�χουν π�ος το πα�όν %1$s άλλα π�όσθετα σε "
+"ου�ά αναμονής. Θέλετε να επιταχ�νετε τη διαδικασία αξιολόγησης; Σκεφτείτε "
+"την πιθανότητα να <a %2$s>γίνετε συντάκτης</a> κι εσείς."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
-msgstr "Δημιου�γήθηκε η νέα σας έκδοση και έχει σημειωθεί π�ος το πα�όν σε κατάσταση «%s»."
+msgstr ""
+"Δημιου�γήθηκε η νέα σας έκδοση και έχει σημειωθεί π�ος το πα�όν σε κατάσταση "
+"«%s»."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
-msgstr "Δείτε το νέο σας α�χείο στη <a %1$s>σελίδα εκδόσεων και α�χείων</a>, ελέγξτε την <a %2$s>τ�έχουσα κατάσταση</a> του π�όσθετου σας, ή <b>π�οσθέστε σημειώσεις έκδοσης</b> κάνοντας κλικ στο πα�ακάτω κουμπί (συνιστάται)."
+msgstr ""
+"Δείτε το νέο σας α�χείο στη <a %1$s>σελίδα εκδόσεων και α�χείων</a>, ελέγξτε "
+"την <a %2$s>τ�έχουσα κατάσταση</a> του π�όσθετου σας, ή <b>π�οσθέστε "
+"σημειώσεις έκδοσης</b> κάνοντας κλικ στο πα�ακάτω κουμπί (συνιστάται)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
-msgstr "Δείτε τη νέα έκδοση σας στη <a %1$s>σελίδα εκδόσεων και α�χείων</a>, ελέγξτε την <a %2$s>τ�έχουσα κατάσταση</a> του π�όσθετου σας, ή <b>π�οσθέστε σημειώσεις έκδοσης</b> κάνοντας κλικ στο πα�ακάτω κουμπί (συνιστάται)."
+msgstr ""
+"Δείτε τη νέα έκδοση σας στη <a %1$s>σελίδα εκδόσεων και α�χείων</a>, ελέγξτε "
+"την <a %2$s>τ�έχουσα κατάσταση</a> του π�όσθετου σας, ή <b>π�οσθέστε "
+"σημειώσεις έκδοσης</b> κάνοντας κλικ στο πα�ακάτω κουμπί (συνιστάται)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
-msgstr "Αποστείλετε το α�χείο του π�όσθετου σας από την πα�ακάτω φό�μα. Αν χ�ειάζεται να αποστείλετε διάφο�α α�χεία, ξεχω�ιστά για κάθε πλατφό�μα, επιλέξτε ένα μοναδικό α�χείο και μετά αποστείλετε τα υπόλοιπα χ�ησιμοποιώντας τον διαχει�ιστή εκδόσεων και α�χείων."
+msgstr ""
+"Αποστείλετε το α�χείο του π�όσθετου σας από την πα�ακάτω φό�μα. Αν "
+"χ�ειάζεται να αποστείλετε διάφο�α α�χεία, ξεχω�ιστά για κάθε πλατφό�μα, "
+"επιλέξτε ένα μοναδικό α�χείο και μετά αποστείλετε τα υπόλοιπα "
+"χ�ησιμοποιώντας τον διαχει�ιστή εκδόσεων και α�χείων."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Όλες"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Συγκεκ�ιμένα:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Πα�ακαλο�με επιλέξτε..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4063,24 +4066,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Ενημέ�ωση του  %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Πα�ακαλο�με δείτε %s για οδηγίες."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "αυτή τη σελίδα"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Δεν β�έθηκε λογα�ιασμός με αυτή τη διε�θυνση ηλ. αλληλογ�αφίας."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Είτε δεν είναι έγκυ�ος ο κώδικας XML, είτε απουσιάζουν απαιτο�μενα πεδία.  Πα�ακαλο�με δείτε την <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">τεκμη�ίωση</a>, επαληθε�στε το π�όσθετο σας και π�οσπαθήστε ξανά."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Επεξε�γασία έκδοσης"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Η έκδοση ενημε�ώθηκε με επιτυχία."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4137,66 +4147,66 @@ msgstr[1] "%s αξιολογήσεις"
 msgid "devcp_versions_delete_sure"
 msgstr "Θέλετε σίγου�α να διαγ�αφεί ο�ιστικά η έκδοση %s;"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Ακ��ωση"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Διαγ�αφή α�χείου"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Π�οσθήκη νέας εφα�μογής"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Αφαί�εση εφα�μογής"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Π�οσθήκη νέου α�χείου"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
-msgstr "Η ��θμιση πλη�οφο�ιών για την εφα�μογή εδώ θα επιτ�έψει στους χ�ήστες να εγκαταστήσουν το π�όσθετο σας ακόμα και αν το α�χείο  install.rdf του πακέτου υποδεικν�ει ότι δεν είναι συμβατό με την εφα�μογή. <a %s>Λίστα υποστη�ιζόμενων εφα�μογών</a>"
+msgstr ""
+"Η ��θμιση πλη�οφο�ιών για την εφα�μογή εδώ θα επιτ�έψει στους χ�ήστες να "
+"εγκαταστήσουν το π�όσθετο σας ακόμα και αν το α�χείο  install.rdf του "
+"πακέτου υποδεικν�ει ότι δεν είναι συμβατό με την εφα�μογή. <a %s>Λίστα "
+"υποστη�ιζόμενων εφα�μογών</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr "Θέλετε <b>σίγου�α</b> να αφαι�εθεί η συμβατότητα με αυτή την εφα�μογή;"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Θέλετε <b>σίγου�α</b> να διαγ�αφεί ο�ιστικά αυτό το α�χείο;"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Πλη�οφο�ίες έγκ�ισης"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Συμβατές εφα�μογές"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Πλη�οφο�ίες α�χείου"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Άδεια"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Διαχεί�ιση έκδοσης %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Σημειώσεις έγκ�ισης"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Διαγ�αφή α�χείου"
 
@@ -4205,63 +4215,70 @@ msgstr "Διαγ�αφή α�χείου"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Το α�χείο %1$s (πλατφό�μα: %2$s) δημιου�γήθηκε στις %3$s και η κατάσταση του άλλαξε σε « %4$s» στις %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Πα�ακαλο�με επιλέξτε την κατάλληλη άδεια για το π�όσθετο σας. Η άδεια αυτή καθο�ίζει τα δικαιώματα που πα�έχετε πάνω στον πηγαίο κώδικα."
+msgid "devcp_versions_edit_li_file"
+msgstr ""
+"Το α�χείο %1$s (πλατφό�μα: %2$s) δημιου�γήθηκε στις %3$s και η κατάσταση του "
+"άλλαξε σε « %4$s» στις %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Δεν β�έθηκαν α�χεία."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
-msgstr "Π�οαι�ετικές πλη�οφο�ίες για τον συντάκτη που θα αξιολογήσει αυτή την έκδοση."
+msgstr ""
+"Π�οαι�ετικές πλη�οφο�ίες για τον συντάκτη που θα αξιολογήσει αυτή την έκδοση."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Αφαί�εση συμβατότητας με εφα�μογή"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Πα�ακαλο�με επιλέξτε μια εφα�μογή"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Α�χείο"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Πλατφό�μα"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Μέγεθος"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Κατάσταση"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Πλη�οφο�ίες για τις αλλαγές σ' αυτή την έκδοση, νέα χα�ακτη�ιστικά, γνωστά π�οβλήματα και άλλες χ�ήσιμες πλη�οφο�ίες  γι' αυτή τη συγκεκ�ιμένη έκδοση. Αυτές οι πλη�οφο�ίες θα είναι διαθέσιμες  στους χ�ήστες και μέσα από το διάλογο διαχει�ιστή π�όσθετων του Firefox 3."
+msgstr ""
+"Πλη�οφο�ίες για τις αλλαγές σ' αυτή την έκδοση, νέα χα�ακτη�ιστικά, γνωστά "
+"π�οβλήματα και άλλες χ�ήσιμες πλη�οφο�ίες  γι' αυτή τη συγκεκ�ιμένη έκδοση. "
+"Αυτές οι πλη�οφο�ίες θα είναι διαθέσιμες  στους χ�ήστες και μέσα από το "
+"διάλογο διαχει�ιστή π�όσθετων του Firefox 3."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Σημειώσεις έκδοσης"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Υπά�χουν μη αποθηκευμένες αλλαγές.</strong> Η συμβατότητα δεν θα διαγ�αφεί  μέχ�ι να κάνετε κλικ στο «Ενημέ�ωση εκδόσεων» πα�ακάτω."
+msgstr ""
+"<strong>Υπά�χουν μη αποθηκευμένες αλλαγές.</strong> Η συμβατότητα δεν θα "
+"διαγ�αφεί  μέχ�ι να κάνετε κλικ στο «Ενημέ�ωση εκδόσεων» πα�ακάτω."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Υπά�χουν μη αποθηκευμένες αλλαγές.</strong> Τα α�χεία δεν θα διαγ�αφο�ν αν δεν κάνετε κλικ στο «Ενημέ�ωση εκδόσεων» πα�ακάτω."
+msgstr ""
+"<strong>Υπά�χουν μη αποθηκευμένες αλλαγές.</strong> Τα α�χεία δεν θα "
+"διαγ�αφο�ν αν δεν κάνετε κλικ στο «Ενημέ�ωση εκδόσεων» πα�ακάτω."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Ενημέ�ωση εκδόσεων"
 
@@ -4280,7 +4297,9 @@ msgstr "Η έκδοση %s διαγ�άφηκε με επιτυχία."
 
 #: views/developers/versions.thtml:73
 msgid "devcp_versions_p_remove"
-msgstr "Αυτή η έκδοση δεν είναι συσχετισμένη με κανένα α�χείο και μπο�εί να αφαι�εθεί. Θέλετε να την αφαι�έσουμε;"
+msgstr ""
+"Αυτή η έκδοση δεν είναι συσχετισμένη με κανένα α�χείο και μπο�εί να "
+"αφαι�εθεί. Θέλετε να την αφαι�έσουμε;"
 
 #: views/developers/versions.thtml:58
 msgid "devcp_versions_th_created"
@@ -4294,7 +4313,7 @@ msgstr "Κατάσταση"
 msgid "devcp_versions_th_version"
 msgstr "Έκδοση"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Αυτό το π�όσθετο έχει απενε�γοποιηθεί"
 
@@ -4338,8 +4357,7 @@ msgstr "Φίλτ�ο"
 msgid "editorcp_logs_filter_by"
 msgstr "Φιλτ�ά�ισμα κατά τ�πο/ενέ�γεια"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Καταγ�αφή συμβάντων"
 
@@ -4401,7 +4419,7 @@ msgstr "Εμφάνιση εγγ�αφών μεταξ� %s και %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Δεν β�έθηκαν αξιολογήσεις γι' αυτή την πε�ίοδο."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Καταγ�αφή αξιολόγησης"
 
@@ -4425,29 +4443,28 @@ msgstr "Π�όσφατη δ�αστη�ιότητα συντάκτη"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Σ�νολο αξιολογήσεων"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Αξιολόγηση π�όσθετου"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Πα�ακαλο�με συμπλη�ώστε τα ακόλουθα πεδία:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Πα�ακαλο�με επιλέξτε τουλάχιστον ένα α�χείο για αξιολόγηση."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Δεν επιτ�έπεται η αξιολόγηση δικο� σας π�όσθετου."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Λογισμικό τ�ίτων"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Π�οσθήκη χα�ακτη�ιστικο�"
 
@@ -4455,299 +4472,257 @@ msgstr "Π�οσθήκη χα�ακτη�ιστικο�"
 msgid "editors_featured_add_feature_submit"
 msgstr "Π�οσθήκη"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Αποτυχία π�οσθήκης χα�ακτη�ιστικο�."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Το χα�ακτη�ιστικό π�οστέθηκε επιτυχώς."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Αποτυχία επεξε�γασίας χα�ακτη�ιστικο�."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Το χα�ακτη�ιστικό επεξε�γάστηκε επιτυχώς."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Μια ή πε�ισσότε�ες γλώσσες δεν είναι έγκυ�η."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Αποτυχία αφαί�εσης χα�ακτη�ιστικο�."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Το χα�ακτη�ιστικό αφαι�έθηκε επιτυχώς."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Μετάβαση"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Αφαί�εση χα�ακτη�ιστικο�"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Ου�ά αναμονής φίλτ�ων"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Δεσμοί για βοήθεια"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Οδηγός συντάκτη"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Πολιτική π�όσθετου"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Τα φίλτ�α θα πα�αμείνουν ενε�γά για τη συνεδ�ία ή μέχ�ι να εκκαθα�ιστο�ν."
+msgstr ""
+"Τα φίλτ�α θα πα�αμείνουν ενε�γά για τη συνεδ�ία ή μέχ�ι να εκκαθα�ιστο�ν."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Δεν υπά�χουν π�ος το πα�όν π�όσθετα για αξιολόγηση"
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ημέ�α"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ώ�α"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 λεπτό"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Πίνακας ελέγχου συντάκτη"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "μόνο για %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Π�οέκδοση"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Συμβατότητα με %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Διε�θυνση ηλ. ταχυδ�ομείου δημιου�γο� ή π�όσθετου"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Τ�ποι π�όσθετων"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Π�όγ�αμμα"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Μέγιστη έκδοση"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Πλατφό�μες"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Χ�όνος υποβολής (ημέ�ες)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Αποτελέσματα της φιλτ�α�ισμένης αναζήτησης: <strong>%1$s</strong> π�όσθετο"
-msgstr[1] "Αποτελέσματα της φιλτ�α�ισμένης αναζήτησης: <strong>%1$s</strong> π�όσθετα"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Εκκαθά�ιση"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Φίλτ�ο"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Όλες οι λίστες αναμονής αξιολογήσεων έχουν π�ος το πα�όν απενε�γοποιηθεί. Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Επεξε�γασία αντικειμένου"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Ιστο�ικό αντικειμένου"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Α�χική σελίδα αντικειμένου"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Επισκόπηση στοιχείου"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Π�οεπισκοπήσεις"
+msgstr ""
+"Όλες οι λίστες αναμονής αξιολογήσεων έχουν π�ος το πα�όν απενε�γοποιηθεί. "
+"Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
 
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ενέ�γεια αξιολόγησης"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Αίτηση για πε�ισσότε�ες πλη�οφο�ίες"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Π�οώθηση στο δημόσιο χώ�ο"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Αίτηση ανώτε�ης αξιολόγησης"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Πα�αμονή στο Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Αξιολόγηση σχόλιων"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "Χ�ησιμοποιείστε αυτή τη φό�μα για να ζητήσετε πε�ισσότε�ες πλη�οφο�ίες από τους δημιου�γο�ς. Θα ειδοποιηθο�ν μέσω ηλεκτ�ονικο� ταχυδ�ομείου και θα μπο�ο�ν να απαντήσουν εδώ. Όταν απαντήσουν, θα ειδοποιηθείτε κι εσείς μέσω ηλεκτ�ονικο� ταχυδ�ομείου."
+msgstr ""
+"Χ�ησιμοποιείστε αυτή τη φό�μα για να ζητήσετε πε�ισσότε�ες πλη�οφο�ίες από "
+"τους δημιου�γο�ς. Θα ειδοποιηθο�ν μέσω ηλεκτ�ονικο� ταχυδ�ομείου και θα "
+"μπο�ο�ν να απαντήσουν εδώ. Όταν απαντήσουν, θα ειδοποιηθείτε κι εσείς μέσω "
+"ηλεκτ�ονικο� ταχυδ�ομείου."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Αυτή η ενέ�γεια θα σημειώσει το π�όσθετο και την πιο π�όσφατη έκδοσή του ως κατάλληλες για τοποθέτηση στο δημόσιο χώ�ο. Οι μελλοντικές εκδόσεις θα πα�αμένουν στο sandbox ώσπου να αξιολογηθο�ν από κάποιον συντάκτη."
+msgstr ""
+"Αυτή η ενέ�γεια θα σημειώσει το π�όσθετο και την πιο π�όσφατη έκδοσή του ως "
+"κατάλληλες για τοποθέτηση στο δημόσιο χώ�ο. Οι μελλοντικές εκδόσεις θα "
+"πα�αμένουν στο sandbox ώσπου να αξιολογηθο�ν από κάποιον συντάκτη."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Αυτή η ενέ�γεια θα διατη�ήσει το π�όσθετο στο sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Αυτή η ενέ�γεια θα επιτ�έψει σε μια έκδοση που β�ίσκεται π�ος το πα�όν στο sandbox, να εμφανιστεί στο δημόσιο χώ�ο."
+msgstr ""
+"Αυτή η ενέ�γεια θα επιτ�έψει σε μια έκδοση που β�ίσκεται π�ος το πα�όν στο "
+"sandbox, να εμφανιστεί στο δημόσιο χώ�ο."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "Αυτή η ενέ�γεια θα διατη�ήσει στο sandbox μια έκδοση π�όσθετου που β�ίσκεται ήδη εκεί."
+msgstr ""
+"Αυτή η ενέ�γεια θα διατη�ήσει στο sandbox μια έκδοση π�όσθετου που β�ίσκεται "
+"ήδη εκεί."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Αν έχετε αμφιβολίες για την ασφάλεια του συγκεκ�ιμένου π�όσθετου, για θέματα πνευματικής ιδιοκτησίας ή για ο,τιδήποτε άλλο θα έπ�επε να ελέγξει ένας διαχει�ιστής, εισάγετε τα σχόλιά σας στην πα�ακάτω πε�ιοχή. Τα σχόλια θα αποσταλο�ν στους διαχει�ιστές μόνο και όχι στο δημιου�γό."
+msgstr ""
+"Αν έχετε αμφιβολίες για την ασφάλεια του συγκεκ�ιμένου π�όσθετου, για θέματα "
+"πνευματικής ιδιοκτησίας ή για ο,τιδήποτε άλλο θα έπ�επε να ελέγξει ένας "
+"διαχει�ιστής, εισάγετε τα σχόλιά σας στην πα�ακάτω πε�ιοχή. Τα σχόλια θα "
+"αποσταλο�ν στους διαχει�ιστές μόνο και όχι στο δημιου�γό."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Σ�γκ�ιση με την έκδοση στο δημόσιο χώ�ο"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Εμφάνιση πε�ιεχομένων"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Δημιου�γοί:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Κατηγο�ίες:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Συμβατότητα:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Πε�ιγ�αφή"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Σχόλια δημιου�γο�"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ΣΑΤΧ (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Α�χεία:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Ιστο�ικό στοιχείου"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Μήνυμα υποβολής υποψηφιότητας"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Στιγμιότυπα"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Πολιτική απο��ήτου"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Αξιολόγηση του %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Σημειώσεις για το συντάκτη αξιολόγησης"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Πε�ίληψη"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Σημειώσεις έκδοσης"
 
@@ -4775,7 +4750,7 @@ msgstr "Η υποψηφιότητα εγκ�ίθηκε/δημόσιος χώ�ο
 msgid "editors_review_history_nominated_denied"
 msgstr "Η υποψηφιότητα απο��ίφθηκε/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Δε β�έθηκαν παλαιότε�ες αξιολογήσεις."
 
@@ -4802,88 +4777,81 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Π�οβολή/απόκ�υψη απάντησης (%1$s)"
 msgstr[1] "Π�οβολή/απόκ�υψη απαντήσεων (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Εφα�μογές:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ή επιλέξτε μια τυποποιημένη απόκ�ιση:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Σχόλια:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Λειτου�γικά συστήματα:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Κο�υφή"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Σημείωση: Αξιολογήστε πάνω από ένα α�χείο μόνο αν ελέγξατε όλα τα α�χεία που επιλέξατε."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "επόμ. &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Δε β�έθηκε αξιολόγηση."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; π�οηγ."
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Ου�ά αναμονής αξιολόγησης"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> από %2$s σε αναμονή"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong>ο από %2$s π�όσθετα στην ου�ά αναμονής(φιλτ�α�ισμένα))"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ενέ�γεια επεξε�γασίας"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ενέ�γεια"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Σχόλια"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Ημε�ομηνία"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Συντάκτης αξιολόγησης"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Έκδοση/Α�χείο"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "�α ειδοποιηθώ την επόμενη φο�ά που θα ενημε�ωθεί το π�όσθετο. (Ισχ�ει για μια μόνο φο�ά, δεν θα σταλεί μήνυμα ειδοποίησης για άλλες μελλοντικές ενημε�ώσεις)"
+msgstr ""
+"�α ειδοποιηθώ την επόμενη φο�ά που θα ενημε�ωθεί το π�όσθετο. (Ισχ�ει για "
+"μια μόνο φο�ά, δεν θα σταλεί μήνυμα ειδοποίησης για άλλες μελλοντικές "
+"ενημε�ώσεις)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Η αξιολόγηση επεξε�γάστηκε με επιτυχία."
 
@@ -4907,7 +4875,7 @@ msgstr "Ενέ�γεια"
 msgid "editors_reviews_in_reply_to"
 msgstr "Σε απάντηση του:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Οι αξιολογήσεις επεξε�γάστηκαν με επιτυχία!"
 
@@ -4919,85 +4887,87 @@ msgstr "Δεν υπάÏ�χουν αξιολογήσεις για έλεγχο Ï€Ï
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Επεξε�γασία αξιολογήσεων"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Συσχετιζόμενο με ιστοχώ�ο"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "�έο"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Ενημε�ωμένο"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Ελεγμένη εφα�μογή"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Ελεγμένο λειτου�γικό σ�στημα"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Π�όσθετες πλη�οφο�ίες"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Π�όσθετο"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Τ�πος"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Τ�ποι π�όσθετων"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Ηλικία"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Εφα�μογές"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Πε�ιο�ισμός γλωσσών;"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Χ�όνος αναμονής"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Α�ξουσα ταξινόμηση"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Πλατφό�μες"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Φθίνουσα ταξινόμηση"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Τ�ποι υποβληθέντων"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ημέ�ες"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ώ�ες"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s λεπτά"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Απαγο�ε�εται η π�όσβαση"
 
@@ -5005,41 +4975,34 @@ msgstr "Απαγο�ε�εται η π�όσβαση"
 msgid "error_access_denied_message"
 msgstr "Δεν είστε εξουσιοδοτημένος να δείτε αυτή τη σελίδα."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Το π�όσθετο υπά�χει ήδη!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Δε β�έθηκε το π�όσθετο!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Δεν μπο�εί να εμφανιστεί εδώ αυτό το π�όσθετο."
 
@@ -5047,7 +5010,7 @@ msgstr "Δεν μποÏ�εί να εμφανιστεί εδώ αυτό το Ï€Ï�Ï
 msgid "error_addon_selfreview"
 msgstr "Δεν επιτ�έπεται να αξιολογήσετε το π�όσθετο σας."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Δεν υπά�χουν π�όσθετα σε αυτή την κατηγο�ία!"
 
@@ -5055,108 +5018,87 @@ msgstr "Δεν υπά�χουν π�όσθετα σε αυτή την κατηγ
 msgid "error_collection_feed_notfound"
 msgstr "Δεν β�έθηκε το α�χείο �οής του π�όσθετου"
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Δεν είναι έγκυ�η η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Δεν επιτ�έπεται να είναι κενό το πεδίο."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Δε β�έθηκε το α�χείο!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Σφάλμα α�χείου: δεν υπά�χει το %s."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
-msgstr "Εντοπίστηκαν σφάλματα στη φό�μα. Πα�ακαλο�με διο�θώστε τα και υποβάλετέ την ξανά."
+msgstr ""
+"Εντοπίστηκαν σφάλματα στη φό�μα. Πα�ακαλο�με διο�θώστε τα και υποβάλετέ την "
+"ξανά."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Λάθος λέξη, πα�ακαλο�με π�οσπαθήστε ξανά!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "Αυτό το  URL έχει μη έγκυ�η μο�φή. Τα έγκυ�α URL έχουν τη μο�φή http://example.com/my_page."
+msgstr ""
+"Αυτό το  URL έχει μη έγκυ�η μο�φή. Τα έγκυ�α URL έχουν τη μο�φή http://"
+"example.com/my_page."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Λείπει το ό�ισμα: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Δεν πε�ιέχει α�χεία"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Ειδοποίηση"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Δε β�έθηκε στιγμιότυπο!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Π�έπει να επιλέξετε βαθμολογία."
 
@@ -5164,95 +5106,83 @@ msgstr "Π�έπει να επιλέξετε βαθμολογία."
 msgid "error_user_already_confirmed"
 msgstr "Ο λογα�ιασμός χ�ήστη έχει ήδη επιβεβαιωθεί."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Μη έγκυ�ος κωδικός επιβεβαίωσης!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Δεν ται�ιάζουν οι κωδικοί."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
-msgstr "Αυτή η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου χ�ησιμοποιείται ήδη από άλλο χ�ήστη."
+msgstr ""
+"Αυτή η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου χ�ησιμοποιείται ήδη από άλλο "
+"χ�ήστη."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Ο χ�όνος για αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου έχει λήξει. Πα�ακαλο�με αλλάξτε ξανά τη διε�θυνση στο π�οφίλ χ�ήστη και κάντε κλικ στο δεσμό που θα β�είτε στο μήνυμα επιβεβαίωσης μόλις το πα�αλάβετε."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Οι χ�ήστες μπο�ο�ν να έχουν μόνο ένα �όλο κάθε φο�ά. Πα�ακαλο�με αφαι�έστε οποιοδήποτε άλλο �όλο από το χ�ήστη π�ιν συνεχίσετε."
+msgstr ""
+"Ο χ�όνος για αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου έχει λήξει. "
+"Πα�ακαλο�με αλλάξτε ξανά τη διε�θυνση στο π�οφίλ χ�ήστη και κάντε κλικ στο "
+"δεσμό που θα β�είτε στο μήνυμα επιβεβαίωσης μόλις το πα�αλάβετε."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Το ψευδώνυμο υπά�χει ήδη."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Δε β�έθηκε ο χ�ήστης!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Πα�ακαλο�με επιβεβαιώστε π�ώτα το λογα�ιασμό χ�ήστη με τον κωδικό που πα�αλάβατε μέσω ηλεκτ�ονικο� ταχυδ�ομείου."
+msgstr ""
+"Πα�ακαλο�με επιβεβαιώστε π�ώτα το λογα�ιασμό χ�ήστη με τον κωδικό που "
+"πα�αλάβατε μέσω ηλεκτ�ονικο� ταχυδ�ομείου."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Λάθος όνομα χ�ήστη ή κωδικός!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Δε β�έθηκε η έκδοση!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Έχετε εισάγει λάθος κωδικό!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Μάθετε πε�ισσότε�α"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Μάθετε πε�ισσότε�α για το %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s αξιολόγηση"
 msgstr[1] "%1$s αξιολογήσεις"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Δείτε πε�ισσότε�α από"
 
@@ -5292,151 +5222,140 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Πε�ί"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "Ιστολόγιο"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "Σ. Ε."
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Συχνές ε�ωτήσεις"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Με την επιφ�λαξη παντός δικαιώματος."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
-msgstr "Copyright"
+msgstr "Πνευματικά δικαιώματα"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Μνεία"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Ο ο�γανισμός Mozilla πα�έχει τους δεσμο�ς αυτο�ς σαν μια π�όσθετη υπη�εσία και δεν αντιπ�οσωπε�ει τις εφα�μογές ή οποιαδήποτε πλη�οφο�ία σχετικά με αυτές. Οποιαδήποτε ε�ώτηση, πα�άπονο ή ισχυ�ισμός σχετικά με τις εφα�μογές θα π�έπει να απευθ�νεται στον αντίστοιχο κατασκευαστή λογισμικο�."
+msgstr ""
+"Ο ο�γανισμός Mozilla πα�έχει τους δεσμο�ς αυτο�ς σαν μια π�όσθετη υπη�εσία "
+"και δεν αντιπ�οσωπε�ει τις εφα�μογές ή οποιαδήποτε πλη�οφο�ία σχετικά με "
+"αυτές. Οποιαδήποτε ε�ώτηση, πα�άπονο ή ισχυ�ισμός σχετικά με τις εφα�μογές "
+"θα π�έπει να απευθ�νεται στον αντίστοιχο κατασκευαστή λογισμικο�."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
-msgstr "Αλλαγή"
+msgstr "Μετάβαση"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "�ομικές σημειώσεις"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Άλλες γλώσσες:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Πολιτική απο��ήτου"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Αποθήκευση"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Λεξικό"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Λεξικά"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Επέκταση"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Επεκτάσεις"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Πακέτο γλώσσας (π�όσθετου)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Πακέτα γλώσσας (π�όσθετου)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Πακέτο γλώσσας (εφα�μογής)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Πακέτα γλώσσας (εφα�μογής)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Π�όσθετη λειτου�γία"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Π�όσθετες λειτου�γίες"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Μηχανή αναζήτησης"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Μηχανές αναζήτησης"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Θέμα"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Θέματα"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Όλες οι γλώσσες"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Επιστ�οφή στην α�χική σελίδα των π�όσθετων του %1$s"
@@ -5445,81 +5364,37 @@ msgstr "ΕπιστÏ�οφή στην αÏ�χική σελίδα των Ï€Ï�όσθÎ
 msgid "header_main_firefox_header"
 msgstr "Π�όσθετα Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Π�όσθετα <em>για τον</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Π�όσθετα"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Π�όσθετα <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Π�όσθετα Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Π�όσθετα <em>για τον</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Π�όσθετα Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Π�όσθετα <em>για τον</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Π�όσθετα Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Π�όσθετα <em>για τον</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Μετάβαση στο μενο� π�ογ�αμμάτων"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Μετάβαση στο μενο� κατηγο�ιών"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Μετάβαση στο κεντ�ικό πε�ιεχόμενο"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Μετάβαση στη φό�μα αναζήτησης"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Π�όσθετα"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Σ�νδεση"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Αποσ�νδεση"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Ο λογα�ιασμός μου"
 
@@ -5527,23 +5402,11 @@ msgstr "Ο λογα�ιασμός μου"
 msgid "header_navlink_register"
 msgstr "Εγγ�αφή"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Εγγ�αφείτε</a> ή <a href=\"%2$s\">συνδεθείτε</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Ε�γαλεία"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5552,52 +5415,38 @@ msgstr "Εικόνα π�οεπισκόπησης του %s"
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">Συνδεθείτε</a> για να εγκαταστήσετε αυτό το π�όσθετο. <a href=\"%2$s\">Ποιος ο λόγος</a>;"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "�α επιτ�απεί η εγκατάσταση αυτο� του πει�αματικο� π�όσθετου. <a href=\"%1$s\">Τι είναι αυτό;</a>"
+msgstr ""
+"<a href=\"%1$s\">Συνδεθείτε</a> για να εγκαταστήσετε αυτό το π�όσθετο. <a "
+"href=\"%2$s\">Ποιος ο λόγος</a>;"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Π�οσθήκη στον %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Π�οσθήκη του %1$s στο %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Λήψη %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Δεν είναι διαθέσιμο αυτό το π�όσθετο."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Λίστα πακέτων γλωσσών και λεξικών.."
 
@@ -5609,9 +5458,8 @@ msgstr "Λήψη λεξικο�"
 msgid "langtools_download_langpack"
 msgstr "Λήψη πακέτου γλώσσας"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Λεξικά & πακέτα γλώσσας"
 
@@ -5623,74 +5471,36 @@ msgstr "Εγκατάσταση λεξικο�"
 msgid "langtools_install_langpack"
 msgstr "Εγκατάσταση πακέτου γλώσσας"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Λεξικό"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Πακέτο γλώσσας"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Γλώσσα"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Π�οσα�μοσμένη άδεια"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Άδεια BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, έκδοση 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, έκδοση 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, έκδοση 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, έκδοση 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Άδεια MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, έκδοση 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Κάντε κλικ εδώ για επιστ�οφή στην α�χική σελίδα."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Ημε�ομηνία"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Λήψεις"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Όνομα π�όσθετου"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Βαθμολογία"
@@ -5715,22 +5525,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Λεξικά & πακέτα γλωσσών"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Π�όσθετες λειτου�γίες"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Θέματα"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Αναζήτηση π�όσθετων για άλλα π�ογ�άμματα"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "άλλα"
 
@@ -5738,29 +5554,12 @@ msgstr "άλλα"
 msgid "page_title_appversions"
 msgstr "Εκδόσεις εφα�μογών"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Συχνές ε�ωτήσεις Add-on Collector"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Χα�ακτη�ιστικά Add-on Collector"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Καλωσο�ίσατε στο Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Μνεία"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Συχνές ε�ωτήσεις δημιου�γών"
+msgid "page_title_experimental_addons"
+msgstr "Πει�αματικά π�όσθετα"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5790,36 +5589,45 @@ msgstr "Σ�στημα αξιολογήσεων Sandbox"
 msgid "page_title_submissionhelp"
 msgstr "Βοήθεια υποβολής"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Έγκυ�ες εκδόσεις εφα�μογής"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Τα π�όσθετα που υποβάλλετε στο Mozilla Add-ons θα π�έπει να έχουν ένα α�χείο install.rdf που θα υποστη�ίζει τουλάχιστον μια από τις πα�ακάτω εφα�μογές. Μόνο οι εκδόσεις που πα�αθέτουμε πα�ακάτω επιτ�έπονται γι' αυτές τις εφα�μογές."
+msgstr ""
+"Τα π�όσθετα που υποβάλλετε στο Mozilla Add-ons θα π�έπει να έχουν ένα α�χείο "
+"install.rdf που θα υποστη�ίζει τουλάχιστον μια από τις πα�ακάτω εφα�μογές. "
+"Μόνο οι εκδόσεις που πα�αθέτουμε πα�ακάτω επιτ�έπονται γι' αυτές τις "
+"εφα�μογές."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Ακόμα και αν η εφα�μογή που υποστη�ίζεται από το π�ότυπό σας δεν απαιτεί α�χείο install.rdf, θα π�έπει να συμπε�ιλάβετε ένα με τις απαιτο�μενες �υθμίσεις όπως αυτές πε�ιγ�άφονται %s."
+msgstr ""
+"Ακόμα και αν η εφα�μογή που υποστη�ίζεται από το π�ότυπό σας δεν απαιτεί "
+"α�χείο install.rdf, θα π�έπει να συμπε�ιλάβετε ένα με τις απαιτο�μενες "
+"�υθμίσεις όπως αυτές πε�ιγ�άφονται %s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "εδώ"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Εκδόσεις"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Πίσω στην π�οηγο�μενη σελίδα"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Σελίδα πλη�οφο�ιών για το Sandbox"
 
@@ -5827,13 +5635,22 @@ msgstr "Σελίδα πλη�οφο�ιών για το Sandbox"
 msgid "pagination_next_page"
 msgstr "επόμενη"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Σελίδα %1$s από %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "π�οηγο�μενη"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Πα�ακαλο�με εισάγετε <strong>και τις δ�ο λέξεις</strong> πα�ακάτω, <strong>διαχω�ίζοντας τις με ένα κενό διάστημα</strong>."
+msgstr ""
+"Πα�ακαλο�με εισάγετε <strong>και τις δ�ο λέξεις</strong> πα�ακάτω, "
+"<strong>διαχω�ίζοντας τις με ένα κενό διάστημα</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5849,7 +5666,10 @@ msgstr "Πα�ακαλο�με πληκτ�ολογήστε αυτό που ακ
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "αν δεν μπο�είτε να καταλάβατε τι ακο�τε, μπο�είτε να <a href=\"%1$s\">ακο�σετε κάτι άλλο</a> ή<a href=\"%2$s\">να επιστ�έψετε στη μέθοδο με κείμενο</a>."
+msgstr ""
+"αν δεν μπο�είτε να καταλάβατε τι ακο�τε, μπο�είτε να <a href=\"%1$s"
+"\">ακο�σετε κάτι άλλο</a> ή<a href=\"%2$s\">να επιστ�έψετε στη μέθοδο με "
+"κείμενο</a>."
 
 # %1 is the link switching refreshing the captcha
 # %2 is the link switching to an audio captcha
@@ -5857,17 +5677,20 @@ msgstr "αν δεν μπο�είτε να καταλάβατε τι ακο�τε
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Αν δεν μπο�είτε να καταλάβετε τι γ�άφει, μπο�είτε να <a href=\"%1$s\">δοκιμάσετε διαφο�ετικές λέξεις</a> ή <a href=\"%2$s\">να ακο�σετε κάτι</a>."
+msgstr ""
+"Αν δεν μπο�είτε να καταλάβετε τι γ�άφει, μπο�είτε να <a href=\"%1$s"
+"\">δοκιμάσετε διαφο�ετικές λέξεις</a> ή <a href=\"%2$s\">να ακο�σετε κάτι</"
+"a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Είστε άνθ�ωπος;"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Τι είναι αυτό;"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Πα�ουσιάστηκε σφάλμα κατά τη σημείωση της αξιολόγησης!"
 
@@ -5875,8 +5698,7 @@ msgstr "ΠαÏ�ουσιάστηκε σφάλμα κατά τη σημείωση Ï
 msgid "review_flag_reason_bug_support"
 msgstr "Αναφο�ά σφάλματος ή αίτημα υποστή�ιξης αντί για αξιολόγηση."
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Αναφο�ά αξιολόγησης (επιλέξτε ένα λόγο)"
 
@@ -5892,11 +5714,12 @@ msgstr "Άλλος (πα�ακαλο�με εξηγήστε)"
 msgid "review_flag_reason_spam"
 msgstr "Ανεπιθ�μητο ή άσχετο με την αξιολόγηση πε�ιεχόμενο."
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
-msgstr "Ευχα�ιστο�με, η αξιολόγηση έχει σημειωθεί για να εγκ�ιθεί από τους συντάκτες μας."
+msgstr ""
+"Ευχα�ιστο�με, η αξιολόγηση έχει σημειωθεί για να εγκ�ιθεί από τους συντάκτες "
+"μας."
 
 #: views/reviews/display.thtml:41
 msgid "review_flag_this"
@@ -5904,156 +5727,139 @@ msgstr "Αναφο�ά αξιολόγησης"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Θεω�είτε αυτή την αξιολόγηση ανά�μοστη, μη ακ�ιβή ή απλά άσχετη; Κάντε κλικ εδώ για να τη σημειώσετε ώστε να αξιολογηθεί από τους συντάκτες μας."
+msgstr ""
+"Θεω�είτε αυτή την αξιολόγηση ανά�μοστη, μη ακ�ιβή ή απλά άσχετη; Κάντε κλικ "
+"εδώ για να τη σημειώσετε ώστε να αξιολογηθεί από τους συντάκτες μας."
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Έχετε υπόψη σας τα εξής:</p><ul><li>Συντάξτε την αξιολόγηση σας σα να διηγήστε την εμπει�ία σας με το π�όσθετο σε ένα φίλο σας.  Δώστε συγκεκ�ιμένες και χ�ήσιμες λεπτομέ�ειες, όπως τα χα�ακτη�ιστικά που σας ά�εσαν και/ή δεν σας ά�εσαν, πόσο ε�κολη είναι η χ�ήση του και αν έχει κάποια πιθανά μειονεκτήματα. Αποφ�γετε γενικε�σεις του τ�που «Φοβε�ό» ή  «Άχ�ηστο», εκτός κι αν μπο�είτε να δικαιολογήσετε αυτή σας την άποψη.</li><li>Πα�ακαλο�με μη δημοσιε�ετε αναφο�ές σφαλμάτων στις αξιολογήσεις. Οι δημιου�γοί είναι πιθανό να χ�ειαστεί να επικοινωνήσουν μαζί σας για να επιλυθεί το π�όβλημα κι εμείς δεν τους γνωστοποιο�με τη διε�θυνση του ηλεκτ�ονικο� σας ταχυδ�ομείου.. Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</a> για να μάθετε που μπο�είτε να β�είτε υποστή�ιξη για το π�όσθετο.</li><li>Σας πα�ακαλο�με να διατη�είτε το επίπεδο των αξιολογήσεων και να αποφε�γετε ακατάλληλες εκφ�άσεις και τη δημοσιοποίηση π�οσωπικών σας πλη�οφο�ιών.</li></ul><p>Διαβάστε τις <a href=\"%2$s\">οδηγίες σ�νταξης αξιολόγησης</a> για πε�ισσότε�ες λεπτομέ�ειες σχετικά με την υποβολή αξιολογήσεων από τους χ�ήστες.</p>"
+msgstr ""
+"<p>Έχετε υπόψη σας τα εξής:</p><ul><li>Συντάξτε την αξιολόγηση σας σα να "
+"διηγήστε την εμπει�ία σας με το π�όσθετο σε ένα φίλο σας.  Δώστε "
+"συγκεκ�ιμένες και χ�ήσιμες λεπτομέ�ειες, όπως τα χα�ακτη�ιστικά που σας "
+"ά�εσαν και/ή δεν σας ά�εσαν, πόσο ε�κολη είναι η χ�ήση του και αν έχει "
+"κάποια πιθανά μειονεκτήματα. Αποφ�γετε γενικε�σεις του τ�που «Φοβε�ό» ή  "
+"«Άχ�ηστο», εκτός κι αν μπο�είτε να δικαιολογήσετε αυτή σας την άποψη.</"
+"li><li>Πα�ακαλο�με μη δημοσιε�ετε αναφο�ές σφαλμάτων στις αξιολογήσεις. Οι "
+"δημιου�γοί είναι πιθανό να χ�ειαστεί να επικοινωνήσουν μαζί σας για να "
+"επιλυθεί το π�όβλημα κι εμείς δεν τους γνωστοποιο�με τη διε�θυνση του "
+"ηλεκτ�ονικο� σας ταχυδ�ομείου.. Δείτε το <a href=\"%1$s\">τμήμα υποστή�ιξης</"
+"a> για να μάθετε που μπο�είτε να β�είτε υποστή�ιξη για το π�όσθετο.</"
+"li><li>Σας πα�ακαλο�με να διατη�είτε το επίπεδο των αξιολογήσεων και να "
+"αποφε�γετε ακατάλληλες εκφ�άσεις και τη δημοσιοποίηση π�οσωπικών σας "
+"πλη�οφο�ιών.</li></ul><p>Διαβάστε τις <a href=\"%2$s\">οδηγίες σ�νταξης "
+"αξιολόγησης</a> για πε�ισσότε�ες λεπτομέ�ειες σχετικά με την υποβολή "
+"αξιολογήσεων από τους χ�ήστες.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Αξιολογήσεις για %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Συνιστώμενα π�όσθετα"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Π�όσφατα π�όσθετα"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Δημοφιλή π�όσθετα"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Ενημε�ωμένα π�όσθετα"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Αναζήτηση"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Αποτελέσματα αναζήτησης συλλογών"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Αποτελέσματα αναζήτησης για συλλογές"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
-msgstr "Η αναζήτηση είναι απενε�γοποιημένη π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε ξανά α�γότε�α."
+msgstr ""
+"Η αναζήτηση είναι απενε�γοποιημένη π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε "
+"ξανά α�γότε�α."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "όλα τα π�όσθετα"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "όλες τις συλλογές"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "αναζήτηση για π�όσθετα"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "αναζήτηση για συλλογές"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Αναζήτηση για π�όσθετα"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Κάντε κλικ για να εισάγετε ό�ους αναζήτησης"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "σε"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Όλες τις μηχανές αναζήτησης"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Πε�ιήγηση στις μηχανές αναζήτησης"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "ται�ιάζει %s π�όσθετο"
+msgstr[1] "ται�ιάζουν %s π�όσθετα"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Δε β�έθηκαν αποτελέσματα."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Αναζήτηση στα π�όσθετα"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Α�χείο �οής αποτελεσμάτων αναζήτησης"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Αποτελέσματα αναζήτησης για: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ε�γαλεία διαχει�ιστή"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ε�γαλεία δημιου�γών"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ε�γαλεία συντακτών"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Καλωσή�θατε"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Καλωσό�ισες, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Λεξικό"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Συνιστώμενα π�όσθετα"
 
@@ -6061,7 +5867,7 @@ msgstr "Συνιστώμενα π�όσθετα"
 msgid "sidebar_pitch_looking_for"
 msgstr "Αναζητώ:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "�έα π�όσθετα"
 
@@ -6069,35 +5875,32 @@ msgstr "�έα π�όσθετα"
 msgid "sidebar_pitch_search"
 msgstr "Π�όσθετη λειτου�γία αναζήτησης"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Εγγ�αφή σε"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
-msgstr "Θέματα"
+msgstr "Θέμα"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Ενημε�ωμένα π�όσθετα"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Δεν έχει βαθμολογηθεί ακόμα"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6117,35 +5920,31 @@ msgstr "Εναλλαγή π�όσθετου"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e %b."
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e, %b. %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "Δημιου�γήθηκε το %1$s "
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "Εκδόθηκε ο %1$s"
@@ -6158,202 +5957,214 @@ msgstr "Κλείσιμο"
 msgid "statistics_help_link"
 msgstr "Βοήθεια"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "ή επιλέξτε κάποιο άλλο π�όσθετο"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "ή επιλέξτε ένα π�όσθετο με δημόσια στατιστικά."
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Επιλέξτε ένα από τα π�όσθετά σας για να δείτε τα στατιστικά του"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Επιλέξτε π�όσθετο για να δείτε τα στατιστικά του"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Επιλέξτε π�όσθετο με δημόσια στατιστικά"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Ταμπλό στατιστικών"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Εμφάνιση στατιστικών"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Εμφάνιση πίνακα σε μο�φή CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "κανένα"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Αφαί�εση γ�αφήματος"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Ομαδοποίηση κατά: Ημέ�α"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Ομαδοποίηση κατά: Μήνα"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Ομαδοποίηση κατά : Εβδομάδα"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Σ�γκ�ιση ανά: εβδομάδα"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "β�έθηκαν %s στο διάστημα"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Π�οσθήκη γ�αφήματος"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Π�οσθήκη κι άλλου σχεδίου στο γ�άφημα"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Απόκ�υψη συνολικο� μετ�ητή"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Π�οβολή συνολικο� μετ�ητή"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Σχεδίαση του συνόλου στο γ�άφημα"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Εμφάνιση δεδομένων (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
-msgstr "Πά�τε τα δεδομένα σε α�χείο όπου οι τιμές διαχω�ίζονται με κόμματα (CSV)"
+msgstr ""
+"Πά�τε τα δεδομένα σε α�χείο όπου οι τιμές διαχω�ίζονται με κόμματα (CSV)"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Απόκ�υψη ο�όσημων του %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Π�οβολή ο�όσημων του %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Ημε�ομηνίες έκδοσης π�όσθετου σε επικάλυψη πάνω στο γ�άφημα"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Απόκ�υψη ο�όσημων του Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Π�οβολή ο�όσημων του Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Ημε�ομηνίες έκδοσης του Firefox σε επικάλυψη πάνω στο γ�άφημα"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Σ�μπτυξη γ�αφήματος"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Ανάπτυξη γ�αφήματος"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Αλλαγή μεγέθους γ�αφήματος"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Εφα�μογή"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Π�οσα�μοσμένο"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Λήψεις"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Λειτου�γικό σ�στημα"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Κατάσταση π�όσθετου"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Σ�νοψη"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Έκδοση π�όσθετου"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Εφα�μογή"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Λειτου�γικό σ�στημα"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Κατάσταση π�όσθετου"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Άγνωστη"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Έκδοση π�όσθετου"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Δεν υπά�χουν ακόμα α�κετά δεδομένα για να σχεδιαστεί το γ�άφημα. Πα�ακαλο�με δοκιμάστε ξανά α�γότε�α."
+msgstr ""
+"Δεν υπά�χουν ακόμα α�κετά δεδομένα για να σχεδιαστεί το γ�άφημα. Πα�ακαλο�με "
+"δοκιμάστε ξανά α�γότε�α."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "Δεν υπά�χουν ακόμα δεδομένα για το π�όσθετό σας. Πα�ακαλο�με δοκιμάστε ξανά σε με�ικές μέ�ες."
+msgstr ""
+"Δεν υπά�χουν ακόμα δεδομένα για το π�όσθετό σας. Πα�ακαλο�με δοκιμάστε ξανά "
+"σε με�ικές μέ�ες."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Τα στατιστικά π�όσθετων β�ίσκονται π�ος το πα�όν σε διαδικασία ενημέ�ωσης. Τα π�όσφατα δεδομένα μπο�εί να είναι ημιτελή καθώς τα σενά�ια εντολών ενημε�ώνουν τις πλη�οφο�ίες. Πα�ακαλο�με δοκιμάστε ξανά μετά από με�ικά λεπτά."
+msgstr ""
+"Τα στατιστικά π�όσθετων β�ίσκονται π�ος το πα�όν σε διαδικασία ενημέ�ωσης. "
+"Τα π�όσφατα δεδομένα μπο�εί να είναι ημιτελή καθώς τα σενά�ια εντολών "
+"ενημε�ώνουν τις πλη�οφο�ίες. Πα�ακαλο�με δοκιμάστε ξανά μετά από με�ικά "
+"λεπτά."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "Το ταμπλό στατιστικών είναι απενε�γοποιημένο π�ος το πα�όν. Πα�ακαλο�με π�οσπαθήστε α�γότε�α."
+msgstr ""
+"Το ταμπλό στατιστικών είναι απενε�γοποιημένο π�ος το πα�όν. Πα�ακαλο�με "
+"π�οσπαθήστε α�γότε�α."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
-msgstr "Για να δείτε τα γ�αφήματα του ταμπλό στατιστικών, απαιτείται η ενε�γοποίηση της JavaScript."
+msgstr ""
+"Για να δείτε τα γ�αφήματα του ταμπλό στατιστικών, απαιτείται η ενε�γοποίηση "
+"της JavaScript."
 
 #: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
@@ -6362,7 +6173,7 @@ msgstr "Οι �υθμίσεις σας ενημε�ώθηκαν!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Ταμπλό στατιστικών"
 
@@ -6390,103 +6201,111 @@ msgstr "Απομάκ�υνση"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Απομάκ�υνση κατά ένα μήνα"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Καθημε�ινή σ�νοψη στατιστικών για %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Α�χείο �οής δεδομένων σ�νοψης"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A %e, %B  %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Στατιστικά για %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Εξ ο�ισμο�, μόνο εσείς και ο ο�γανισμός Mozilla  μπο�είτε να έχετε π�όσβαση στις πλη�οφο�ίες του ταμπλό σας. Μπο�είτε να το ανοίξετε στο κοινό ώστε να μπο�εί να δει ο καθένας τα δεδομένα του π�οσθέτου σας."
+msgstr ""
+"Εξ ο�ισμο�, μόνο εσείς και ο ο�γανισμός Mozilla  μπο�είτε να έχετε π�όσβαση "
+"στις πλη�οφο�ίες του ταμπλό σας. Μπο�είτε να το ανοίξετε στο κοινό ώστε να "
+"μπο�εί να δει ο καθένας τα δεδομένα του π�οσθέτου σας."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Π�όσβαση στο ταμπλό"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Ιδιωτικό"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
-msgstr "Μόνο εσείς και ο ο�γανισμός Mozilla μπο�είτε να δείτε τα στατιστικά αυτο� του π�όσθετου"
+msgstr ""
+"Μόνο εσείς και ο ο�γανισμός Mozilla μπο�είτε να δείτε τα στατιστικά αυτο� "
+"του π�όσθετου"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Δημόσια"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Τα στατιστικά αυτο� του π�όσθετου είναι σε κοινή θέα"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Αλλαγή �υθμίσεων"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Πα�ακαλο�με διαχει�ιστείτε αυτή την πλη�οφο�ία σαν εμπιστευτική."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Αυτό το ταμπλό είναι <b>ιδιωτικό</b> π�ος το πα�όν."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Αυτό το ταμπλό είναι <b>δημόσιο</b> π�ος το πα�όν."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Κλειδωμένο"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Επιστ�οφή στο ταμπλό"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Αποθήκευση �υθμίσεων"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Ρυθμίσεις ταμπλό στατιστικών για %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ξεκλειδωμένο"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Π�ογ�."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "Συστ."
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Κατ."
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Αγν."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Εκδ."
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Μέσος ό�ος ημε�ήσεων λήψεων"
 
@@ -6494,46 +6313,37 @@ msgstr "Μέσος ό�ος ημε�ήσεων λήψεων"
 msgid "statistics_summary_downloads_heading"
 msgstr "Λήψεις"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Μέτ�ηση τελευταίας ημέ�ας"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Λήψεις κατά τις π�οηγο�μενες 7 ημέ�ες"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Συνολικές λήψεις"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Από %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Δεν υπά�χουν ακόμα δεδομένα"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Μέσος ό�ος καθημε�ινών ενε�γών χ�ηστών"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Αλλαγή από την π�οηγο�μενη μέτ�ηση"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s την %2$s"
@@ -6542,151 +6352,161 @@ msgstr "%1$s την %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Ενε�γοί καθημε�ινοί χ�ήστες"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Την %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Μέσος ό�ος καθημε�ινών χ�ηστών αυτή την εβδομάδα"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s διαφο�ά από την π�οηγο�μενη εβδομάδα"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Στατιστικά %1$s "
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Όλα τα θέματα"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Πε�ιήγηση στα θέματα"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Αλλαγή διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Αλλαγή κωδικο�"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Αλλαγή κωδικο� ή διε�θυνσης ηλ. ταχυδ�ομείου"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Ο κωδικός επιβεβαίωσης στάλθηκε ξανά!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Ο λογα�ιασμός σας για τη διε�θυνση %1$s διαγ�άφηκε με επιτυχία. Αν θελήσετε κάποτε να επιστ�έψετε, μπο�είτε να εγγ�αφείτε ξανά από τη σελίδα <a href=\"%2$s\">εγγ�αφής νέου χ�ήστη</a>."
+msgstr ""
+"Ο λογα�ιασμός σας για τη διε�θυνση %1$s διαγ�άφηκε με επιτυχία. Αν θελήσετε "
+"κάποτε να επιστ�έψετε, μπο�είτε να εγγ�αφείτε ξανά από τη σελίδα <a href=\"%2"
+"$s\">εγγ�αφής νέου χ�ήστη</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Η κοινότητα των π�όσθετων Mozilla λυπάται που φε�γετε."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Επιβεβαίωση κωδικο�"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Διαγ�αφή τώ�α του λογα�ιασμο� μου"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Δεν μπο�είτε να διαγ�άψετε τον λογα�ιασμό σας αν αναφέ�εστε ως <a href=\"%1$s\">δημιου�γός π�όσθετου</a>. Για να διαγ�αφεί ο λογα�ιασμός σας, πα�ακαλο�με ζητήστε από κάποιο μέλος της ομάδας ανάπτυξης του π�όσθετου σας να σας διαγ�άψει από τη λίστα των δημιου�γών. Μετά απ' αυτό, θα μπο�έσετε να διαγ�άψετε τον λογα�ιασμό σας από 'δω."
+msgstr ""
+"Δεν μπο�είτε να διαγ�άψετε τον λογα�ιασμό σας αν αναφέ�εστε ως <a href=\"%1$s"
+"\">δημιου�γός π�όσθετου</a>. Για να διαγ�αφεί ο λογα�ιασμός σας, πα�ακαλο�με "
+"ζητήστε από κάποιο μέλος της ομάδας ανάπτυξης του π�όσθετου σας να σας "
+"διαγ�άψει από τη λίστα των δημιου�γών. Μετά απ' αυτό, θα μπο�έσετε να "
+"διαγ�άψετε τον λογα�ιασμό σας από 'δω."
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
-msgstr "Αν έχετε π�όσθετες ε�ωτήσεις, πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s για βοήθεια."
+msgstr ""
+"Αν έχετε π�όσθετες ε�ωτήσεις, πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s "
+"για βοήθεια."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Π�έπει να τσεκά�ετε το πλαίσιο στο «Κατανοώ...» για να να διαγ�άψουμε τον λογα�ιασμό σας."
+msgstr ""
+"Π�έπει να τσεκά�ετε το πλαίσιο στο «Κατανοώ...» για να να διαγ�άψουμε τον "
+"λογα�ιασμό σας."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
-msgstr "Πα�ακαλο�με εισάγετε τον κωδικό σας σωστά για να ολοκλη�ώσετε αυτή τη διαδικασία."
+msgstr ""
+"Πα�ακαλο�με εισάγετε τον κωδικό σας σωστά για να ολοκλη�ώσετε αυτή τη "
+"διαδικασία."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Πα�ουσιάστηκε ένα άγνωστο σφάλμα κατά τη διαγ�αφή του λογα�ιασμο� σας. Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s γνωστοποιώντας το π�όβλημα και θα τον διαγ�άψουμε εμείς. Ζητάμε συγνώμη για την ταλαιπω�ία."
+msgstr ""
+"Πα�ουσιάστηκε ένα άγνωστο σφάλμα κατά τη διαγ�αφή του λογα�ιασμο� σας. "
+"Πα�ακαλο�με επικοινωνήστε με τη διε�θυνση %1$s γνωστοποιώντας το π�όβλημα "
+"και θα τον διαγ�άψουμε εμείς. Ζητάμε συγνώμη για την ταλαιπω�ία."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Επιβεβαίωση διαγ�αφής λογα�ιασμο�"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Διαγ�αφή του λογα�ιασμο� χ�ήστη %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Σας αποχαι�ετο�με!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Δεν θα μπο�είτε πια να συνδεθείτε στον ιστότοπο των π�όσθετων Mozilla."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Κάνωντας κλικ στο «Διαγ�αφή...» ο λογα�ιασμός σας θα <strong>διαγ�αφεί ο�ιστικά</strong>. Αυτό σημαίνει πως:"
+msgstr ""
+"Κάνωντας κλικ στο «Διαγ�αφή...» ο λογα�ιασμός σας θα <strong>διαγ�αφεί "
+"ο�ιστικά</strong>. Αυτό σημαίνει πως:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Οι βαθμολογίες και οι αξιολογήσεις σας δεν θα διαγ�αφο�ν αλλά δεν θα έχετε καμία σχέση πλέον με αυτές."
+msgstr ""
+"Οι βαθμολογίες και οι αξιολογήσεις σας δεν θα διαγ�αφο�ν αλλά δεν θα έχετε "
+"καμία σχέση πλέον με αυτές."
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Αν αντιμετωπίζετε κάποιο π�όβλημα που ίσως μπο�ο�με να σας βοηθήσουμε να λ�σετε, μην διαγ�άψετε τον λογα�ιασμό σας άμεσα,  επικοινωνήστε μαζί μας στη διε�θυνση %1$s και θα κάνουμε ό,τι μπο�ο�με για να σας βοηθήσουμε."
+msgstr ""
+"Αν αντιμετωπίζετε κάποιο π�όβλημα που ίσως μπο�ο�με να σας βοηθήσουμε να "
+"λ�σετε, μην διαγ�άψετε τον λογα�ιασμό σας άμεσα,  επικοινωνήστε μαζί μας στη "
+"διε�θυνση %1$s και θα κάνουμε ό,τι μπο�ο�με για να σας βοηθήσουμε."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Κατανοώ ότι η ενέ�γεια αυτή είναι μη αναστ�έψιμη."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Διαγ�αμμένος χ�ήστης"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Έχει αποσταλεί ένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου στη διε�θυνση %1$s για να γίνει επιβεβαίωση. Για να ολοκλη�ωθεί η αλλαγή θα π�έπει να κάνετε κλικ στο δεσμό που θα β�είτε στο μήνυμα. Μέχ�ι να γίνει αυτό, μπο�είτε να συνδέεστε χ�ησιμοποιώντας την τ�έχουσα διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας."
+msgstr ""
+"Έχει αποσταλεί ένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου στη διε�θυνση %1$s για "
+"να γίνει επιβεβαίωση. Για να ολοκλη�ωθεί η αλλαγή θα π�έπει να κάνετε κλικ "
+"στο δεσμό που θα β�είτε στο μήνυμα. Μέχ�ι να γίνει αυτό, μπο�είτε να "
+"συνδέεστε χ�ησιμοποιώντας την τ�έχουσα διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου "
+"σας."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Διαγ�αφή λογα�ιασμο� χ�ήστη"
 
@@ -6702,28 +6522,40 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Καλωσή�θατε στα π�όσθετα του %2$s.\n"
 "\n"
-"Π�ιν μπο�έσετε να χ�ησιμοποιήσετε το λογα�ιασμό σας, θα π�έπει να τον ενε�γοποιήσετε - αυτό διασφαλίζει πως η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου που χ�ησιμοποιήσατε είναι έγκυ�η και σας ανήκει.\n"
-"Για να ενε�γοποιήσετε το λογα�ιασμό σας, κάντε κλικ στον πα�ακάτω δεσμό ή κάντε αντιγ�αφή και επικόλληση ολόκλη�ης της γ�αμμής στη γ�αμμή διευθ�νσεων του πε�ιηγητή σας:\n"
+"Π�ιν μπο�έσετε να χ�ησιμοποιήσετε το λογα�ιασμό σας, θα π�έπει να τον "
+"ενε�γοποιήσετε - αυτό διασφαλίζει πως η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου "
+"που χ�ησιμοποιήσατε είναι έγκυ�η και σας ανήκει.\n"
+"Για να ενε�γοποιήσετε το λογα�ιασμό σας, κάντε κλικ στον πα�ακάτω δεσμό ή "
+"κάντε αντιγ�αφή και επικόλληση ολόκλη�ης της γ�αμμής στη γ�αμμή διευθ�νσεων "
+"του πε�ιηγητή σας:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Αφο� ενε�γοποιήσετε το λογα�ιασμό σας με επιτυχία, μπο�είτε να διαγ�άψετε αυτό το μήνυμα με ασφάλεια.\n"
+"Αφο� ενε�γοποιήσετε το λογα�ιασμό σας με επιτυχία, μπο�είτε να διαγ�άψετε "
+"αυτό το μήνυμα με ασφάλεια.\n"
 "\n"
 "Ευχα�ιστο�με για τη συμμετοχή σας στα π�όσθετα του %2$s\n"
 "-- Το π�οσωπικό των π�όσθετων του %2$s"
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
-"Ζητήσατε να γίνει αλλαγή της διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου σας για τα Π�όσθετα του %2$s.\n"
+"Ζητήσατε να γίνει αλλαγή της διε�θυνσης ηλεκτ�ονικο� ταχυδ�ομείου σας για τα "
+"Π�όσθετα του %2$s.\n"
 "\n"
-"Για να επιβεβαιωθεί η νέα διε�θυνση, κάντε κλικ στον πα�ακάτω δεσμό ή αντιγ�άψτε και επικολλήστε τον ολόκλη�ο στην ε�γαλειοθήκη διευθ�νσεων του πε�ιηγητή σας:\n"
+"Για να επιβεβαιωθεί η νέα διε�θυνση, κάντε κλικ στον πα�ακάτω δεσμό ή "
+"αντιγ�άψτε και επικολλήστε τον ολόκλη�ο στην ε�γαλειοθήκη διευθ�νσεων του "
+"πε�ιηγητή σας:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Η επιβεβαίωση της νέας διε�θυνσης θα π�έπει να γίνει εντός 48 ω�ών. Αν αλλάξατε γνώμη και δεν θέλετε πια να γίνει η αλλαγή, απλά αγνοήστε αυτό το μήνυμα.\n"
+"Η επιβεβαίωση της νέας διε�θυνσης θα π�έπει να γίνει εντός 48 ω�ών. Αν "
+"αλλάξατε γνώμη και δεν θέλετε πια να γίνει η αλλαγή, απλά αγνοήστε αυτό το "
+"μήνυμα.\n"
 "\n"
 "Ευχα�ιστο�με!\n"
 "-- Το π�οσωπικό των Π�όσθετων του %2$s"
@@ -6743,126 +6575,106 @@ msgid "user_email_pwreset"
 msgstr ""
 "Επαναφο�ά κωδικο� για τα π�όσθετα του %2$s\n"
 "\n"
-"Δεχθήκαμε ένα αίτημα για την επαναφο�ά κωδικο� αυτο� του λογα�ιασμο� στο addons.mozilla.org. Για να αλλάξετε τον κωδικό , πα�ακαλο�με κάντε κλικ στον ακόλουθο δεσμό ή επικολλήστε τον στη γ�αμμή διευθ�νσεων του πε�ιηγητή σας:\n"
+"Δεχθήκαμε ένα αίτημα για την επαναφο�ά κωδικο� αυτο� του λογα�ιασμο� στο "
+"addons.mozilla.org. Για να αλλάξετε τον κωδικό , πα�ακαλο�με κάντε κλικ στον "
+"ακόλουθο δεσμό ή επικολλήστε τον στη γ�αμμή διευθ�νσεων του πε�ιηγητή σας:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Αν θεω�είτε πως το αίτημα στάλθηκε εσφαλμένα, δεν υπά�χει λόγος να κάνετε οποιαδήποτε ενέ�γεια.\n"
+"Αν θεω�είτε πως το αίτημα στάλθηκε εσφαλμένα, δεν υπά�χει λόγος να κάνετε "
+"οποιαδήποτε ενέ�γεια.\n"
 "\n"
 "Ευχα�ιστο�με,\n"
 "-- Το π�οσωπικό των π�όσθετων του %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Επαναφο�ά του κωδικο� σας για τα π�όσθετα του %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Σφάλμα!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
-msgstr "Πα�ακαλο�με επιβεβαιώστε την αλλαγή της διε�θυνσης ηλεκτ�ονικο�  ταχυδ�ομείου σας στα Π�όσθετα  %1$s "
+msgstr ""
+"Πα�ακαλο�με επιβεβαιώστε την αλλαγή της διε�θυνσης ηλεκτ�ονικο�  "
+"ταχυδ�ομείου σας στα Π�όσθετα  %1$s "
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Επιτυχία!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας αλλάχθηκε με επιτυχία. Στο εξής χ�ησιμοποιήστε τη διε�θυνση %1$s για να συνδεθείτε."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Λίγα λόγια για μένα"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Συστηθείτε στην κοινότητα αν θέλετε! Αυτό το κείμενο θα εμφανίζεται δημόσια στη σελίδα πλη�οφο�ιών χ�ήστη.  Οι αλλαγές γαμμής διατη�ο�νται αλλά δεν επιτ�έπεται κώδικας HTML."
+msgstr ""
+"Η διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας αλλάχθηκε με επιτυχία. Στο εξής "
+"χ�ησιμοποιήστε τη διε�θυνση %1$s για να συνδεθείτε."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Επιβεβαίωση κωδικο�"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Εμφάνιση των συλλογών που έχω δημιου�γήσει στο π�οφίλ χ�ήστη"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Εμφάνιση των αγαπημένων μου συλλογών στο π�οφίλ χ�ήστη"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Επεξε�γασία π�οφίλ χ�ήστη του %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Όνομα"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Απόκ�υψη διε�θυνσης ηλ. ταχυδ�ομείου"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL ιστότοπου"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Επώνυμο"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Σ�νδεση χ�ήστη"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "�έος κωδικός"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Ψευδώνυμο"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Παλιός κωδικός"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Άλλες ενέ�γειες"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Κωδικός"
 
@@ -6870,60 +6682,68 @@ msgstr "Κωδικός"
 msgid "user_form_registration"
 msgstr "Εγγ�αφή νέου χ�ήστη"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "�α με θυμάσαι σ' αυτό τον υπολογιστή"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Π�οβολή του sandbox;"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Αποθήκευση"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Σ�νδεση"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Εγγ�αφή"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Χ�ήστης του %s Add-ons από:"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Δημιου�γία νέου λογα�ιασμο� χ�ήστη"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Συμβατότητα π�οσθέτου (Συστήνεται σφόδ�α)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Επε�χόμενες εκδηλώσεις και διαγωνισμοί"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Δεν υπά�χουν π�ος το πα�όν ειδοποιήσεις για να τακτοποιήσετε."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Κατά και�ο�ς , ο ο�γανισμός  Mozilla μπο�εί να σας στείλει μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου για επε�χόμενες εκδόσεις και εκδηλώσεις σχετικά με τα π�όσθετα. Πα�ακαλο�με επιλέξτε ποια θέματα σας ενδιαφέ�ουν από τα πα�ακάτω:"
+msgstr ""
+"Κατά και�ο�ς , ο ο�γανισμός  Mozilla μπο�εί να σας στείλει μην�ματα "
+"ηλεκτ�ονικο� ταχυδ�ομείου για επε�χόμενες εκδόσεις και εκδηλώσεις σχετικά με "
+"τα π�όσθετα. Πα�ακαλο�με επιλέξτε ποια θέματα σας ενδιαφέ�ουν από τα "
+"πα�ακάτω:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Ο ο�γανισμός Mozilla διατη�εί το δικαίωμα να επικοινωνήσει π�οσωπικά μαζί σας για συγκεκ�ιμένα θέματα σχετικά με το π�όσθετο σας."
+msgstr ""
+"Ο ο�γανισμός Mozilla διατη�εί το δικαίωμα να επικοινωνήσει π�οσωπικά μαζί "
+"σας για συγκεκ�ιμένα θέματα σχετικά με το π�όσθετο σας."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Υπά�χουν σφάλματα στις αλλαγές που κάνατε. Πα�ακαλο�με ελέγξτε τις και υποβάλετέ τες ξανά..."
+msgstr ""
+"Υπά�χουν σφάλματα στις αλλαγές που κάνατε. Πα�ακαλο�με ελέγξτε τις και "
+"υποβάλετέ τες ξανά..."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Ενημε�ώθηκε το π�οφίλ."
 
@@ -6936,15 +6756,15 @@ msgstr "Επαναφο�ά κωδικο� του %s"
 msgid "user_pwreset_header"
 msgstr "Επαναφο�ά κωδικο�"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Ξεχάσατε τον κωδικό σας;"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Ο δεσμός επαναφο�άς κωδικο� έχει αποσταλεί στη διε�θυνσή σας."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Έγινε επαναφο�ά του κωδικο� με επιτυχία."
 
@@ -6956,7 +6776,7 @@ msgstr "Υποβολή αιτήματος αλλαγής κωδικο�"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Αποστολή δεσμο� επαναφο�άς κωδικο�"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Π�όσθετα %s"
@@ -6966,62 +6786,56 @@ msgstr "Π�όσθετα %s"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Στάλθηκε ένας δεσμός για να ενε�γοποιήσετε το λογα�ιασμό σας μέσω ηλ. ταχυδ�ομείου στη διε�θυνση %1$s. Θα π�έπει να κάνετε κλικ στο δεσμό αυτό για να μπο�έσετε να συνδεθείτε στα π�όσθετά του %2$s."
+msgstr ""
+"Στάλθηκε ένας δεσμός για να ενε�γοποιήσετε το λογα�ιασμό σας μέσω ηλ. "
+"ταχυδ�ομείου στη διε�θυνση %1$s. Θα π�έπει να κάνετε κλικ στο δεσμό αυτό για "
+"να μπο�έσετε να συνδεθείτε στα π�όσθετά του %2$s."
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Έχει αποσταλεί μήνυμα επιβεβαίωσης στη διε�θυνση %1$s. Για να μπο�έσετε να συνδεθείτε θα π�έπει π�ώτα να ενε�γοποιήσετε το λογα�ιασμό σας κάνοντας κλικ στο δεσμό που θα β�είτε στο μήνυμα αυτό."
+msgstr ""
+"Έχει αποσταλεί μήνυμα επιβεβαίωσης στη διε�θυνση %1$s. Για να μπο�έσετε να "
+"συνδεθείτε θα π�έπει π�ώτα να ενε�γοποιήσετε το λογα�ιασμό σας κάνοντας κλικ "
+"στο δεσμό που θα β�είτε στο μήνυμα αυτό."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "Επανάληψη αποστολής μην�ματος επιβεβαίωσης"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Συγχα�ητή�ια! Ο λογα�ιασμός χ�ήστη δημιου�γήθηκε με επιτυχία."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>Η εγγ�αφή στο AMO  <strong>δεν</strong> απαιτείται αν θέλετε απλά να κάνετε λήψη και εγκατάσταση π�όσθετων που β�ίσκονται στο δημόσιο χώ�ο.</p><p>Θα π�έπει να εγγ�αφείτε μόνο αν:</p><ul><li>Θέλετε να υποβάλετε αξιολογήσεις για π�όσθετα.</li><li>Είστε δημιου�γός κάποιου π�όσθετου και θέλετε να φιλοξενηθεί στο AMO</li></ul><p>Αφου εγγ�αφείτε επιτυχώς, θα πα�αλάβετε ένα μήνυμα επιβεβαίωσης στη διε�θυνση που δώσατε.  Πα�ακαλο�με ακολουθήστε τις οδηγίες που θα β�είτε εκεί για να επιβεβαιώσετε το λογα�ιασμό σας.</p><p>Αν θέλετε, μπο�είτε να διαβάσετε τις <a href='%1$s' title='νομικές σημειώσεις'>�ομικές σημειώσεις</a> και την <a href='%2$s' title='πολιτική απο��ήτου'>πολιτική απο��ήτου</a> (Αγγλικά).</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγου�ευτείτε πως η υπη�εσία ηλ. ταχυδ�ομείου που χ�ησιμοποιείτε δεν το σημείωσε ως «ανεπιθ�μητο» ή «spam». Αν χ�ειάζεται, μπο�ο�με να κάνουμε  %1$s στη διε�θυνση ηλ. ταχυδ�ομείου που αναφέ�θηκε πα�απάνω."
+msgstr ""
+"Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγου�ευτείτε πως η υπη�εσία ηλ. "
+"ταχυδ�ομείου που χ�ησιμοποιείτε δεν το σημείωσε ως «ανεπιθ�μητο» ή «spam». "
+"Αν χ�ειάζεται, μπο�ο�με να κάνουμε  %1$s στη διε�θυνση ηλ. ταχυδ�ομείου που "
+"αναφέ�θηκε πα�απάνω."
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Καλωσή�θατε στα %1$s! και ευχα�ιστο�με για την εγγ�αφή σας"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Καλώς ήλθατε στον ιστότοπο addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Απαιτείται όνομα, επώνυμο ή ψευδώνυμο."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Συλλογές"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Ειδοποιήσεις"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Π�οφίλ χ�ήστη"
 
@@ -7029,65 +6843,51 @@ msgstr "Π�οφίλ χ�ήστη"
 msgid "user_verified_okay"
 msgstr "Επιβεβαιώθηκε με επιτυχία!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Διαγ�αφή λογα�ιασμο� χ�ήστη"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Επεξε�γασία λογα�ιασμο� χ�ήστη"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Λίγα λόγια για μένα"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Π�όσθετα από τον %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Όνομα"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Π�οφίλ χ�ήστη"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Συλλογές από %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Αγαπημένες συλλογές"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Α�χική σελίδα"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Ψευδώνυμο"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Πλη�οφο�ίες για το χ�ήστη: %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Αξιολογήσεις από %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Σ�νδεση χ�ήστη"
 
@@ -7098,7 +6898,10 @@ msgstr "Σ�νδεση χ�ήστη"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Το π�όσθετο που αναζητήσατε β�ίσκεται π�οσω�ινά στο sandbox. Αν έχετε ήδη ένα λογα�ιασμό στο Mozilla Add-ons, πα�ακαλο�με συνδεθείτε, ή <a href=\"%1$s\">μάθετε πε�ισσότε�α για το sandbox.</a>"
+msgstr ""
+"Το π�όσθετο που αναζητήσατε β�ίσκεται π�οσω�ινά στο sandbox. Αν έχετε ήδη "
+"ένα λογα�ιασμό στο Mozilla Add-ons, πα�ακαλο�με συνδεθείτε, ή <a href=\"%1$s"
+"\">μάθετε πε�ισσότε�α για το sandbox.</a>"
 
 # %1 is the link to the sandbox/policy explanation page
 # This message is for any given sandbox-related page not found
@@ -7107,133 +6910,18 @@ msgstr "Το Ï€Ï�όσθετο που αναζητήσατε βÏ�ίσκεται Ï
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "Η σελίδα που αναζητήσατε είναι τμήμα του sandbox. Αν έχετε ήδη ένα λογα�ιασμό στο Mozilla Add-ons, πα�ακαλο�με συνδεθείτε, ή <a href=\"%1$s\">μάθετε π�ισσότε�α για το sandbox.</a>"
+msgstr ""
+"Η σελίδα που αναζητήσατε είναι τμήμα του sandbox. Αν έχετε ήδη ένα "
+"λογα�ιασμό στο Mozilla Add-ons, πα�ακαλο�με συνδεθείτε, ή <a href=\"%1$s"
+"\">μάθετε π�ισσότε�α για το sandbox.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Επαναφο�ά κωδικο� χ�ήστη"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Εγγ�αφή νέου χ�ήστη"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Άδεια πηγαίου κώδικα του %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Εμφάνιση όλων όσων π�οστέθηκαν π�όσφατα"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Εμφάνιση όλων των κο�υφαίων σε λήψεις"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Εμφάνιση όλων με κο�υφαία βαθμολογία"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Επόμενο π�όσθετο"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Π�οηγο�μενο π�όσθετο"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Η πιο π�όσφατη έκδοση, συμβατή με"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Ολοκλη�ωμένο ιστο�ικό εκδόσεων"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "�εότε�α:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Δημοφιλέστε�α:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Συνιστο�με:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Πιο π�όσφατα ενημε�ωμένα:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "Εμφάνιση όλων"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Δείτε όλα τα συνιστώμενα π�όσθετα"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Π�ώτα τα βαθμολογημένα υψηλότε�α"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Π�ώτα τα π�όσφατα ενημε�ωμένα"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Π�ώτα τα πιο δημοφιλή"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Φό�τωση"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Π�οβολή πε�ισσότε�ων πλη�οφο�ιών"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Αυτή η έκδοση του π�οσθέτου σας δεν φαίνεται να είναι συμβατή με τον "
-#~ "Firefox %1$s. Η επόμενη έκδοση του Firefox θα εκδοθεί σ�ντομα από τον "
-#~ "ο�γανισμό Mozilla, οπότε σας πα�ακαλο�με να δοκιμάσετε το π�όσθετό σας  "
-#~ "με τη νέα έκδοση και να ελέγξετε τη συμβατότητά του. Μπο�είτε να β�είτε "
-#~ "πε�ισσότε�ες πλη�οφο�ίες <a href=\"%2$s\">εδώ</a>. Αυτή είναι μια απλή "
-#~ "ειδοποίηση, μπο�είτε να υποβάλετε κανονικά αυτή την έκδοση στο addons."
-#~ "mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Το π�όσθετο απενε�γοποιήθηκε επιτυχώς"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Επεξε�γασία π�όσθετου"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Το π�όσθετο ενε�γοποιήθηκε επιτυχώς"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Πε�ιγ�αφή π�όσθετου"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "Συμφωνητικό αδειοδότησης τελικο� χ�ήστη"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Α�χική σελίδα π�όσθετου"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Όνομα π�όσθετου"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Πολιτική απο��ήτου"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Σ�νοψη π�όσθετου"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Διε�θυνση email υποστή�ιξης"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL υποστή�ιξης"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Σημειώσεις έκδοσης"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Υποψηφιότητα π�όσθετου"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Το π�όσθετο τέθηκε σε υποψηφιότητα επιτυχώς"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Α�κετές αξιολογήσεις από χ�ήστες για το π�όσθετο (Πιθανόν εκτός "
-#~ "ιστοτόπου)."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Αποδεκτό"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Μη αποδεκτό"
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "�έο"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Ενημε�ωμένο"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Ηλικία π�όσθετου"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Τ�ποι π�όσθετων"
-#~ msgid "editors_th_applications"
-#~ msgstr "Εφα�μογές"
-#~ msgid "editors_th_platforms"
-#~ msgstr "Πλατφό�μες"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Τ�ποι υποβληθέντων"
-#~ msgid "forum_save"
-#~ msgstr "Αποθήκευση"
-#~ msgid "home"
-#~ msgstr "α�χική"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Π�όσθετες λειτου�γίες"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "ται�ιάζει %s π�όσθετο"
-#~ msgstr[1] "ται�ιάζουν %s π�όσθετα"
-
diff --git a/site/app/locale/en_US/LC_MESSAGES/messages.po b/site/app/locale/en_US/LC_MESSAGES/messages.po
index 945c083..0135b2f 100644
--- a/site/app/locale/en_US/LC_MESSAGES/messages.po
+++ b/site/app/locale/en_US/LC_MESSAGES/messages.po
@@ -16,169 +16,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancel Installation"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Download Now %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accept and Download"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accept and Install"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "weekly downloads"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s add-on"
 msgstr[1] "%1$s add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per page"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recommended"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is not available for %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Back to %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Back to the reviews..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Rating:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Review:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Add a review for %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Title/Summary:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Delete"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Reply"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Are you sure you wish to delete this review?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Yes"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
 
@@ -187,7 +178,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Edit Review for %s"
@@ -200,18 +191,18 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Please note: Before your review shows up on the public site it will be "
 "moderated by an editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Developer reply to:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -228,161 +219,131 @@ msgid "addon_review_pagetitle"
 msgstr "Reviews for %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Reply by %1$s on %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Developer Reply:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "by %1$s on %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "by %1$s on %2$s (rated %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Permanent link to this version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Browse %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Don't like it"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Hate it"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Like it"
 
@@ -390,22 +351,19 @@ msgstr "Like it"
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Love it"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "More Images"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Other add-ons by %1$s"
@@ -414,21 +372,21 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support for this add-on is provided by the developer at %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -436,20 +394,21 @@ msgstr ""
 "an e-mail to %2$s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support for this add-on is provided by the developer at %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Really like it"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Please do not post bug reports in reviews. We do not make your email address "
@@ -457,45 +416,50 @@ msgstr ""
 "resolve your issue."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "See All %1$s Add-ons"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Complete Version History"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
 
@@ -503,259 +467,159 @@ msgstr "What do you think?"
 msgid "addons_display_workswith"
 msgstr "Works with:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "by"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
 "a look around and make %1$s your own."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find related add-ons in the %1$s collection."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Easy to install</strong> and keep up-to-date."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
-msgstr "Add-ons for %1$s"
+msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Most Popular:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "We Recommend:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "View all"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "View all popular add-ons"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "View all recommended add-ons"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
-"<ol><li>Download and save the file to your hard disk.</li><li>In Mozilla "
-"Sunbird, open Add-ons from the Tools menu.</li><li>Click the Install button, "
-"and locate/select the file you downloaded and click \"OK\".</li></ol>"
+"<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, "
+"open Add-ons from the Tools menu.</li><li>Click the Install button, and "
+"locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
-"<ol><li>Download and save the file to your hard disk.</li><li>In Mozilla "
+"<ol><li>Right-click the link below and choose \"Save Link As...\" to "
+"download and save the file to your hard disk.</li><li>In Mozilla "
 "Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
 "button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "How to Install in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "show experimental add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Go"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "By"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "for Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "for Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -763,11 +627,11 @@ msgstr ""
 "more information about other plugins available for Mozilla-based Browsers, "
 "visit %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Looking for a plugin not listed here?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins help your browser perform specific functions like viewing special "
@@ -775,24 +639,24 @@ msgstr ""
 "from extensions, which modify or add to existing functionality."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -800,40 +664,36 @@ msgstr ""
 "installation can proceed:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "With so many great add-ons available, there's something for everyone. To get "
 "you started, here's a list of some of the most popular. Enjoy!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Add-ons"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Recommended Add-ons"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Sorry, you need a Mozilla-based browser (such as Firefox) to install a "
@@ -848,42 +708,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Learn how to %1$s at the %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "make your own"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Browse through more search engines at %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
-"Special thanks to the Mycroft Project for their work on Firefox search "
-"engines."
+"Special thanks to the Mycroft Project for their work on Firefox Search "
+"Engines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Share this"
 
@@ -919,17 +780,17 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "In Sandbox"
@@ -938,36 +799,26 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Be Careful With Old Versions"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -1002,422 +853,151 @@ msgstr "Group Admin"
 msgid "admin_group_saved"
 msgstr "The Group has been saved"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "This add-on is for older versions of Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "An <a href=\"%1$s\">older version</a> may work"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
 
@@ -1426,775 +1006,106 @@ msgid "categories_current_title"
 msgstr "Current Category"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Choose a category"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "See All %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "See All Recommended Add-ons"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Highest Rated First"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Last Updated First"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Most Popular First"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "See All %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Keep an eye on your kids and your calendar"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Family"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Research anything online"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Reference"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Manage your social network"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Social"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Plan business trips and unforgettable vacations"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Travel"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Build the perfect website"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Web Development"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
-"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please log "
-"in</a> to analyze the status of your add-ons for %2$s."
+"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
+"login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
 
@@ -2202,119 +1113,119 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla would like to thank the following people for their contributions to "
 "the addons.mozilla.org project over the years:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Developers"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Localizers"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Other Contributors"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Past Developers"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Some icons used are from the <a href=\"http://www.famfamfam.com/lab/icons/"
@@ -2322,7 +1233,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
 "Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
@@ -2332,20 +1243,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%B %e, %Y"
 
@@ -2380,22 +1288,22 @@ msgstr "Statistics Dashboard"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
 
@@ -2403,6 +1311,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detect)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Opens in a new window"
@@ -2439,64 +1360,129 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
 "Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
@@ -2526,7 +1512,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
 
@@ -2534,6 +1520,10 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Add-on Summary required"
@@ -2543,12 +1533,12 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
@@ -2556,7 +1546,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
@@ -2564,11 +1554,11 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
 "Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
@@ -2576,13 +1566,13 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 "You may now nominate your add-on for <span class=\"status-4\">Public</span> "
@@ -2651,12 +1641,121 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Next"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "Active"
@@ -2720,33 +1819,176 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Author"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Category"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Add Reply"
@@ -2792,52 +2034,64 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in public display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 "<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
@@ -2848,26 +2102,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
 
@@ -2932,19 +2186,19 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 "Any information end users may want to know that isn't necessarily applicable "
@@ -2952,22 +2206,22 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 "The description of your add-on is a longer explanation of features, "
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 "If your add-on has an End-User License Agreement (EULA), please enter its "
@@ -2975,28 +2229,28 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 "The summary is a short explanation of your add-on's basic functionality that "
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
 
@@ -3016,100 +2270,162 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "This add-on requires external software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "This is a site-specific add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 "An add-on's default locale is the main locale in which translations must be "
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 "The GUID of your add-on is specified in its install.rdf and uniquely "
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 "The add-on icon is a small image that is displayed next to your add-on's "
@@ -3117,90 +2433,100 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 "If your add-on has another homepage, enter its address here. Adding other "
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 "If you have an email address for support inquiries, enter it here. Adding "
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 "If your add-on has a support website or forum, enter its address here. "
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Authors"
@@ -3276,14 +2602,68 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Pending Updates (%s)"
 msgstr[1] "Pending Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "You do not have access to that add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3297,9 +2677,9 @@ msgstr "Please see %s for reference."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3317,6 +2697,10 @@ msgstr ""
 "That file extension (%1$s) is not allowed for the selected add-on type. "
 "Please use one of the following: %2$s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Please select no more than five categories."
@@ -3351,7 +2735,14 @@ msgstr ""
 "That file extension (%1$s) is not allowed for an icon. Please use one of the "
 "following: %2$s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
@@ -3359,9 +2750,9 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Please select a valid add-on type."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3428,6 +2819,18 @@ msgstr "No ID could be found for this add-on in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Please select at least one category."
@@ -3445,6 +2848,16 @@ msgstr ""
 "That file extension (%1$s) is not allowed for a preview. Please use one of "
 "the following: %2$s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3457,82 +2870,280 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
@@ -3548,12 +3159,12 @@ msgstr ""
 "to the selected default locale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Tools"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Tools"
 
@@ -3562,28 +3173,28 @@ msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Back to Main"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submit Add-on"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 "This add-on ID (%1$s) already exists in the database. If this is your add-"
@@ -3593,25 +3204,36 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3624,6 +3246,18 @@ msgstr ""
 "Removing this as the default preview will cause another preview to "
 "automatically become the default preview."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3631,13 +3265,13 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3666,46 +3300,46 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 "Click the Update Previews button below to save this image. (<a %s>Cancel?</"
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 "This preview will be deleted when Update Previews is clicked below. (<a %"
@@ -3722,7 +3356,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
 
@@ -3730,7 +3364,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
 
@@ -3742,23 +3376,23 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 "The preview screenshots for your add-on are shown below. You can make "
@@ -3781,16 +3415,24 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
@@ -3801,7 +3443,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 "Please note that some changes may take several hours to appear in all areas "
@@ -3811,6 +3453,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3878,7 +3524,7 @@ msgstr "Are you sure you wish to make this add-on public?"
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Moving this add-on back to the sandbox will require users to log in before "
+"Moving this add-on back to the sandbox will require users to login before "
 "downloading and updates will no longer be offered to existing users. Because "
 "your add-on is currently public, you will be able to return here at any time "
 "to make it public again."
@@ -3901,54 +3547,99 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
 msgstr ""
 "If a user browses the site and a translation isn't available in their own "
@@ -3957,61 +3648,61 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
 msgstr ""
 "This is a <i>Translation Box</i>. It allows you to localize a specific field "
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
 "The version number uploaded (%1$s) already exists for this add-on. If you "
@@ -4019,7 +3710,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
 "The uploaded version number (%1$s) does not match the existing version "
@@ -4029,28 +3720,24 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
 msgstr ""
 "<p>Your add-on listing has been successfully created. The basic information "
@@ -4062,25 +3749,25 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
 
@@ -4089,11 +3776,11 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
 
@@ -4115,20 +3802,16 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 "The new file will be available to the public as soon as an editor is able to "
@@ -4136,7 +3819,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 "The new version will be available to the public as soon as an editor is able "
@@ -4144,13 +3827,13 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 "View your new file in the <a %1$s>Versions and Files page</a>, check out "
@@ -4159,33 +3842,28 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 "View your new version in the <a %1$s>Versions and Files page</a>, check out "
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
 msgstr ""
 "Upload your add-on file using the form below. If you have multiple, platform-"
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4201,27 +3879,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4278,70 +3960,66 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
 msgstr ""
 "Adjusting application information here will allow users to install your add-"
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
 
@@ -4350,49 +4028,43 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
 "Information about changes in this release, new features, known bugs, and "
@@ -4400,23 +4072,23 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
 
@@ -4451,7 +4123,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
 
@@ -4495,7 +4167,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
 
@@ -4557,7 +4229,7 @@ msgstr "View entries between %1$s and %2$s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
 
@@ -4581,24 +4253,24 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "External Software"
 
@@ -4610,39 +4282,39 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
 
@@ -4654,257 +4326,206 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "There are currently no add-ons of this type to review."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "Use this form to request more information from the author. They will receive "
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "This will mark the add-on and its most recent version and files as public. "
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public add-on to appear on the "
 "public side."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public add-on to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "If you have concerns about this add-on's security, copyright issues, or "
 "other concerns that an administrator should look into, enter your comments "
 "in the area below. They will be sent to administrators, not the author."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
@@ -4932,7 +4553,7 @@ msgstr "Nomination Approved/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
@@ -4959,90 +4580,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
 
@@ -5066,7 +4676,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
@@ -5078,79 +4688,87 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Age"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Access Denied"
 
@@ -5158,18 +4776,17 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5178,14 +4795,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Add-on not found!"
 
@@ -5197,7 +4811,7 @@ msgstr "This add-on is not viewable here."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "No add-ons in this category!"
 
@@ -5205,45 +4819,50 @@ msgstr "No add-ons in this category!"
 msgid "error_collection_feed_notfound"
 msgstr "Add-on feed not found."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "This is not a valid email address."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "This field must not be empty."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "File not found!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "There are errors in this form. Please correct them and resubmit."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "This URL has an invalid format. Valid URLs look like http://example.com/"
@@ -5251,46 +4870,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Missing argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Notice"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
 
@@ -5298,46 +4905,38 @@ msgstr "You must select a rating."
 msgid "error_user_already_confirmed"
 msgstr "This user account is already confirmed."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Invalid confirmation code!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "The passwords did not match."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "This email address is already taken by another user."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "The email change has expired. Please change your email address again in your "
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "This nickname is already taken."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "User not found!"
 
@@ -5346,42 +4945,39 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "Please confirm your user account first with the code you received by email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Wrong password entered!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Learn more"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s review"
 msgstr[1] "%1$s reviews"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "View more from"
 
@@ -5420,39 +5016,38 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Credits"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla is providing links to these applications as a courtesy, and makes no "
@@ -5460,184 +5055,130 @@ msgstr ""
 "to. Any questions, complaints or claims regarding the applications must be "
 "directed to the appropriate software vendor."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Go"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Legal Notices"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Other languages:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Save"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Add-on)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Return to the %1$s Add-ons homepage"
 
 #: views/elements/header.thtml:87
 msgid "header_main_firefox_header"
-msgstr "Add-ons for Firefox"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
+msgstr "Firefox Add-ons"
 
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "SeaMonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Log in"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Log out"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "My Account"
 
@@ -5645,69 +5186,49 @@ msgstr "My Account"
 msgid "header_navlink_register"
 msgstr "Register"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Preview Image of %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2"
 "$s\">Why</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Add to %1$s %2$s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Add %1$s to %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "This add-on is not available."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
 
@@ -5719,8 +5240,8 @@ msgstr "Download Dictionary"
 msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
 
@@ -5732,72 +5253,36 @@ msgstr "Install Dictionary"
 msgid "langtools_install_langpack"
 msgstr "Install Language Pack"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dictionary"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Language Pack"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Language"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Date"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Add-on Name"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Rating"
@@ -5822,20 +5307,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "others"
 
@@ -5843,30 +5335,10 @@ msgstr "others"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
-
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Frequently Asked Questions"
@@ -5895,15 +5367,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Valid Application Versions"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Add-ons submitted to Mozilla Add-ons must have an install.rdf file with at "
@@ -5911,7 +5383,7 @@ msgstr ""
 "below are allowed for these applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5920,15 +5392,15 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "here"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
 
@@ -5936,6 +5408,12 @@ msgstr "Sandbox Information Page"
 msgid "pagination_next_page"
 msgstr "next"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "This is page %1$s of %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "previous"
@@ -5970,15 +5448,15 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
 
@@ -5986,7 +5464,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
 
@@ -6002,8 +5480,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
 
@@ -6018,7 +5496,7 @@ msgstr ""
 "editor review."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
@@ -6035,125 +5513,101 @@ msgstr ""
 "Guidelines</a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Reviews for %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Featured Add-ons"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Search is currently disabled. Please try again later."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "all add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "within"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "All Search Engines"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matching add-on"
+msgstr[1] "%s matching add-ons"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "No results found."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Search Add-ons"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Search results feed"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Welcome, %s"
@@ -6162,7 +5616,7 @@ msgstr "Welcome, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dictionary"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
 
@@ -6170,7 +5624,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "I am looking for a:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
 
@@ -6178,7 +5632,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Search Plugin"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
 
@@ -6186,23 +5640,24 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Theme"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Not yet rated"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Rated %s out of 5 stars"
@@ -6239,13 +5694,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s created"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
@@ -6258,179 +5713,179 @@ msgstr "Close"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
@@ -6467,7 +5922,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
@@ -6495,105 +5950,109 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "By default, only you and Mozilla can access the information in your "
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
@@ -6605,7 +6064,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
@@ -6623,7 +6082,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
@@ -6649,68 +6108,54 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "All Themes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Browse Themes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Change password"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "The confirmation code was resent!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Your user account %1$s has been successfully deleted. If you want to come "
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "You cannot delete your account if you are listed as an <a href=\"%1$s"
@@ -6719,81 +6164,81 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Your reviews and ratings will not be deleted, but they will no longer be "
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "If you have a specific problem we may help you with, please do not delete "
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "An email has been sent to %1$s to confirm your new email address. For the "
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
 
@@ -6813,14 +6258,16 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"Once you've successfully activated your account, you can throw away this e-"
+"Once you successfully activated your account, you can throw away this e-"
 "mail.\n"
 "\n"
 "Thanks for joining %2$s Add-ons\n"
 "-- %2$s Add-ons Staff"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -6860,107 +6307,90 @@ msgstr ""
 "Thanks,\n"
 "-- %2$s Add-ons Staff"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reset your %s Add-ons password"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirm password"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Edit user profile for %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Email address"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "First name"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Hide email address"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Website URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Last name"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "User Login"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "New password"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nickname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Old password"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Password"
 
@@ -6968,65 +6398,65 @@ msgstr "Password"
 msgid "user_form_registration"
 msgstr "New User Registration"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Show sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Save"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Log in"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Register"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons user since"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Create a new user account"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "There were errors in the changes you made. Please correct them and resubmit."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profile updated."
 
@@ -7039,15 +6469,15 @@ msgstr "Password reset for %s"
 msgid "user_pwreset_header"
 msgstr "Password Reset"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Forgot your password?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "The password reset link was sent to your email address."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Password successfully reset."
 
@@ -7059,7 +6489,7 @@ msgstr "Submit password change"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Send password reset link"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7073,7 +6503,7 @@ msgstr ""
 "You have to click it before you can log into %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7085,23 +6515,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "resend the confirmation message"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7112,28 +6529,20 @@ msgstr ""
 "us %1$s to your email address mentioned above."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Thanks for registering and welcome to %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "User Profile"
 
@@ -7141,63 +6550,50 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Successfully verified!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "User Account Editing"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons by %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Name"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "User Profile"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Email address"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Homepage"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "User Info for %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "User Login"
 
@@ -7229,20 +6625,8 @@ msgstr "User Password Reset"
 msgid "users_register_pagetitle"
 msgstr "New User Registration"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "View all top downloads"
+#~ msgid "page_title_experimental_addons"
+#~ msgstr "Experimental Add-ons"
 
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "View all top rated"
+#~ msgid "pages_experimental_addons_backbutton"
+#~ msgstr "Back to the previous page"
diff --git a/site/app/locale/en_US/pages/developer_agreement.thtml b/site/app/locale/en_US/pages/developer_agreement.thtml
index 4f85ca0..ba4c436 100644
--- a/site/app/locale/en_US/pages/developer_agreement.thtml
+++ b/site/app/locale/en_US/pages/developer_agreement.thtml
@@ -1,215 +1,15 @@
-<!-- Localizer note: please don't localize this page; we don't want to get into
-     any legal ambiguities between the english version and a translation. -->
-<div id="dev-agreement" class="rounded">
-<p>
-  If you upload add-on software or otherwise make information or material
-  available (each an &#8220;<strong><abbr title="addons.mozilla.org">AMO</abbr>
-  Contribution</strong>&#8221;) by means of the services provided by Mozilla
-  Corporation (&#8220;<strong>Mozilla</strong>&#8221;) via the
-  addons.mozilla.org website or any of its subdomains (&#8220;<strong>AMO
-  Services</strong>&#8221;), you (&#8220;<strong>Contributor</strong>&#8221;)
-  and the AMO Contribution are subject to the following terms, as well as
-  Mozilla’s Privacy Policy,
-  <a href="http://www.mozilla.com/en-US/about/legal.html">web site notices</a>
-  and other policies, guidelines or requirements that may be posted on an AMO
-  Services web site (the &#8220;<strong>Terms</strong>&#8221;). By acting as a
-  Contributor, you agree to these Terms. If you are an individual acting as a
-  representative of a corporation or other legal entity that wishes to use any
-  AMO Services, you represent and agree that you accept the Terms on behalf of
-  such entity. If you have any questions about these terms or the AMO Service,
-  please email:
-  <a href="mailto:amo-editors@mozilla.org">amo-editors@mozilla.org</a>
-</p>
-<ol>
-  <li>
-    <p>
-      <strong>Responsibility Re AMO Contributions.</strong>
-      You represent and warrant that:
-    </p>
-    <ul>
-      <li>
-        if any information about the user or usage of the AMO Contribution is
-        collected or transmitted outside of the user's computer, the details of this
-        collection will be provided in the description of the AMO Contribution and
-        you will provide a link to a privacy policy detailing how the information is
-        managed and protected;
-      </li>
-      <li>
-        the descriptions and other data you provide about the AMO Contribution are
-        true to the best of your knowledge; and
-      </li>
-      <li>
-        if the AMO Contribution is an add-on, such add-on is accompanied by an
-        accessible license that describes the rights of users;
-      </li>
-      <li>
-        the AMO Contribution does not violate any applicable law, regulation or
-        ordinance, nor infringe or misappropriate the rights of any third party.
-      </li>
-    </ul>
-  </li>
-  <li>
-    <p>
-      <strong>Licenses.</strong>
-      In order to provide the AMO Service, you grant to Mozilla and its
-      Affiliates a non-exclusive, worldwide, royalty-free, sublicensable license
-      to distribute, transmit, reproduce, publish, publicly and privately
-      perform and display and otherwise use the AMO Contribution, including any
-      updates, solely in connection with Mozilla’s provision of the AMO
-      Services. Mozilla may also (i) bundle and/or package your AMO Contribution
-      with third party add-ons for delivery and promotion of the AMO
-      Contributions to users and (ii) maintain and/or update your AMO
-      Contribution for the purpose of providing compatibility with current and
-      new versions of Firefox or other Mozilla software that the AMO
-      Contribution interoperates with.
-    </p>
-  </li>
-  <li>
-   <p>
-     <strong>Management of AMO Services.</strong>
-     Mozilla may manage the AMO Services in a manner designed to facilitate the
-     integrity and proper functioning of the AMO Services without limitation or
-     liability. The following is a list of exemplary activities that Mozilla in
-     its sole discretion may undertake as part of its management of the AMO
-     Services: (i) monitor, test and review AMO Contributions; (ii) remove or
-     disable AMO Contributions or change their listing or description; (iii)
-     move an AMO Service and related AMO Contributions to a new domain or
-     website; (iv) rate limit, throttle and/or block requests or access to any
-     AMO Service; (v) use, modify or remove authentication requirements for
-     access to AMO Services; and (vi) collect statistics and other data
-     regarding your AMO Contribution, which may be made publicly available
-     through the AMO API (as described below).
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>AMO <abbr title="Application Programming Interface">API</abbr>.</strong>
-      As part of the AMO Services, Mozilla provides the addons.mozilla.org API
-      (&#8220;<strong>AMO API</strong>&#8221;), which allows you to get
-      information about certain AMO Contributions distributed by Mozilla via the
-      AMO Service and is currently served via calls to
-      https://services.addons.mozilla.org/api/.
-      You may use the AMO API solely to retrieve data made publicly available by
-      Mozilla via the AMO API, which data may be used solely for your own
-      reasonable business purposes or personal use. In addition to the
-      restrictions otherwise set forth in the Terms regarding AMO Services
-      generally, you agree that you are responsible for your use of and
-      contribution to the AMO API and you will not:
-    </p>
-    <ul>
-      <li>
-        hide or mask from Mozilla the identity of your service as it uses the
-        AMO API, including by failing to follow required identification
-        conventions; or
-      </li>
-      <li>
-        use the AMO API for any application that replicates or attempts to
-        replicate the Mozilla AMO Service or experience
-        unless your use of the AMO API is non-confusing. By non-confusing,
-        Mozilla means that people should always know with whom they are dealing
-        and where the information or software they are downloading came from.
-        Websites and software that are not produced by Mozilla shouldn’t imply,
-        either directly or by omission, that they are.
-      </li>
-    </ul>
-  </li>
-  <li>
-    <p>
-      <strong>Ownership, Reservation of Rights.</strong>
-      You are welcome to use the AMO Services subject to these Terms, and
-      Mozilla grants you the right to do so. Mozilla and its licensors reserve
-      all other rights in the AMO Services. Further, nothing in the Terms shall
-      be deemed to grant you any right to use the trademarks, trade names,
-      service marks, or trade dress of Mozilla or its licensors and Mozilla
-      hereby reserves all right, title and interest therein. For information on
-      our trademarks, please see our
-      <a href="http://www.mozilla.org/foundation/trademarks/">Trademark and Logo Usage Policies</a>.
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>
-        The AMO Services are provided &#8220;as-is&#8221;. Mozilla, its
-        contributors, licensors, and distributors, disclaim all warranties,
-        whether express or implied, including without limitation, implied
-        warranties of merchantability, fitness for a particular purpose and
-        non-infringement. Some jurisdictions do not allow the exclusion or
-        limitation of implied warranties, so this disclaimer may not apply to
-        you.
-      </strong>
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>
-        Except as required by law, Mozilla, its contributors, licensors, and
-        distributors will not be liable for any indirect, special, incidental,
-        consequential, punitive, or exemplary damages arising out of or in any way
-        relating to the use of AMO Services and their collective liability
-        under these Terms will not exceed $500 (five hundred dollars). Some
-        jurisdictions do not allow the exclusion or limitation of certain damages,
-        so this exclusion and limitation may not apply to you.
-      </strong>
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>Changes to the Terms.</strong>
-      Mozilla may update these Terms as necessary from time to time. These Terms
-      may not be modified or cancelled without Mozilla’s written agreement.
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>Eligibility.</strong>
-      You represent that you are of legal age to form a binding contract and
-      that you not are a person barred from receiving or using the AMO Services
-      under the laws of any country, including the country in which you are
-      resident or from which you use the AMO Services.
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>Export Control.</strong>
-      The AMO Services are subject to all applicable export restrictions
-      including the export and import laws, restrictions and regulations of any
-      United States or foreign agency.
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>Miscellaneous.</strong>
-      These Terms are governed by the laws of the state of California, U.S.A.,
-      excluding its conflict of law provisions. If any portion of these Terms is
-      held to be invalid or unenforceable, the remaining portions will remain in
-      full force and effect. In the event of a conflict between a translated
-      version of these Terms and the English language version, the English
-      language version shall control. Mozilla’s subsidiaries and affiliates
-      shall be third party beneficiaries of these Terms, entitled to enforce and
-      rely upon the provisions hereof.
-    </p>
-  </li>
-  <li>
-    <p>
-      <strong>Termination.</strong>
-      You may terminate your use of the AMO Services at any time. Mozilla may
-      modify or discontinue the AMO Services at its sole discretion.
-    </p>
-  </li>
-</ol>
-</div>
-<p id="license-disclosure">
-  <strong>
-    DEVELOPER LICENSE DISCLOSURE STATEMENT FOR ADD-ON UPLOAD/REGISTRATION PAGE:
-  </strong>
-  <br/>
-  For both your benefit and the benefit of users that download your add-on,
-  Mozilla requests that you identify the license terms applicable to use of your
-  add-on by users. Unless you specify otherwise, any updates to your add-on will
-  be assumed to be under the same license as that specified for your add-on.
-  Please select the applicable license terms from the list below or, if your
-  license terms are not listed, select &#8220;Other&#8221; and identify the
-  license terms in the dialog box provided. Please note that you must include an
-  accessible copy of your license terms with your add-on (such as in a parent
-  directory).  <br /> <a href="%1$s">Learn more about open source licenses</a>
-</p>
+By uploading your add-on to this site, you agree that the following are true:
+
+<ul>
+    <li> you have the right to distribute this add-on, including any rights required for
+        material that may be trademarked or copyrighted by someone else; and </li>
+    <li> if any information about the user or usage of this add-on is collected or transmitted outside of
+        the user's computer, the details of this collection will be provided in the description of the
+        software, and you will provide a link to a privacy policy detailing how the information is
+        managed and protected; and </li>
+    <li> your add-on may be removed from the site, re-categorized, have its
+        description or other information changed, or otherwise have its listing changed or removed, at the
+        sole discretion of Mozilla and its authorized agents; and </li>
+    <li> the descriptions and other data you provide about the add-on are true to the best
+        of your knowledge. </li>
+</ul>
diff --git a/site/app/locale/en_US/pages/error404.thtml b/site/app/locale/en_US/pages/error404.thtml
index cd3c287..5c1c53b 100644
--- a/site/app/locale/en_US/pages/error404.thtml
+++ b/site/app/locale/en_US/pages/error404.thtml
@@ -10,7 +10,7 @@
 <p>Or you can just jump over to some of the popular pages on our website.</p>
 
 <ul>
-<li>Are you interested in a <a href="%1$s">list of recommended add-ons</a>?</li>
+<li>Are you interested in a <a href="%1$s">list of popular add-ons</a>?</li>
 <li>Do you want to <a href="%2$s">search for add-ons</a>? You may go to the <a href="%2$s">search page</a> or just use the search field above.</li>
 <li>If you prefer to start over, just go to the <a href="%3$s">add-ons front page</a>.</li>
 </ul>
diff --git a/site/app/locale/en_US/pages/faq.thtml b/site/app/locale/en_US/pages/faq.thtml
index 7dd294d..7b6af48 100755
--- a/site/app/locale/en_US/pages/faq.thtml
+++ b/site/app/locale/en_US/pages/faq.thtml
@@ -9,15 +9,6 @@
 </ul>
 
 <p></p>
- 
-<div id="gsfn_list_widget">
-  <a href="https://getsatisfaction.com/mozilla" class="widget_title">Active customer service discussions about Mozilla Add-ons</a>
-  <div id="gsfn_content">Loading...</div>
-  <div class="powered_by">
-    <a href="https://getsatisfaction.com/"><img alt="Favicon" src="https://www.getsatisfaction.com/favicon.gif" style="vertical-align: middle;" /></a> 
-    <a href="https://getsatisfaction.com/">Get Satisfaction support network</a>
-  </div>
-</div>
 
 <h2>Add-on Questions</h2>
 <dl class="faq">
@@ -52,27 +43,18 @@
 <dd>Go to "Add-ons" in the "Tools" menu. Click the "Themes" section and from here you can select the default theme, or any others you have installed.</dd>
 
 <dt>If I have an issue with an add-on, should I contact Mozilla?</dt> 
-<dd>Add-ons, with a few exceptions, are created by the community and not Mozilla. The best thing to do is to contact the developer directly with your question. To find contact info for a developer, click their name in the by line on the Add-on listing page.</dd>
+<dd>Add-ons, with a few exceptions, are created by the community and not Mozilla. The best thing to do is to contact the developer directly with your question. To find contact info for a developer, click their name in the byline on the Add-on listing page.</dd>
 
 <dt>How are add-ons reviewed?</dt> 
 <dd>Public add-ons are reviewed by our dedicated and talented editorial team. They review the code of all public add-ons and also test the add-ons to make sure that they are accurately described.</dd>
 
-<dt>I've upgraded to Firefox 3.5 but my add-on no longer works? Why is that?</dt> 
-<dd>Most of our add-ons are now Firefox 3.5 compatible, and every day more are added. If your add-on worked on 3.0 but not 3.5, chances are they're already working on it. When they do upgrade their add-on, Firefox will notify you about the upgrade.</dd>
+<dt>I've upgraded to Firefox 3.1 but my add-on no longer works? Why is that?</dt> 
+<dd>Most of our add-ons are now Firefox 3.1 compatible, and every day more are added. If your add-on worked on 3.0 but not 3.1, chances are they're already working on it. When they do upgrade their add-on, Firefox will notify you about the upgrade.</dd>
 
 <dt id="experimental-addons">What are experimental add-ons?</dt> 
-<dd>
-    <p>Experimental add-ons are newer add-ons which have not yet undergone our public review process.  Many of these add-ons may be in prototype form.  Since they are untested by our editorial team, they may be alpha, beta or pre-production in quality, performance and features.</p>
-    <p>Caution should be used when installing experimental add-ons, as they have not been tested by an editor and may harm your computer configuration.</p>
-</dd>
+<dd>Experimental Add-ons are generally the newest add-ons hosted on AMO. These Add-ons have not undergone the editorial review required to become public and are generally at some sort of prerelease level of quality. Since they haven't been reviewed, there is a higher chance of something going wrong when you install one.</dd>
 
-<dt id="recognizing-experimental-addons">How do I know an experimental add-on when I see one on the site?</dt>
-<dd>Experimental add-ons are marked with an "experimental" label and show a warning when you install them.</dd>
-
-<dt id="recommended-addons">What are Recommended and Featured add-ons?</dt>
+<dt>What are Recommended and Featured add-ons?</dt>
 <dd>The AMO team recommends a set of add-ons which represent some of the best add-ons in terms of utility and overall experience.  These Recommended add-ons appear on the individual category pages.  Some of these add-ons are also rotated onto the front page of AMO as Featured add-ons.  This is by no means a comprehensive list, and we update the list monthly to continue to show our users a fresh set of add-ons.  Some things we consider when we recommend add-ons: quality, popularity, uniqueness, and whether or not the add-on has already been recommended.</dd>
 
 </dl>
-
-<script src="https://getsatisfaction.com/mozilla/widgets/javascripts/500b6b4141/widgets.js" type="text/javascript"></script>
-<script src="https://getsatisfaction.com/mozilla/topics.widget?callback=gsfnTopicsCallback&amp;limit=5&amp;product=mozilla_mozilla_add_ons&amp;sort=last_active_at&amp;style=topics" type="text/javascript"></script>
diff --git a/site/app/locale/en_US/pages/statistics_help.thtml b/site/app/locale/en_US/pages/statistics_help.thtml
index 2a529cd..625dc10 100644
--- a/site/app/locale/en_US/pages/statistics_help.thtml
+++ b/site/app/locale/en_US/pages/statistics_help.thtml
@@ -4,4 +4,4 @@
 <p>Download counts are updated every day and only include original add-on downloads, not updates.</p>
 
 <h4>Update Pings</h4>
-<p>Add-ons downloaded from this site check for updates once per day, and the total number of these update pings is known as Active Daily Users. Active Daily Users (ADU) can be broken down by add-on version, operating system, add-on status, and application.</p>
+<p>Add-ons downloaded from this site check for updates once per day, and the total number of these update pings is known as Active Daily Users. Active Daily Users (ADU) can be broken down by add-on version, operating system, add-on status, and application. This data is currently recorded for one day each week, on Wednesdays.</p>
\ No newline at end of file
diff --git a/site/app/locale/es_ES/LC_MESSAGES/messages.po b/site/app/locale/es_ES/LC_MESSAGES/messages.po
index cc05ecc..9005114 100644
--- a/site/app/locale/es_ES/LC_MESSAGES/messages.po
+++ b/site/app/locale/es_ES/LC_MESSAGES/messages.po
@@ -11,201 +11,171 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-10 23:32+0100\n"
+"PO-Revision-Date: 2009-02-24 14:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: Español (España) <nave@elistas.net>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"Language: es_ES\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Pootle 1.2.0-rc1\n"
 "X-Poedit-Language: Spanish\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancelar instalación"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Descargar ahora %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Aceptar y descargar"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Aceptar e instalar"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "�rea pública"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "�rea de pruebas"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "%s actualizado"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versión %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "descargas"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "descargas totales"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "descargas semanales"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s complemento"
 msgstr[1] "%1$s complementos"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "por página"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s no está disponible para %2$s"
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Volver a %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Volver a las valoraciones..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Puntuación:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Valoración:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
-msgstr "Envía tu valoración"
+msgstr "Enviar su valoración"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Añadir una valoración de %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Título/Resumen:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Borrar"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Responder"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "¿Estás seguro que quieres borrar esta valoración?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Si"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Borrar valoración"
 
@@ -214,7 +184,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "La valoración se borró con éxito."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editar valoración de %s"
@@ -222,24 +192,29 @@ msgstr "Editar valoración de %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Problema al marcar para valoración: Las notas de las valoraciones están limitadas entre 10 y 100 caracteres; la longitud de tu texto fue de %1$s."
+msgstr ""
+"Problema al marcar para revisión: Las notas de las revisiones están "
+"limitadas entre 10 y 100 caracteres; la longitud de tu texto fue de %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Atención: Antes de que tu valoración aparezca en el sitio público, será revisada por un editor."
+msgstr ""
+"Atención: Antes de que su valoración aparezca en el sitio público, será "
+"revisada por un editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Respuesta del desarrollador a:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "Ver %1$s valoración previa enviada por %2$s para este complemento."
-msgstr[1] "Ver %1$s valoraciones previas enviadas por %2$s para este complemento."
+msgstr[1] ""
+"Ver %1$s valoraciones previas enviadas por %2$s para este complemento."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -251,169 +226,131 @@ msgid "addon_review_pagetitle"
 msgstr "Valoraciones de %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Respuesta por %1$s el %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Respuesta del desarrollador:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
-msgstr "Tu valoración se ha guardado con éxito. ¡Gracias!"
+msgstr "Su valoración se ha guardado con éxito. ¡Gracias!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "por %1$s el %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "Valorado por %1$s, puntuado con %2$d"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Siguiente complemento"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Complemento previo"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Enlace permanente a esta versión"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "La versión más reciente compatible con %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Enviar"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Ver el perfil del autor"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Ver todos los temas :: %1$s Addons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Examinar %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Ver todos los temas %1$s :: %2$s Addons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "¿Qué es esto?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Añadir una valoración"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalles avanzados"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorías"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Añadir a un recopilatorio:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nuevo recopilatorio..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Seleccionar un recopilatorio..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publicar"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s ha sido añadido al recopilatorio %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "¿Qué es esto?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "y %1$s recopilatorio mas"
-msgstr[1] "y %1$s recopilatorios más"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "valoración en detalle"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "No me gusta"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editar tu valoración"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Este complemento tiene una política de privacidad."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Lo odio"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Recopilatorios relacionados"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentarios del desarrollador"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Portada"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licencia del código fuente"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Valoraciones"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Asistencia"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Me gusta"
 
@@ -421,23 +358,19 @@ msgstr "Me gusta"
 msgid "addons_display_long_description"
 msgstr "Descripción larga"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Me encanta"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Más imágenes"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Este complemento no está aún en ningun recopilatorio."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Otros complementos de %1$s"
@@ -446,84 +379,94 @@ msgstr[1] "Otros complementos de estos autores"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "El desarrollador proporciona ayuda técnica para esta extensión en %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "El desarrollador proporciona ayuda técnica para esta extensión en %s o enviando un correo electrónico a %s."
+msgstr ""
+"El desarrollador proporciona ayuda técnica para esta extensión en %s o "
+"enviando un correo electrónico a %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "El desarrollador proporciona ayuda técnica para esta extensión en %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Puntúa"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Me gusta mucho"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Por favor, no informes de errores en las valoraciones. Tu correo electrónico no es visible para el desarrollador del complemento y es posible que necesite contactar contigo para resolver la incidencia."
+msgstr ""
+"Por favor, no informes de errores en las valoraciones. Tu correo electrónico "
+"no es visible para el desarrollador del complemento y es posible que "
+"necesite contactar contigo para resolver la incidencia."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Guía para revisores</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Visita la <a href=\"%1$s\">sección de asistencia</a> para obtener ayuda con este complemento."
+msgstr ""
+"Visita la <a href=\"%1$s\">sección de asistencia</a> para obtener ayuda con "
+"este complemento."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Guardar"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Ver todos los complementos en %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ver todas las valoraciones (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Ver todas las versiones"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Historial completo de la versión"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ver el código fuente"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver estadísticas"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "¿Qué opinas?"
 
@@ -531,447 +474,339 @@ msgstr "¿Qué opinas?"
 msgid "addons_display_workswith"
 msgstr "Válida para:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Añadido"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populares"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Recomendados"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Suscribirse"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Explorar complementos"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Actualizado"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "por"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Recopilatorios populares"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Recopilatorios"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> complemento"
-msgstr[1] "<strong>%1$s</strong> complementos"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Ver todos los recopilatorios"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Los recopilatorios son un modo de categorizar, mezclar y relacionar complementos. Puedes suscribirte a los recopilatorios de otros usuarios o crear los tuyos propios."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> suscriptor"
-msgstr[1] "<strong>%1$s</strong> suscriptores"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Recomendamos"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Los complementos amplían %1$s, permitiéndote personalizar su funcionamiento.  Echa un vistazo y crea tu propio %1$s."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "¿Como este? Encuentra más complementos en %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Más de 5000 complementos</strong> que te permiten personalizar y extender Firefox del modo que necesitas."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "¿Qué son los complementos?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Fáciles de instalar</strong>, serás avisado cuando haya actualizaciones disponibles."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introducción"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Barras de herramientas, temas y buscadores que  <strong>te ayudan a realizar tareas comunes.</strong>"
+msgstr ""
+"Los complementos amplían %1$s, permitiéndote personalizar su "
+"funcionamiento.  Echa un vistazo y crea tu propio %1$s."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "¡NUEVO!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Nuevos:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Otras aplicaciones"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Complementos para %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>complemento descargado</span>"
-msgstr[1] "<strong>%1$s</strong> <span>complementos descargados</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Más populares:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>complemento en uso</span>"
-msgstr[1] "<strong>%1$s</strong> <span>complementos en uso</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Recomendamos:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Actualizados recientemente:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Ver todos"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Ver todos los complementos nuevos"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Ver todos los complementos populares"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Ver todos los complementos recomendados"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Ver todos los complementos actualizados recientemente"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Haz clic en el enlace a continuación para guardar el archivo.</li><li>En Mozilla Sunbird, abre Complementos desde el menú Herramientas.</li><li>Haz clic en el botón Instalar, localiza/selecciona el archivo que descargaste y pulsa sobre \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Haz clic en el enlace a continuación para guardar el archivo.</"
+"li><li>En Mozilla Sunbird, abre Complementos desde el menú Herramientas.</"
+"li><li>Haz clic en el botón Instalar, localiza/selecciona el archivo que "
+"descargaste y pulsa sobre \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Cómo instalar en Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Haz clic con el botón secundario sobre el enlace a continuación y elige \"Guardar enlace como...\" para descargar y guardar el archivo a tu disco duro.</li><li>En Mozilla Thunderbird, abre Complementos desde el menú Herramientas.</li><li>Haz clic en el botón Instalar, selecciona el archivo que descargaste y haz clic en \"Aceptar\".</li></ol>"
+msgstr ""
+"<ol><li>Haz clic con el botón secundario sobre el enlace a continuación y "
+"elige \"Guardar enlace como...\" para descargar y guardar el archivo a tu "
+"disco duro.</li><li>En Mozilla Thunderbird, abre Complementos desde el menú "
+"Herramientas.</li><li>Haz clic en el botón Instalar, selecciona el archivo "
+"que descargaste y haz clic en \"Aceptar\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Cómo instalar en Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Ver los complementos experimentales"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Ir"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Por"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "para Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "para Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "para Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Esta página solo contiene una lista de los plugins más comunes y populares. Para más información sobre otros plugins disponibles para los navegadores basados en Mozilla, visite %1$s"
+msgstr ""
+"Esta página solo contiene una lista de los plugins más comunes y populares. "
+"Para más información sobre otros plugins disponibles para los navegadores "
+"basados en Mozilla, visite %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "¿Busca un plugin que no se encuentra en esta lista?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Los plugins permiten a tu navegador realizar funciones específicas como ver gráficos en formatos especiales o reproducir archivos multimedia. Los plugins algo diferentes a las extensiones, las cuales modifican o añaden funcionalidades existentes."
+msgstr ""
+"Los plugins permiten a tu navegador realizar funciones específicas como ver "
+"gráficos en formatos especiales o reproducir archivos multimedia. Los "
+"plugins algo diferentes a las extensiones, las cuales modifican o añaden "
+"funcionalidades existentes."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins comunes para %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentación de ayuda: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s requiere que aceptes el siguiente contrato de licencia para usuarios antes de que se proceda a su instalación:"
+msgstr ""
+"%s requiere que aceptes el siguiente contrato de licencia para usuarios "
+"antes de que se proceda a su instalación:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Capturas de %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Añadido recientemente"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Con más de mil complementos disponibles, hay uno para cada persona. Para comenzar, aquí hay una lista de algunos de nuestros favoritos. ¡Disfrute!"
+msgstr ""
+"Con más de mil complementos disponibles, hay uno para cada persona. Para "
+"comenzar, aquí hay una lista de algunos de nuestros favoritos. ¡Disfrute!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Complementos recomendados"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Complementos recomendados"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos adicionales"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Lo lamento, necesitas tener un navegador basado en Mozilla (como Firefox) para instalar un plugin de búsqueda."
+msgstr ""
+"Lo lamento, necesitas tener un navegador basado en Mozilla (como Firefox) "
+"para instalar un plugin de búsqueda."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "JavaScript is required to install plugins, but it looks like you have it disabled.  Please enable JavaScript before trying to install any of the search plugins below."
+msgstr ""
+"JavaScript is required to install plugins, but it looks like you have it "
+"disabled.  Please enable JavaScript before trying to install any of the "
+"search plugins below."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Aprende como %1$s en el %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/es/docs/Creación_de_plugins_OpenSearch_para_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "hacer el tuyo propio"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Descubre más motores de búsqueda en %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motores de búsqueda"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Gracias en especial al proyecto Mycroft por su trabajo en los motores de búsqueda de Firefox."
+msgstr ""
+"Gracias en especial al proyecto Mycroft por su trabajo en los motores de "
+"búsqueda de Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Compartir"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Añador a Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "¡Enviar a Digg!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Publicar en Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Compartir en FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Publicar en MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Desactivado"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versión incompleta"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "En el área de pruebas; En propuestas públicas"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
-msgstr "En el área de pruebas; Pendiente de valoración"
+msgstr "En el área de pruebas; Pendiente de revisión"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Público"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "En el área de pruebas"
@@ -980,34 +815,26 @@ msgstr "En el área de pruebas"
 msgid "addons_status_unknown"
 msgstr "Desconocido"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Descubre más sobre este complemento"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Más descargados"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Mejor valorados"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Ten cuidado con las versiones antiguas"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Estas versiones se muestran como referencia y para pruebas. Debes usar siempre la última versión del complemento."
+msgstr ""
+"Estas versiones se muestran como referencia y para pruebas. Debes usar "
+"siempre la última versión del complemento."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Historial de la versión con las listas de cambios"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historial de las versiones de %1$s"
@@ -1030,8 +857,7 @@ msgstr "El grupo con identificador %s fue borrado"
 msgid "admin_group_edit_pagetitle"
 msgstr "Editar grupo"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Identificador no valido para el grupo"
 
@@ -1039,1364 +865,424 @@ msgstr "Identificador no valido para el grupo"
 msgid "admin_group_pagetitle"
 msgstr "Grupo administradores"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "El grupo ha sido guardado"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avanzado"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Cualquier fecha"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Cualquiera"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Cualquiera"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplicación"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Coincidencia por palabra"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Últimos actualizados"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nombre"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Más recientes"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Últimos 3 meses"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Últimos 6 meses"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Último día"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Último mes"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Última semana"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Último año"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Por página"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Plataforma"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularidad"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Puntuación"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordenar por"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "a"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Cambiar al modo de búsqueda avanzado"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tipo"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versión"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Siguiente"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Anterior"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorar la comprobación"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Este complemento es para versiones antiguas de Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Puedes <a href=\"%1$s\">probar una versión más antigua</a> o <a href=\"#\" onclick=\"%2$s\">ignorar esta comprobación</a>"
+msgstr ""
+"Puedes <a href=\"%1$s\">probar una versión más antigua</a> o <a href=\"#\" "
+"onclick=\"%2$s\">ignorar esta comprobación</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Puede que funcione una <a href=\"%1$s\">versión más antigua</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Este complemento requiere la versión aún no publicada de <a href=\"%1$s\">Firefox %2$s</a>"
+msgstr ""
+"Este complemento requiere la versión aún no publicada de <a href=\"%1$s"
+"\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Actualiza Firefox</a> para usar este complemento"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s ha cambiado el estado de %2$s a %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s ha realizado una acción administrativa desconocida %2$s en el ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s ha borrado la característica %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s ha creado la aplicación %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s ha editado la aplicación %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s ha creado la versión %2$s de %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s ha borrado la versión %2$s de %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s ha cambiado al configuración '%2$s' de '%3$s' a '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s ha realizado una acción de edición desconocida %2$s al ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s ha borrado el complemento %2$s de la lista de características"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s ha añadido el complemento %2$s a la lista de características"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s ha cambiado una característica para el idioma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s ha cambiado los idiomas del complemento %2$s en la lista de características"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s ha recalculado el hash del archivo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s ha añadido %2$s al grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s los ha asociado con %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s ha creado el grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s ha borrado el grupo %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s ha editado el grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s ha borrado %2$s del grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s ha realizado una acción desconocida %2$s en %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s ha intentado modificar el grupo bloqueado %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s ha intentado modificar las traducciones en %2$s sin permiso"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s ha creado la plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s ha borrado la plataforma %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s ha editado la plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s ha fallado al volver a autenticar para acceder a %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s ha creado la respuesta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s ha borrado la respuesta %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s ha editado la respuesta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s ha aprobado la revisión %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s ha borrado la previsión %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s ha realizado una acción de seguridad desconocida %2$s al ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s ha creado la etiqueta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s ha borrado la categoría %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s ha editado la categoría %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s ha actualizado las traducciones de la aplicación para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s ha actualizado las traducciones del blog para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s ha actualizado las traducciones de la plataforma para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s ha actualizado las traducciones de la categoría para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s ha editado la información del usuario %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Actualiza Firefox</a> para usar este "
+"complemento"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Complementos por nombre"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Complementos nuevos"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Complementos populares"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Complementos por puntuación"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Complementos actualizados recientemente"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Categoría actual"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorías"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Elige una categoría"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Ver todos en %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "La descripción debe tener menos de %1$s caracteres."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Recopilatorio %s"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "¡Error al borrar el complemento!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "¡Error al guardar el complemento!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "¡Error al guardar el comentario!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "El nombre debe tener menos de %1$s caracteres."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
-msgid "collection_not_found"
-msgstr "¡Recopilatorio no encontrado!"
-
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Si ya sabes qué complementos quieres añadir a tu recopilatorio, escribe sus nombres debajo. Si prefieres esperar y hacerlo después, simplemente pulsa %1$s ahora."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Selecciona tus primeros complementos"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Crear un recopilatorio"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Complementos seleccionados"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Es fácil crear tu propio recopilatorio de complementos tan solo rellenando los campos a continuación."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Crear recopilatorio"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Recopilatorios"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Descubre más"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Añadir a favoritos"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Eliminar de favoritos"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Puedes ver tu nuevo recopilatorio abajo.Si quieres configurar al recopilatorio un nombre, subir un icono, o cambiar opciones a mayores, visita por favor la página <a href='%1$s'>Administrador recopilatorios</a>.</p><p>Se puede acceder a tu recopilatorio en esta dirección: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "¡Ya está listo tu recopilatorio!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Acerca de este recopilatorio"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s complemento en este recopilatorio"
-msgstr[1] "%1$s complementos en este recopilatorio"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Creada por:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Actualizada:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Añadiendo a favoritos&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Eliminando favorito&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Inicia sesión</a> para añadir este recopilatorio a tus favoritos."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Administrar recopilatorio"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Fecha"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Nombre"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularidad"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s descarga esta semana"
-msgstr[1] "%1$s descargas esta semana"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Los complementos seleccionados se eliminarán una vez se guarde"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Para publicar nuevos complementos a este recopilatorio, escribe sus nombres debajo."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Para publicar nuevos complementos a este recopilatorio, escribe una lista de números de identificación debajo, separados por comas."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "También puedes publicar un complemento desde su página de listado."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Añadido el %1$s por %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Añadir comentario del publicador"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Borrar comentario del publicador"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Editar comentario del publicador"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Nota: El comentario seguirá apareciendo como escrito por el publicador original en su fecha de publicación"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Guardar comentario"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Borrar"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Añadir a un recopilatorio"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Comprobar la disponibilidad"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Sí, quiero borrar este recopilatorio."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Marca la casilla y pulsa en  \"%1$s\" para borrar este recopilatorio."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Cuando pulse en \"%1$s\", tu recopilatorio será borrado. Si no quiere borrar este recopilatorio, desmarca la casilla de confirmación en la pestaña \"%2$s\" y continúa editando tu recopilatorio. Si sales de esta página sin guardar, tu recopilatorio tampoco será borrado."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "¡Tu recopilatorio está a punto de ser borrado!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Debes proporcionar una descripción para el recopilatorio"
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Se ha producido un error al enviar el icono."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Debes proporcionar un nombre para el recopilatorio"
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Si seleccionas un nick, debe ser único."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Nombre del complemento:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Aplicación asociada:"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Selecciona la aplicación que soporta tu recopilatorio."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Tipo de recopilatorio"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Borrar recopilatorio"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Si borras tu recopilatorio, se eliminará permanentemente."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Descripción del recopilatorio"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Describe brevemente tu recopilatorio y el tipo de complementos que contiene"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Icono"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Puedes enviar un icono en formatos JPG, GIF o PNG que será redimensionado a 32x32 pixels."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "¿Quien puede ver tu recopilatorio?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Por defecto, los recopilatorios aparecen en el directorio público de recopilatorios y pueden ser descubiertos por cualquiera. Si quieres restringir tu recopilatorio para ser visto sólo por las personas a las que des un enlace especial, selecciona esa opción debajo."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Sólo las personas a la que invite pueden ver mi recopilatorio"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Cualquiera puede ver mi recopilatorio en el directorio"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "¿Quien puede administrar mi recopilatorio?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Estos usuarios puede publicar complementos en tu recopilatorio, administrar los complementos y opciones, y dar permisos a otros usuarios."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Nombre del recopilatorio"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Da a tu recopilatorio un nombre descriptivo, como por ejemplo \"Complementos favoritos de David\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Nick del recopilatorio"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Opcionalmente, puedes dar a tu recopilatorio un nick único para un acceso rápido:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "¿Quien puede publicar complementos en tu recopilatorio?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Estos usuarios puede publicar complementos en tu recopilatorio y borrar los complementos que ellos hayan publicado."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Introduce el correo electrónico de una cuenta de Firefox Add-ons:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Las cuentas seleccionadas se borrarán al guardar"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Introduce una lista separada por comas de direcciones de correo electrónico de cuentas de Firefox Add-ons:"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Sólo yo"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Yo y los siguientes usuarios"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Añadir"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Administrar %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Administrar el contenido del recopilatorio"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Complementos actuales:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Opciones avanzadas:"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Administrar los permisos del recopilatorio:"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Cancelar"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Borrar icono"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Reemplazar icono"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "El icono se borrará cuando pulse \"%1$s\" "
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Nick disponible"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Tu nick contiene caracteres no válidos y ha sido corregido. Por favor, inténtalo de nuevo."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Nick ocupado"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Puedes acceder a tu recopilatorio en esta ubicación:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "¡Tu recopilatorio se ha guardado correctamente!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Actualizar recopilatorio"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Borrar recopilatorio"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Complementos"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avanzado"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Nombre &amp; detalles"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permisos"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Los complementos pueden tener un ojo en tus hijos y tu agenda."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Organizador familiar"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Revisar el recopilatorio de complementos"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Crear un recopilatorio"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Ir"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Aún no tienes ningún recopilatorio favorito.</strong></p> <p>Puedes acceder rápidamente a los recopilatorios que hayas marcado como favoritos desde esta página, y aparecerán en el <a href='%1$s'>recopilador de complementos</a> si lo tienes instalado.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Aún no tienes ningún recopilatorio. Los recopilatorios son fáciles de crear y llenar con tus complementos favoritos. ¡<a href='%1$s'>Pruébalo ahora</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Recopilatorios"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Recopilador de complementos"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "creado por %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "¿Qué son los recopilatorios?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Ordenar por"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Elegidos por el editor"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Mis favoritos"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Ver todos los complementos recomendados"
 
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Mis recopilatorios"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Los mejor puntuados primero"
 
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populares"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Los actualizados recientemente primero"
 
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Más populares de todos los tiempos"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Los más populares primero"
 
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Más populares de este mes"
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Ver todos en %1$s"
 
-#: views/search/collections.thtml:76
 #: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Más nuevos"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Más populares esta semana"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Hay un nuevo modo de administrar y buscar los complementos favoritos. Comenta, comparte y sincroniza recopilatorios, todo desde tu navegador"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Los recopilatorios son grupos de complementos relacionados para ser fáciles de compartir."
+msgid "collection_not_found"
+msgstr "¡Colección no encontrada!"
 
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
-msgstr "Añadido en %s"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Los complementos pueden hacer la mejor búsqueda en la web."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referencia de escritorio"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Los complementos pueden administrar tus redes sociales."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Conexiones sociales"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Cerrar"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Se ha producido un error al añadir un recopilatorio favorito. ¿Está ya este recopilatorio en tus favoritos?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "No volver a mostrar este mensaje."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s se ha añadido a tus recopilatorios favoritos."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Ahora puedes encontrar rápidamente este recopilatorio desde la pestaña <a href=\"%1$s\">%2$s</a> del directorio. Para un uso incluso más fácil de seguir el rastro de tus recopilatorios favoritos, prueba nuestra extensión para Firefox <a href=\"%3$s\">recopilador de complementos</a>."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "El recopilatorio ha sido borrado."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Los complementos pueden convertirte en un agente de viajes."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "El pack de los viajeros"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Publicado automáticamente"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Seleccionado por el editor"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Se ha producido un error al intentar eliminar un recopilatorio favorito. ¿No era este recopilatorio un favorito?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s se ha eliminado de tus recopilatorios favoritos."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Los complementos te hacen más fácil construir la web perfecta."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Conjunto de herramientas de desarrolladores web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "¿Qué son los recopilatorios?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Lee las preguntas frecuentes"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Hay un nuevo modo de administrar y buscar los complementos favoritos. Comenta, comparte y sincroniza los recopilatorios, todo desde tu navegador."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Recopilador de complementos"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Descargar el recopilador de complementos"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo del recopilador de complementos"
+msgstr "Añadido %s"
 
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centro de compatibilidad de complementos"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Estáte preparado para la publicación de %1$s con las herramientas y la información disponible para la comunidad de complementos de %2$s que encontrarás más abajo."
+msgstr ""
+"Estate preparado para la publicación de %1$s con las herramientas y la "
+"información disponible para la comunidad de complementos de %2$s que "
+"encontrarás más abajo."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Cargando datos..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Volver al inicio"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Informe de compatibilidad del complemento"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Información para desarrolladores de complementos"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajustar la maxVersion sin subirlo de nuevo"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Comprobar el estado de mis complementos"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Si tienes complementos alojados en Mozilla Addons, <a href=\"%1$s\">por favor, inicia sesión</a>para analizar el estado de tus complementos para %2$s."
+msgstr ""
+"Si tienes complementos alojados en Mozilla Addons, <a href=\"%1$s\">por "
+"favor, inicia sesión</a>para analizar el estado de tus complementos para %2"
+"$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo del Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "No tienes ningún complemento alojado en Mozilla Addons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Resultados de la comprobación del estado del complemento"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Obteniendo el estado de los complementos alojados..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s usuarios de %2$s (%3$s&#37; del total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Los siguientes complementos representan el 95% del volumen de uso que Mozilla tiene constancia y están ordenados por su volumen de uso."
+msgstr ""
+"Los siguientes complementos representan el 95% del volumen de uso que "
+"Mozilla tiene constancia y están ordenados por su volumen de uso."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Ver informe detallado"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "De los %1$s complementos que representan el 95&#37; del volumen de uso que Mozilla tiene constancia, <b>%2$s&#37;</b>son actualmente considerados compatibles con las últimas versiones de %3$s."
+msgstr ""
+"De los %1$s complementos que representan el 95&#37; del volumen de uso que "
+"Mozilla tiene constancia, <b>%2$s&#37;</b>son actualmente considerados "
+"compatibles con las últimas versiones de %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versiones Alpha"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Complementos compatibles con un versión Alpha de %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versiones Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Complementos compatibles con una versión beta o candidata de %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Última versión"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Complementos actualizados para las últimas versiones de %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Otras versiones"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Complementos no compatibles con ninguna versión de %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Informe de compatibilidad del complemento"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Información para los usuarios del complemento"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Ver informe de compatibilidad"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
-msgstr "Si deseas información sobre cómo colaborar, por favor visita nuestra %s."
+msgstr ""
+"Si deseas información sobre cómo colaborar, por favor visita nuestra %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "página wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "A Mozilla le gustaría dar las gracias a las siguientes personas por su colaboración con el proyecto addons.mozilla.org durante estos años:"
+msgstr ""
+"A Mozilla le gustaría dar las gracias a las siguientes personas por su "
+"colaboración con el proyecto addons.mozilla.org durante estos años:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Desarrolladores"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editores"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Traductores"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Otros colaboradores"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Antiguos desarrolladores"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Aplicaciones e imágenes"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Alguno de los iconos usado son del <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, licenciado bajo <a href=\"http://creativecommons.org/licenses/by/2.5/\">Licencia Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Alguno de los iconos usado son del <a href=\"http://www.famfamfam.com/lab/"
+"icons/silk/\">famfamfam Silk Icon Set</a>, licenciado bajo <a href=\"http://"
+"creativecommons.org/licenses/by/2.5/\">Licencia Creative Commons Attribution "
+"2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
-msgstr "Algunas páginas usan elementos de <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, bajo <a href=\"http://simile.mit.edu/license.html\">licencia BSD</a>."
+msgstr ""
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%x"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%x %X"
@@ -2413,7 +1299,7 @@ msgstr "Editar el complemento"
 
 #: views/elements/developers/actionbar.thtml:51
 msgid "devcp_actionbar_link_newversion"
-msgstr "Subir una nueva versión"
+msgstr "Subir runa nueva versión"
 
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
@@ -2424,29 +1310,46 @@ msgstr "Panel de estadísticas"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "El archivo %1$s tiene una extensión incorrecta (%2$s). Extensiones permitidas: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "No se pudo guardar el archivo %s en la base de datos. Por favor, inténtalo de nuevo."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "La vista previa %1$s fue remplazada con éxito por el archivo %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Se subió con éxito el archivo %s. Puedes añadir una captura abajo."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detectar)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Esta versión de tu complemento no es compatible con Firefox %1$s. Mozilla "
+"tiene planeado publicar la próxima versión de Firefox pronto, así que, por "
+"favor, prueba tu complemento en la nueva versión y actualiza la información "
+"de compatibilidad. Puedes informarte más sobre ello <a href=\"%2$s\">aquí</"
+"a>. Esto es simplemente un aviso, puedes continuar y enviar esta versión a "
+"addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Abrir en una nueva ventana"
@@ -2483,715 +1386,1379 @@ msgstr "Paso 5: Éxito"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ayuda con el envío"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Complemento desactivado con éxito"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Editar complemento"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Complemento activado con éxito"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descripción del complemento"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "CLUF"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Página web del complemento"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nombre del complemento"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Captura de vista previa"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Marcar como activo"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Política de privacidad"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Resumen del complemento"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Correo de ayuda"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL con ayuda"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Notas de la versión"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Proponer el complemento"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "¡Complemento propuesto con éxito!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Marcar tu complemento como activo para que pueda ser visualizado en los listados públicos y activar el sistema de comprobación de actualizaciones."
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Completar complemento"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Completar tu complemento y moverlo al área de pruebas"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Marcar como inactivo"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Marcar tu complemento como inactivo para ocultarlo de los listados públicos y desactivar el sistema de comprobación de actualizaciones."
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Mover al área de pruebas"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Mover tu complemento al área de pruebas. Puede ser revertido."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Proponer públicamente"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Proponer tu complemento para que sea público"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Hacer público"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Hacer tu complemento público de nuevo."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
-msgstr "Tu complemento está <span class=\"inactive-0\">Activo</span>. Esto significa que debido a ello, se está mostrando en todos los listados actuales que le correspondan."
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Por favor, antes de que puedas completar el proceso, rellena completamente los campos superiores y muévelo al <span class=\"status-1\">�rea de pruebas</span>."
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Ahora debes completar el proceso y mover tu complemento al <span class=\"status-1\">�rea de pruebas</span> haciendo clic sobre el siguiente botón."
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Al menos una categoría debe ser seleccionada"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Se requiere una descripción del complemento"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Se requiere el nombre del complemento"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "El complemente no está marcado como una versión previa."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Para las extensiones y temas, se requiere al menos una captura con la vista previa."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Se requiere un resumen del complemento"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Estado del complemento: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Acciones disponibles"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Estado: <span class=\"inactive-0\">Activo</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Criterio para complementos"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Estado: <span class=\"inactive-1\">Inactivo</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Criterios de propuesta pública"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Estado de confianza: <span class=\"status-4\">Confiable</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "Tu complemente está <span class=\"inactive-1\">Inactivo</span>. Esto significa que no se mostrará en ningún listado debido a su estado. <strong>No</strong> se están proporcionando actualizaciones para tu complemento a través del servicio de actualizaciones."
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Por favor, rellena completamente los campos superiores antes de proponer tu complemento para convertirse en <span class=\"status-4\">Público</span>."
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Ahora puedes proponer tu complemento para convertirse en <span class=\"status-4\">Público</span> haciendo clic sobre el siguiente botón."
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Público"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "�rea de pruebas"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Tu complemento fue <span class=\"status-5\">Desactivado</span> por un administrador y no puede usarse. Si tienes alguna pregunta, envía un correo a %s."
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Tu complemento está actualmente <span class=\"status-0\">Incompleto</span>. Esto significa que no se mostrará en ninguna parte de la web o en el servicio de actualizaciones. Deberías regresar a esta página para completar los datos de tu complemento para que cumplan los requisitos, completando así el proceso y enviarlo al <span class=\"status-1\">�rea de pruebas</span>."
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Tu complemento está actualmente propuesto para convertirse en <span class=\"status-4\">Público</span> y está esperando una valoración del editor. Actualmente hay %s otros complementos en la cola de propuestas."
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "Tu complemento está pendiente. Ésto no debería haber pasado. Por favor, envía un correo electrónico a %s con tu ID de complemento y menciona este error."
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "Tu complemento es <span class=\"status-4\">Público</span>, lo que significa que se mostrará en todos los listados y búsquedas y puede ser descargado sin restricciones. Las actualizaciones son proporcionadas a través del servicio de verificación de actualizaciones."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Tu complemento está en el <span class=\"status-1\">�rea de pruebas</span>, lo que significa que se mostrará en los listados y búsquedas, pero los usuarios deberán iniciar sesión descargarlo.  <strong>No</strong> se proporcionarán actualizaciones de tu complemento a través del servicio de verificación de actualizaciones."
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Estado de %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "Tu complemento es <span class=\"status-4\">Confiable</span>. Ésto significa que puedes enviar actualizaciones de tu complemento sin necesidad de una valoración del editor."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visita la página de %1$s para hacer cambios a tu envío, o %2$s para volver a "
+"las Herramientas del desarrollador."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "haz clic aquí"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Editar complemento"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Esta versión ha sido colocada en el área de pruebas esperando valoraciones "
+"por parte de los voluntarios y de un editor de Mozilla Addons. Se te "
+"notificará por correo electrónico cualquier acción que se tome."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Puedes leer más sobre el sistema de valoración del área de pruebas %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "aquí"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Esta versión ha sido colocada en el área de pruebas para su uso por usuarios "
+"expertos. Para que sea mostrado en el área pública, debes %s tu complemento "
+"y someterte a un proceso de valoración."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "proponer"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "El envío de tu complemento se ha completado con éxito."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Como tu complemento es de confianza, esta versión ha sido aprobada "
+"automáticamente para aparecer en el área pública."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Enviar un complemento"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Complemento actualizado con éxito"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Quizá desees %s para aumentar el interés en tu complemento."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "subir una vista previa"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Autor no encontrado [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Eliminar"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancelar"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "¿Estás seguro que quieres cancelar tu envío?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Siguiente"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Cambiar el tipo de complemento:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Actualizados los comentarios del desarrollador."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Activo"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s actualmente %2$s y %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Cambiar estado"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Tu complemento fue deshabilitado por un administrador y no puede ser usado.  Si tienes alguna pregunta, por favor envía un correo electrónico a %s."
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Estado del complemento: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Panel del desarrollador"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Bienvenido al panel del desarrollador"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Inactivo"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Última edición el %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "Actualmente no tienes ningún complemento alojado en Mozilla Addons. Para conocer cómo funciona el proceso y enviar tu primer complemento, haz clic en \"Comenzar\" debajo."
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Comenzar"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Versiones y archivos"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Subir una nueva versión"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "La vista previa de %s no puede borrarse de la base de datos. Por favor, intentalo de nuevo."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "La vista previa de %s ha sido borrada con éxito."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "No tienes privilegios para borrar versiones o archivos."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s archivo %2$s "
-msgstr[1] "%1$s archivos %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Añadir vista previa"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autores"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Ninguno"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorías"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categoría"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descripción"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Desactivado"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detalles"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Comentarios del desarrollador"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Vistas previas"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versiones"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Página web"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Ninguna"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Sin capturas"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "No se encontraron vistas previas."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Actualizar"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Correo de ayuda"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "El desarrollador no proporcionó ningún correo de ayuda."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL con ayuda"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "El desarrollador no proporcionó ninguna url de ayuda."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "De confianza"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versión %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "No se encontraron versiones."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancelar y volver atrás"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Sí, desactivarlo"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "¿Estás seguro de querer desactivar este complemento?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Al desactivar este complemento lo ocultarás de las búsquedas y los listados. "
+"No se podrá descargar desde la web y no enviará avisos de actualización a "
+"los clientes. El complemento será borrado, aunque podrás volver aquí para "
+"reactivarlo si lo deseas."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Desactivar %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Sí, activarlo"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "¿Estás seguro de querer activar este complemento?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Al activar este complemento, este aparecerá de nuevo en las búsquedas y en "
+"los listados. Se podrá descargar tanto desde la web como mediante los avisos "
+"de actualización de los clientes."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Activar %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Añadir respuesta"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Respuestas"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
-msgstr "Hubo un error al guardar tu respuesta. Por favor, contacta en %1$s sobre este problema."
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
-msgstr "Un editor de Mozilla Addons ha solicitado más información sobre tu versión %2$s de tu complemento %1$s."
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "Proporcionar más información sobre la valoración del complemento %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Enviar respuesta"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
-msgstr "Tu respuesta se ha guardado con éxito. Se informará por correo electrónico a los otros participantes en la discusión."
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "escrito por %1$s el %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Añadir autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Correo electrónico del autor"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Eliminar"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Añadir nuevo autor"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Añadir autor"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Cuenta de correo del autor:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Comprobando cuenta de correo..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Pulse el botón actualizar autores para guardar."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Autores actuales"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Administrar autores del complemento"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Listar como autor en las páginas públicas"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Desarrollador</strong> - Puede administrar todos los aspectos del listado de complementos, excepto añadir y borrar otros autores."
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Propietario</strong> - Puede administrar todos los aspectos del listado de complementos, incluyendo añadir y borrar otros autores."
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Visualizador</strong> - Puede visualizar el listado de desarrolladores y estadísticas, pero no puede hacer ningún cambio."
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Selecciona un rol para el autor:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Listado"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Rol"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Actualizar autores"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Actualiza categorías"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Mi complemento no coincide con ninguna de las categorías disponibles."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "Categorías de %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Administrar las categorías del complemento"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Pase el cursor sobre una categoría para ver su descripción."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Categoría %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "No hay categorías disponibles para el tipo y aplicación del complemento."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Incluya su complemento en esta categoría sólo si no encaja en el resto de categorías disponibles."
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Selecciona hasta tres categorías de %s para tu complemento"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Añade o elimina usuarios que puedan administrar este complemento."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Selecciona las categorías relevantes para cada aplicación que admita tu complemento."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "Añade y modifica las traducciones para el resumen del complemento, descripción, licencia de usuario final y política de privacidad."
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Cambie el nombre de tu complemento, la página web, el icono y otras marcas."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Actualizar descripciones"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Por favor, corrige los errores indicados en rojo más arriba."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Editar descripciones de complementos"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Cualquier información que los usuarios finales pueden necesitar saber, y que no necesariamente se aplican al resumen del complemento o la descripción. Los usos comunes incluyen informar de problemas conocidos, cómo informar de errores, fecha prevista de nuevas versiones, etc."
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Comentarios del desarrollador"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "La descripción de tu complemento es una explicación más larga de características, funcionalidades y otra información relevante. Se muestra bajo el resumen en la página del complemento."
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Descripción del complemento"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Si tu complemento tiene un acuerdo de licencia final de usuario (EULA), introduce el texto a continuación. De este modo, los usuarios necesitarán aceptarla antes de poder instalar tu complemento. Ten en cuenta que una EULA no es lo mismo que una licencia de código como GPL o MPL."
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Acuerdo de licencia final de usuario"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Si tienes una política de privacidad, introduce el texto a continuación. La página del complemento mostrará un enlace a la política."
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Política de privacidad"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "El resumen es una explicación corta de la funcionalidad básica de tu complemento que se muestra en la búsqueda y en los listados, además de en la parte superior de la página del complemento. <strong>Límite de 250 caracteres.</strong>"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Resumen del complemento"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Administrar autores del complemento"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Administrar categorías del complemento"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Administrar descripciones del complemento"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Administrar propiedades del complemento"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No hay categorías disponibles para este tipo de complemento."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autores"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Añadir icono"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Cambiar icono"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permitir a los usuarios ver los archivos fuente en línea"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorías"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Idioma por defecto"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Este complemento requiere programas externos"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Solo eliminar el icono actual"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nuevo archivo de icono"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icono"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Información adicional sobre el idioma"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Esta es una versión previa"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Este es un complemento específico para una web"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Idioma objetivo"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "breve información adicional (como el nombre del dialecto local)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Actualizar propiedades"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Cámbialo sólo si entiendes todas las consecuencias."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Icono actual"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "Un idioma por defecto para los complementos es el idioma principal en el que las traducciones deben estar. Si las traducciones de las descripciones de tu complemento no existen en un idioma seleccionado por el usuario, se usará el idioma por defecto."
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "Estas marcas se usan para filtrar y clasificar los complementos."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "El GUID de tu complemento se especifica en el archivo install.rdf y lo identifica unívocamente. No puedes cambiar el GUID una vez se haya registrado en Mozilla Addons."
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Editar propiedades del complemento"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Tipo de complemento"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Opciones de administrador"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Idioma por defecto"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Marcas del complemento"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID del complemento"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Icono del complemento"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Otras opciones"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "¿Complemento de confianza?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Ver código fuente en línea"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "El icono del complemento es una pequeña imagen que se muestra junto al nombre de tu complemento en los listados y los resultados de las búsquedas, y en el cuadro de instalación del complemento. La imagen se redimensionará automáticamente a 32 x 32 pixels.  Por favor, usa uno de los siguientes tipos de imagen: %s"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Este complemento contiene componentes binarios"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "No es de confianza"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "De confianza"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Nuevo icono"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Borrar icono"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Si tu complemento tiene otra página web, introduce su dirección aquí. No es necesario añadir otras traducciones a menos que tu página web esté traducida en varios idiomas."
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Página del complemento"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "El nombre de su complemento aparecerá en todos los sitios donde sea listado."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Nombre del complemento"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Si tienes una dirección de correo para peticiones de asistencia, introdúcela aquí. No es necesario añadir otras traducciones a menos que tengas diferentes direcciones para otros idiomas."
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "Dirección de correo de asistencia"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Si tu complemento tiene una página web o un foro de asistencia, introduce su dirección aquí. No es necesario añadir otras traducciones a menos que la página web esté traducida en varios idiomas."
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Página web de asistencia"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "Los complementos de confianza pueden pasar a ser públicos sin necesidad de revisiones de los editores."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Los iconos se borrarán al guardar. <a %s>¿Cancelar?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "El código fuente de los archivos de tu complemento podrán ser vistos en línea por cualquier usuario conectado si lo deseas."
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Permitir ver el código fuente en línea"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "No permitir la visualización del código fuente en línea"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Actualizar"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nombre sencillo "
+"del idioma</a>, tal como 'en-US'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Autores"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Categorías"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Cambiar estado"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Descripciones"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Editar complemento"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Nueva versión"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Propiedades"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Capturas de pantalla"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Panel de estadísticas"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Versiones y archivos"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Ver en la web"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3224,14 +2791,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Una actualización pendiente"
 msgstr[1] "Actualizaciones pendientes (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Los archivos marcados serán eliminados"
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Archivos"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplicaciones destino"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Sin archivos."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notas para el revisor"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Actualizar"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "No tienes acceso a ese complemento."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Las descripciones están limitadas a un máximo de 250 caracteres.\n"
+"(Introdujiste %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"El nombre de tu complemento ya existe en la base de datos. Por favor, "
+"asegúrese que: <br /><li>Sus GUIDs coinciden. La causa más común de esto son "
+"unas GUIDs erróneas.</li><li>No tienes una entrada duplicada en la base de "
+"datos. Si es así, debes actualizar dicha entrada o eliminarla y probar de "
+"nuevo.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3245,21 +2867,32 @@ msgstr "Por favor, lee %s para más información."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "esta página"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Tu complemente debe tener al menos un propietario."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Por favor, describa los cambios realizados en esta actualización del "
+"complemento."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "Ya existe una versión de ese complemento. Para reemplazarla, debes borrar primero el archivo %1$s."
+msgstr ""
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "No está permitido esa extensión de archivo (%s) para el tipo de complemento seleccionado. Por favor, usa una de los siguientes: %s"
+msgstr ""
+"No está permitido esa extensión de archivo (%s) para el tipo de complemento "
+"seleccionado. Por favor, usa una de los siguientes: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "No concuerdan todas las GUIDs de los archivos"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3291,9 +2924,19 @@ msgstr "No se subió ningún archivo"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "No está permitida esa extensión de archivo (%s) para un icono. Por favor, elige una de las siguientes: %s"
+msgstr ""
+"No está permitida esa extensión de archivo (%s) para un icono. Por favor, "
+"elige una de las siguientes: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Una versión idéntica (%s) ya existe para este complemento y plataforma."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No está presente el archivo install.rdf."
 
@@ -3301,7 +2944,7 @@ msgstr "No está presente el archivo install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Se encontraron los siguientes errores en el install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Por favor, seleccione un tipo válido de complemento."
 
@@ -3324,21 +2967,29 @@ msgstr "El ID de este complemento no es válido: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%s no es una versión válida para %s: las versiones mínimas no pueden contener *"
+msgstr ""
+"%s no es una versión válida para %s: las versiones mínimas no pueden "
+"contener *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "La version de este complemento no es válida: por favor, lee las <a href=\"http://developer.mozilla.org/es/docs/Formato_para_la_versi%C3%B3n_del_Toolkit\">especificaciones</a>"
+msgstr ""
+"La version de este complemento no es válida: por favor, lee las <a href="
+"\"http://developer.mozilla.org/es/docs/Formato_para_la_versi%C3%"
+"B3n_del_Toolkit\">especificaciones</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "La versión de este complemento no es válida: las versiones no pueden contener espacios."
+msgstr ""
+"La versión de este complemento no es válida: las versiones no pueden "
+"contener espacios."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
-msgstr "Ocurrieron los siguientes errores mientras se analizaba el install.rdf: %s"
+msgstr ""
+"Ocurrieron los siguientes errores mientras se analizaba el install.rdf: %s"
 
 #: controllers/components/developers.php:373
 msgid "devcp_error_move_file"
@@ -3357,16 +3008,33 @@ msgstr "Ocurrió un error al mover %s."
 
 #: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
-msgstr "Debes incluir en las aplicaciones destino al menos una aplicación válida de Mozilla."
+msgstr ""
+"Debes incluir en las aplicaciones destino al menos una aplicación válida de "
+"Mozilla."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
-msgstr "No se encontró ningún un ID en el archivo install.rdf de este complemento."
+msgstr ""
+"No se encontró ningún un ID en el archivo install.rdf de este complemento."
 
 #: controllers/components/developers.php:287
 msgid "devcp_error_no_platform"
 msgstr "No se seleccionó ninguna plataforma"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Debes proporcionar los datos requeridos para la nominación"
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "No puedes nominar complementos en fase beta."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Solo puedes proponer complementos que estén actualmente en el área de "
+"pruebas."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Por favor, elige al menos una categoría."
@@ -3380,91 +3048,320 @@ msgstr "Este complemento debe tener al menos un autor."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "No está permitida esa extensión de archivo (%s) para las vistas previas. Por favor, usa una de las siguientes: %s"
+msgstr ""
+"No está permitida esa extensión de archivo (%s) para las vistas previas. Por "
+"favor, usa una de las siguientes: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Ocurrió un error mientras se intentaban salvar tus datos."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "No tienes permisos para actualizar este complemento."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Los complementos no pueden usar un updateKey. Por favor, elimina esto del install.rdf e intentalo de nuevo."
+msgstr ""
+"Los complementos no pueden usar un updateKey. Por favor, elimina esto del "
+"install.rdf e intentalo de nuevo."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Los complementos no pueden usar una updateURL externa. Por favor, elimina esto del install.rdf e intentalo de nuevo."
+msgstr ""
+"Los complementos no pueden usar una updateURL externa. Por favor, elimina "
+"esto del install.rdf e intentalo de nuevo."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor, suba un archivo."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Añadir otro archivo de plataforma"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Añadir autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Eliminar"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Las categorías para tu nuevo complemento estarán disponibles en el próximo "
+"paso."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No hay categoría disponibles para este tipo de complemento."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Por favor, introduzca una descripción para su complemento."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Por favor, introduzca el nombre de su complemento."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Por favor, seleccione el tipo de complemento que está enviando."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Por favor,  introduzca una descripción para su complemento."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Archivo del complemento"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Archivo del complemento 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Archivo del complemento 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tipo de complemento"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permitir a los usuarios ver los archivos fuente en línea"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Correo electrónico del autor"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autores"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorías"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Idioma por defecto"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descripción"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Contrato de Licencia para el Usuario Final (CLUF)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Este complemento requiere programas externos"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Archivos"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Página web"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Archivo de icono"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nombre"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plataformas admitidas"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Esta es una versión previa"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Política de privacidad"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Este complemento es específico para una página web"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Descripción"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Correo de ayuda"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL con ayuda"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplicaciones destino"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versión"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Notas de las versión"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Ninguna"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notas para el revisor"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Como tu complemento es confiable, por favor, elija donde debe ir esta "
+"versión:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "�rea pública"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "�rea de pruebas"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Acuerdo del desarrollador"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Paso 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Subir archivo"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Paso 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detalles del complemento"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Paso 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detalles de la versión"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Paso 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localización"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Paso 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Éxito"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mis complementos"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Subir un archivo"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Por favor, introduce la cuenta de correo del autor que quieres añadir."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Bajar"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Subir"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Borrar la compatibilidad con la aplicación"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Mostrar como autor en los listados públicos"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Por favor, selecciona una licencia."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Introduce el texto para tu licencia."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Desarrollador"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Propietario"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Visualizador"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Eliminar autor"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "¿<strong>Seguro</strong> que quieres eliminar este autor?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Debes seleccionar un archivo para subir."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Licencia personalizada del complemento %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3474,15 +3371,20 @@ msgstr "Campos localizables"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Algunos de los campos de esta página son localizables para que aparezcan en las páginas finales de usuario en su idioma nativo. Elige un idioma abajo para editar los detalles de tu complemento en ese idioma. Si no está disponible la traducción para un idioma, se mostrará la elegida en el idioma por defecto (%s)."
+msgstr ""
+"Algunos de los campos de esta página son localizables para que aparezcan en "
+"las páginas finales de usuario en su idioma nativo. Elige un idioma abajo "
+"para editar los detalles de tu complemento en ese idioma. Si no está "
+"disponible la traducción para un idioma, se mostrará la elegida en el idioma "
+"por defecto (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Herramientas del administrador"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Herramientas del editor"
 
@@ -3491,72 +3393,110 @@ msgid "devcp_myaddons_link"
 msgstr "Mis complementos"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Volver a la página inicial"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Panel de estadísticas"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Enviar un complemento"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Herramientas del desarrollador"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "El ID de este complemento (%1$s) ya existe en la base de datos. Si es tu complemento, puedes <a href=\"%2$s\">enviar una nueva versión</a>."
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Cancelar y volver"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Volver a los detalles del complemento"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Proponer %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Detectar automáticamente el tipo de complemento: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>Uno o más de tus cambios no han podido guardarse.</span><br />Por favor, revisa los errores a continuación. El resto de tus cambios se han guardado correctamente."
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Tus cambios se han guardado.</span><br />Por favor, ten en cuenta que algunos cambios pueden tardar varias horas en aparecer en todas las zonas de la página web."
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Eliminar esta como la vista previa por defecto hará que otra vista previa se convierta automáticamente en la vista previa por defecto."
+msgstr ""
+"Eliminar esta como la vista previa por defecto hará que otra vista previa se "
+"convierta automáticamente en la vista previa por defecto."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"El idioma por defecto de este complemento (%1$s [%2$s]) es distinto de su "
+"idioma por defecto (%3$s [%4$s]). Los campos abajo deberían ser completados "
+"en %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "Hacer esta su vista previa por defecto eliminará el estado por defecto de su actual vista previa por defecto."
+msgstr ""
+"Hacer esta su vista previa por defecto eliminará el estado por defecto de su "
+"actual vista previa por defecto."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Tienes cambios sin guardar."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3585,94 +3525,120 @@ msgstr "Editar vista previa"
 msgid "devcp_preview_updated_successfully"
 msgstr "Vista previa actualizada con éxito."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Añadir otra captura"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Borrar captura"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Reemplazar captura"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Actualizar capturas"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Añadir nueva captura"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Selecciona una imagen para enviar a continuación. Las imágenes mayores de un tamaño máximo de 700 pixels de ancho por 525 serán redimensionadas. Tipos de archivos permitidos: %s"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Haz clic en actualizar captura a continuación para enviar."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Haz clic el botón actualizar capturas para guardar la imagen . (<a %s>¿Cancelar?</a>)"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "Esta captura se borrará cuando pulses actualizar capturas. (<a %s>¿Cancelar?</a>)"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Usa el formulario de abajo para subir una captura de pantalla en PNG, JPG, o GIF de tu complemento. Las imágenes mayores de 700 pixels de ancho y 525 pixels alto será redimensionadas automáticamente."
+msgstr ""
+"Usa el formulario de abajo para subir una captura de pantalla en PNG, JPG, o "
+"GIF de tu complemento. Las imágenes mayores de 700 pixels de ancho y 525 "
+"pixels alto será redimensionadas automáticamente."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Añadir vista previa"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Título de la captura"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Editar vista previa"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Captura por defecto"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "Vista previa del archivo"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Hacer esta la vista previa por defecto"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Nueva imagen:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Enviar captura:"
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "Una o varias de tus capturas no se han podido guardar."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Tus capturas se han actualizado correctamente."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "Las capturas de pantalla de tu complemento se muestran abajo y puedes hacer cambios a sus descripciones e imágenes. La captura por defecto en la que se muestra al lado en el listado de complementos tras una búsqueda."
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3690,30 +3656,53 @@ msgstr "Editar la vista previa"
 msgid "devcp_previews_submit_upload"
 msgstr "Subir vista previa"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Miniatura"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Administrador de capturas de %s"
+msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "¿Incorrecto?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "¿Estás seguro de borrar este archivo?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Por favor, revisa y acepta el siguiente acuerdo de desarrollador antes de proceder."
+msgstr ""
+"Por favor, revisa y acepta el siguiente acuerdo de desarrollador antes de "
+"proceder."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>No tienes permisos suficientes para hacer cambios en esta página.</span><br />Contacta con el propietario del complemento si necesitas hacer cambios."
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "Por favor, ten en cuenta que algunos cambios tardarán varias horas en aparecer en todas las áreas de la web."
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Panel"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Saltar la valoración de la información actual de mi complemento"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3737,570 +3726,804 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> descargas semanales"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "Al marcar este complemento como activo, harás que se muestre en todas las áreas públicas donde corresponda por su estado, incluyendo las búsquedas y listados. Podrá ser descargado desde la web y podrán pedirse actualizaciones desde los clientes, dependiendo de su estado. Podrás volver aquí y desactivarlo de nuevo cuando lo desees."
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "¿Seguro que quieres marcar este complemente como activo?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "¿Estás seguro?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "Al marcar este complemento como inactivo, harás que no se muestre en ningún área pública donde corresponda por su estado, incluyendo las búsquedas y listados. No podrá ser descargado desde la web y no se podrán pedir actualizaciones desde los clientes. Podrás volver aquí y activarlo de nuevo cuando lo desees."
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "¿Seguro que quieres marcar este complemente como inactivo?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "No, cancelar"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "Al marcar este complemento como público harás que esté disponible para su descargar por cualquiera y se empezarán a servir actualizaciones los usuarios actuales."
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "¿Estás seguro de querer hacer este complemento público?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Al mover este complemento al área de pruebas, los usuarios tendrán que conectarse antes de poder descargarlo, y las actualizaciones no se ofrecerán a los usuarios existentes. Ya que tu complemento es actualmente público, podrás volver aquí en cualquier momento y volver a hacerlo público."
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "¿Estás seguro de mover este complemento al área de pruebas?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Sí, estoy seguro"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Es necesario un mensaje para la propuesta.</span><br />Por favor, rellena el cuadro de texto con la información solicitada e inténtalo de nuevo."
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Propuesta de complemento"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Los envíos de complementos están actualmente deshabilitados. Por favor, "
+"vuelva a intentarlo más tarde."
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Aceptar"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Rechazar"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Este complemento ha sido desactivado por un administrador."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Desactivado"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "De confianza"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última versión:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "No tienes ningún complemento. Haz clic %s para enviar uno."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "aquí"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Por favor, asegúrese de %s para su tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "subir una vista previa"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Editar %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Ayuda (no abandonar la página)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Ayuda"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Caracteres usados: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "¿Estás seguro de que quieres borrar esta traducción?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "¿Qué son estas %s pestañas?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "¿Qué pasa si no tengo ninguna traducción?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Ocultar ayuda"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "Si un usuario visita el sitio y la traducción de su propio idioma no está disponible, se usará el idioma por defecto de tu complemento, especificado en el área de edición de las propiedades del complemento. Si no tienes ninguna traducción, introduce lo que puedas en tu idioma por defecto, que debe ser un idioma que hables."
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "Este es un <i>cuadro de traducción</i>. Te permite traducir un campo concreto en otro idioma, para el que debes tener una traducción. Puedes añadir, editar y borrar las traducciones usando las pestañas de idioma."
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Añadir traducción"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Borrar traducción"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Añadir idioma a todos"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Añadir traducción"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Borrar elemento"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Selecciona el idioma de la traducción a añadir:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "El GUID del complemento usado en este archivo (%1$s) no se corresponde con el GUID existente para este complemento (%2$s)."
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "No tienes los privilegios suficientes para actualizar este complemento."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "La versión espeficada (%1$s) no pertenece a este complemento (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "El número de la versión enviada (%1$s) ya existe para este complemento. Si estás intentando añadir otro archivo para esta versión, <a href=\"%2$s\">pulsa aquí</a>."
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "El número de la versión enviada (%1$s) no corresponde con el número de la versión existente (%2$s)."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Comenzar"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Enviando archivo..."
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Aceptar y continuar"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Editar mi complemento"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Completaré mi complemento después"
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Añadir notas de la versión"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>El listado de tu complemento se ha creado correctamente. La información básica obtenida de tu archivo enviado se ha guardado, pero hay más datos en tu listado que puedes personalizar.</p><p>Tu complemento está actualmente marcado como <strong>incompleto</strong>. Para completar tu complemento, debes asegurarte que tiene un nombre preciso, resumen y descripción, así como al menos una categoría seleccionada. Puedes editar la información del complemento usando el siguiente enlace y comprobando el estado cada vez en la <a %s>página de estado</a>."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Por favor, corrige este problema y vuelve a enviar el archivo."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "Tu nuevo archivo se ha añadido a la versión %1$s y está actualmente marcado como %2$s."
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "¡Complemento creado!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "¡Vaya! Parece que hay un problema con este archivo..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "¡Archivo añadido!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "¿Cómo funciona todo?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Versión %s creada"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Envía tu archivo"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Gracias por tu interés en enviar tu complemento a Mozilla Add-ons. Alojar tu complemento en Mozilla Add-ons es la manera más sencilla de distribuir tu complento. Esto es lo que tendrás:</p><ul><li>Cada complemento tiene su página pública que muestra la información que proporcionas, como un breve resumen de la funcionalidad del complemento, una descripción más larga de modo opcional, y una presentación de vistas previas de tu complemento.</li><li>tu complemento aparecerá en las búsquedas del sitio, e incluso en el administrador de complementos de Firefox 3.</li><li>Nosotros nos encargamos el alojamiento de todas tus descargas y proporcionamos las actualizaciones automáticas a los usuarios cuando envías una nueva versión.</li><li>Tendrás acceso a un panel de estadísticas con información detallada sobre tus usuarios.</li></ul><p>Los complementos alojados en el sitio tienen que ser revisados por un editor de Mozilla Add-ons antes de tener todos los puntos listados anteriormente. Si estás preparado para iniciar el proceso y tienes tu complemento listo para enviar, tan sólo pulsa en la opción de iniciar</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Plataformas soportadas:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Archivo de complemento:"
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Otro"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "El nuevo archivo estará disponible de forma pública tan pronto como un editor lo revise. Actualmente hay otros %1$s complementos en la cola. ¿Quieres ser revisado más rápido? Piensa en la opción de <a %2$s>hacerte editor</a>."
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "La nueva versión estará disponible de forma pública tan pronto como un editor lo revise. Actualmente hay otros %1$s complementos en la cola. ¿Quieres ser revisado más rápido? Piensa en la opción de <a %2$s>hacerte editor</a>."
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "Tu nueva versión se ha creado y está actualmente marcada como %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "Comprueba tus nuevos archivos en la <a %1$s>página de versiones y archivos</a>, comprueba el <a %2$s>estado actual</a> de tu complemento, o <b>añade las notas de la versión</b> pulsando en el siguiente botón (muy recomendable)."
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "Comprueba tu  nueva versión en la <a %1$s>página de versiones y archivos</a>, comprueba el <a %2$s>estado actual</a> de tu complemento, o <b>añade las notas de la versión</b> pulsando en el siguiente botón (muy recomendable)."
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Envía el archivo de tu complemento usando el siguiente formulario. Si tiene varios archivos dependientes de la plataforma, selecciona un único archivo y después envía el resto usando el administrador de versiones y archivos."
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Todas"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Específica:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Por favor, selecciona..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Añadir archivo a %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Enviar nuevo complemento"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Actualizar %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Por favor, ve %s para una referencia."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "esta página"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "No se ha encontrado ninguna cuenta para esta dirección de correo."
+msgstr "No account found for that email address."
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Editar versión"
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "El archivo XML no es correcto o faltan campos obligatorios. Por favor <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">consulta la documentación</a>, verifica tu complemento, y vuelve a intentarlo."
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versión actualizada con éxito."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Borrar versión"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Borrar versión vacía"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "¿Borrar?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Añadir nueva versión"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Borrar versión"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Esto también borrará:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s archivo"
-msgstr[1] "%s archivos"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "¿Borrar la versión %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s valoración"
-msgstr[1] "%s valoraciones"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "¿Está seguro de que quiere eliminar permanentemente la versión %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Borrar archivo"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Añadir nueva aplicación"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Borrar aplicación"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Añadir nuevo archivo"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Al ajustar la información de las aplicaciones aquí, permitirá a los usuarios instalar tu complemento incluso si el install.rdf del paquete indica que el complemento es incompatible. <a %s>Lista de las aplicaciones soportadas</a>"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "¿Está <b>seguro</b> de que quiere eliminar la compatibilidad con esta aplicación?"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "¿Está <b>seguro</b> de que quiere eliminar permanentemente este archivo?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Información de aprobación"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Aplicaciones compatibles"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Información del archivo"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licencia"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Administrar versión %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Notas de aprobación"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Borrar archivo"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Archivo %1$s (%2$s) creado el %3$s y cambiado a %4$s en %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Por favor, selecciona la licencia adecuada para tu complemento. Esta licencia espeficia los derechos que cedes del código fuente."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "No se han encontrado archivos."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Información opcional para el editor que va a revisar esta versión."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Borrar compatibilidad de aplicación"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Por favor, seleccione una aplicación"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Archivo"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Plataforma"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Tamaño"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Estado"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Información sobre cambios en esta versión, nuevas características, bugs conocidos, y otra información útil específica de esta versión. Esta información estará también disponible para los usuarios al actualizar el complemento en el administrador de complementos de Firefox 3."
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Notas de la versión"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Tienes cambios sin guardar.</strong> La compatibilidad no se guardará hasta que no use la opción inferior actualizar versión."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Tienes cambios sin guardar.</strong> Los archivos no se borrarán hasta que no use la opción inferior actualizar versión."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Actualizar versión"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Administrar versiones y archivos"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "No hay versiones"
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Versión %s borrada correctamente."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "Esta versión no tiene archivos asociados y puede borrarse. ¿Quieres borrar esta versión?"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Creada"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "Estado"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Versión"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Este complemento está deshabilitado"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "Este complemento no ha sido propuesto."
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Este archivo no tiene revisiones pendientes."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
 #: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "Por favor, selecciona una acción para la valoración."
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "Por favor, introduce las aplicaciones que has probado."
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
 #: controllers/components/editors.php:84
 #: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "Por favor, introduce comentarios de valoración."
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "Por favor, selecciona al menos un archivo para revisar."
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "Por favor, introduce los sistemas operativos que has probado."
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
@@ -4310,8 +4533,7 @@ msgstr "Filtrar"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/acción"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registro de eventos"
 
@@ -4373,7 +4595,7 @@ msgstr "Ver registros entre %s y %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No se encontraron valoraciones para ese periodo."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registro de valoraciones"
 
@@ -4397,29 +4619,28 @@ msgstr "Actividad reciente del editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Valoraciones totales"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Valorar complemento"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor, completa los siguientes campos:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Por favor, seleccione al menos un archivo para revisar."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Las valoraciones a ti mismo no están permitidas."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Programas externos"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Añadir una característica"
 
@@ -4427,307 +4648,266 @@ msgstr "Añadir una característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Añadir"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "No se ha podido añadir una característica"
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Se añadió una característica con éxito."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Fallo al editar una característica."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Se editó una característica con éxito."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "No son válidos uno o más idiomas."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Fallo al eliminar una característica."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Se eliminó una característica con éxito."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Complementos destacados"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Ir"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Borrar característica"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtrar cola"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Enlaces útiles"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guía de editores"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Política del complemento"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Estos filtros permanecerán para esta sesión o hasta que se cancelen."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Actualmente no hay complementos para valorar."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 día"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Herramientas del editor"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Solo %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Versión previa"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilidad de %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Correo electrónico del complemento o del autor"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tipos de complementos"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplicación"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Versión Máx:"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Plataformas"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Frecuencia de envíos (días)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Resultados de tu búsqueda filtrada: <strong>%1$s</strong> complemento"
-msgstr[1] "Resultados de tu búsqueda filtrada: <strong>%1$s</strong> complementos"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Limpiar"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtro"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Todas las colas de valoración están desactivadas actualmente. Por favor, vuelve a intentarlo en otro momento."
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Editar elemento"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Historial del elemento"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Página web del elemento"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Acerca del elemento"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Vistas previas"
+msgstr ""
+"Todas las colas de valoración están desactivadas actualmente. Por favor, "
+"vuelve a intentarlo en otro momento."
 
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Valoración a realizar"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "Solicitar más información"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Mover a la zona pública"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Solicitar una valoración mayor (Super-Review)"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Mantener en el área de pruebas"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Revisar los comentarios"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
-msgstr "Usa este formulario para solicitar más información del autor. Recibirán un correo electrónico y podrán responder aquí. Serás informado cuando se envíe una respuesta."
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Esto marcará el complemento y sus versiones más recientes como públicas. Las versiones posteriores irán al área de pruebas hasta que hayan sido valoradas por un editor."
+msgstr ""
+"Esto marcará el complemento y sus versiones más recientes como públicas. Las "
+"versiones posteriores irán al área de pruebas hasta que hayan sido valoradas "
+"por un editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Esto retendrá el complemento en el área de pruebas."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Esto aprobará la versión en el área de pruebas de un complemento público para que aparezca en el sitio público."
+msgstr ""
+"Esto aprobará la versión en el área de pruebas de un complemento público "
+"para que aparezca en el sitio público."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "Esto hará que la versión del área de pruebas de un complemento público permanezca en el área de pruebas."
+msgstr ""
+"Esto hará que la versión del área de pruebas de un complemento público "
+"permanezca en el área de pruebas."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Si te preocupa la seguridad de este complemento, su licencia, u otras preocupaciones que un administrador deba valorar, introduce tus comentarios en el campo abajo. Serán enviados a los administradores, no al autor."
+msgstr ""
+"Si te preocupa la seguridad de este complemento, su licencia, u otras "
+"preocupaciones que un administrador deba valorar, introduce tus comentarios "
+"en el campo abajo. Serán enviados a los administradores, no al autor."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Comparar con la versión pública"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Ver los contenidos"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autores:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorías:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidad:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descripción"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentarios del desarrollador"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "CLUF"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Archivos:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historial del elemento"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensaje de nominación"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Vistas previas"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de privacidad"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Valoraciones de %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para el revisor"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Descripción"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notas de la versión"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Respuesta"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Solicitud de información"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -4744,7 +4924,7 @@ msgstr "Propuesta Aprobada/Páblica"
 msgid "editors_review_history_nominated_denied"
 msgstr "Propuesta denegada/�rea de pruebas"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No se han podido encontrar valoraciones anteriores."
 
@@ -4766,102 +4946,96 @@ msgstr "Denegada/�rea de pruebas"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Mostrar/Ocultar respuesta (%1$s)"
-msgstr[1] "Mostrar/Ocultar respuestas (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicaciones:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o selecciona una respuesta predeterminada:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentarios:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas operativos:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Ir al inicio"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Atención: Revisa más de un archivo sólo si has comprobado cada uno de los archivos que ha seleccionado."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "siguiente &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No se encontraron vistas previas."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; anterior"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Cola de valoración"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> de %2$s en cola"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> de %2$s en cola (filtrado)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Procesar acción"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acción"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentarios"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Fecha"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versión/Archivo"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
-msgstr "Informarme la próxima vez que este complemento se actualice. (Las actualizaciones sucesivas no generarán aviso por correo)"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Valoración procesada con éxito."
 
 #: views/editors/reviews_queue.thtml:106
 msgid "editors_reviews_action_delete_review"
-msgstr "Borrar valoración"
+msgstr "Borrar revisión"
 
 #: views/editors/reviews_queue.thtml:104
 msgid "editors_reviews_action_keep"
-msgstr "Borrar marcas; mantener valoración"
+msgstr "Borrar marcas; mantener revisión"
 
 #: views/editors/reviews_queue.thtml:102
 msgid "editors_reviews_action_skip"
@@ -4875,7 +5049,7 @@ msgstr "Acción"
 msgid "editors_reviews_in_reply_to"
 msgstr "En respuesta a:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "¡Valoraciones procesadas con éxito!"
 
@@ -4887,85 +5061,87 @@ msgstr "Actualmente no hay valoraciones que moderar."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Procesar valoraciones"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Específico del sitio"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nuevo"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Actualizado"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicación probada"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas operativos probados"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Información adicional"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Complemento"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tipo"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipos de complementos"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Antigüedad"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplicaciones"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "¿Restringir idiomas?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tiempo en la cola"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Orden ascendente"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plataformas"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Orden descendente"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipos de envíos"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s días"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutos"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Acceso denegado"
 
@@ -4973,41 +5149,34 @@ msgstr "Acceso denegado"
 msgid "error_access_denied_message"
 msgstr "No estás autorizado para ver esta página."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "¡El complemento ya existe!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "¡Complemento no encontrado!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Este complemento no está visible aquí."
 
@@ -5015,116 +5184,94 @@ msgstr "Este complemento no está visible aquí."
 msgid "error_addon_selfreview"
 msgstr "No puedes valorar tu propio complemento."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "¡No hay complementos en la categoría!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Hilo del complemento no encontrado."
+msgstr ""
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Esta dirección de correo electrónico no es válida."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Este campo no debe estar vacío."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "¡Archivo no encontrado!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Error en el archivo: %s no existe."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
-msgstr "Hay errores en este formulario. Por favor, corríjalos y vuelva a enviarlo."
+msgstr ""
+"Hay errores en este formulario. Por favor, corríjalos y vuelva a enviarlo."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Código no válido, por favor, inténtalo de nuevo"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "Esta URL tiene un formato no válido. Las URLs válidas tienen un aspecto como este http://example.com/my_page."
+msgstr ""
+"Esta URL tiene un formato no válido. Las URLs válidas tienen un aspecto como "
+"este http://example.com/my_page."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Falta un argumento: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Sin archivos"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Advertencia"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "¡Previsualización no encontrada!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Debes elegir una puntuación."
 
@@ -5132,49 +5279,38 @@ msgstr "Debes elegir una puntuación."
 msgid "error_user_already_confirmed"
 msgstr "Esta cuenta de usuario ya ha sido confirmada."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "¡Código de confirmación no válido!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Las contraseñas no coinciden."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Esta dirección de correo electrónico ya está en uso."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "El cambio de correo electrónico ha expirado. Por favor, cambiar tu dirección de correo electrónico de nuevo en tu perfil de usuario y haz clic en el enlace del correo de confirmación tan pronto como lo recibas."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Los usuarios sólo pueden tener un rol a la vez. Por favor, elimina al usuario de cualquier rol existente antes de continuar."
+msgstr ""
+"El cambio de correo electrónico ha expirado. Por favor, cambiar tu dirección "
+"de correo electrónico de nuevo en tu perfil de usuario y haz clic en el "
+"enlace del correo de confirmación tan pronto como lo recibas."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Este apodo ya está en uso."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "¡Usuario no encontrado!"
 
@@ -5182,221 +5318,210 @@ msgstr "¡Usuario no encontrado!"
 msgid "error_user_unconfirmed"
 msgstr "Por favor, confirme su cuenta de usuario primero."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "¡Nombre de usuario o contraseña incorrectos!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "¡Versión no encontrada!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "¡Se ha introducido una contraseña errónea!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Conoce más"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Conoce más acerca de %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s valoración"
 msgstr[1] "%1$s valoraciones"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Ver más de"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "Volver al complemento"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Expandir todas"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "Volver a la valoración"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Navegador de archivos :: Complementos de %2$s"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Acerca"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "PUF"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Preguntas de usuario frecuentes"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Todos los derechos reservados."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Copyright"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Créditos"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla proporciona enlaces a estas aplicaciones como muestra de cortesía, y no representa a éstas ni a ninguna información relacionada con ellas. Cualquier pregunta, queja o reclamación relativa a las aplicaciones debe dirigirse a los respectivos propietarios del software."
+msgstr ""
+"Mozilla proporciona enlaces a estas aplicaciones como muestra de cortesía, y "
+"no representa a éstas ni a ninguna información relacionada con ellas. "
+"Cualquier pregunta, queja o reclamación relativa a las aplicaciones debe "
+"dirigirse a los respectivos propietarios del software."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Ir"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Avisos legales"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Otros idiomas:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Política de privacidad"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Guardar"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Diccionario"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Diccionarios"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensión"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "extensiones"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Paquete de idioma (Complemento)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paquetes de idioma (Complemento)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Paquete de idioma (Aplicación)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paquetes de idioma (Aplicación)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor de búsqueda"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Motores de búsqueda"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "temas"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Todos los idiomas"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Volver a la página de inicio de Complementos para %1$s"
@@ -5405,81 +5530,37 @@ msgstr "Volver a la página de inicio de Complementos para %1$s"
 msgid "header_main_firefox_header"
 msgstr "Complementos para Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Complementos <em>para</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Complementos"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Complementos <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Complementos para Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Complementos <em>para</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Complementos para Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Complementos <em>para</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Complementos para Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Complementos <em>para</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Saltar al menú de otras aplicaciones"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Saltar al menú categorías"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Saltar al contenido principal"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Saltar al formulario de búsqueda"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Complementos"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Iniciar sesión"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Salir"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Mi cuenta"
 
@@ -5487,23 +5568,11 @@ msgstr "Mi cuenta"
 msgid "header_navlink_register"
 msgstr "Registrarse"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Registrarse</a> o <a href=\"%2$s\">Acceder</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Herramientas"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5511,51 +5580,37 @@ msgstr "Imagen previa de %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">Inicia sesión</a> para instalar este complemento experimental. ¿<a href=\"%2\" \"$s\">Por qué</a>?\""
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Déjame instalar este complemento experimental. <a href=\"%1$s\">¿Qué es esto?</a>"
+msgstr ""
+"<a href=\"%1$s\">Inicia sesión</a> para instalar este complemento "
+"experimental. ¿<a href=\"%2\" \"$s\">Por qué</a>?\""
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Añadir a %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Añadir %1$s a %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Descargar %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "¡Complemento no encontrado!"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista de paquetes de idioma y diccionarios."
 
@@ -5567,9 +5622,8 @@ msgstr "Descargar diccionario"
 msgid "langtools_download_langpack"
 msgstr "Descargar paquete de idioma"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Diccionarios y paquetes de idioma"
 
@@ -5581,74 +5635,36 @@ msgstr "Instalar diccionario"
 msgid "langtools_install_langpack"
 msgstr "Instalar paquete de idioma"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Diccionario"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Paquete de idioma"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Idioma"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Licencia personalizada"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licencia BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Licencia pública GNU, versión 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Licencia pública GNU, versión 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Licencia pública menor GNU Lesser, versión 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Licencia pública menor GNU Lesser, versión 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licencia MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Licencia pública Mozilla, versión 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Haz clic aquí para volver a la página principal."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Fecha"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Descargas"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nombre"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Puntuación"
@@ -5673,21 +5689,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Diccionarios y paquetes de idioma"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temas"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Encontrar complementos para otras aplicaciones"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "otros"
 
@@ -5695,29 +5717,12 @@ msgstr "otros"
 msgid "page_title_appversions"
 msgstr "Versiones de la aplicación"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Recopilador de complementos"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Preguntas frecuentes del recopilador de complementos"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Características del recopilador de complementos"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Bienvenido al recopilador de complementos"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Créditos"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Preguntas frecuentes del desarrollador"
+msgid "page_title_experimental_addons"
+msgstr "Complementos experimentales"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5737,46 +5742,53 @@ msgstr "Política de privacidad de Mozilla"
 
 #: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
-msgstr "Guía de valoración"
+msgstr "Guía de revisión"
 
 #: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
-msgstr "Sistema de valoración del área de prueba"
+msgstr "Sistema de revisión del área de prueba"
 
 #: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
 msgstr "Ayuda sobre el envío"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versiones válidas para las aplicaciones "
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Los complementos enviados a Mozilla Addons deben especificar al menos una aplicación válida, como las listadas abajo, en el archivo install.rdf. Solo son permitidas para estas aplicaciones las versiones que se detallan abajo."
+msgstr ""
+"Los complementos enviados a Mozilla Addons deben especificar al menos una "
+"aplicación válida, como las listadas abajo, en el archivo install.rdf. Solo "
+"son permitidas para estas aplicaciones las versiones que se detallan abajo."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Si tu aplicación no requiere un archivo install.rdf, debes aun así incluir uno con las propiedades requeridas tal como se especifican %s."
+msgstr ""
+"Si tu aplicación no requiere un archivo install.rdf, debes aun así incluir "
+"uno con las propiedades requeridas tal como se especifican %s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "aquí"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versiones"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Volver a la página anterior"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Página de información del área de pruebas"
 
@@ -5784,13 +5796,21 @@ msgstr "Página de información del área de pruebas"
 msgid "pagination_next_page"
 msgstr "siguiente"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Está es la página %1$s de %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "anterior"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Por favor, introduce <strong>todas las palabras</strong> que aparece, <strong>separadas por un espacio</strong>."
+msgstr ""
+"Por favor, introduce <strong>todas las palabras</strong> que aparece, "
+"<strong>separadas por un espacio</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5804,23 +5824,27 @@ msgstr "Por favor, escribe lo que oigas."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Si es difícil de comprender, puedes <a href=\"%1$s\">escuchar otra cosa</a> o <a href=\"%2$s\">cambiar a texto</a>."
+msgstr ""
+"Si es difícil de comprender, puedes <a href=\"%1$s\">escuchar otra cosa</a> "
+"o <a href=\"%2$s\">cambiar a texto</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Si es difícil de leer, puedes <a href=\"%1$s\">probar otras palabras</a> o <a href=\"%2$s\">escuchar el audio</a> en su lugar."
+msgstr ""
+"Si es difícil de leer, puedes <a href=\"%1$s\">probar otras palabras</a> o "
+"<a href=\"%2$s\">escuchar el audio</a> en su lugar."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "¿Eres humano?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "¿Qué es esto?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "¡Error al marcar esta valoración!"
 
@@ -5828,10 +5852,9 @@ msgstr "¡Error al marcar esta valoración!"
 msgid "review_flag_reason_bug_support"
 msgstr "Informe de problema en un lugar incorrecto o petición de asistencia"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
-msgstr "Informa de esta valoración (elige una razón)"
+msgstr "Informa de esta revisión (elige una razón)"
 
 #: models/reviews_moderation_flag.php:67
 msgid "review_flag_reason_language"
@@ -5845,11 +5868,12 @@ msgstr "Otro (por favor, especifícalo)"
 msgid "review_flag_reason_spam"
 msgstr "Publicidad u otro contenido no relacionado"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
-msgstr "Gracias; esta valoración ha sido marcada para su aprobación por parte de un editor."
+msgstr ""
+"Gracias; esta valoración ha sido marcada para su aprobación por parte de un "
+"editor."
 
 #: views/reviews/display.thtml:41
 msgid "review_flag_this"
@@ -5857,155 +5881,136 @@ msgstr "Informar de esta valoración"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Si esta valoración es inapropiada, incorrecta o ¿publicidad? Haz clic aquí para marcarla y que un editor la revise."
+msgstr ""
+"Si esta valoración es inapropiada, incorrecta o ¿publicidad? Haz clic aquí "
+"para marcarla y que un editor la revise."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Ten en mente estos consejos:</p><ul><li>Escribe como si estuvieras contando a un amigo tu experiencia con el complementos. Da detalles específicos y útiles, tales como qué características te gustaron más o menos, cómo de fácil es de usar, y las desventajas que tiene. Evita palabras genéricas como \"Genial\" o \"Malo\" a menos que des razones por las cuales crees esto.</li><li>Por favor, no informes de errores en las valoraciones. Tu dirección de correo no está disponible a los desarrolladores de complementos y puede que quieran contactar contigo para resolver la incidencia. Ve a la <a href=\"%1$s\">sección de asistencia</a> para descubrir dónde conseguir ayuda técnica para este complemento.</li><li>Por favor, escribe valoraciones claras, evita el lenguaje inadecuado y no publiques ninguna información personal.</li></ul><p>Lee la <a href=\"%2$s\">Guía para revisores</a> para más detalles sobre las valoraciones de usuarios.</p>"
+msgstr ""
+"<p>Ten en mente estos consejos:</p><ul><li>Escribe como si estuvieras "
+"contando a un amigo tu experiencia con el complementos. Da detalles "
+"específicos y útiles, tales como qué características te gustaron más o "
+"menos, cómo de fácil es de usar, y las desventajas que tiene. Evita palabras "
+"genéricas como \"Genial\" o \"Malo\" a menos que des razones por las cuales "
+"crees esto.</li><li>Por favor, no informes de errores en las valoraciones. "
+"Tu dirección de correo no está disponible a los desarrolladores de "
+"complementos y puede que quieran contactar contigo para resolver la "
+"incidencia. Ve a la <a href=\"%1$s\">sección de asistencia</a> para "
+"descubrir dónde conseguir ayuda técnica para este complemento.</li><li>Por "
+"favor, escribe valoraciones claras, evita el lenguaje inadecuado y no "
+"publiques ninguna información personal.</li></ul><p>Lee la <a href=\"%2$s"
+"\">Guía para revisores</a> para más detalles sobre las valoraciones de "
+"usuarios.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Valoraciones de %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Complementos destacados"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Últimos complementos"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Complementos populares"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Complementos actualizados"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Buscar"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Resultados de la búsqueda de recopilatorios"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Resultados de la búsqueda de recopilatorios"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
-msgstr "La función de búsqueda no está activa en estos momentos. Por favor, inténtalo de nuevo más tarde."
+msgstr ""
+"La función de búsqueda no está activa en estos momentos. Por favor, "
+"inténtalo de nuevo más tarde."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "todos los complementos"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "todos los recopilatorios"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "buscar complementos"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "buscar recopilatorios"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Buscar complementos"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Haz clic para escribir tu busqueda"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "dentro de"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Todos los motores de búsqueda"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Ver motores de búsqueda"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s complemento encontrado"
+msgstr[1] "%s complementos encontrados"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "No se han encontrado resultados."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Buscar complementos"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Canal de resultados de búsqueda"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultados de la búsqueda por: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Herramientas de administrador"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Herramientas para desarrolladores"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Herramientas de edición"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Bienvenido"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Bienvenido, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Diccionario"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Complementos destacados"
 
@@ -6013,7 +6018,7 @@ msgstr "Complementos destacados"
 msgid "sidebar_pitch_looking_for"
 msgstr "Estoy buscando:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Complementos más nuevos"
 
@@ -6021,34 +6026,31 @@ msgstr "Complementos más nuevos"
 msgid "sidebar_pitch_search"
 msgstr "Plugin de búsqueda"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Suscribirse a"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complementos actualizados"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s Kb"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Sin puntuar aún"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6068,35 +6070,31 @@ msgstr "Cambiar complemento"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e de %b"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e de %b, %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e de %b"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s creado"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s publicado"
@@ -6109,202 +6107,215 @@ msgstr "Cerrar"
 msgid "statistics_help_link"
 msgstr "Ayuda"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "o, elige otro complemento"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "o, elige un complemento con estadísticas públicas"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Elige un de tus complementos favoritos para ver sus estadísticas"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Elige un complemento para ver sus estadísticas"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Elige un complemento con estadísticas públicas"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Panel de estadísticas"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Ver estadísticas"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Ver esta tabla en formato CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "ninguno"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Eliminar este argumento"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupar por: Día"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupar por: Mes"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Comparar por: Semanas"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Encontrados %s al alcance"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Añadir argumento"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Añadir otro argumento a este gráfico"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ocultar el recuento total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Ver el recuento total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Determinar el recuento total en este gráfico"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver datos (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Obtener valores separados por comas para este dato"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s eventos"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Ver %s eventos"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
-msgstr "Superponer las fechas de publicación de los complementos con los argumentos"
+msgstr ""
+"Superponer las fechas de publicación de los complementos con los argumentos"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar los eventos de Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Ver los eventos de Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Superponer las fechas de publicación de Firefox sobre los argumentos"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Contraer gráfico"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir gráfico"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar gráfico"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuarios activos al día"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicación"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizado"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Descargas"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operativo"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estado del complemento"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Resumen"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versión del complemento"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplicación"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema operativo"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Estado del complemento"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Desconocido"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versión del complemento"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Aún no hay datos suficientes para mostrar este gráfico. Por favor, inténtalo de nuevo más tarde."
+msgstr ""
+"Aún no hay datos suficientes para mostrar este gráfico. Por favor, inténtalo "
+"de nuevo más tarde."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "No disponemos de datos sobre tu complemento aún. Por favor, inténtalo de nuevo en unos días."
+msgstr ""
+"No disponemos de datos sobre tu complemento aún. Por favor, inténtalo de "
+"nuevo en unos días."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Las estadísticas de los complementos están actualmente en proceso de ser actualizados. Los datos actuales pueden ser incompletos mientras nuestros scripts trabajan para actualizar esta información. Por favor, inténtalo de nuevo en unos minutos."
+msgstr ""
+"Las estadísticas de los complementos están actualmente en proceso de ser "
+"actualizados. Los datos actuales pueden ser incompletos mientras nuestros "
+"scripts trabajan para actualizar esta información. Por favor, inténtalo de "
+"nuevo en unos minutos."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "En panel de estadísticas está desactivado en estos momentos. Por favor, inténtalo más tarde."
+msgstr ""
+"En panel de estadísticas está desactivado en estos momentos. Por favor, "
+"inténtalo más tarde."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
-msgstr "Se requiere el uso de JavaScript para ver los gráficos del panel de estadísticas."
+msgstr ""
+"Se requiere el uso de JavaScript para ver los gráficos del panel de "
+"estadísticas."
 
 #: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
@@ -6313,7 +6324,7 @@ msgstr "¡Se han actualizado tus preferencias!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Panel de estadísticas"
 
@@ -6341,103 +6352,109 @@ msgstr "Reducir"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Reducir un mes"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resumen diario con estadísticas para %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Canal RSS con datos de resumen"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e de %B de %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Estadísticas para %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Por defecto, solo tú y Mozilla pueden acceder a la información en tu panel de control. Puedes mostrarlo de forma pública para que todo el mundo pueda ver los datos e tu complemento."
+msgstr ""
+"Por defecto, solo tú y Mozilla pueden acceder a la información en tu panel "
+"de control. Puedes mostrarlo de forma pública para que todo el mundo pueda "
+"ver los datos e tu complemento."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Acceso al panel"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privado"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Solo Mozilla y tú pueden ver las estadísticas de este complemento"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Público"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Cualquiera puede ver las estadísticas de este complemento"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Cambiar preferencias"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor, tratar esta información como confidencial."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este panel actualmente es <strong>privado</strong>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Este panel actualmente es <strong>public</strong>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Volver al panel de control"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Guardar preferencias"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Preferencias del panel de estadísticas de %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Est."
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Desc."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Media de descargas diarias"
 
@@ -6445,46 +6462,37 @@ msgstr "Media de descargas diarias"
 msgid "statistics_summary_downloads_heading"
 msgstr "Descargas"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Conteo del último día"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Descargas en los últimos 7 días"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Descargas totales"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Desde %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Sin datos aún"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Media de usuarios activos al día"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Cambio desde el conteo previo"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s el %2$s"
@@ -6493,144 +6501,152 @@ msgstr "%1$s el %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Usuarios activos al día"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Usuarios activos al día"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "El %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Media de usuarios diaria en esta semana"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s desde la última semana"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Estadísticas para %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Todos los temas"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Ver temas"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Cambiar correo electrónico"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Cambiar contraseña"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Cambiar la contraseña o el correo electrónico"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "¡El código de confirmación se volvió a enviar!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Tu cuenta de usuario %1$s se ha borrado con éxito. Si algún día quieres regresar, puedes volverte a registrar en la <a href=\"%2$s\">página de registro de usuario</a>."
+msgstr ""
+"Tu cuenta de usuario %1$s se ha borrado con éxito. Si algún día quieres "
+"regresar, puedes volverte a registrar en la <a href=\"%2$s\">página de "
+"registro de usuario</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "La comunidad de Mozilla se entristece de tenerte que decir adiós."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirmar contraseña"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Borrar mi cuenta de usuario ahora"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "No puedes borrar tu cuenta si eres el <a href=\"%1$s\">autor de algún complemento</a>. Para borrar tu cuenta, por favor, pide a otra persona de tu grupo de desarrolladores que te elimine de la lista de autores de tus complementos. Una vez hecho eso, serás capaz de borrar tu cuenta desde aquí."
+msgstr ""
+"No puedes borrar tu cuenta si eres el <a href=\"%1$s\">autor de algún "
+"complemento</a>. Para borrar tu cuenta, por favor, pide a otra persona de tu "
+"grupo de desarrolladores que te elimine de la lista de autores de tus "
+"complementos. Una vez hecho eso, serás capaz de borrar tu cuenta desde aquí."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
-msgstr "Si tienes alguna otra pregunta, por favor, contacta en %1$s para recibir asistencia."
+msgstr ""
+"Si tienes alguna otra pregunta, por favor, contacta en %1$s para recibir "
+"asistencia."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Es necesario que marques la casilla \"Comprendo...\" antes de que podamos borrar tu cuenta."
+msgstr ""
+"Es necesario que marques la casilla \"Comprendo...\" antes de que podamos "
+"borrar tu cuenta."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
-msgstr "Por favor, introduce tu contraseña correctamente para poder completar este paso."
+msgstr ""
+"Por favor, introduce tu contraseña correctamente para poder completar este "
+"paso."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Ha ocurrido un error no esperado al borrar tu cuenta de usuario. Por favor, escribe a %1$s comentando el problema y borraremos la cuenta por ti. Te pedimos disculpas por los inconvenientes."
+msgstr ""
+"Ha ocurrido un error no esperado al borrar tu cuenta de usuario. Por favor, "
+"escribe a %1$s comentando el problema y borraremos la cuenta por ti. Te "
+"pedimos disculpas por los inconvenientes."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmar el borrado de cuenta"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Borrar la cuenta de usuario %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "¡Hasta luego!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "No podrás ingresar como usuario en Mozilla Addons nunca más."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Al hacer clic en \"borrar\", tu cuenta se <strong>borrara de forma permanente</strong>. Lo que significa que:"
+msgstr ""
+"Al hacer clic en \"borrar\", tu cuenta se <strong>borrara de forma "
+"permanente</strong>. Lo que significa que:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Tus valoraciones y puntuaciones no se borrarán, pero no estarán nunca más asociadas a ti."
+msgstr ""
+"Tus valoraciones y puntuaciones no se borrarán, pero no estarán nunca más "
+"asociadas a ti."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Si tienes algún problema específico en el que te podamos ayudar, por favor, no borres aún la cuenta y contacta con nosotros en %1$s , trataremos de ayudarte lo mejor posible para solucionarlo."
+msgstr ""
+"Si tienes algún problema específico en el que te podamos ayudar, por favor, "
+"no borres aún la cuenta y contacta con nosotros en %1$s , trataremos de "
+"ayudarte lo mejor posible para solucionarlo."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Comprendo que este paso no se puede deshacer."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Usuario borrado"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Se ha enviado un correo electrónico a %1$s para confirmar tu nueva dirección. Para que este cambio surta efecto, necesitas hacer clic en el enlace que se proporciona en este correo. Hasta entonces, puedes seguir ingresando con tu dirección de correo electrónico actual."
+msgstr ""
+"Se ha enviado un correo electrónico a %1$s para confirmar tu nueva "
+"dirección. Para que este cambio surta efecto, necesitas hacer clic en el "
+"enlace que se proporciona en este correo. Hasta entonces, puedes seguir "
+"ingresando con tu dirección de correo electrónico actual."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Borrar la cuenta de usuario"
 
@@ -6643,27 +6659,35 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Bienvenido a %2$s Addons.\n"
 "\n"
-"Antes de que puedas usar su nueva cuenta, debes activarla - esto permite asegurarnos que la dirección de correo que usaste es válida y te pertenece.\n"
-"Para activar tu cuenta, haz clic en el enlace de abajo o copia y pega la dirección en la barra de direcciones de tu navegador:\n"
+"Antes de que puedas usar su nueva cuenta, debes activarla - esto permite "
+"asegurarnos que la dirección de correo que usaste es válida y te pertenece.\n"
+"Para activar tu cuenta, haz clic en el enlace de abajo o copia y pega la "
+"dirección en la barra de direcciones de tu navegador:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Una vez que hayas activado satisfactoriamente tu cuenta, puedes borrar este correo.\n"
+"Una vez que hayas activado satisfactoriamente tu cuenta, puedes borrar este "
+"correo.\n"
 "\n"
 "Gracias por unirte a %2$s Addons\n"
 "-- El Equipo de %2$s Addons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Has solicitado cambiar tu dirección de correo electrónico en %2$s Addons.\n"
 "\n"
-"Para poder confirmar tu nueva dirección, por favor, haz clic en el enlace a continuación o copia y pega la dirección completa en la barra de direcciones de tu navegador:\n"
+"Para poder confirmar tu nueva dirección, por favor, haz clic en el enlace a "
+"continuación o copia y pega la dirección completa en la barra de direcciones "
+"de tu navegador:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Dispones de 48 horas para confirmar la nueva dirección. Si ya no deseas cambiar de dirección, simplemente ignora este correo.\n"
+"Dispones de 48 horas para confirmar la nueva dirección. Si ya no deseas "
+"cambiar de dirección, simplemente ignora este correo.\n"
 "\n"
 "¡Gracias!\n"
 "-- El equipo de %2$s Addons"
@@ -6681,7 +6705,9 @@ msgid "user_email_pwreset"
 msgstr ""
 "Reinicio de contraseña de Mozilla Addons\n"
 "\n"
-"Se ha recibido una solicitud para reiniciar la contraseña de esta cuenta en addons.mozilla.org. Para cambiar esta cuenta, por favor pulse en el siguiente enlace, o copialo en la barra de direcciones de su navegador:\n"
+"Se ha recibido una solicitud para reiniciar la contraseña de esta cuenta en "
+"addons.mozilla.org. Para cambiar esta cuenta, por favor pulse en el "
+"siguiente enlace, o copialo en la barra de direcciones de su navegador:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6690,115 +6716,92 @@ msgstr ""
 "Gracias,\n"
 "-- El personal de Mozilla Addons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reiniciar su contraseña de Mozilla Addons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "¡Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
-msgstr "Por favor, confirma el cambio de tu dirección de correo electrónico en %1$s Addons"
+msgstr ""
+"Por favor, confirma el cambio de tu dirección de correo electrónico en %1$s "
+"Addons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "¡Correcto!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Tu dirección de correo electrónico se ha cambiado con éxito. A partir de ahora, por favor, usa %1$s para ingresar."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Acerca de mí"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "¡Preséntate a ti mismo a la comunidad, si quieres! Este texto aparecerá de forma pública en tu página de información de usuario. Los saltos de línea se mantendrán, pero el código HTML no está permitido."
+msgstr ""
+"Tu dirección de correo electrónico se ha cambiado con éxito. A partir de "
+"ahora, por favor, usa %1$s para ingresar."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirmar contraseña"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Mostrar los recopilatorios que he creado en mi perfil de usuario"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Mostrar mis recopilatorios favoritos en mi perfil de usuario"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Editar perfil del usuario %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Dirección de correo electrónico"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Nombre"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ocultar dirección de correo electrónico"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Dirección del sitio web"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Apellidos"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Código de usuario"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nueva contraseña"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Apodo"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Contraseña antigua"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Otras acciones"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Contraseña"
 
@@ -6806,60 +6809,67 @@ msgstr "Contraseña"
 msgid "user_form_registration"
 msgstr "Registro de nuevo usuario"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Recuérdame en este equipo"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "¿Ver el área de pruebas?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Guardar"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Entrar"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registrarse"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s complementos del usuario"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Crear una nueva cuenta de usuario"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilidad del complemento (altamente recomendado)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Próximos eventos y concursos"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Actualmente no tienes avisos disponibles para configurar."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "De vez en cuando, Mozilla puede enviarte un correo electrónico sobre próximas publicaciones y eventos sobre complementos. Por favor, selecciona debajo los temas en los que estás interesados:"
+msgstr ""
+"De vez en cuando, Mozilla puede enviarte un correo electrónico sobre "
+"próximas publicaciones y eventos sobre complementos. Por favor, selecciona "
+"debajo los temas en los que estás interesados:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla se reserva el derecho de contactar contigo individualmente sobre temas específicos de los complementos que hayas alojado."
+msgstr ""
+"Mozilla se reserva el derecho de contactar contigo individualmente sobre "
+"temas específicos de los complementos que hayas alojado."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Hay errores en los cambios que ha hecho. Por favor, corrígelos y vuelva a enviarlos..."
+msgstr ""
+"Hay errores en los cambios que ha hecho. Por favor, corrígelos y vuelva a "
+"enviarlos..."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Perfil actualizado."
 
@@ -6872,15 +6882,17 @@ msgstr "Reiniciar contraseña de %s"
 msgid "user_pwreset_header"
 msgstr "Reiniciar contraseña"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "¿Ha olvidado su contraseña?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
-msgstr "El enlace de reinicio de contraseña se ha enviado a su dirección de correo electrónico."
+msgstr ""
+"El enlace de reinicio de contraseña se ha enviado a su dirección de correo "
+"electrónico."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Contraseña reiniciada con éxito."
 
@@ -6892,7 +6904,7 @@ msgstr "Confirmar cambio de contraseña"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Enviar enlace para reiniciar contraseña"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Addons"
@@ -6901,59 +6913,52 @@ msgstr "%s Addons"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Un enlace para activar tu cuenta de usuario ha sido enviado a tu cuenta de correo %1$s. Debes hacer clic en él antes de que puedas entrar en %2$s Addons."
+msgstr ""
+"Un enlace para activar tu cuenta de usuario ha sido enviado a tu cuenta de "
+"correo %1$s. Debes hacer clic en él antes de que puedas entrar en %2$s "
+"Addons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Se ha enviado un correo a tu dirección %1$s para confirmar tu cuenta. Antes de que puedas entrar, debes activar tu cuenta haciendo clic en el enlace que hay en dicho correo."
+msgstr ""
+"Se ha enviado un correo a tu dirección %1$s para confirmar tu cuenta. Antes "
+"de que puedas entrar, debes activar tu cuenta haciendo clic en el enlace que "
+"hay en dicho correo."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "reenviar el mensaje de confirmación"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "¡Enhorabuena! Tu cuenta de usuario se ha creado con éxito."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>El registro en AMO <strong>no es obligatorio</strong> si solo quieres descargar e instalar complementos públicos.</p><p>Solo necesitas registrarte si:</p><ul><li>Quieres enviar valoraciones de los complementos</li><li>Eres desarrollador de complementos y quieres subir y alojarlos en AMO</li></ul><p>Una vez completes con éxito el registro, se te enviará un correo de confirmación a la dirección que hayas proporcionado. Por favor, sigue las instrucciones que se detallan para validar tu cuenta.</p><p>Si lo deseas, puedes leer nuestros <a href='%1$s' title='Avisos legales'>Avisos legales</a> y la <a href='%2$s' title='Política de privacidad'>Política de privacidad</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Si no recibes el correo de confirmación, asegúrate que tu proveedor de correo no lo marque como  \"correo basura\" o \"spam\". Si lo necesitas, podemos enviarte el %1$s a la dirección de correo electrónico mencionada."
+msgstr ""
+"Si no recibes el correo de confirmación, asegúrate que tu proveedor de "
+"correo no lo marque como  \"correo basura\" o \"spam\". Si lo necesitas, "
+"podemos enviarte el %1$s a la dirección de correo electrónico mencionada."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "¡Gracias por registrarte y bienvenido a %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "¡Bienvenido a addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Se requiere un nombre, apellido o nick."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Recopilatorios"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Avisos"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Perfil de usuario"
 
@@ -6961,64 +6966,50 @@ msgstr "Perfil de usuario"
 msgid "user_verified_okay"
 msgstr "¡Verificado con éxito!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Borrar la cuenta de usuario"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Edición de cuenta de usuario"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Acerca de mí"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Complementos de %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nombre"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Perfil del autor"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Recopilatorios de %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Dirección de correo"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Recopilatorios favoritos"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Página web"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Apodo"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Información del usuario %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Valoraciones de %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Inicio de sesión de usuario"
 
@@ -7027,513 +7018,28 @@ msgstr "Inicio de sesión de usuario"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "El complemento que estás buscando se encuentra actualmente en el área de pruebas. Si tienes una cuenta de usuario en Mozilla Addons, por favor inicia sesión, o <a href=\"%1$s\">descubre más sobre el área de pruebas.</a>"
+msgstr ""
+"El complemento que estás buscando se encuentra actualmente en el área de "
+"pruebas. Si tienes una cuenta de usuario en Mozilla Addons, por favor inicia "
+"sesión, o <a href=\"%1$s\">descubre más sobre el área de pruebas.</a>"
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "La página que estas buscando es parte del área de pruebas. Si tienes una cuenta de usuario en Mozilla Addons, por favor inicia sesión, o <a href=\"%1$s\">descubre más sobre el área de pruebas.</a>"
+msgstr ""
+"La página que estas buscando es parte del área de pruebas. Si tienes una "
+"cuenta de usuario en Mozilla Addons, por favor inicia sesión, o <a href=\"%1"
+"$s\">descubre más sobre el área de pruebas.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Reinicio de contraseña de usuario"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registro de nuevo usuario"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licencia del código fuente para %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Ver todos los añadidos recientemente"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Ver todos los más descargados"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Ver todos los mejor valorados"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Siguiente complemento"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Complemento previo"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "La versión más reciente compatible con"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Historial completo de la versión"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Nuevos:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Más populares:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Recomendamos:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Actualizados recientemente:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "Ver todos"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Ver todos los complementos recomendados"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Los mejor puntuados primero"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Los actualizados recientemente primero"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Los más populares primero"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Esta versión de tu complemento no es compatible con Firefox %1$s. Mozilla "
-#~ "tiene planeado publicar la próxima versión de Firefox pronto, así que, "
-#~ "por favor, prueba tu complemento en la nueva versión y actualiza la "
-#~ "información de compatibilidad. Puedes informarte más sobre ello <a href="
-#~ "\"%2$s\">aquí</a>. Esto es simplemente un aviso, puedes continuar y "
-#~ "enviar esta versión a addons.mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Complemento desactivado con éxito"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Editar complemento"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Complemento activado con éxito"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Descripción del complemento"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "CLUF"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Página web del complemento"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nombre del complemento"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Política de privacidad"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Resumen del complemento"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Correo de asistencia"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Web de asistencia"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Notas de la versión"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Proponer el complemento"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "¡Complemento propuesto con éxito!"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Varías valoraciones del complemente por usuarios (deberían ser "
-#~ "valoraciones externas)."
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visita la página de %1$s para hacer cambios a tu envío, o %2$s para "
-#~ "volver a las Herramientas del desarrollador."
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "haz clic aquí"
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Editar complemento"
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Esta versión ha sido colocada en el área de pruebas esperando "
-#~ "valoraciones por parte de los voluntarios y de un editor de Mozilla "
-#~ "Addons. Se te notificará por correo electrónico cualquier acción que se "
-#~ "tome."
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Puedes leer más sobre el sistema de valoración del área de pruebas %s."
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "aquí"
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Esta versión ha sido colocada en el área de pruebas para su uso por "
-#~ "usuarios expertos. Para que sea mostrado en el área pública, debes %s tu "
-#~ "complemento y someterte a un proceso de valoración."
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "proponer"
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "El envío de tu complemento se ha completado con éxito."
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Como tu complemento es de confianza, esta versión ha sido aprobada "
-#~ "automáticamente para aparecer en el área pública."
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Enviar un complemento"
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Complemento actualizado con éxito"
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Quizá desees %s para aumentar el interés en tu complemento."
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "subir una vista previa"
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Autor no encontrado [%s]"
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Eliminar"
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancelar"
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "¿Estás seguro que quieres cancelar tu envío?"
-#~ msgid "devcp_button_next"
-#~ msgstr "Siguiente"
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Cambiar el tipo de complemento:"
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Actualizados los comentarios del desarrollador."
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Añadir captura"
-#~ msgid "devcp_details_author"
-#~ msgstr "Autor"
-#~ msgid "devcp_details_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Ninguno"
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categorías"
-#~ msgid "devcp_details_category"
-#~ msgstr "Categoría"
-#~ msgid "devcp_details_description"
-#~ msgstr "Descripción"
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Desactivado"
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detalles"
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Comentarios del desarrollador"
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Vistas previas"
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versiones"
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Página web"
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Ninguna"
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Sin capturas"
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "No se encontraron capturas."
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Correo de asistencia"
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "El desarrollador no proporcionó ningún correo de asistencia."
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Web de asistencia"
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "El desarrollador no proporcionó ninguna web de asistencia."
-#~ msgid "devcp_details_trusted"
-#~ msgstr "De confianza"
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "No se encontraron versiones."
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancelar y volver atrás"
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Sí, desactivarlo"
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "¿Estás seguro de querer desactivar este complemento?"
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Al desactivar este complemento lo ocultarás de las búsquedas y los "
-#~ "listados. No se podrá descargar desde la web y no enviará avisos de "
-#~ "actualización a los clientes. El complemento será borrado, aunque podrás "
-#~ "volver aquí para reactivarlo si lo deseas."
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Desactivar %s"
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Sí, activarlo"
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "¿Estás seguro de querer activar este complemento?"
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Al activar este complemento, este aparecerá de nuevo en las búsquedas y "
-#~ "en los listados. Se podrá descargar tanto desde la web como mediante los "
-#~ "avisos de actualización de los clientes."
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Activar %s"
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Añadir autor"
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Correo electrónico del autor"
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Eliminar"
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "No hay categorías disponibles para este tipo de complemento."
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Transferencia incompleta"
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No se han enviado archivos"
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Excede el tamaño máximo de subida"
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Añadir icono"
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Cambiar icono"
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permitir a los usuarios ver los archivos fuente en línea"
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categorías"
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Idioma por defecto"
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Solo eliminar el icono actual"
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Nuevo archivo de icono"
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icono"
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "breve información adicional (como el nombre del dialecto local)"
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nombre "
-#~ "sencillo del idioma</a>, tal como 'en-US'"
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Los archivos marcados serán eliminados"
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Archivos"
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Aplicaciones destino"
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Sin archivos."
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notas para el revisor"
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Las descripciones están limitadas a un máximo de 250 caracteres.\n"
-#~ "(Introdujiste %s)"
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "El nombre de tu complemento ya existe en la base de datos. Por favor, "
-#~ "asegúrese que: <br /><li>Sus GUIDs coinciden. La causa más común de esto "
-#~ "son unas GUIDs erróneas.</li><li>No tienes una entrada duplicada en la "
-#~ "base de datos. Si es así, debes actualizar dicha entrada o eliminarla y "
-#~ "probar de nuevo.</li>"
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr ""
-#~ "Por favor, describa los cambios realizados en esta actualización del "
-#~ "complemento."
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "No concuerdan todas las GUIDs de los archivos"
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Una versión idéntica (%s) ya existe para este complemento y plataforma."
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Debes proporcionar los datos requeridos para la propuesta"
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "No puedes proponer complementos en fase beta."
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Solo puedes proponer complementos que estén actualmente en el área de "
-#~ "pruebas."
-#~ msgid "devcp_error_saving"
-#~ msgstr "Ocurrió un error mientras se intentaban salvar tus datos."
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "No tienes permisos para actualizar este complemento."
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Añadir otro archivo de plataforma"
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Añadir autor"
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Eliminar"
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Las categorías para tu nuevo complemento estarán disponibles en el "
-#~ "próximo paso."
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "No hay categoría disponibles para este tipo de complemento."
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Por favor, introduzca una descripción para su complemento."
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Por favor, introduzca el nombre de su complemento."
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Por favor, seleccione el tipo de complemento que está enviando."
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Por favor,  introduzca una descripción para su complemento."
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Archivo del complemento"
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Archivo del complemento 2"
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Archivo del complemento 3"
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tipo de complemento"
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permitir a los usuarios ver los archivos fuente en línea"
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Correo electrónico del autor"
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categorías"
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Idioma por defecto"
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Descripción"
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Contrato de Licencia para el Usuario Final (CLUF)"
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Este complemento requiere programas externos"
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Archivos"
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Página web"
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Archivo de icono"
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nombre"
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plataformas admitidas"
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Esta es una versión previa"
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Política de privacidad"
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Este complemento es específico para una página web"
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Descripción"
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Correo de ayuda"
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Web de asistencia"
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Aplicaciones destino"
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versión"
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Notas de las versión"
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Ninguna"
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notas para el revisor"
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Como tu complemento es confiable, por favor, elija donde debe ir esta "
-#~ "versión:"
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "�rea pública"
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "�rea de pruebas"
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Acuerdo del desarrollador"
-#~ msgid "devcp_header_step1"
-#~ msgstr "Paso 1"
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Subir archivo"
-#~ msgid "devcp_header_step2"
-#~ msgstr "Paso 2"
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detalles del complemento"
-#~ msgid "devcp_header_step3"
-#~ msgstr "Paso 3"
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Detalles de la versión"
-#~ msgid "devcp_header_step4"
-#~ msgstr "Paso 4"
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localización"
-#~ msgid "devcp_header_step5"
-#~ msgstr "Paso 5"
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Éxito"
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Mis complementos"
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Volver a los detalles del complemento"
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Detectar automáticamente el tipo de complemento: %s."
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "El idioma por defecto de este complemento (%1$s [%2$s]) es distinto de su "
-#~ "idioma por defecto (%3$s [%4$s]). Los campos abajo deberían ser "
-#~ "completados en %1$s."
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "¿Incorrecto?"
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "¿Estás seguro de borrar este archivo?"
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Saltar la valoración de la información actual de mi complemento"
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Los envíos de complementos están actualmente deshabilitados. Por favor, "
-#~ "vuelva a intentarlo más tarde."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Aceptar"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Rechazar"
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Este complemento ha sido desactivado por un administrador."
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Desactivado"
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "De confianza"
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "No tienes ningún complemento. Haz clic %s para enviar uno."
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "aquí"
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Por favor, asegúrese de %s para su tema."
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "subir una vista previa"
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Editar versión"
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versión actualizada con éxito."
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nuevo"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Actualizado"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Edad del complemento"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tipos de complementos"
-#~ msgid "editors_th_age"
-#~ msgstr "Antigüedad"
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplicaciones"
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plataformas"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Tipos de envíos"
-#~ msgid "error_notice"
-#~ msgstr "Advertencia"
-#~ msgid "forum_save"
-#~ msgstr "Guardar"
-#~ msgid "home"
-#~ msgstr "Inicio"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Complementos experimentales"
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Volver a la página anterior"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Está es la página %1$s de %2$s"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s complemento encontrado"
-#~ msgstr[1] "%s complementos encontrados"
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Canal RSS con datos de resumen"
-
diff --git a/site/app/locale/eu/LC_MESSAGES/messages.po b/site/app/locale/eu/LC_MESSAGES/messages.po
index c8760f7..c852454 100644
--- a/site/app/locale/eu/LC_MESSAGES/messages.po
+++ b/site/app/locale/eu/LC_MESSAGES/messages.po
@@ -19,173 +19,164 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.0.1\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Utzi instalazioa"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Deskargatu orain %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Onartu eta deskargatu"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Onartu eta instalatu"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Publikoa"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Probagunea"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "%s(e)an eguneratua"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Azken bertsioa"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "deskarga"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "deskarga guztira"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "deskarga astero"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "Gehigarri %1$s"
 msgstr[1] "%1$s gehigarri"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "orriko"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordenatu:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "esperimentala"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "aholkatua"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ez dago eskuragarri %2$serako."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Itzuli %1$s(e)ra..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Itzuli berrikuspenetara..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Balorazioa:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Berrikuspena:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Bidali berrikuspena"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Gehitu berrikuspena %s(r)i"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Izenburua/laburpena:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Ezabatu"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Erantzun"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Ziur berrikuspen hau ezabatu nahi duzula?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Ez"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Bai"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Ezabatu berrikuspena"
 
@@ -194,7 +185,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Berrikuspena guztiz ezabatu da."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editatu %s(r)en berrikuspena"
@@ -209,19 +200,19 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Oharra: zure berrikuspena gune publikoan erakutsi aurretik editore batek "
 "moderatuko du."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Hona erantzun garatzaileari:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -240,32 +231,47 @@ msgstr "%s(r)en berrikuspenak"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s(r)en erantzuna %2$sn"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Garatzailearen erantzuna:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Berrikuspena behar bezala gorde da. Milesker!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "%1$s(e)k %2$s(e)an"
 
 # %1 is the (localized) date, y is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "%1$s(e)k %2$sn (balorazioa: %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Bertsio honetara lotura iraunkorra"
@@ -274,29 +280,28 @@ msgstr "Bertsio honetara lotura iraunkorra"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Joan"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Ikusi egilearen profila"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Arakatu %s"
@@ -305,115 +310,63 @@ msgstr "Arakatu %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Gehitu berrikuspena"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Xehetasun aurreratuak"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategoriak"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "berrikuspen xehea"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Ez dut gogoko"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editatu berrikuspena"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Gehigarri honek pribatutasun politika du."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Gorroto dut"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Garatzailearen Iruzkinak"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Webgunea"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Berrikuspenak"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Laguntza"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gogoko dut"
 
@@ -421,26 +374,22 @@ msgstr "Gogoko dut"
 msgid "addons_display_long_description"
 msgstr "Azalpen luzea"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Maite dut"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Irudi gehiago"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -450,14 +399,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -471,7 +420,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -485,7 +434,7 @@ msgstr ""
 "upcoming version."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -497,15 +446,16 @@ msgstr ""
 "post a review, they will not be able to contact you to ask for more details "
 "or let you know if the bug has been fixed in an upcoming version."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Puntuatu"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Oso gogoko dut"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -515,49 +465,53 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Gorde"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Ikusi %1$s(e)rako gehigarri guztiak"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ikusi berrikuspen guztiak (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Ikusi bertsio guztiak"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Bertsioen historia osoa"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ikusi iturburua"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ikusi estatistikak"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Zer deritzozu?"
 
@@ -565,226 +519,108 @@ msgstr "Zer deritzozu?"
 msgid "addons_display_workswith"
 msgstr "Honekin dabil:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "Egilea:"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Gure gomendioak"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Gehigarriek %1$s hedatzen dute, zure nabigazio esperientzia pertsonaliza "
 "dezazun. Begirada bat eman eta %1$s zure egin."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Berriena:"
 
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Beste aplikazioak"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s(e)rako gehigarriak"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Arrakastatsuenak:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Gure gomendioak:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Eguneratu berria:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Ikusi guztiak"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Ikusi sortu berri diren gehigarriak"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Ikusi gehigarri arrakastatsu guztiak"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Ikusi gomendatutako gehigarri guztiak"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Ikusi eguneratu berri diren gehigarriak"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -792,12 +628,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Egin eskuin-klika azpiko loturan eta aukeratu \"Gorde Lotura "
@@ -806,42 +642,39 @@ msgstr ""
 "li><li>Egin klik instalatu botoian eta bilatu/aukeratu deskargatutako "
 "fitxategia eta egin klik \"Ados\" botoian.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Thunderbirden nola instalatu"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "erakutsi probarako gehigarriak"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Joan"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Garatzailea"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linuxerako"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS Xrako"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windowserako"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -849,11 +682,11 @@ msgstr ""
 "ditu. Mozillan oinarritutako nabigatzaileentzat eskuragarri dauden plugin "
 "gehiagori buruzko argibideak jasotzeko jo %1$s(e)ra."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Hemen ez dagoen plugin baten bila?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Pluginek nabigatzaileari funtzio konkretuak burutzen laguntzen diote, hala "
@@ -863,24 +696,24 @@ msgstr ""
 "baitiote."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s(r)en plugin ohikoenak"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Pluginak"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Laguntza-dokumentazioa: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -889,42 +722,37 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s(r)en aurrebista"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Ehundaka gehigarri erabilgarrirekin guztiontzat dago zerbait. Hasteko hemen "
 "duzu gehien erabiltzen direnen zerrenda bat. Gozatu!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Gomendatutako gehigarriak"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Gomendatutako gehigarriak"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Baliabide gehigarriak"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozillaren garapengunea"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Barkatu, Mozillan oinarritutako nabigatzaile bat behar duzu bilaketa "
@@ -941,48 +769,47 @@ msgstr ""
 # %2 is mozdev link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Ikasi nola %1$s %2$s-(e)n."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "egin zuk zeuk"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Arakatu bilaketa-motor gehiago %1$s(e)n"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Bilaketa-motorrak"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Esker bereziak Mycroft Proiektuari Firefoxen Bilaketa-motorretan egindako "
 "lanagatik."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1027,19 +854,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1050,38 +877,26 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Gehiago gehigarri honi buruz"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Kontuz ibili bertsio zaharrekin"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Bertsio hauek erreferentzia eta egiaztatze helburuetarako bistaratzen dira. "
 "Gehigarri baten azken bertsioa erabili beharko zenuke beti."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Bertsioaren historia aldaketen egunkariarekin"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Bertsioaren historia"
@@ -1116,124 +931,112 @@ msgstr "Taldeko kudeatzailea"
 msgid "admin_group_saved"
 msgstr "Taldea gorde da"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Aurreratua"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Edonoiz"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Edozein"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Edozein"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplikazioa"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Bilatutako hitzak"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Azken eguneraketa"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Izena"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Berriena"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Orain 3 hilabete"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Orain 6 hilabete"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Azken egunean"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Azken hilean"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Azken astean"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Azken urtean"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Orriko"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Plataforma"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Arrakasta"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Puntuaketa"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordena"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "(e)tik honaino:"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Bistaratu/ezkutatu bilaketa aurreratua"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Mota"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "Bertsioa:"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Baztertu bertsio kontrola"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Gehigarri hau Firefoxen bertsio zaharragoetarako da"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1241,347 +1044,45 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Baliteke <a href=\"%1$s\">bertsio zaharrago bat</a>ek funtzionatzea"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Eguneratu Firefox</a> gehigarri hau "
 "erabiltzeko"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1591,863 +1092,48 @@ msgid "categories_current_title"
 msgstr "Uneko kategoria"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategoriak"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Hautatu kategoria bat"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Ikusi gomendatutako kategoriak"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Puntuaketa onenekoak aurrena"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Azken eguneraketak lehenengo"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Gogokoenak lehenengo"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Ikusi %1$s guztiak"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2455,71 +1141,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2528,26 +1214,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2555,108 +1241,108 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Laguntza-informazioa jasotzeko ikusi gure %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki orria"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozillak eskerrak eman nahi dizkie ondorengoei addons.mozilla.org "
 "proiektuari urteotan emandako laguntzagatik:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Garatzaileak"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editoreak"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Itzultzaileak"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Beste laguntzaileak"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Lehengo garatzaileak"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 #, fuzzy
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 #, fuzzy
 msgid "credits_software_famfamfam"
 msgstr ""
@@ -2665,7 +1351,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2678,20 +1364,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Y(e)ko %Bren %ea"
 
@@ -2727,25 +1410,25 @@ msgstr "Estatistiken arbela"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2754,6 +1437,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(automatikoki atzeman)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Zure gehigarriaren bertsio hau ez da Firefox %1$s(r)ekin bateragarria. "
+"Mozillak Firefoxen hurrengo bertsioa laster kaleratzeko asmoa du, beraz, "
+"probatu zure gehigarria bertsio berrian eta eguneratu bateragarritasun "
+"informazioa. Honi buruz gehiago irakur dezakezu <a href=\\\"%2$s\\\">hemen</"
+"a>. Honako hau jakinarazpen bat baino ez da, eta bertsio hau addons.mozilla."
+"org(e)ra bidaltzen jarrai dezakezu."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Leiho berrian irekiko da"
@@ -2790,76 +1486,141 @@ msgstr "5. urratsa: eginda"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Bidaltzeko laguntza"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Gehigarria arrakastaz ezgaitu da"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Editatu gehigarria"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Gehigarria arrakastaz gaitu da"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Gehigarriaren azalpena"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "AELK"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Gehigarriaren webgunea"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Gehigarriaren izena"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Aurrebistaren izenburua"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Pribatutasun-politika"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Gehigarriaren laburpena"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Sostengurako Eposta"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Sostengurako URLa"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Bertsio-oharrak"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Proposatu gehigarria"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Gehigarria arrakastaz proposatu da!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2895,7 +1656,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2905,6 +1666,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2916,13 +1682,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2932,7 +1698,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2942,12 +1708,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2956,14 +1722,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3042,13 +1808,128 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"%1$s orrira zure bidalketan aldaketak burutzeko edo %2$s orrira "
+"Garatzailearen tresnetara itzultzeko."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "egin klik hemen"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Editatu gehigarria"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Bertsio hau probagunera bidali da bertako probatzaileek eta Mozillako "
+"editore batek berrikusteko. Berrikusketa burutzean posta elektronikoz "
+"jakinaraziko zaizu."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Probaguneko berrikusketa sistemari buruz gehiago irakur dezakezu %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "hemen"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Bertsio hau probagunera bidali da esperientziadun erabiltzaileek erabil "
+"dezaten. Gune publikoan argitaratzea nahi baduzu, zure gehigarria %s beharko "
+"duzu eta berrikusketa prozesua burutu."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "proposatu"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Zure gehigarriaren bidalketa ondo burutu da."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Zure gehigarriak konfiantza duenez, bertsio hau automatikoki onartu da gune "
+"publikorako."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Bidali gehigarria"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Gehigarria ondo eguneratu da"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Agian %s nahiko duzu zure gehigarriaganako interesa gehitzeko."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "igo aurrebista"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Ez da egilerik aurkitu [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Ezabatu"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Utzi"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Ziur zaude bidalketa utzi nahi duzula?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Hurrengoa"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Aldatu gehigarri mota:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Garatzailearen iruzkinak eguneratu dira."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3125,37 +2006,179 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Gehitu aurrebista"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Egilea"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Egileak"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Bat ere ez"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategoriak"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Azalpena"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Ezgaituta"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Xehetasunak"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Garatzailearen iruzkinak"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Aurrebistak"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Bertsioak"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Webgunea"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Bat ere ez"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Izenbururik ez"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Ez da aurrebistarik aurkitu."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Eguneratu"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Sostengurako Eposta"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Garatzaileak ez du sostengurako epostarik eman."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Sostengurako URLa"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Garatzaileak ez du sostengurako URLrik eman."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Konfiantzazkoa"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "%s bertsioa"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Ez da bertsiorik aurkitu."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Utzi eta atzera itzuli"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Bai, ezgaitu"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Ziur gehigarri hau ezgaitu nahi duzula?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Gehigarri hau ezgaituz gero bilaketa eta zerrendetatik kanpo geratuko da. "
+"Ezin izango da webgunetik deskargatu eta ez ditu eguneratzeak jakinaraziko.  "
+"Gehigarria ezabatu egingo da nolabait, nahiz eta hona itzuli eta bergai "
+"dezakezun hala nahi izanez gero."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Ezgaitu %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Bai, gaitu"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Ziur gehigarri hau gaitu nahi duzula?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Gehigarri hau gaituz gero bilaketa eta zerrendetan agertuko da berriro. "
+"Webgunetik eta bezeroen eguneraketen bidez deskargatu ahal izango da."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Gaitu %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3209,62 +2232,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Gehitu egilea"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Egilearen eposta helbidea"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Kendu"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3277,30 +2312,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3379,22 +2414,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3403,12 +2438,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3416,12 +2451,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3430,24 +2465,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3455,7 +2490,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3480,42 +2515,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Ez dago kategoriarik eskuragarri gehigarri-mota honentzat."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Egileak"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Gehitu ikonoa"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Aldatu ikonoa"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Baimendu erabiltzaileei iturburu-fitxategiak linean ikustea"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategoriak"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Lehenetsitako locale-a"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Gehigarri honek kanpoko softwarea behar du"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Soilik uneko ikonoa ezabatu"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Ikono-fitxategi berria"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikonoa"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Locale-aren info gehigarria"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Hau aurreargitalpen bat da"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Hau gune konkretu baterako gehigarria da"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Helburu locale-a"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "info gehigarri laburra (adb. hizkera lokal baten izena)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3523,12 +2623,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3536,60 +2636,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3598,32 +2698,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3631,22 +2731,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3654,12 +2754,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3667,39 +2767,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Eguneratu"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">locale izen "
+"arrunta</a>, hala nola 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3789,14 +2899,71 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Burutugabeko eguneraketak (%s)"
 msgstr[1] "Burutugabeko eguneraketak (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Markatutako fitxategiak ezabatu egingo dira."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Fitxategiak"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Helburu-aplikazioak"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Fitxategirik ez."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Ikuskatzailearentzat oharrak"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Eguneratu"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Ez duzu atzipenik gehigarri horretara."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Laburpenek 250 karaktereko muga dute.\n"
+"(%s sartu dituzu)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Zure gehigarriaren izena dagoeneko datu-basean existitzen da. Mesedez "
+"ondorengoa ziurtatu: <br /><li>Zure GUID-ak bat datozela. Errore honen ohiko "
+"arrazoia bat ez datozen GUID-ak dira.</li><li>Ez duzula bikoiztutako "
+"sarrerarik datu-basean. Halakorik izatekotan, sarrera hori eguneratu edo "
+"ezabatu beharko zenuke eta berriro saiatu.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3810,10 +2977,9 @@ msgstr "Erreferentziarako ikusi %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "orri hau"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Mesedez azaldu gehigarri honen eguneraketan egin diren aldaketak."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3832,6 +2998,10 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen aukeratutako gehigarri "
 "motarentzat. Mesedez erabili ondorengoetako bat: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Fitxategi guztien GUID-ak ez datoz bat"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Mesedez aukeratu gehienez ere bost kategoria."
@@ -3866,7 +3036,16 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen ikono batentzat. Mesedez "
 "erabili ondorengoetako bat: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Dagoeneko pareko bertsio bat (%s) existitzen da gehigarri eta plataforma "
+"honetarako."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Ez dago install.rdf fitxategia."
 
@@ -3874,7 +3053,7 @@ msgstr "Ez dago install.rdf fitxategia."
 msgid "devcp_error_install_manifest"
 msgstr "Ondorengo erroreak aurkitu dira install.rdf fitxategian:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Mesedez aukeratu baliozko gehigarri-mota bat."
 
@@ -3945,6 +3124,18 @@ msgstr "Ezin da IDrik aurkitu gehigarri honentzat install.rdf fitxategian."
 msgid "devcp_error_no_platform"
 msgstr "Ez da plataformarik aukeratu"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Eskatutako xehetasunak hornitu behar dituzu proposamenerako."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Ezin duzu aurre-argitalpena proposatu."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Une honetan probagunean dauden gehigarriak soilik proposatu ditzakezu."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Mesedez aukeratu gutxienez kategoria bat."
@@ -3962,6 +3153,16 @@ msgstr ""
 "Fitxategiaren luzapen hori (%s) ez da onartzen aurrebista batentzat. Mesedez "
 "erabili ondorengoetako bat: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Errore bat gertatu da zure datuak gordetzen saiatzean."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Ez duzu baimenik gehigarri hau eguneratzeko."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3974,98 +3175,295 @@ msgstr ""
 "Gehigarriek ezin dute kanpoko updateURL bat erabili. Mesedez ezaba ezazu hau "
 "install.rdf fitxategitik eta saiatu berriro."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Mesedez igo fitxategi bat."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Gehitu beste plataforma bateko fitxategia"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Gehitu egilea"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Kendu"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Zure gehigari-motarentzako kategoriak hurrengo urratsean egongo dira "
+"eskuragarri."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Ez dago kategoriarik eskuragarri gehigarri-mota honentzat."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Sar ezazu gehigarriarentzako azalpen bat."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Sar ezazu gehigarriarentzako izena."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Aukera ezazu zein gehigarri-mota ari zaren bidaltzen."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Sar ezazu gehigarriarentzako laburpen bat."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Gehigarriaren fitxategia"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Gehigarriaren fitxategia 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Gehigarriaren fitxategia 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Gehigarri-mota"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Baimendu erabiltzaileak iturburu-fitxategiak linean ikustera"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Egilearen eposta helbidea"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Egileak"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategoriak"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Lehenetsitako locale-a"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Azalpena"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Azken Erabiltzailearentzako Lizentzia-kontratua (AELK)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Gehigarri honek kanpoko softwarea behar du"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Fitxategiak"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Webgunea"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Ikono-fitxategia"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Izena"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Onartutako plataformak"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Hau aurreargitalpen bat da"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Pribatutasun-politika"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Hau gune konkretu baterako gehigarria da"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Laburpena"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Sostengurako Eposta"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Sostengurako URLa"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Helburu-aplikazioak"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Bertsioa"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Bertsio-oharrak"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Bat ere ez"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Ikuskatzailearentzat oharrak"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Zure gehigarria konfiantzazkoa denez, aukera ezazu bertsio honek non joan "
+"beharko lukeen:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publikoa"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Probagunea"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Garatzaile-kontratua"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1. urratsa"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Igo fitxategia"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2. urratsa"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Gehigarriaren xehetasunak"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3. urratsa"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Bertsioaren xehetasunak"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4. urratsa"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalizazioa"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5. urratsa"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Eginda"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Nire gehigarriak"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalizatutako eremuak"
@@ -4082,12 +3480,12 @@ msgstr ""
 "eskuratu, lehenetsitako locale-a aukeratuko da (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Kudeatzailearen tresnak"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editorearen tresnak"
 
@@ -4096,28 +3494,28 @@ msgid "devcp_myaddons_link"
 msgstr "Nire gehigarriak"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Atzera orri nagusira"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Estatistiken arbela"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Bidali gehigarria"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Garatzailearen tresnak"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4129,27 +3527,39 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Itzuli gehigarriaren xehetasunetara"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Proposatu %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatikoki atzemandako gehigarri-mota: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4163,6 +3573,22 @@ msgstr ""
 "Aurrebista lehenetsi bezala kentzeak beste aurrebista bat automatikoki "
 "lehenetsi bezala ezartzea dakar."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Gehigarri honen lehenetsitako locale-a (%1$s [%2$s]) zuk aukeratuta "
+"daukazunarekin alderatuta ezberdina da (%3$s [%4$s]). Azpiko eremuak %1$s "
+"locale-an bete behar dira."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4170,14 +3596,14 @@ msgstr ""
 "Aurrebista lehenetsi bezala ezartzeak uneko aurrebista lehenetsiari egoera "
 "hori kentzea dakar."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4206,46 +3632,46 @@ msgstr "Editatu aurrebista"
 msgid "devcp_preview_updated_successfully"
 msgstr "Aurrebista arrakastaz eguneratu da."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4253,7 +3679,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4271,7 +3697,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Gehitu aurrebista"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4280,7 +3706,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Editatu aurrebista"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4293,27 +3719,27 @@ msgstr "Aurrebistaren fitxategia"
 msgid "devcp_previews_label_makedefault"
 msgstr "Ezarri lehenetsitako aurrebista-irudi gisa"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4337,18 +3763,26 @@ msgstr "Editatu aurrebista"
 msgid "devcp_previews_submit_upload"
 msgstr "Igo aurrebista"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Ezegokia?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Ziur zaude fitxategi hau ezabatu nahi duzula?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Mesedez aurreikusi eta onartu ondorengo garatzaile-kontratua aurrera "
@@ -4361,7 +3795,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4373,6 +3807,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Saltatu nire uneko gehigarriaren informazioa berrikustea"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4476,17 +3914,65 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Gehigarrien bidalketak ezgaituta daude momentuz. Mesedez beranduago "
+"egiaztatu."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Onartzen dut"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Uko egiten dut"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Gehigarri hau kudeatzaileak ezgaitu du."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Ezgaituta"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Konfiantzazkoa"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Azken bertsioa:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Ez duzu gehigarririk. Egin klik %s bat bidaltzeko."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "hemen"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Mesedez egiaztatu zure gaiarentzat %s."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "aurrebista igotzeaz"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4494,44 +3980,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4541,7 +4027,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4549,64 +4035,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4615,7 +4101,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4627,33 +4113,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4666,29 +4147,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4699,12 +4180,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4728,23 +4209,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4753,7 +4229,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4762,14 +4238,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4779,7 +4255,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4787,7 +4263,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4795,22 +4271,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4829,29 +4299,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Mesedez ikusi %s erreferentziarako."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "orri hau"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Editatu bertsioa"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Bertsioa arrakastaz eguneratu da."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4920,34 +4393,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4955,49 +4428,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -5007,59 +4475,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5068,26 +4529,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5130,7 +4591,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Gehigarri hau ezgaituta dago"
 
@@ -5181,7 +4642,7 @@ msgstr "Iragazkia"
 msgid "editorcp_logs_filter_by"
 msgstr "Iragazkia motaren/ekintzaren arabera"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Gertaeren log-a"
 
@@ -5243,7 +4704,7 @@ msgstr "Ikusi %s eta %s arteko sarrerak"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Ez da berrikuspenik aurkitu periodo honetarako."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Berrikuspenen log-a"
 
@@ -5267,24 +4728,24 @@ msgstr "Editorearen azken ekintzak"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Berrikuspenak guztira"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Ikuskatu Gehigarria"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Mesedez osatu ondorengo eremuak:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Mesedez aukeratu gutxienez ikuskatzeko fitxategi bat."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Norbere ikuskapenak ez dira onartzen."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Kanpoko softwarea"
 
@@ -5296,39 +4757,39 @@ msgstr "Gehitu ezaugarria"
 msgid "editors_featured_add_feature_submit"
 msgstr "Gehitu"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Ezaugarria gehitzeak huts egin du."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Ezaugarria ongi gehitu da."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Ezaugarria editatzeak huts egin du."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Ezaugarria ongi editatu da."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Locale bat edo gehiago baliogabeak dira."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Ezaugarria ezabatzeak huts egin du."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Ezaugarria ongi ezabatu da."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Nabarmendutako gehigarriak"
 
@@ -5340,170 +4801,107 @@ msgstr "Joan"
 msgid "editors_featured_remove_feature"
 msgstr "Ezabatu ezaugarria"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Iragazi ilara"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Lotura lagungarriak"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Editorearen gida"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Gehigarrien politika"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Iragazki hauek saio hau bukatu arte edo garbitu arte mantenduko dira."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Ez dago mota horretako gehigarririk berrikusteko."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "egun bat"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "ordu bat"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "minutu bat"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editorearen tresnak"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s bakarrik"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Aurreargitalpena"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s bateragarritasuna"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Garbitu"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Iragazkia"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Ikuskapen-ilara guztiak ezgaituta daude momentuz. Mesedez beranduago "
 "egiaztatu."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ikuskapen ekintza"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publiko izatea Eskatu"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Eskatu super-ikuskapena"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Mantendu probagunean"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Ikuskapen-iruzkinak"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5511,30 +4909,30 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Honek gehigarria gehigarria eta honen bertsiorik berrienaren fitxategiak "
 "publiko gisa ezarriko ditu. Etorkizuneko bertsioak hondar-kutxara joango "
 "dira editore batek ikuskatu arte."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Honek gehigarria probagunean mantenduko du."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Honek gehigarri publiko baten probagunera bidalitako bertsioa onartuko du "
 "alde publikoak ager dadin."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Honek gehigarri publiko baten probagunera bidalitako bertsioa probagunean "
 "mantenduko du."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Inolako kezkarik izanez gero gehigarri honen segurtasunarekin, "
@@ -5542,75 +4940,75 @@ msgstr ""
 "gauza ikusiz gero, idatzi zure iruzkinak azpiko eremuan. Iruzkinak "
 "kudeatzaileei bidaliko zaizkie, ez egileei."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Ikusi edukiak"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Egileak:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategoriak:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Bateragarritasuna:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Azalpena"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Garatzailearen iruzkinak"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "AELK"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Fitxategiak:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Elementuaren historia"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Proposamen-mezua"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Aurrebistak"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Pribatutasun-politika"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Ikuskatu %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Ikuskatzailearentzat oharrak"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Laburpena"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Bertsio-oharrak"
 
@@ -5640,7 +5038,7 @@ msgstr "Proposamena Onartuta/Publikoa"
 msgid "editors_review_history_nominated_denied"
 msgstr "Proposamen ukatua/probagunea"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Ezin da aurreko berrikuspen sarrerarik aurkitu."
 
@@ -5668,97 +5066,84 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplikazioak:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "edo aukeratu erantzun finkoa:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Iruzkinak:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistema eragileak:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Goialdean"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Ez da aurrebistarik aurkitu."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Berrikuspenen ilara"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Prozesatu ekintza"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ekintza"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Iruzkinak"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Ikuskatzailea"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Bertsioa/Fitxategia"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Berrikuspena arrakastaz prozesatu da."
 
@@ -5784,7 +5169,7 @@ msgstr "Ekintza"
 msgid "editors_reviews_in_reply_to"
 msgstr "honi erantzunez:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Berrikuspenak arrakastaz prozesatu dira!"
 
@@ -5796,82 +5181,87 @@ msgstr "Ez dago berrikuspenik moderatzeke."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Prozesatu berrikuspenak"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Gune konkreturako"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Berria"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Eguneratuta"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Egiaztatutako aplikazioa"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Egiaztatutako sistema eragileak"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informazio gehigarria"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Gehigarria"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Mota"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Gehigarri-motak"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Adina"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplikazioak"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Murriztu locale-etara?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plataformak"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Bidalketa-motak"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s egun"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ordu"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutu"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Sarrera ukatua"
 
@@ -5879,19 +5269,17 @@ msgstr "Sarrera ukatua"
 msgid "error_access_denied_message"
 msgstr "Ez duzu orri hau ikusteko baimenik."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5900,14 +5288,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Ez da gehigarria aurkitu!"
 
@@ -5920,55 +5305,59 @@ msgstr "Gehigarri hau ezin da hemen ikusi."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Ez dago gehigarririk kategoria honetan!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Hau ez da baliozko eposta helbide bat."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Eremu hau ezin da hutsik utzi."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Fitxategia ez da aurkitu!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fitxategi-errorea: %s ez da existitzen."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Erroreak daude inprimaki honetan. Mesedez konpondu eta berriz bidali."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "URL honek formatu baliogabea du. Baliozko URLak honelakoak dira: http://"
@@ -5976,47 +5365,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argumentua falta da: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Oharra"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Aurrebista ez da aurkitu!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Puntuazio bat aukeratu behar duzu."
 
@@ -6024,24 +5401,24 @@ msgstr "Puntuazio bat aukeratu behar duzu."
 msgid "error_user_already_confirmed"
 msgstr "Erabiltzaile kontu hau berretsirik dago dagoeneko."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Berrespen kode baliogabea!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Pasahitzak ez dira berdinak."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Beste erabiltzaile batek dagoeneko eposta helbide hau erabiltzen du."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6049,23 +5426,14 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Ezizen hau dagoeneko hartuta dago."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Erabiltzailea ez da aurkitu!"
 
@@ -6073,43 +5441,40 @@ msgstr "Erabiltzailea ez da aurkitu!"
 msgid "error_user_unconfirmed"
 msgstr "Lehenik berretsi zure erabiltzaile kontua mesedez."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Erabiltzaile-izen edo pasahitz okerra!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Bertsioa ez da aurkitu!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Pasahitz okerra!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Ikasi gehiago"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Gehiago jakin %1$s buruz"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "berrikuspen %1$s"
 msgstr[1] "%1$s berrikuspen"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Kategoria honetako gehiago:"
 
@@ -6153,43 +5518,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Eskubide guztiak erreserbatuta"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Kredituak"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozillak aplikazio horietarako loturak kortesia gisa eskaintzen ditu eta ez "
@@ -6197,106 +5561,99 @@ msgstr ""
 "Aplikazioari buruzko edozein galdera, erreklamazio edo eskaera dagokion "
 "software saltzaileari zuzendu behar zaio."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Aurrera"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Lege oharrak"
 
 # This is the lang code -- should be the same as the dir for this locale.
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Beste hizkuntzak:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Pribatutasun-politika"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Gorde"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Hiztegia"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Hiztegiak"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Hedapena"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Hedapenak"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Hizkuntza Paketea (Gehigarria)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Hizkuntza Paketeak (Gehigarriak)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Hizkuntza Paketea (Aplikazioa)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Hizkuntza Paketeak (Aplikazioak)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugina"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Pluginak"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Bilaketa Motorea"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Bilaketa Motoreak"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Gaia"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Gaiak"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Itzuli %1$serako gehigarrien hasiera orrira"
@@ -6305,95 +5662,37 @@ msgstr "Itzuli %1$serako gehigarrien hasiera orrira"
 msgid "header_main_firefox_header"
 msgstr "Firefoxerako gehigarriak"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Gehigarriak"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkeyrako gehigarriak"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbirderako gehigarriak"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbirderako gehigarriak"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Gehigarriak"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Hasi saioa"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Amaitu saioa"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Nire kontua"
 
@@ -6401,24 +5700,12 @@ msgstr "Nire kontua"
 msgid "header_navlink_register"
 msgstr "Eman izena"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s(r)en aurrebista irudia"
@@ -6426,47 +5713,36 @@ msgstr "%s(r)en aurrebista irudia"
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Hasi saioa</a> gehigarri hau instalatzeko"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Gehitu %s(e)ra %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Gehitu %1$s(e)ra %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Deskargatu %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Gehigarri hau ez dago eskuragarri."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 #, fuzzy
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
@@ -6479,8 +5755,8 @@ msgstr "Deskargatu hiztegia"
 msgid "langtools_download_langpack"
 msgstr "Deskargatu hizkuntza-paketea"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Hiztegiak eta hizkuntza-paketeak"
 
@@ -6492,81 +5768,37 @@ msgstr "Instalatu hiztegia"
 msgid "langtools_install_langpack"
 msgstr "Instalatu hizkuntza-paketea"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Hiztegia"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Hizkuntza-paketea"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Hizkuntza"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Data"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Deskargak"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Gehigarriaren izena"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Balorazioa"
@@ -6592,24 +5824,32 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 #, fuzzy
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+#, fuzzy
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 #, fuzzy
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "besteak"
 
@@ -6618,35 +5858,14 @@ msgstr "besteak"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6683,15 +5902,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Baliozko aplikazio-bertsioak"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Mozilla Gehigarrien gunera bidalitako gehigarriei gutxienez azpian "
@@ -6700,7 +5919,7 @@ msgstr ""
 "horientzat."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6709,15 +5928,19 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "hemen"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Bertsioak"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Probaguneko informazio-orria"
 
@@ -6725,6 +5948,13 @@ msgstr "Probaguneko informazio-orria"
 msgid "pagination_next_page"
 msgstr "hurrengoa"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Orria: %1$s / %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "aurrekoa"
@@ -6768,17 +5998,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -6788,7 +6018,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6808,8 +6038,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -6828,7 +6058,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -6846,134 +6076,104 @@ msgstr ""
 "a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Berrikuspenak %s(r)entzat"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Nabarmendutako gehigarriak"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Gehigarri berrienak"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Bilaketa ezgaituta dago momentuz. Saia zaitez geroago."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "gehigarri guztiak"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "bilatu gehigarriak"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "hemen:"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Bilaketa-motor guztiak"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Arakatu bilaketa-motorrak"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "gehigarri %s aurkitu da"
+msgstr[1] "%s gehigarri aurkitu dira"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Ez da emaitzarik aurkitu."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Bilatu gehigarriak"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Bilaketa-emaitzen jarioa"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Bilaketaren emaitzak: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Kudeaketa-tresnak"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Garatzaile-tresnak"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editore-tresnak"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Ongi etorri"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Ongi etorri, %s"
@@ -6982,7 +6182,7 @@ msgstr "Ongi etorri, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Hiztegia"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 #, fuzzy
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
@@ -6991,7 +6191,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "Honen bila nabil:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 #, fuzzy
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
@@ -7000,7 +6200,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Bilaketa Plugina"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 #, fuzzy
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
@@ -7009,25 +6209,26 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Gaia"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Puntuatu gabe oraindik"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "5etik %s izarrekin baloratua"
@@ -7064,13 +6265,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%b. %e, %A"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s sortu da"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s argitaratu da"
@@ -7083,185 +6284,185 @@ msgstr "Itxi"
 msgid "statistics_help_link"
 msgstr "Laguntza"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "edo, hautatu beste gehigarri bat"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "edo, hautatu estatistika publikoak dituen gehigarri bat"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Aukeratu zure gehigarrietako bat bere estatistikak ikusteko"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Aukeratu gehigarri bat estatistikak ikusteko"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Aukeratu estatistika publikodun gehigarri bat"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Estatistiken arbela"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Ikusi estatistikak"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "bat ere ez"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Ezabatu grafiko hau"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s aurkitu dira heinean"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Gehitu grafikoa"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Gehitu beste irudi bat grafikoari"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ezkutatu kontu totala "
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Erakutsi kontu totala"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ikusi datuak (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Lortu datu hauetatik komaz berizitako balioen (CSV) fitxategi bat"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ezkutatu %s(r)en gertaerak"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Erakutsi %s(r)en gertaerak"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Gainjarri grafikoetan gehigarrien kaleratze-datak"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ezkutatu Firefoxen gertaerak"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Erakutsi Firefoxen gertaerak"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Gainjarri grafikoetan Firefoxen kaleratze-datak"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Tolestu grafikoa"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Zabaldu grafikoa"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Aldatu tamainaz grafikoa"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Eguneko erabiltzaile aktiboak"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikazioa"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Pertsonalizatu"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Deskargak"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema Eragilea"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Gehigarriaren egoera"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Laburpena"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Gehigarriaren bertsioa"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplikazioa"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema Eragilea"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Gehigarriaren egoera"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Ezezaguna"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Gehigarriaren bertsioa"
 
@@ -7295,7 +6496,7 @@ msgstr "Zure ezarpenak eguneratu dira!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Estatistiken arbela"
 
@@ -7323,105 +6524,109 @@ msgstr "Urrundu zooma"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Urrundu zooma hilabete"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Estatistiken eguneroko laburpena (%1$s)"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Laburpen-datuen RSS jarioa"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%Y(e)ko %Bren %e(a), %A"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Honen estatistikak: %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Lehenetsita, zuk eta Mozilla-k soilik atzi dezakezue zure arbeleko "
 "informazioa. Publikora zabal dezakezu edonork ikus ditzan zure gehigarriaren "
 "datuak."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Arbelaren atzipena"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Pribatua"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Zuk eta Mozilla-k ikus ditzakezue soilik gehigarri honen estatistikak"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Publikoa"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Edonork ikus ditzake gehigarri honen estatistikak"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Aldatu ezarpenak"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mesedez erabili informazio hau konfidentziala balitz bezala."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Arbel hau une honetan <b>pribatua</b> da."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Arbel hau une honetan <b>publikoa</b> da."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Itxirik"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Itzuli arbelera"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Gorde ezarpenak"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Estatistiken arbelaren ezarpenak (%1$s)"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desblokeatua"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Apl"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SEa"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Ego"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Ee"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ber"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Batez besteko eguneko deskargak"
 
@@ -7433,7 +6638,7 @@ msgstr "Deskargak"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Azken egunean"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Deskargak azken 7 egunetan"
 
@@ -7451,7 +6656,7 @@ msgstr "%1$s(e)tik"
 msgid "statistics_summary_nodata"
 msgstr "Daturik ez oraindik"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Batez besteko eguneko erabiltzaile aktiboak"
 
@@ -7477,53 +6682,36 @@ msgstr "Eguneko erabiltzaile aktiboak"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s estatistikak"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Gai guztiak"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Arakatu gaiak"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Aldatu pasahitza"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Berrespen kodea berriz bidali da!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7531,24 +6719,24 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7559,62 +6747,62 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7623,7 +6811,7 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7631,19 +6819,19 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -7651,7 +6839,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7682,8 +6870,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -7725,118 +6914,95 @@ msgstr ""
 "Milesker,\n"
 "-- Mozilla Gehigarrien Pertsonala"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Berrezarri Mozilla Gehigarrietako zure pasahitza"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Berretsi pasahitza"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Editatu %s erabiltzailearen profila"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Eposta helbidea"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Izena"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ezkutatu eposta helbidea"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Webgunearen URLa"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Abizena"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Erabiltzailearen saio-hasiera"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Pasahitz berria"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Ezizena"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Pasahitz zaharra"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Pasahitza"
 
@@ -7844,72 +7010,72 @@ msgstr "Pasahitza"
 msgid "user_form_registration"
 msgstr "Erabiltzaile berriaren harpidetza"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Ikusi probagunea?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Gorde"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Hasi saioa"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Harpidetu"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Gehigarrien erabiltzailea noiztik"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Sortu erabiltzaile-kontu berria"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Erroreren bat dago egindako aldaketetan. Mesedez zuzendu itzazu eta bidali "
 "berriro..."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profila eguneratuta."
 
@@ -7922,15 +7088,15 @@ msgstr "%s(r)en pasahitza berrezarri da"
 msgid "user_pwreset_header"
 msgstr "Berrezarri pasahitza"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Zure pasahitza ahaztu duzu?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Pasahitza berrezartzeko lotura zure eposta helbidera bidali da."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Pasahitza behar bezala berrezarri da."
 
@@ -7942,7 +7108,7 @@ msgstr "Bidali pasahitz aldaketa"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Bidali pasahitza berrezartzeko lotura"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Gehigarriak"
@@ -7958,7 +7124,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7970,24 +7136,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "berriz bidali berrespen mezua"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Zorionak! zure erabiltzaile kontua behar bezala sortu da!"
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -8000,32 +7152,22 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Milesker harpidetzeagatik eta ongi etorri %1$s(e)ra!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -8034,69 +7176,53 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Ondo egiaztatu da!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Erabiltzaile-kontuaren edizioa"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s(r)en gehigarriak"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Izena"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Egilearen profila"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Eposta helbidea"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Webgunea"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Ezizena"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s erabiltzailearen informazioa"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Erabiltzailearen saio-hasiera"
 
@@ -8132,723 +7258,5 @@ msgstr "Berrezarri erabiltzaile pasahitza"
 msgid "users_register_pagetitle"
 msgstr "Erabiltzaile berriaren harpidetza"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Azken bertsio bateragarria"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Bertsioen historia osoa"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Berriena:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Arrakastatsuenak:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Gure gomendioak:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Eguneratu berria:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Ikusi guztiak"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Ikusi gomendatutako kategoriak"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Puntuaketa onenekoak aurrena"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Azken eguneraketak lehenengo"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Gogokoenak lehenengo"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Zure gehigarriaren bertsio hau ez da Firefox %1$s(r)ekin bateragarria. "
-#~ "Mozillak Firefoxen hurrengo bertsioa laster kaleratzeko asmoa du, beraz, "
-#~ "probatu zure gehigarria bertsio berrian eta eguneratu bateragarritasun "
-#~ "informazioa. Honi buruz gehiago irakur dezakezu <a href=\\\"%2$s\\"
-#~ "\">hemen</a>. Honako hau jakinarazpen bat baino ez da, eta bertsio hau "
-#~ "addons.mozilla.org(e)ra bidaltzen jarrai dezakezu."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Gehigarria arrakastaz ezgaitu da"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Editatu gehigarria"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Gehigarria arrakastaz gaitu da"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Gehigarriaren azalpena"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "AELK"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Gehigarriaren webgunea"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Gehigarriaren izena"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Pribatutasun-politika"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Gehigarriaren laburpena"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Sostengurako Eposta"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Sostengurako URLa"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Bertsio-oharrak"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Proposatu gehigarria"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Gehigarria arrakastaz proposatu da!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "%1$s orrira zure bidalketan aldaketak burutzeko edo %2$s orrira "
-#~ "Garatzailearen tresnetara itzultzeko."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "egin klik hemen"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Editatu gehigarria"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Bertsio hau probagunera bidali da bertako probatzaileek eta Mozillako "
-#~ "editore batek berrikusteko. Berrikusketa burutzean posta elektronikoz "
-#~ "jakinaraziko zaizu."
-
-# %1 is the link to the sandbox information page
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Probaguneko berrikusketa sistemari buruz gehiago irakur dezakezu %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "hemen"
-
-# %1 is the "nominate" link
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Bertsio hau probagunera bidali da esperientziadun erabiltzaileek erabil "
-#~ "dezaten. Gune publikoan argitaratzea nahi baduzu, zure gehigarria %s "
-#~ "beharko duzu eta berrikusketa prozesua burutu."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "proposatu"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Zure gehigarriaren bidalketa ondo burutu da."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Zure gehigarriak konfiantza duenez, bertsio hau automatikoki onartu da "
-#~ "gune publikorako."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Bidali gehigarria"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Gehigarria ondo eguneratu da"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Agian %s nahiko duzu zure gehigarriaganako interesa gehitzeko."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "igo aurrebista"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Ez da egilerik aurkitu [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Ezabatu"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Utzi"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Ziur zaude bidalketa utzi nahi duzula?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Hurrengoa"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Aldatu gehigarri mota:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Garatzailearen iruzkinak eguneratu dira."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Gehitu aurrebista"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Egilea"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Egileak"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Bat ere ez"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Kategoriak"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Kategoria"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Azalpena"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Ezgaituta"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Xehetasunak"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Garatzailearen iruzkinak"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Aurrebistak"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Bertsioak"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Webgunea"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Bat ere ez"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Izenbururik ez"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Ez da aurrebistarik aurkitu."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Eguneratu"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Sostengurako Eposta"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Garatzaileak ez du sostengurako epostarik eman."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Sostengurako URLa"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Garatzaileak ez du sostengurako URLrik eman."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Konfiantzazkoa"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Ez da bertsiorik aurkitu."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Utzi eta atzera itzuli"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Bai, ezgaitu"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Ziur gehigarri hau ezgaitu nahi duzula?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Gehigarri hau ezgaituz gero bilaketa eta zerrendetatik kanpo geratuko da. "
-#~ "Ezin izango da webgunetik deskargatu eta ez ditu eguneratzeak "
-#~ "jakinaraziko.  Gehigarria ezabatu egingo da nolabait, nahiz eta hona "
-#~ "itzuli eta bergai dezakezun hala nahi izanez gero."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Ezgaitu %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Bai, gaitu"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Ziur gehigarri hau gaitu nahi duzula?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Gehigarri hau gaituz gero bilaketa eta zerrendetan agertuko da berriro. "
-#~ "Webgunetik eta bezeroen eguneraketen bidez deskargatu ahal izango da."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Gaitu %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Gehitu egilea"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Egilearen eposta helbidea"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Kendu"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Ez dago kategoriarik eskuragarri gehigarri-mota honentzat."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Egileak"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Gehitu ikonoa"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Aldatu ikonoa"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Baimendu erabiltzaileei iturburu-fitxategiak linean ikustea"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Kategoriak"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Lehenetsitako locale-a"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Soilik uneko ikonoa ezabatu"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Ikono-fitxategi berria"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Ikonoa"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "info gehigarri laburra (adb. hizkera lokal baten izena)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Eguneratu"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">locale izen "
-#~ "arrunta</a>, hala nola 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Markatutako fitxategiak ezabatu egingo dira."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Fitxategiak"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Helburu-aplikazioak"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Fitxategirik ez."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Ikuskatzailearentzat oharrak"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Eguneratu"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Laburpenek 250 karaktereko muga dute.\n"
-#~ "(%s sartu dituzu)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Zure gehigarriaren izena dagoeneko datu-basean existitzen da. Mesedez "
-#~ "ondorengoa ziurtatu: <br /><li>Zure GUID-ak bat datozela. Errore honen "
-#~ "ohiko arrazoia bat ez datozen GUID-ak dira.</li><li>Ez duzula "
-#~ "bikoiztutako sarrerarik datu-basean. Halakorik izatekotan, sarrera hori "
-#~ "eguneratu edo ezabatu beharko zenuke eta berriro saiatu.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Mesedez azaldu gehigarri honen eguneraketan egin diren aldaketak."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Fitxategi guztien GUID-ak ez datoz bat"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Dagoeneko pareko bertsio bat (%s) existitzen da gehigarri eta plataforma "
-#~ "honetarako."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Eskatutako xehetasunak hornitu behar dituzu proposamenerako."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Ezin duzu aurre-argitalpena proposatu."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Une honetan probagunean dauden gehigarriak soilik proposatu ditzakezu."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Errore bat gertatu da zure datuak gordetzen saiatzean."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Ez duzu baimenik gehigarri hau eguneratzeko."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Gehitu beste plataforma bateko fitxategia"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Gehitu egilea"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Kendu"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Zure gehigari-motarentzako kategoriak hurrengo urratsean egongo dira "
-#~ "eskuragarri."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Ez dago kategoriarik eskuragarri gehigarri-mota honentzat."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Sar ezazu gehigarriarentzako azalpen bat."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Sar ezazu gehigarriarentzako izena."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Aukera ezazu zein gehigarri-mota ari zaren bidaltzen."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Sar ezazu gehigarriarentzako laburpen bat."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Gehigarriaren fitxategia"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Gehigarriaren fitxategia 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Gehigarriaren fitxategia 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Gehigarri-mota"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Baimendu erabiltzaileak iturburu-fitxategiak linean ikustera"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Egilearen eposta helbidea"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Egileak"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Kategoriak"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Lehenetsitako locale-a"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Azalpena"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Azken Erabiltzailearentzako Lizentzia-kontratua (AELK)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Gehigarri honek kanpoko softwarea behar du"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Fitxategiak"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Webgunea"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Ikono-fitxategia"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Izena"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Onartutako plataformak"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Hau aurreargitalpen bat da"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Pribatutasun-politika"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Hau gune konkretu baterako gehigarria da"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Laburpena"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Sostengurako Eposta"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Sostengurako URLa"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Helburu-aplikazioak"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Bertsioa"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Bertsio-oharrak"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Bat ere ez"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Ikuskatzailearentzat oharrak"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Zure gehigarria konfiantzazkoa denez, aukera ezazu bertsio honek non joan "
-#~ "beharko lukeen:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Publikoa"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Probagunea"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Garatzaile-kontratua"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "1. urratsa"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Igo fitxategia"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "2. urratsa"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Gehigarriaren xehetasunak"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "3. urratsa"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Bertsioaren xehetasunak"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "4. urratsa"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Lokalizazioa"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "5. urratsa"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Eginda"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Nire gehigarriak"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Itzuli gehigarriaren xehetasunetara"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatikoki atzemandako gehigarri-mota: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Gehigarri honen lehenetsitako locale-a (%1$s [%2$s]) zuk aukeratuta "
-#~ "daukazunarekin alderatuta ezberdina da (%3$s [%4$s]). Azpiko eremuak %1$s "
-#~ "locale-an bete behar dira."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Ezegokia?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Ziur zaude fitxategi hau ezabatu nahi duzula?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Saltatu nire uneko gehigarriaren informazioa berrikustea"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Gehigarrien bidalketak ezgaituta daude momentuz. Mesedez beranduago "
-#~ "egiaztatu."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Onartzen dut"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Uko egiten dut"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Gehigarri hau kudeatzaileak ezgaitu du."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Ezgaituta"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Konfiantzazkoa"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Ez duzu gehigarririk. Egin klik %s bat bidaltzeko."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "hemen"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Mesedez egiaztatu zure gaiarentzat %s."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "aurrebista igotzeaz"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Editatu bertsioa"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Bertsioa arrakastaz eguneratu da."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Berria"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Eguneratuta"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Gehigarri-motak"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Adina"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplikazioak"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plataformak"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Bidalketa-motak"
-
-#~ msgid "error_notice"
-#~ msgstr "Oharra"
-
-#~ msgid "forum_save"
-#~ msgstr "Gorde"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-# %1 is page number, %2 is total page count
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Orria: %1$s / %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "gehigarri %s aurkitu da"
-#~ msgstr[1] "%s gehigarri aurkitu dira"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Laburpen-datuen RSS jarioa"
diff --git a/site/app/locale/fa/LC_MESSAGES/messages.po b/site/app/locale/fa/LC_MESSAGES/messages.po
index c4a00e5..edbc872 100644
--- a/site/app/locale/fa/LC_MESSAGES/messages.po
+++ b/site/app/locale/fa/LC_MESSAGES/messages.po
@@ -3,199 +3,169 @@ msgstr ""
 "Project-Id-Version: addons.mozilla.org\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-06 17:15+0330\n"
+"PO-Revision-Date: 2008-08-09 15:24-0700\n"
 "Last-Translator: Ehsan Akhgari <ehsan.akhgari@gmail.com>\n"
 "Language-Team: Persian <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Narro 0.9.4 on https://l10n.mozilla.org/narro\n"
+"X-Generator: Narro 0.9.1 on https://l10n.mozilla.org/narro\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "انصرا� از نصب"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "هم‌اکنون بارگیری کنید %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "پذیر�تن و بارگیری"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "پذیر�تن و نصب"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "عمومی"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "گودال ماسه‌بازی"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "به‌هنگام شده در %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "نسخهٔ %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "بارگیری‌ها"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "بارگیری در کل"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "بارگیری در این ه�ته"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s ا�زودنی"
 msgstr[1] "%1$s ا�زودنی"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "در هر ص�حه"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "مرتب‌سازی بر حسب:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "آزمایشی"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "پیشنهاد شده"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s برای %2$s در دسترس نیست."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "بازگشت به %1$s…"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "بازگشت به بررسی‌ها…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "رتبه:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "بررسی:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "ارسال بررسی شما"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "ا�زودن یک بررسی به %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "عنوان/خلاصه:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "حذ�"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "پاسخ دادن"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "آیا از حذ� این بررسی اطمینان دارید؟"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "خیر"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "بله"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "حذ� بررسی"
 
@@ -204,7 +174,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "بررسی با مو�قیت حذ� گردید."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "ویرایش بررسی برای %s"
@@ -212,24 +182,30 @@ msgstr "ویرایش بررسی برای %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "علامت‌گذاری این بررسی با اشکال مواجه شد: یادداشت‌های مخصوص بررسی‌های علامت‌گذاری شده محدود به ۱۰ تا ۱۰۰ حر� هستند؛ در حالی که شما %1$s حر� وارد کرده‌اید."
+msgstr ""
+"علامت‌گذاری این بررسی با اشکال مواجه شد: یادداشت‌های مخصوص بررسی‌های علامت‌گذاری "
+"شده محدود به ۱۰ تا ۱۰۰ حر� هستند؛ در حالی که شما %1$s حر� وارد کرده‌اید."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "لط�اً توجه کنید: پیش از آن که بررسی شما در وب‌گاه عمومی ظاهر شود، توسط یک ویرایش‌گر مورد بررسی قرار خواهد گر�ت."
+msgstr ""
+"لط�اً توجه کنید: پیش از آن که بررسی شما در وب‌گاه عمومی ظاهر شود، توسط یک "
+"ویرایش‌گر مورد بررسی قرار خواهد گر�ت."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "پاسخ توسعه‌دهنده به:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
-msgstr[0] "%1$s بررسی قبلی ارسال شده توسط %2$s برای این ا�زودنی را مشاهده کنید."
-msgstr[1] "%1$s بررسی قبلی ارسال شده توسط %2$s برای این ا�زودنی را مشاهده کنید."
+msgstr[0] ""
+"%1$s بررسی قبلی ارسال شده توسط %2$s برای این ا�زودنی را مشاهده کنید."
+msgstr[1] ""
+"%1$s بررسی قبلی ارسال شده توسط %2$s برای این ا�زودنی را مشاهده کنید."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -241,169 +217,131 @@ msgid "addon_review_pagetitle"
 msgstr "بررسی‌های %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "پاسخ از طر� %1$s در تاریخ %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "پاسخ توسعه‌دهنده:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "بررسی شما با مو�قیت ذخیره گردید.  متشکریم!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "توسط %1$s در تاریخ %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "توسط %1$s در تاریخ %2$s (رتبهٔ %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "ا�زودنی بعدی"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "ا�زودنی قبلی"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "پیوند دائمی به این نسخه"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "جدیدترین نسخهٔ سازگار با %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "برو"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "مشاهدهٔ اطلاعات مؤل�"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "مرور همهٔ تم‌ها :: ا�زودنی‌های %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "مرور %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "مرور تم‌های %1$s :: ا�زودنی‌های %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "این چیست؟"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "ا�زودن یک بررسی"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "جزئیات پیشر�ته"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "دسته‌ها"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "ا�زودن به یک مجموعه:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "مجموعهٔ جدید..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "انتخاب یک مجموعه..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "منتشر کردن"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s به مجموعهٔ %2$s ا�زوده شده است."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "این چیست؟"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "و %1$s مجموعهٔ دیگر"
-msgstr[1] "و %1$s مجموعهٔ دیگر"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "بررسی م�صل"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "آن را دوست ندارم"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "ویرایش بررسی خود"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
-msgstr "این ا�زودنی دارای یک سیاست ح�ظ حریم خصوصی است."
+msgstr "این ا�زودنی دارای یک سیاست محرمانگی است."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "از آن متن�رم"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "مجموعه‌های مربوطه"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "توضیحات توسعه‌دهنده"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ص�حهٔ آغازه"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "مجوز کد منبع"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "بررسی‌ها"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "پشتیبانی"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "آن را دوست دارم"
 
@@ -411,23 +349,19 @@ msgstr "آن را دوست دارم"
 msgid "addons_display_long_description"
 msgstr "شرح کامل"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "عاشق آن هستم"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "تصاویر بیشتر"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "این ا�زودنی هنوز در هیچ مجموعه‌ای قرار ندارد"
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "دیگر ا�زودنی‌های %1$s"
@@ -436,84 +370,94 @@ msgstr[1] "دیگر ا�زودنی‌های این مؤل�ان"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s ارائه می‌شود"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s یا با ارسال پست الکترونیکی به %s ارائه می‌شود"
+msgstr ""
+"پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s یا با ارسال پست الکترونیکی به %"
+"s ارائه می‌شود"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "ص�حهٔ آغازه"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "به این ا�زودنی رتبه بدهید"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "آن را خیلی دوست دارم"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "لط�اً گزارش مشکلات را در بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را در اختیار توسعه‌دهندگان ا�زودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند با شما تماس بگیرند تا به ر�ع مشکلتان کمک کنند."
+msgstr ""
+"لط�اً گزارش مشکلات را در بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را "
+"در اختیار توسعه‌دهندگان ا�زودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند "
+"با شما تماس بگیرند تا به ر�ع مشکلتان کمک کنند."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">رهنمون‌های انجام بررسی</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک گر�تن دربارهٔ است�اده از این ا�زودنی بازدید کنید."
+msgstr ""
+"از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک گر�تن دربارهٔ است�اده از این "
+"ا�زودنی بازدید کنید."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "ارسال"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "مشاهدهٔ تمام ا�زودنی‌های %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "همهٔ بررسی‌ها را مشاهده کنید (تعداد: %1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "مشاهدهٔ تمام نسخه‌ها"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "تاریخچهٔ کامل نسخه‌ها"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "مشاهدهٔ متن برنامه"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "مشاهدهٔ آمار"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "شما چه �کر می‌کنید؟"
 
@@ -521,447 +465,337 @@ msgstr "شما چه �کر می‌کنید؟"
 msgid "addons_display_workswith"
 msgstr "با این نسخه‌ها کار می‌کند:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "به تازگی ا�زوده شده"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "محبوب"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "پیشنهاد شده"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "مشترک شدن"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "مرور ا�زودنی‌ها"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "به‌هنگام شده"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "توسط"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "مجموعه‌های محبوب"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "مجموعه‌ها"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> ا�زودنی"
-msgstr[1] "<strong>%1$s</strong> ا�زودنی"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "مشاهدهٔ همهٔ مجموعه‌ها"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "مجموعه‌ها روشی برای س�ارشی‌سازی، ترکیب، تطبیق و مخلوط کردن ا�زودنی‌ها در اختیار شما قرار می‌دهند. می‌توانید به عضویت مجموعه‌های ایجاد شده توسط کاربران دیگر درآیید یا مجموعهٔ خود را ایجاد نمایید."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> مشترک"
-msgstr[1] "<strong>%1$s</strong> مشترک"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "پیشنهاد ما"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "ا�زودنی‌ها %1$s را گسترش می‌دهند، و به شما امکان می‌دهند تجربهٔ مرور خود را منحصر به �رد سازید. نگاهی به اطرا� بیاندازید و %1$s را آن گونه که مایلید تغییر دهید."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "از این ا�زودنی‌ها راضی هستید؟ در %1$s می‌توانید ا�زودنی‌های بیشتری پیدا کنید."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>بیش از ۵۰۰۰ ا�زودنی رایگان</strong> که به شما امکان گسترش و س�ارشی‌سازی �ایر�اکس را بر اساس نیازتان می‌دهند."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "ا�زودنی‌ها چیستند؟"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>عملیات نصب ساده است</strong>، و هنگامی که به‌هنگام‌سازی‌ای وجود داشته باشد مطلع خواهید شد."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "معر�ی"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "نوار ابزارها، تم‌ها و �راهم‌کنندگان جست‌وجویی که <strong>به شما در کارهای معمول کمک می‌کنند.</strong>"
+msgstr ""
+"ا�زودنی‌ها %1$s را گسترش می‌دهند، و به شما امکان می‌دهند تجربهٔ مرور خود را "
+"منحصر به �رد سازید. نگاهی به اطرا� بیاندازید و %1$s را آن گونه که مایلید "
+"تغییر دهید."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "جدید!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "جدیدترین ا�زودنی‌ها:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "برنامه‌های دیگر"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "ا�زودنی‌های %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>ا�زودنی دریا�ت شده</span>"
-msgstr[1] "<strong>%1$s</strong> <span>ا�زودنی دریا�ت شده</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "محبوب‌ترین ا�زودنی‌ها:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>ا�زودنی در حال است�اده</span>"
-msgstr[1] "<strong>%1$s</strong> <span>ا�زودنی در حال است�اده</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "پیشنهاد ما:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "ا�زودنی‌های به تازگی به‌هنگام شده:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "مشاهدهٔ همهٔ ا�زودنی‌ها"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "مشاهدهٔ همهٔ ا�زودنی‌های به تازگی ایجاد شده"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "مشاهدهٔ همهٔ ا�زودنی‌های محبوب"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "مشاهدهٔ همهٔ ا�زودنی‌های پیشنهاد شده"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "مشاهدهٔ همهٔ ا�زودنی‌های به تازگی به‌هنگام شده"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>برای ذخیره کردن پرونده روی پیوند زیر کلیک کنید.</li><li>در موزیلا سان‌برد، از منوی ابزارها گزینهٔ ا�زودنی‌ها را انتخاب کنید.</li><li>دکمهٔ نصب را �شار دهید و پرونده‌ای که بارگیری نموده‌اید را انتخاب نمایید و دکمهٔ «تأیید» را �شار دهید.</li></ol>"
+msgstr ""
+"<ol><li>برای ذخیره کردن پرونده روی پیوند زیر کلیک کنید.</li><li>در موزیلا "
+"سان‌برد، از منوی ابزارها گزینهٔ ا�زودنی‌ها را انتخاب کنید.</li><li>دکمهٔ نصب را "
+"�شار دهید و پرونده‌ای که بارگیری نموده‌اید را انتخاب نمایید و دکمهٔ «تأیید» را "
+"�شار دهید.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "چگونه در سان‌برد نصب کنیم"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>بر پیوند زیر کلیک راست کنید و گزینهٔ «ذخیرهٔ پیوند به نام…» را انتخاب کنید تا پرونده بر روی دیسک سخت‌تان ذخیره شود.</li><li> در موزیلا تاندربرد، از منوی ابزارها، ا�زودنی‌ها را انتخاب کنید.</li><li>دکمهٔ «نصب» را �شار دهید، و پرونده‌ای را که بارگیری کرده‌اید انتخاب نمایید و دکمهٔ «تأیید» را �شار دهید.</li></ol>"
+msgstr ""
+"<ol><li>بر پیوند زیر کلیک راست کنید و گزینهٔ «ذخیرهٔ پیوند به نام…» را انتخاب "
+"کنید تا پرونده بر روی دیسک سخت‌تان ذخیره شود.</li><li> در موزیلا تاندربرد، از "
+"منوی ابزارها، ا�زودنی‌ها را انتخاب کنید.</li><li>دکمهٔ «نصب» را �شار دهید، و "
+"پرونده‌ای را که بارگیری کرده‌اید انتخاب نمایید و دکمهٔ «تأیید» را �شار دهید.</"
+"li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "چگونه در تاندربرد نصب کنیم"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "نمایش ا�زودنی‌های آزمایشی"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "پشتیبانی از این ا�زودنی توسط توسعه‌دهنده در %s ارائه می‌شود"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "توسط"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "مخصوص لینوکس"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "مخصوص مک‌ا�وا�س ا�کس"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "مخصوص ویندوز"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "این ص�حه تنها تعدادی از معمول‌ترین و محبوب‌ترین متصل‌شونده‌ها را �هرست کرده است. برای اطلاعات بیشتر دربارهٔ متصل‌شونده‌های دیگر در دسترس برای مرورگرهای بر پایهٔ موزیلا، از %1$s بازدید کنید"
+msgstr ""
+"این ص�حه تنها تعدادی از معمول‌ترین و محبوب‌ترین متصل‌شونده‌ها را �هرست کرده است. "
+"برای اطلاعات بیشتر دربارهٔ متصل‌شونده‌های دیگر در دسترس برای مرورگرهای بر پایهٔ "
+"موزیلا، از %1$s بازدید کنید"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "به دنبال متصل‌شونده‌ای می‌گردید که در اینجا وجود ندارد؟"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "متصل‌شونده‌ها به مرورگرتان کمک می‌کنند کارهای خاصی مانند مشاهدهٔ قالب‌های خاص گرا�یکی یا پخش پرونده‌های چندرسانه‌ای انجام دهد. متصل‌شونده‌ها کمی با ضمیمه‌ها که توانایی‌های موجود را گسترش می‌دهند یا بهبود می‌بخشند ت�اوت دارند."
+msgstr ""
+"متصل‌شونده‌ها به مرورگرتان کمک می‌کنند کارهای خاصی مانند مشاهدهٔ قالب‌های خاص "
+"گرا�یکی یا پخش پرونده‌های چندرسانه‌ای انجام دهد. متصل‌شونده‌ها کمی با ضمیمه‌ها که "
+"توانایی‌های موجود را گسترش می‌دهند یا بهبود می‌بخشند ت�اوت دارند."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "متصل‌شونده‌های %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "متصل‌شونده‌ها"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "مستندات پشتیبانی: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "پیش از ادامهٔ نصب، %s شما را ملزم به پذیر�تن توا�ق‌نامهٔ مجوز کاربر نهایی زیر می‌کند:"
+msgstr ""
+"پیش از ادامهٔ نصب، %s شما را ملزم به پذیر�تن توا�ق‌نامهٔ مجوز کاربر نهایی زیر "
+"می‌کند:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "پیش‌نمایش‌های مخصوص %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "به تازگی ا�زوده شده"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "با این همه ا�زودنی‌های عالی که وجود دارد، هر کس چیزی پیدا خواهد کرد. برای شروع، این �هرستی از محبوب‌ترین ا�زودنی‌هاست.  لذت ببرید!"
+msgstr ""
+"با این همه ا�زودنی‌های عالی که وجود دارد، هر کس چیزی پیدا خواهد کرد. برای "
+"شروع، این �هرستی از محبوب‌ترین ا�زودنی‌هاست.  لذت ببرید!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "منابع دیگر"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "مرکز توسعه‌دهندگان موزیلا"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "متأس�یم، شما نیاز به یک مرورگر بر پایهٔ موزیلا (مانند �ایر�اکس) دارید تا بتوانید یک متصل‌شوندهٔ جست‌وجو نصب کنید."
+msgstr ""
+"متأس�یم، شما نیاز به یک مرورگر بر پایهٔ موزیلا (مانند �ایر�اکس) دارید تا "
+"بتوانید یک متصل‌شوندهٔ جستجو نصب کنید."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "جاوا اسکریپت برای نصب ا�زودنی‌ها لازم است، ولی به نظر می‌رسد شما آن را غیر �عال کرده‌اید.  لط�اً جاوا اسکریپت را پیش از تلاش برای نصب هر یک از متصل شونده‌های جست‌وجوی زیر �عال سازید."
+msgstr ""
+"جاوا اسکریپت برای نصب ا�زودنی‌ها لازم است، ولی به نظر می‌رسد شما آن را غیر "
+"�عال کرده‌اید.  لط�اً جاوا اسکریپت را پیش از تلاش برای نصب هر یک از متصل "
+"شونده‌های جستجوی زیر �عال سازید."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "در %2$s یاد بگیرید چگونه %1$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "ا�زودنی خود را بسازید"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
-msgstr "گشتن در میان موتورهای جست‌وجوی بیشتری در %1$s"
+msgstr "گشتن در میان موتورهای جستجوی بیشتری در %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
-msgstr "موتورهای جست‌وجو"
+msgstr "موتورهای جستجو"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "تشکر خاص از پروژهٔ مایکرا�ت برای کار بر روی موتورهای جست‌وجوی �ایر�اکس."
+msgstr "تشکر خاص از پروژهٔ مایکرا�ت برای کار بر روی موتورهای جستجوی �ایر�اکس."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "به اشتراک گذاشتن"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "ا�زودن به Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "ا�زودن به Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "ارسال به Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "به اشتراک گذاشتن در FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "ارسال به MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "غیر �عال"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "نسخهٔ ناقص"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "در گودال ماسه‌بازی، نامزد عمومی شدن"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "در گودال ماسه‌بازی، در انتظار بررسی"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "عمومی"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "در گودال ماسه‌بازی"
@@ -970,34 +804,26 @@ msgstr "در گودال ماسه‌بازی"
 msgid "addons_status_unknown"
 msgstr "نامعلوم"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "دربارهٔ این ا�زودنی بیشتر بدانید"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "بیشترین بارگیری"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "بالاترین رتبه"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "مراقب نسخه‌های قدیمی باشید"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "این نسخه‌ها تنها برای رجوع و آزمایش نمایش داده می‌شوند. همیشه باید از جدیدترین نسخهٔ ا�زودنی است�اده کنید."
+msgstr ""
+"این نسخه‌ها تنها برای رجوع و آزمایش نمایش داده می‌شوند. همیشه باید از جدیدترین "
+"نسخهٔ ا�زودنی است�اده کنید."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "تاریخچهٔ نسخه‌ها به همراه �هرست تغییرات"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "تاریخچهٔ نسخه‌های %1$s"
@@ -1020,8 +846,7 @@ msgstr "گروه با شناسهٔ %s حذ� گردید"
 msgid "admin_group_edit_pagetitle"
 msgstr "ویرایش گروه"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "شناسهٔ نامعتبر برای گروه"
 
@@ -1029,1444 +854,420 @@ msgstr "شناسهٔ نامعتبر برای گروه"
 msgid "admin_group_pagetitle"
 msgstr "مدیر گروه"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "گروه ذخیره گردید"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "پیشر�ته"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "هر زمان"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "هرچه"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "هرچه"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "برنامه"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "تطابق واژهٔ کلیدی"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "آخرین به‌هنگام‌سازی"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "نام"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "جدیدترین"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "۳ ماه گذشته"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "۶ ماه گذشته"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "روز گذشته"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "ماه گذشته"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "ه�تهٔ گذشته"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "سال گذشته"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "در هر ص�حه"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "بستر نرم‌ا�زاری"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "محبوبیت"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "رتبه"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "مرتب‌سازی بر حسب"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "تا"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
-msgstr "ر�تن به حالت جست‌وجوی پیشر�ته"
+msgstr "ر�تن به حالت جستجوی پیشر�ته"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "نوع"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "نسخهٔ"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "بعدی"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "قبلی"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "صر�‌نظر از کنترل تطابق نسخهٔ ا�زودنی"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "این ا�زودنی مخصوص نسخه‌های پیشین �ایر�اکس است"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "می‌توانید <a href=\"%1$s\">نسخه‌ای قدیمی‌تر را امتحان کنید</a> یا <a href=\"#\" onclick=\"%2$s\">از انجام این وارسی صر�‌نظر کنید</a>"
+msgstr ""
+"می‌توانید <a href=\"%1$s\">نسخه‌ای قدیمی‌تر را امتحان کنید</a> یا <a href=\"#\" "
+"onclick=\"%2$s\">از انجام این وارسی صر�‌نظر کنید</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">نسخه‌ای قدیمی‌تر</a> ممکن است به کار بیاید"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "این ا�زودنی نیازمند <a href=\"%1$s\">�ایر�اکس %2$s</a> است که هنوز منتشر نشده است"
+msgstr ""
+"این ا�زودنی نیازمند <a href=\"%1$s\">�ایر�اکس %2$s</a> است که هنوز منتشر "
+"نشده است"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "برای است�اده از این ا�زودنی، <a href=\"http://getfirefox.com\">�ایر�اکس را ارتقا دهید</a>"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
+msgstr ""
+"برای است�اده از این ا�زودنی، <a href=\"http://getfirefox.com\">�ایر�اکس را "
+"ارتقا دهید</a>"
 
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "ا�زودنی‌ها بر حسب نام"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "جدیدترین ا�زودنی‌ها"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "ا�زودنی‌های محبوب"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "ا�زودنی‌ها بر حسب رتبه"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "ا�زودنی‌های به تازگی به‌هنگام شده"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "دستهٔ �علی"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "دسته‌ها"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "انتخاب یک دسته"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "مشاهدهٔ همهٔ ا�زودنی‌های دستهٔ %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "شرح باید کمتر از %1$s نویسه باشد."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "مجموعهٔ %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "مشاهدهٔ تمام ا�زودنی‌های پیشنهاد شده"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "خطا در حین حذ� ا�زودنی!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "تقدم با بالاترین رتبه‌ها"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "خطا در حین ذخیرهٔ ا�زودنی!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "تقدم با تازه‌ترین به‌هنگام‌سازی‌ها"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "خطا در حین ذخیرهٔ نظر!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "تقدم با محبوب‌ترین‌ها"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "نام باید کمتر از %1$s نویسه باشد."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "مشاهدهٔ همهٔ ا�زودنی‌های دستهٔ %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "مجموعه‌ای پیدا نشد!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "اگر از قبل می‌دانید کدام ا�زودنی‌ها را می‌خواهید به مجموعهٔ خود اضا�ه نمایید، تنها کا�ی است نام آنها را در �ضای زیر وارد کنید. اگر می‌خواهید �علاً دست نگه دارید و بعداً این کار را انجام دهید، کا�ی است هم اکنون روی %1$s کلیک کنید."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "اولین ا�زودنی‌های خود را انتخاب نمایید"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "ایجاد یک مجموعه"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "ا�زودنی‌های انتخاب شده"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "ایجاد مجموعهٔ خودتان با پر کردن تعداد کمی �یلد در زیر کار ساده‌ای است."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "ایجاد مجموعه"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "مجموعه‌ها"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "بیشتر بدانید"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "ا�زودن به ا�زودنی‌های محبوب"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "حذ� از ا�زودنی‌های محبوب"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr "<p>You can view your new collection below. If you'd like to set a collection nickname, upload an icon, or change additional settings, please visit the <a href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "دربارهٔ این مجموعه"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s ا�زودنی در این مجموعه"
-msgstr[1] "%1$s ا�زودنی در این مجموعه"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>ایجاد شده توسط:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>به‌هنگام شده در:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "تاریخ ا�زوده شدن"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "نام"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "محبوبیت"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s بارگیری در ه�تهٔ جاری"
-msgstr[1] "%1$s بارگیری در ه�تهٔ جاری"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "ا�زودنی‌های انتخاب شده هنگام ذخیره‌سازی حذ� خواهند گردید"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr "To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr "To publish new add-ons to this collection, enter a comma-separated list of Add-on IDs below."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "ا�زوده شده در %1$s توسط %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "ا�زودن نظر منتشر کننده"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "حذ� نظر منتشر کننده"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "ویرایش نظر منتشر کننده"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Note: Comment will appear as though written by original publisher on the original publication date"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "ذخیرهٔ نظر"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "حذ�"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "ا�زودن به مجموعه"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "بررسی در دسترس بودن"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr "Upon clicking \"%1$s\" below, your collection will be deleted. If you do not want to delete your collection, uncheck the confirmation box in the \"%2$s\" tab and continue editing your collection. If you leave this page without saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "نام ا�زودنی:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "برنامهٔ مربوطه"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "برنامه‌هایی که مجموعه‌تان از آنها پشتیبانی می‌کند را انتخاب کنید."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "حذ� مجموعه"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "حذ� مجموعه آن را برای همیشه پاک می‌کند."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "شرح مجموعه"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "مجموعهٔ خود و ا�زودنی‌های موجود در آن را به صورت خلاصه توضیح دهید"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "شمایل"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "می‌توانید یک شمایل JPG�، GIF یا PNG ارسال کنید که اندازهٔ آن تبدیل به ۳۲×۳۲ نقطه خواهد گردید."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "چه کسی می‌تواند مجموعهٔ شما را مشاهده کند؟"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "به صورت پیش‌�رض، مجموعه‌ها در �هرست عمومی مجموعه‌ها ثبت می‌شوند و توسط همه قابل مشاهده هستند. اگر می‌خواهید مجموعه‌تان تنها توسط ا�رادی که پیوندی به آن دریا�ت می‌کنند قابل مشاهده باشد، گزینهٔ زیر را انتخاب نمایید."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "تنها اشخاصی که از آنها دعوت می‌شود قادر به مشاهدهٔ این مجموعه باشند"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "همه بتوانند مجموعهٔ من را در �هرست مجموعه‌ها مشاهده کنند"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "چه کسی می‌تواند مجموعهٔ شما را مدیریت کند؟"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "این کاربران می‌توانند ا�زودنی‌های جدید به مجموعه‌تان بیا�زایند، همهٔ ا�زودنی‌ها و تنظیمات را مدیریت کنند، و به کاربران دیگر نیز اجازهٔ این کار را بدهند."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "نام مجموعه"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "به مجموعهٔ خود یک نام واضح بدهید، مثلاً «ا�زودنی‌های محبوب داوود دربارهٔ مسا�رت»"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "نام مستعار مجموعه"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "همچنین می‌توانید برای دسترسی سریع‌تر به ا�زودنی خود یک نام مستعار نیز تخصیص دهید:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "چه کسی می‌تواند ا�زودنی‌های جدید در مجموعه‌تان منتشر کند؟"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "این کاربران می‌توانند ا�زودنی‌های جدید به مجموعه‌تان اضا�ه کنند یا ا�زودنی‌هایی را که قبلاً اضا�ه کرده‌اند حذ� کنند."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "نشانی پست الکترونیک یک حساب کاربری ا�زودنی‌های �ایر�اکس را وارد کنید:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "حساب‌های کاربری انتخاب شده در هنگام ذخیره‌سازی حذ� خواهند گردید"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "�هرستی از نشانی‌های پست الکترونیک ا�زودنی‌های �ایر�اکس را که با ویرگول از یکدیگر جدا شده‌اند در اینجا وارد کنید"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "تنها خود من"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "من و این کاربران:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "ا�زودن"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "مدیریت %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "مدیریت محتوای مجموعه"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "ا�زودنی‌های �علی:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "تنظیمات پیشر�ته"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "مدیریت مجوزهای مجموعه"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "انصرا�"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "حذ� شمایل"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "جایگزینی شمایل"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr "Your nickname contained invalid characters and was corrected. Please try again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "ا�زودنی‌ها"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "پیشر�ته"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "نام و جزئیات"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "مجوزها"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "مراقب �رزندان و برنامهٔ خود باشید"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "خانواده"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "برو"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>You don't have any favorite collections yet.</strong></p> <p>Collections you mark as favorites can be quickly accessed from this page, and will appear in the <a href='%1$s'>Add-on Collector</a> if you've installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr "<p>You haven't created any collections yet. Collections are easy to create and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "مجموعه‌ها"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "مجموعه‌ساز ا�زودنی‌ها"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "ایجاد شده توسط %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "مجموعه‌ها چیستند؟"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "مرتب‌سازی بر حسب"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "منتخب ویرایش‌گران"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "ا�زودنی‌های محبوب من"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "ا�زودنی‌های من"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "ا�زودنی‌های محبوب"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "محبوب‌ترین ا�زودنی‌ها در هر زمانی"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "محبوب‌ترین ا�زودنی‌ها در ماه جاری"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "جدیدترین‌ها"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "محبوب‌ترین ا�زودنی‌ها در این ه�ته"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr "There's a new way to manage and find favorite add-ons. Comment, share and sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "اضا�ه گردید"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "در وب دربارهٔ همه‌چیز تحقیق کنید"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "مراجع"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "مدیریت شبکه‌های اجتماعی"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "اجتماعی"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "بستن"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr "An error occurred trying to add a favorite collection. Is this collection already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr "You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> tab in the directory. For an even easier way to keep track of your favorite collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "مجموعه با مو�قیت حذ� گردید."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "برنامه‌ریزی برای س�رهای کاری و تعطیلات به یاد ماندنی"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "مسا�رت"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "خود منتشر شونده"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "منتخب ویرایش‌گران"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "معمولی"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr "An error occurred trying to remove a favorite collection. Was this collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "بهترین وب‌گاه را بسازید"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "توسعهٔ وب"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "مجموعه‌ها چیستند؟"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "مطالعهٔ پرسش‌های متداول"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "روشی جدید برای مدیریت و یا�تن ا�زودنی‌های محبوب وجود دارد. مجموعه‌هایی از ا�زودنی‌ها را می‌توانید از درون خود مرورگر به اشتراک گذاشته، روی آن‌ها نظر دهید و آنها را با یکدیگر همسان سازید."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "ص�حهٔ آغازهٔ مجموعه‌ساز ا�زودنی‌ها"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "بارگیری مجموعه‌ساز ا�زودنی‌ها:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "نشان مجموعه‌ساز ا�زودنی‌ها"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "مرکز سازگاری ا�زودنی‌ها"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "با است�اده از ابزارها و اطلاعات مخصوص توسعه‌دهندگان ا�زودنی‌های %2$s که در این بخش وجود دارد برای انتشار %1$s آماده شوید."
+msgstr ""
+"با است�اده از ابزارها و اطلاعات مخصوص توسعه‌دهندگان ا�زودنی‌های %2$s که در این "
+"بخش وجود دارد برای انتشار %1$s آماده شوید."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "در حال بار کردن اطلاعات..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "بازگشت به ص�حهٔ اصلی"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "گزارش سازگاری ا�زودنی‌ها"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "اطلاعات مخصوص توسعه‌دهندگان ا�زودنی‌ها"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "تنظیم maxVersion بدون ارسال مجدد ا�زودنی"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "کنترل وضعیت ا�زودنی‌های من"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "اگر ا�زودنی‌های خود را در وب‌گاه ا�زودنی‌های موزیلا میزبانی می‌کنید، لط�اً برای تحلیل وضعیت ا�زودنی‌های %2$s خود <a href=\"%1$s\">وارد شوید</a>."
+msgstr ""
+"اگر ا�زودنی‌های خود را در وب‌گاه ا�زودنی‌های موزیلا میزبانی می‌کنید، لط�اً برای "
+"تحلیل وضعیت ا�زودنی‌های %2$s خود <a href=\"%1$s\">وارد شوید</a>."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "لوگوی مرکز توسعه‌دهندگان موزیلا"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "شما هیچ ا�زودنی میزبانی شده در وب‌گاه ا�زودنی‌های موزیلا ندارید."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "نتایج  بررسی وضعیت ا�زودنی‌ها"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "بازیابی وضعیت ا�زودنی‌های میزبانی شده..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s کاربر %2$s (%3$s٪ از کل)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "بر اساس اطلاعاتی که موزیلا در اختیار دارد، ا�زودنی‌های زیر ۹۵٪ ا�زودنی‌های است�اده شده توسط کاربران را تشکیل می‌دهند و بر اساس مقدار است�اده مرتب شده‌اند."
+msgstr ""
+"بر اساس اطلاعاتی که موزیلا در اختیار دارد، ا�زودنی‌های زیر ۹۵٪ ا�زودنی‌های "
+"است�اده شده توسط کاربران را تشکیل می‌دهند و بر اساس مقدار است�اده مرتب شده‌اند."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "مشاهدهٔ گزارش جزئی"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "بر اساس اطلاعاتی که موزیلا در اختیار دارد، از مجموع %1$s ا�زودنی که ۹۵٪ ا�زودنی‌های است�اده شده را تشکیل می‌دهند، <b>%2$s٪</b> در حال حاضر با آخرین نسخهٔ %3$s سازگار هستند."
+msgstr ""
+"بر اساس اطلاعاتی که موزیلا در اختیار دارد، از مجموع %1$s ا�زودنی که ۹۵٪ "
+"ا�زودنی‌های است�اده شده را تشکیل می‌دهند، <b>%2$s٪</b> در حال حاضر با آخرین "
+"نسخهٔ %3$s سازگار هستند."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "نسخه‌های آل�ا"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "ا�زودنی‌های سازگار با نسخهٔ آل�ایی از %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "نسخه‌های بتا"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "ا�زودنی‌های سازگار با نسخهٔ بتا یا نامزد انتشاری از %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "جدیدترین نسخه"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "ا�زودنی‌های سازگار با جدیدترین نسخه‌های %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "نسخه‌های دیگر"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "ا�زودنی‌های ناسازگار با هر نسخهٔ %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "گزارش سازگاری ا�زودنی‌ها"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "اطلاعات مخصوص است�اده‌کنندگان ا�زودنی‌ها"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "مشاهدهٔ گزارش سازگاری"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "برای اطلاعات دربارهٔ مشارکت، لط�اً از %s ما بازدید کنید."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "ص�حهٔ ویکی"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "موزیلا مایل به تشکر از ا�راد زیر برای مشارکت در پروژهٔ ا�زودنی‌های موزیلا در طول سالیان گذشته می‌باشد:"
+msgstr ""
+"موزیلا مایل به تشکر از ا�راد زیر برای مشارکت در پروژهٔ ا�زودنی‌های موزیلا در "
+"طول سالیان گذشته می‌باشد:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "توسعه‌دهندگان"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "ویرایش‌کنندگان"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "محلی‌سازان"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "دیگر مشارکت کنندگان"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "توسعه‌دهندگان پیشین"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "نرم‌ا�زار و تصاویر"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "بعضی شمایل‌ها از <a href=\"http://www.famfamfam.com/lab/icons/silk/\">مجموعهٔ شمایل famfamfam Silk</a>، تحت مجوز <a href=\"http://creativecommons.org/licenses/by/2.5/\">تخصیص کریتیو کامنز ۲٫۵</a> مورد است�اده قرار گر�ته‌اند."
+msgstr ""
+"بعضی شمایل‌ها از <a href=\"http://www.famfamfam.com/lab/icons/silk/\">مجموعهٔ "
+"شمایل famfamfam Silk</a>، تحت مجوز <a href=\"http://creativecommons.org/"
+"licenses/by/2.5/\">تخصیص کریتیو کامنز ۲٫۵</a> مورد است�اده قرار گر�ته‌اند."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
-msgstr "بعضی از ص�حه‌ها از قسمت‌هایی از <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a> تحت مجوز <a href=\"http://simile.mit.edu/license.html\">BSD</a> است�اده می‌کنند."
+msgstr ""
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e %B %Y، %I:%M %p"
@@ -2494,29 +1295,46 @@ msgstr "ص�حهٔ آمار"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "پسوند پروندهٔ %1$s� (%2$s) معتبر نیست. پسوندهای معتبر: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "قادر به ذخیرهٔ پروندهٔ %s در پایگاه داده نبود. لط�اً دوباره تلاش نمایید."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "پیش‌نمایش %1$s با مو�قیت با پروندهٔ %2$s جایگزین گردید."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "پروندهٔ %s با مو�قیت بارگذاری شد. در پایین می‌توانید شرحی برای آن بنویسید."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(شناسایی خودکار)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"این نسخه از ا�زودنی شما سازگار با �ایر�اکس %1$s نیست.  موزیلا در آینده‌ای "
+"نزدیک نسخهٔ بعدی �ایر�اکس را منتشر می‌کند، بنابراین لط�اً ا�زودنی خود را در "
+"نسخهٔ جدید آزمایش نموده و اطلاعات سازگاری در اینجا را به‌هنگام سازید.  اطلاعات "
+"بیشتری در مورد این موضوع در <a href=\"%2$s\">اینجا</a> در دسترس است. این "
+"تنها جهت توجه شما است و می‌توانید به ادامهٔ ارسال این نسخه به وب‌گاه ا�زودنی‌های "
+"موزیلا بپردازید."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "در پنجره‌ای جدید باز می‌شود"
@@ -2553,280 +1371,695 @@ msgstr "گام ۵: مو�قیت"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "راهنمای ارسال"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "ا�زودنی با مو�قیت غیر �عال گردید"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "ویرایش ا�زودنی"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "ا�زودنی با مو�قیت �عال گردید"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "شرح ا�زودنی"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "ص�حهٔ آغازهٔ ا�زودنی"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "نام ا�زودنی"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "عنوان پیش‌نمایش"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "�عال شود"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "سیاست محرمانگی"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "خلاصهٔ ا�زودنی"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "پست الکترونیکی پشتیبانی"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "نشانی پشتیبانی"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "یادداشت‌های نسخه"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "نامزد کردن ا�زودنی"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "ا�زودنی با مو�قیت نامزد شد!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "برای نمایش ا�زودنی در �هرست‌های عمومی و �عال کردن خدمات بررسی به‌هنگام‌سازی آن را �عال سازید."
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "کامل شود"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "ا�زودنی خود را تکمیل کنید و آن را به گودال ماسه‌بازی انتقال دهید"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "غیر �عال شود"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "برای نمایش ندادن ا�زودنی در �هرست‌های عمومی و غیر �عال کردن خدمات بررسی به‌هنگام‌سازی آن را غیر �عال کنید."
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "به گودال ماسه‌بازی منتقل شود"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "ا�زودنی خود را به گودال ماسه‌بازی برگردانید. این عمل غیر قابل برگشت است."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "نامزد عمومی شدن شود"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "ا�زودنی خود را برای عمومی شدن نامزد کنید"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "عمومی شود"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "ا�زودنی خود را بار دیگر عمومی کنید."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
-msgstr "ا�زودنی شما <span class=\"inactive-0\">�عال</span> شده است. این بدان معنی است که ا�زودنی شما در تمامی �هرست‌های مربوط به وضعیت آن در بالا نمایش داده خواهد شد."
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "لط�اً معیارهای بالا را پیش از تکمیل ا�زودنی خود و انتقال آن به <span class=\"status-1\">گودال ماسه‌بازی</span> تکمیل نمایید."
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "اکنون می‌توانید ا�زودنی خود را تکمیل نموده و با �شردن دکمهٔ زیر آن را به <span class=\"status-1\">گودال ماسه‌بازی</span> انتقال دهید."
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "حداقل یک دسته باید انتخاب شود"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "ا�زودنی نیاز به شرح دارد"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "ا�زودنی نیاز به نام دارد"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "ا�زودنی به عنوان نسخهٔ پیش از انتشار معر�ی نشده است."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "ضمیمه‌ها و تم‌ها باید حداقل یک تصویر پیش‌نمایش داشته باشند."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "ا�زودنی نیاز به خلاصه دارد"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "وضعیت ا�زودنی: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "اعمال موجود"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "وضعیت ا�زودنی: <span class=\"inactive-0\">�عال</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "معیارهای کامل بودن ا�زودنی"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "وضعیت ا�زودنی: <span class=\"inactive-1\">غیر �عال</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "معیارهای نامزدی برای عمومی شدن"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "وضعیت اعتماد: <span class=\"status-4\">مورد اعتماد</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "ا�زودنی شما <span class=\"inactive-1\">غیر �عال</span> است. این بدان معنی است که ا�زودنی شما بدون توجه به وضعیت آن در بالا در هیچ �هرستی ظاهر نخواهد شد. خدمات بررسی به‌هنگام‌سازی برای ا�زودنی شما هیچ به‌هنگام‌سازی پیشنهاد <b>نخواهند داد</b>."
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Please fulfill the criteria above before nominating your add-on to become <span class=\"status-4\">Public</span>."
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "You may now nominate your add-on for <span class=\"status-4\">Public</span> by clicking the button below."
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "عمومی"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "گودال ماسه‌بازی"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
 #, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Your add-on was <span class=\"status-5\">Disabled</span> by an administrator and cannot be used. If you have any questions, please e-mail %s."
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
 #, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Your add-on is currently <span class=\"status-0\">Incomplete</span>. This means your add-on is not showing up on any portion of the site or update check service. You may come to this page to complete your add-on after it meets the criteria below for completion and transfer to the <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 #, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Your add-on is currently nominated to become <span class=\"status-4\">Public</span> and is awaiting editor review. There are currently %s other add-ons in the nomination queue."
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 #, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "Your add-on is pending. This shouldn't have happened. Please e-mail %s with your add-on ID and state this error."
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
 #, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "Your add-on is <span class=\"status-4\">Public</span>, which means it will show up in all listings and searches and can be downloaded without restriction. Updates are being provided to your add-on through the update check service."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 #, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means it will show up in listings and searches, but users must log in to download it. Updates are <b>not</b> being provided to your add-on through the update check service."
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "وضعیت %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can submit updates to your add-on without editor review."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"از ص�حهٔ %1$s برای تغییر در ا�زودنی ارسالی خود، و %2$s برای برگشتن به "
+"ابزارهای توسعه‌دهندگان است�اده کنید."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "اینجا کلیک کنید"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "ویرایش ا�زودنی"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"این نسخه تا زمانی که توسط آزمایش کنندگان و یک ویرایش‌گر ا�زودنی‌های موزیلا "
+"بررسی شود درون گودال ماسه‌بازی قرار گر�ته است. هنگامی که این عمل انجام شود، "
+"به شما توسط پست الکترونیکی خبر داده خواهد شد."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "در %s می‌توانید بیشتر دربارهٔ روال بررسی گودال ماسه‌یازی بیشتر بخوانید."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "اینجا"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"این نسخه درون گودال ماسه‌بازی قرار داده شده است تا توسط کاربران باتجربه "
+"است�اده شود. برای این که در وب‌گاه عمومی نمایش داده شود، باید ا�زودنی خود را %"
+"s و وارد یک روال بررسی شوید."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "نامزد کنید"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "ارسال ا�زودنی شما با مو�قیت به پایان رسید."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"به دلیل این که ا�زودنی شما مورد اعتماد است، این نسخه به صورت خودکار برای بخش "
+"عمومی تأیید شده است."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "ارسال ا�زودنی"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "ا�زودنی با مو�قیت به‌هنگام گردید"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "ممکن است مایل باشید برای ا�زایش علاقه به ا�زودنی‌تان، %s."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "یک پیش‌نمایش بارگذاری کنید"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "مؤل�ی پیدا نشد [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "حذ�"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "انصرا�"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "آیا از انصرا� از ارسال خود اطمینان دارید؟"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "بعدی"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "تغییر نوع ا�زودنی:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "توضیحات توسعه‌دهنده به‌هنگام گردید."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "�عال"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s در حال حاضر %2$s و %3$s است"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "تغییر وضعیت"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
 #, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Your add-on was disabled by an administrator and cannot be used.  If you have any questions, please email %s."
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "وضعیت ا�زودنی: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "ص�حهٔ آمار توسعه‌دهندگان"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "به ص�حهٔ آمار توسعه‌دهندگان خوش آمدید"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "غیر �عال"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "آخرین ویرایش در تاریخ %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "شما در حال حاضر هیچ ا�زودنی در وب‌گاه ا�زودنی‌های موزیلا ندارید. برای یادگیری �رایند ارسال اولین ا�زودنی خود، بر روی «چگونه شروع کنیم» کلیک کنید."
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "چگونه شروع کنیم"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "نسخه‌ها و پرونده‌ها"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "ارسال نسخه‌ای جدید"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "قادر به حذ� پیش‌نمایش %s از پایگاه داده نبود. لط�اً دوباره تلاش کنید."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "پیش‌نمایش %s با مو�قیت حذ� گردید."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "شما مجوز لازم را برای حذ� نسخه‌ها و پرونده‌ها ندارید."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s پروندهٔ‌ %2$s"
-msgstr[1] "%1$s پروندهٔ %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "ا�زودن پیش‌نمایش"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "مؤل�"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "مؤل�ان"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "وجود ندارد"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "دسته‌ها"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "دسته"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "شرح"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "غیر �عال"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "جزئیات"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "توضیحات توسعه‌دهنده"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "پیش‌نمایش‌ها"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "نسخه‌ها"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "ص�حهٔ آغازه"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "وجود ندارد"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "بدون عنوان"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "هیچ پیش‌نمایشی پیدا نشد."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "به‌هنگام‌سازی"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "پست الکترونیکی پشتیبانی"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "نشانی پست الکترونیکی برای پشتیبانی از طر� توسعه‌دهنده معر�ی نشده است."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "نشانی پشتیبانی"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "نشانی اینترنتی پشتیبانی توسط توسعه‌دهنده معر�ی نشده است."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "مورد اعتماد"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "نسخهٔ %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "نسخه‌ای پیدا نشد."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "انصرا� و بازگشت"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "بله، آن را غیر �عال کن"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "آیا از غیر �عال کردن این ا�زودنی اطمینان دارید؟"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"غیر �عال کردن این ا�زودنی آن را از �هرست‌ها و نتایج جستجو حذ� می‌کند. این "
+"ا�زودنی با است�اده از وب‌گاه قابل بارگیری نخواهد بود و در گشتن به دنبال "
+"به‌هنگام‌سازی‌ها از طر� کارگیرها بازگردانده نخواهد شد.  این ا�زودنی عملاً پاک "
+"می‌شود، ولی می‌توانید هر زمانی که مایل باشید به اینجا بازگردید و آن را دوباره "
+"�عال کنید."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "غیر �عال کردن %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "بله، آن را �عال کن"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "آیا از �عال کردن این ا�زودنی اطیمنان دارید؟"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"�عال کردن این ا�زودنی باعث می‌شود که آن یک بار دیگر در �هرست‌ها و نتایج جستجو "
+"ظاهر شود.  این ا�زودنی هم از طریق وب‌گاه و هم از طریق گشتن به دنبال "
+"به‌هنگام‌سازی‌ها توسط کارگیرها قابل بارگیری خواهد بود."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "�عال کردن %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "ا�زودن پاسخ"
@@ -2839,12 +2072,15 @@ msgstr "پاسخ‌ها"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "خطایی در ذخیره کردن پاسخ‌تان روی داد. لط�اً در این مورد با %1$s تماس بگیرید."
+msgstr ""
+"خطایی در ذخیره کردن پاسخ‌تان روی داد. لط�اً در این مورد با %1$s تماس بگیرید."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "یکی از ویرایش‌گران ا�زودنی‌های موزیلا دربارهٔ نسخهٔ %2$s از ا�زودنی %1$s از شما اطلاعات بیشتری درخواست کرده است."
+msgstr ""
+"یکی از ویرایش‌گران ا�زودنی‌های موزیلا دربارهٔ نسخهٔ %2$s از ا�زودنی %1$s از شما "
+"اطلاعات بیشتری درخواست کرده است."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
@@ -2858,436 +2094,649 @@ msgstr "ارسال پاسخ"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "پاسخ شما با مو�قیت ذخیره گردید.  دیگر شرکت‌کنندگان در این بحث توسط نامه‌ای الکترونیکی باخبر خواهند شد."
+msgstr ""
+"پاسخ شما با مو�قیت ذخیره گردید.  دیگر شرکت‌کنندگان در این بحث توسط نامه‌ای "
+"الکترونیکی باخبر خواهند شد."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "نوشته شده توسط %1$s در تاریخ %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "ا�زودن مؤل�"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "نشانی پست الکترونیکی مؤل�"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "حذ�"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "ا�زودن مؤل� جدید"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "ا�زودن مؤل�"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "آدرس پست الکترونیکی حساب کاربری مؤل�:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "در حال بررسی آدرس پست الکترونیکی حساب کاربری مؤل�..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "برای ذخیره کردن بر روی دکمهٔ به‌هنگام‌سازی مؤل�ان در پایین کلیک کنید."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "مؤل�ان �علی"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "مدیریت مؤل�ان ا�زودنی"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "نمایش به عنوان مؤل� در ص�حه‌های نمایش عمومی"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Developer</strong> - Can manage all aspects of the add-on listing, except for adding and removing other authors."
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Owner</strong> - Can manage all aspects of the add-on listing, including adding and removing other authors."
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Viewer</strong> - Can view add-on developer listing and statistics, but can't make any changes."
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "یک نقش برای مؤل� انتخاب کنید:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "مؤل�"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "�هرست شده"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "نقش"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "به‌هنگام‌سازی مؤل�ان"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "به‌هنگام‌سازی دسته‌ها"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "ا�زودنی من مناسب هیچ یک از دسته‌های موجود نیست."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "دسته‌های %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "مدیریت دسته‌ها"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "برای مشاهدهٔ شرح هر دسته مکان‌نما را روی آن قرار دهید."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "دستهٔ %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "هیج دسته‌ای برای این نوع ا�زودنی و برنامه وجود ندارد."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
 #, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Place your add-on into this category only if it does not fit into any other available categories."
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "حداکثر سه دستهٔ مربوط به %s برای ا�زودنی خود انتخاب کنید"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "کاربرانی که قادر به مدیریت این ا�زودنی هستند را ویرایش نمایید."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "دسته‌های مربوط به هر برنامه‌ای که توسط ا�زودنی‌تان مورد پشتیبانی قرار می‌گیرد را انتخاب نمایید."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "ترجمه‌های خلاصه، شرح، توا�ق‌نامهٔ کاربر نهایی و سیاست ح�ظ حریم خصوصی ا�زودنی خود را ویرایش نمایید."
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "نام، ص�حهٔ آغازه، شمایل و دیگر ویژگی‌های ا�زودنی خود را تغییر دهید."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "به‌هنگام‌سازی شرح‌ها"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "لط�اً اشکالات بالا را که با رنگ قرمز مشخص شده‌اند تصحیح نمایید."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "ویرایش شرح‌های ا�زودنی"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "اطلاعاتی که برای کاربران م�ید است ولی لزوماً در خلاصه یا شرح ا�زودنی جایی ندارد. است�اده‌های معمول شامل برشمردن اشکالات عمدهٔ معلوم ا�زودنی، اطلاعاتی در مورد چگونگی گزارش اشکالات، تاریخ تقریبی انتشار نسخه‌های جدید و غیره می‌باشد."
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "توضیحات توسعه‌دهنده"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "شرح ا�زودنی توضیح بیشتری از ویژگی‌ها، کارایی‌ها و دیگر اطلاعات مربوطه است. شرح در زیر خلاصهٔ ا�زودنی در ص�حهٔ مربوط به آن نمایش داده می‌شود."
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "شرح ا�زودنی"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "If your add-on has an End-User License Agreement (EULA), please enter its text below. If set below, users will be required to agree to this before installing your add-on. Please note that a EULA is not the same as a code license such as GPL or MPL."
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "If your add-on has a privacy policy, enter its text here. Your add-on's display page will display a link to the policy."
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "سیاست ح�ظ حریم خصوصی"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "The summary is a short explanation of your add-on's basic functionality that is displayed in search and browse listings, as well as at the top of your add-on's display page. <strong>Limit of 250 characters.</strong>"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "خلاصهٔ ا�زودنی"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "مدیریت مؤل�ان ا�زودنی"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "مدیریت دسته‌های ا�زودنی"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "مدیریت شرح ا�زودنی"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "مدیریت ویژگی‌های ا�زودنی"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "هیچ دسته‌ای برای این نوع ا�زودنی وجود ندارد."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "مؤل�ان"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "ا�زودن شمایل"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "تغییر شمایل"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "به کاربران اجازهٔ مشاهدهٔ متصل پرونده‌های متن برنامه را بده"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "دسته‌ها"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "منطقهٔ پیش‌�رض"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "این ا�زودنی به نرم‌ا�زار خارجی نیاز دارد"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "پاک‌سازی تنها شمایل موجود"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "پروندهٔ شمایل جدید"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "شمایل"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "اطلاعات بیشتری از منطقه"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "این یک نسخهٔ پیش از انتشار است"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "این ا�زودنی خاص یک وب‌گاه است"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "منطقهٔ مقصد"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "اطلاعات کوتاه اضا�ی (مانند نام یک گویش محلی)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "به‌هنگام‌سازی ویژگی‌ها"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "تنها در صورتی که از اثر تغییرات اطلاع کامل دارید این موارد را تغییر دهید."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "شمایل �علی"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "An add-on's default locale is the main locale in which translations must be present. If translations for your add-on's descriptions are unavailable in a user's selected language, they will fall back to this default locale."
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "The GUID of your add-on is specified in its install.rdf and uniquely identifies it. You cannot change your GUID once it is listed on Mozilla Add-ons."
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "ویرایش ویژگی‌های ا�زودنی"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "نوع ا�زودنی"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "تنظیمات مدیریتی"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "زبان پیش‌�رض"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "پرچم‌های ا�زودنی"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "شناسهٔ ا�زودنی"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "شمایل ا�زودنی"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "تنظیمات دیگر"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "آیا ا�زودنی مورد اعتماد است؟"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "مشاهدهٔ کد منبع به صورت متصل به شبکه"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "The add-on icon is a small image that is displayed next to your add-on's name in browse and search results, display pages, and in the add-on installation dialog. The image will automatically be resized to 32 x 32 pixels.  Please use one of the following image types: %s"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "این ا�زودنی حاوی مؤل�ه‌های دودویی است"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "غیر مورد اعتماد"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "مورد اعتماد"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "شمایل جدید"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "حذ� شمایل"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "If your add-on has another homepage, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "ص�حهٔ آغازهٔ ا�زودنی"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "نام ا�زودنی"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "If you have an email address for support inquiries, enter it here. Adding other translations is not necessary unless you have different email addresses for different languages."
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "نشانی پست الکترونیکی پشتیبانی"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "If your add-on has a support website or forum, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "وب‌گاه پشتیبانی"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "ا�زودنی‌های مورد اعتماد می‌توانند بدون بررسی ویرایش‌گران عمومی شوند."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "شمایل هنگام ذخیره کردن حذ� خواهد شد. <a %s>اگر منصر� شده‌اید اینجا را کلیک کنید.</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "The source of your add-on files can be viewed online by any logged in user if you wish."
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "اجازهٔ مشاهدهٔ متصل کد منبع داده شود"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "اجازهٔ مشاهدهٔ متصل کد منبع داده نشود"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "به‌هنگام‌سازی"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">نام سادهٔ منطقه</"
+"a>، مانند 'en-US'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "مؤل�ان"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "دسته‌ها"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "تغییر وضعیت"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "شرح‌ها"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "ویرایش ا�زودنی"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "نسخهٔ جدید"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "ویژگی‌ها"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "تصاویر پیش‌نمایش"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "ص�حهٔ آمار"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "نسخه‌ها و پرونده‌ها"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "مشاهدهٔ �هرست"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3320,14 +2769,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "به‌هنگام‌سازی‌های باقی‌مانده (%s)"
 msgstr[1] "به‌هنگام‌سازی‌های باقی‌مانده (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "پرونده‌های انتخاب شده حذ� خواهند شد."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "پرونده‌ها"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "برنامه‌های مقصد"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "هیچ پرونده‌ای وجود ندارد."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "یادداشت برای بررسی‌کنندگان"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "به‌هنگام‌سازی"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "شما به آن ا�زودنی دسترسی ندارید."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"خلاصه‌ها محدود به حداکثر ۲۵۰ حر� هستند.\n"
+"(شما %s حر� وارد کردید)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"نام ا�زودنی شما قبلاً در پایگاه‌داده وجود دارد. لط�اً مطمئن شوید که: <br /><li> "
+"GUID های انتخاب شده با هم یکسان هستند. معمولترین دلیل این خطا، GUID های غیر "
+"همسان است.</li><li>شما دو مدخل تکراری در پایگاه‌داده ذخیره نکرده‌اید. در این "
+"صورت، یا باید مدخل قبلی را به‌هنگام سازید یا آن را حذ� کنید و دوباره تلاش "
+"کنید.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3341,21 +2845,30 @@ msgstr "لط�اً %s را به عنوان مرجع ملاحظه نمایید."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "این ص�حه"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "ا�زودنی شما باید حداقل یک مؤل� داشته باشد."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "لط�اً تغییرات این به‌هنگام‌سازی ا�زودنی را توضیح دهید."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "یک نسخه از این ا�زودنی از قبل وجود دارد. برای جایگزین کردن آن، ابتدا باید پروندهٔ %1$s را حذ� نمایید."
+msgstr ""
+"یک نسخه از این ا�زودنی از قبل وجود دارد. برای جایگزین کردن آن، ابتدا باید "
+"پروندهٔ %1$s را حذ� نمایید."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "این پسوند پرونده (%s) برای نوع ا�زودنی انتخاب شده مجاز نیست. لط�اً از یکی از پسوندهای زیر است�اده کنید: %s"
+msgstr ""
+"این پسوند پرونده (%s) برای نوع ا�زودنی انتخاب شده مجاز نیست. لط�اً از یکی از "
+"پسوندهای زیر است�اده کنید: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "تمام GUID ها با هم یکسان نیستند"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3387,9 +2900,18 @@ msgstr "هیچ پرونده‌ای بارگذاری نشد"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "این پسوند پرونده (%s) برای شمایل مجاز نیست. لط�اً از یکی از پسوندهای زیر است�اده کنید: %s"
+msgstr ""
+"این پسوند پرونده (%s) برای شمایل مجاز نیست. لط�اً از یکی از پسوندهای زیر "
+"است�اده کنید: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "نسخهٔ مشابهی (%s) برای این ا�زودنی و این سکوی نرم‌ا�زاری وجود دارد."
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "پروندهٔ install.rdf وجود ندارد."
 
@@ -3397,10 +2919,9 @@ msgstr "پروندهٔ install.rdf وجود ندارد."
 msgid "devcp_error_install_manifest"
 msgstr "خطاهای زیر در پروندهٔ install.rdf پیدا شد:"
 
-#: controllers/developers_controller.php:1463
-#, fuzzy
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "شناسهٔ این ا�زودنی نامعتبر است: %s"
+msgstr "لط�اً یک نوع ا�زودنی مجاز انتخاب کنید."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3421,11 +2942,13 @@ msgstr "شناسهٔ این ا�زودنی نامعتبر است: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%s نسخهٔ معتبری برای %s نیست: نسخه‌های کمینه نمی‌توانند شامل * باشند"
+msgstr "%s نسخهٔ معتبری برای %s نیست: نسخه‌های حداقل نمی‌توانند شامل * باشند"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "نسخهٔ این ا�زودنی مجاز نیست: لط�اً <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">مشخصات</a> را ملاحظه کنید"
+msgstr ""
+"نسخهٔ این ا�زودنی مجاز نیست: لط�اً <a href=\"http://developer.mozilla.org/en/"
+"docs/Toolkit_version_format\">مشخصات</a> را ملاحظه کنید"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
@@ -3454,7 +2977,7 @@ msgstr "خطایی در تغییر مکان %s روی داد."
 
 #: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
-msgstr "باید کمینه یک برنامهٔ مقصد معتبر بر پایهٔ موزیلا را انتخاب کنید."
+msgstr "باید حداقل یک برنامهٔ مقصد معتبر بر پایهٔ موزیلا را انتخاب کنید."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
@@ -3464,104 +2987,343 @@ msgstr "شناسه‌ای برای این ا�زودنی در install.rdf تعر
 msgid "devcp_error_no_platform"
 msgstr "سکوی نرم‌ا�زاری انتخاب نشده است"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "باید اطلاعات خواسته شده را برای نامزد کردن ا�زودنی �راهم کنید."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "شما نمی‌توانید یک ا�زودنی پیش از انتشار را نامزد کنید."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "تنها می‌توانید ا�زودنی‌های موجود در گودال ماسه‌بازی را نامزد کنید."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
-msgstr "لط�اً کمینه یک دسته را انتخاب کنید."
+msgstr "لط�اً حداقل یک دسته را انتخاب کنید."
 
 #: controllers/components/developers.php:92
 msgid "devcp_error_one_user"
-msgstr "کمینه یک مؤل� برای این ا�زودنی باید تعری� شده باشد."
+msgstr "حداقل یک مؤل� برای این ا�زودنی باید تعری� شده باشد."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "پسوند پروندهٔ (%s) برای یک پیش‌نمایش مجاز نیست. لط�اً از یکی از پسوندهای زیر است�اده کنید: %s"
+msgstr ""
+"پسوند پروندهٔ (%s) برای یک پیش‌نمایش مجاز نیست. لط�اً از یکی از پسوندهای زیر "
+"است�اده کنید: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "در ذخیره‌سازی اطلاعات شما خطایی روی داد."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "اجازهٔ به‌هنگام‌سازی این ا�زودنی را ندارید."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "ا�زودنی‌ها قادر به است�اده از updateKey نیستند.  لط�اً این را از install.rdf حذ� کنید و دوباره تلاش نمایید."
+msgstr ""
+"ا�زودنی‌ها قادر به است�اده از updateKey نیستند.  لط�اً این را از install.rdf "
+"حذ� کنید و دوباره تلاش نمایید."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "ا�زودنی‌ها قادر به است�اده از یک updateURL خارجی نیستند.  لط�اً این را از install.rdf حذ� کنید و دوباره تلاش نمایید."
+msgstr ""
+"ا�زودنی‌ها قادر به است�اده از یک updateURL خارجی نیستند.  لط�اً این را از "
+"install.rdf حذ� کنید و دوباره تلاش نمایید."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "لط�اً یک پرونده بارگذاری نمایید."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "یک پروندهٔ خاص سکوی نرم‌ا�زاری دیگر اضا�ه کنید"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "ا�زودن مؤل�"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "حذ�"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "دسته‌های نوع جدید ا�زودنی شما در گام بعدی در دسترس هستند."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "هیچ دسته‌ای برای این نوع ا�زودنی وجود ندارد."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "لط�اً شرحی از ا�زودنی خود وارد کنید."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "لط�اً نام ا�زودنی خود را وارد کنید."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "لط�اً نوع ا�زودنی که در حال ارسالش می‌باشید را انتخاب کنید."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "لط�اً خلاصه‌ای از ا�زودنی خود وارد نمایید."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "پروندهٔ ا�زودنی"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "پروندهٔ دوم ا�زودنی"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "پروندهٔ سوم ا�زودنی"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "نوع ا�زودنی"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "به کاربران اجازهٔ مشاهدهٔ متصل پرونده‌های متن برنامه را بده"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "نشانی پست الکترونیکی مؤل�"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "مؤل�ان"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "دسته‌ها"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "منطقهٔ پیش‌�رض"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "شرح"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "این ا�زودنی به نرم‌ا�زار خارجی نیاز دارد"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "پرونده‌ها"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "ص�حهٔ آغازه"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "پروندهٔ شمایل"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "نام"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "سکوهای نرم‌ا�زاری پشتیبانی شده"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "این یک نسخهٔ پیش از انتشار است"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "سیاست محرمانگی"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "این ا�زودنی خاص یک وب‌گاه است"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "خلاصه"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "پست الکترونیکی پشتیبانی"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "نشانی پشتیبانی"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "برنامه‌های مقصد"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "نسخه"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "یادداشت‌های نسخه"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "وجود ندارد"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "یادداشت برای بررسی‌کنندگان"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"به دلیل آن که ا�زودنی شما مورد اعتماد است، لط�اً مشخص کنید این نسخه به کجا "
+"باید برود:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "عمومی"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "گودال ماسه‌بازی"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "توا�ق‌نامهٔ توسعه‌دهنده"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "گام ۱"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "بارگذاری پرونده"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "گام ۲"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "جزئیات ا�زودنی"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "گام ۳"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "جزئیات نسخه"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "گام ۴"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "محلی‌سازی"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "گام ۵"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "مو�قیت"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "ا�زودنی‌های من"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "انصرا�"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "لط�اً نشانی پست الکترونیکی حساب کاربری مؤل�ی را که مایل به ا�زودن هستید وارد کنید."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "حرکت به پایین"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "انتقال به بالا"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "حذ� سازگاری با برنامه‌ها"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "نمایش به عنوان مؤل� در �هرست‌های عمومی"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "لط�اً یک مجوز انتخاب کنید."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "لط�اً متن مجوز خود را وارد نمایید."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "توسعه‌دهنده"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "صاحب"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "مشاهده کننده"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "حذ� مؤل�"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "آیا از حذ� این مؤل� <strong>اطمینان دارید</strong>؟"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "باید یک پرونده برای بارگذاری انتخاب نمایید."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "مجوز خاص برای ا�زودنی %1$s نسخهٔ %2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3571,15 +3333,19 @@ msgstr "�یلدهای محلی شده"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "بعضی از �یلدهای این ص�حه برای نمایش داده شدن به زبان مادری کاربر نهایی ترجمه شده‌اند. منطقه‌ای را از پایین برای ویرایش جزئیات ا�زودنی خود در آن زبان انتخاب کنید. اگر ترجمه‌ای برای یک منطقه وجود نداشته باشد، متن مربوطه از منطقهٔ پیش‌�رض انتخاب شده (%s) انتخاب خواهد شد."
+msgstr ""
+"بعضی از �یلدهای این ص�حه برای نمایش داده شدن به زبان مادری کاربر نهایی ترجمه "
+"شده‌اند. منطقه‌ای را از پایین برای ویرایش جزئیات ا�زودنی خود در آن زبان انتخاب "
+"کنید. اگر ترجمه‌ای برای یک منطقه وجود نداشته باشد، متن مربوطه از منطقهٔ پیش‌�رض "
+"انتخاب شده (%s) انتخاب خواهد شد."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "ابزارهای مدیر"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "ابزارهای ویرایش‌گر"
 
@@ -3588,74 +3354,109 @@ msgid "devcp_myaddons_link"
 msgstr "ا�زودنی‌های من"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "بازگشت به ص�حهٔ اصلی"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "ص�حهٔ آمار"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "ارسال ا�زودنی"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "ابزارهای توسعه‌دهنده"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "This add-on ID (%1$s) already exists in the database. If this is your add-on, you can <a href=\"%2$s\">upload a new version</a>."
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "انصرا� و بازگشت"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "بازگشت به جزئیات ا�زودنی"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "نامزد کردن %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "نوع تشخیص داده شدهٔ ا�زودنی به صورت خودکار: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>One or more of your changes couldn't be saved.</span><br />Please look for the errors below. The rest of your changes were successfully saved."
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>تغییرات شما ذخیره گردید.</span><br />لط�اً توجه نمایید که منعکس شدن برخی تغییرات در تمام بخش‌های وب‌گاه ممکن است چندین ساعت به طول انجامد."
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "حذ� پیش‌نمایش پیش‌�رض باعث می‌شود یک پیش‌نمایش دیگر به صورت خودکار به عنوان پیش‌نمایش پیش‌�رض انتخاب شود."
+msgstr ""
+"حذ� پیش‌نمایش پیش‌�رض باعث می‌شود یک پیش‌نمایش دیگر به صورت خودکار به عنوان "
+"پیش‌نمایش پیش‌�رض انتخاب شود."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"منظقهٔ پیش‌�رض این ا�زودنی (%1$s [%2$s]) با منطقهٔ انتخاب شده‌ٔ �علی شما(%3$s [%4"
+"$s]) ت�اوت دارد.  �یلدهای زیر باید در زبان %1$s کامل شوند."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "انتخاب این پیش‌نمایش به عنوان پیش‌نمایش پیش‌�رض باعث می‌شود پیش‌نمایش پیش‌�رض کنونی از حالت پیش‌�رضی خارج شود."
+msgstr ""
+"انتخاب این پیش‌نمایش به عنوان پیش‌نمایش پیش‌�رض باعث می‌شود پیش‌نمایش پیش‌�رض "
+"کنونی از حالت پیش‌�رضی خارج شود."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "هنوز تغییرات ذخیره نشده‌ای دارید."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3684,97 +3485,120 @@ msgstr "ویرایش پیش‌نمایش"
 msgid "devcp_preview_updated_successfully"
 msgstr "پیش‌نمایش با مو�قیت به‌هنگام شد."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "ا�زودن پیش‌نمایشی دیگر"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "حذ� پیش‌نمایش"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "جایگزین نمودن پیش‌نمایش"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "به‌هنگام‌سازی پیش‌نمایش‌ها"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "ا�زودن پیش‌نمایش جدید"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Select an image to upload below. Images larger than the maximum size of 700 pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "برای بارگذاری بر روی دکمهٔ به‌هنگام‌سازی پیش‌نمایش‌ها در پایین کلیک کنید."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Click the Update Previews button below to save this image. (<a %s>Cancel?</a>)"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "This preview will be deleted when Update Previews is clicked below. (<a %s>Cancel?</a>)"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "از �رم زیر برای بارگذاری یک تصویر از ا�زودنی‌تان با قالب PNG، JPG یا GIF است�اده کنید. تصاویر بزرگتر از ۷۰۰ نقطه در ۵۲۵ نقطه به صورت خودکار کوچک می‌شوند."
+msgstr ""
+"از �رم زیر برای بارگذاری یک تصویر از ا�زودنی‌تان با قالب PNG، JPG یا GIF "
+"است�اده کنید. تصاویر بزرگتر از ۷۰۰ نقطه در ۵۲۵ نقطه به صورت خودکار کوچک "
+"می‌شوند."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "ا�زودن پیش‌نمایش"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "عنوان پیش‌نمایش"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "ویرایش پیش‌نمایش"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "پیش‌نمایش پیش‌�رض"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "پروندهٔ پیش‌نمایش"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "این تصویر را به عنوان پیش‌نمایش پیش‌�رض قرار بده"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "تصویر جدید:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "ارسال پیش‌نمایش: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "قادر به ذخیرهٔ یک یا چند عدد از پیش‌نمایش‌ها نبود."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "پیش‌نمایش‌های شما با مو�قیت به‌هنگام شدند."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "تصاویر پیش‌نمایش ا�زودنی شما در زیر نمایش داده شده‌اند. در اینجا می‌توانید تصاویر یا عناوین آنها را تغییر دهید. پیش‌نمایش پیش‌�رض پیش‌نمایشی است که در �هرست‌های مرور و جستجو کنار ا�زودنی‌تان نشان داده می‌شود."
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3792,30 +3616,53 @@ msgstr "ویرایش پیش‌نمایش"
 msgid "devcp_previews_submit_upload"
 msgstr "بارگذاری پیش‌نمایش"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "تصویر کوچک"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "مدیر پیش‌نمایش‌های %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "نادرست؟"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "آیا از حذ� این پرونده اطمینان دارید؟"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "لط�اً توا�ق‌نامهٔ توسعه‌دهندهٔ زیر را بررسی کنید و پیش از پیشروی با آن موا�قت نمایید."
+msgstr ""
+"لط�اً توا�ق‌نامهٔ توسعه‌دهندهٔ زیر را بررسی کنید و پیش از پیشروی با آن موا�قت "
+"نمایید."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>شما برای تغییر این ص�حه مجوز کا�ی ندارید.</span><br />در صورتی که نیاز به تغییر این قسمت‌ها دارید با مالک ا�زودنی تماس بگیرید."
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "لط�اً توجه نمایید که اعمال برخی تغییرات در تمام بخش‌های وب‌گاه ممکن است چند ساعت به طول انجامد."
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "ص�حهٔ آمار"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "از به‌هنگام‌سازی اطلاعات �علی ا�زودنی من صر�‌نظر کن"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3839,554 +3686,761 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> بارگیری در این ه�ته"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "�عال کردن این ا�زودنی باعث می‌شود که بر حسب وضعیت در قسمت‌های عمومی وب‌گاه مانند �هرست‌های مرور و جستجو ظاهر شود. ا�زودنی از وب‌گاه قابل دریا�ت خواهد بود و بر حسب وضعیت آن ممکن است در بررسی‌های به‌هنگام‌سازی کاربران ظاهر شود. شما بسته به نیاز خود می‌توانید به این بخش بازگردید و ا�زودنی خود را مجدداً غیر�عال سازید."
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "آیا از �عال کردن این ا�زودنی اطیمنان دارید؟"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "آیا مطمئن هستید؟"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "غیر�عال کردن این ا�زودنی باعث می‌شود که در هیچ بخش عمومی وب‌گاه مانند �هرست‌ها و نتایج جست‌وجوها ظاهر نشود. ا�زودنی از وب‌گاه قابل دریا�ت نخواهد بود و در به‌هنگام‌سازی‌ها به کاربران عرضه نخواهد شد. شما بر حسب نیاز می‌توانید به این بخش بازگردید و آن را مجدداً �عال سازید."
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "آیا از غیر �عال کردن این ا�زودنی اطمینان دارید؟"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "خیر، انصرا�"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "عمومی کردن این ا�زودنی باعث می‌شود که همه بتوانند آن را دریا�ت کنند و به‌هنگام‌سازی‌های آن در دسترس کاربران قرار گیرد."
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "آیا از عمومی کردن این ا�زودنی اطیمنان دارید؟"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
 #, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Moving this add-on back to the sandbox will require users to log in before downloading and updates will no longer be offered to existing users. Because your add-on is currently public, you will be able to return here at any time to make it public again."
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "آیا از انتقال این ا�زودنی به گودال ماسه‌بازی اطمینان دارید؟"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "بله، اطمینان دارم"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<spanبرای نامزد کردن این ا�زودنی یک پیام مورد نیاز است.</span><br />لط�اً اطلاعات درخواست شده را در �ضای متنی وارد کنید و دوباره تلاش نمایید."
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "نامزد کردن ا�زودنی"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "ارسال ا�زودنی �علاً غیر �عال است. لط�اً بعداً دوباره تلاش نمایید."
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "قبول دارم"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "قبول ندارم"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "این ا�زودنی توسط یک مدیر غیر �عال شده است."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "غیر �عال"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "مورد اعتماد"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "جدیدترین نسخه:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "شما هیچ ا�زودنی ندارید. برای ارسال یک ا�زودنی %s کلیک کنید."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "اینجا"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "لط�اً مطمئن شوید برای تم خود %s."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "یک پیش‌نمایش بارگذاری کنید"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "ویرایش %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "راهنما (در همین ص�حه)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "راهنما"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "نویسه‌های است�اده شده: %1$s از %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "آیا از حذ� این ترجمه اطمینان دارید؟"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "زبانه‌های %s چیستند؟"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "اگر ترجمه‌ای در اختیار نداشته باشم چه باید کرد؟"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "پنهان‌سازی راهنما"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "If a user browses the site and a translation isn't available in their own language, it will fall back to your add-on's Default Locale, specified in the Edit Add-on Properties area. If you don't have any translations, just enter what you can into your Default Locale, which should be a language you speak."
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "This is a <i>Translation Box</i>. It allows you to localize a specific field into any other languages for which you might have a translation. You can add, edit, and remove translations using the locale tabs."
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "ا�زودن ترجمه"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "حذ� ترجمه"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "ا�زودن زبان به همه"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "ا�زودن زبان"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "انصرا�"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "حذ� شود"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "زبان ترجمه‌ای که می‌خواهید اضا�ه کنید را انتخاب نمایید:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "شناسهٔ ا�زودنی که در این پرونده است�اده شده است (%1$s) به شناسهٔ موجود این ا�زودنی (%2$s) مطابقت ندارد."
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "شما مجوز لازم را برای حذ� به‌هنگام‌سازی این ا�زودنی ندارید."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "نسخهٔ مشخص شده (%1$s) مربوط به این ا�زودنی (%2$s) نیست."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "The version number uploaded (%1$s) already exists for this add-on. If you are trying to add another file to this version, <a href=\"%2$s\">click here</a>."
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "نسخهٔ ارسال شده (%1$s) با نسخهٔ موجود (%2$s) یکسان نیست."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "چگونه شروع کنیم"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "در حال بارگذاری پرونده…"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
+#: views/developers/uploader.thtml:123
 #, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
 msgid "devcp_uploader_button_edit"
-msgstr "ویرایش ا�زودنی من"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "بعداً ا�زودنی‌ام را تکمیل خواهم نمود."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "ا�زودن یادداشت‌های انتشار"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>Your add-on listing has been successfully created. The basic information obtained from your uploaded file has been stored, but there's a lot more to your listing that can be customized.</p><p>Your add-on is currently marked as <strong>Incomplete</strong>. In order to complete your add-on, you'll need to make sure it has an accurate name, summary, and description, as well as at least one selected category. You can edit your add-on's information using the link below and check the status of your add-on at any time on the <a %s>status page</a>."
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "لط�اً این مشکل را ر�ع کنید و پروندهٔ خود را مجدداً ارسال نمایید."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "پروندهٔ جدیدتان به نسخهٔ %1$s ا�زوده شده است و هم‌اکنون %2$s است."
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "ا�زودنی ایجاد گردید!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "به نظر می‌رسد این پرونده مشکلی دارد…"
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "پرونده ا�زوده گردید!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "این قسمت چگونه کار می‌کند؟"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "نسخهٔ %s ایجاد گردید"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "بارگذاری پرونده‌تان"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
 #, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. Hosting your add-on on Mozilla Add-ons is the easiest way to handle distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on will have a public display page with information you provide, such as a brief summary of the add-on's functionality, an optional longer description, and a showcase of preview screenshots of your add-on.</li><li>Your add-on will appear in search and browse listings across the site, and even in the Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your downloads and providing automatic updates to users when you upload a new version.</li><li>You'll have access to a statistics dashboard with detailed information about your user base.</li></ul><p>Add-ons hosted on the site must be reviewed by a Mozilla Add-ons Editor before they will have all of the features listed above. If you're ready to start the process and have your add-on package ready for upload, just click on Get Started below!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "سکوهای نرم‌ا�زاری پشتیبانی شده:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "پروندهٔ ا�زودنی: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "دیگر"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "The new file will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "The new version will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "نسخهٔ جدید شما ایجاد گردید و در حال حاضر %s است."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "View your new file in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "View your new version in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Upload your add-on file using the form below. If you have multiple, platform-specific files to upload, choose a single file and then upload the others using the Versions and Files Manager."
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "همه"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "خاص:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "لط�اً انتخاب نمایید..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "ا�زودن پرونده به %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "ارسال ا�زودنی جدید"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "به‌هنگام‌سازی %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "لط�اً %s را به عنوان مرجع ملاحظه نمایید."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "این ص�حه"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "حساب کاربری برای این نشانی پست الکترونیکی وجود ندارد."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr "Either the XML is invalid or required fields are missing.  Please <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "ویرایش نسخه"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "نسخه با مو�قیت به‌هنگام گردید."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "انصرا�"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "حذ� نسخه"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "حذ� نسخهٔ خالی"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "حذ� شود؟"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "ا�زودن نسخهٔ جدید"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "انصرا�"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "حذ� نسخه"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "این عمل موارد زیر را نیز حذ� می‌کند:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s پرونده"
-msgstr[1] "%s پرونده"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "حذ� نسخهٔ %s؟"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s بررسی"
-msgstr[1] "%s بررسی"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "آیا از حذ� نسخهٔ %s برای همیشه اطمینان دارید؟"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "انصرا�"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "حذ� پرونده"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "ا�زودن برنامهٔ جدید"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "حذ� برنامه"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "ا�زودن پروندهٔ جدید"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Adjusting application information here will allow users to install your add-on even if the install.rdf in the package indicates that the add-on is incompatible. <a %s>List of supported applications</a>"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "آیا از حذ� سازگاری با این برنامه <b>اطمینان دارید</b>؟"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "آیا از حذ� این پرونده برای همیشه <b>اطمینان دارید</b>؟"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "اطلاعات تأیید"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "برنامه‌های سازگار"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "اطلاعات پرونده"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "مجوز"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "مدیریت نسخهٔ %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "یادداشت‌های تأیید"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "حذ� پرونده"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "پروندهٔ %1$s (%2$s) در تاریخ %3$s ایجاد شده و وضعیت آن در تاریخ %5$s به %4$s تغییر یا�ته است"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "لط�اً مجوز مناسب را برای ا�زودنی خود انتخاب کنید. این مجوز حقوقی که در قبال کد منبع به دیگران عرضه می‌کنید را مشخص می‌کند."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "هیچ پرونده‌ای پیدا نشد."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "اطلاعات اختیاری برای ویرایش‌گری که این نسخه را بررسی می‌کند."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "حذ� سازگاری با برنامه‌ها"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "لط�اً یک برنامه انتخاب نمایید"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "پرونده"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "بستر نرم‌ا�زاری"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "اندازه"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "وضعیت"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Information about changes in this release, new features, known bugs, and other useful information specific to this release/version. This information will also be available to users updating the add-on in the Firefox 3 Add-ons Manager interface."
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "یادداشت‌های انتشار"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>You have unsaved changes.</strong> Compatibility will not be deleted until you click Update Version below."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>You have unsaved changes.</strong> Files will not be deleted until you click Update Version below."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "به‌هنگام‌سازی نسخه‌ها"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "مدیریت نسخه‌ها و پرونده‌ها"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "نسخه‌ای پیدا نشد."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "نسخهٔ %s با مو�قیت حذ� گردید."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
 #, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "This version has no files associated with it and can be removed. Would you like to remove this version?"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "ایجاد شده در تاریخ"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "وضعیت"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "نسخه"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "این ا�زودنی غیر �عال است"
 
@@ -4416,7 +4470,7 @@ msgstr "لطÙ�اً نظرات خود را دربارهٔ این بررسی واØ
 
 #: controllers/components/editors.php:161
 msgid "editor_review_error_no_files"
-msgstr "لط�اً کمینه یک پرونده را برای بررسی انتخاب نمایید."
+msgstr "لط�اً حداقل یک پرونده را برای بررسی انتخاب نمایید."
 
 #: controllers/components/editors.php:197
 msgid "editor_review_error_no_operating_system"
@@ -4430,8 +4484,7 @@ msgstr "صا�ی"
 msgid "editorcp_logs_filter_by"
 msgstr "صا�ی بر حسب نوع/عمل"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "ثبت وقایع رویدادها"
 
@@ -4493,7 +4546,7 @@ msgstr "مشاهدهٔ موارد بین %s و %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "هیچ بررسی در این دوره پیدا نشد."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "ثبت وقایع بررسی‌ها"
 
@@ -4517,29 +4570,28 @@ msgstr "�عالیت‌های اخیر ویرایش‌گر"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "تعداد کل بررسی‌ها"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "بررسی ا�زودنی"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "لط�اً �یلدهای زیر را تکمیل نمایید:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
-msgstr "لط�اً کمینه یک پرونده را برای بررسی انتخاب نمایید."
+msgstr "لط�اً حداقل یک پرونده را برای بررسی انتخاب نمایید."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "بررسی ا�زودنی‌های خود مجاز نیست."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "نرم‌ا�زار خارجی"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "ا�زودن ویژگی"
 
@@ -4547,296 +4599,246 @@ msgstr "ا�زودن ویژگی"
 msgid "editors_featured_add_feature_submit"
 msgstr "ا�زودن"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "ا�زودن ویژگی شکست خورد."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "ویژگی با مو�قیت ا�زوده شد."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "ویرایش ویژگی شکست خورد."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "ویرایش ویژگی با مو�قیت انجام شد."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "یک یا چند منطقه نامعتبر است."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "حذ� ویژگی شکست خورد."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "حذ� ویژگی با مو�قیت انجام شد."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "ا�زودنی‌های ویژه"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "برو"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "حذ� ویژگی"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "ص� صا�ی"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "پیوندهای م�ید"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "راهنمای ویرایش‌گر"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "سیاست ا�زودنی"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "این صا�ی‌ها برای این نشست تا زمانی که پاک شوند باقی خواهند ماند."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "در حال حاضر هیچ ا�زودنی از این نوع برای بررسی وجود ندارد."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "۱ روز"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "۱ ساعت"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "۱ دقیقه"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "ابزارهای ویرایش‌گر"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "تنها %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "پیش از انتشار"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "سازگاری با %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "نشانی پست الکترونیکی ا�زودنی یا مؤل�"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "انواع ا�زودنی"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "برنامه"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "حداکثر نسخه"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "سکوهای نرم‌ا�زاری"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "مدت زمان ارسال شده (بر حسب روز)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "نتایج جستجوی صا�ی‌شدهٔ شما: <strong>%1$s</strong> ا�زودنی"
-msgstr[1] "نتایج جستجوی صا�ی‌شدهٔ شما: <strong>%1$s</strong> ا�زودنی"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "پاک کردن"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "صا�ی"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "تمام ص�‌های بررسی اکنون غیر �عال هستند.  لط�اً بعداً دوباره تلاش نمایید."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "ویرایش"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "تاریخچهٔ مورد"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "ص�حهٔ آغازه"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "شرح کلی مورد"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "پیش‌نمایش‌ها"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "عمل بررسی"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "درخواست اطلاعات بیشتر"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "عمومی کردن"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "درخواست بررسی ارشد"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "نگه داشتن در گودال ماسه‌بازی"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "توضیحات بررسی"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "از این �رم برای درخواست اطلاعات بیشتر از مؤل� است�اده کنید. مؤل�ان نامه‌ای الکترونیکی دریا�ت خواهند کرد و قادر خواهند بود در اینجا پاسخ دهند. هنگامی که مؤل�ان پاسخی ارسال نمایند، شما توسط نامه‌ای الکترونیکی مطلع خواهید شد."
+msgstr ""
+"از این �رم برای درخواست اطلاعات بیشتر از مؤل� است�اده کنید. مؤل�ان نامه‌ای "
+"الکترونیکی دریا�ت خواهند کرد و قادر خواهند بود در اینجا پاسخ دهند. هنگامی که "
+"مؤل�ان پاسخی ارسال نمایند، شما توسط نامه‌ای الکترونیکی مطلع خواهید شد."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "این گزینه، ا�زودنی و آخرین نسخهٔ آن را به صورت عمومی در خواهد آورد. نسخه‌های بعدی وارد گودال ماسه‌بازی می‌شوند تا توسط یک ویرایش‌گر بررسی گردند."
+msgstr ""
+"این گزینه، ا�زودنی و آخرین نسخهٔ آن را به صورت عمومی در خواهد آورد. نسخه‌های "
+"بعدی وارد گودال ماسه‌بازی می‌شوند تا توسط یک ویرایش‌گر بررسی گردند."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "این گزینه ا�زودنی را در گودال ماسه‌بازی نگه خواهد داشت."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "این گزینه یک نسخهٔ درون گودال ماسه‌بازی از ا�زودنی را عمومی می‌کند."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "این گزینه باعث می‌شود یک نسخهٔ درون گودال ماسه‌یازی از ا�زودنی در گودال ماسه‌بازی باقی بماند."
+msgstr ""
+"این گزینه باعث می‌شود یک نسخهٔ درون گودال ماسه‌یازی از ا�زودنی در گودال "
+"ماسه‌بازی باقی بماند."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "اگر دربارهٔ امنیت این ا�زودنی، مسائل مربوط به حق msgid"
+msgstr ""
+"اگر دربارهٔ امنیت این ا�زودنی، مسائل مربوط به حق نسخه‌برداری آن، یا دیگر "
+"مواردی که نیاز به بررسی یک مدیر دارد، شک دارید، نظرات خود را در ناحیهٔ زیر "
+"وارد کنید.  این نظرات به مدیران، نه مؤل� ا�زودنی، �رستاده می‌شوند."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "مقایسه با نسخهٔ عمومی"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "مشاهدهٔ محتویات"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "مؤل�ان:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "دسته‌ها:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "سازگاری:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "شرح"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "توضیحات توسعه‌دهنده"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "توا�ق‌نامهٔ مجوز کاربر نهایی"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "پرونده‌ها:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "تاریخچهٔ مورد"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "پیام نامزد شدن ا�زودنی"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "پیش‌نمایش‌ها"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
-msgstr "سیاست ح�ظ حریم خصوصی"
+msgstr "سیاست محرمانگی"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "بررسی %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "یادداشت برای بررسی‌کنندگان"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "خلاصه"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "یادداشت‌های نسخه"
 
@@ -4864,7 +4866,7 @@ msgstr "با نامزدی ا�زودنی موا�قت شد، ا�زودنی عم
 msgid "editors_review_history_nominated_denied"
 msgstr "با نامزدی ا�زودنی موا�قت نشد/ا�زودنی در گودال ماسه‌بازی باقی ماند"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "هیچ بررسی قبلی پیدا نشد."
 
@@ -4891,87 +4893,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "نمایش/پنهان‌سازی پاسخ"
 msgstr[1] "نمایش/پنهان‌سازی پاسخ‌ها (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "برنامه‌ها:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "یا یک پاسخ از پیش آماده انتخاب کنید:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "نظرها:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "سیستم‌عامل‌ها:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "بالای ص�حه"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "توجه: تنها در صورتی بیش از یک پرونده را بررسی نمایید که همهٔ آن پرونده‌ها را جداگانه آزمایش کرده باشید."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "بعدی &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "یادداشت‌های نسخه"
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; قبلی"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "ص� بررسی"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "ا�زودنی <strong>%1$s</strong> از %2$s در این ص�"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong>شمارهٔ %1$s</strong> از %2$s در ص� (صا�ی شده)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "پردازش عمل"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "عمل"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "نظرها"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "نظرها"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "بررسی‌کننده"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "نسخه/پرونده"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "د�عهٔ بعدی که این ا�زودنی به‌هنگام می‌شود به من اطلاع داده شود. (به‌هنگام‌سازی‌های بعدی باعث ارسال مجدد نامهٔ الکترونیکی نخواهند شد)"
+msgstr ""
+"د�عهٔ بعدی که این ا�زودنی به‌هنگام می‌شود به من اطلاع داده شود. (به‌هنگام‌سازی‌های "
+"بعدی باعث ارسال مجدد نامهٔ الکترونیکی نخواهند شد)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "بررسی با مو�قیت پردازش گردید."
 
@@ -4995,7 +4989,7 @@ msgstr "عمل"
 msgid "editors_reviews_in_reply_to"
 msgstr "در پاسخ به:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "بررسی با مو�قیت پردازش گردید!"
 
@@ -5007,85 +5001,87 @@ msgstr "در حال حاضر هیچ بررسی در صÙ� تعدیل وجود Ù†Ø
 msgid "editors_reviews_submit_process_reviews"
 msgstr "پردازش بررسی‌ها"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "مخصوص یک وب‌گاه"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "جدید"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "به‌هنگام شده"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "برنامهٔ مورد آزمایش"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "سیستم‌عامل‌های مورد آزمایش"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "اطلاعات اضا�ی"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "ا�زودنی"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "حذ�"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "انواع ا�زودنی"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "سن"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "برنامه‌ها"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "محدود ساختن به منطقه‌ها؟"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "مدت زمان باقی ماندن در ص�"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "مرتب‌سازی صعودی"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "سکوهای نرم‌ا�زاری"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "مرتب‌سازی نزولی"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "انواع ارسال"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s روز"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ساعت"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s دقیقه"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "دسترسی مجاز نیست"
 
@@ -5093,41 +5089,34 @@ msgstr "دسترسی مجاز نیست"
 msgid "error_access_denied_message"
 msgstr "شما مجاز به مشاهدهٔ این ص�حه نیستید."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "ا�زودنی از قبل وجود دارد!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "ا�زودنی پیدا نشد!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "این ا�زودنی قابل مشاهده در اینجا نیست."
 
@@ -5135,7 +5124,7 @@ msgstr "این ا�زودنی قابل مشاهده در اینجا نیست."
 msgid "error_addon_selfreview"
 msgstr "بررسی ا�زودنی خودتان ممکن نیست."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "هیچ ا�زودنی در این دسته وجود ندارد!"
 
@@ -5143,108 +5132,87 @@ msgstr "هیچ ا�زودنی در این دسته وجود ندارد!"
 msgid "error_collection_feed_notfound"
 msgstr "خورد وبی ا�زودنی پیدا نشد"
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "این نشانی پست الکترونیکی معتبر نیست."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "این �یلد نباید خالی باشد."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "پرونده پیدا نشد!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "خطای پرونده: %s وجود ندارد."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
-msgstr "در این �رم خطاهایی وجود دارد.  لط�اً آنها را تصحیح کنید و دوباره �رم را ارسال نمایید."
+msgstr ""
+"در این �رم خطاهایی وجود دارد.  لط�اً آنها را تصحیح کنید و دوباره �رم را ارسال "
+"نمایید."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "کد وارد شده نامعتبر است، لط�اً دوباره تلاش کنید!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "قالب این نشانی معتبر نیست. نشانی‌های معتبر مشابه htt_p://example.com/mypage هستند."
+msgstr ""
+"قالب این نشانی معتبر نیست. نشانی‌های معتبر مشابه htt_p://example.com/mypage "
+"هستند."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "آرگومان ناقص: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "پرونده‌ای در ا�زودنی وجود ندارد"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "توجه"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "پیش‌نمایش پیدا نشد!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "باید یک رتبه انتخاب کنید."
 
@@ -5252,94 +5220,80 @@ msgstr "باید یک رتبه انتخاب کنید."
 msgid "error_user_already_confirmed"
 msgstr "این حساب کاربری قبلاً تأیید شده است."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "کد تأیید نامعتبر!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "گذرواژه‌ها یکسان نبودند."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "این نشانی پست الکترونیکی توسط کاربر دیگری ثبت شده است."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "تغییر نشانی پست الکترونیکی منقضی شده است. لط�اً نشانی پست الکترونیکی خود را در مجموعه تنظیمات کاربری خود دوباره تغییر دهید و به محض دریا�ت نامهٔ تأییدیه بر روی پیوند موجود در آن کلیک کنید."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "کاربران در هر زمان می‌توانند تنها یک نقش داشته باشند. لط�اً پیش از ادامه این کاربر را از نقش‌های �علی‌اش حذ� کنید."
+msgstr ""
+"تغییر نشانی پست الکترونیکی منقضی شده است. لط�اً نشانی پست الکترونیکی خود را "
+"در مجموعه تنظیمات کاربری خود دوباره تغییر دهید و به محض دریا�ت نامهٔ تأییدیه "
+"بر روی پیوند موجود در آن کلیک کنید."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "این نام مستعار قبلاً است�اده شده است."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "کاربر پیدا نشد!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "لط�اً ابتدا توسط کدی که در یک نامهٔ الکترونیکی دریا�ت نموده‌اید، حساب کاربری خود را تأیید کنید."
+msgstr ""
+"لط�اً ابتدا توسط کدی که در یک نامهٔ الکترونیکی دریا�ت نموده‌اید، حساب کاربری "
+"خود را تأیید کنید."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "نام کاربری یا گذرواژهٔ اشتباه!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "نسخه پیدا نشد!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "گذرواژهٔ اشتباه وارد شد!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "بیشتر بدانید"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "دربارهٔ %1$s بیشتر بدانید"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s بررسی"
 msgstr[1] "%1$s بررسی"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "مشاهدهٔ موارد بیشتری از"
 
@@ -5379,144 +5333,132 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "درباره برنامه"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "وب‌نوشت"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "پرسش‌های متداول"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "پرسش‌های متداول"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "تمامی حقوق مح�وظ است."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
-msgstr "حق رونوشت‌برداری"
+msgstr "حق نسخه‌برداری"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "دست‌اندرکاران"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "موزیلا پیوندهای به این برنامه‌ها را با حسن نیت ارائه می‌دهد، و هیچ تضمینی در خصوص برنامه‌ها و یا اطلاعات دیگر مربوط به آنها نمی‌دهد.  هر گونه سؤال، شکایت یا دعوی مربوط به این برنامه‌ها باید به توزیع‌کنندهٔ نرم‌ا�زار مربوطه ارسال شود."
+msgstr ""
+"موزیلا پیوندهای به این برنامه‌ها را با حسن نیت ارائه می‌دهد، و هیچ تضمینی در "
+"خصوص برنامه‌ها و یا اطلاعات دیگر مربوط به آنها نمی‌دهد.  هر گونه سؤال، شکایت "
+"یا دعوی مربوط به این برنامه‌ها باید به توزیع‌کنندهٔ نرم‌ا�زار مربوطه ارسال شود."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "برو"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "یادداشت‌های قانونی"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "زبان‌های دیگر:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
-msgstr "سیاست ح�ظ حریم خصوصی"
+msgstr "سیاست محرمانگی"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "ارسال"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "واژه‌نامه"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "واژه‌نامه‌ها"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "ضمیمه"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "ضمیمه‌ها"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "بستهٔ زبان (ا�زودنی)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "بسته‌های زبان (ا�زودنی)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "بستهٔ زبان (برنامه)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "بسته‌های زبان (برنامه)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "متصل‌شونده"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "متصل‌شونده‌ها"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
-msgstr "موتور جست‌وجو"
+msgstr "موتور جستجو"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
-msgstr "موتورهای جست‌وجو"
+msgstr "موتورهای جستجو"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "تم"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "تم‌ها"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "همهٔ زبان‌ها"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "موزیلا"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "بازگشت به ص�حهٔ آغازهٔ ا�زودنی‌های %1$s"
@@ -5525,81 +5467,37 @@ msgstr "بازگشت به ص�حهٔ آغازهٔ ا�زودنی‌های %1$s"
 msgid "header_main_firefox_header"
 msgstr "ا�زودنی‌های �ایر�اکس"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "ا�زودنی‌های <img alt=\"�ایر�اکس\" src=\"%1$s\" /> <strong>�ایر�اکس</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "ا�زودنی‌ها"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "ا�زودنی‌ها <img alt=\"ا�زودنی‌ها\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "ا�زودنی‌های سی‌مانکی"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "ا�زودنی‌های <img alt=\"سی‌مانکی\" src=\"%1$s\" /> <strong>سی‌مانکی</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "ا�زودنی‌های سان‌برد"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "ا�زودنی‌های <img alt=\"سان‌برد\" src=\"%1$s\" /> <strong>سان‌برد</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "ا�زودنی‌های تاندربرد"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "ا�زودنی‌های <img alt=\"تاندربرد\" src=\"%1$s\" /> <strong>تاندربرد</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "پرش به منوی برنامه‌های دیگر"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "پرش به منوی دسته‌ها"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "پرش به محتوای اصلی"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "پرش به �رم جست‌وجو"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "ا�زودنی‌ها"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "ورود"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "خروج"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "حساب کاربری من"
 
@@ -5607,23 +5505,11 @@ msgstr "حساب کاربری من"
 msgid "header_navlink_register"
 msgstr "ثبت نام"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">ثبت نام</a> یا <a href=\"%2$s\">ورود</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "ابزارها"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5631,51 +5517,37 @@ msgstr "تصویر پیش‌نمایش %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "برای نصب این ا�زودنی آزمایشی <a href=\"%1$s\">وارد شوید</a>. <a href=\"%2$s\">چرا</a>؟"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "به من اجازهٔ نصب این ا�زودنی آزمایشی داده شود. <a href=\"%1$s\">یعنی چه؟</a>"
+msgstr ""
+"برای نصب این ا�زودنی آزمایشی <a href=\"%1$s\">وارد شوید</a>. <a href=\"%2$s"
+"\">چرا</a>؟"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "ا�زودن به %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "ا�زودن %1$s به %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "بارگیری %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "این ا�زودنی در دسترس نیست."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "�هرست بسته‌های زبان و واژه‌نامه‌ها."
 
@@ -5687,9 +5559,8 @@ msgstr "بارگیری واژه‌نامه"
 msgid "langtools_download_langpack"
 msgstr "بارگیری بستهٔ زبان"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "واژه‌نامه‌ها و بسته‌های زبان"
 
@@ -5701,74 +5572,36 @@ msgstr "نصب واژه‌نامه"
 msgid "langtools_install_langpack"
 msgstr "نصب بستهٔ زبان"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "واژه‌نامه"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "بستهٔ زبان"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "زبان"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "مجوز خاص"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "مجوز BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "مجوز عمومی کلی گنو، نسخهٔ ۲٫۰"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "مجوز عمومی کلی گنو، نسخهٔ ۳٫۰"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "مجوز عمومی کلی کاهش‌یا�تهٔ گنو، نسخهٔ ۲٫۱"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "مجوز عمومی کلی کاهش‌یا�تهٔ گنو، نسخهٔ ۳٫۰"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "مجوز MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "مجوز عمومی موزیلا، نسخهٔ ۱٫۱"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "برای بازگشت به ص�حهٔ اصلی اینجا را کلیک کنید."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "تاریخ"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "بارگیری‌ها"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "نام ا�زودنی"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "رتبه"
@@ -5793,21 +5626,27 @@ msgstr "سان‌برد"
 msgid "main_prettyname_thunderbird"
 msgstr "تاندربرد"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "واژه‌نامه‌ها و بسته‌های زبان"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "متصل‌شونده‌ها"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "تم‌ها"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "پیدا کردن ا�زودنی‌های برنامه‌های دیگر"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "دیگران"
 
@@ -5815,29 +5654,12 @@ msgstr "دیگران"
 msgid "page_title_appversions"
 msgstr "نسخه‌های برنامه"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "مجموعه‌ساز ا�زودنی‌ها"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "پرسش‌های متداول مجموعه‌ساز ا�زودنی‌ها"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "ویژگی‌های مجموعه‌ساز ا�زودنی‌ها"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "به مجموعه‌ساز ا�زودنی‌ها خوش آمدید"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "دست‌اندرکاران"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "پرسش‌های متداول توسعه‌دهندگان"
+msgid "page_title_experimental_addons"
+msgstr "ا�زودنی‌های آزمایشی"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5853,7 +5675,7 @@ msgstr "سیاست ا�زودنی‌ها"
 
 #: controllers/pages_controller.php:103
 msgid "page_title_privacy"
-msgstr "سیاست ح�ظ حریم خصوصی موزیلا"
+msgstr "سیاست محرمانگی موزیلا"
 
 #: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
@@ -5867,36 +5689,43 @@ msgstr "نظام بررسی گودال ماسه‌بازی"
 msgid "page_title_submissionhelp"
 msgstr "راهنمای ارسال"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "نسخه‌های معتبر برنامه"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "ا�زودنی‌هایی که به وب‌گاه ا�زودنی‌های موزیلا ارسال می‌شوند باید دارای یک پروندهٔ install.rdf با کمینه یکی از برنامه‌های پشتیبانی شدهٔ زیر باشند.  تنها نسخه‌هایی که در زیر ذکر شده‌اند برای این برنامه‌ها مجاز می‌باشند."
+msgstr ""
+"ا�زودنی‌هایی که به وب‌گاه ا�زودنی‌های موزیلا ارسال می‌شوند باید دارای یک پروندهٔ "
+"install.rdf با حداقل یکی از برنامه‌های پشتیبانی شدهٔ زیر باشند.  تنها نسخه‌هایی "
+"که در زیر ذکر شده‌اند برای این برنامه‌ها مجاز می‌باشند."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "اگر برنامه‌ای که از آن پشتیبانی می‌کنید نیازی به پروندهٔ install.rdf ندارد، باز هم باید این پرونده را با مشخصات مشخص شده %s درون ا�زودنی خود قرار دهید."
+msgstr ""
+"اگر برنامه‌ای که از آن پشتیبانی می‌کنید نیازی به پروندهٔ install.rdf ندارد، باز "
+"هم باید این پرونده را با مشخصات مشخص شده %s درون ا�زودنی خود قرار دهید."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "اینجا"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "نسخه‌ها"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "برگشتن به ص�حهٔ قبل"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "ص�حهٔ اطلاعات گودال ماسه‌بازی"
 
@@ -5904,13 +5733,21 @@ msgstr "ص�حهٔ اطلاعات گودال ماسه‌بازی"
 msgid "pagination_next_page"
 msgstr "بعدی"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "این ص�حهٔ %1$s از %2$s است"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "ص�حهٔ قبلی"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "لط�اً <strong>هر دو کلمهٔ</strong> زیر را با <strong>یک �اصله از هم</strong> وارد کنید."
+msgstr ""
+"لط�اً <strong>هر دو کلمهٔ</strong> زیر را با <strong>یک �اصله از هم</strong> "
+"وارد کنید."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5924,23 +5761,27 @@ msgstr "لط�اً آنچه را که می‌شنوید وارد نمایید."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "اگر متوجه نشدید، می‌توانید <a href=\"%1$s\">به چیز دیگری گوش دهید</a> یا <a href=\"%2$s\">به حالت متنی بازگردید</a>."
+msgstr ""
+"اگر متوجه نشدید، می‌توانید <a href=\"%1$s\">به چیز دیگری گوش دهید</a> یا <a "
+"href=\"%2$s\">به حالت متنی بازگردید</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "اگر قادر به خواندن این متن نیستید، می‌توانید <a href=\"%1$s\">واژه‌های دیگری را امتحان کنید</a> یا به جای آن <a href=\"%2$s\">به متنی گوش دهید</a>."
+msgstr ""
+"اگر قادر به خواندن این متن نیستید، می‌توانید <a href=\"%1$s\">واژه‌های دیگری "
+"را امتحان کنید</a> یا به جای آن <a href=\"%2$s\">به متنی گوش دهید</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "آیا شما یک انسان هستید؟"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "این چیست؟"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "علامت‌گذاری این بررسی با خطا مواجه شد!"
 
@@ -5948,8 +5789,7 @@ msgstr "علامت‌گذاری این بررسی با خطا مواجه شد!"
 msgid "review_flag_reason_bug_support"
 msgstr "گزارش اشکال یا تقاضای پشتیبانی نابه‌جا"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "این بررسی را (با ذکر یک دلیل) گزارش کنید"
 
@@ -5965,9 +5805,8 @@ msgstr "دلایل دیگر (لط�اً آنها را مشخص کنید)"
 msgid "review_flag_reason_spam"
 msgstr "هرزنوشته و مطلب نامربوط به بررسی"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "متشکریم؛ این بررسی برای تأیید ویرایش‌گران علامت خورد."
 
@@ -5977,155 +5816,132 @@ msgstr "گزارش این بررسی"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "آیا این بررسی نامناسب، غیر دقیق یا هرزنوشته است؟ اینجا را کلیک کنید تا آن را برای بررسی ویرایش‌گران علامت بزنید."
+msgstr ""
+"آیا این بررسی نامناسب، غیر دقیق یا هرزنوشته است؟ اینجا را کلیک کنید تا آن را "
+"برای بررسی ویرایش‌گران علامت بزنید."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>این تر�ندها را در ذهن داشته باشید:</p><ul><li>طوری بنویسید که انگار تجربهٔ خود از این ا�زودنی را برای یک دوست تعری� می‌کنید. نکات ریز و جزئیات م�ید مانند ویژگی‌هایی که دوست داشتید یا دوست نداشتید، آسانی است�اده از آن، و معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن ا�زودنی بپرهیزید مگر آن که دلایل نظر خود را نیز بیان کنید.</li><li>لط�اً گزارش مشکلات را در بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را در اختیار توسعه‌دهندگان ا�زودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند با شما تماس بگیرند تا به ر�ع مشکلتان کمک کنند. از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک گر�تن دربارهٔ است�اده از این ا�زودنی بازدید کنید.</li><li>لط�اً بررسی‌ها را عاری از ال�اظ نامناسب و یا هر گونه اطلاعات شخصی نگه دارید.</li></ul><p>لط�اً برای اطلاعات بیشتر از بررسی‌های ا�زودنی‌های کاربران، <a href=\"%2$s\">رهنمون‌های انجام بررسی</a> را مطالعه نمایید."
+msgstr ""
+"<p>این تر�ندها را در ذهن داشته باشید:</p><ul><li>طوری بنویسید که انگار تجربهٔ "
+"خود از این ا�زودنی را برای یک دوست تعری� می‌کنید. نکات ریز و جزئیات م�ید "
+"مانند ویژگی‌هایی که دوست داشتید یا دوست نداشتید، آسانی است�اده از آن، و "
+"معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن ا�زودنی بپرهیزید "
+"مگر آن که دلایل نظر خود را نیز بیان کنید.</li><li>لط�اً گزارش مشکلات را در "
+"بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را در اختیار توسعه‌دهندگان "
+"ا�زودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند با شما تماس بگیرند تا "
+"به ر�ع مشکلتان کمک کنند. از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک "
+"گر�تن دربارهٔ است�اده از این ا�زودنی بازدید کنید.</li><li>لط�اً بررسی‌ها را "
+"عاری از ال�اظ نامناسب و یا هر گونه اطلاعات شخصی نگه دارید.</li></ul><p>لط�اً "
+"برای اطلاعات بیشتر از بررسی‌های ا�زودنی‌های کاربران، <a href=\"%2$s"
+"\">رهنمون‌های انجام بررسی</a> را مطالعه نمایید."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "بررسی‌های %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "جدیدترین ا�زودنی‌ها"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "ا�زودنی‌های محبوب"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "ا�زودنی‌های به‌هنگام شده"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "جست‌وجو"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "نتایج جستجو در مجموعه‌ها"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "نتایج جستجو در مجموعه‌ها"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
-msgstr "جست‌وجو در حال حاضر غیر �عال است.  لط�اً بعداً دوباره تلاش نمایید."
+msgstr "جستجو در حال حاضر غیر �عال است.  لط�اً بعداً دوباره تلاش نمایید."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "همهٔ ا�زودنی‌ها"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "همهٔ مجموعه‌ها"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
-msgstr "جست‌وجو برای ا�زودنی‌ها"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "جست‌وجو به دنبال مجموعه‌ها"
+msgstr "جستجو برای ا�زودنی‌ها"
 
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
-msgstr "جست‌وجو برای ا�زودنی‌ها"
+msgstr "جستجو برای ا�زودنی‌ها"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
-msgstr "برای وارد کردن عبارت‌های جست‌وجو کلیک کنید"
+msgstr "برای وارد کردن عبارت‌های جستجو کلیک کنید"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "درون"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
-msgstr "همهٔ موتورهای جست‌وجو"
+msgstr "همهٔ موتورهای جستجو"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
-msgstr "مرور موتورهای جست‌وجو"
+msgstr "مرور موتورهای جستجو"
+
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s ا�زودنی مطابق"
+msgstr[1] "%s ا�زودنی مطابق"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "هیچ نتیجه‌ای پیدا نشد."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
-msgstr "جست‌وجو در ا�زودنی‌ها"
+msgstr "جستجو در ا�زودنی‌ها"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
-msgstr "خورد نتیجهٔ جست‌وجو"
+msgstr "خورد نتیجهٔ جستجو"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
-msgstr "نتایج جست‌وجو برای: %s"
+msgstr "نتایج جستجو برای: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "جدیدترین ا�زودنی‌ها"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "ابزارهای توسعه‌دهنده"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "ابزارهای ویرایش‌گر"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "خوش آمدید"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "%s، خوش آمدید"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "واژه‌نامه"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "ا�زودنی‌های پیشنهاد شده"
 
@@ -6133,42 +5949,39 @@ msgstr "ا�زودنی‌های پیشنهاد شده"
 msgid "sidebar_pitch_looking_for"
 msgstr "به دنبال یکی از این موارد می‌گردم:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "جدیدترین ا�زودنی‌ها"
 
 #: views/elements/pitch.thtml:49
 msgid "sidebar_pitch_search"
-msgstr "متصل‌شوندهٔ جست‌وجو"
+msgstr "متصل‌شوندهٔ جستجو"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "آبونه شدن"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "تم"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "ا�زودنی‌های به‌هنگام شده"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s کیلوبایت"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "هنوز رتبه‌دهی نشده است"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6188,35 +6001,31 @@ msgstr "تغییر ا�زودنی"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e %B"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e %B %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A، %e %B"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s ایجاد گردید"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s کنار گذاشته شد"
@@ -6229,194 +6038,198 @@ msgstr "بستن"
 msgid "statistics_help_link"
 msgstr "راهنما"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "یا ا�زودنی دیگری انتخاب کنید"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "یا ا�زودنی دیگری با آمار عمومی انتخاب نمایید"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "یکی از ا�زودنی‌های خود را انتخاب کنید تا آمارش را مشاهده نمایید"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "یک ا�زودنی انتخاب کنید تا آمارش را اینجا مشاهده نمایید"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "یک ا�زودنی با آمار عمومی انتخاب کنید"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "ص�حهٔ آمار"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "آمار مشاهده"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "مشاهدهٔ این جدول در قالب CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "خالی"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "حذ� این نمودار"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "گروه‌بندی بر اساس: روز"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "گروه‌بندی بر اساس: ماه"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "گروه‌بندی بر اساس: ه�ته"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "مقایسه بر اساس: ه�ته"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s مورد در این بازه پیدا شد"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "ا�زودن نمودار"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "ا�زودن نموداری دیگر به این شکل"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "پنهان کردن تعداد کل"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "نمایش تعداد کل"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "رسم تعداد کل این نمودار"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "مشاهدهٔ اطلاعات (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "دریا�ت یک پروندهٔ مقادیر جدا شده توسط ویرگول از این اطلاعات"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "پنهان کردن رویدادهای %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "تمایش رویدادهای %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "انداختن تاریخ‌های انتشار نسخه‌های ا�زودنی بر روی نمودار"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "پنهان کردن رویدادهای �ایر�اکس"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "نمایش رویدادهای �ایر�اکس"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "انداختن تاریخ‌های انتشار �ایر�اکس بر روی نمودار"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "جمع کردن شکل"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "بسط دادن شکل"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "تغییر اندازهٔ شکل"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "کاربران �عال روزانه"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "برنامه"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "س�ارشی"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "بارگیری‌ها"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "سیستم‌عامل"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "وضعیت ا�زودنی"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "خلاصه"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "نسخهٔ ا�زودنی"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "برنامه"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "سیستم‌عامل"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "وضعیت ا�زودنی"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "نامعلوم"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "نسخهٔ ا�زودنی"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "هنوز اطلاعات کا�ی برای نمایش نمودار جمع‌آوری نشده است. لط�اً بعداً تلاش نمایید."
+msgstr ""
+"هنوز اطلاعات کا�ی برای نمایش نمودار جمع‌آوری نشده است. لط�اً بعداً تلاش نمایید."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "ما هنوز از ا�زودنی شما اطلاعاتی نداریم.  لط�اً چند روز بعد مجدداً مراجعه نمایید."
+msgstr ""
+"ما هنوز از ا�زودنی شما اطلاعاتی نداریم.  لط�اً چند روز بعد مجدداً مراجعه "
+"نمایید."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "آمار ا�زودنی‌ها هم‌اکنون در حال به‌هنگام شدن است.  اطلاعات جدید ممکن است تا زمان انجام این به‌هنگام‌سازی ناقص باشد. لط�اً چند دقیقهٔ بعد دوباره تلاش نمایید."
+msgstr ""
+"آمار ا�زودنی‌ها هم‌اکنون در حال به‌هنگام شدن است.  اطلاعات جدید ممکن است تا "
+"زمان انجام این به‌هنگام‌سازی ناقص باشد. لط�اً چند دقیقهٔ بعد دوباره تلاش نمایید."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
@@ -6433,7 +6246,7 @@ msgstr "تنظیمات شما به‌هنگام شدند!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "ص�حهٔ آمار"
 
@@ -6461,103 +6274,109 @@ msgstr "کوچک‌نمایی"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "کوچک‌نمایی روی یک ماه"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "خلاصهٔ روزانهٔ آمار %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "خورد RSS از اطلاعات خلاصه"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A، %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "آمار %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "به صورت پیش‌�رض، تنها شما و موزیلا قادر به مشاهدهٔ این اطلاعات در ص�حهٔ آمار خود هستید. شما می‌توانید این ص�حه را به روی عموم بگشایید تا همه بتوانند اطلاعات ا�زودنی شما را مشاهده کنند."
+msgstr ""
+"به صورت پیش‌�رض، تنها شما و موزیلا قادر به مشاهدهٔ این اطلاعات در ص�حهٔ آمار "
+"خود هستید. شما می‌توانید این ص�حه را به روی عموم بگشایید تا همه بتوانند "
+"اطلاعات ا�زودنی شما را مشاهده کنند."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "دسترسی به آمار"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "خصوصی"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "تنها موزیلا قادر به مشاهدهٔ آمار این ا�زودنی باشد"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "ص�حهٔ آمار"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "همه بتوانند آمار این ا�زودنی را مشاهده کنند"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "تغییر تنظیمات"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "لط�اً این اطلاعات را محرمانه تقلی کنید."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "این ص�حهٔ آمار در حال حاضر <b>خصوصی</b> است."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "این ص�حهٔ آمار در حال حاضر <b>عمومی</b> است."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ق�ل شده"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "بازگشت به آمار"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "ذخیرهٔ تنظیمات"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "تنظیمات ص�حهٔ آمار %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "ق�ل نشده"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "برنامه"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "سیستم‌عامل"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "نام کوتاه"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "نامعلوم"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "نسخه"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "بارگیری‌های متوسط روزانه"
 
@@ -6565,46 +6384,37 @@ msgstr "بارگیری‌های متوسط روزانه"
 msgid "statistics_summary_downloads_heading"
 msgstr "بارگیری‌ها"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "تعداد آخرین روز"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "بارگیری‌ها در ۷ روز گذشته"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "بارگیری‌ها"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "از %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "هیچ اطلاعاتی هنوز وجود ندارد"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "متوسط کاربران �عال روزانه"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "تغییر از تعداد قبلی"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s بر %2$s"
@@ -6613,144 +6423,146 @@ msgstr "%1$s بر %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "کاربران �عال روزانه"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "کاربران �عال روزانه"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "در تاریخ %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "متوسط کاربران روزانه در این ه�ته"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s نسبت به ه�تهٔ قبل"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "آمار %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "همهٔ تم‌ها"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "مرور تم‌ها"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "تغییر نشانی پست الکترونیکی"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "تغییر گذرواژه"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "تغییر گذرواژه یا نشانی پست الکترونیکی"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "کد تأیید دوباره ارسال گردید!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "حساب کاربری %1$s با مو�قیت حذ� گردید.  اگر بعداً بخواهید بازگردید، می‌توانید در <a href=\"%2$s\">ص�حهٔ ثبت نام کاربران</a> دوباره ثبت نام کنید."
+msgstr ""
+"حساب کاربری %1$s با مو�قیت حذ� گردید.  اگر بعداً بخواهید بازگردید، می‌توانید "
+"در <a href=\"%2$s\">ص�حهٔ ثبت نام کاربران</a> دوباره ثبت نام کنید."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "اجتماع ا�زودنی‌های موزیلا، از ر�تن شما اندوهگین است."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "تأیید گذرواژه"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "هم‌اکنون حساب کاربری من را حذ� کن"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "اگر شما به عنوان <a href=\"%1$s\">مؤل� یک ا�زودنی</a> ثبت شده باشید، نمی‌توانید حساب کاربری خود را حذ� نمایید.  برای حذ� حساب کاربری خود، از یکی از اعضای دیگر تیم توسعه‌دهندگان بخواهید شما را از �هرست مؤل�ان ا�زودنی حذ� کند. پس از آن خواهید توانست در این قسمت حساب کاربری خود را حذ� نمایید."
+msgstr ""
+"اگر شما به عنوان <a href=\"%1$s\">مؤل� یک ا�زودنی</a> ثبت شده باشید، "
+"نمی‌توانید حساب کاربری خود را حذ� نمایید.  برای حذ� حساب کاربری خود، از یکی "
+"از اعضای دیگر تیم توسعه‌دهندگان بخواهید شما را از �هرست مؤل�ان ا�زودنی حذ� "
+"کند. پس از آن خواهید توانست در این قسمت حساب کاربری خود را حذ� نمایید."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "در صورتی که سؤال دیگری دارید، با %1$s تماس بگیرید."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "برای آن که بتوانیم حساب کاربری شما را حذ� کنیم، باید گزینهٔ «متوجه هستم که...» را �عال کنید."
+msgstr ""
+"برای آن که بتوانیم حساب کاربری شما را حذ� کنیم، باید گزینهٔ «متوجه هستم "
+"که...» را �عال کنید."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "لط�اً برای انجام این کار، گذرواژهٔ خود را وارد نمایید."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "خطای نامعلومی در هنگام حذ� حساب کاربری شما ات�اق ا�تاد.  لط�اً مورد را به %1$s اطلاع دهید، و ما عمل حذ� را از طر� شما انجام خواهیم داد.  از مشکل پیش‌آمده متأس�یم."
+msgstr ""
+"خطای نامعلومی در هنگام حذ� حساب کاربری شما ات�اق ا�تاد.  لط�اً مورد را به %1"
+"$s اطلاع دهید، و ما عمل حذ� را از طر� شما انجام خواهیم داد.  از مشکل پیش‌آمده "
+"متأس�یم."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "تأیید حذ� حساب کاربری"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "حذ� حساب کاربری %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "بدرود!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "از این پس قادر به ورود به وب‌گاه ا�زودنی‌های موزیلا نخواهید بود."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "با کلیک روی دکمهٔ «حذ�»، حساب کاربری شما <strong>برای همیشه حذ� خواهید گردید</strong>. این بدان معنی است که:"
+msgstr ""
+"با کلیک روی دکمهٔ «حذ�»، حساب کاربری شما <strong>برای همیشه حذ� خواهید گردید</"
+"strong>. این بدان معنی است که:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "بررسی‌ها و رتبه‌هایی که به ا�زودنی‌ها داده‌اید حذ� نخواهند شد، ولی از این پس با نام شما نمایش داده نخواهند شد."
+msgstr ""
+"بررسی‌ها و رتبه‌هایی که به ا�زودنی‌ها داده‌اید حذ� نخواهند شد، ولی از این پس با "
+"نام شما نمایش داده نخواهند شد."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "اگر مشکل خاصی دارید که امکان دارد بتوانیم در مورد آن به شما کمک کنیم، لط�اً حساب کاربری خود را �علاً پاک نکنید، و با %1$s تماس بگیرید و ما نهایت تلاش خود را برای کمک به ر�ع آن انجام خواهیم داد."
+msgstr ""
+"اگر مشکل خاصی دارید که امکان دارد بتوانیم در مورد آن به شما کمک کنیم، لط�اً "
+"حساب کاربری خود را �علاً پاک نکنید، و با %1$s تماس بگیرید و ما نهایت تلاش خود "
+"را برای کمک به ر�ع آن انجام خواهیم داد."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "متوجه هستم که این عمل قابل بازگرداندن نیست."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "کاربر حذ� شده"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "نامه‌ای به نشانی %1$s ارسال شد تا نشانی پست الکترونیکی جدیدتان را تأیید کند.  برای این که این تغییر اعمال شود، می‌توانید بر روی پیوند درون آن نامه کلیک کنید.  تا آن زمان، می‌توانید با نشانی پست الکترونیک �علی خود وارد شوید."
+msgstr ""
+"نامه‌ای به نشانی %1$s ارسال شد تا نشانی پست الکترونیکی جدیدتان را تأیید کند.  "
+"برای این که این تغییر اعمال شود، می‌توانید بر روی پیوند درون آن نامه کلیک "
+"کنید.  تا آن زمان، می‌توانید با نشانی پست الکترونیک �علی خود وارد شوید."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "حذ� حساب کاربری"
 
@@ -6763,27 +6575,35 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "به ا�زودنی‌های %2$s خوش آمدید.\n"
 "\n"
-"پیش از آن که بتوانید از حساب کاربری جدید خود است�اده کنید، باید آن را �عال سازید. این کار به ما اطمینان می‌دهد که نشانی پست الکترونیکی شما معتبر است و متعلق به شما می‌باشد.\n"
-"برای �عال کردن حساب کاربری‌تان، بر روی پیوند زیر کلیک کنید یا کل أن را درون نوار مکان مرورگر خود بچسبانید:\n"
+"پیش از آن که بتوانید از حساب کاربری جدید خود است�اده کنید، باید آن را �عال "
+"سازید. این کار به ما اطمینان می‌دهد که نشانی پست الکترونیکی شما معتبر است و "
+"متعلق به شما می‌باشد.\n"
+"برای �عال کردن حساب کاربری‌تان، بر روی پیوند زیر کلیک کنید یا کل أن را درون "
+"نوار مکان مرورگر خود بچسبانید:\n"
 "\n"
 "%1$s\n"
 "\n"
-"هنگامی که حساب کاربری‌تان را با مو�قیت �عال کردید، می‌توانید این نامه را حذ� کنید.\n"
+"هنگامی که حساب کاربری‌تان را با مو�قیت �عال کردید، می‌توانید این نامه را حذ� "
+"کنید.\n"
 "\n"
 "از پیوستن شما به ا�زودنی‌های %2$s متشکریم\n"
 "--تیم ا�زودنی‌های %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "شما درخواست تغییر نشانی پست الکترونیکی خود در ا�زودنی‌های %2$s داده‌اید.\n"
 "\n"
-"به منظور تأیید نشانی جدید، بر روی پیوند زیر کلیک کنید یا کل آن را درون نوار مکان مرورگرتان بچسبانید:\n"
+"به منظور تأیید نشانی جدید، بر روی پیوند زیر کلیک کنید یا کل آن را درون نوار "
+"مکان مرورگرتان بچسبانید:\n"
 "\n"
 "%1$s\n"
 "\n"
-"برای تأیید نشانی جدید ۴۸ ساعت �رصت دارید. اگر از تغییر نشانی پست الکترونیکی‌تان منصر� شدید۷ می‌توانید این نامه را نادیده بگیرید.\n"
+"برای تأیید نشانی جدید ۴۸ ساعت �رصت دارید. اگر از تغییر نشانی پست "
+"الکترونیکی‌تان منصر� شدید۷ می‌توانید این نامه را نادیده بگیرید.\n"
 "\n"
 "با تشکر!\n"
 "-- تیم ا�زودنی‌های %2$s"
@@ -6801,7 +6621,9 @@ msgid "user_email_pwreset"
 msgstr ""
 "بازنشانی گذرواژهٔ ا�زودنی‌های %2$s\n"
 "\n"
-"درخواستی برای بازنشانی گذرواژهٔ این حساب کاربری در addons.mozilla.org دریا�ت شده است. برای تغییر این گذرواژه، لط�اً بر روی پیوند زیر کلیک کنید، یا آن را درون نوار مکان مرورگر خود بچسبانید:\n"
+"درخواستی برای بازنشانی گذرواژهٔ این حساب کاربری در addons.mozilla.org دریا�ت "
+"شده است. برای تغییر این گذرواژه، لط�اً بر روی پیوند زیر کلیک کنید، یا آن را "
+"درون نوار مکان مرورگر خود بچسبانید:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6810,115 +6632,90 @@ msgstr ""
 "با تشکر،\n"
 "-- تیم ا�زودنی‌های %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "بازنشانی گذرواژهٔ ا�زودنی‌های %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "خطا!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "لط�اً تغییر نشانی پست الکترونیکی خود در ا�زودنی‌های %1$s را تأیید کنید"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "مو�قیت!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "نشانی پست الکترونیکی شما با مو�قیت تغییر یا�ت. از این پس، لط�اً از %1$s برای ورود است�اده نمایید."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "دربارهٔ من"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "اگر مایل هستید، خود را به اجتماع کاربران معر�ی کنید! این متن در ص�حهٔ اطلاعات کاربر شما در دسترس همگان قرار می‌گیرد.  خطوط جدید دست‌نخورده باقی می‌مانند ولی است�اده از HTML مجاز نیست."
+msgstr ""
+"نشانی پست الکترونیکی شما با مو�قیت تغییر یا�ت. از این پس، لط�اً از %1$s برای "
+"ورود است�اده نمایید."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "تأیید گذرواژه"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "مجموعه‌هایی که ایجاد کرده‌ام در ص�حهٔ اطلاعات کاربری‌ام نمایش داده شود"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "مجموعه‌های محبوبم در ص�حهٔ اطلاعات کاربری‌ام نمایش داده شود"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "ویرایش مجموعه تنظیمات کاربری %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "نشانی پست الکترونیکی"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "نام"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "پنهان کردن نشانی پست الکترونیکی"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "نشانی وب‌گاه"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "نام خانوادگی"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "ورود کاربر"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "گذرواژهٔ جدید"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "نام مستعار"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "گذرواژهٔ قدیمی"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "دیگر کارها"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "گذرواژه"
 
@@ -6926,60 +6723,67 @@ msgstr "گذرواژه"
 msgid "user_form_registration"
 msgstr "ثبت نام کاربر جدید"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "من را روی این رایانه به خاطر بسپار"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "نمایش گودال ماسه‌بازی؟"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "ارسال"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "ورود"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "ثبت نام"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "کاربر ا�زودنی‌های %s از تاریخ"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "ایجاد یک حساب کاربری جدید"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "سازگاری ا�زودنی‌ها (به شدت توصیه می‌شود)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "رویدادها و مسابقه‌های پیش رو"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "در حال حاضر هیچ اعلانی برای تنظیم کردن وجود ندارد."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "ممکن است موزیلا هر چند وقت یک بار دربارهٔ انتشارهای پیش رو و رویدادهای مربوط به ا�زودنی‌ها نامه‌ای الکترونیکی ارسال کند. لط�اً موضوعات مورد علاقهٔ خود را در ادامه انتخاب کنید:"
+msgstr ""
+"ممکن است موزیلا هر چند وقت یک بار دربارهٔ انتشارهای پیش رو و رویدادهای مربوط "
+"به ا�زودنی‌ها نامه‌ای الکترونیکی ارسال کند. لط�اً موضوعات مورد علاقهٔ خود را در "
+"ادامه انتخاب کنید:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "موزیلا حق تماس با شما را به صورت شخصی در خصوص موارد مربوط به ا�زودنی‌های‌تان برای خود مح�وظ نگه می‌دارد."
+msgstr ""
+"موزیلا حق تماس با شما را به صورت شخصی در خصوص موارد مربوط به ا�زودنی‌های‌تان "
+"برای خود مح�وظ نگه می‌دارد."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "تغییراتی که ایجاد کردید باعث ایجاد خطا گردید.  لط�اً خطاها را اصلاح کنید و �رم را دوباره ارسال نمایید."
+msgstr ""
+"تغییراتی که ایجاد کردید باعث ایجاد خطا گردید.  لط�اً خطاها را اصلاح کنید و "
+"�رم را دوباره ارسال نمایید."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "مجموعه تنظیمات به‌هنگام شد."
 
@@ -6992,15 +6796,15 @@ msgstr "گذرواژه برای %s بازنشانده شد"
 msgid "user_pwreset_header"
 msgstr "گذرواژه بازنشانده شد"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "گذرواژه‌تان را �راموش کرده‌اید؟"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "پیوند بازنشانی گذرواژه به نشانی پست الکترونیکی شما ارسال شد."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "گذرواژه با مو�قیت بازنشانده شد."
 
@@ -7012,7 +6816,7 @@ msgstr "ارسال تغییر گذرواژه"
 msgid "user_pwreset_submit_sendlink"
 msgstr "ارسال پیوند بازنشانی گذرواژه"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "ا�زودنی‌های %s"
@@ -7021,59 +6825,52 @@ msgstr "ا�زودنی‌های %s"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "پیوندی برای �عال‌سازی حساب کاربری شما به نشانی پست الکترونیکی‌تان %1$s �رستاده گردید. پیش از آن که بتوانید وارد وب‌گاه ا�زودنی‌های %2$s شوید باید بر روی آن کلیک نمایید."
+msgstr ""
+"پیوندی برای �عال‌سازی حساب کاربری شما به نشانی پست الکترونیکی‌تان %1$s �رستاده "
+"گردید. پیش از آن که بتوانید وارد وب‌گاه ا�زودنی‌های %2$s شوید باید بر روی آن "
+"کلیک نمایید."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "یک نامهٔ الکترونیک به نشانی شما %1$s �رستاده شد تا حساب کاربری‌تان تأیید شود. پیش از آن که بتوانید وارد شوید، باید حساب کاربری‌تان را با کلیک بر روی پیوند موجود در این نامه �عال کنید."
+msgstr ""
+"یک نامهٔ الکترونیک به نشانی شما %1$s �رستاده شد تا حساب کاربری‌تان تأیید شود. "
+"پیش از آن که بتوانید وارد شوید، باید حساب کاربری‌تان را با کلیک بر روی پیوند "
+"موجود در این نامه �عال کنید."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "ارسال مجدد پیام تأیید"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "به شما تبریک می‌گوییم! حساب کاربری شما با مو�قیت ایجاد گردید."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>اگر تنها مایل به بارگیری و نصب ا�زودنی‌های عمومی می‌باشید، ثبت نام در وب‌گاه ا�زودنی‌های موزیلا <strong>ضروری نیست</strong>.</p><p>تنها زمانی نیاز به ثبت نام کردن دارید که:</p><ul><li>می‌خواهید برای ا�زودنی‌ها بررسی ارسال کنید</li><li>خود یک توسعه‌دهندهٔ ا�زودنی هستید که می‌خواهید ا�زودنی‌تان برای میزبانی به وب‌گاه ا�زودنی‌های موزیلا ارسال شود</li></ul><p>پس از انجام ثبت نام با مو�قیت، شما نامه‌ای الکترونیکی در تأیید نشانی پست الکترونیکی وارد شده‌تان دریا�ت می‌نمایید. لط�اً برای تأیید حساب کاربری خود، از دستورالعمل موجود در آن نامه است�اده کنید.</p><p>اگر مایل هستید می‌توانید <a href='%1$s' title='یادداشت‌های قانونی'>یادداشت‌های قانونی</a> ما و <a href='%2$s' title='سیاست ح�ظ حریم خصوصی'>سیاست ح�ظ حریم خصوصی</a> ما را مطالعه نمایید.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "اگر نامهٔ تأییدیه را دریا�ت نکرده‌اید، اطمینان حاصل نمایید که سرویس پست الکترونیکی شما آن را به عنوان «هرزنامه» برچسب نزده باشد. اگر نیاز دارید، می‌توانید از ما درخواست %1$s به نشانی پست الکترونیکی �وق را بنمایید."
+msgstr ""
+"اگر نامهٔ تأییدیه را دریا�ت نکرده‌اید، اطمینان حاصل نمایید که سرویس پست "
+"الکترونیکی شما آن را به عنوان «هرزنامه» برچسب نزده باشد. اگر نیاز دارید، "
+"می‌توانید از ما درخواست %1$s به نشانی پست الکترونیکی �وق را بنمایید."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "از ثبت نام شما متشکریم، و به %1$s خوش آمدید!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "به وب‌گاه ا�زودنی‌های موزیلا (AMO) خوش آمدید!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "نام، نام خانوادگی، یا نام مستعار مورد نیاز است."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "مجموعه‌ها"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "اعلامیه‌ها"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "مجموعه تنظیمات کاربر"
 
@@ -7081,64 +6878,50 @@ msgstr "مجموعه تنظیمات کاربر"
 msgid "user_verified_okay"
 msgstr "با مو�قیت تأیید گردید!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "حذ� حساب کاربری"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "ویرایش حساب کاربر"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "دربارهٔ من"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "ا�زودنی‌های %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "نام"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "مجموعه تنظیمات کاربر"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "مجموعه‌های ایجاد شده توسط %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "نشانی پست الکترونیکی"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "مجموعه‌های محبوب"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "ص�حهٔ آغازه"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "نام مستعار"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "اطلاعات کاربری %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "بررسی توسط %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "ورود کاربر"
 
@@ -7147,102 +6930,25 @@ msgstr "ورود کاربر"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "ا�زودنی که به دنبالش هستید اکنون در گودال ماسه‌بازی است. اگر یک حساب کاربری در وب‌گاه ا�زودنی‌های موزیلا دارید، لط�اً وارد شوید، یا <a href=\"%1$s\">در مورد گودال ماسه‌بازی بیشتر بدانید</a>."
+msgstr ""
+"ا�زودنی که به دنبالش هستید اکنون در گودال ماسه‌بازی است. اگر یک حساب کاربری "
+"در وب‌گاه ا�زودنی‌های موزیلا دارید، لط�اً وارد شوید، یا <a href=\"%1$s\">در "
+"مورد گودال ماسه‌بازی بیشتر بدانید</a>."
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "ص�حه‌ای که به دنبالش هستید بخشی از گودال ماسه‌بازی است. اگر یک حساب کاربری در وب‌گاه ا�زودنی‌های موزیلا دارید، لط�اً وارد شوید، یا <a href=\"%1$s\">در مورد گودال ماسه‌بازی بیشتر بدانید</a>."
+msgstr ""
+"ص�حه‌ای که به دنبالش هستید بخشی از گودال ماسه‌بازی است. اگر یک حساب کاربری در "
+"وب‌گاه ا�زودنی‌های موزیلا دارید، لط�اً وارد شوید، یا <a href=\"%1$s\">در مورد "
+"گودال ماسه‌بازی بیشتر بدانید</a>."
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "بازنشانی گذرواژهٔ کاربر"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "ثبت نام کاربر جدید"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "مجوز کد منبع برای ا�زودنی %1$s نسخهٔ %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "مشاهدهٔ همهٔ موارد به تازگی اضا�ه شده"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "مشاهدهٔ همهٔ موارد با بیشترین تعداد بارگیری"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "مشاهدهٔ همهٔ موارد با بالاترین رتبه"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "ا�زودنی بعدی"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "ا�زودنی قبلی"
-#~ msgid "addons_display_version_history"
-#~ msgstr "تاریخچهٔ کامل نسخه‌ها"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "جدیدترین ا�زودنی‌ها:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "محبوب‌ترین ا�زودنی‌ها:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "پیشنهاد ما:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "ا�زودنی‌های به تازگی به‌هنگام شده:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "مشاهدهٔ همهٔ ا�زودنی‌ها"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "مشاهدهٔ تمام ا�زودنی‌های پیشنهاد شده"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "تقدم با بالاترین رتبه‌ها"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "تقدم با تازه‌ترین به‌هنگام‌سازی‌ها"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "تقدم با محبوب‌ترین‌ها"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "در حال بارگیری"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "نمایش اطلاعات بیشتر"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "چندین بررسی ا�زودنی توسط کاربران (می‌تواند شامل بررسی‌های خارجی هم باشد)."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "قبول دارم"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "قبول ندارم"
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "جدید"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "به‌هنگام شده"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "سن ا�زودنی"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "انواع ا�زودنی"
-#~ msgid "editors_th_applications"
-#~ msgstr "برنامه‌ها"
-#~ msgid "editors_th_platforms"
-#~ msgstr "سکوهای نرم‌ا�زاری"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "انواع ارسال"
-#~ msgid "forum_save"
-#~ msgstr "ذخیره کردن"
-#~ msgid "home"
-#~ msgstr "آغازه"
-#~ msgid "nav_category_plugins"
-#~ msgstr "متصل‌شونده‌ها"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "این ص�حهٔ %1$s از %2$s است"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s ا�زودنی مطابق"
-#~ msgstr[1] "%s ا�زودنی مطابق"
-
diff --git a/site/app/locale/fi/LC_MESSAGES/messages.po b/site/app/locale/fi/LC_MESSAGES/messages.po
index ac8d775..40c5aa5 100644
--- a/site/app/locale/fi/LC_MESSAGES/messages.po
+++ b/site/app/locale/fi/LC_MESSAGES/messages.po
@@ -16,172 +16,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Peruuta asennus"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Lataa %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Hyväksy ja lataa"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Hyväksy ja asenna"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Julkinen"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Hiekkalaatikko"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versio %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "latausta"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads_weekly"
 msgstr "weekly downloads"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s lisäosa luokassa \"%2$s\""
 msgstr[1] "%1$s lisäosaa luokassa \"%2$s\""
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "yhdellä sivulla"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Järjestys:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "kokeellinen"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "suositeltu"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ei ole saatavilla alustalle %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Palaa lisäosaan %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Palaa arvosteluihin..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Pisteitä:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Arvostelu:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Lähetä arvostelu"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Kirjoita arvostelu lisäosalle %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Otsikko tai yhteenveto:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Poista"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Vastaa"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Poistetaanko arvostelu?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Ei"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Kyllä"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Poista arvostelu"
 
@@ -190,7 +181,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Arvostelu poistettiin."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Muokkaa lisäosan %s arvostelua"
@@ -204,18 +195,18 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Huom.: Toimitus tarkistaa arvostelusi sisällön asiallisuuden ennen kuin se "
 "julkaistaan sivustolla."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Tekijän vastaus:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -232,32 +223,46 @@ msgid "addon_review_pagetitle"
 msgstr "Arvostelut lisäosasta %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Vastauksen kirjoitti %1$s %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Tekijän vastaus:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Arvostelusi tallennettiin. Kiitos vaivannäöstä!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
-#, fuzzy
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, fuzzy, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "by %1$s on %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "Arvostelun kirjoitti %1$s %2$s (pisteitä %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -265,147 +270,94 @@ msgstr "Permanent link to this version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Selaa %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Kirjoita arvostelu"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Lisätietoja"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Luokat"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "yksityiskohtainen arvostelu"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "En pidä"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Muokkaa arvosteluasi"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Lisäosalla on tietosuojakäytäntö"
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Vihaan"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Tekijän kommentteja"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Arvostelut"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pidän"
 
@@ -413,23 +365,19 @@ msgstr "Pidän"
 msgid "addons_display_long_description"
 msgstr "Pitkä kuvaus"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Rakastan"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Lisää kuvia"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -439,14 +387,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -460,7 +408,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -474,7 +422,7 @@ msgstr ""
 "upcoming version."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -486,15 +434,16 @@ msgstr ""
 "post a review, they will not be able to contact you to ask for more details "
 "or let you know if the bug has been fixed in an upcoming version."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Pisteytä lisäosa"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Tosissaan pidän"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -503,49 +452,53 @@ msgstr ""
 "resolve your issue."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Näytä kaikki \"%1$s\" lisäosat"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Näytä kaikki arvostelut (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 #, fuzzy
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Täydellinen versiohistoria"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Näytä lähdekoodi"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Näytä tilastotietoja"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Mitä mieltä olet?"
 
@@ -553,95 +506,24 @@ msgstr "Mitä mieltä olet?"
 msgid "addons_display_workswith"
 msgstr "Toimii seuraavilla ohjelmaversioilla:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "Tekijänä"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Suosittelemme"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -649,133 +531,88 @@ msgstr ""
 "toimimaan haluamallasi tavalla. Tutki eri vaihtoehtoja ja tee %1$sista "
 "itsesi näköinen."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
+#: views/addons/home.thtml:201
 #, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Muut ohjelmat"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$sin lisäosat"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Suosituimpia:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Suosittelememme:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+#, fuzzy
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Näytä kaikki"
+
+#: views/addons/home.thtml:209
 #, fuzzy
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Näytä kaikki suositus lisäosat"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Näytä kaikki suositellut lisäosat"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 #, fuzzy
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -783,12 +620,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Napsauta alla olevaa linkkiä hiiren oikealla painikkeella ja valitse "
@@ -797,42 +634,39 @@ msgstr ""
 "Työkalut-valikosta.</li><li>Napsauta Asenna-painiketta, valitse edellä "
 "tallentamasi asennustiedosto ja napsauta OK-painiketta.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Lisäosan asentaminen Thunderbirdiin"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "näytä kokeelliset lisäosat"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Valmis"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Tekijänä"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linuxille"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X:lle"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windowsille"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -840,11 +674,11 @@ msgstr ""
 "Voit lukea muista Mozilla-pohjaisille selaimille olemassa olevista "
 "liitännäisistä sivulta %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Eikö etsimääsi liitännäistä löytynyt?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Liitännäisten avulla selaimet kykenevät näyttämään tiettyjä kuva- tai "
@@ -853,24 +687,24 @@ msgstr ""
 "selaimen toimintaa."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "keskeisimmät liitännäiset"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Liitännäiset"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Ohjeita ongelmatilanteisiin: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -878,43 +712,38 @@ msgstr ""
 "(EULA) hyväksytään:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Esikatselukuvat lisäosasta %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Lisäosia on niin paljon, että jokaiselle löytyy jotakin mieleistä. Alle on "
 "listattu muutama suosittu lisäosa, jotta pääsisit vauhtiin. Pidä hauskaa!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Suositeltuja lisäosia"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "suositeltuja lisäosia"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 #, fuzzy
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Ikävä kyllä näitä hakukoneita voi asentaa vain Mozilla-pohjaisiin selaimiin "
@@ -929,48 +758,47 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Learn how to %1$s at the %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_link"
 msgstr "make your own"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Browse through more search engines at %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Hakukoneet"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 #, fuzzy
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Special thanks to the Mycroft Project for their work on Firefox Search "
 "Engines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1015,19 +843,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1038,39 +866,27 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Olethan aina varovainen vanhojen versioiden kanssa"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Nämä versiot ovat esillä vain testaus- ja referenssimielessä. On aina "
 "suositeltua käyttää lisäosan viimeisintä versiota."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Versiohistoria muutostietojen kera"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versiohistoria"
@@ -1105,149 +921,137 @@ msgstr "Ryhmän ylläpitäjä"
 msgid "admin_group_saved"
 msgstr "Ryhmä on tallennettu"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 #, fuzzy
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 #, fuzzy
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 #, fuzzy
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 #, fuzzy
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 #, fuzzy
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 #, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 #, fuzzy
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 #, fuzzy
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 #, fuzzy
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 #, fuzzy
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 #, fuzzy
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 #, fuzzy
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 #, fuzzy
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 #, fuzzy
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 #, fuzzy
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 #, fuzzy
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 #, fuzzy
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 #, fuzzy
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 #, fuzzy
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 #, fuzzy
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 #, fuzzy
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 #, fuzzy
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 #, fuzzy
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 #, fuzzy
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Tämä lisäosa on tarkoitettu vanhemmille versioille Firefoxista"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1255,347 +1059,45 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">Aikaisempi versio</a> lisäosasta saattaa toimia"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Päivitä Firefoxisi</a> asentaaksesi tämän "
 "lisäosan"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1605,862 +1107,47 @@ msgid "categories_current_title"
 msgstr "Valittu luokka"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Luokat"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Valitse luokka"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Näytä kaikki luokassa \"%1$s\""
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Näytä kaikki suositellut lisäosat"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Korkeimmin pisteytetty ensin"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Viimeisin päivitys ensin"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Suosituin ensin"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Näytä kaikki luokassa \"%1$s\""
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2468,71 +1155,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2541,26 +1228,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2568,108 +1255,108 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Lue lisätietoja avustamisesta %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki-sivultamme"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla haluaa kiittää seuraavia ihmisiä monta vuotta kestäneestä "
 "uutteruudesta addons.mozilla.orgin parissa:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Kehittäjät"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Toimittajat"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Lokalisoijat"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Muut avustajat"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Aikaisemmat kehittäjät"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 #, fuzzy
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 #, fuzzy
 msgid "credits_software_famfamfam"
 msgstr ""
@@ -2678,7 +1365,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2689,20 +1376,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e.%m.%Y"
 
@@ -2737,25 +1421,25 @@ msgstr "Tilastosivu"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2764,6 +1448,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(tunnista automaattisesti)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, fuzzy, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Avautuu uuteen ikkunaan"
@@ -2800,76 +1497,141 @@ msgstr "5. kohta: onnellinen loppu"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Apua lisäosan lisäämiseen"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Lisäosan poisto käytöstä onnistui"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Muokkaa lisäosaa"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Lisäosan käyttöönotto onnistui"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Lisäosan kuvaus"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Lisäosan kotisivu"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Lisäosan nimi"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Esikatselun kuvateksti"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Tietosuojakäytäntö"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Lisäosan yhteenveto"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Tukisähköpostiosoite"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Tukisivu"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Versiotietoja"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Lisäosan ehdottaminen julkiselle puolelle"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Lisäosaa ehdotettiin julkiselle puolelle."
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2905,7 +1667,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2915,6 +1677,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2926,13 +1693,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2942,7 +1709,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2952,12 +1719,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2966,14 +1733,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3052,13 +1819,120 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr "Siirry %1$s-sivulle muuttaaksesi lisäyksesi tietoja tai palaa %2$s."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "kehittäjän ohjauspaneeliin"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Muokkaa lisäosaa"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Tämä versio lisäosasta on laitettu hiekkalaatikkoon siksi aikaa kunnes jokin "
+"hiekkalaatikkotestaaja arvioi ja sivuston ylläpitäjä tarkastaa sen. Lisäosan "
+"tilan muutoksista ilmoitetaan sinulle sähköpostitse."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Lue lisää %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "hiekkalaatikon tarkastusjärjestelmästä"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Tämä versio lisäosasta on laitettu hiekkalaatikkoon vain kokeneille "
+"käyttäjille. Aseta lisäosasi %s, jotta se tarkistettaisiin sivuston "
+"julkiselle puolelle lisäystä varten."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "ehdolle"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Lisäosasi lisättiin sivustolle."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Lisäosasi luokitellaan luotettavaksi ja se on automaattisesti hyväksytty ja "
+"lisätty sivuston julkiselle puolelle."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Lähetä lisäosa"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Lisäosa päivittiin"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Kasvata lisäosasi käyttäjäkuntaa lisäämällä siitä sivulle %s."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "esikatselukuvia"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Tekijää ei löytynyt [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Poista"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Peruuta"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Peruutetaanko lisäosan lisäys?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Seuraava"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Muuta lisäosan tyyppiä:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Tekijän kommentit päivitettiin."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3135,37 +2009,182 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Lisää esikatselu"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Tekijä"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Tekijät"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Ei kukaan"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Luokat"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Luokka"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Kuvaus"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Poistettu käytöstä"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Lisätiedot"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Tekijän kommentit"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Esikatselut"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versiot"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Kotisivu"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Ei mitään"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Ei kuvatekstiä"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Ei esikatselukuvia."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Päivitä"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Tukisähköpostiosoite"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Tekijä ei ole kirjoittanut tukisähköpostin osoitetta."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Tukisivu"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Tekijä ei ole kirjoittanut tukisivun osoitetta."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Luotettu"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versio %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Versioita ei löytynyt."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Hylkää ja palaa"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Kyllä, poista saatavilta"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Poistetaanko tämä lisäosa saatavilta?"
+
+#: views/developers/disable.thtml:56
+#, fuzzy
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Poista %s saatavilta"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Kyllä, palauta saataville"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Palautetaanko lisäosa saataville?"
+
+#: views/developers/disable.thtml:49
+#, fuzzy
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Palauta %s saataville"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3219,62 +2238,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Lisää tekijä"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Tekijän sähköpostiosoite"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Poista"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3287,30 +2318,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3389,22 +2420,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3413,12 +2444,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3426,12 +2457,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3440,24 +2471,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3465,7 +2496,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3490,43 +2521,108 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Lisäosatyypille ei ole luokkia."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Tekijät"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Lisää kuvake"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Muuta kuvaketta"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Lähdekoodi on käyttäjien tarkasteltavissa"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Luokat"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Oletuslokaali"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr ""
 "Tämä lisäosa tarvitsee toimiakseen erikseen jaeltavan, itsenäisen ohjelman"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Poista vain nykyinen kuvake"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Uusi kuvaketiedosto"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Kuvake"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Lisätietoja lokaalista"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Tämä on esijulkaisuversio"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Tämä on sivustokohtainen lisäosa"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Kohdelokaali"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "lisätietoja lyhyesti (kuten paikallisen murteen nimi)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3534,12 +2630,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3547,60 +2643,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3609,32 +2705,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3642,22 +2738,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3665,12 +2761,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3678,39 +2774,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Päivitä"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">yksinkertaiset "
+"lokaalinimet</a> kuten \"en-US\""
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3797,14 +2903,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Odottaa päivitystä (%s)"
 msgstr[1] "Odottavat päivitystä (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Valitut tiedostot poistetaan."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Tiedostot"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Ohjelmat, johon asennettavissa"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Ei tiedostoja."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Huomautuksia tarkastajalle"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Päivitä"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Sinulle ei ole oikeutta muokata tätä lisäosaa."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Yhteenveto voi olla enintään 250 merkkiä pitkä.\n"
+"(Kirjoitit %s merkkiä)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Saman niminen lisäosa on jo tietokannassa. Tarkista, että: <br /><li>Käytät "
+"oikeaa tunnusta (GUID). Sekaannus tunnuksen kanssa on tavanomainen syy "
+"tällaiseen virheeseen.</li><li>Ettet ole lisännyt lisäosaa kahdesti "
+"tietokantaan. Jos näin on käynyt, päivitä vanhaa merkintää tai poista se ja "
+"yritä uudelleen.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3818,10 +2979,9 @@ msgstr "Lue %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "referenssisivu"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Kuvaile lisäosaan tehtyjä päivityksiä."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3840,6 +3000,10 @@ msgstr ""
 "Tiedostopääte (%s) ei ole kelvollinen valitun tyyppiselle lisäosalle. Oikea "
 "pääte on: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Kaikkien tiedostojen GUID:t eivät täsmää"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Älä valitse yli viittä luokkaa."
@@ -3874,7 +3038,14 @@ msgstr ""
 "Tiedostopääte %s ei ole kelvollinen kuvakkeelle. Kuvakkeen tiedostopäätteen "
 "tulee olla jokin seuraavista: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Identtinen versio (%s) lisäosasta tällä alustalla on jo olemassa."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Install.rdf-tiedostoa ei löytynyt."
 
@@ -3882,7 +3053,7 @@ msgstr "Install.rdf-tiedostoa ei löytynyt."
 msgid "devcp_error_install_manifest"
 msgstr "Seuraavat virheet havaittiin install.rdf:ssä:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Valitse kelvollinen lisäosatyyppi."
 
@@ -3954,6 +3125,20 @@ msgstr "Lisäosan tunnusta (GUID) ei löytynyt install.rdf:stä."
 msgid "devcp_error_no_platform"
 msgstr "Alustaa ei valittu"
 
+#
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Pyydetyt tiedot täytyy antaa asetettaessa lisäosaa ehdolle."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr ""
+"Et voi ehdottaa lisäosan esijulkaisuversioita sivuston julkiselle puolelle."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Voit asettaa ehdolle ainoastaan lisäosia, jotka ovat hiekkalaatikossa."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Valitse ainakin yksi luokka."
@@ -3971,6 +3156,16 @@ msgstr ""
 "Tiedostopääte %s ei ole kelvollinen esikatselukuvalle. Kuvan "
 "tiedostopäätteen tulee olla jokin seuraavista: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Tietojen tallennus ei onnistunut."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Sinulla ei ole oikeutta päivittää lisäosan tietoja."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3983,98 +3178,291 @@ msgstr ""
 "Lisäosalla ei voi olla AMOn ulkopuolista päivitys URL:ää (updateURL). Poista "
 "päivitysosoite install.rdf:stä ja yritä uudelleen."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Siirrä tiedosto."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Lisää alustakohtainen tiedosto"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Lisää tekijä"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Poista"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Voit asettaa uudelle lisäosalle sopivat luokat seuraavassa kohdassa."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Lisäosatyypille ei ole luokkia."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Kirjoita kuvaus lisäosasta."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Kirjoita lisäosan nimi."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Valitse lisäosan tyyppi."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Kirjoita yhteenveto lisäosasta."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Lisäosatiedosto"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "2. lisäosatiedosto"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "3. lisäosatiedosto"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Lisäosan tyyppi"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Lisäosan lähdekoodi on käyttäjien luettavissa"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Tekijän sähköpostiosoite"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Tekijät"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Luokat"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Oletuslokaali"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Kuvaus"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Loppukäyttäjän lisenssisopimus (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Lisäosa tarvitsee toimiakseen erikseen jaeltavan, itsenäisen ohjelman"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Tiedostot"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Kotisivu"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Kuvaketiedosto"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nimi"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Tuetut alustat"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Tämä on esijulkaisuversio"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Tietosuojakäytäntö"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Lisäosa on sivustokohtainen"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Yhteenveto"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Tukisähköpostiosoite"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Tukisivu"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Ohjelmat, joihin asennettavissa"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versio"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Versiotiedot"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Ei mitään"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Huomautuksia lisäosan tarkastajalle"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "Lisäosasi on luotettu. Valitse lisäosan sijainti sivustolla:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Julkinen"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Hiekkalaatikko"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Kehittäjäsopimus"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1. kohta"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Tiedostonsiirto"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2. kohta"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Lisäosan tiedot"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3. kohta"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Versiotiedot"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4. kohta"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalisointi"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5. kohta"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Onnellinen loppu"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Lisäosani"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalisoidut kentät"
@@ -4090,12 +3478,12 @@ msgstr ""
 "näytetään oletuslokaalin kuvaus (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Ylläpitäjän ohjauspaneeli"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Toimittajan ohjauspaneeli"
 
@@ -4104,28 +3492,28 @@ msgid "devcp_myaddons_link"
 msgstr "Lisäosani"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Palaa etusivulle"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Tilastosivu"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Lähetä lisäosa"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Kehittäjän työkalut"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4137,26 +3525,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Palaa lisäosan tietoihin"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Ehdota lisäosaa %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automaattisesti tunnistettu lisäosatyyppi: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4170,6 +3569,18 @@ msgstr ""
 "Jostain toisesta kuvasta tulee oletuskuva jos nykyinen oletuskuva muutetaan "
 "normaaliksi esikatselukuvaksi."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Tämän lisäosan oletuslokaali, eli kieli- ja maa-asetus, (%1$s [%2$s]) eroaa "
+"käytössä olevasta lokaalista (%3$s [%4$s]). Lisäosan kuvaus tulee täyttää "
+"kielellä \"%1$s\"."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4177,14 +3588,14 @@ msgstr ""
 "Kuvan muuttaminen oletuskuvaksi muuttaa aikaisemman oletusesikatselukuvan "
 "normaaliksi kuvaksi."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4213,46 +3624,46 @@ msgstr "Muokkaa esikatselua"
 msgid "devcp_preview_updated_successfully"
 msgstr "Esikatselun päivittäminen onnistui"
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4260,7 +3671,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4278,7 +3689,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Lisää esikatselukuva"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4287,7 +3698,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Muokkaa esikatselukuvaa"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4300,27 +3711,27 @@ msgstr "Esikatselutiedosto"
 msgid "devcp_previews_label_makedefault"
 msgstr "Aseta kuva oletusesikatselukuvaksi"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4344,18 +3755,26 @@ msgstr "Muokkkaa esikatselukuvaa"
 msgid "devcp_previews_submit_upload"
 msgstr "Siirrä kuva"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Virheellinen?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Poistetaanko tiedosto?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "Lue ja hyväksy seuraava kehittäjäsopimus ennen kuin jatkat."
 
@@ -4366,7 +3785,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4378,6 +3797,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Ohita lisäosan tietojen tarkistaminen"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4481,17 +3904,61 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Lisäosia ei juuri nyt voi lähettää. Kokeile myöhemmin uudestaan."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Hyväksyn"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "En hyväksy"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Ylläpito on poistanut tämän lisäosan käytöstä."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Poistettu käytöstä"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Luotettu"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Viimeisin versio:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Sinulla ei ole yhtään lisäosia. %s."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "Lisää sellainen"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "%s teemastasi."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "Siirräthän esikatselukuvan"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4499,44 +3966,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4546,7 +4013,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4554,64 +4021,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4620,7 +4087,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4632,33 +4099,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4671,29 +4133,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4704,12 +4166,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4733,23 +4195,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4758,7 +4215,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4767,14 +4224,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4784,7 +4241,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4792,7 +4249,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4800,22 +4257,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4834,29 +4285,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Lue %s."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "lisätietoja"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Muokkaa versiota"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versio päivitettiin."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4925,34 +4379,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4960,49 +4414,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -5012,59 +4461,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5073,26 +4515,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5135,7 +4577,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Lisäosa on poistettu käytöstä"
 
@@ -5186,7 +4628,7 @@ msgstr "Suodata"
 msgid "editorcp_logs_filter_by"
 msgstr "Suodata tyypin ja toimen suhteen"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Tapahtumaloki"
 
@@ -5248,7 +4690,7 @@ msgstr "Näytä merkinnät aikavälillä %s - %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Ei tarkastuksia annetulla aikavälillä."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Tarkastusloki"
 
@@ -5272,24 +4714,24 @@ msgstr "Toimittajan viimeaikaiset toimet"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Tarkastuksia yhteensä"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Tarkasta lisäosa"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Täytä seuraavat kentät:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Valitse ainakin yksi tarkastettava tiedosto."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Omia lisäosiaan ei voi tarkastaa."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Kolmannen osapuolen ohjelma"
 
@@ -5301,39 +4743,39 @@ msgstr "Lisää ominaisuus"
 msgid "editors_featured_add_feature_submit"
 msgstr "Lisää"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Ominaisuuden lisäys epäonnistui."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Ominaisuuden lisäys onnistui."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Ominaisuuden muokkaus ei onnistunut."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Ominaisuuden muokkaus onnistui."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Yksi tai useampi lokaali on virheellinen."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Ominaisuuden poisto ei onnistunut."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Ominaisuuden poisto onnistui."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Näytteillä olevat lisäosat"
 
@@ -5345,166 +4787,103 @@ msgstr "Valmis"
 msgid "editors_featured_remove_feature"
 msgstr "Poista ominaisuus"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Suodatettu jono"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Hyödyllisiä linkkejä"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Toimittajan opas"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Lisäosakäytäntö"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Nämä suodattimet poistuvat istunnon loputtua tai kun ne poistetaan."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Tällä hetkellä ei ole yhtään tarkastettavia %sin lisäosia."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 päivä"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 tunti"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuutti"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Toimittajan ohjauspaneeli"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Vain %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Esijulkaisu"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s yhteensopivuus"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Tyhjennä"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Suodatin"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Kaikki tarkastusjonot ovat pois päältä. Yritä myöhemmin uudestaan."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Tarkastustoimi"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Siirrä julkiselle puolelle"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Pyydä Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Säilytä hiekkalaatikossa"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Tarkastuskommentit"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5512,103 +4891,103 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Tämä valinta merkitsee lisäosan ja sen tiedostojen uusimmat versiot "
 "julkiseksi. Tulevat versiot jäävät odottomaan tarkastusta hiekkalaatikkoon."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Tämä valinta jättää lisäosan hiekkalaatikkoon."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Tämä valinta hyväksyy hiekkalaatikossa olevan uuden version julkisella "
 "puolella olevasta lisäosasta."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Tämä valinta jättää hiekkalaatikossa olevan uuden version julkisella "
 "puolella olevasta lisäosasta hiekkalaatikkoon."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Jos uskot, että ylläpitäjän tulisi tarkistaa tämä lisäosa turvallisuus-, "
 "tekijänoikeus- tai muiden ongelmien takia, kirjoita tästä kommentteihin "
 "alle. Kommentteja ei lähetetä lisäosan tekijälle vaan vain ylläpidolle."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Näytä sisältö"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Tekijät:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Luokat:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Yhteensopivuus:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Kuvaus"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Kehittäjän kommentit"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Tiedostot:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Kohteen historia"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Viesti ehdolle asettamista"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Esikatselukuvat"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Tietosuojakäytäntö"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Tarkasta %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Kommentit tarkastajalle"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Yhteenveto"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versiokommentit"
 
@@ -5638,7 +5017,7 @@ msgstr "Ehdotus hyväksytty/julkinen"
 msgid "editors_review_history_nominated_denied"
 msgstr "Ehdotus hylätty/hiekkalaatikko"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Aikaisempia tarkastusmerkintöjä ei löytynyt."
 
@@ -5666,96 +5045,83 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Ohjelmat:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "tai valitse evätty vastaus:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentit:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Käyttöjärjestelmät:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Alkuun"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Esikatselukuvia ei löytynyt."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Tarkastusjono"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Käsittele toiminnot"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Toiminto"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentit"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Päiväys"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Arvostelija"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versio/tiedosto"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Arvostelu käsiteltiin."
 
@@ -5781,7 +5147,7 @@ msgstr "Toiminto"
 msgid "editors_reviews_in_reply_to"
 msgstr "Vastauksena kysymykseen:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Arvostelut käsiteltiin."
 
@@ -5793,82 +5159,87 @@ msgstr "Yhtäkään arvostelua ei ole tarkistettavana."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Käsittele arvostelut"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sivustokohtainen"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Uusi"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Päivitetty"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testattu ohjelma"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testatut käyttöjärjestelmät"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Lisätietoja"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Lisäosa"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tyyppi"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Lisäosatyypit"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Ikä"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Ohjelmat"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Rajoitetaanko lokaaleihin?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Alustat"
 
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
-
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Lähetystyyppi"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s päivää"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s tuntia"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuuttia"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Yhteys estetty"
 
@@ -5876,19 +5247,17 @@ msgstr "Yhteys estetty"
 msgid "error_access_denied_message"
 msgstr "Sinulla ei ole oikeutta avata sivua."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5897,14 +5266,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Lisäosaa ei löytynyt."
 
@@ -5917,55 +5283,59 @@ msgstr "Lisäosa ei ole esillä täällä."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Tässä luokassa ei ole lisäosia."
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Tämä sähköpostiosoite on virheellinen."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Tämä kenttä ei voi olla tyhjä."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Tiedostoa ei löytynyt."
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Tiedostovirhe: %s ei ole olemassa."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Lomakkeessa on virheitä. Korjaa virheet ja lähetä lomake uudestaan."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "URL:n muoto on virheellinen. Oikean muotoiset URL:it ovat muotoa http://"
@@ -5973,47 +5343,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Valinta puuttuu: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Huomautus"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Esikatselukuvaa ei löytynyt."
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -6022,24 +5380,24 @@ msgstr "You must select a rating."
 msgid "error_user_already_confirmed"
 msgstr "Käyttäjätili on jo varmistettu."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Virheellinen varmistuskoodi!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Salasanat eivät täsmää."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Sähköpostiosoite on jo toisen käyttäjätunnuksen varaama."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6047,23 +5405,14 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Käyttäjätunnus on jo varattu."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Käyttäjää ei löytynyt."
 
@@ -6071,42 +5420,39 @@ msgstr "Käyttäjää ei löytynyt."
 msgid "error_user_unconfirmed"
 msgstr "Varmista käyttäjätilisi koodilla, jonka sait sähköpostitse."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Virheellinen käyttäjätunnus tai salasana."
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versiota ei löytynyt."
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Virheellinen salasana."
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Lue lisää"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lue lisää lisäosasta %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "arvostelu"
 msgstr[1] "arvostelua"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Näytä lisää luokasta"
 
@@ -6150,141 +5496,133 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Kaikki oikeudet pidätetään."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Tekijänoikeudet"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Tekijät"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla tarjoaa linkit näihin ohjelmiin hyvässä tahdossa eikä vastaa "
 "ohjelmista tai niistä esitetyistä tiedoista. Kaikki kysymykset, valitukset "
 "ja vaatimukset ohjelmista tulee osoittaa kyseisen ohjelman tekijälle."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Siirry"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Lakipykälät"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Muut kielet:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Tietosuojakäytäntö"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Tallenna"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Oikolukusanasto"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Oikolukusanastot"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Laajennus"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Laajennukset"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Kielipaketti (lisäosan)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Kielipaketit (lisäosan)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Kielipaketti (ohjelman)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Kielipaketit (ohjelman)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Liitännäinen"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Liitännäiset"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Hakukone"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Hakukoneet"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Teema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Teemat"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Palaa lisäosan %1$s kotisivulle"
@@ -6293,95 +5631,37 @@ msgstr "Palaa lisäosan %1$s kotisivulle"
 msgid "header_main_firefox_header"
 msgstr "Firefoxin lisäosat"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "lisäosat"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkeyn lisäosat"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbirdin lisäosat"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbirdin lisäosat"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Lisäosat"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Kirjaudu sisään"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Kirjaudu ulos"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Tilini"
 
@@ -6389,70 +5669,47 @@ msgstr "Tilini"
 msgid "header_navlink_register"
 msgstr "Rekisteröidy"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Esikatselukuva lisäosasta %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Kirjaudu sisään</a> asentaaksesi lisäosan"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Asenna %s %siin"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Asenna lisäosa %1$s %2$siin"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Lataa %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Lisäosa ei ole saatavilla."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 #, fuzzy
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
@@ -6465,8 +5722,8 @@ msgstr "Lataa oikolukusanasto"
 msgid "langtools_download_langpack"
 msgstr "Lataa kielipaketti"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Oikolukusanastot ja kielipaketit"
 
@@ -6478,81 +5735,37 @@ msgstr "Asenna oikolukusanasto"
 msgid "langtools_install_langpack"
 msgstr "Asenna kielipaketti"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Oikolukusanasto"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Kielipaketti"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Kieli"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Päiväys"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Lataukset"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nimen mukaan"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Pisteitä"
@@ -6578,23 +5791,31 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 #, fuzzy
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+#, fuzzy
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 #, fuzzy
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "muut"
 
@@ -6603,35 +5824,14 @@ msgstr "muut"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6668,15 +5868,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Kelvolliset ohjelmaversiot"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Mozilla Add-ons:ssa olevien lisäosien täytyy sisältää install.rdf-tiedosto "
@@ -6684,7 +5884,7 @@ msgstr ""
 "näistä ohjelmista on sallittu."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6693,15 +5893,19 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "on määritelty"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versiot"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Hiekkalaatikon tietosivu"
 
@@ -6709,6 +5913,12 @@ msgstr "Hiekkalaatikon tietosivu"
 msgid "pagination_next_page"
 msgstr "seuraava"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Tämä on sivu %1$s / %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "edellinen"
@@ -6748,17 +5958,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -6768,7 +5978,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6788,8 +5998,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -6807,7 +6017,7 @@ msgstr ""
 "editor review."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -6825,135 +6035,105 @@ msgstr ""
 "a> for more detail about user add-on reviews.</a></p><a href=\"%2$s\">"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Arvosteluja lisäosalle %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Esiteltävät lisäsosat"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Uusimmat lisäosat"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr ""
 "Etsimistoiminto on tällä hetkellä pois käytöstä. Yritä myöhemmin uudestaan."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "kaikki lisäosat"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "etsi lisäosista"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "kohteessa"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Kaikki hakukoneet"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Selaa hakukoneita"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s vastaava lisäosa"
+msgstr[1] "%s hakua vastaavaa lisäosaa"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Osumia ei löytynyt."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Etsi lisäosista"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Syöte hakutuloksista"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Hakutulokset haulle: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ylläpitäjien työkalut"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Kehittäjätyökalut"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Toimittajan työkalut"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Tervetuloa"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Tervetuloa %s"
@@ -6962,7 +6142,7 @@ msgstr "Tervetuloa %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Oikolukusanasto"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 #, fuzzy
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
@@ -6971,7 +6151,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "Haen...:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 #, fuzzy
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
@@ -6980,7 +6160,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Hakukone"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 #, fuzzy
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
@@ -6989,24 +6169,25 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Teema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s kt"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ei vielä pisteytetty"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Pisteitä %s / 5"
@@ -7043,13 +6224,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "l, M. j"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s lisätty"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s julkaistu"
@@ -7062,185 +6243,185 @@ msgstr "Sulje"
 msgid "statistics_help_link"
 msgstr "Ohje"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "tai valitse toinen lisäosa"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "tai valitse lisäosa, jonka tilastot ovat julkisia"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Valitse lisäosasi, jonka tilastot haluat nähdä"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Valitse lisäosa nähdäksesi siitä tilastoja"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Valitse lisäosa, jonka tilastot ovat julkisia"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Tilastosivu"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Näytä tilastoja"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "ei mitään"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Poista tämä tietosarja"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s löydettiin rajauksella"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Lisää tietosarja"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Lisää tietosarja tähän kuvaajaan"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Piilota yhteyslukumäärä"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Näytä yhteyslukumäärä"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Näytä data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Lataa tämä data pilkkueroteltuna tiedostona (CSV)"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Piilota %s tapahtumat"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "NÄytä %s tapahtumat"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "NÄytä lisäosan julkaisupäivät kuvaajassa"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Piilota Firefox-tapahtumat"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Näytä Firefox-tapahtumat"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Näytä Firefoxin julkaisupäivät kuvaajissa"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Supista kuvaaja"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Laajenna kuvaaja"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Muuta kuvaajan kokoa"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktiiviset päivittäiskäyttäjät"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Ohjelma"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Oma"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Latauksia"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Käyttöjärjestelmä"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Lisäosan tila"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Yhteenveto"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Lisäosan versio"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Ohjelma"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Käyttöjärjestelmä"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Lisäosan tila"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Tuntematon"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Lisäosan versio"
 
@@ -7280,7 +6461,7 @@ msgstr "Asetuksesi on päivitetty."
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Tilastosivu"
 
@@ -7308,21 +6489,25 @@ msgstr "Loitonna"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Loitonna yksi kuukausi"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Päivän tilastoyhteenveto lisäosalle %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS-syöte yhteenvedosta"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "l, F j, Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Tilastot päivälle %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 #, fuzzy
 msgid "statistics_settings_access_description"
 msgstr ""
@@ -7330,84 +6515,84 @@ msgstr ""
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Tilastojen lukuoikeus"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Yksityinen"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Vain sinä ja Mozilla voivat nähdä lisäosan tilastot"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Julkinen"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Kuka tahansa voi katsoa lisäosan tilastoja"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Muokkaa asetuksia"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Nämä tiedot ovat luottamuksellisia."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Tämä tilastosivu on asetettu <b>yksityiseksi</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Tämä tilastosivu on asetettu <b>julkiseksi</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Lukittu"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Palaa tilastosivulle"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Tallenna asetukset"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Tilastosivuasetukset kohteelle %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Ei lukittu"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Ohj"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Tila"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Tunt"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Päivittäisiä latauksia keskimäärin"
 
@@ -7419,7 +6604,7 @@ msgstr "Latauksia"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Viimeisin tieto"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Latauksia viimeisen 7 päivän aikana"
 
@@ -7437,7 +6622,7 @@ msgstr "%1$s lähtien"
 msgid "statistics_summary_nodata"
 msgstr "Ei dataa vielä"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Aktiivisia käyttäjiä päivittäin keskimäärin"
 
@@ -7463,52 +6648,35 @@ msgstr "Aktiivisia käyttäjiä päivittäin"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Tilastoja lisäosasta %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Kaikki teemat"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Selaa teemoja"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Muuta salasanaa"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Varmistuskoodi lähetettiin uudestaan."
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7516,23 +6684,23 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7542,60 +6710,60 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7603,7 +6771,7 @@ msgstr ""
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7611,18 +6779,18 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -7630,7 +6798,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7657,8 +6825,9 @@ msgstr ""
 "-- %2$sin lisäosat -sivuston ylläpito"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -7699,116 +6868,93 @@ msgstr ""
 "Kiitokset,\n"
 "-- %2$sin lisäosien ylläpito"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Nollaa salasanasi %sin lisäosiin"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Vahvista salasana"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Muokkaa käyttäjän %s tietoja"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Sähköpostiosoite"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Etunimi"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Piilota sähköpostiosoite"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "WWW-sivun URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Sukunimi"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Sisäänkirjautuminen"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Uusi salasana"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Lempinimi"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Vanha salasana"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Salasana"
 
@@ -7816,72 +6962,72 @@ msgstr "Salasana"
 msgid "user_form_registration"
 msgstr "Uuden käyttäjän rekisteröinti"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Hiekkalaatikon sisältö näytetään"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Tallenna"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Kirjaudu sisään"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Rekisteröidy"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Rekisteröitynyt sivustolle "
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Luo uusi käyttäjätili"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Tehdyt muutokset olivat virheellisiä. Korjaa virheet ja lähetä tiedot "
 "uudestaan."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Käyttäjätiedot päivitettiin."
 
@@ -7894,17 +7040,17 @@ msgstr "Salasanan nollaaminen käyttäjälle %s"
 msgid "user_pwreset_header"
 msgstr "Salasanan nollaaminen"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Oletko unohtanut salasanasi?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "Sähköposti, jossa on linkki salasanan nollaukseen, lähetettiin "
 "sähköpostiosoitteeseesi."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Salasanan nollaaminen onnistui."
 
@@ -7916,7 +7062,7 @@ msgstr "Muuta salasanaa"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Lähetä linkki salasanan nollaamiseen"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%sin lisäosat"
@@ -7931,7 +7077,7 @@ msgstr ""
 "kirjautua sivustolle."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7943,24 +7089,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "lähettää vahvistusviestin uudelleen"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Onneksi olkoon! Käyttäjätilisi luonti onnistui."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7971,32 +7103,22 @@ msgstr ""
 "sähköpostiosoitteeseen."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Kiitos rekisteröitymisestä ja tervetuloa %1$s-sivustolle!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -8005,68 +7127,52 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Tili vahvistettu."
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Käyttäjätilin muokkaaminen"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Lisäosat, joiden tekijä on %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nimi"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Käyttäjätiedot"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Sähköpostiosoite"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Kotisivu"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Lempinimi"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Käyttäjän %1$s tiedot"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Sisäänkirjautuminen"
 
@@ -8098,708 +7204,6 @@ msgstr "Käyttäjän salasanan nollaaminen"
 msgid "users_register_pagetitle"
 msgstr "Uuden käyttäjän rekisteröityminen"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #, fuzzy
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "The most recent version compatible with"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Täydellinen versiohistoria"
-
-#, fuzzy
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Newest:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Suosituimpia:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Suosittelememme:"
-
-#, fuzzy
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Recently Updated:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Näytä kaikki"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Näytä kaikki suositellut lisäosat"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Korkeimmin pisteytetty ensin"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Viimeisin päivitys ensin"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Suosituin ensin"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#, fuzzy
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "This version of your add-on does not claim compatibility with Firefox %1"
-#~ "$s. Mozilla is expecting the next version of Firefox to be released soon, "
-#~ "so please test your add-on in the new version and update compatibility "
-#~ "information. You can find out more about this <a href=\"%2$s\">here</a>. "
-#~ "This is only a notice and you may continue to submit this version to "
-#~ "addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Lisäosan poisto käytöstä onnistui"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Muokkaa lisäosaa"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Lisäosan käyttöönotto onnistui"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Lisäosan kuvaus"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Lisäosan kotisivu"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Lisäosan nimi"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Tietosuojakäytäntö"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Lisäosan yhteenveto"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Tukisähköpostiosoite"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Tukisivu"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Versiotietoja"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Lisäosan ehdottaminen julkiselle puolelle"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Lisäosaa ehdotettiin julkiselle puolelle."
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr "Siirry %1$s-sivulle muuttaaksesi lisäyksesi tietoja tai palaa %2$s."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "kehittäjän ohjauspaneeliin"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Muokkaa lisäosaa"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Tämä versio lisäosasta on laitettu hiekkalaatikkoon siksi aikaa kunnes "
-#~ "jokin hiekkalaatikkotestaaja arvioi ja sivuston ylläpitäjä tarkastaa sen. "
-#~ "Lisäosan tilan muutoksista ilmoitetaan sinulle sähköpostitse."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Lue lisää %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "hiekkalaatikon tarkastusjärjestelmästä"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Tämä versio lisäosasta on laitettu hiekkalaatikkoon vain kokeneille "
-#~ "käyttäjille. Aseta lisäosasi %s, jotta se tarkistettaisiin sivuston "
-#~ "julkiselle puolelle lisäystä varten."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "ehdolle"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Lisäosasi lisättiin sivustolle."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Lisäosasi luokitellaan luotettavaksi ja se on automaattisesti hyväksytty "
-#~ "ja lisätty sivuston julkiselle puolelle."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Lähetä lisäosa"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Lisäosa päivittiin"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Kasvata lisäosasi käyttäjäkuntaa lisäämällä siitä sivulle %s."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "esikatselukuvia"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Tekijää ei löytynyt [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Poista"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Peruuta"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Peruutetaanko lisäosan lisäys?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Seuraava"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Muuta lisäosan tyyppiä:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Tekijän kommentit päivitettiin."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Lisää esikatselu"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Tekijä"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Tekijät"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Ei kukaan"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Luokat"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Luokka"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Kuvaus"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Poistettu käytöstä"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Lisätiedot"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Tekijän kommentit"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Esikatselut"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versiot"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Kotisivu"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Ei mitään"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Ei kuvatekstiä"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Ei esikatselukuvia."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Päivitä"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Tukisähköpostiosoite"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Tekijä ei ole kirjoittanut tukisähköpostin osoitetta."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Tukisivu"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Tekijä ei ole kirjoittanut tukisivun osoitetta."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Luotettu"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Versioita ei löytynyt."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Hylkää ja palaa"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Kyllä, poista saatavilta"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Poistetaanko tämä lisäosa saatavilta?"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Disabling this add-on will hide it from searches and listings. It will "
-#~ "not be downloadable from the website and will not be returned in client "
-#~ "update checks. The add-on will effectively be deleted, although you will "
-#~ "be able to return here and re-enable it at your convenience."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Poista %s saatavilta"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Kyllä, palauta saataville"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Palautetaanko lisäosa saataville?"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Enabling this add-on will cause it to once again appear in searches and "
-#~ "listings. It will be downloadable both from the website and from client "
-#~ "update checks."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Palauta %s saataville"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Lisää tekijä"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Tekijän sähköpostiosoite"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Poista"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Lisäosatyypille ei ole luokkia."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Tekijät"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Lisää kuvake"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Muuta kuvaketta"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Lähdekoodi on käyttäjien tarkasteltavissa"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Luokat"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Oletuslokaali"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Poista vain nykyinen kuvake"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Uusi kuvaketiedosto"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Kuvake"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "lisätietoja lyhyesti (kuten paikallisen murteen nimi)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Päivitä"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names"
-#~ "\">yksinkertaiset lokaalinimet</a> kuten \"en-US\""
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Valitut tiedostot poistetaan."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Tiedostot"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Ohjelmat, johon asennettavissa"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Ei tiedostoja."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Huomautuksia tarkastajalle"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Päivitä"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Yhteenveto voi olla enintään 250 merkkiä pitkä.\n"
-#~ "(Kirjoitit %s merkkiä)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Saman niminen lisäosa on jo tietokannassa. Tarkista, että: <br /"
-#~ "><li>Käytät oikeaa tunnusta (GUID). Sekaannus tunnuksen kanssa on "
-#~ "tavanomainen syy tällaiseen virheeseen.</li><li>Ettet ole lisännyt "
-#~ "lisäosaa kahdesti tietokantaan. Jos näin on käynyt, päivitä vanhaa "
-#~ "merkintää tai poista se ja yritä uudelleen.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Kuvaile lisäosaan tehtyjä päivityksiä."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Kaikkien tiedostojen GUID:t eivät täsmää"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "Identtinen versio (%s) lisäosasta tällä alustalla on jo olemassa."
-
-#
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Pyydetyt tiedot täytyy antaa asetettaessa lisäosaa ehdolle."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr ""
-#~ "Et voi ehdottaa lisäosan esijulkaisuversioita sivuston julkiselle "
-#~ "puolelle."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Voit asettaa ehdolle ainoastaan lisäosia, jotka ovat hiekkalaatikossa."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Tietojen tallennus ei onnistunut."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Sinulla ei ole oikeutta päivittää lisäosan tietoja."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Lisää alustakohtainen tiedosto"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Lisää tekijä"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Poista"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Voit asettaa uudelle lisäosalle sopivat luokat seuraavassa kohdassa."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Lisäosatyypille ei ole luokkia."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Kirjoita kuvaus lisäosasta."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Kirjoita lisäosan nimi."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Valitse lisäosan tyyppi."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Kirjoita yhteenveto lisäosasta."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Lisäosatiedosto"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "2. lisäosatiedosto"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "3. lisäosatiedosto"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Lisäosan tyyppi"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Lisäosan lähdekoodi on käyttäjien luettavissa"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Tekijän sähköpostiosoite"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Tekijät"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Luokat"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Oletuslokaali"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Kuvaus"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Loppukäyttäjän lisenssisopimus (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr ""
-#~ "Lisäosa tarvitsee toimiakseen erikseen jaeltavan, itsenäisen ohjelman"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Tiedostot"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Kotisivu"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Kuvaketiedosto"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nimi"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Tuetut alustat"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Tämä on esijulkaisuversio"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Tietosuojakäytäntö"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Lisäosa on sivustokohtainen"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Yhteenveto"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Tukisähköpostiosoite"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Tukisivu"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Ohjelmat, joihin asennettavissa"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versio"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Versiotiedot"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Ei mitään"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Huomautuksia lisäosan tarkastajalle"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr "Lisäosasi on luotettu. Valitse lisäosan sijainti sivustolla:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Julkinen"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Hiekkalaatikko"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Kehittäjäsopimus"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "1. kohta"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Tiedostonsiirto"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "2. kohta"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Lisäosan tiedot"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "3. kohta"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Versiotiedot"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "4. kohta"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Lokalisointi"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "5. kohta"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Onnellinen loppu"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Lisäosani"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Palaa lisäosan tietoihin"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automaattisesti tunnistettu lisäosatyyppi: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Tämän lisäosan oletuslokaali, eli kieli- ja maa-asetus, (%1$s [%2$s]) "
-#~ "eroaa käytössä olevasta lokaalista (%3$s [%4$s]). Lisäosan kuvaus tulee "
-#~ "täyttää kielellä \"%1$s\"."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Virheellinen?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Poistetaanko tiedosto?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Ohita lisäosan tietojen tarkistaminen"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "Lisäosia ei juuri nyt voi lähettää. Kokeile myöhemmin uudestaan."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Hyväksyn"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "En hyväksy"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Ylläpito on poistanut tämän lisäosan käytöstä."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Poistettu käytöstä"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Luotettu"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Sinulla ei ole yhtään lisäosia. %s."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "Lisää sellainen"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "%s teemastasi."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "Siirräthän esikatselukuvan"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Muokkaa versiota"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versio päivitettiin."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Uusi"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Päivitetty"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Lisäosatyypit"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Ikä"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Ohjelmat"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Alustat"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Lähetystyyppi"
-
-#~ msgid "error_notice"
-#~ msgstr "Huomautus"
-
-#~ msgid "forum_save"
-#~ msgstr "Tallenna"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Tämä on sivu %1$s / %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s vastaava lisäosa"
-#~ msgstr[1] "%s hakua vastaavaa lisäosaa"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS-syöte yhteenvedosta"
diff --git a/site/app/locale/fr/LC_MESSAGES/messages.po b/site/app/locale/fr/LC_MESSAGES/messages.po
index fbcabb9..879fb68 100644
--- a/site/app/locale/fr/LC_MESSAGES/messages.po
+++ b/site/app/locale/fr/LC_MESSAGES/messages.po
@@ -16,169 +16,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Annuler l'installation"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Télécharger %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accepter et télécharger"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accepter et installer"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Bac à sable"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Mis à jour le %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "Téléchargements"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Total des téléchargements"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "Téléchargements hebdomadaires"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s module"
 msgstr[1] "%1$s modules"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "par page"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Trier par&nbsp;:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "expérimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recommandé"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s n'est pas disponible pour %2$s"
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Retour à %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Retour aux critiques..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Évaluation&nbsp;:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Critique&nbsp;:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Envoyer votre critique"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Ajouter une critique pour %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titre/Résumé&nbsp;:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Effacer"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Répondre"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Êtes-vous certain de vouloir effacer cette critique&nbsp;?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Non"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Oui"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Effacer la critique"
 
@@ -187,7 +178,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Critique effacée avec succès."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Éditer la critique de %s"
@@ -201,18 +192,18 @@ msgstr ""
 "contenait %1$s caractères."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Attention&nbsp;: avant que votre critique n'apparaisse sur le site public, "
 "elle sera modérée par un éditeur."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Réponse du développeur à&nbsp;:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -231,170 +222,131 @@ msgid "addon_review_pagetitle"
 msgstr "Critique de %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Réponse de %1$s le %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Réponse du développeur&nbsp;:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Votre critique a bien été enregistrée. Merci&nbsp;!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "par %1$s le %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "par %1$s le %2$s (note&nbsp;: %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Module suivant"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Module précédent"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Lien permanent vers cette version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "La version la plus récente compatible avec %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ok"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Afficher le profil de l'auteur"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Parcourir tous les thèmes :: %1$s modules"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Parcourir la catégorie %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "parcourir %1$s thèmes :: %2$s modules"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Qu'est-ce que c'est?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Ajouter une critique"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Détails avancés"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Catégories"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "critique détaillée"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Opinion négative"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Éditer votre critique"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Ce module est pourvu d'une politique de confidentialité spécifique."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Opinion très négative"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Commentaires du développeur"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Page d'accueil"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Critiques"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Assistance"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Opinion positive"
 
@@ -402,23 +354,19 @@ msgstr "Opinion positive"
 msgid "addons_display_long_description"
 msgstr "Description détaillée"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Opinion très positive"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Plus d'images"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Autres modules de %1$s"
@@ -427,14 +375,14 @@ msgstr[1] "Autres modules de ces auteurs"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -443,7 +391,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -451,22 +399,23 @@ msgstr ""
 "ici&nbsp;: %s ou bien par courriel à cette adresse&nbsp;: %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
 "L'assistance pour cette extension est disponible auprès de son développeur "
 "ici&nbsp;: %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Votre évaluation"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Opinion très positive"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Veuillez ne pas poster de rapports de bugs dans vos critiques. Nous ne "
@@ -475,45 +424,50 @@ msgstr ""
 "problème."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Instruction pour la critique</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Consultez la <a href=\"%1$s\">section d'assistance</a> pour toute question "
 "relative à ce module."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Enregistrer"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Afficher tous les modules pour %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Voir toutes les critiques (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Afficher toutes les versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Historique complet des versions"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Afficher la source"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Voir les statistiques"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Qu'en pensez-vous&nbsp;?"
 
@@ -521,226 +475,108 @@ msgstr "Qu'en pensez-vous&nbsp;?"
 msgid "addons_display_workswith"
 msgstr "Fonctionne avec&nbsp;"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "par "
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Nous vous recommandons"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Les modules complémentaires étendent %1$s en vous permettant de "
 "personnaliser votre navigation."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Ajouts récents"
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Autres applications"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Modules pour %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Les plus populaires&nbsp;:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Nous recommandons&nbsp;:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Mises à jour récentes&nbsp;:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Tout afficher"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Afficher tous les modules récemment créés"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Afficher tous les modules populaires"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Afficher tous les modules recommandés"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Afficher tous les modules récemment mis à jour"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Cliquez sur le lien ci-dessous pour enregistrer le fichier.</"
@@ -748,11 +584,11 @@ msgstr ""
 "menu Outils.</li><li>Cliquez sur le bouton Installer, sélectionnez le "
 "fichier téléchargé sur votre disque dur et cliquez sur \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Comment réaliser l'installation dans Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Faites un clic-droit sur le lien ci-dessous et choisissez  "
@@ -763,42 +599,39 @@ msgstr ""
 "puis cliquez sur  \"OK\" (ou \"Ouvrir\" selon la terminologie de votre "
 "système d'exploitation).</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Comment installer un module dans Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Afficher les modules expérimentaux"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Valider"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "par"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "pour Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "pour Mac&nbsp;OS&nbsp;X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "pour Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -806,11 +639,11 @@ msgstr ""
 "Pour de plus amples informations sur les plugins pour navigateurs basés sur "
 "les navigateurs Mozilla, visitez %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Recherchez-vous un plugin non listé ici&nbsp;?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Les plugins aident votre navigateur à réaliser des tâches spécifiques telles "
@@ -819,24 +652,24 @@ msgstr ""
 "elles pour but la modification ou l'ajout de fonctionnalités."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins courants pour %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentation de support"
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -844,42 +677,37 @@ msgstr ""
 "avant de procéder à l'installation"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Prévisualisations de %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Avec plus d'un millier de modules complémentaires disponibles, chacun "
 "trouvera son bonheur. Voici quelques-uns de nos modules préférés, n'hésitez-"
 "pas à les essayer&nbsp;!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Modules recommandés"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Modules recommandés"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Ressources supplémentaires"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Désolé, vous devez utiliser un navigateur basé sur Mozilla pour installer un "
@@ -895,42 +723,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Apprenez à %1$s sur le site %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/fr/docs/Cr%C3%A9ation_de_plugins_OpenSearch_pour_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "créer votre propre plugin de recherche"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Découvrez de nombreux autres moteurs de recherche sur le site %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Moteurs de recherche"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Nous tenons à remercier tout particulièrement le projet Mycroft pour leur "
 "travail sur les moteurs de recherche de Firefox"
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -972,17 +801,17 @@ msgstr "Version incomplète"
 msgid "addons_status_nominated"
 msgstr "Dans le bac à sable. Nomination publique"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Dans le bac à sable. En attente de révision."
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Dans le bac à sable"
@@ -991,39 +820,27 @@ msgstr "Dans le bac à sable"
 msgid "addons_status_unknown"
 msgstr "Inconnu"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "En savoir plus sur ce module"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Méfiez-vous des anciennes versions&nbsp;!"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Ces versions sont affichées pour référence et à des fins de tests. Il est "
 "fortement conseillé d'utiliser la toute dernière version du module et non "
 "une ancienne version."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Historique des versions et modifications correspondantes"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historique de version de %1$s"
@@ -1058,467 +875,153 @@ msgstr "Administration du groupe"
 msgid "admin_group_saved"
 msgstr "Le groupe a été enregistré"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avancé"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "N'importe quand"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Tous"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Toutes"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Logiciel"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Correspondance du mot-clef"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Dernière mise à jour"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nom"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Récents"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Les 3 derniers mois"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Les 6 derniers mois"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Hier"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Le mois dernier"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "La semaine dernière"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "L'année dernière"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Résultats par page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platforme"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularité"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Évaluation"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Trié par"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "à"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Passer au mode de recherche avancé"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorer la vérification de version"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Ce module est pour une ancienne version de Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Vous pouvez <a href=\"%1$s\">essayer une ancienne version</a> ou bien <a "
 "href=\"#\" onclick=\"%2$s\">ignorer cet avertissement</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Une <a href=\"%1$s\">version plus ancienne</a> pourrait fonctionner"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Ce module est pour une version en préparation de Firefox, concrètement <a "
 "href=\"%1$s\">Firefox %2$s</a>."
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Mettez à jour votre Firefox</a> pour "
 "utiliser ce module"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Modules par nom"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Modules récents"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Modules populaires"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Modules selon leur évaluation"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Modules mis à jour récemment"
 
@@ -1527,921 +1030,106 @@ msgid "categories_current_title"
 msgstr "Catégorie en cours"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Catégories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Choisir une catégorie"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "%1$s, tout afficher"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Voir tous les modules recommandés"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Les mieux notés en premier"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Les plus récemment mis à jour en premier"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Les plus populaires en premier"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "%1$s, tout afficher"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Collection introuvable&nbsp;!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Ajouté le %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centre de compatibilité des modules complémentaires"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Préparez-vous à la sortie de %1$s grâce aux outils et à l'information "
 "disponibles pour la communauté 2$s Add-ons ci-dessous."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Chargement des données..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Retour à la section principale"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Rapport de compatibilité du module complémentaire"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informations pour les développeurs de modules"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajuster maxVersion sans renvoyer le fichier"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Vérifier le statut de mes modules"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Si vous avez des modules hébergés sur Mozilla Add-ons, <a href=\"%1$s"
 "\">veuillez vous connecter</a> pour analyser le statut de ceux-ci pour %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Vous n'avez aucun module hébergé sur Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Vérification des résultats relatifs au statut des modules"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Extraction du statut des modules hébergés..."
 
@@ -2449,122 +1137,122 @@ msgstr "Extraction du statut des modules hébergés..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s utilisateurs de %2$s (%3$s&#37; du total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Les modules listés ci-dessous par popularité représentent, à la connaissance "
 "de Mozilla, 95% des modules utilisés."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Afficher le rapport détaillé"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Des %1$s modules représentant 95&#37; à la connaissance de Mozilla, 95% des "
 "modules utilisés, <b>%2$s&#37;</b> sont actuellement considérés comme "
 "compatibles avec les toutes dernières versions de %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versions alphas"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Modules compatibles avec une version alpha de %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versions bêtas"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "Module compatible avec une version bêta ou une version candidate de %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Dernière version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Modules acutualisé pour les dernières compilations de %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Autres versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Modules non-compatibles avec une quelconque version de %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Rapport de compatibilité du module"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informations pour les utilisateurs du module"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Afficher le rapport de compatibilité"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr ""
 "Pour vous renseigner sur les manières de contribuer au projet, consultez "
 "notre %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Page wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla aimerait remercier les personnes suivantes pour leur contribution au "
 "projet addons.mozilla.org durant toutes ces années&nbsp;:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Développeurs"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Éditeurs"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Traducteurs"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Autres contributeurs"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Anciens développeurs"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Logiciel et images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Certaines icônes utilisées proviennent du <a href=\"http://www.famfamfam.com/"
@@ -2572,7 +1260,7 @@ msgstr ""
 "\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
 "2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2583,20 +1271,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%x"
 
@@ -2631,25 +1316,25 @@ msgstr "Tableau de bord des statistiques"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2658,6 +1343,20 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-détection)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Cette version de votre module n'indique pas être compatible avec Firefox %1"
+"$s. Mozilla a l'intention de sortir une nouvelle version de Firefox bientôt, "
+"nous vous engageons à tester votre module dans la nouvelle version et à "
+"mettre à jour les informations de compatibilité. Vous trouverez de plus "
+"amples informations à ce sujet <a href=\"%2$s\">ici</a>. Ce message vous est "
+"transmis à titre informatif, vous pouvez continuer à envoyer cette version à "
+"addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "S'ouvre dans une nouvelle fenêtre"
@@ -2694,76 +1393,141 @@ msgstr "Étape 5&nbsp;: succès"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Aide à la soumission"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Module désactivé avec succès"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Éditer le module"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Module activé avec succès"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Description du module"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "CLUF"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Page d'accueil du module"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nom du module"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Vignette de prévisualisation"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Politique de confidentialité"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Résumé du module"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Courriel d'assistance"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL d'assistance"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Notes de version"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Proposer le module"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Module proposé avec succès&nbsp;!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2799,7 +1563,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2809,6 +1573,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2820,13 +1589,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2836,7 +1605,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2846,12 +1615,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2860,14 +1629,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -2946,13 +1715,125 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visitez la page %1$s afin d'effectuer des changements à votre soumission ou "
+"bien %2$s pour retourner au panneau de contrôle du développeur."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "Cliquez ici"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Éditer le module"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Cette version a été placée dans le bac à sable jusqu'à ce qu'elle soit "
+"validée par les testeurs de la zone de bac à sable ainsi qu'un éditeur. Vous "
+"serez averti par courriel lorsqu'une mesure concernant votre module aura été "
+"prise."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Vous pouvez en découvrir d'avantage sur le système de révision du bac à "
+"sable %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "ici"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Cette version a été placée dans le bac à sable pour être proposé à des "
+"utilisateurs expérimentés. Afin de s'afficher sur le site public, vous devez "
+"%s votre module et subir un processus de vérification."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominer"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "La soumission de votre module a été réalisée avec succès."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Votre module étant considéré de confiance, cette version a été approuvée "
+"automatiquement pour la zone publique."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Soumettre un module"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Module mis à jour avec succès"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Vous désirez peut-être %s afin de promouvoir votre module."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "Envoyer une pré-version"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Aucun auteur trouvé [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Enlever"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Annuler"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Êtes-vous certain de vouloir annuler votre soumission&nbsp;?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Suivant"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Modifier le type de module&nbsp;:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Commentaire développeur mis à jour."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3029,37 +1910,181 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Ajouter une prévisualisation"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Auteur"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Auteurs"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Aucun"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Catégories"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Catégorie"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Désactivé"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Détails"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Commentaires du développeur"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Prévisualisations"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Page d'accueil"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Aucun"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Aucun texte d'illustration"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Aucune prévisualisation trouvée."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Mettre à jour"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Courriel d'assistance"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Le développeur n'a pas fourni de courriel d'assistance."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL d'assistance"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Le développeur n'a pas fourni d'URL d'assistance."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "De confiance"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Aucune version trouvée."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Annuler et revenir en arrière"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Oui, le désactiver"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Êtes-vous sûr de vouloir désactiver ce module&nbsp;?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Désactiver ce module le cachera des résultats de recherche et des pages "
+"publiques. Celui-ci ne pourra plus être téléchargé depuis le site et ne sera "
+"plus proposé via les vérifications automatiques de mise à jour. Le module "
+"sera bel et bien effacé, néanmoins vous pourrez revenir ici et le réactiver "
+"à votre guise. "
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Désactiver %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Oui, je l'active"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Êtes-vous sûr de vouloir activer ce module&nbsp;?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Activer ce module permettra son affichage dans les résultats de recherches "
+"et sur les pages publiques. Celui-ci sera téléchargeable à la fois depuis le "
+"site Web et depuis les vérifications automatiques de mise à jour des clients."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Activer %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3113,62 +2138,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Ajouter l'auteur"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Courriel de l'auteur"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Enlever"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3181,30 +2218,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3283,22 +2320,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3307,12 +2344,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3320,12 +2357,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3334,24 +2371,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3359,7 +2396,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3384,42 +2421,108 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Aucune catégorie disponible pour ce type de module."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Auteurs"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Ajouter une icône"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Changer l'icône"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permettre aux utilisateurs de voir les fichiers sources en ligne"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Catégories"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Langue par défaut"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Ce module a besoin d'un logiciel externe"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "N'effacer que l'icône actuelle"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nouveau fichier icône"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icône"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Information complémentaire sur la locale"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Ceci est une pré-version"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Ce module concerne un site web spécifique"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Locale cible"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr ""
+"information suplémentaire succinte (telle que le nom de la langue régionale)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3427,12 +2530,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3440,60 +2543,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3502,32 +2605,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3535,22 +2638,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3558,12 +2661,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3571,39 +2674,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Mettre à jour"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">code langue "
+"simple</a>  tel que 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3690,14 +2803,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Une mise à jour en attente"
 msgstr[1] "Mises à jour en attente (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Les fichiers cochés seront effacés."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Fichiers"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Applications cibles"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Aucun fichier."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes au réviseur"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Mettre à jour"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Vous n'avez pas accès à ce module."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Les résumés sont limités à un maximum de 250 caractères.\n"
+"(Vous en avez saisi %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Le nom de votre module existe déjà dans la base de données. Assurez-vous "
+"que&nbsp;: <br /><li>vos GUIDs correspondent. La cause la plus commune pour "
+"cette erreur est la non correspondance des GUIDs.</li><li>Vous n'avez pas "
+"d'entrée dupliquée dans la base de données. Si c'est le cas, vous devriez "
+"mettre à jour cette entrée ou l'effacer et recommencer l'opération.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3711,10 +2879,10 @@ msgstr "Veuillez consulter %s pour référence."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "cette page"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Veuillez décrire les changements apportés par la mise à jour de ce module."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3733,6 +2901,10 @@ msgstr ""
 "Cette extension de fichier (%s) n'est pas autorisée pour le type de module "
 "sélectionné. Veuillez utiliser l'une des extensions suivantes&nbsp;: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Les GUIDs de tous les fichiers ne correspondent pas"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Vous ne pouvez pas sélectionner plus de cinq catégories."
@@ -3767,7 +2939,15 @@ msgstr ""
 "Cette extension de fichier (%s) n'est pas autorisée pour une icône. Veuillez "
 "utiliser une des extensions suivantes&nbsp;: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Une version identique (%s) existe déjà pour ce module et cette plateforme."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf manquant."
 
@@ -3775,7 +2955,7 @@ msgstr "install.rdf manquant."
 msgid "devcp_error_install_manifest"
 msgstr "Les erreurs suivantes ont été trouvées dans install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Veuillez sélectionner un type de module valide."
 
@@ -3850,6 +3030,19 @@ msgstr "Aucun ID n'a été trouvé pour ce module dans install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Aucune plateforme sélectionnée"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Vous devez fournir les détails demandés pour la nomination."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Vous ne pouvez sélectionner un module en pré-version."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Vous ne pouvez nominer que des modules actuellement dans le bac à sable."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Veuillez sélectionner au moins une catégorie."
@@ -3867,6 +3060,16 @@ msgstr ""
 "L'extension de fichier (%s) n'est pas autotisée pour une prévisualisation. "
 "Veuillez utiliser une des extensions suivantes&nbsp;: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Une erreur s'est produite lors de l'enregistremnet de vos données."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Vous n'avez pas l'autorisation de mettre à jour ce module."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3879,98 +3082,294 @@ msgstr ""
 "Les modules ne peuvent utiliser un updateURL externe. Veuillez l'effacer de "
 "votre fichier install.rdf et réessayer."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Veuillez envoyer un fichier."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Ajouter un autre fichier pour la plateforme"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Ajouter auteur"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Supprimer"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Les catégories pour votre module seront disponibles à l'étape suivante."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Aucune catégorie disponible pour ce type de module."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Veuillez saisir une description pour votre module."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Veuillez saisir le nom de votre module."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Veuillez sélectionner le type de module que vous proposez."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Veuillez saisir un résumé de votre module."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Fichier de module"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Fichier de module 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Fichier de module 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Type de module"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permettre aux utilisateurs de voir les fichiers sources en ligne"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Courriel de l'auteur"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Auteurs"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Catégories"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Langue par défaut"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Contrat de License Utilisateur Final (CLUF)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Ce module a besoin d'un logiciel externe"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Fichiers"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Page d'accueil"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Fichier icône"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nom"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plateformes supportées"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Ceci est une pré-version"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Politique de confidentialité"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Ce module concerne un site web spécifique"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Résumé"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Courriel d'assistance"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL d'assistance"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Applications cibles"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Notes de version"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Aucun"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notes au réviseur"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Votre module étant jugé de confiance, choisissez où cette version devrait "
+"être placée&nbsp;:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Bac à sable"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Accord du développeur"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Étape 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Envoi du fichier"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Étape 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Détails du module"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Étape 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Détails de la version"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Étape 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localisation"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Étape 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Succès"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mes modules"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Champs localisés"
@@ -3986,12 +3385,12 @@ msgstr ""
 "n'est pas disponible, la langue sélectionnée par défaut sera utilisée (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Panneau de contrôle administrateur"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Panneau de contrôle éditeur"
 
@@ -4000,28 +3399,28 @@ msgid "devcp_myaddons_link"
 msgstr "Mes modules"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Retour à la section principale"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Tableau de bord des statistiques"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Soumettre un module"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Outils de développement"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4033,26 +3432,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Revenir aux détails du module"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominer %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Type de module automatiquement détecté&nbsp;: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4066,6 +3476,18 @@ msgstr ""
 "Supprimer la prévisualisation par défaut fera qu'une des autres "
 "prévisualisations deviendra automatiquement la prévisualisation par défaut."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"La locale par défaut de ce module (%1$s [%2$s]) est différente de celle que "
+"vous avez sélectionnée actuellement (%3$s [%4$s]). Les champs ci-dessous "
+"devraient être remplis dans %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4073,14 +3495,14 @@ msgstr ""
 "Choisir ceci comme prévisualisation par défaut supprimera le statut par "
 "défaut de la prévisualisation par défaut actuelle."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4109,46 +3531,46 @@ msgstr "Éditer la prévisualisation"
 msgid "devcp_preview_updated_successfully"
 msgstr "La prévisualisation a bien été mise à jour."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4156,7 +3578,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4174,7 +3596,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Ajouter une prévisualisation"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4183,7 +3605,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Éditer la prévisualisation"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4196,27 +3618,27 @@ msgstr "Prévisualiser le fichier"
 msgid "devcp_previews_label_makedefault"
 msgstr "Choisir comme image de prévisualisation par défaut"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4240,18 +3662,26 @@ msgstr "Éditer la prévisualisation"
 msgid "devcp_previews_submit_upload"
 msgstr "Envoyer la prévisualisation"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect&nbsp;?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Êtes-vous sûr de vouloir effacer ce fichier&nbsp;?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Merci de lire et d'accepter l'Accord Développeur ci-après avant de "
@@ -4264,7 +3694,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4276,6 +3706,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Passer l'étape de mise à jour des informations concernant mon module."
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4379,17 +3813,63 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Les soumissions de modules sont actuellement désactivées. Veuillez réessayer "
+"plus tard."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "J'accepte"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Je refuse"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Ce module a été désactivé par un administrateur."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Désactivé"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "De confiance"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Dernière version&nbsp;:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Vous n'avez pas de modules. Cliquez %s pour en soumettre un."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "ici"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Assurez-vous d'%s de votre thème."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "envoyer une prévisualisation"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4397,44 +3877,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4444,7 +3924,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4452,64 +3932,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4518,7 +3998,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4530,33 +4010,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4569,29 +4044,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4602,12 +4077,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4631,23 +4106,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4656,7 +4126,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4665,14 +4135,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4682,7 +4152,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4690,7 +4160,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4698,22 +4168,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4732,29 +4196,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Veuillez consulter %s pour référence."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "cette page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Éditer la version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Version mise à jour avec succès."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4823,34 +4290,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4858,49 +4325,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4910,59 +4372,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4971,26 +4426,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5033,7 +4488,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Ce module est désactivé."
 
@@ -5077,7 +4532,7 @@ msgstr "Filtrer"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrer par type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Journal des évènements"
 
@@ -5139,7 +4594,7 @@ msgstr "Afficher les items entre %s et %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Aucune révision trouvée sur cette période."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "journal des révisions"
 
@@ -5163,24 +4618,24 @@ msgstr "Activité récente de l'éditeur"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Ensemble des révisions"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Révision du module"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Veuillez remplir les champs suivants&nbsp;:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Veuillez sélectionner au moins un fichier à réviser."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Il n'est pas permis de réviser ses propres modules."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Logiciel externe"
 
@@ -5192,39 +4647,39 @@ msgstr "Ajouter aux essentiels"
 msgid "editors_featured_add_feature_submit"
 msgstr "Ajouter"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Échec de l'ajout aux modules essentiels."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Ajout aux modules essentiels réussi."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Impossible de marquer comme module essentiel."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Le module a bien été marqué comme essentiel."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Une ou plusieurs locales sont invalides."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Impossible d'enlever des modules essentiels."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Le module a bien été enlevé de la liste des essentiels."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Modules essentiels"
 
@@ -5236,170 +4691,107 @@ msgstr "valider"
 msgid "editors_featured_remove_feature"
 msgstr "Enlever des essentiels"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtrer la queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Liens utiles"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guide de l'éditeur"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Politique du module"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Ces filtres resteront actifs jusqu'à la fin de cette session ou bien jusqu'à "
 "ce qu'ils soient désactivés."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Il n'y a actuellement pas de module %s à réviser."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 jour"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 heure"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Panneau de contrôle de l'éditeur"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s uniquement"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-version"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilité %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Nettoyer"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtrer"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Toutes les queues de révision sont actuellement désactivées. Veuillez "
 "revenir plus tard."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Action de révision"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Envoi sur le site public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Demande de super-révision"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Garder dans le bac à sable"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Commentaire de révision"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5407,30 +4799,30 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Ceci marquera le module dans sa dernière version ainsi que ses fichiers "
 "comme publics. Les versions futures resteront dans la bac à sable jusqu'à ce "
 "qu'elles soient revues par un éditeur."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Ceci gardera le module dans le bac à sable."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Ceci fera passer une version d'un module public actuellement dans le bac à "
 "sable vers la partie publique."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Ceci gardera en quarantaine dans le bac à sable une version d'un module "
 "public déjà dans le bac à sable."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Si vous avez des inquiétudes concernant la sécurité de ce module, son "
@@ -5438,73 +4830,73 @@ msgstr ""
 "examiner, saisissez vos commentaires dans la zone de texte ci-dessous. Ces "
 "commentaires seront envoyés aux administrateurs, pas à l'auteur."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Comparer avec la version publique"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Voir le contenu"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Auteurs&nbsp;:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Catégories&nbsp;:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilité&nbsp;:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Commentaires du développeur"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "CLUF"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Fichiers&nbsp;:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item de l'historique"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Message de nomination"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Prévisualisation"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Politique de confidentialité"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "révision de&nbsp: %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes au réviseur"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Résumé"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notes de version"
 
@@ -5534,7 +4926,7 @@ msgstr "Nomination Approuvé/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Refusé/Bac à sable"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Aucune révision antérieure trouvée."
 
@@ -5559,95 +4951,82 @@ msgstr "Refusé/Bac à sable"
 #, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Afficher/Cacher les réponses  Show/Hide Replies (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applications&nbsp;:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou bien sélectionnez une réponse type&nbsp;:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Commentaires&nbsp;:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systèmes d'exploitation&nbsp;:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Haut de page"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "suivant &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Aucune prévisualisation trouvée."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; précédent"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Critiques en attente"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> sur %2$s en attente"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Lancer l'action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Commentaires"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Réviseur"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Fichier"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "M'avertir la prochaine fois que ce module est mis à jour (les mises à jour "
 "ultérieures ne généreront pas l'envoi d'un courriel)."
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Révision traitée avec succès."
 
@@ -5671,7 +5050,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "En réponse à&nbsp;:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Révisions traitées avec succès&nbsp;!"
 
@@ -5683,81 +5062,87 @@ msgstr "Il n'y a pas de révision actuellement en modération."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Traiter les révisions"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Specifique à un site"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nouveau"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Mis à jour"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Application testée"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Systèmes d'exploitation testés"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informations supplémentaires"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Module"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Types de modules"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Âge"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restreindre aux locales&nbsp;?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Dans la file d'attente depuis"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plateformes"
 
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
-
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Types de soumissions"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s jours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s heures"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Accès refusé"
 
@@ -5765,19 +5150,17 @@ msgstr "Accès refusé"
 msgid "error_access_denied_message"
 msgstr "Vous n'êtes pas autorisé à afficher cette page"
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5786,14 +5169,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Module non trouvé&nbsp;!"
 
@@ -5805,55 +5185,60 @@ msgstr "Ce module n'est pas affichable ici."
 msgid "error_addon_selfreview"
 msgstr "Vous ne pouvez pas critiquer votre propre module."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Pas de module dans cette catégorie&nbsp;!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Flux Web du module introuvable."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Cette adresse est invalide."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Ce champ doit être rempli."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Fichier introuvable&nbsp;!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erreur fichier&nbsp;: %s n'existe pas."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr ""
 "Le formulaire contient des erreurs. Merci de les corriger et de soumettre à "
 "nouveau les données du formulaire."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha invalide, veullez recommencer&nbsp;!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Cette URL a un format non valide. Une URL valide ressemble à ceci&nbsp;: "
@@ -5861,46 +5246,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argument manquant&nbsp;: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Aucun fichier"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Avertissement"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Prévisualisation introuvable&nbsp;!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Vous devez fournir une évaluation."
 
@@ -5908,24 +5281,24 @@ msgstr "Vous devez fournir une évaluation."
 msgid "error_user_already_confirmed"
 msgstr "Ce compte utilisateur a déjà été confirmé."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Code de confirmation invalide&nbsp;!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Cette adresse est déjà utilisée par un autre compte."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Votre demande de changement d'adresse de messagerie est arrivée à "
@@ -5933,23 +5306,14 @@ msgstr ""
 "utilisateur et cliquer sur le lien inclus dans le message de confirmation "
 "que nous vous envoyons, ceci dès sa réception."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Cet identifiant est déjà pris."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Utilisateur inconnu&nbsp;!"
 
@@ -5957,42 +5321,39 @@ msgstr "Utilisateur inconnu&nbsp;!"
 msgid "error_user_unconfirmed"
 msgstr "Veuillez confirmer votre compte utilisateur."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Identifiant ou mot de passe incorrect&nbsp!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version introuvable&nbsp;!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Mot de passe erroné&nbsp;!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "En savoir plus"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "En savoir plus sur %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s critique"
 msgstr[1] "%1$s critiques"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Afficher plus&nbsp;:"
 
@@ -6031,39 +5392,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "À propos"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Foire aux questions"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Tous droits réservés."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Nos contributeurs"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla fournit des liens vers ces applications tierces comme un service "
@@ -6072,98 +5436,91 @@ msgstr ""
 "concernant ces applications doit être dirigée vers leurs auteurs, seuls "
 "responsables."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Ok !"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Avertissement légal"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Autres langues&nbsp;:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Politique de confidentialité"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Enregistrer"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Dictionnaire"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dictionnaires"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pack de langue (module)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Packs de langues (module)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Pack de langue (application)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Packs de langues (application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Moteur de recherche"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Moteurs de recherche"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Thème"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Thèmes"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Revenir à la page d'accueil des modules %1$s"
@@ -6172,95 +5529,37 @@ msgstr "Revenir à la page d'accueil des modules %1$s"
 msgid "header_main_firefox_header"
 msgstr "Modules Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Modules"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Modules Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Modules Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Modules Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Modules"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Connexion"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Déconnexion"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Mon compte"
 
@@ -6268,70 +5567,47 @@ msgstr "Mon compte"
 msgid "header_navlink_register"
 msgstr "Inscription"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Prévisualisation de l'image de %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Connectez-vous</a> pour installer ce module."
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Je veux installer ce module expérimental. <a href=\"%1$s\">Qu'est-ce que "
-"c'est&nbsp;?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Ajouter à %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Ajouter %1$s à %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Télécharger %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Module non trouvé&nbsp;!"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Liste des dictionnaires et paquetages linguistiques."
 
@@ -6343,8 +5619,8 @@ msgstr "Télécharger le dictionnaire"
 msgid "langtools_download_langpack"
 msgstr "Télécharger le paquetage linguistique"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionnaires et paquetages linguistiques"
 
@@ -6356,72 +5632,36 @@ msgstr "Installer le dictionnaire"
 msgid "langtools_install_langpack"
 msgstr "Installer le paquetage linguistique"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dictionnaire"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Paquetage linguistique"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Langue"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Licence personnalisée"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licence BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licence MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Cliquez ici pour retourner sur la page d'accueil."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Date"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Téléchargements"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nom du module"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Évaluation"
@@ -6446,20 +5686,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionnaires et paquetages linguistiques"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Thèmes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Trouver des modules pour d'autres logiciels"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "Autres"
 
@@ -6467,33 +5714,12 @@ msgstr "Autres"
 msgid "page_title_appversions"
 msgstr "Versions des logiciels"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Remerciements"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ du développeur"
+msgid "page_title_experimental_addons"
+msgstr "Modules expérimentaux"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6523,15 +5749,15 @@ msgstr "Système de révision du bac à sable"
 msgid "page_title_submissionhelp"
 msgstr "Aide à l'envoi"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versions valides de l'application"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Les modules soumis au site Mozilla Add-ons doivent être pourvus d'un fichier "
@@ -6540,7 +5766,7 @@ msgstr ""
 "applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6550,15 +5776,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "ici"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Retour à la page précédente"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Page d'information du bac à sable"
 
@@ -6566,6 +5795,12 @@ msgstr "Page d'information du bac à sable"
 msgid "pagination_next_page"
 msgstr "suivant"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Ceci est la page %1$s sur %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "précédent"
@@ -6600,15 +5835,15 @@ msgstr ""
 "Si c'est illisible, vous pouvez <a href=\"%1$s\">essayer d'autres mots</a> "
 "ou bien <a href=\"%2$s\">utiliser le test auditif</a> à la place."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Êtes-vous un être humain&nbsp;?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Qu'est-ce que ceci&nsbp;?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Erreur lors du marquage de cette critique&nbsp;!"
 
@@ -6616,7 +5851,7 @@ msgstr "Erreur lors du marquage de cette critique&nbsp;!"
 msgid "review_flag_reason_bug_support"
 msgstr "Rapport de bug ou demande d'assistance inadéquate dans ce contexte"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Dénoncer cette critique (selectionnez un motif)"
 
@@ -6632,8 +5867,8 @@ msgstr "Autre (veuillez préciser)"
 msgid "review_flag_reason_spam"
 msgstr "Spam ou contenu qui n'est pas une critique du module"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Merci. Cette critique est maintenant en attente d'approbation par un "
@@ -6650,7 +5885,7 @@ msgstr ""
 "pour demander sa modération."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Veuillez garder ces conseils à l'esprit&nbsp;:</p><ul><li>Écrivez votre "
@@ -6670,130 +5905,101 @@ msgstr ""
 "modules.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Critique de %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Modules essentiels"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Modules récemment ajoutés"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Modules mis à jour"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Recherche"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "La recherche est actuellement désactivée. Veullez réessayer plus tard."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "tous les modules"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "recherche de modules"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Recherche de modules"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Cliquez vous saisir des termes de recherche"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "dans"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Tous les moteurs de recherche"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Naviguer dans les moteurs de recherche"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s module correspondant"
+msgstr[1] "%s modules correspondants"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Aucun résultat."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Recherche de modules"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Fil des résultats de la recherche"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Résultat de la recherche pour&nbsp;: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Outils d'administration"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Outils de développement"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Outils d'édition"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Bienvenue"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Bienvenue, %s"
@@ -6802,7 +6008,7 @@ msgstr "Bienvenue, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dictionnaire"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Modules essentiels"
 
@@ -6810,7 +6016,7 @@ msgstr "Modules essentiels"
 msgid "sidebar_pitch_looking_for"
 msgstr "Je recherche&nbsp;:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Modules récents"
 
@@ -6818,7 +6024,7 @@ msgstr "Modules récents"
 msgid "sidebar_pitch_search"
 msgstr "Plugin de recherche"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "S'abonner à&nbsp;:"
 
@@ -6826,23 +6032,24 @@ msgstr "S'abonner à&nbsp;:"
 msgid "sidebar_pitch_theme"
 msgstr "Thème"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Modules mis à jour"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s Ko"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Pas encore évalué"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Évaluation de %s sur 5 étoiles"
@@ -6879,13 +6086,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s créé"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s publié"
@@ -6898,181 +6105,181 @@ msgstr "Fermer"
 msgid "statistics_help_link"
 msgstr "Aide"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "ou bien choisissez un autre module complémentaire"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "ou bien choisissez un module disposant de statistiques publiques"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Sélectionnez l'un de vos modules pour afficher ses statistiques"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Sélectionnez un module pour afficher ses statistiques"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Sélectionnez un module disposant de statistiques publiques"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Tableau de bord des statistiques"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Voir les Statistiques"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Afficher ce tableau au format CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "aucun"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Retirer cette courbe"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grouper par&nbsp;: jour"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grouper par&nbsp;: mois"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grouper par&nbsp;: semaine"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Comparer par: semaine"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trouvés sur cette tranche"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Ajouter une courbe"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Ajouter une autre courbe sur ce graphique"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Cacher le compte total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Afficher le compte total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Tracer le décompte total sur ce graphique"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Afficher les données (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr ""
 "Obtenir ces données sous forme de fichier aux valeurs séparées par des "
 "virgules (CSV)."
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Cacher %s évènements"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Afficher %s évènements"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Superposer les dates de sortie des modules sur les courbes"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Cacher les évènements Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Afficher les évènements Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Superposer les dates de sortie de Firefox sur les courbes"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Réduire le graphique"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Dévelopepr le graphique"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionner le graphique"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilisateurs actifs par jour"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personnalisé"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Téléchargements"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Système d'exploitation"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Statut du module"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Résumé"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version du module"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Système d'exploitation"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Statut du module"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Inconnu"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Version du module"
 
@@ -7114,7 +6321,7 @@ msgstr "Vos réglages ont été mis à jour&nbsp;!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Tableau de bord des statistiques"
 
@@ -7142,105 +6349,109 @@ msgstr "Dézoomer"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Dézoomer un mois"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Résumé quotidien des statistiques pour %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Flux RSS du résumé des données"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistiques pour %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Par défaut, seul vous et Mozilla avez accès aux informations de votre "
 "tableau de bord. Vous pouvez rendre celui-ci public afin que tout le monde "
 "puisse voir les données concernant votre module."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Accès au tableau de bord"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privé"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Seul vous et Mozilla avez accès aux statistiques de ce module"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Quiconque peut voir les statistiques de ce module"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Changer les réglages"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Veuillez considérer ces informations comme confidentielles."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ce tableau de bord est actuellement <b>privé</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ce tableau de bord est actuellement <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Verrouillé"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Retour au tableau de bord"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Enregistrer les réglages"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Réglages du tableau de bord des statistiques pour %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "déverrouillé"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Appli"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SE"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "??"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Moyenne des téléchargements quotidiens"
 
@@ -7252,7 +6463,7 @@ msgstr "Téléchargements"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Dernier jour compté"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Téléchargements ces 7 derniers jours"
 
@@ -7270,7 +6481,7 @@ msgstr "Depuis %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Pas encore de données"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Moyenne des utilisateurs actifs par jour"
 
@@ -7296,69 +6507,54 @@ msgstr "Utilisateurs actifs par jour"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Sur %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Moyenne quotidienne du nombre d'utilisateurs cette semaine"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s par rapport à la semaine dernière"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistiques %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Tous les thèmes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Naviguer dans les thèmes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Changer le courriel"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Changer le mot de passe"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Le code de confirmation a été renvoyé&nbsp;!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Votre compte utilisateur a bien été effacé. Si vous désirez revenir, vous "
 "pouvez vous réinscrire sur la <a href=\"%2$s\">page d'inscription des "
 "utilisateurs</a>"
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "La communauté des Mozilla Add-ons regrette votre départ."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirmez le mot de passe"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Effacer mon compte utilisateur maintenant"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Vous ne pouvez pas effacer votre compte si vous êtes listé comme <a href=\"%1"
@@ -7368,80 +6564,80 @@ msgstr ""
 "compte depuis cette page."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Si vous avez d'autres questions, veuillez contacter %1$s pour obtenir de "
 "l'assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "You devez cocher la case \"Je comprends...\" avant que nous ne puissions "
 "effacer votre compte."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr ""
 "Veuillez saisir votre mot de passe correctement afin de passer cette étape."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Une erreur non identifée s'est produite lors de la suppression de votre "
 "compte. Veuillez faire part de ce problème à  %1$s et nous vous supprimerons "
 "votre compte. Veuillez nous excuser pour cette gêne."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmer la suppression du compte"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Supprimer le compte utilisateur %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Au revoir&nbsp;!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Vous ne pourrez plus vous connecter sur Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "En cliquant sur  \"Supprimer\" votre compte sera <strong>effacé "
 "définitivement</strong>. Cela signifie que&nbsp;:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Vos critiques et évaluations ne seront pas effacées mais elle ne seront plus "
 "associées à votre nom."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Si vous avez un problème spécifique pour lequel vous avez besoin d'aide, ne "
 "supprimez pas votre compte maintenant mais contactez-nous via  %1$s, nous "
 "ferons tout notre possible pour vous aider à le résoudre."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr ""
 "Je comprend bien qu'une fois cette étape franchie, il n'y a pas de retour en "
 "arrière possible."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Utilisateur supprimé"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Un courriel a été envoyé à %1$s afin de confirmer votre nouvelle adresse "
@@ -7449,7 +6645,7 @@ msgstr ""
 "le lien inclus dans ce courriel. En attendant, vous pouvez continuer de vous "
 "connecter avec votre adresse actuelle."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Supprimer le compte utilisateur"
 
@@ -7477,7 +6673,9 @@ msgstr ""
 "L'équipe %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Vous avez demandé un changement de votre adresse électronique sur %2$s Add-"
@@ -7522,110 +6720,91 @@ msgstr ""
 "-- \n"
 "L'équipe de Mozilla Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Réinitialiser votre mot de passe AMO"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Erreur&nbsp;!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr ""
 "Veuillez confirmer votre changement d'adresse électronique à %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Bravo&nbsp;!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Votre adresse électronique a bien été changée. À partir de maintenant, "
 "utilisez %1$s  pour vous connecter."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "À propos de moi"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Présentez-vous à la communauté si vous le désirez! Ce texte sera affiché sur "
-"votre page publique d'utilisateur. Les sauts de ligne seront conservés mais "
-"l'utilisation du HTML n'est pas permise."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirmez le mot de passe"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Éditer le profil utilisateur de %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Courriel"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Prénom"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Masquer l'adresse électronique"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Site web (URL)"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Nom"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Connexion utilisateur"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nouveau mot de passe"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Pseudo"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Ancien mot de passe"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Autres opérations"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Mot de passe"
 
@@ -7633,69 +6812,69 @@ msgstr "Mot de passe"
 msgid "user_form_registration"
 msgstr "Enregistrement d'un nouvel utilisateur"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Se souvenir de moi sur cet ordinateur"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Afficher le bac à sable ?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Enregistrer"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Se connecter"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "S'enregistrer"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s est un utilisateur AMO depuis "
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Créer un nouveau compte utilisateur"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilité du module (fortement recommandé)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Évènements et concours à venir"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr ""
 "Il n'y a actuellement aucune notification nécessitant une configuration de "
 "votre part."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Occasionnellement, Mozilla peut vous envoyer un courriel concernant les "
 "prochaines sorties logicielles et des évènements liés aux modules. Veuillez "
 "sélectionnez ci-dessous les sujets susceptibles de vous intéresser&nbsp;:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla se réserve le droit de vous contacter personnellement pour des "
 "problèmes particuliers liés à vos modules hébergés."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Les changements que vous avez effectués contenaient des erreurs. Veuillez "
 "les corriger avant de soumettre le formulaire à nouveau."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil mis à jour."
 
@@ -7708,15 +6887,15 @@ msgstr "Mot de passe de  %s réinitialisé"
 msgid "user_pwreset_header"
 msgstr "Réinitialisation du mot de passe"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Mot de passe oublié&nbsp;?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Le lien de réinitialisation de votre mot de passe a été envoyé."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Mot de passe réinitialisé avec succès."
 
@@ -7728,7 +6907,7 @@ msgstr "Envoyer le nouveau mot de passe"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Envoyer un lien pour réinitialiser le mot de passe"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s AMO"
@@ -7743,7 +6922,7 @@ msgstr ""
 "connecter à Mozilla Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7755,24 +6934,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "envoyer à nouveau le message de confirmation"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Félicitations&nbsp;! Votre compte utilisateur a bien été créé."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7784,29 +6949,20 @@ msgstr ""
 "mentionnée ci-dessus."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Merci de vous être inscrit et bienvenue sur %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Bienvenue sur addons.mozilla.org (AMO)&nbsp;!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Votre nom, prénom ou pseudo est nécessaire."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil utilisateur"
 
@@ -7814,65 +6970,50 @@ msgstr "Profil utilisateur"
 msgid "user_verified_okay"
 msgstr "Vérification réussie&nbsp;!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Supprimer le compte utilisateur"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Édition du compte utilisateur"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "À propos de moi"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Modules de %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nom"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil de l'auteur"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Courriel"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Site web"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Pseudo"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Information sur %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Critiques de %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Connexion utilisateur"
 
@@ -7905,706 +7046,5 @@ msgstr "Mot de passe utilisateur réinitialisé"
 msgid "users_register_pagetitle"
 msgstr "Inscription d'un nouvel utilisateur"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licence du code source de %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Afficher tous les ajouts récents"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Afficher les plus téléchargés"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Afficher les mieux notés"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Module suivant"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Module précédent"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "La plus récente version compatible avec "
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Historique complet des versions"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Ajouts récents"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Les plus populaires&nbsp;:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Nous recommandons&nbsp;:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Mises à jour récentes&nbsp;:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Tout afficher"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Voir tous les modules recommandés"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Les mieux notés en premier"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Les plus récemment mis à jour en premier"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Les plus populaires en premier"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Cette version de votre module n'indique pas être compatible avec Firefox %"
-#~ "1$s. Mozilla a l'intention de sortir une nouvelle version de Firefox "
-#~ "bientôt, nous vous engageons à tester votre module dans la nouvelle "
-#~ "version et à mettre à jour les informations de compatibilité. Vous "
-#~ "trouverez de plus amples informations à ce sujet <a href=\"%2$s\">ici</"
-#~ "a>. Ce message vous est transmis à titre informatif, vous pouvez "
-#~ "continuer à envoyer cette version à addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Module désactivé avec succès"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Éditer le module"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Module activé avec succès"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Description du module"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "CLUF"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Page d'accueil du module"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nom du module"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Politique de confidentialité"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Résumé du module"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Courriel d'assistance"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL d'assistance"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Notes de version"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Proposer le module"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Module proposé avec succès&nbsp;!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visitez la page %1$s afin d'effectuer des changements à votre soumission "
-#~ "ou bien %2$s pour retourner au panneau de contrôle du développeur."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "Cliquez ici"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Éditer le module"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Cette version a été placée dans le bac à sable jusqu'à ce qu'elle soit "
-#~ "validée par les testeurs de la zone de bac à sable ainsi qu'un éditeur. "
-#~ "Vous serez averti par courriel lorsqu'une mesure concernant votre module "
-#~ "aura été prise."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Vous pouvez en découvrir d'avantage sur le système de révision du bac à "
-#~ "sable %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "ici"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Cette version a été placée dans le bac à sable pour être proposé à des "
-#~ "utilisateurs expérimentés. Afin de s'afficher sur le site public, vous "
-#~ "devez %s votre module et subir un processus de vérification."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nominer"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "La soumission de votre module a été réalisée avec succès."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Votre module étant considéré de confiance, cette version a été approuvée "
-#~ "automatiquement pour la zone publique."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Soumettre un module"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Module mis à jour avec succès"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Vous désirez peut-être %s afin de promouvoir votre module."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "Envoyer une pré-version"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Aucun auteur trouvé [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Enlever"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Êtes-vous certain de vouloir annuler votre soumission&nbsp;?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Suivant"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Modifier le type de module&nbsp;:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Commentaire développeur mis à jour."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Ajouter une prévisualisation"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Auteur"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Auteurs"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Aucun"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Catégories"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Catégorie"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Description"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Désactivé"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Détails"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Commentaires du développeur"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Prévisualisations"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versions"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Page d'accueil"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Aucun"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Aucun texte d'illustration"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Aucune prévisualisation trouvée."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Mettre à jour"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Courriel d'assistance"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Le développeur n'a pas fourni de courriel d'assistance."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL d'assistance"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Le développeur n'a pas fourni d'URL d'assistance."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "De confiance"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Aucune version trouvée."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Annuler et revenir en arrière"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Oui, le désactiver"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Êtes-vous sûr de vouloir désactiver ce module&nbsp;?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Désactiver ce module le cachera des résultats de recherche et des pages "
-#~ "publiques. Celui-ci ne pourra plus être téléchargé depuis le site et ne "
-#~ "sera plus proposé via les vérifications automatiques de mise à jour. Le "
-#~ "module sera bel et bien effacé, néanmoins vous pourrez revenir ici et le "
-#~ "réactiver à votre guise. "
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Désactiver %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Oui, je l'active"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Êtes-vous sûr de vouloir activer ce module&nbsp;?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Activer ce module permettra son affichage dans les résultats de "
-#~ "recherches et sur les pages publiques. Celui-ci sera téléchargeable à la "
-#~ "fois depuis le site Web et depuis les vérifications automatiques de mise "
-#~ "à jour des clients."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Activer %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Ajouter l'auteur"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Courriel de l'auteur"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Enlever"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Aucune catégorie disponible pour ce type de module."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Auteurs"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Ajouter une icône"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Changer l'icône"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permettre aux utilisateurs de voir les fichiers sources en ligne"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Catégories"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Langue par défaut"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "N'effacer que l'icône actuelle"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Nouveau fichier icône"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icône"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr ""
-#~ "information suplémentaire succinte (telle que le nom de la langue "
-#~ "régionale)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Mettre à jour"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">code langue "
-#~ "simple</a>  tel que 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Les fichiers cochés seront effacés."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Fichiers"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Applications cibles"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Aucun fichier."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notes au réviseur"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Mettre à jour"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Les résumés sont limités à un maximum de 250 caractères.\n"
-#~ "(Vous en avez saisi %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Le nom de votre module existe déjà dans la base de données. Assurez-vous "
-#~ "que&nbsp;: <br /><li>vos GUIDs correspondent. La cause la plus commune "
-#~ "pour cette erreur est la non correspondance des GUIDs.</li><li>Vous "
-#~ "n'avez pas d'entrée dupliquée dans la base de données. Si c'est le cas, "
-#~ "vous devriez mettre à jour cette entrée ou l'effacer et recommencer "
-#~ "l'opération.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr ""
-#~ "Veuillez décrire les changements apportés par la mise à jour de ce module."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Les GUIDs de tous les fichiers ne correspondent pas"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Une version identique (%s) existe déjà pour ce module et cette plateforme."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Vous devez fournir les détails demandés pour la nomination."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Vous ne pouvez sélectionner un module en pré-version."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Vous ne pouvez nominer que des modules actuellement dans le bac à sable."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Une erreur s'est produite lors de l'enregistremnet de vos données."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Vous n'avez pas l'autorisation de mettre à jour ce module."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Ajouter un autre fichier pour la plateforme"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Ajouter auteur"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Supprimer"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Les catégories pour votre module seront disponibles à l'étape suivante."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Aucune catégorie disponible pour ce type de module."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Veuillez saisir une description pour votre module."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Veuillez saisir le nom de votre module."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Veuillez sélectionner le type de module que vous proposez."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Veuillez saisir un résumé de votre module."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Fichier de module"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Fichier de module 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Fichier de module 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Type de module"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permettre aux utilisateurs de voir les fichiers sources en ligne"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Courriel de l'auteur"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Auteurs"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Catégories"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Langue par défaut"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Description"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Contrat de License Utilisateur Final (CLUF)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Ce module a besoin d'un logiciel externe"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Fichiers"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Page d'accueil"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Fichier icône"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nom"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plateformes supportées"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Ceci est une pré-version"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Politique de confidentialité"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Ce module concerne un site web spécifique"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Résumé"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Courriel d'assistance"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL d'assistance"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Applications cibles"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Version"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Notes de version"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Aucun"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notes au réviseur"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Votre module étant jugé de confiance, choisissez où cette version devrait "
-#~ "être placée&nbsp;:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Public"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Bac à sable"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Accord du développeur"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Étape 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Envoi du fichier"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Étape 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Détails du module"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Étape 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Détails de la version"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Étape 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localisation"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Étape 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Succès"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Mes modules"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Revenir aux détails du module"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Type de module automatiquement détecté&nbsp;: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "La locale par défaut de ce module (%1$s [%2$s]) est différente de celle "
-#~ "que vous avez sélectionnée actuellement (%3$s [%4$s]). Les champs ci-"
-#~ "dessous devraient être remplis dans %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorrect&nbsp;?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Êtes-vous sûr de vouloir effacer ce fichier&nbsp;?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr ""
-#~ "Passer l'étape de mise à jour des informations concernant mon module."
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Les soumissions de modules sont actuellement désactivées. Veuillez "
-#~ "réessayer plus tard."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "J'accepte"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Je refuse"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Ce module a été désactivé par un administrateur."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Désactivé"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "De confiance"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Vous n'avez pas de modules. Cliquez %s pour en soumettre un."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "ici"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Assurez-vous d'%s de votre thème."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "envoyer une prévisualisation"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Éditer la version"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Version mise à jour avec succès."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nouveau"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Mis à jour"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Types de modules"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Âge"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Applications"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plateformes"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Types de soumissions"
-
-#~ msgid "error_notice"
-#~ msgstr "Avertissement"
-
-#~ msgid "forum_save"
-#~ msgstr "Enregistrer"
-
-#~ msgid "home"
-#~ msgstr "accueil"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Modules expérimentaux"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Retour à la page précédente"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Ceci est la page %1$s sur %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s module correspondant"
-#~ msgstr[1] "%s modules correspondants"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Flux RSS du résumé des données"
diff --git a/site/app/locale/fy_NL/LC_MESSAGES/messages.po b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
index 487446a..46c456f 100644
--- a/site/app/locale/fy_NL/LC_MESSAGES/messages.po
+++ b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 #, fuzzy
 msgid "a_cancel_installation"
 msgstr "Cancel Installation"
@@ -26,188 +26,179 @@ msgstr "Cancel Installation"
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, fuzzy, php-format
 msgid "a_download"
 msgstr "Download Now %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 #, fuzzy
 msgid "a_eula_download"
 msgstr "Accept and Download"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 #, fuzzy
 msgid "a_eula_install"
 msgstr "Accept and Install"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 #, fuzzy
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 #, fuzzy
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, fuzzy, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads_weekly"
 msgstr "weekly downloads"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s add-on"
 msgstr[1] "%1$s add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 #, fuzzy
 msgid "addon_list_perpage"
 msgstr "per page"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 #, fuzzy
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 #, fuzzy
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 #, fuzzy
 msgid "addon_listitem_flag_recommended"
 msgstr "recommended"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 #, fuzzy
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is not available for %2$s."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, fuzzy, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Back to %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, fuzzy, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Back to the reviews..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 #, fuzzy
 msgid "addon_review_add_rating_field"
 msgstr "Rating:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 #, fuzzy
 msgid "addon_review_add_review_field"
 msgstr "Review:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 #, fuzzy
 msgid "addon_review_add_submit"
 msgstr "Submit your review"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_add_title"
 msgstr "Add a review for %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 #, fuzzy
 msgid "addon_review_add_title_field"
 msgstr "Title/Summary:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 #, fuzzy
 msgid "addon_review_admin_delete"
 msgstr "Delete"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 #, fuzzy
 msgid "addon_review_author_reply_link"
 msgstr "Reply"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 #, fuzzy
 msgid "addon_review_confirm_delete"
 msgstr "Are you sure you wish to delete this review?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 #, fuzzy
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 #, fuzzy
 msgid "addon_review_confirm_yes"
 msgstr "Yes"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 #, fuzzy
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
@@ -218,7 +209,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, fuzzy, php-format
 msgid "addon_review_edit_title"
 msgstr "Edit Review for %s"
@@ -234,21 +225,21 @@ msgstr ""
 
 # Removing an extra comma
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 #, fuzzy
 msgid "addon_review_in_moderation"
 msgstr ""
 "Please note: Before your review shows up on the public site it will be "
 "moderated by an editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 #, fuzzy
 msgid "addon_review_in_reply_to"
 msgstr "Developer reply to:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -267,35 +258,49 @@ msgstr "Reviews for %s"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Reply by %1$s on %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 #, fuzzy
 msgid "addon_review_reply_prefix"
 msgstr "Developer Reply:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 #, fuzzy
 msgid "addon_review_saved_successfully"
 msgstr "Your review was saved successfully. Thanks!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
-#, fuzzy
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, fuzzy, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "by %1$s on %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, fuzzy, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "by %1$s on %2$s (rated %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -305,31 +310,30 @@ msgstr "Permanent link to this version"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, fuzzy, php-format
 msgid "addons_browse_browse_category"
 msgstr "Browse %s"
@@ -338,127 +342,75 @@ msgstr "Browse %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 #, fuzzy
 msgid "addons_display_add_review"
 msgstr "Add a review"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 #, fuzzy
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
 msgstr "Don't like it"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 #, fuzzy
 msgid "addons_display_edit_review"
 msgstr "Edit your review"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 #, fuzzy
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 #, fuzzy
 msgid "addons_display_hate_it"
 msgstr "Hate it"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 #, fuzzy
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 #, fuzzy
 msgid "addons_display_header_reviews"
 msgstr "Reviews"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
@@ -468,28 +420,24 @@ msgstr "Like it"
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 #, fuzzy
 msgid "addons_display_love_it"
 msgstr "Love it"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 #, fuzzy
 msgid "addons_display_more_images"
 msgstr "More Images"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -499,21 +447,21 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, fuzzy, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Support for this add-on is provided by the developer at %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -521,22 +469,23 @@ msgstr ""
 "e-mail to %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Support for this add-on is provided by the developer at %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 #, fuzzy
 msgid "addons_display_really_like_it"
 msgstr "Really like it"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -546,53 +495,58 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, fuzzy, php-format
 msgid "addons_display_see_all_addons"
 msgstr "See All %1$s Add-ons"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, fuzzy, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "See all reviews (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 #, fuzzy
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+#, fuzzy
+msgid "addons_display_version_history"
+msgstr "Complete Version History"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 #, fuzzy
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -602,233 +556,120 @@ msgstr "What do you think?"
 msgid "addons_display_workswith"
 msgstr "Works with:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 #, fuzzy
 msgid "addons_home_by"
 msgstr "by"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 #, fuzzy
 msgid "addons_home_feature_head"
 msgstr "We Recommend"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, fuzzy, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
 "a look around and make %1$s your own."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
+#: views/addons/home.thtml:201
 #, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 #, fuzzy
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, fuzzy, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+#, fuzzy
+msgid "addons_home_popular_header"
+msgstr "Most Popular:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+#, fuzzy
+msgid "addons_home_recommended_header"
+msgstr "We Recommend:"
+
+#: views/addons/home.thtml:211
+#, fuzzy
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+#, fuzzy
+msgid "addons_home_view_all"
+msgstr "View all"
+
+#: views/addons/home.thtml:209
 #, fuzzy
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 #, fuzzy
 msgid "addons_home_view_all_popular_title"
 msgstr "View all popular add-ons"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 #, fuzzy
 msgid "addons_home_view_all_recommended_title"
 msgstr "View all recommended add-ons"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 #, fuzzy
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -836,12 +677,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 #, fuzzy
 msgid "addons_install_in_thunderbird"
 msgstr ""
@@ -850,49 +691,46 @@ msgstr ""
 "Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
 "button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 #, fuzzy
 msgid "addons_install_in_thunderbird_title"
 msgstr "How to Install in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 #, fuzzy
 msgid "addons_options_show_experimental"
 msgstr "show experimental add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 #, fuzzy
 msgid "addons_options_submit"
 msgstr "Go"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 #, fuzzy
 msgid "addons_plugins_by"
 msgstr "By"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 #, fuzzy
 msgid "addons_plugins_for_linux"
 msgstr "for Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 #, fuzzy
 msgid "addons_plugins_for_macosx"
 msgstr "for Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 #, fuzzy
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, fuzzy, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -900,12 +738,12 @@ msgstr ""
 "more information about other plugins available for Mozilla-based Browsers, "
 "visit %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 #, fuzzy
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Looking for a plugin not listed here?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 #, fuzzy
 msgid "addons_plugins_main_description"
 msgstr ""
@@ -914,26 +752,26 @@ msgstr ""
 "from extensions, which modify or add to existing functionality."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 #, fuzzy
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 #, fuzzy
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, fuzzy, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -942,47 +780,42 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, fuzzy, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 #, fuzzy
 msgid "addons_recommended_introduction"
 msgstr ""
 "With so many great add-ons available, there's something for everyone. To get "
 "you started, here's a list of some of the most popular. Enjoy!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 #, fuzzy
 msgid "addons_recommended_pagetitle"
 msgstr "Recommended Add-ons"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 #, fuzzy
 msgid "addons_recommended_title"
 msgstr "Recommended Add-ons"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 #, fuzzy
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 #, fuzzy
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 #, fuzzy
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
@@ -1001,53 +834,52 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Learn how to %1$s at the %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 #, fuzzy
 msgid "addons_searchengines_makeyourown_link"
 msgstr "make your own"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Browse through more search engines at %1$s"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 #, fuzzy
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 #, fuzzy
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 #, fuzzy
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Special thanks to the Mycroft Project for their work on Firefox Search "
 "Engines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1092,19 +924,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1115,42 +947,30 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 #, fuzzy
 msgid "addons_versions_careful"
 msgstr "Be Careful With Old Versions"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 #, fuzzy
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 #, fuzzy
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, fuzzy, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -1191,150 +1011,138 @@ msgstr "Group Admin"
 msgid "admin_group_saved"
 msgstr "The Group has been saved"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 #, fuzzy
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 #, fuzzy
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 #, fuzzy
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 #, fuzzy
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 #, fuzzy
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 #, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 #, fuzzy
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 #, fuzzy
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 #, fuzzy
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 #, fuzzy
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 #, fuzzy
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 #, fuzzy
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 #, fuzzy
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 #, fuzzy
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 #, fuzzy
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 #, fuzzy
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 #, fuzzy
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 #, fuzzy
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 #, fuzzy
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 #, fuzzy
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 #, fuzzy
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 #, fuzzy
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 #, fuzzy
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 #, fuzzy
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 #, fuzzy
 msgid "app_compat_older_firefox_only"
 msgstr "This add-on is for older versions of Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1342,348 +1150,46 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 #, fuzzy
 msgid "app_compat_try_old_version"
 msgstr "An <a href=\"%1$s\">older version</a> may work"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 #, fuzzy
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1694,865 +1200,54 @@ msgid "categories_current_title"
 msgstr "Current Category"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 #, fuzzy
 msgid "categories_header"
 msgstr "Categories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 #, fuzzy
 msgid "categories_header_title"
 msgstr "Choose a category"
 
-# %1 is the category name
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, fuzzy, php-format
-msgid "category_extra_see_all"
-msgstr "See All %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
+#: views/addons/category_landing.thtml:68
 #, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+msgid "category_extra_allrecommended"
+msgstr "See All Recommended Add-ons"
 
-#: controllers/collections_controller.php:1065
+#: views/addons/category_landing.thtml:59
 #, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+msgid "category_extra_highestrated"
+msgstr "Highest Rated First"
 
-#: controllers/collections_controller.php:1051
+#: views/addons/category_landing.thtml:60
 #, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+msgid "category_extra_lastupdated"
+msgstr "Last Updated First"
 
-#: controllers/collections_controller.php:1080
+#: views/addons/category_landing.thtml:58
 #, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+msgid "category_extra_mostpopular"
+msgstr "Most Popular First"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+# %1 is the category name
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, fuzzy, php-format
+msgid "category_extra_see_all"
+msgstr "See All %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2560,71 +1255,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2633,26 +1328,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2660,115 +1355,115 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 #, fuzzy
 msgid "credits_intro"
 msgstr ""
 "Mozilla would like to thank the following people for their contributions to "
 "the addons.mozilla.org project over the years:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 #, fuzzy
 msgid "credits_section_developers"
 msgstr "Developers"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 #, fuzzy
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 #, fuzzy
 msgid "credits_section_localizers"
 msgstr "Localizers"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 #, fuzzy
 msgid "credits_section_other_contributors"
 msgstr "Other Contributors"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 #, fuzzy
 msgid "credits_section_past_developers"
 msgstr "Past Developers"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 #, fuzzy
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 #, fuzzy
 msgid "credits_software_famfamfam"
 msgstr ""
@@ -2777,7 +1472,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2790,20 +1485,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 #, fuzzy
 msgid "date"
 msgstr "%B %e, %Y"
@@ -2845,25 +1537,25 @@ msgstr "Statistics Dashboard"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2873,6 +1565,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detect)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, fuzzy, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 #, fuzzy
 msgid "devcp_additem_linktitle_opensin_newwindow"
@@ -2918,77 +1623,156 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
+#: controllers/developers_controller.php:2746
+#, fuzzy
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+#, fuzzy
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+#: controllers/developers_controller.php:2741
+#, fuzzy
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+#, fuzzy
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+#, fuzzy
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+#, fuzzy
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+#, fuzzy
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 #, fuzzy
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+#, fuzzy
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+#, fuzzy
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+#: controllers/developers_controller.php:2540
+#, fuzzy
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+#, fuzzy
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+#, fuzzy
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+#, fuzzy
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+#: controllers/developers_controller.php:2814
+#, fuzzy
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -3024,7 +1808,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -3034,6 +1818,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -3045,13 +1834,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -3061,7 +1850,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -3071,12 +1860,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -3085,14 +1874,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3171,13 +1960,144 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, fuzzy, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Tools."
+
+#: views/developers/add_step5.thtml:76
+#, fuzzy
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+#: views/developers/add_step5.thtml:76
+#, fuzzy
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+#: views/developers/add_step5.thtml:57
+#, fuzzy
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+#: views/developers/add_step5.thtml:63
+#, fuzzy
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+#: views/developers/add_step5.thtml:60
+#, fuzzy
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+#: views/developers/add_step5.thtml:51
+#, fuzzy
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+#: views/developers/add_step5.thtml:54
+#, fuzzy
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+#, fuzzy
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+#: controllers/developers_controller.php:2460
+#, fuzzy
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, fuzzy, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+#: views/developers/add_step5.thtml:71
+#, fuzzy
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, fuzzy, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+#: views/developers/author_lookup.thtml:44
+#, fuzzy
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#, fuzzy
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#, fuzzy
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+#, fuzzy
+msgid "devcp_button_next"
+msgstr "Next"
+
+#: views/developers/add_step2.thtml:66
+#, fuzzy
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+#: controllers/developers_controller.php:1487
+#, fuzzy
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3254,37 +2174,211 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+#, fuzzy
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_author"
+msgstr "Author"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+#: views/developers/details.thtml:68
+#, fuzzy
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+#: views/developers/details.thtml:73
+#, fuzzy
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+#, fuzzy
+msgid "devcp_details_category"
+msgstr "Category"
+
+#: views/developers/details.thtml:74
+#, fuzzy
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+#, fuzzy
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+#: views/developers/details.thtml:69
+#, fuzzy
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+#, fuzzy
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+#, fuzzy
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+#: views/developers/details.thtml:102
+#, fuzzy
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+#: views/developers/details.thtml:79
+#, fuzzy
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+#, fuzzy
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+#, fuzzy
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+#: views/developers/details.thtml:109
+#, fuzzy
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+#: views/developers/details.thtml:117
+#, fuzzy
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+#: views/developers/details.thtml:151
+#, fuzzy
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+#, fuzzy
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, fuzzy, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+#, fuzzy
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+#: views/developers/disable.thtml:64
+#, fuzzy
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+#, fuzzy
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+#, fuzzy
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+#, fuzzy
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, fuzzy, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+#, fuzzy
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+#, fuzzy
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+#, fuzzy
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, fuzzy, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3338,62 +2432,77 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+#, fuzzy
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+#: views/developers/edit.thtml:69
+#, fuzzy
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/edit.thtml:56
+#, fuzzy
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3406,30 +2515,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3508,22 +2617,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3532,12 +2641,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3545,12 +2654,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3559,24 +2668,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3584,7 +2693,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3609,47 +2718,123 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+#, fuzzy
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+#, fuzzy
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+#: views/developers/edit.thtml:99
+#, fuzzy
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+#: views/developers/edit.thtml:96
+#, fuzzy
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+#: views/developers/edit.thtml:131
+#, fuzzy
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/edit.thtml:75
+#, fuzzy
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+#, fuzzy
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 #, fuzzy
 msgid "devcp_edit_label_externalsoftware"
 msgstr "This add-on requires external software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+#, fuzzy
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+#: views/developers/edit.thtml:104
+#, fuzzy
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+#: views/developers/edit.thtml:92
+#, fuzzy
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 #, fuzzy
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 #, fuzzy
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 #, fuzzy
 msgid "devcp_edit_label_sitespecific"
 msgstr "This is a site-specific add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 #, fuzzy
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+#, fuzzy
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3657,12 +2842,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3670,60 +2855,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3732,32 +2917,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3765,22 +2950,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3788,12 +2973,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3801,39 +2986,51 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+#, fuzzy
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+#: views/developers/edit.thtml:121
+#, fuzzy
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3924,8 +3121,53 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Pending Updates (%s)"
 msgstr[1] "Pending Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+#, fuzzy
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, fuzzy, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+#, fuzzy
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+#: views/developers/editversion.thtml:75
+#, fuzzy
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+#: views/developers/editversion.thtml:69
+#, fuzzy
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+#: views/developers/editversion.thtml:117
+#, fuzzy
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/editversion.thtml:122
+#, fuzzy
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
@@ -3933,6 +3175,25 @@ msgstr[1] "Pending Updates (%s)"
 msgid "devcp_error_addon_access_denied"
 msgstr "You do not have access to that add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+#, fuzzy
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+#: controllers/developers_controller.php:1992
+#, fuzzy
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3947,10 +3208,10 @@ msgstr "Please see %s for reference."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: views/developers/addon_edit_authors.thtml:76
+#: controllers/developers_controller.php:2098
 #, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3969,6 +3230,11 @@ msgstr ""
 "That file extension (%s) is not allowed for the selected add-on type. Please "
 "use one of the following: %s"
 
+#: controllers/developers_controller.php:1739
+#, fuzzy
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
 #: controllers/components/developers.php:64
 #, fuzzy
 msgid "devcp_error_five_categories"
@@ -4008,7 +3274,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, fuzzy, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 #, fuzzy
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
@@ -4018,7 +3291,7 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 #, fuzzy
 msgid "devcp_error_invalid_addontype"
 msgstr "Please select a valid add-on type."
@@ -4093,6 +3366,21 @@ msgstr "No ID could be found for this add-on in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
+#: controllers/developers_controller.php:2803
+#, fuzzy
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+#: controllers/developers_controller.php:2797
+#, fuzzy
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+#: controllers/developers_controller.php:2789
+#, fuzzy
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
 #: controllers/components/developers.php:59
 #, fuzzy
 msgid "devcp_error_one_category"
@@ -4112,6 +3400,18 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+#, fuzzy
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+#: controllers/developers_controller.php:1781
+#, fuzzy
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
 #: controllers/components/developers.php:511
 #, fuzzy
 msgid "devcp_error_updatekey"
@@ -4126,99 +3426,345 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+#, fuzzy
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+#, fuzzy
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+#: views/developers/add_step2.thtml:84
+#, fuzzy
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+#: views/developers/add_step2.thtml:107
+#, fuzzy
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+#: views/developers/add_step2.thtml:105
+#, fuzzy
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: views/developers/add_step2.thtml:132
+#, fuzzy
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+#: views/developers/add_step2.thtml:76
+#, fuzzy
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+#: views/developers/add_step1.thtml:63
+#, fuzzy
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+#: views/developers/add_step2.thtml:127
+#, fuzzy
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+#: views/developers/add_step1.thtml:72
+#, fuzzy
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+#: views/developers/add_step1.thtml:80
+#, fuzzy
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+#: views/developers/add_step1.thtml:89
+#, fuzzy
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+#: views/developers/add_step1.thtml:59
+#, fuzzy
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+#: views/developers/add_step2.thtml:145
+#, fuzzy
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/add_step2.thtml:97
+#, fuzzy
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/add_step2.thtml:79
+#, fuzzy
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+#, fuzzy
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+#, fuzzy
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/add_step2.thtml:130
+#, fuzzy
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+#, fuzzy
+msgid "devcp_form_label_eula"
+msgstr "End-User License Agreement (EULA)"
+
+#: views/developers/add_step2.thtml:157
+#, fuzzy
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+#: views/developers/add_step3.thtml:70
+#, fuzzy
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+#: views/developers/add_step2.thtml:110
+#, fuzzy
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+#, fuzzy
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+#: views/developers/add_step2.thtml:74
+#, fuzzy
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+#, fuzzy
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+#: views/developers/add_step2.thtml:149
+#, fuzzy
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+#: views/developers/add_step2.thtml:140
+#, fuzzy
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+#: views/developers/add_step2.thtml:153
+#, fuzzy
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+#: views/developers/add_step2.thtml:125
+#, fuzzy
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+#: views/developers/add_step2.thtml:115
+#, fuzzy
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+#, fuzzy
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+#, fuzzy
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+#: views/developers/add_step3.thtml:66
+#, fuzzy
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+#, fuzzy
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+#: views/developers/add_step3.thtml:89
+#, fuzzy
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+#: views/developers/add_step3.thtml:100
+#, fuzzy
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/add_step3.thtml:114
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+#: views/developers/add_step3.thtml:119
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+#, fuzzy
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, fuzzy, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+#: views/developers/add_step1.thtml:44
+#, fuzzy
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+#: views/developers/add_step1.thtml:44
+#, fuzzy
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+#: views/developers/add_step2.thtml:43
+#, fuzzy
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+#: views/developers/add_step2.thtml:43
+#, fuzzy
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+#: views/developers/add_step3.thtml:43
+#, fuzzy
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+#: views/developers/add_step3.thtml:43
+#, fuzzy
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+#: views/developers/add_step4.thtml:43
+#, fuzzy
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+#: views/developers/add_step4.thtml:43
+#, fuzzy
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+#: views/developers/add_step5.thtml:43
+#, fuzzy
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+#: views/developers/add_step5.thtml:43
+#, fuzzy
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+#: views/developers/index.thtml:48
+#, fuzzy
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 #, fuzzy
 msgid "devcp_localebox_header_localizedfields"
@@ -4236,13 +3782,13 @@ msgstr ""
 "to the selected default locale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 #, fuzzy
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Tools"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 #, fuzzy
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Tools"
@@ -4253,32 +3799,32 @@ msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 #, fuzzy
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Back to Main"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 #, fuzzy
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 #, fuzzy
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submit Add-on"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 #, fuzzy
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4290,27 +3836,40 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+#, fuzzy
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, fuzzy, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, fuzzy, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4325,6 +3884,22 @@ msgstr ""
 "Removing this as the default preview will cause another preview to "
 "automatically become the default preview."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, fuzzy, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 #, fuzzy
@@ -4333,14 +3908,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4375,46 +3950,46 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4422,7 +3997,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4442,7 +4017,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4452,7 +4027,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4467,27 +4042,27 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4515,18 +4090,28 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+#, fuzzy
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+#: controllers/developers_controller.php:2717
+#, fuzzy
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 #, fuzzy
 msgid "devcp_review_agreement_please"
 msgstr ""
@@ -4539,7 +4124,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4551,6 +4136,11 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+#, fuzzy
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip updating my current add-on information"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4654,18 +4244,73 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+#, fuzzy
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+#, fuzzy
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+#, fuzzy
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+#: views/developers/index.thtml:91
+#, fuzzy
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+#: views/developers/index.thtml:75
+#, fuzzy
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+#: views/developers/index.thtml:74
+#, fuzzy
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 #, fuzzy
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, fuzzy, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+#: views/developers/index.thtml:102
+#, fuzzy
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, fuzzy, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+#: views/developers/add_step5.thtml:68
+#, fuzzy
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4673,44 +4318,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4720,7 +4365,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4728,64 +4373,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4794,7 +4439,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4806,33 +4451,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4845,29 +4485,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4878,12 +4518,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4907,23 +4547,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4932,7 +4567,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4941,14 +4576,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4958,7 +4593,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4966,7 +4601,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4974,22 +4609,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -5008,30 +4637,35 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, fuzzy, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, fuzzy
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
 #, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+#, fuzzy
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -5100,34 +4734,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -5135,49 +4769,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -5187,59 +4816,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5248,26 +4870,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5310,7 +4932,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
@@ -5364,7 +4986,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -5440,7 +5062,7 @@ msgstr "View entries between %s and %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -5470,28 +5092,28 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 #, fuzzy
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 #, fuzzy
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 #, fuzzy
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 #, fuzzy
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 #, fuzzy
 msgid "editors_external_software"
 msgstr "External Software"
@@ -5506,46 +5128,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 #, fuzzy
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 #, fuzzy
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 #, fuzzy
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 #, fuzzy
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 #, fuzzy
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 #, fuzzy
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -5560,188 +5182,125 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 #, fuzzy
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 #, fuzzy
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 #, fuzzy
 msgid "editors_notice_none_found"
 msgstr "There are currently no add-ons of this type to review."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 #, fuzzy
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 #, fuzzy
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 #, fuzzy
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 #, fuzzy
 msgid "editors_pagetitle"
 msgstr "Editor Tools"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, fuzzy, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 #, fuzzy
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, fuzzy, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 #, fuzzy
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 #, fuzzy
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 #, fuzzy
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 #, fuzzy
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 #, fuzzy
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 #, fuzzy
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 #, fuzzy
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 #, fuzzy
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5749,7 +5308,7 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 #, fuzzy
 msgid "editors_review_details_nominated_public"
 msgstr ""
@@ -5757,26 +5316,26 @@ msgstr ""
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 #, fuzzy
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 #, fuzzy
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public add-on to appear on the "
 "public side."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 #, fuzzy
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public add-on to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 #, fuzzy
 msgid "editors_review_details_superreview"
 msgstr ""
@@ -5784,89 +5343,89 @@ msgstr ""
 "other concerns that an administrator should look into, enter your comments "
 "in the area below. They will be sent to administrators, not the author."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 #, fuzzy
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 #, fuzzy
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 #, fuzzy
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 #, fuzzy
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 #, fuzzy
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 #, fuzzy
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 #, fuzzy
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 #, fuzzy
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 #, fuzzy
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 #, fuzzy
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 #, fuzzy
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, fuzzy, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 #, fuzzy
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 #, fuzzy
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 #, fuzzy
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
@@ -5900,7 +5459,7 @@ msgstr "Nomination Approved/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 #, fuzzy
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
@@ -5932,110 +5491,97 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 #, fuzzy
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 #, fuzzy
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 #, fuzzy
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 #, fuzzy
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 #, fuzzy
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 #, fuzzy
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 #, fuzzy
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 #, fuzzy
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 #, fuzzy
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 #, fuzzy
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 #, fuzzy
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 #, fuzzy
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 #, fuzzy
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 #, fuzzy
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
@@ -6065,7 +5611,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 #, fuzzy
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
@@ -6080,89 +5626,101 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 #, fuzzy
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+#, fuzzy
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+#: controllers/editors_controller.php:232
+#, fuzzy
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+#: controllers/editors_controller.php:470
 #, fuzzy
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 #, fuzzy
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 #, fuzzy
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 #, fuzzy
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 #, fuzzy
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+#, fuzzy
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+#: views/editors/queue.thtml:81
+#, fuzzy
+msgid "editors_th_age"
+msgstr "Age"
+
+#: views/editors/queue.thtml:56
+#, fuzzy
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 #, fuzzy
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
+#: views/editors/queue.thtml:55
 #, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
+#: views/editors/queue.thtml:57
 #, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, fuzzy, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, fuzzy, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, fuzzy, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 #, fuzzy
 msgid "error_access_denied"
 msgstr "Access Denied"
@@ -6172,19 +5730,17 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -6193,14 +5749,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 #, fuzzy
 msgid "error_addon_notfound"
 msgstr "Add-on not found!"
@@ -6215,27 +5768,27 @@ msgstr "This add-on is not viewable here."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 #, fuzzy
 msgid "error_browse_no_addons"
 msgstr "No add-ons in this category!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 #, fuzzy
 msgid "error_email_invalid"
 msgstr "This is not a valid email address."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 #, fuzzy
 msgid "error_field_required"
 msgstr "This field must not be empty."
@@ -6243,32 +5796,36 @@ msgstr "This field must not be empty."
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 #, fuzzy
 msgid "error_file_notfound"
 msgstr "File not found!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, fuzzy, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 #, fuzzy
 msgid "error_formerrors"
 msgstr "There are errors in this form. Please correct them and resubmit."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 #, fuzzy
 msgid "error_invalid_url"
 msgstr ""
@@ -6277,48 +5834,37 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, fuzzy, php-format
 msgid "error_missing_argument"
 msgstr "Missing argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, fuzzy
+msgid "error_notice"
+msgstr "Notice"
+
 #: controllers/previews_controller.php:200
 #, fuzzy
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -6328,27 +5874,27 @@ msgstr "You must select a rating."
 msgid "error_user_already_confirmed"
 msgstr "This user account is already confirmed."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 #, fuzzy
 msgid "error_user_badconfirmationcode"
 msgstr "Invalid confirmation code!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 #, fuzzy
 msgid "error_user_confirmpw_nomatch"
 msgstr "The passwords did not match."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 #, fuzzy
 msgid "error_user_email_notunique"
 msgstr "This email address is already taken by another user."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6356,24 +5902,15 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 #, fuzzy
 msgid "error_user_nickname_notunique"
 msgstr "This nickname is already taken."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 #, fuzzy
 msgid "error_user_notfound"
 msgstr "User not found!"
@@ -6384,47 +5921,44 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "Please confirm your user account first with the code you received by email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 #, fuzzy
 msgid "error_username_or_pw_wrong"
 msgstr "Wrong username or password!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 #, fuzzy
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 #, fuzzy
 msgid "error_wrong_password"
 msgstr "Wrong password entered!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 #, fuzzy
 msgid "feature_learnmore"
 msgstr "Learn more"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, fuzzy, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s review"
 msgstr[1] "%1$s reviews"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 #, fuzzy
 msgid "feature_view_more_from_category"
 msgstr "View more from"
@@ -6469,46 +6003,45 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 #, fuzzy
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 #, fuzzy
 msgid "footer_credits"
 msgstr "Credits"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 #, fuzzy
 msgid "footer_disclaimer"
 msgstr ""
@@ -6517,123 +6050,117 @@ msgstr ""
 "to. Any questions, complaints or claims regarding the applications must be "
 "directed to the appropriate software vendor."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 #, fuzzy
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Go"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 #, fuzzy
 msgid "footer_legal_notices"
 msgstr "Legal Notices"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 #, fuzzy
 msgid "footer_other_languages"
 msgstr "Other languages:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 #, fuzzy
 msgid "footer_privacy_policy"
 msgstr "Privacy Policy"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+#, fuzzy
+msgid "forum_save"
+msgstr "Save"
+
+#: models/addontype.php:89
 #, fuzzy
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 #, fuzzy
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 #, fuzzy
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Add-on)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 #, fuzzy
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 #, fuzzy
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 #, fuzzy
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 #, fuzzy
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 #, fuzzy
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, fuzzy, php-format
 msgid "header_home_tooltip"
 msgstr "Return to the %1$s Add-ons homepage"
@@ -6643,102 +6170,44 @@ msgstr "Return to the %1$s Add-ons homepage"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 #, fuzzy
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 #, fuzzy
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 #, fuzzy
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 #, fuzzy
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 #, fuzzy
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 #, fuzzy
 msgid "header_navlink_login"
 msgstr "Log in"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 #, fuzzy
 msgid "header_navlink_logout"
 msgstr "Log out"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 #, fuzzy
 msgid "header_navlink_myaccount"
 msgstr "My Account"
@@ -6748,24 +6217,12 @@ msgstr "My Account"
 msgid "header_navlink_register"
 msgstr "Register"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, fuzzy, php-format
 msgid "img_preview_of"
 msgstr "Preview Image of %s"
@@ -6774,51 +6231,40 @@ msgstr "Preview Image of %s"
 # %2 is the link to an explanatory page.
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 #, fuzzy
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2"
 "$s\">Why</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, fuzzy, php-format
 msgid "install_button_text"
 msgstr "Add to %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, fuzzy, php-format
 msgid "install_button_title"
 msgstr "Add %1$s to %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 #, fuzzy
 msgid "install_error_addon_not_found"
 msgstr "This add-on is not available."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 #, fuzzy
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
@@ -6833,8 +6279,8 @@ msgstr "Download Dictionary"
 msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -6849,87 +6295,43 @@ msgstr "Install Dictionary"
 msgid "langtools_install_langpack"
 msgstr "Install Language Pack"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 #, fuzzy
 msgid "langtools_tableheader_dictionary"
 msgstr "Dictionary"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 #, fuzzy
 msgid "langtools_tableheader_langpack"
 msgstr "Language Pack"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 #, fuzzy
 msgid "langtools_tableheader_language"
 msgstr "Language"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 #, fuzzy
 msgid "list_sortby_date"
 msgstr "Date"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 #, fuzzy
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 #, fuzzy
 msgid "list_sortby_name"
 msgstr "Add-on Name"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 #, fuzzy
 msgid "list_sortby_rating"
@@ -6960,24 +6362,32 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 #, fuzzy
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+#, fuzzy
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 #, fuzzy
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 #, fuzzy
 msgid "other_users"
 msgstr "others"
@@ -6987,35 +6397,14 @@ msgstr "others"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -7052,17 +6441,17 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 #, fuzzy
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 #, fuzzy
 msgid "pages_appversions_header"
 msgstr "Valid Application Versions"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 #, fuzzy
 msgid "pages_appversions_intro"
 msgstr ""
@@ -7071,7 +6460,7 @@ msgstr ""
 "below are allowed for these applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -7080,17 +6469,21 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
 msgstr "here"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 #, fuzzy
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 #, fuzzy
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
@@ -7100,6 +6493,13 @@ msgstr "Sandbox Information Page"
 msgid "pagination_next_page"
 msgstr "next"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, fuzzy, php-format
+msgid "pagination_page_number_title"
+msgstr "This is page %1$s of %2$s"
+
 #: views/elements/pagination.thtml:52
 #, fuzzy
 msgid "pagination_previous_page"
@@ -7144,17 +6544,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -7164,7 +6564,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -7184,8 +6584,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -7204,7 +6604,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -7223,149 +6623,119 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, fuzzy, php-format
 msgid "reviews_header"
 msgstr "Reviews for %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 #, fuzzy
 msgid "rss_featuredaddons"
 msgstr "Featured Add-ons"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 #, fuzzy
 msgid "rss_newestaddons"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 #, fuzzy
 msgid "search_disabled"
 msgstr "Search is currently disabled. Please try again later."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 #, fuzzy
 msgid "search_form_all_addons"
 msgstr "all add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 #, fuzzy
 msgid "search_form_default_text"
 msgstr "search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 #, fuzzy
 msgid "search_form_within"
 msgstr "within"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 #, fuzzy
 msgid "search_landing_all_search_engines"
 msgstr "All Search Engines"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 #, fuzzy
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, fuzzy, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matching add-on"
+msgstr[1] "%s matching add-ons"
+
+#: views/search/index.thtml:49
 #, fuzzy
 msgid "search_nothing_found"
 msgstr "No results found."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 #, fuzzy
 msgid "search_pagetitle"
 msgstr "Search Add-ons"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 #, fuzzy
 msgid "search_rss_description"
 msgstr "Search results feed"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, fuzzy, php-format
 msgid "search_rss_results_for"
 msgstr "Search results for: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 #, fuzzy
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 #, fuzzy
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 #, fuzzy
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Welcome, %s"
@@ -7375,7 +6745,7 @@ msgstr "Welcome, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dictionary"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 #, fuzzy
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
@@ -7385,7 +6755,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "I am looking for a:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 #, fuzzy
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
@@ -7395,7 +6765,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Search Plugin"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 #, fuzzy
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
@@ -7405,26 +6775,27 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Theme"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, fuzzy, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 #, fuzzy
 msgid "stars_not_yet_rated"
 msgstr "Not yet rated"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Rated %s out of 5 stars"
@@ -7467,13 +6838,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, fuzzy, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s created"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
@@ -7488,222 +6859,222 @@ msgstr "Close"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 #, fuzzy
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 #, fuzzy
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 #, fuzzy
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 #, fuzzy
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 #, fuzzy
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 #, fuzzy
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 #, fuzzy
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 #, fuzzy
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 #, fuzzy
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 #, fuzzy
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 #, fuzzy
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 #, fuzzy
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 #, fuzzy
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 #, fuzzy
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
@@ -7747,7 +7118,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #, fuzzy
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
@@ -7782,22 +7153,27 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+#, fuzzy
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 #, fuzzy
 msgid "statistics_settings_access_description"
 msgstr ""
@@ -7805,102 +7181,102 @@ msgstr ""
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 #, fuzzy
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 #, fuzzy
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 #, fuzzy
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, fuzzy, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 #, fuzzy
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 #, fuzzy
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 #, fuzzy
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 #, fuzzy
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 #, fuzzy
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -7915,7 +7291,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
@@ -7936,7 +7312,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
@@ -7966,49 +7342,32 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 #, fuzzy
 msgid "themes_landing_all_themes"
 msgstr "All Themes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 #, fuzzy
 msgid "themes_landing_browse_themes"
 msgstr "Browse Themes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 #, fuzzy
 msgid "user_change_password"
 msgstr "Change password"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 #, fuzzy
 msgid "user_confirmationcode_resent"
@@ -8016,7 +7375,7 @@ msgstr "The confirmation code was resent!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -8024,24 +7383,24 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -8052,62 +7411,62 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -8116,7 +7475,7 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -8124,19 +7483,19 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -8144,7 +7503,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -8176,8 +7535,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -8219,128 +7579,105 @@ msgstr ""
 "Thanks,\n"
 "-- %2$s Add-ons Staff"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, fuzzy, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reset your %s Add-ons password"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 #, fuzzy
 msgid "user_form_confirmpassword"
 msgstr "Confirm password"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, fuzzy, php-format
 msgid "user_form_editprofile"
 msgstr "Edit user profile for %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 #, fuzzy
 msgid "user_form_email"
 msgstr "Email address"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 #, fuzzy
 msgid "user_form_firstname"
 msgstr "First name"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 #, fuzzy
 msgid "user_form_hideemail"
 msgstr "Hide email address"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 #, fuzzy
 msgid "user_form_homepage"
 msgstr "Website URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 #, fuzzy
 msgid "user_form_lastname"
 msgstr "Last name"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 #, fuzzy
 msgid "user_form_login"
 msgstr "User Login"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 #, fuzzy
 msgid "user_form_newpassword"
 msgstr "New password"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 #, fuzzy
 msgid "user_form_nickname"
 msgstr "Nickname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 #, fuzzy
 msgid "user_form_oldpassword"
 msgstr "Old password"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 #, fuzzy
 msgid "user_form_password"
 msgstr "Password"
@@ -8350,77 +7687,77 @@ msgstr "Password"
 msgid "user_form_registration"
 msgstr "New User Registration"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 #, fuzzy
 msgid "user_form_showsandbox"
 msgstr "Show sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 #, fuzzy
 msgid "user_form_submit_edit"
 msgstr "Save"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 #, fuzzy
 msgid "user_form_submit_login"
 msgstr "Log in"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 #, fuzzy
 msgid "user_form_submit_register"
 msgstr "Register"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, fuzzy, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons user since"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 #, fuzzy
 msgid "user_login_register_link"
 msgstr "Create a new user account"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 #, fuzzy
 msgid "user_profile_edit_error"
 msgstr ""
 "There were errors in the changes you made. Please correct them and resubmit."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 #, fuzzy
 msgid "user_profile_saved"
 msgstr "Profile updated."
@@ -8435,17 +7772,17 @@ msgstr "Password reset for %s"
 msgid "user_pwreset_header"
 msgstr "Password Reset"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 #, fuzzy
 msgid "user_pwreset_link"
 msgstr "Forgot your password?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 #, fuzzy
 msgid "user_pwreset_link_sent"
 msgstr "The password reset link was sent to your email address."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 #, fuzzy
 msgid "user_pwreset_okay"
 msgstr "Password successfully reset."
@@ -8460,7 +7797,7 @@ msgstr "Submit password change"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Send password reset link"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, fuzzy, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -8476,7 +7813,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, fuzzy, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -8489,25 +7826,11 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "resend the confirmation message"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 #, fuzzy
 msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -8520,32 +7843,22 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, fuzzy, php-format
 msgid "user_register_welcome"
 msgstr "Thanks for registering and welcome to %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -8555,75 +7868,59 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Successfully verified!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 #, fuzzy
 msgid "users_edit_pagetitle"
 msgstr "User Account Editing"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, fuzzy, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons by %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 #, fuzzy
 msgid "users_info_author_name"
 msgstr "Name"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 #, fuzzy
 msgid "users_info_author_profile"
 msgstr "User Profile"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 #, fuzzy
 msgid "users_info_email"
 msgstr "Email address"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 #, fuzzy
 msgid "users_info_homepage"
 msgstr "Homepage"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 #, fuzzy
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, fuzzy, php-format
 msgid "users_info_pagetitle"
 msgstr "User Info for %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 #, fuzzy
 msgid "users_login_pagetitle"
 msgstr "User Login"
@@ -8662,915 +7959,6 @@ msgstr "User Password Reset"
 msgid "users_register_pagetitle"
 msgstr "New User Registration"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #, fuzzy
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "The most recent version compatible with"
-
-#, fuzzy
-#~ msgid "addons_display_version_history"
-#~ msgstr "Complete Version History"
-
-#, fuzzy
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Newest:"
-
-#, fuzzy
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Most Popular:"
-
-#, fuzzy
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "We Recommend:"
-
-#, fuzzy
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Recently Updated:"
-
-#, fuzzy
-#~ msgid "addons_home_view_all"
-#~ msgstr "View all"
-
-#, fuzzy
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "See All Recommended Add-ons"
-
-#, fuzzy
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Highest Rated First"
-
-#, fuzzy
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Last Updated First"
-
-#, fuzzy
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Most Popular First"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#, fuzzy
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "This version of your add-on does not claim compatibility with Firefox %1"
-#~ "$s. Mozilla is expecting the next version of Firefox to be released soon, "
-#~ "so please test your add-on in the new version and update compatibility "
-#~ "information. You can find out more about this <a href=\"%2$s\">here</a>. "
-#~ "This is only a notice and you may continue to submit this version to "
-#~ "addons.mozilla.org."
-
-#, fuzzy
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Add-on disabled successfully"
-
-#, fuzzy
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Edit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Add-on enabled successfully"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Add-on Description"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Add-on Homepage"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Add-on Name"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Privacy Policy"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Add-on Summary"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Version Notes"
-
-#, fuzzy
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nominate Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Add-on nominated successfully!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visit the %1$s page to make changes to your submission, or %2$s to return "
-#~ "to the Developer Tools."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "click here"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Edit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox while it awaits review from "
-#~ "sandbox testers and a Mozilla Add-ons editor. You will be notified by e-"
-#~ "mail when action has been taken."
-
-# %1 is the link to the sandbox information page
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "You can read more about the Sandbox Review System %s."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "here"
-
-# %1 is the "nominate" link
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox for use by experienced users. "
-#~ "In order for it to be shown on the public site, you must %s your add-on "
-#~ "and undergo a review process."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nominate"
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Your add-on submission has been completed successfully."
-
-#, fuzzy
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Because your add-on is trusted, this version has automatically been "
-#~ "approved for the public area."
-
-#, fuzzy
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Submit Add-on"
-
-#, fuzzy
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Add-on updated successfully"
-
-# %1 is the link to the preview upload page
-#, fuzzy
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "You may wish to %s to increase interest in your add-on."
-
-#, fuzzy
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "upload a preview"
-
-# #1 is the author email
-#, fuzzy
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "No author found [%s]"
-
-#, fuzzy
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancel"
-
-#, fuzzy
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Are you sure you wish to cancel your submission?"
-
-#, fuzzy
-#~ msgid "devcp_button_next"
-#~ msgstr "Next"
-
-#, fuzzy
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Change add-on type:"
-
-#, fuzzy
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Developer Comments updated."
-
-#, fuzzy
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Add Preview"
-
-#, fuzzy
-#~ msgid "devcp_details_author"
-#~ msgstr "Author"
-
-#, fuzzy
-#~ msgid "devcp_details_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_details_category"
-#~ msgstr "Category"
-
-#, fuzzy
-#~ msgid "devcp_details_description"
-#~ msgstr "Description"
-
-#, fuzzy
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Disabled"
-
-#, fuzzy
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#, fuzzy
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Details"
-
-#, fuzzy
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Developer Comments"
-
-#, fuzzy
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Previews"
-
-#, fuzzy
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versions"
-
-#, fuzzy
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Homepage"
-
-#, fuzzy
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "No caption"
-
-#, fuzzy
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "No previews found."
-
-#, fuzzy
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "No support email provided by developer."
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "No support url provided by developer."
-
-#, fuzzy
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Trusted"
-
-#, fuzzy
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "No versions found."
-
-#, fuzzy
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancel and go back"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Yes, disable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Are you sure you want to disable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Disabling this add-on will hide it from searches and listings. It will "
-#~ "not be downloadable from the website and will not be returned in client "
-#~ "update checks. The add-on will effectively be deleted, although you will "
-#~ "be able to return here and re-enable it at your convenience."
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Disable %s"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Yes, enable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Are you sure you want to enable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Enabling this add-on will cause it to once again appear in searches and "
-#~ "listings. It will be downloadable both from the website and from client "
-#~ "update checks."
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Enable %s"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Add Author"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Author's Email Address"
-
-#, fuzzy
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#, fuzzy
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Add Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Change Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Only clear the existing icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "New Icon File"
-
-#, fuzzy
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "short additional info (such as a local dialect name)"
-
-#, fuzzy
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple "
-#~ "locale name</a>, such as 'en-US'"
-
-#, fuzzy
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Checked files will be deleted."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#, fuzzy
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#, fuzzy
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Files"
-
-#, fuzzy
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Target Applications"
-
-#, fuzzy
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "No files."
-
-#, fuzzy
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#, fuzzy
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Summaries are limited to a maximum of 250 characters.\n"
-#~ "(You entered %s)"
-
-#, fuzzy
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "The name for your add-on already exists in the database. Please make sure "
-#~ "that: <br /><li>Your GUIDs match. The most common cause for this error is "
-#~ "mismatched GUIDs.</li><li>You do not have a duplicate entry in the "
-#~ "database. If you do, you should update that entry or delete it and try "
-#~ "again.</li>"
-
-#, fuzzy
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Please describe the changes made in this add-on update."
-
-#, fuzzy
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Not all file GUIDs match"
-
-#, fuzzy
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "An identical version (%s) already exists for this add-on and platform."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "You must supply the requested details for nomination."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "You cannot nominate a pre-release add-on."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "You can only nominate add-ons currently in the sandbox."
-
-#, fuzzy
-#~ msgid "devcp_error_saving"
-#~ msgstr "An error occurred trying to save your data."
-
-#, fuzzy
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "You do not have permission to update this add-on."
-
-#, fuzzy
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Add Another Platform File"
-
-#, fuzzy
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Add Author"
-
-#, fuzzy
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Remove"
-
-#, fuzzy
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Categories for your new add-on type will be available in the next step."
-
-#, fuzzy
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#, fuzzy
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Please enter a description of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Please enter the name of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Please select the type of add-on you are submitting."
-
-#, fuzzy
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Please enter a summary of your add-on."
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Add-on File"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Add-on File 2"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Add-on File 3"
-
-#, fuzzy
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Add-on Type"
-
-#, fuzzy
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#, fuzzy
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Author's Email Address"
-
-#, fuzzy
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Authors"
-
-#, fuzzy
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categories"
-
-#, fuzzy
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#, fuzzy
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Description"
-
-#, fuzzy
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "End-User License Agreement (EULA)"
-
-#, fuzzy
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "This add-on requires external software"
-
-#, fuzzy
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Files"
-
-#, fuzzy
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Homepage"
-
-#, fuzzy
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Icon File"
-
-#, fuzzy
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Name"
-
-#, fuzzy
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Supported Platforms"
-
-#, fuzzy
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "This is a pre-release"
-
-#, fuzzy
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Privacy Policy"
-
-#, fuzzy
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "This is a site-specific add-on"
-
-#, fuzzy
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Summary"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Target Applications"
-
-#, fuzzy
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Version"
-
-#, fuzzy
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Version Notes"
-
-#, fuzzy
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Because your add-on is trusted, please choose where this version should "
-#~ "go:"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Public"
-
-#, fuzzy
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#, fuzzy
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Developer Agreement"
-
-#, fuzzy
-#~ msgid "devcp_header_step1"
-#~ msgstr "Step 1"
-
-#, fuzzy
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Upload File"
-
-#, fuzzy
-#~ msgid "devcp_header_step2"
-#~ msgstr "Step 2"
-
-#, fuzzy
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Add-on Details"
-
-#, fuzzy
-#~ msgid "devcp_header_step3"
-#~ msgstr "Step 3"
-
-#, fuzzy
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Version Details"
-
-#, fuzzy
-#~ msgid "devcp_header_step4"
-#~ msgstr "Step 4"
-
-#, fuzzy
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localization"
-
-#, fuzzy
-#~ msgid "devcp_header_step5"
-#~ msgstr "Step 5"
-
-#, fuzzy
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Success"
-
-#, fuzzy
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "My Add-ons"
-
-#, fuzzy
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Return to add-on details"
-
-# %1 is the autodetected addon type
-#, fuzzy
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatically detected add-on type: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#, fuzzy
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "The default locale of this add-on (%1$s [%2$s]) is different from your "
-#~ "currently selected locale (%3$s [%4$s]). The fields below should be "
-#~ "completed in %1$s."
-
-#, fuzzy
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorrect?"
-
-#, fuzzy
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Are you sure you want to delete this file?"
-
-#, fuzzy
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Skip updating my current add-on information"
-
-#, fuzzy
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Add-on submissions are currently disabled. Please check back at a later "
-#~ "time."
-
-#, fuzzy
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "I Accept"
-
-#, fuzzy
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "I Decline"
-
-#, fuzzy
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "This add-on has been disabled by an administrator."
-
-#, fuzzy
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Disabled"
-
-#, fuzzy
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Trusted"
-
-# %1 is a link to the addon submit page
-#, fuzzy
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "You don't have any add-ons. Click %s to submit one."
-
-#, fuzzy
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "here"
-
-# %1 is the link to the preview upload page
-#, fuzzy
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Please be sure to %s for your theme."
-
-#, fuzzy
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "upload a preview"
-
-#, fuzzy
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Edit Version"
-
-#, fuzzy
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Version updated successfully."
-
-#, fuzzy
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "New"
-
-#, fuzzy
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Updated"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#, fuzzy
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Add-on Types"
-
-#, fuzzy
-#~ msgid "editors_th_age"
-#~ msgstr "Age"
-
-#, fuzzy
-#~ msgid "editors_th_applications"
-#~ msgstr "Applications"
-
-#, fuzzy
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platforms"
-
-#, fuzzy
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Submission Types"
-
-#, fuzzy
-#~ msgid "error_notice"
-#~ msgstr "Notice"
-
-#, fuzzy
-#~ msgid "forum_save"
-#~ msgstr "Save"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-# %1 is page number, %2 is total page count
-#, fuzzy
-#~ msgid "pagination_page_number_title"
-#~ msgstr "This is page %1$s of %2$s"
-
-#, fuzzy
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s matching add-on"
-#~ msgstr[1] "%s matching add-ons"
-
-#, fuzzy
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS feed of summary data"
diff --git a/site/app/locale/ga_IE/LC_MESSAGES/messages.po b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
index 7f8fa9e..fe0433c 100644
--- a/site/app/locale/ga_IE/LC_MESSAGES/messages.po
+++ b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
@@ -17,83 +17,75 @@ msgstr ""
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
 "3 : 4\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cealaigh an tSuiteáil"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "�osluchtaigh Anois %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Glac Leis agus �osluchtaigh"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Glac Leis agus Suiteáil"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Poiblí"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Bosca Gainimh"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Nuashonraithe %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Leagan %s"
 
 # preceded by a number I think
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "íosluchtú"
 
 # preceded by a number
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "íosluchtú san iomlán"
 
 # preceded by a number
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "íosluchtú sa tseachtain"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -103,93 +95,92 @@ msgstr[2] "%1$s bhreiseán"
 msgstr[3] "%1$s mbreiseán"
 msgstr[4] "%1$s breiseán"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "sa leathanach"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sórtáil de réir:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "turgnamhach"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "molta"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
-msgstr "Níl %1$s ar fáil ar %2$s."
+msgstr "Níl %1$s ar fáil le haghaidh %2$s."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Ar ais go %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Ar ais go dtí na léirmheasanna..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Rátáil:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Léirmheas:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Seol do léirmheas"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Déan léirmheas ar %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Teideal/Achoimre:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Scrios"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Freagair"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "An bhfuil tú cinnte go dteastaíonn uait an léirmheas seo a scriosadh?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Níl"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Tá"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Scrios an Léirmheas"
 
@@ -198,34 +189,32 @@ msgid "addon_review_deleted_successfully"
 msgstr "Scriosadh an léirmheas."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Cuir Léirmheas ar %s in Eagar"
 
+# %1 is the count of characters entered as notes for the review flag reason.
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
-#, fuzzy
 msgid "addon_review_flag_error_other_length"
 msgstr ""
-"Problem flagging review: Notes for flagged reviews are limited to between 10 "
-"and 100 characters; your character length was %1$s."
 
 # Removing an extra comma
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Tabhair faoi deara nach mbeidh do léirmheas ar fáil ar an suíomh poiblí go "
 "dtí go ndéanfaidh eagarthóir iniúchadh air."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Freagra chuig an bhforbróir:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -252,59 +241,74 @@ msgstr "Léirmheasanna ar %s"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Freagra ó %1$s ar %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Freagra ón Fhorbróir:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Sábháladh do léirmheas.  Go raibh maith agat!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "ag %1$s ar %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "ag %1$s ar %2$s (rátáil %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "An Chéad Bhreiseán Eile"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "An Breiseán Roimhe Seo"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Nasc buan leis an leagan seo"
 
+# %1 is the current Application name (e.g. Firefox)
+# %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "An leagan is déanaí atá comhoiriúnach do %1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Téigh"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Féach ar Phróifíl an Údair"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Brabhsáil gach Téama :: Breiseáin %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Brabhsáil %s"
@@ -313,114 +317,62 @@ msgstr "Brabhsáil %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Brabhsáil Téamaí %1$s :: Breiseáin %2$s"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Cuir léirmheas leis"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Mionsonraí Casta"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Catagóirí"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "léirmheas mionsonraithe"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Ní maith liom é"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Cuir do léirmheas in eagar"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Tá polasaí príobháideachta ag an mbreiseán seo."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Is fuath liom é"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Nótaí ón Fhorbróir"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Leathanach Baile"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Léirmheasanna"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Tacaíocht"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Is maith liom é"
 
@@ -428,23 +380,19 @@ msgstr "Is maith liom é"
 msgid "addons_display_long_description"
 msgstr "Cur Síos Fada"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Tá sé an-an-mhaith!"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Tuilleadh �omhánna"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Breiseáin eile scríofa ag %1$s"
@@ -456,42 +404,43 @@ msgstr[4] "Breiseáin eile scríofa ag na húdair seo"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Soláthraíonn an forbróir (%s) tacaíocht le haghaidh an bhreiseáin seo"
+msgstr "Soláthraíonn an forbróir ag %s tacaíocht le haghaidh an bhreiseáin seo"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
-"Soláthraíonn an forbróir ag %1$s tacaíocht le haghaidh an bhreiseáin seo, nó "
-"b'fhéidir leat ríomhphoist a sheoladh chuig %2$s"
+"Soláthraíonn an forbróir ag %s tacaíocht le haghaidh an bhreiseáin seo, nó "
+"b'fhéidir leat ríomhphoist a sheoladh chuig %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Soláthraíonn an forbróir ag %s tacaíocht le haghaidh an bhreiseáin seo"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Rátáil É"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Tá sé an-mhaith"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Ná cuir tuairiscí faoi fhabhtanna i do léirmheas, le do thoil.  Ní chuirimid "
@@ -500,48 +449,53 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Treoirlínte do Léirmheasanna</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Féach ar an <a href=\"%1$s\">Leathanach Tacaíochta</a> chun cabhair leis an "
 "mbreiseán seo a fháil."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Sábháil"
 
 # %1 is generally speaking, plural, "Uirlisí Forbróra", or "Foclóirí agus Pacáistí Teanga", etc.
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Féach ar na %1$s go léir"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Féach ar gach léirmheas (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Féach Ar Gach Leagan"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Stair Iomlán na Leaganacha"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Amharc ar fhoinse"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Amharc ar staitisticí"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Cad é do bharúil?"
 
@@ -549,226 +503,108 @@ msgstr "Cad é do bharúil?"
 msgid "addons_display_workswith"
 msgstr "Oibríonn sé le:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "le"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Molaimid"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Le Breiseáin, is féidir do chuairt ar líne a shaincheapadh ar a lán bealaí. "
 "Breathnaigh thart agus cuir %1$s in oiriúint duit féin."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Is Nuaí:"
 
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Feidhmchláir Eile"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Breiseáin %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Is Mó Éilimh Orthu:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Molaimid:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Nuashonraithe Le Déanaí:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Taispeáin uile"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Féach ar na breiseáin is nuaí"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Taispeáin na breiseáin is mó éilimh orthu"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Amharc ar gach breiseán molta"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Féach ar na breiseáin nuashonraithe le déanaí"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Cliceáil an nasc thíos chun an comhad a shábháil.</li><li>I Mozilla "
@@ -776,11 +612,11 @@ msgstr ""
 "Suiteáil, aimsigh/roghnaigh an comhad a d'íosluchtaigh tú, agus cliceáil \"OK"
 "\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Conas is féidir suiteáil in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Deaschliceáil an nasc thíos agus roghnaigh \"Sábháil Nasc Mar...\" "
@@ -789,42 +625,39 @@ msgstr ""
 "cnaipe Suiteáil, roghnaigh an comhad a d'íosluchtaigh tú, agus cliceáil \"OK"
 "\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Conas is féidir suiteáil in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "taispeáin breiseáin thurgnamhacha"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Téigh"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Le"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "le haghaidh Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "le haghaidh Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "le haghaidh Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -832,11 +665,11 @@ msgstr ""
 "éilimh orthu.  Le tuilleadh eolais a fháil maidir le forlíontáin eile le "
 "haghaidh Brabhsálaithe Mozilla, déan cuairt ar %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "An bhfuil tú ag lorg forlíontán nach bhfuil anseo?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Cabhraíonn forlíontáin le do bhrabhsálaí feidhmeanna ar leith a dhéanamh, "
@@ -845,24 +678,24 @@ msgstr ""
 "fheabhsaíonn feidhmiúlacht atá ann cheana."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Forlíontáin Choitianta le haghaidh %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Forlíontáin"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Doiciméadú: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -871,43 +704,38 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Réamhamhairc at %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Tá a lán breiseán iontach ar fáil, agus seans maith go mbeidh rud éigin ann "
 "a bhfuil suim agat ann.  Seo duit liosta de na breiseáin is mó éilimh "
 "orthu.  Bain sult as!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Breiseáin Mholta"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Breiseáin Mholta"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Acmhainní Eile"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Lárionad Forbartha Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Ní mór duit brabhsálaí Mozilla (mar shampla Firefox) a úsáid chun forlíontán "
@@ -925,68 +753,75 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Foghlaim conas is féidir %1$s ag %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "do bhreiseán féin a dhéanamh"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Brabhsáil tuilleadh inneall cuardaigh ag %1$s"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Innill Chuardaigh"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Táimid an-bhuíoch den Tionscadal Mycroft as a gcuid oibre go léir ar Innill "
 "Chuardaigh Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Comhroinn é seo"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Cuir le Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Digg é seo!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Cuir le Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Comhroinn ar FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Cuir le MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -1000,17 +835,17 @@ msgstr "Leagan Neamhiomlán"
 msgid "addons_status_nominated"
 msgstr "Sa Bhosca Gainimh; Ainmniú Poiblí"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
-msgstr "Sa Bhosca Gainimh; ag fanacht le heagarthóir"
+msgstr ""
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Poiblí"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Sa Bhosca Gainimh"
@@ -1019,38 +854,26 @@ msgstr "Sa Bhosca Gainimh"
 msgid "addons_status_unknown"
 msgstr "Anaithnid"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Tuilleadh eolais faoin bhreiseán seo"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Bí Cúramach le Seanleaganacha"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Taispeántar na leaganacha seo le haghaidh tagartha agus tástála. Ba chóir "
 "duit an leagan is déanaí den bhreiseán a úsáid i gcónaí."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Stair na Leaganacha le Logchomhaid Athruithe"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Stair na Leaganacha %1$s"
@@ -1085,468 +908,154 @@ msgstr "Riarthóir an Ghrúpa"
 msgid "admin_group_saved"
 msgstr "Sábháladh an Grúpa"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Cuardach Casta"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Am ar bith"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Cineál ar bith"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Leagan ar bith"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Feidhmchlár"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Comhoiriúnacht Eochairfhocal"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Nuashonraithe"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Ainm"
 
 # "sort by"
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Dáta"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 mhí is déanaí"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 mhí is déanaí"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "An lá is déanaí"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "An mhí is déanaí"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "An tseachtain is déanaí"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "An bhliain is déanaí"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Gach Leathanach"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Ardán"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Éileamh"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Rátáil"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sórtáil De Réir"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "go"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Scoránaigh cuardach casta"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Cineál"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "leagan"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Déan neamhaird ar chinntiú an leagain"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Úsáidtear an breiseán seo le leaganacha níos sine de Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Is féidir leat triail a bhaint as <a href=\"%1$s\">leagan níos sine</a> nó "
 "<a href=\"#\" onclick=\"%2$s\">déan neamhaird ar an deimhniú seo</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Seans go n-oibreodh <a href=\"%1$s\">leagan níos sine</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Tá <a href=\"%1$s\">Firefox %2$s</a> de dhíth ar an mbreiseán seo ach níl sé "
 "ar fáil fós"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Nuashonraigh Firefox</a> chun an breiseán "
 "seo a úsáid"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Breiseáin de réir Ainm"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Breiseáin Is Nuaí"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Breiseáin is mó éilimh orthu"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Breiseáin de réir Rátála"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Breiseáin Nuashonraithe Le Déanaí"
 
@@ -1555,925 +1064,108 @@ msgid "categories_current_title"
 msgstr "Catagóir Reatha"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Catagóirí"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Roghnaigh catagóir"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Taispeáin Gach Breiseán Molta"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Rátáil is Airde Ar dTús"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Nuashonrú Is Déanaí Ar dTús"
+
+# msgstr "Breiseáin Is Mó Éilimh Orthu Ar dTús" is a hair too long
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Is Mó Éilimh Orthu Ar dTús"
+
 # %1 is the category name
 # Generall speaking it will be plural, so "Taispeáin Gach %1" doesn't cut it.
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Taispeáin na %1$s go léir"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Bailiúchán gan aimsiú!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Curtha Leis %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Lárionad Comhoiriúnachta Breiseán"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
-#, fuzzy
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
-"Be prepared for the release of %1$s with the tools and information available "
-"for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Sonraí á luchtú..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Ar ais go dtí an Príomhleathanach"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Tuairisc Chomhoiriúnacht an Bhreiseáin"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Eolas le haghaidh Forbróirí"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Athraigh maxVersion gan uasluchtú"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Seiceáil Stádas de Mo Chuid Breiseán"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Má tá breiseáin agat óstáilte ag Breiseáin Mozilla, <a href=\"\"%1$s"
 "\">logáil isteach</a> chun anailís a dhéanamh ar stádas do chuid breiseán le "
 "haghaidh %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Lógó Lárionad Forbartha Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Níl aon bhreiseáin óstáilte ag Breiseáin Mozilla agat."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Torthaí Seiceáil Stádais an Bhreiseáin"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Stádas do bhreiseáin óstáilte á fháil..."
 
@@ -2481,124 +1173,117 @@ msgstr "Stádas do bhreiseáin óstáilte á fháil..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
-msgstr "%1$s úsáideoir %2$s (%3$s&#37; as an iomlán)"
+msgstr "%1$s %2$s úsáideoirí (%3$s&#37; as an iomlán)"
 
-#: views/compatibility/report.thtml:45
-#, fuzzy
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
-"The add-ons below make up 95% of add-on usage known to Mozilla and are "
-"ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Féach ar Thuairisc Mhionsonraithe"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
-#, fuzzy
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
-"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
-"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
-"of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Leaganacha Alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Breiseáin atá comhoiriúnach le leagan alfa de %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Leaganacha Béite"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "Breiseáin atá comhoiriúnach le leagan béite nó leagan réamhscaoilte de %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Leagan Is Déanaí"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Breiseáin atá suas le dáta na leaganacha is déanaí de %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Leaganacha Eile"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Breiseáin nach bhfuil comhoiriúnach le haon leagan de %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Tuairisc Chomhoiriúnacht an Bhreiseáin"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Eolas le haghaidh Úsáideoirí"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Féach ar Thuairisc Chomhoiriúnachta"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr ""
 "Le tuilleadh eolais a fháil maidir le conas b'fhéidir leat cabhrú linn, "
-"féach ar %s."
+"féach ar ár %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "leathanach vicí"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Ba mhaith le Mozilla a bhuíochas a ghabháil leis na daoine seo a leanas as a "
 "gcuid oibre ar addons.mozilla.org le blianta anuas:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Forbróirí"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Eagarthóirí"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Aistritheoirí"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Daoine eile a chuir leis an obair"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Iarfhorbróirí"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Bogearraí agus �omhánna"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Úsáidtear deilbhíní ón <a href=\"http://www.famfamfam.com/lab/icons/silk/"
@@ -2606,32 +1291,30 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution, leagan 2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
-"Úsáidtear codanna de <a href=\"http://www.simile-widgets.org/timeplot/"
-"\">Timeplot</a>, atá ar fáil faoi <a href=\"http://simile.mit.edu/license."
-"html\">Cheadúnas BSD</a>, ar leathanaigh áirithe."
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 # date format string as used in PHP's strftime():
 # http://php.net/strftime
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B, %Y"
 
@@ -2667,33 +1350,47 @@ msgstr "Painéal na Staitisticí"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr ""
-"Iarmhír neamhbhailí (%2$s) ar chomhad %1$s. Iarmhíreanna ceadaithe: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr ""
-"Níorbh fhéidir comhad %s a shábháil sa bhunachar sonraí. Bain triail eile as."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Cuireadh comhad %2$s in ionad réamhamharc %1$s gan fhadhb."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr ""
-"Uasluchtaíodh comhad %s gan fhadhb. Is féidir leat fotheideal a chur leis "
-"thíos."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(braith go huathoibríoch)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Ní mhaíonn an leagan seo de do bhreiseán go bhfuil sé comhoiriúnach do "
+"Firefox %1$s.  Tá Mozilla ag súil leis an chéad leagan eile de Firefox go "
+"luath, agus mar sin ba chóir duit do bhreiseán a thástáil sa leagan nua seo "
+"agus an fhaisnéis chomhoiriúnachta a nuashonrú mar is ceart.  Tá tuilleadh "
+"eolais faoi seo ar fáil <a href=\"%2$s\">anseo</a>. Níl ann seo ach fógra "
+"agus is féidir leat dul ar aghaidh agus an leagan seo a sheoladh chuig "
+"addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Osclaíonn sé i bhfuinneog nua"
@@ -2730,68 +1427,141 @@ msgstr "Céim 5: D'éirigh leat"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Cabhair le Seoladh Breiseán"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Díchumasaíodh an breiseán"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Cuir Breiseán in Eagar"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Cumasaíodh an breiseán"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Cur Síos ar an mBreiseán"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Leathanach Baile an Bhreiseáin"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Ainm an Bhreiseáin"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Fotheideal an Réamhamhairc"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Gníomhachtaigh"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Polasaí Príobháideachta"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Achoimre an Bhreiseáin"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Ríomhphost Tacaíochta"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL Tacaíochta"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Nótaí Eisiúna"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Ainmnigh Breiseán"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "D'éirigh le hainmniú an bhreiseáin!"
 
 #: views/developers/addon_status.thtml:178
 #, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Críochnaigh an Breiseán"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Críochnaigh do bhreiseán agus cuir é sa Bhosca Gainimh"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Díghníomhachtaigh"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Cuir é sa Bhosca Gainimh"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr ""
-"Cuir do bhreiseán ar ais sa Bhosca Gainimh. Beidh tú in ann é seo a chealú."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Ainmnigh do bhreiseán chun é a bhogadh go dtí an taobh poiblí"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Foilsigh"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Foilsigh do bhreiseán arís."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2813,63 +1583,78 @@ msgstr ""
 "\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Roghnaíodh catagóir amháin ar a laghad"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Cur Síos ar an mBreiseán de dhíth"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Ainm de dhíth ar an Bhreiseán"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "�omhá réamhamhairc de dhíth ar eisínteachtaí agus téamaí."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Achoimre de dhíth ar an mBreiseán"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Stádas an Bhreiseáin: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Gníomhartha Le Fáil"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Stádas Gníomhachtaithe: <span class=\"inactive-0\">Gníomhach</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
 #, fuzzy
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr ""
-"Stádas Gníomhachtaithe: <span class=\"inactive-1\">Neamhghníomhach</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Critéir Ainmnithe"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Stádas Iontaoibhe: <span class=\"status-4\">Iontaofa</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2878,33 +1663,37 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Is féidir leat do bhreiseán a ainmniú chun é a bhogadh go dtí an taobh <span "
-"class=\"status-4\">Poiblí</span> trí chliceáil ar an gcnaipe thíos."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Poiblí"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Bosca Gainimh"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"Bhí do bhreiseán <span class=\"status-5\">Díchumasaithe</span> ag riarthóir "
-"agus ní féidir é a úsáid. Má tá ceisteanna ort, seol ríomhphost chuig %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
 #, fuzzy
@@ -2956,59 +1745,184 @@ msgstr ""
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Stádas %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Déan cuairt ar leathanach %1$s chun do bhreiseán a athrú, nó %2$s chun dul "
+"ar ais go dtí na hUirlisí Forbróra."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "cliceáil anseo"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Cuir Breiseán in Eagar"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Cuireadh an leagan seo sa bhosca gainimh agus fanfaidh sé ansin go dtí go "
+"ndéanfaidh tástálaí agus eagarthóir Breiseáin Mozilla iniúchadh air.  "
+"Cuirfear in iúl duit nuair a dhéanfar gníomhú air. "
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Tá tuilleadh eolais ar fáil faoin Chóras Bosca Gainimh %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "anseo"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Cuireadh an leagan seo sa bhosca gainimh ar son úsáideoirí cleachta.  Chun é "
+"a chur ar fáil ar an suíomh poiblí, ní mór duit do bhreiseán a %s agus "
+"déanfaidh eagarthóirí an tsuímh iniúchadh air."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "ainmniú"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "D'éirigh le seoladh do bhreiseáin."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Toisc go bhfuil breiseán iontaofa agat, cuirfear an leagan seo ar an taobh "
+"poiblí go huathoibríoch."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Seol Breiseán"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "D'éirigh le nuashonrú an bhreiseáin"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "B'fhéidir gur chóir duit %s chun suim i do bhreiseán a mhéadú."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "réamhamharc a uasluchtú"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Gan údar [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Bain"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cealaigh"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "An bhfuil tú cinnte gur mian leat seoladh do bhreiseáin a chealú?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Ar Aghaidh"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Athraigh cineál an bhreiseáin:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Nuashonraíodh Nótaí an Fhorbróra."
+
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Gníomhach"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "Tá an %1$s %2$s agus %3$s faoi láthair"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Athraigh Stádas"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
-"Bhí do bhreiseán díchumasaithe ag riarthóir agus ní féidir é a úsáid. Má tá "
-"ceisteanna ort, seol ríomhphost chuig %s."
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Stádas an Bhreiseáin: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Painéal Forbróirí"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Fáilte go dtí an Painéal Forbróirí"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Neamhghníomhach"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Athrú is déanaí: %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
 #, fuzzy
@@ -3018,65 +1932,213 @@ msgstr ""
 "the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Tús Maith"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Leaganacha agus Comhaid"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Uasluchtaigh leagan nua"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr ""
-"Níorbh fhéidir réamhamharc %s a scriosadh ón bhunachar sonraí.  Bain triail "
-"eile as."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "Scriosadh réamhamharc %s."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "Níl cead agat leaganacha ná comhaid a scriosadh."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s chomhad %2$s"
-msgstr[1] "%1$s chomhad %2$s"
-msgstr[2] "%1$s chomhad %2$s"
-msgstr[3] "%1$s gcomhad %2$s"
-msgstr[4] "%1$s comhad %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Cuir Réamhamharc Leis"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Údar"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Údair"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Faic"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Catagóirí"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Catagóir"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Cur Síos"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Díchumasaithe"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Mionsonraí"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Nótaí ón Fhorbróir"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Réamhamhairc"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Leaganacha"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Leathanach Baile"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Faic"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Gan fotheideal"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Gan réamhamharc."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Nuashonraigh"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Ríomhphost Tacaíochta"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Níor thug an forbróir seoladh ríomhphoist le haghaidh tacaíochta."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL Tacaíochta"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Níor thug an forbróir URL le haghaidh tacaíochta."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Iontaofa"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Leagan %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Níor aimsíodh aon leagan."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cealaigh agus téigh ar ais"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Díchumasaigh é"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "An bhfuil tú cinnte gur mian leat an breiseán seo a dhíchumasú?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Má dhíchumasaíonn tú an breiseán seo, ní bheidh sé infheicthe nuair a "
+"dhéanfar cuardach air, agus ní thaispeánfar é i liostaí.  Ní bheidh tú in "
+"ann é a íosluchtú ón suíomh agus ní thaispeánfar é nuair a dhéanfaidh cliant "
+"seiceáil ar nuashonruithe.  Is ionann is go mbeidh sé scriosta, cé go mbeidh "
+"tú in ann teacht ar ais anseo agus é a chumasú ar d'uain féin."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Díchumasaigh %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Cumasaigh é"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "An bhfuil tú cinnte gur mian leat an breiseán seo a chumasú?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Má chumasaíonn tú an breiseán seo, taispeánfar é i liostaí agus i dtorthaí "
+"cuardaigh. Beidh tú in ann é a íosluchtú ón suíomh Gréasáin agus nuair a "
+"dhéanann cliant nuashonrú."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Cumasaigh %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Cuir Freagra Leis"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Freagraí"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
 msgstr ""
-"Tharla earráid agus do fhreagra á shábháil. Téigh i dteagmháil le %1$s faoin "
-"fhadhb seo."
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
@@ -3094,8 +2156,9 @@ msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Seol Freagra"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
 #, fuzzy
@@ -3108,61 +2171,78 @@ msgstr ""
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "scríofa ag %1$s ar %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Cuir Údar Leis"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Seoladh Ríomhphoist an Údair"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Bain"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Cuir Údar Nua Leis"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Cuir Údar Leis"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Údair Reatha"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Bainistigh Údair an Bhreiseáin"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "List as author in public display pages"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3171,35 +2251,42 @@ msgstr ""
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Roghnaigh ról an údair:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Údar"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Liostaithe"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Ról"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Nuashonraigh na húdair"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Nuashonraigh Catagóirí"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
 #, fuzzy
@@ -3208,12 +2295,14 @@ msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "Catagóirí %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Bainistigh Catagóirí an Bhreiseáin"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
 #, fuzzy
@@ -3222,8 +2311,9 @@ msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Catagóir %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
@@ -3240,8 +2330,9 @@ msgstr ""
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Roghnaigh suas le trí chatagóir %s le haghaidh do bhreiseáin"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
 #, fuzzy
@@ -3262,23 +2353,26 @@ msgstr ""
 "license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Athraigh an t-ainm, leathanach baile, deilbhín, nó bratacha eile."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Athraigh an Cur Síos"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Cuir an Cur Síos ar an mBreiseáin in Eagar"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3287,11 +2381,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Nótaí ón Fhorbróir"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3299,11 +2394,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Cur Síos ar an mBreiseán"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3312,22 +2408,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Comhaontú Ceadúnais Úsáideoir Deiridh"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Polasaí Príobháideachta"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3335,60 +2433,132 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Achoimre an Bhreiseáin"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Bainistigh Údair an Bhreiseáin"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Bainistigh Catagóirí an Bhreiseáin"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Bainistigh Cur Síos ar an mBreiseán"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Bainistigh Airíonna an Bhreiseáin"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Níl aon chatagóir ar fáil don chineál breiseáin seo."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Údair"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Cuir Deilbhín Leis"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Athraigh an Deilbhín"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Ceadaigh d'úsáideoirí na comhaid fhoinseacha a fheiceáil ar líne"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Catagóirí"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Logchaighdeán Réamhshocraithe"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Tá bogearraí seachtracha de dhíth ar an mbreiseán seo"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Glan an deilbhín atá ann amháin"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Comhad Nua Deilbhín"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Deilbhín"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Eolas Breise faoin Logchaighdeán"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Réamhleagan é seo"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Breiseán sainiúil do shuíomh é seo"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Logchaighdeán Sprice"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "beagán eolais eile (mar shampla, ainm na canúna logánta)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Nuashonraigh Airíonna"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Deilbhín Reatha"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3396,12 +2566,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3409,50 +2579,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Cuir Airíonna an Bhreiseáin in Eagar"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Cineál an Bhreiseáin"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Socruithe Riaracháin"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Logchaighdeán Réamhshocraithe"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Bratacha an Bhreiseáin"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID an Bhreiseáin"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Deilbhín an Bhreiseáin"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Socruithe Eile"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Breiseán Iontaofa?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Féach ar an bhfoinse ar líne"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3461,28 +2641,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Neamhiontaofa"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "Iontaofa"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Deilbhín Nua"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Bain Deilbhín"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3490,20 +2674,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Leathanach Baile an Bhreiseáin"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Ainm an Bhreiseáin"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3511,12 +2697,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3524,63 +2710,83 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Scriosfar an deilbhín nuair a shábhálfaidh tú. <a %s>Cealaigh?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Ceadaigh d'úsáideoirí na comhaid fhoinseacha a fheiceáil ar líne"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Ná ceadaigh d'úsáideoirí na comhaid fhoinseacha a fheiceáil ar líne"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Nuashonraigh"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">ainm simplí an "
+"logchaighdeáin</a>, mar shampla 'ga-IE'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Údair"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Catagóirí"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Athraigh Stádas"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Cur Síos"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Cuir Breiseán in Eagar"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Leagan Nua"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Airíonna"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
 #, fuzzy
@@ -3588,12 +2794,14 @@ msgid "devcp_editbox_screenshots"
 msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Painéal na Staitisticí"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Leaganacha agus Comhaid"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
 #, fuzzy
@@ -3643,14 +2851,71 @@ msgstr[2] "Nuashonruithe Ar Feitheamh (%s)"
 msgstr[3] "Nuashonruithe Ar Feitheamh (%s)"
 msgstr[4] "Nuashonruithe Ar Feitheamh (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Scriosfar na comhaid ticeáilte."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Comhaid"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Feidhmchláir Sprice"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Gan chomhaid."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Nótaí don Eagarthóir"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Nuashonraigh"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Níl rochtain agat ar an mbreiseán sin."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Ní cheadaítear níos mó ná 250 carachtar in achoimre.\n"
+"(Chuir tú %s isteach)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Tá an t-ainm atá ar do bhreiseán sa bhunachar sonraí cheana. Bí cinnte: <br /"
+"><li>go bhfuil na GUIDanna comhoiriúnach.  Seo é an chúis is coitianta leis "
+"an earráid seo.</li><li>nach bhfuil iontráil dhúblach sa bhunachar sonraí. "
+"Má tá, ba chóir duit an iontráil sin a nuashonrú nó é a scriosadh agus "
+"iarracht eile a dhéanamh.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3664,16 +2929,17 @@ msgstr "Féach ar %s mar thagairt."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "an leathanach seo"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Ní mór úinéir amháin ar a laghad a bheith ag do bhreiseán."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Déan cur síos ar na hathruithe a rinne tú agus an breiseán seo á nuashonrú."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 #, fuzzy
 msgid "devcp_error_file_exists"
 msgstr ""
-"A version of that add-on already exists. To replace it, you must delete the "
+"A version of that addon already exists. To replace it, you must delete the "
 "file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
@@ -3682,8 +2948,12 @@ msgstr ""
 #, php-format
 msgid "devcp_error_file_extension"
 msgstr ""
-"Ní cheadaítear an iarmhír sin (%1$s) ar bhreiseán den chineál roghnaithe. Ba "
-"chóir duit ceann de na hiarmhíreanna seo a leanas a úsáid: %2$s"
+"Ní cheadaítear an iarmhír sin (%s) ar bhreiseán den chineál roghnaithe. Ba "
+"chóir duit ceann de na hiarmhíreanna seo a leanas a úsáid: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Níl gach GUID comhaid comhoiriúnach"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3716,10 +2986,18 @@ msgstr "Níor uasluchtaíodh aon chomhad"
 #, php-format
 msgid "devcp_error_icon_extension"
 msgstr ""
-"Ní cheadaítear an iarmhír sin (%1$s) ar dheilbhín. Ba chóir duit ceann de na "
-"hiarmhíreanna seo a leanas a úsáid: %2$s"
+"Ní cheadaítear an iarmhír sin (%s) ar dheilbhín. Ba chóir duit ceann de na "
+"hiarmhíreanna seo a leanas a úsáid: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Tá breiseán leis an leagan céanna (%s) ann cheana le haghaidh an ardáin seo."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Níl install.rdf ann."
 
@@ -3727,10 +3005,9 @@ msgstr "Níl install.rdf ann."
 msgid "devcp_error_install_manifest"
 msgstr "Aimsíodh na hearráidí seo a leanas i install.rdf:"
 
-#: controllers/developers_controller.php:1463
-#, fuzzy
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "Tá aitheantas an bhreiseáin seo neamhbhailí: %s"
+msgstr "Roghnaigh cineál bailí breiseáin."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3738,7 +3015,7 @@ msgstr "Tá aitheantas an bhreiseáin seo neamhbhailí: %s"
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "Ní leagan bailí é %1$s le haghaidh %2$s"
+msgstr "Ní leagan bailí é %s le haghaidh %s"
 
 #. %s is a string
 #: controllers/components/developers.php:521
@@ -3751,8 +3028,7 @@ msgstr "Tá aitheantas an bhreiseáin seo neamhbhailí: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr ""
-"Ní leagan bailí é %1$s le haghaidh %2$s: ní cheadaítear * i leagan íosta"
+msgstr "Ní leagan bailí é %s le haghaidh %s: ní cheadaítear * i leagan íosta"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
@@ -3801,6 +3077,19 @@ msgstr ""
 msgid "devcp_error_no_platform"
 msgstr "Níor roghnaíodh ardán"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr ""
+"Caithfidh tú na mionsonraí iarrtha a thabhairt chun breiseán a ainmniú."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Ní féidir leat réamhleagan de bhreiseán a ainmniú."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Ní féidir leat ach breiseáin sa bhosca gainimh a ainmniú."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Roghnaigh catagóir amháin ar a laghad."
@@ -3815,8 +3104,18 @@ msgstr "Ní mór údar amháin ar a laghad a bheith ag an mbreiseán seo."
 #, php-format
 msgid "devcp_error_preview_extension"
 msgstr ""
-"Ní cheadaítear an iarmhír sin (%1$s) ar réamhamharc. Ba chóir duit ceann de "
-"na hiarmhíreanna seo a leanas a úsáid: %2$s"
+"Ní cheadaítear an iarmhír sin (%s) ar réamhamharc. Ba chóir duit ceann de na "
+"hiarmhíreanna seo a leanas a úsáid: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Tharla earráid agus do chuid sonraí á sábháil."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Níl cead agat an breiseán seo a nuashonrú."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
@@ -3830,88 +3129,292 @@ msgstr ""
 "Ní féidir le breiseáin updateURL seachtrach a úsáid.  Bain é seo ó install."
 "rdf agus déan iarracht eile."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Uasluchtaigh comhad, le do thoil."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Cuir Comhad Ardáin Eile Leis"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Cuir Údar Leis"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Bain"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Beidh tú in ann catagóirí a roghnú sa chéad chéim eile."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Níl aon chatagóir ar fáil do bhreiseán den chineál seo."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Déan cur síos ar do bhreiseán anseo."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Cuir ainm ar do bhreiseán anseo."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Roghnaigh cineál an bhreiseáin nua."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Tabhair uait achoimre do bhreiseáin."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Comhad Breiseáin"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Comhad Breiseáin 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Comhad Breiseáin 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Cineál an Bhreiseáin"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Ceadaigh d'úsáideoirí na comhaid fhoinseacha a fheiceáil ar líne"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Seoladh Ríomhphoist an Údair"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Údair"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Catagóirí"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Logchaighdeán Réamhshocraithe"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Cur Síos"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Comhaontú Ceadúnais Úsáideoir Deiridh (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Tá bogearraí seachtracha de dhíth ar an mbreiseán seo"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Comhaid"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Leathanach Baile"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Comhad Deilbhín"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Ainm"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Ardáin a dTacaítear Leo"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Réamhleagan é seo"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Polasaí Príobháideachta"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Breiseán sainiúil do shuíomh é seo"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Achoimre"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Ríomhphost Tacaíochta"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL Tacaíochta"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Feidhmchláir Sprice"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Leagan"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Nótaí Eisiúna"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Faic"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Nótaí don Eagarthóir"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Toisc go bhfuil breiseán iontaofa agat, roghnaigh cén áit ba chóir don "
+"leagan seo a chur:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Poiblí"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Bosca Gainimh"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Comhaontú Forbróra"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Céim 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Uasluchtaigh Comhad"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Céim 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Mionsonraí an Bhreiseáin"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Céim 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Mionsonraí an Leagain"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Céim 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Logánú"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Céim 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "D'éirigh Leis"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mo Chuid Bhreiseán"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Cealaigh"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Bog Síos"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Bog Suas"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Forbróir"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Úinéir"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Breathnóir"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Bain Údar"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr ""
-"An bhfuil tú <strong>cinnte</strong> gur mian leat an t-údar seo a bhaint?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
-msgid "devcp_js_upload_alert"
-msgstr "Ní mór duit comhad a roghnú le huasluchtú."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
+msgid "devcp_js_upload_alert"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3929,12 +3432,12 @@ msgstr ""
 "sa teanga réamhshocraithe (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Uirlisí Riaracháin"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Uirlisí Eagarthóra"
 
@@ -3943,28 +3446,28 @@ msgid "devcp_myaddons_link"
 msgstr "Mo Chuid Breiseán"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Ar ais go dtí an Príomhleathanach"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Painéal na Staitisticí"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Seol Breiseán"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Uirlisí Forbróra"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -3972,30 +3475,43 @@ msgstr ""
 "on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Cealaigh agus téigh ar ais"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Ar ais go mionsonraí an bhreiseáin"
 
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Ainmnigh %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Braitheadh cineál an bhreiseáin go huathoibríoch: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4009,6 +3525,22 @@ msgstr ""
 "Má bhaineann tú é seo mar réamhamharc réamhshocraithe, roghnófar réamhamharc "
 "eile mar réamhshocrú go huathoibríoch."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Ní ionann logchaighdeán réamhshocraithe an bhreiseáin seo (%1$s [%2$s]) agus "
+"an logchaighdeán atá agat faoi láthair (%3$s [%4$s]). Ba chóir duit na "
+"réimsí thíos a líonadh i %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4016,13 +3548,14 @@ msgstr ""
 "Má dhéanann tú réamhamharc réamhshocraithe de seo, rachaidh sé in áit an "
 "réamhamhairc réamhshocraithe atá ann faoi láthair."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Tá athruithe gan sábháil agat."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4051,52 +3584,59 @@ msgstr "Cuir an Réamhamharc in Eagar"
 msgid "devcp_preview_updated_successfully"
 msgstr "Nuashonraíodh an réamhamharc."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Cuir Réamhamharc Eile Leis"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Scrios an Réamhamharc"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Ionadaigh an Réamhamharc"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Nuashonraigh na Réamhamhairc"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Cuir Réamhamharc Nua Leis"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
-"Cliceáil ar an gcnaipe 'Nuashonraigh Réamhamhairc' chun an íomhá seo a "
-"shábháil. (<a %s>Cealaigh?</a>)"
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
-"Scriosfar an réamhamharc seo nuair a chliceálfar ar 'Nuashonraigh "
-"Réamhamhairc' thíos. (<a %s>Cealaigh?</a>)"
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
@@ -4109,17 +3649,19 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Cuir Réamhamharc Leis"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Fotheideal an Réamhamhairc"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Cuir Réamhamharc in Eagar"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Réamhamharc Réamhshocraithe"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
@@ -4129,24 +3671,27 @@ msgstr "Comhad Réamhamhairc"
 msgid "devcp_previews_label_makedefault"
 msgstr "Úsáid é seo mar réamhamharc réamhshocraithe"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "�omhá nua:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Uasluchtaigh Réamhamharc: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Nuashonraíodh do chuid réamhamharc."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4170,16 +3715,26 @@ msgstr "Cuir Réamhamharc in Eagar"
 msgid "devcp_previews_submit_upload"
 msgstr "Uasluchtaigh Réamhamharc"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Mionsamhail"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Bainisteoir Réamhamharc %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Mícheart?"
 
-#: views/developers/uploader.thtml:74
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "An bhfuil tú cinnte gur mian leat an comhad seo a scriosadh?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "Léigh an Comhaontú Forbróra seo agus glac leis."
 
@@ -4190,7 +3745,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4198,29 +3753,34 @@ msgstr ""
 "of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Painéal"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Ní gá an t-eolas faoin bhreiseán seo a nuashonrú"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
 #, php-format
 msgid "devcp_statsbar_adu"
-msgstr "<em>%s</em> Úsáideoir Gníomhach Laethúil"
+msgstr "<em>%s</em> Úsáideoirí Gníomhacha Laethúla"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:41
 #: views/developers/dashboard.thtml:75
 #, php-format
 msgid "devcp_statsbar_total_downloads"
-msgstr "<em>%s</em> �osluchtú Go hIomlán"
+msgstr "<em>%s</em> Líon Iomlán na n�osluchtuithe"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:43
 #: views/developers/dashboard.thtml:77
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
-msgstr "<em>%s</em> �osluchtú sa tSeachtain"
+msgstr "<em>%s</em> Líon na n�osluchtuithe sa tSeachtain"
 
 #: views/developers/addon_status_confirm.thtml:59
 #, fuzzy
@@ -4238,8 +3798,9 @@ msgid "devcp_status_confirm_active_sure"
 msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "An bhfuil tú cinnte?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
 #, fuzzy
@@ -4253,11 +3814,12 @@ msgstr ""
 #: views/developers/addon_status_confirm.thtml:55
 #, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Are you sure you wish to mark this add-on inactive?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "Níl, cealaigh"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
 #, fuzzy
@@ -4267,27 +3829,28 @@ msgstr ""
 "will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "An bhfuil tú cinnte gur mian leat an breiseán seo a fhoilsiú?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
 #, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Moving this add-on back to the sandbox will require users to log in before "
+"Moving this add-on back to the sandbox will require users to login before "
 "downloading and updates will no longer be offered to existing users. Because "
 "your add-on is currently public, you will be able to return here at any time "
 "to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr ""
-"An bhfuil tú cinnte gur mian leat an breiseán seo a bhogadh go dtí an bosca "
-"gainimh?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Táim Cinnte"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
 #, fuzzy
@@ -4297,58 +3860,114 @@ msgstr ""
 "box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Ainmniú an Bhreiseáin"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Ní féidir breiseáin a sheoladh chugainn faoi láthair. Déan iarracht eile ar "
+"ball."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Glacaim Leis"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Diúltaím"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Bhí an breiseán seo díchumasaithe ag riarthóir."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Díchumasaithe"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Iontaofa"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Leagan Is Déanaí:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Níl aon bhreiseáin agat. Cliceáil %s chun breiseán a sheoladh."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "anseo"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Tá sé tábhachtach %s le haghaidh do théama."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "réamhamharc a uasluchtú"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Cuir %s in Eagar"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Cabhair (ná fág an leathanach)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Cabhair"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Carachtair a úsáideadh: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr ""
-"An bhfuil tú cinnte go dteastaíonn uait an t-aistriúchán seo a scriosadh?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Cad iad na cluaisíní %s seo?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Cad é mura bhfuil aon aistriúcháin agam?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Folaigh an Chabhair"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4358,7 +3977,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4366,57 +3985,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Cuir Aistriúchán Leis"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Bain Aistriúchán"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Cuir Logchaighdeán Leis"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Cealaigh"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Scrios É"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Roghnaigh logchaighdeán an aistriúcháin le cur leis:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "Níl cead agat an breiseán seo a nuashonrú."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4425,7 +4051,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4433,32 +4059,32 @@ msgstr ""
 "number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Tús Maith"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Comhad á uasluchtú..."
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
+#: views/developers/uploader.thtml:123
 #, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
 msgid "devcp_uploader_button_edit"
-msgstr "Cuir Mo Bhreiseán in Eagar"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Críochnóidh mé mo bhreiseán ar ball."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Cuir Nótaí Eisiúna Leis"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4471,41 +4097,48 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Réitigh an fhadhb seo agus uasluchtaigh do chomhad arís."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "Cruthaíodh an Breiseán!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Úps! Dealraíonn sé go bhfuil fadhb leis an gcomhad seo..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Cuireadh an Comhad Leis!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Conas a oibríonn sé?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Cruthaíodh Leagan %s"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Uasluchtaigh Do Chomhad"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
 #, fuzzy
@@ -4526,21 +4159,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Ardáin a dtacaítear leo:"
-
-#: views/developers/uploader.thtml:124
-msgid "devcp_uploader_label_upload_field"
-msgstr "Comhad Breiseáin: "
+msgstr "Supported Platforms:"
 
-#: controllers/components/developers.php:1221
+#: views/developers/uploader.thtml:90
 #, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
+msgid "devcp_uploader_label_upload_field"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4549,7 +4179,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4558,14 +4188,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4575,7 +4205,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4583,7 +4213,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4591,143 +4221,156 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Uile"
-
-#: views/developers/uploader.thtml:126
-msgid "devcp_uploader_platformtype_specific"
-msgstr "Sainiúil:"
+msgstr "All"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
+#: views/developers/uploader.thtml:92
 #, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
+msgid "devcp_uploader_platformtype_specific"
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Cuir an Comhad le %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Seol Breiseán Nua"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Nuashonraigh %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Féach ar %s mar thagairt."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "an leathanach seo"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Cuir an Leagan in Eagar"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "D'éirigh le nuashonrú an leagain."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Cealaigh"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Scrios Leagan"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Bain Leagan Folamh"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Bain?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Cuir Leagan Nua Leis"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Cealaigh"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Scrios Leagan"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Scriosfar iad seo freisin:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s chomhad"
-msgstr[1] "%s chomhad"
-msgstr[2] "%s chomhad"
-msgstr[3] "%s gcomhad"
-msgstr[4] "%s comhad"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "An bhfuil fonn ort leagan %s a scriosadh?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s léirmheas"
-msgstr[1] "%s léirmheas"
-msgstr[2] "%s léirmheas"
-msgstr[3] "%s léirmheas"
-msgstr[4] "%s léirmheas"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "An bhfuil tú cinnte gur mhaith leat an leagan %s a scriosadh go buan?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Cealaigh"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Scrios an Comhad"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Cuir Feidhmchlár Nua Leis"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Bain Feidhmchlár"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Cuir Comhad Nua Leis"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4735,100 +4378,99 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr ""
-"An bhfuil tú <b>cinnte</b> gur mian leat an comhad seo a scriosadh go buan?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Feidhmchláir Chomhoiriúnacha"
-
-#: views/developers/versions_edit.thtml:74
-msgid "devcp_versions_edit_header_file"
-msgstr "Eolas faoin Chomhad"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:189
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
+msgid "devcp_versions_edit_header_file"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Bainistigh Leagan %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Scrios an Comhad"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Cruthaíodh comhad %1$s (%2$s) ar %3$s agus athraíodh é go %4$s ar %5$s"
-
 #: views/developers/versions_edit.thtml:190
 #, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Níor aimsíodh comhaid."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Roghnaigh Feidhmchlár"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Comhad"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Ardán"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Méid"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Stádas"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4837,40 +4479,45 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Nótaí Eisiúna"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Nuashonraigh Leaganacha"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Bainistigh Leaganacha agus Comhaid"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Gan leaganacha."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Scriosadh leagan %s."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
 #, fuzzy
@@ -4880,18 +4527,21 @@ msgstr ""
 "like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Cruthaithe"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "Stádas"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Leagan"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Tá an breiseán seo díchumasaithe"
 
@@ -4942,7 +4592,7 @@ msgstr "Scag"
 msgid "editorcp_logs_filter_by"
 msgstr "Scagadh de réir cineáil/gnímh"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Logchomhad Imeachtaí"
 
@@ -4998,13 +4648,13 @@ msgstr "Taispeáin Nótaí"
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "Féach ar iontrálacha idir %1$s agus %2$s"
+msgstr "Féach ar iontrálacha idir %s agus %s"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "Níor aimsíodh aon rud sa tréimhse seo."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Logchomhad Iniúchta"
 
@@ -5028,24 +4678,24 @@ msgstr "Gníomhaíocht Eagarthóireachta Le Déanaí"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Líon Iomlán Iniúchta"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Déan Iniúchadh ar Bhreiseán"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Líon isteach na réimsí seo a leanas:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Roghnaigh comhad amháin ar a laghad a ndéanfaidh tú iniúchadh air."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Níl cead agat do bhreiseán féin a iniúchadh."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Bogearra Seachtrach"
 
@@ -5057,39 +4707,39 @@ msgstr "Cuir gné leis"
 msgid "editors_featured_add_feature_submit"
 msgstr "Cuir Leis"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Níorbh fhéidir an ghné a chur leis."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Cuireadh an ghné leis."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Níorbh fhéidir an ghné a chur in eagar."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Cuireadh an ghné in eagar."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Tá logchaighdeán amháin neamhbhailí ar a laghad."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Níorbh fhéidir an ghné a bhaint."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Baineadh an ghné amach."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Breiseáin Shuntasacha"
 
@@ -5101,170 +4751,107 @@ msgstr "Téigh"
 msgid "editors_featured_remove_feature"
 msgstr "Bain gné"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Scag an Ciú"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Naisc Chabhracha"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Lámhleabhar d'Eagarthóirí"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Polasaí Breiseáin"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Coinnigh na scagairí seo le linn an tseisiúin seo, nó go dtí go nglanfar iad."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Níl aon bhreiseáin den chineál seo le hiniúchadh faoi láthair."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 lá"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 uair"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 nóiméad"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Uirlisí Eagarthóra"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s amháin"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Réamhleagan"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Comhoiriúnacht %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Glan"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Scag"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Tá gach ciú iniúchta díchumasaithe faoi láthair.  Déan iarracht eile ar ball."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Gníomh"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Cuir ar an taobh Poiblí"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Déan Iarratas ar Fhorbhreithniú"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Coinnigh sa Bhosca Gainimh"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Nótaí ón Eagarthóir"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5272,115 +4859,117 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Cuirfidh sé seo an breiseán agus an leagan is déanaí de ar an taobh poiblí. "
 "Rachaidh leaganacha amach anseo sa bhosca gainimh go dtí go ndéanfaidh "
 "eagarthóir iniúchadh orthu."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Coinneoidh sé seo an breiseán sa bhosca gainimh."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Cuirfidh sé seo leagan atá sa bhosca gainimh de bhreiseán poiblí ar an taobh "
 "poiblí."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Coinneoidh sé seo leagan atá sa bhosca gainimh de bhreiseán poiblí sa bhosca "
 "gainimh.poiblí."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Má tá imní ort maidir le slándáil an bhreiseáin seo, cúrsaí cóipchirt, nó "
 "aon rud eile ba chóir do riarthóir a iniúchadh, cuir do chuid smaointe sa "
 "bhosca thíos.  Seolfar iad chuig riarthóirí an tsuímh (in ionad an údair)."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Cuir i gcomparáid leis an leagan poiblí"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Féach ar Inneachar"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Údair:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Catagóirí:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Comhoiriúnacht:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Cur Síos"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Nótaí ón Fhorbróir"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Comhaid:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Stair na Míre"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Teachtaireacht Ainmnithe"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Réamhamhairc"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Polasaí Príobháideachta"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Déan Iniúchadh ar %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Nótaí don Eagarthóir"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Achoimre"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Nótaí Eisiúna"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Freagra"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Iarratas ar Eolas"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -5397,7 +4986,7 @@ msgstr "Glacadh leis an Ainmniú/Poiblí"
 msgid "editors_review_history_nominated_denied"
 msgstr "Diúltaíodh an tAinmniú/Bosca Gainimh"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Níor aimsíodh aon iontrálacha iniúchta roimhe seo."
 
@@ -5419,102 +5008,87 @@ msgstr "Diúltaithe/Bosca Gainimh"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Taispeáin/Folaigh Freagraí (%1$s)"
-msgstr[1] "Taispeáin/Folaigh Freagraí (%1$s)"
-msgstr[2] "Taispeáin/Folaigh Freagraí (%1$s)"
-msgstr[3] "Taispeáin/Folaigh Freagraí (%1$s)"
-msgstr[4] "Taispeáin/Folaigh Freagraí (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Feidhmchláir:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "nó roghnaigh freagra coitianta:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Nótaí:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Córais Oibriúcháin:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Barr"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "ar aghaidh &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Níor aimsíodh réamhamharc."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; roimhe seo"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Ciú Léirmheasanna"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> as %2$s sa chiú"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Próiseáil Gníomh"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Gníomh"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Nótaí"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dáta"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Eagarthóir"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Leagan/Comhad"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Próiseáladh an léirmheas."
 
@@ -5538,7 +5112,7 @@ msgstr "Gníomh"
 msgid "editors_reviews_in_reply_to"
 msgstr "I bhfreagra ar:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Próiseáladh na léirmheasanna!"
 
@@ -5550,81 +5124,87 @@ msgstr "Níl aon léirmheasanna le hiniúchadh faoi láthair."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Próiseáil Léirmheasanna"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sainiúil do Shuíomh"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nua"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Nuashonraithe"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Feidhmchlár Profa"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Córais Oibriúcháin Profa"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Tuilleadh Eolais"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Breiseán"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Cineál"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Cineálacha Breiseáin"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Aois"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Feidhmchláir"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Srian na logchaighdeáin?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tréimhse sa Chiú"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Ardáin"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Cineálacha na mBreiseán"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s lá"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s uair"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s nóiméad"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Cead Rochtana Diúltaithe"
 
@@ -5632,19 +5212,17 @@ msgstr "Cead Rochtana Diúltaithe"
 msgid "error_access_denied_message"
 msgstr "Níl cead agat féachaint ar an leathanach seo."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5653,14 +5231,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Breiseán gan aimsiú!"
 
@@ -5672,7 +5247,7 @@ msgstr "Níl an breiseán seo infheicthe anseo."
 msgid "error_addon_selfreview"
 msgstr "Níl cead agat léirmheas a dhéanamh ar do bhreiseán féin."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Níl aon bhreiseán sa chatagóir seo!"
 
@@ -5680,45 +5255,50 @@ msgstr "Níl aon bhreiseán sa chatagóir seo!"
 msgid "error_collection_feed_notfound"
 msgstr "Fotha an bhreiseáin gan aimsiú."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Ní seoladh ríomhphoist bailí é seo."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Caithfidh tú an réimse seo a líonadh."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Comhad gan aimsiú!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Earráid chomhaid: níl %s ann."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Tá earráidí san fhoirm seo.  Ceartaigh iad agus seol é arís."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha neamhbhailí, bain triail eile as!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Tá formáid an URL seo neamhbhailí. Ba chóir dó a bheith cosúil le http://"
@@ -5726,46 +5306,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argóint ar iarraidh: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Gan Chomhaid"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Fógra"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Réamhamharc gan aimsiú!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Ní mór duit rátáil a roghnú."
 
@@ -5773,47 +5341,38 @@ msgstr "Ní mór duit rátáil a roghnú."
 msgid "error_user_already_confirmed"
 msgstr "Tá an cuntas úsáideora seo dearbhaithe cheana."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Cód neamhbhailí dearbhaithe!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Ní ionann na focail fhaire."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Tá an seoladh ríomhphoist seo cláraithe cheana ag úsáideoir eile."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Chuaigh an t-iarratas athraithe ríomhphoist as feidhm.  Athraigh do sheoladh "
 "ríomhphoist arís i do phróifíl úsáideora agus cliceáil an nasc sa "
 "teachtaireacht dearbhaithe chomh luath is a gheobhaidh tú é."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Tá an leasainm seo cláraithe cheana."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Úsáideoir gan aimsiú!"
 
@@ -5823,35 +5382,33 @@ msgstr ""
 "Dearbhaigh do chuntas úsáideora ar dtús leis an gcód a fuair tú trí "
 "ríomhphost."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Ainm an úsáideora nó focal faire mícheart!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Leagan gan aimsiú!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Focal faire mícheart!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Tuilleadh eolais"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Tuilleadh eolais faoi %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5861,23 +5418,24 @@ msgstr[2] "%1$s léirmheas"
 msgstr[3] "%1$s léirmheas"
 msgstr[4] "%1$s léirmheas"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Tuilleadh ó"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "Ar ais go dtí an breiseán"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Leathnaigh uile"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
@@ -5891,50 +5449,55 @@ msgstr "Back to review"
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Brabhsálaí Comhad :: Breiseáin %2$s"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Maidir Leis"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "Blag"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "Ceisteanna Coitianta"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Ceisteanna Coitianta"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Gach ceart ar cosaint."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Cóipcheart"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Admhálacha"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Soláthraíonn Mozilla naisc leis na feidhmchláir seo mar sheirbhís, agus ní "
@@ -5942,105 +5505,98 @@ msgstr ""
 "leo.  Ní mór duit ceisteanna, gearáin, nó éilimh a bhaineann leis na "
 "feidhmchláir a sheoladh chuig an bhforbróir oiriúnach."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Téigh"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Fógraí Dlí"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Teangacha eile:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Polasaí Príobháideachta"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Sábháil"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Foclóir"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Foclóirí"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Eisínteacht"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Eisínteachtaí"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pacáiste Teanga (Breiseán)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacáistí Teanga (Breiseán)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Pacáiste Teanga (Feidhmchlár)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacáistí Teanga (Feidhmchlár)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Breiseán"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Breiseán"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Inneall Cuardaigh"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Innill Chuardaigh"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Téama"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Téamaí"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Ar ais go dtí leathanach baile Breiseáin %1$s"
@@ -6049,95 +5605,37 @@ msgstr "Ar ais go dtí leathanach baile Breiseáin %1$s"
 msgid "header_main_firefox_header"
 msgstr "Breiseáin Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Breiseáin"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
-msgstr "Breiseáin SeaMonkey"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
+msgstr "Breiseáin Seamonkey"
 
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Breiseáin Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Breiseáin Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Breiseáin"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Logáil isteach"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Logáil amach"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Mo Chuntas"
 
@@ -6145,24 +5643,12 @@ msgstr "Mo Chuntas"
 msgid "header_navlink_register"
 msgstr "Cláraigh"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "�omhá Réamhamhairc de %s"
@@ -6171,49 +5657,38 @@ msgstr "�omhá Réamhamhairc de %s"
 # %2 is the link to an explanatory page.
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Logáil isteach</a> chun an breiseán turgnamhach seo a "
 "shuiteáil. <a href=\"%2$s\">Cén fáth</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Ceadaigh dom an breiseán turgnamhach seo a shuiteáil. <a href=\"%1$s\">Cad É "
-"Seo?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Cuir le %1$s %2$s"
+msgstr "Cuir le %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Cuir %1$s le %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "�osluchtaigh %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Níl an breiseán seo ar fáil."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Liosta na bpacáistí teanga agus na bhfoclóirí."
 
@@ -6225,8 +5700,8 @@ msgstr "�osluchtaigh Foclóir"
 msgid "langtools_download_langpack"
 msgstr "�osluchtaigh Pacáiste Teanga"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Foclóirí agus Pacáistí Teanga"
 
@@ -6238,80 +5713,36 @@ msgstr "Suiteáil an Foclóir"
 msgid "langtools_install_langpack"
 msgstr "Suiteáil Pacáiste Teanga"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Foclóir"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pacáiste Teanga"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Teanga"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Cliceáil anseo chun dul ar ais go dtí an príomhleathanach."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dáta"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Líon na n�osluchtuithe"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Ainm an Bhreiseáin"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Rátáil"
@@ -6336,21 +5767,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Foclóirí agus Pacáistí Teanga"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Breiseáin"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Téamaí"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Aimsigh breiseáin le haghaidh feidhmchlár eile"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "eile"
 
@@ -6358,43 +5796,20 @@ msgstr "eile"
 msgid "page_title_appversions"
 msgstr "Leaganacha Feidhmchláir"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Admhálacha"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Breiseáin Thurgnamhacha"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
 msgstr "Ceisteanna Coitianta"
 
 #: controllers/pages_controller.php:94
-#, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
-msgstr "Fashion your Firefox FAQ"
+msgstr ""
 
 #: controllers/pages_controller.php:101
 msgid "page_title_policy"
@@ -6416,15 +5831,15 @@ msgstr "Córas Bosca Gainimh"
 msgid "page_title_submissionhelp"
 msgstr "Cabhair le Seoladh Breiseán"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Leaganacha Bailí an Fheidhmchláir"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Ní mór comhad install.rdf a bheith ag gach breiseán a sheoltar chuig "
@@ -6433,7 +5848,7 @@ msgstr ""
 "seo."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6443,15 +5858,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "anseo"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Leaganacha"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Leathanach roimhe seo"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Eolas faoin Bhosca Gainimh"
 
@@ -6459,6 +5877,13 @@ msgstr "Eolas faoin Bhosca Gainimh"
 msgid "pagination_next_page"
 msgstr "ar aghaidh"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Seo é leathanach %1$s as %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "siar"
@@ -6498,24 +5923,23 @@ msgstr ""
 "Mura bhfuil tú in ann é seo a léamh, is féidir leat triail a bhaint as <a "
 "href=\"%1$s\">focail eile</a> nó <a href=\"%2$s\">éisteacht le rud éigin</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "An neach daonna thú?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Cad é seo?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Earráid agus bratach á cur leis an léirmheas seo!"
 
 #: models/reviews_moderation_flag.php:69
-#, fuzzy
 msgid "review_flag_reason_bug_support"
-msgstr "Misplaced bug report or support request"
+msgstr ""
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Déan gearán faoin léirmheas seo (roghnaigh an chúis)"
 
@@ -6531,8 +5955,8 @@ msgstr "Cúis eile (sonraigh, le do thoil)"
 msgid "review_flag_reason_spam"
 msgstr "Turscar nó ábhar nach mbaineann le léirmheas"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Go raibh maith agat; cuireadh bratach leis an léirmheas seo agus déanfaidh "
@@ -6549,153 +5973,114 @@ msgstr ""
 "anseo chun bratach a chur leis sa chaoi go ndéanfaidh eagarthóir iniúchadh "
 "air."
 
+# %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
-#, fuzzy
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
-"<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
-"about your experience with the add-on.  Give specifics and helpful details, "
-"such as what features you liked and/or disliked, how easy to use it is, and "
-"any disadvantages it has.  Avoid generic language such as calling it \"Great"
-"\" or \"Bad\" unless you can give reasons why you believe this is so.</"
-"li><li>Please do not post bug reports in reviews. We do not make your email "
-"address available to add-on developers and they may need to contact you to "
-"help resolve your issue. See the <a href=\"%1$s\">support section</a> to "
-"find out where to get assistance for this add-on.</li><li>Please keep "
-"reviews clean, avoid the use of improper language and do not post any "
-"personal information.</li></ul><p>Please read the <a href=\"%2$s\">Review "
-"Guidelines</a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Léirmheasanna ar %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Breiseáin Mhór-Le-Rá"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Breiseáin Is Nuaí"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Breiseáin Nuashonraithe"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr ""
 "Tá an t-inneall cuardaigh díchumasaithe faoi láthair. Déan iarracht eile "
 "níos déanaí."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "na mbreiseán go léir"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "Lorg breiseáin"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Lorg breiseáin"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Cliceáil chun téarmaí cuardaigh a iontráil"
 
 # followed by "all add-ons", "
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "i measc"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Gach Inneall Cuardaigh"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Brabhsáil Innill Chuardaigh"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s bhreiseán comhoiriúnach"
+msgstr[1] "%s bhreiseán chomhoiriúnacha"
+msgstr[2] "%s bhreiseán chomhoiriúnacha"
+msgstr[3] "%s mbreiseán chomhoiriúnacha"
+msgstr[4] "%s breiseán chomhoiriúnacha"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Níor aimsíodh aon rud."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Cuardaigh Breiseáin"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Fotha na dtorthaí cuardaigh"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Torthaí cuardaigh le haghaidh: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Uirlisí Riaracháin"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Uirlisí Forbróra"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Uirlisí Eagarthóra"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Fáilte"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Fáilte romhat, a %s"
@@ -6704,7 +6089,7 @@ msgstr "Fáilte romhat, a %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Foclóir"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Breiseáin Shuntasacha"
 
@@ -6712,7 +6097,7 @@ msgstr "Breiseáin Shuntasacha"
 msgid "sidebar_pitch_looking_for"
 msgstr "Táim ag lorg:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Breiseáin Is Nuaí"
 
@@ -6720,7 +6105,7 @@ msgstr "Breiseáin Is Nuaí"
 msgid "sidebar_pitch_search"
 msgstr "Forlíontán Cuardaigh"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Liostáil le"
 
@@ -6728,24 +6113,25 @@ msgstr "Liostáil le"
 msgid "sidebar_pitch_theme"
 msgstr "Téama"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Breiseáin Nuashonraithe"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s kB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Gan rátáil fós"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Rátáil %s as 5 réiltín"
@@ -6782,13 +6168,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "Cruthaíodh %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s eisithe"
@@ -6801,179 +6187,180 @@ msgstr "Dún"
 msgid "statistics_help_link"
 msgstr "Cabhair"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "nó, roghnaigh breiseán eile"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "nó, roghnaigh breiseán le staitisticí poiblí"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Roghnaigh ceann de do chuid breiseán chun a staitisticí a fheiceáil"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Roghnaigh breiseán chun a staitisticí a fheiceáil"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Roghnaigh breiseán le staitisticí poiblí"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Painéal na Staitisticí"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Amharc ar Staitisticí"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Féach ar an tábla seo i bhformáid CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "faic"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Bain an graf seo"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grúpáil de réir: Lá"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grúpáil de réir: Mí"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grúpáil de réir: Seachtain"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Cuir i gcomparáid de réir: Seachtain"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Aimsíodh %s i raon"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Cuir Graf Leis"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Cuir graf eile leis"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Folaigh an Líon Iomlán"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Taispeáin an Líon Iomlán"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Breac an líon iomlán ar an ngraf seo"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Amharc ar na Sonraí (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Faigh comhad CSV leis na sonraí seo"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Folaigh Imeachtaí %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Taispeáin Imeachtaí %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Forleag dátaí eisiúna an bhreiseáin ar an ngraf"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Folaigh Imeachtaí Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Taispeáin Imeachtaí Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Forleag dátaí eisiúna Firefox ar an ngraf"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Laghdaigh an Graf"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Leathnaigh an Graf"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Athraigh méid an ghraif"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Úsáideoirí Gníomhacha Laethúla"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Feidhmchlár"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Saincheaptha"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "�osluchtuithe"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Córas Oibriúcháin"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stádas an Bhreiseáin"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Achoimre"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Leagan an Bhreiseáin"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Feidhmchlár"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Córas Oibriúcháin"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Stádas an Bhreiseáin"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Anaithnid"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Leagan an Bhreiseáin"
 
@@ -7013,7 +6400,7 @@ msgstr "Nuashonraíodh do chuid socruithe!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Painéal na Staitisticí"
 
@@ -7041,106 +6428,110 @@ msgstr "Súmáil Amach"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Súmáil amach mí amháin"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Achoimre laethúil ar staitisticí do %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Fotha RSS le sonraí achoimrithe"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e %B, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Staitisticí le haghaidh %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "De réir réamhshocraithe, tá cead ag Mozilla agus agatsa féin faisnéis do "
 "phainéil a rochtain. Is féidir leat an painéal a oscailt sa chaoi gurbh "
 "fhéidir le héinne sonraí do bhreiseáin a fheiceáil."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Rochtain ar an bPainéal"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Príobháideach"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr ""
 "Tá cead ag Mozilla agus agatsa féin staitisticí an bhreiseáin seo a fheiceáil"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Poiblí"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Is féidir le héinne staitisticí an bhreiseáin seo a fheiceáil"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Athraigh Socruithe"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "�irigh é seo mar eolas faoi rún."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Tá an painéal seo <b>príobháideach</b> faoi láthair."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Tá an painéal seo <b>poiblí</b> faoi láthair."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Faoi Ghlas"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Fill ar an bPainéal"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Sábháil na Socruithe"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Socruithe Phainéal na Staitisticí le haghaidh %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Díghlasáilte"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Fdhm"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "CO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "An"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Leag"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Meánlíon na n�osluchtuithe sa lá"
 
@@ -7152,7 +6543,7 @@ msgstr "�osluchtuithe"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Líon sa lá is déanaí"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "�osluchtuithe le linn na 7 lá is déanaí"
 
@@ -7170,7 +6561,7 @@ msgstr "Ó %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Gan sonraí fós"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Meánlíon na nÚsáideoirí Gníomhacha sa lá"
 
@@ -7196,130 +6587,109 @@ msgstr "Úsáideoirí Gníomhacha Laethúla"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Ar %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Staitisticí %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Gach Téama"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Brabhsáil Téamaí"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Athraigh Seoladh Ríomhphoist"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Athraigh focal faire"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Seoladh an cód dearbhaithe arís!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "D'éirigh le scriosadh an chuntais %1$s. Más mian leat teacht ar ais linn lá "
 "breá éigin, b'fhéidir leat clárú arís ar an <a href=\"%2$s\">leathanach "
 "cláraithe</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Tá brón ar chomhphobal Breiseán Mozilla go bhfuil tú ag imeacht."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Dearbhaigh an Focal Faire"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Scrios mo chuntas anois"
 
+# %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
-#, fuzzy
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
-"You cannot delete your account if you are listed as an <a href=\"%1$s"
-"\">author of any add-ons</a>. To delete your account, please have another "
-"person in your development group delete you from the list of authors for "
-"your add-ons. Afterwards you will be able to delete your account here."
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Má tá ceisteanna eile agat, téigh i dteagmháil le %1$s."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Caithfidh tú tic a chur sa bhosca \"Tuigim...\" sular féidir linn do chuntas "
 "a scriosadh."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr ""
 "Iontráil d'fhocal faire mar is ceart chun an chéim seo a chur i gcrích."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Tharla earráid anaithnid agus do chuntas á scriosadh. Téigh i dteagmháil le %"
 "1$s agus scriosfaimid é ar do shon. Tá brón orainn."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Dearbhaigh scriosadh an chuntais"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Scrios Cuntas %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Slán agat!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Ní bheidh tú in ann logáil isteach ar Bhreiseáin Mozilla a thuilleadh."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Má chliceálfaidh tú \"scrios\", scriosfar do chuntas <strong>go brách</"
 "strong>. Ciallaíonn sé seo:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Ní scriosfar do chuid léirmheasanna agus rátálacha, ach ní bheidh bainte acu "
@@ -7327,23 +6697,23 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Má tá fadhb ar leith agat, ná scrios do chuntas anois, ach téigh i "
 "dteagmháil linn ag %1$s agus déanfaimid ár ndícheall an fhadhb a réiteach."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Tuigim nach mbeidh mé in ann dul ar ais tar éis na céime seo."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Úsáideoir Scriosta"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Seoladh teachtaireacht ríomhphoist chuig %1$s chun do sheoladh nua a "
@@ -7351,7 +6721,7 @@ msgstr ""
 "an nasc sa teachtaireacht seo.  Go dtí sin, is féidir leat logáil isteach "
 "leis an seoladh ríomhphoist atá agat faoi láthair."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Scrios cuntas úsáideora"
 
@@ -7382,7 +6752,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "D'iarr tú do sheoladh ríomhphoist a athrú ag Breiseáin %2$s.\n"
@@ -7425,113 +6797,92 @@ msgstr ""
 "Go raibh maith agat,\n"
 "-- Foireann Breiseáin %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Athshocraigh d'Fhocal Faire do Bhreiseáin %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Earráid!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Dearbhaigh do sheoladh ríomhphoist nua ag Breiseáin %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "D'éirigh leis!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "D'éirigh le hathrú do ríomhphoist.  As seo amach, bain úsáid as %1$s chun "
 "logáil isteach."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Dearbhaigh an focal faire"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Cuir an phróifíl úsáideora %s in eagar"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Seoladh ríomhphoist"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Ainm"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Folaigh do sheoladh ríomhphoist"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL do shuímh Gréasáin"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Sloinne"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Logáil Isteach"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Focal faire nua"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Leasainm"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Focal faire roimhe seo"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Gníomhartha Eile"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Focal Faire"
 
@@ -7539,67 +6890,64 @@ msgstr "Focal Faire"
 msgid "user_form_registration"
 msgstr "Clárú Úsáideora Nua"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Meabhraigh mé ar an ríomhaire seo"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Taispeáin an bosca gainimh?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Sábháil"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Logáil isteach"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Cláraigh"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Úsáideoir Breiseáin %s ó"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Cruthaigh cuntas nua úsáideora"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Comhoiriúnacht an Bhreiseán (moltar é seo go láidir)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Imeachtaí agus comórtais atá ag teacht"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Níl aon fhógairtí ar fáil le cumrú agat."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Anois is arís, seolfaidh Mozilla teachtaireacht ríomhphoist maidir le "
 "leaganacha nua nó imeachtaí a bhaineann le breiseáin. Roghnaigh na hábhair "
 "thíos a bhfuil suim agat iontu:"
 
-#: views/users/edit.thtml:164
-#, fuzzy
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
-"Mozilla reserves the right to contact you individually about specific "
-"concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Bhí botúin sna hathruithe a rinne tú.  Ceartaigh iad agus seol iad arís."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Nuashonraíodh an phróifíl."
 
@@ -7612,17 +6960,17 @@ msgstr "Athshocraíodh an focal faire le haghaidh %s"
 msgid "user_pwreset_header"
 msgstr "Athshocrú Focail Faire"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "An ndearna tú dearmad ar d'fhocal faire?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "Seoladh nasc chuig do sheoladh ríomhphoist lenar féidir d'fhocal faire a "
 "athshocrú."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "D'éirigh le hathshocrú d'fhocail faire."
 
@@ -7634,7 +6982,7 @@ msgstr "Cuir athrú an fhocail faire i bhfeidhm"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Seol nasc lenar féidir d'fhocal faire a athshocrú"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Breiseáin %s"
@@ -7651,7 +6999,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7663,24 +7011,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "an teachtaireacht dearbhaithe a sheoladh arís"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Comhghairdeas! Cruthaíodh do chuntas úsáideora."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -7693,29 +7027,20 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Go raibh maith agat as clárú agus fáilte romhat go %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Fáilte go addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Ainm, sloinne, nó leasainm de dhíth."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Fógairt"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Próifíl Úsáideora"
 
@@ -7723,67 +7048,51 @@ msgstr "Próifíl Úsáideora"
 msgid "user_verified_okay"
 msgstr "D'éirigh leis an bhfíorú!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Scrios Cuntas"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Cuntas Úsáideora le Cur in Eagar"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Breiseáin le %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Ainm"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Próifíl Úsáideora"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Seoladh ríomhphoist"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Leathanach baile"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Leasainm"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Faisnéis maidir le húsáideoir %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Léirmheasanna le %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Logáil Isteach"
 
@@ -7819,125 +7128,5 @@ msgstr "Athshocrú Focail Faire"
 msgid "users_register_pagetitle"
 msgstr "Clárú Úsáideora Nua"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "An Chéad Bhreiseán Eile"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "An Breiseán Roimhe Seo"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Stair Iomlán na Leaganacha"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Is Nuaí:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Is Mó Éilimh Orthu:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Molaimid:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Nuashonraithe Le Déanaí:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Taispeáin uile"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Taispeáin Gach Breiseán Molta"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Rátáil is Airde Ar dTús"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Nuashonrú Is Déanaí Ar dTús"
-
-# msgstr "Breiseáin Is Mó Éilimh Orthu Ar dTús" is a hair too long
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Is Mó Éilimh Orthu Ar dTús"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Glacaim Leis"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Diúltaím"
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nua"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Nuashonraithe"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Aois an Bhreiseáin"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Cineálacha Breiseáin"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Feidhmchláir"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Ardáin"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Cineálacha na mBreiseán"
-
-#~ msgid "forum_save"
-#~ msgstr "Sábháil"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Breiseáin"
-
-# %1 is page number, %2 is total page count
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Seo é leathanach %1$s as %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s bhreiseán comhoiriúnach"
-#~ msgstr[1] "%s bhreiseán chomhoiriúnacha"
-#~ msgstr[2] "%s bhreiseán chomhoiriúnacha"
-#~ msgstr[3] "%s mbreiseán chomhoiriúnacha"
-#~ msgstr[4] "%s breiseán chomhoiriúnacha"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Fotha RSS le sonraí achoimrithe"
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "An leagan is déanaí atá comhoiriúnach do"
diff --git a/site/app/locale/he/LC_MESSAGES/messages.po b/site/app/locale/he/LC_MESSAGES/messages.po
index 53f2b88..a6fbb97 100644
--- a/site/app/locale/he/LC_MESSAGES/messages.po
+++ b/site/app/locale/he/LC_MESSAGES/messages.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-10 20:13+0200\n"
-"Last-Translator: Tomer Cohen <tomerc@gmail.com>\n"
+"PO-Revision-Date: 2008-09-11 20:53+0200\n"
+"Last-Translator: Amiad <amiadb@gmail.com>\n"
 "Language-Team: Hebrew\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,190 +19,160 @@ msgstr ""
 "X-Poedit-Language: Hebrew\n"
 "X-Poedit-Country: Israel\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "בטל התקנה"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "הורד עכשיו �ת %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "הסכ� והורד"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "קבל והתקן"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "ציבורי"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "�רגז החול"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "%s עודכן"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "גירסה %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "הורדות"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "סה\"כ הורדות"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "הורדות לשבוע"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" תוספת"
 msgstr[1] "%1$s \"%2$s\" תוספות"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "לפי עמוד"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "מיין לפי:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "נסיוני"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "מומלץ"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s ל� זמין עבור %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "חזרה �ל %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "חזרה לסקירות..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "דירוג:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "סקירה:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "שלח �ת הסקירה שלך"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "הוסף סקירה עבור %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "כותרת/תקציר:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "מחק"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "תשובה"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "�תה בטוח שברצונך למחוק �ת הסקירה הזו?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "ל�"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "כן"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "מחק סקירה"
 
@@ -211,32 +181,35 @@ msgid "addon_review_deleted_successfully"
 msgstr "סקירה נמחקה בהצלחה."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "עריכת סקירה עבור %s"
 
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
+#, fuzzy
 msgid "addon_review_flag_error_other_length"
-msgstr "בעיה בסימון הסקריה: הערות לסקירות מסומנות מוגבלות ל־10 עד 100 תווי�; �ורך הסקירה שלך הו� %1$s. "
+msgstr ""
+"Problem flagging review: Notes for flagged reviews are limited to between 10 "
+"and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "שי� לב: לפני שהסקירה שלך תוצג ב�תר, הי� תעבור ביקורת על־ידי עורך."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "תשובת מפתח ל:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
-#, php-format
+#: views/reviews/display.thtml:135
+#, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "See %1$s previous review submitted by %2$s for this add-on."
-msgstr[1] "הצג %1$s סקירות קודמות מ�ת %2$s לתוספת זו."
+msgstr[1] "See %1$s previous reviews submitted by %2$s for this add-on."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -248,169 +221,136 @@ msgid "addon_review_pagetitle"
 msgstr "סקירות עבור %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "תשובה מ�ת %1$s ב-%2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "תשובת מפתח:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "הסקירה שלך נשמרה בהצלחה. תודה!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "מ�ת %1$sב-%2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "סקירות על %1$s, מדורגות %2$d"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "קישור קבוע לגירסה זו"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "הגירסה החדשה ביותר תו�מת ל־%1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "לך"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "צפה בפרופיל המחבר"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
+#, fuzzy
 msgid "addons_browse_all_themes_title"
-msgstr "עיין בכל ערכות הנוש� :: תוספות של %1$s"
+msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "עיין ב%s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
+#, fuzzy
 msgid "addons_browse_categories_header_theme"
-msgstr "עיין בערכות נוש� מסוג %1$s :: תוספות של %2$s"
+msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "מה זה?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "הוסף סקירה"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "פרטי� מתקדמי�"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "קטגוריות"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "הוסף ל�וסף:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "�וסף חדש..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "בחר �וסף..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "פרס�"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s התווסף ל�וסף %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "מה זה?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "ו�וסף נוסף"
-msgstr[1] "ו־%1$s �וספי� נוספי�"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "סקירה מפורטת"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "ל� �והב"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "ערוך סקירה"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "לתוספת זו יש מדיניות פרטיות."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "שונ�"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "�וספי� קשורי�"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "הערות המפתח"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "דף הבית"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "רישיון קוד מקור"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "סקירות"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "תמיכה"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "�והב"
 
@@ -418,109 +358,128 @@ msgstr "�והב"
 msgid "addons_display_long_description"
 msgstr "תי�ור �רוך"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "מת עליו"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "עוד תמונות"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "תוספת זו ל� מצוייה כרגע בשו� �וסף"
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
+#, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
-msgstr[0] "תוספת �חרת מ�ת %1$s"
-msgstr[1] "תוספות �חרות מ�ת המפתחי� הללו"
+msgstr[0] "תוספות �חרות של %1$s"
+msgstr[1] "Other add-ons by these authors"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "תמיכה עבור ההרחבה הזו זמינה ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח ההרחבה  כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� מפורט, והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� למפתחי ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
+msgstr ""
+"תמיכה עבור ההרחבה הזו זמינה ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח ההרחבה  "
+"כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� מפורט, "
+"והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� למפתחי "
+"ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך "
+"קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "תמיכה עבור ההרחבה הזו זמינה ב%s �ו ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח ההרחבה  כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� מפורט, והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� למפתחי ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
+msgstr ""
+"תמיכה עבור ההרחבה הזו זמינה ב%s �ו ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח "
+"ההרחבה  כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� "
+"מפורט, והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� "
+"למפתחי ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור "
+"�יתך קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
-msgstr "תמיכה עבור ההרחבה הזו זמינה ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח ההרחבה  כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� מפורט, והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� למפתחי ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
+msgstr ""
+"תמיכה עבור ההרחבה הזו זמינה ב%s. �� מצ�ת ב�ג מומלץ לדווח עליו למפתח ההרחבה  "
+"כך שהו� יוכל להיות בקשר �יתך. סקירות הן ל� המקו� המת�י� לדיווח ב�גי� מפורט, "
+"והמפתח �ולי יזדקק לכמה פרטי� כדי לשחזר �ת הב�ג. מ�חר ו�נו ל� מ�פשרי� למפתחי "
+"ההרחבות לצפות בכתובת הדו�\"ל שלך כש�תה מפרס� סקירה, ה� ל� יוכלו ליצור �יתך "
+"קשר כדי לבקש עוד פרטי� �ו להודיע לך על תיקון הב�ג בגירס�ות הב�ות."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "דרג"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "�והב מ�וד"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "בבקשה �ל תפרס� דיווחי ב�גי� בסקירות. �נחנו ל� מעבירי� �ת כתובת הדו�\"ל שלך למפתחי התוספות וה� �ולי יצטרכו ליצור �יתך קשר על מנת לפתור �ת הבעיה."
+msgstr ""
+"בבקשה �ל תפרס� דיווחי ב�גי� בסקירות. �נחנו ל� מעבירי� �ת כתובת הדו�\"ל שלך "
+"למפתחי התוספות וה� �ולי יצטרכו ליצור �יתך קשר על מנת לפתור �ת הבעיה."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">קוי� מנחי� לסקירה</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "בקר ב<a href=\"%1$s\">�יזור התמיכה</a> כדי לגלות �יפה ניתן לקבל  סיוע לתוספת זו."
+msgstr ""
+"בקר ב<a href=\"%1$s\">�יזור התמיכה</a> כדי לגלות �יפה ניתן לקבל  סיוע לתוספת "
+"זו."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "שמור"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "צפה בכל התוספות ה%1$s "
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "הצג כל הסקירות (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "צפה בכל הגירס�ות"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "היסטורית גירס�ות מל�ה"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "הצג קוד מקור"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "צפה בסטיסטיקות"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "מה �תה חושב?"
 
@@ -528,484 +487,366 @@ msgstr "מה �תה חושב?"
 msgid "addons_display_workswith"
 msgstr "עובד ע�:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "התווסף ל�חרונה"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "פופולרי"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "מומלץ"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "הירש�"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "עיין בתוספות"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "התעדכן"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "מ�ת"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "�וספי� פופולריי�"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "�וספי�"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "תוספת �חת"
-msgstr[1] "<strong>%1$s</strong> תוספות"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "הצג �ת כל ה�וספי�"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "�וספי� ה� הדרך שלך לקטלג, לערבב, למצו� ולשתף תוספות. הירש� ל�וספי� שנוצרו בידי משתמשי� �חרי� �ו צור �ת שלך."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "מנוי <strong>%1$s</strong>"
-msgstr[1] "<strong>%1$s</strong> מנויי�"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "ההמלצות שלנו"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "תוספות מרחיבות �ת %1$s, ומ�פשרות לך להת�י� �ישית �ת חווית הגלישה שלך. עשה סיור בסביבה והפוך �ת %1$s לשלך."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "�והב �ת �לו? חפש תוספות נוספות ב־%1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>מעל 5000 תוספות בחינ�</strong> המ�פשרות לך לבצע הת�מה �ישית ולהרחיב �ת Firefox כך שית�י� לצרכיך."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "מהן תוספות?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>פשוט להתקנה</strong>, קבל התר�ה כ�שר זמיני� עדכוני�."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "הקדמה"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "סרגלי כלי�, ערכות נוש� וספקי חיפוש ש<strong>עוזרי� לך לבצע משימות שוטפות</strong>."
+msgstr ""
+"תוספות מרחיבות �ת %1$s, ומ�פשרות לך להת�י� �ישית �ת חווית הגלישה שלך. עשה "
+"סיור בסביבה והפוך �ת %1$s לשלך."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "חדש!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "החדש ביותר:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "יישומי� �חרי�"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "�תר התוספות של Mozilla :: הוסף תכונות למוצרי Mozilla"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "הפופולריי� ביותר:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "ההמלצה שלנו:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "עודכנו ל�חרונה:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "צפה בהכל"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "צפה בכל "
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "צפה בכל התוספות הפופולריות"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "צפה בכל התוספות המומלצות"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "צפה בכל התוספות שעודכנו ל�חרונה"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
+#, fuzzy
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>לחץ על הקישור הב� כדי לשמור �ת הקובץ.</li><li>ב־Mozilla Sunbird, פתח �ת חלון התוספות מתפריט כלי�.</li><li>לחץ על כפתור ההתקנה, בחר �ת הקובץ שהורדת, ולחץ \"�ישור\".</li></ol>"
+msgstr ""
+"<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, "
+"open Add-ons from the Tools menu.</li><li>Click the Install button, and "
+"locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
+#, fuzzy
 msgid "addons_install_in_sunbird_title"
-msgstr "כיצד להתקין ב־Sunbird"
+msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>לחץ על הלחצן הימני של העכבר על הקישור הב� ובחר ב\"שמור קישור בתור...\" כדי להוריד ולשמור �ת הקובץ לכונן הקשיח שלך.</li><li>בתוך Mozilla Thunderbird, פתח �ת מנהל התוספות מתוך התפריט כלי�.</li><li>לחץ על כפתור ההתקנה, בחר �ת הקובץ שהורדת ולחץ על \"�ישור\".</li></ol>"
+msgstr ""
+"<ol><li>לחץ על הלחצן הימני של העכבר על הקישור הב� ובחר ב\"שמור קישור בתור..."
+"\" כדי להוריד ולשמור �ת הקובץ לכונן הקשיח שלך.</li><li>בתוך Mozilla "
+"Thunderbird, פתח �ת מנהל התוספות מתוך התפריט כלי�.</li><li>לחץ על כפתור "
+"ההתקנה, בחר �ת הקובץ שהורדת ולחץ על \"�ישור\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "כיצד להתקין ב־Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "הצג תוספות נסיוניות"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "לך"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "מ�ת"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "עבור Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "עבור Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "עבור Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "דף זה מציג רשימה של התוספי� השכיחי� והפופולריי� ביותר. למידע נוסף �ודות תוספי� �חרי� הזמיני� עבור דפדפני� מבוססי Mozilla, ר�ה %1$s"
+msgstr ""
+"דף זה מציג רשימה של התוספי� השכיחי� והפופולריי� ביותר. למידע נוסף �ודות "
+"תוספי� �חרי� הזמיני� עבור דפדפני� מבוססי Mozilla, ר�ה %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "מחפש תוסף של� מופיע כ�ן?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "תוספי� מסייעי� לדפדפן לבצע פעולות מסוימות כגון צפיה בקבצי� גרפיי� מיוחדי� �ו השמעת קבצי מולטימדיה. תוספי� שוני� במקצת מהרחבות, שמשנות �ו מתווספות לפעולות הקיימות."
+msgstr ""
+"תוספי� מסייעי� לדפדפן לבצע פעולות מסוימות כגון צפיה בקבצי� גרפיי� מיוחדי� �ו "
+"השמעת קבצי מולטימדיה. תוספי� שוני� במקצת מהרחבות, שמשנות �ו מתווספות לפעולות "
+"הקיימות."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "תוספי� שכיחי� עבור %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "תוספי�"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "תיעוד לתמיכה: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "%s דורש שתסכי� להסכ� המשתמש הב� כדי להמשיך בהתקנה:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "סקירות עבור %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "התווסף ל�חרונה"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "ע� �לף תוספות זמינות, יש משהו לכל �חד. בתור התחלה, הנה רשימה של כמה מהמעודפי� שלנו. תהנה!"
+msgstr ""
+"ע� �לף תוספות זמינות, יש משהו לכל �חד. בתור התחלה, הנה רשימה של כמה "
+"מהמעודפי� שלנו. תהנה!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "תוספות מומלצות"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "תוספות מומלצות"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "מש�בי� נוספי�"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "מרכז המפתחי� של מוזילה"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "מצטערי�, �תה צריך דפדפן מבוסס Mozilla (כגון Firefox) בכדי להתקין תוספי חיפוש."
+msgstr ""
+"מצטערי�, �תה צריך דפדפן מבוסס Mozilla (כגון Firefox) בכדי להתקין תוספי חיפוש."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "כדי להתקין תוספי� חייבי� JavaScript, �ך נר�ה כי ביטלת ז�ת. בבקשה הפעל �ת ה־JavaScript בדפדפן שלך לפני ש�תה מנסה להתקין �ת תוספי החיפוש הב�י�."
+msgstr ""
+"כדי להתקין תוספי� חייבי� JavaScript, �ך נר�ה כי ביטלת ז�ת. בבקשה הפעל �ת "
+"ה־JavaScript בדפדפן שלך לפני ש�תה מנסה להתקין �ת תוספי החיפוש הב�י�."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "למד �יך %1$s ב%2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "ליצור מנועי חיפוש משלך"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "עיין במנועי חיפוש נוספי� ב-%1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "מנועי חיפוש"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "תודה מיוחדת לפרוייקט Mycroft על עבודת� על מנועי חיפוש לפיירפוקס."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "שתף �ותי"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "הוסף ל־Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "שלח ל־Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "פרס� ב־Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "שתף ב־FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "פרס� ב־MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
+#, fuzzy
 msgid "addons_status_disabled"
-msgstr "מנוטרל"
+msgstr "Disabled"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
+#, fuzzy
 msgid "addons_status_incomplete"
-msgstr "גירסה ל� מל�ה"
+msgstr "Incomplete Version"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 #, fuzzy
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
+#, fuzzy
 msgid "addons_status_pending"
-msgstr "ב�רגז החול; ממתין לסקירה"
+msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
+#, fuzzy
 msgid "addons_status_public"
-msgstr "ציבורי"
+msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
+#, fuzzy
 msgid "addons_status_sandbox"
-msgstr "ב�רגז החול"
+msgstr "In Sandbox"
 
 #: controllers/components/amo.php:203
+#, fuzzy
 msgid "addons_status_unknown"
-msgstr "ל� ידוע"
+msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "למד עוד �ודות תוספת זו"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "הורדו הכי הרבה"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "דורגו הכי גבוה"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "היה זהיר ע� גירס�ות ישנות"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "גירס�ות �לו מוצגות למטרות התייחסות ובדיקות. �תה מתבקש להשתמש תמיד בגירסה ה�חרונה של התוספת."
+msgstr ""
+"גירס�ות �לו מוצגות למטרות התייחסות ובדיקות. �תה מתבקש להשתמש תמיד בגירסה "
+"ה�חרונה של התוספת."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "היסטורית גירס�ות ע� רישו� שינויי�"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "היסטורית הגירס�ות של %1$s"
@@ -1028,8 +869,7 @@ msgstr "הקבוצה ע� מזהה %s נמחקה"
 msgid "admin_group_edit_pagetitle"
 msgstr "ערוך קבוצה"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "מזהה שגוי לקבוצה"
 
@@ -1037,1104 +877,198 @@ msgstr "מזהה שגוי לקבוצה"
 msgid "admin_group_pagetitle"
 msgstr "ניהול קבוצה"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "הקבוצה נשמרה"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "מתקד�"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "כל זמן"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "הכל"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "הכל"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "יישו�"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "הת�מת מילת מפתח"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "עודכן ל�חרונה"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "ש�"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "החדש ביותר"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 חודשי� �חרוני�"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 חודשי� �חרוני�"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "היו� ה�חרון"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "החודש ה�חרון"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "השבוע ה�חרון"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "השנה ה�חרונה"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "לפי עמוד"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "פלטפורמה"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "פופולריות"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "דירוג"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "מיין לפי"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "ל-"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "עבור למצב חיפוש מתקד�"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "סוג"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "גירסה"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "הב�"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "קוד�"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "התעל� מבדיקת גירסה"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "התוספת הז�ת מיועדת לגירס�ות ישנות יותר של פיירפוקס"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick=\"%2$s\">ignore this check</a>"
+msgstr ""
+"You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
+"\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">גירסה ישנה יותר</a> �ולי תעבוד"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
-msgstr "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
+msgstr ""
+"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://firefox.co.il\">שדרג �ת פיירפוקס</a> כדי להשתמש בתוספת הזו"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
+msgstr ""
+"<a href=\"http://firefox.co.il\">שדרג �ת פיירפוקס</a> כדי להשתמש בתוספת הזו"
 
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "תוספות לפי ש�"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "התוספות החדשות ביותר"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "התוספות הפופולריות"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "תוספות לפי הדירוג"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "תוספות שעודכנו ל�חרונה"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "קטגוריה נוכחית"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "קטגוריות"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "בחר קטגוריה"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "הר�ה �ת כל %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "התי�ור שלך צריך להיות פחות מ־%1$s תווי�."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "�וסף %s"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "שגי�ה במחיקת תוספת!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "שגי�ה בשמירת תוספת!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "שגי�ה בשמירת תגובה!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "הש� צריך להיות פחות מ־%1$s תווי�."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
-msgid "collection_not_found"
-msgstr "�וסף ל� נמצ�!"
-
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr "If you already know which add-ons you want to add to your collection, just start typing their names below. If you'd rather wait and do this later, just click %1$s now."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "בחר �ת התוספת הר�שונה שלך"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "צור �וסף"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "תוספות נבחרות"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "זה פשוט ליצור �ת �וסף התוספות שלך ב�מצעות מילוי השדות הב�י�."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "צור �וספי�"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "�וספי�"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "מידע נוסף"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "הוסף למועדפי�"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "הסר ממועדפי�"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr "<p>You can view your new collection below. If you'd like to set a collection nickname, upload an icon, or change additional settings, please visit the <a href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "ה�וסף שלך מוכן כעת!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "�ודות �וסף זה"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "תוספת %1$s  ב�וסף זה"
-msgstr[1] "%1$s תוספות ב�וסף זה"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>נוצר על־ידי:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>עודכן:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "הוספת מועדפי�&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "מחיקת מועדפי�&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">היכנס</a> כדי להוסיף �ת �וסף זה למועדפי� שלך."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "נהל �וספי�"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "ת�ריך הוספה"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "ש�"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "פופולריות"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s הורדה בשבוע זה"
-msgstr[1] "%1$s הורדות בשבוע זה"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "תוספת נבחרת תמחק בשמירה"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr "To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr "To publish new add-ons to this collection, enter a comma-separated list of Add-on IDs below."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "התווסף ב־%1$s על־ידי %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "הוסף הערת מפרס�"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "מחק הערת מפרס�"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "ערוך הערת מפרס�"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "הערה: תגובות יופיעו כ�ילו נכתבו על־ידי המפרס� בת�ריך הפרסו� המקורי"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "שמור תגובה"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "מחק"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "הוסף ל�וסף"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "בדוק זמינות"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "כן, �ני מעוניין למחוק �וסף זה."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "סמן תיבה זו ולחץ על \"%1$s\" כדי למחוק �ת �וסף זה."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "ברגע שתלחץ \"%1$s\", ה�וסף שלך ימחק. במידה ו�ינך מעוניין למחוק �ת ה�וסף, הסר �ת הסימון מתיבת ה�ישור בלשונית \"%2$s\" והמשך לערוך �ת ה�וסף שלך. כמו־כן, במידה ותעזוב דף זה לל� שמירה, ה�וסף שלך ל� ימחק."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "ה�וסף שלך עומד להימחק!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "חובה לספק תי�ור ל�וסף."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "�ירעה שגי�ה בהעל�ת הצלמית שלך."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "חובה להכניס ש� ל�וסף."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "במידה ותבחר כינוי, עליו להיות ייחודי."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "ש� תוספת:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "שיוך יישו�"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "בחר �ת היישו� שה�וסף שלך תומך בו."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "סוג �וסף"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "מחק �וסף"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "מחיקת ה�וסף שלך תשמיד �ותו לתמיד."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "תי�ור �וסף"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Iצלמית"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr "You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr "By default, collections appear in the public Collection Directory and are discoverable by anyone. If you want to restrict your collection to be viewable only by people who are given a special link, choose that option below."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr "These users can publish add-ons to your collection, manage all add-ons and settings, and grant other users permission."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "ש� �וסף"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr "Give your collection a descriptive name, such as \"Dave's Favorite Travel Add-ons\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "כינוי �וסף"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "הר�ה �ת כל התוספות המומלצות"
 
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "מדורגות גבוה ר�שונות"
 
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr "These users can publish add-ons to your collection and remove add-ons that they publish."
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "עודכנו ל�חרונה ר�שונות"
 
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "הכנס כתובת דו�ר �לקטרוני של חשבון ב�תר התוספות של Firefox:"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "הפופולריות ביותר ר�שונות"
 
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "חשבונות נבחרי� ימחקו בשמירה"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "רק �ני"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "�ני והמשתמשי� הב�י�:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "הוסף"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "נהל �ת  %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "נהל תוכן �וספי�"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "תוספת נוכחית:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "הגדרות מתקדמות"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "נהל הרש�ות �וסף"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "ביטול"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "מחק צלמית"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "החלף צלמית"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "כינוי זמין"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "הכינוי שלך מכיל תווי� �סורי� ולכן תוקן. בבקשה נסה שוב."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "כינוי תפוס"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "ה�וסף שלך נגיש בכתובת הב�ה:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "ה�וסף שלך נשמר בהצלחה."
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "עדכן �וסף"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "מחק �וסף"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "תוספות"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "מתקד�"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "ש� ופרטי�"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "הרש�ות"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "מ�רגן משפחה"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "נסה �ת �וסף התוספות"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "צור �וסף"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "לך"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>You don't have any favorite collections yet.</strong></p> <p>Collections you mark as favorites can be quickly accessed from this page, and will appear in the <a href='%1$s'>Add-on Collector</a> if you've installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr "<p>You haven't created any collections yet. Collections are easy to create and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "�וספי�"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "�וסף התוספות"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "מה� �וספי�?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "מיין לפי"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "בחירת העורך"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "המועדפי� שלי"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "ה�וספי� שלי"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "פופולריי�"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "הר�ה �ת כל %1$s"
 
-#: views/search/collections.thtml:76
 #: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "חדשי� ביותר"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
 #, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr "There's a new way to manage and find favorite add-ons. Comment, share and sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
+msgid "collection_not_found"
+msgstr "Collection not found!"
 
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
@@ -2142,135 +1076,7 @@ msgstr "Collections are groups of related add-ons assembled for easy sharing."
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "מעגל חברתי"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "סגירה"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr "An error occurred trying to add a favorite collection. Is this collection already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "�ל תציג לי הודעה זו שוב."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr "You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> tab in the directory. For an even easier way to keep track of your favorite collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "ה�וסף נמחק."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "פרסו� �וטומטי"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "בחירת העורך"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "רגיל"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr "An error occurred trying to remove a favorite collection. Was this collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr "There’s a new way to manage and find favorite add-ons. Comment, share and sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2278,239 +1084,243 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
-msgstr "Be prepared for the release of %1$s with the tools and information available for the %2$s Add-ons community found below."
+msgstr ""
+"Be prepared for the release of %1$s with the tools and information available "
+"for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
+#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "טוען נתוני�..."
+msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
+#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "חזרה לר�שי"
+msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
-msgstr "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please login</a> to analyze the status of your add-ons for %2$s."
+msgstr ""
+"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
+"login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
-msgstr "The add-ons below make up 95% of add-on usage known to Mozilla and are ordered by their usage size."
+msgstr ""
+"The add-ons below make up 95% of add-on usage known to Mozilla and are "
+"ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
-msgstr "Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, <b>%2$s&#37;</b> are currently considered compatible with the latest builds of %3$s."
+msgstr ""
+"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
+"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
+"of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "למידע נוסף על תרומה, בבקשה ר�ה �ת %s שלנו."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "דף וויקי"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla מעונייני� להודות ל�נשי� הב�י� על תרומת� לפרוייקט addons.mozilla.org במשך השני�:"
+msgstr ""
+"Mozilla מעונייני� להודות ל�נשי� הב�י� על תרומת� לפרוייקט addons.mozilla.org "
+"במשך השני�:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "מפתחי�"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "עורכי�"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "מתרגמי�"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "תורמי� �חרי�"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "מפתחי עבר"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "תוכנה ותמונות"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "חלק מהצלמיות הן מ-<a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, ומשוחררות תחת רשיון <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 License</a>."
+msgstr ""
+"חלק מהצלמיות הן מ-<a href=\"http://www.famfamfam.com/lab/icons/silk/"
+"\">famfamfam Silk Icon Set</a>, ומשוחררות תחת רשיון <a href=\"http://"
+"creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
+"License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
-msgstr "Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license.html\">BSD License</a>."
+msgstr ""
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%d/%m/%y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e ב%B %Y, %H:%M"
@@ -2538,25 +1348,25 @@ msgstr "לוח סטיסטיקות"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2565,6 +1375,18 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(�בחנה �וטומטית)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"גירסה זו של התוספת שלך �ינה מוגדרת כתו�מת ל־פיירפוקס %1$s. מוזילה מצפה "
+"שהגירסה הב�ה של פיירפוקס תשוחרר בקרוב, לכן בדוק בבקשה �ת התוספת שלך על "
+"הגירסה החדשה ועדכן �ת מידע הת�ימות שלה. תוכל לקרו� עוד בנוש� <a href=\"%2$s"
+"\">כ�ן</a>.  רק רגע של תשומת לב ותוכל להמשיך ולשלוח �ת גירס�ות �ל addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "פתח בחלון חדש"
@@ -2601,85 +1423,160 @@ msgstr "שלב חמישי: הצלחה"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "הגשת עזרה"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "תוספת נוטרלה בהצלחה"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "עריכת תוספת"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "תוספת �ופשרה בהצלחה"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "תי�ור התוספת"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "הסכ� משתמש (EULA)"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "דף הבית של התוספת"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "ש� התוספת"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "כותרת תצוגה מקדימה"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "מדיניות פרטיות "
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "סיכו� תוספת"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "דו�\"ל לתמיכה"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "כתובת �ינטרנט לתמיכה"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "הערות גירסה"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "הגשת תוספת"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "תוספת הוגשה בהצלחה!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Make your add-on active for it to show up in public listings and enable the update check service."
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Make your add-on inactive to hide it from all public listings and disable the update check service."
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
-msgstr "Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-on is showing up in all available listings appropriate for its status above."
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
 #, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Please fulfill the criteria above before you can complete your add-on and move it to the <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
 #, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "You may now complete your add-on and move it to the <span class=\"status-1\">Sandbox</span> by clicking the button below."
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
 #, fuzzy
@@ -2696,7 +1593,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2706,6 +1603,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2717,13 +1619,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2733,7 +1635,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2743,25 +1645,33 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your add-on will not show up in any listing, regardless of its status above. Updates are <b>not</b> being provided to your add-on through the update check service."
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Please fulfill the criteria above before nominating your add-on to become <span class=\"status-4\">Public</span>."
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "You may now nominate your add-on for <span class=\"status-4\">Public</span> by clicking the button below."
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
 #, fuzzy
@@ -2777,35 +1687,55 @@ msgstr "Sandbox"
 #: views/developers/addon_status.thtml:89
 #, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Your add-on was <span class=\"status-5\">Disabled</span> by an administrator and cannot be used. If you have any questions, please e-mail %s."
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
 #, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Your add-on is currently <span class=\"status-0\">Incomplete</span>. This means your add-on is not showing up on any portion of the site or update check service. You may come to this page to complete your add-on after it meets the criteria below for completion and transfer to the <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 #, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Your add-on is currently nominated to become <span class=\"status-4\">Public</span> and is awaiting editor review. There are currently %s other add-ons in the nomination queue."
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 #, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "Your add-on is pending. This shouldn't have happened. Please e-mail %s with your add-on ID and state this error."
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
 #, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "Your add-on is <span class=\"status-4\">Public</span>, which means it will show up in all listings and searches and can be downloaded without restriction. Updates are being provided to your add-on through the update check service."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 #, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means it will show up in listings and searches, but users must log in to download it. Updates are <b>not</b> being provided to your add-on through the update check service."
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2815,10 +1745,117 @@ msgstr "Your add-on is in the <span class=\"status-1\">Sandbox</span>, which mea
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can submit updates to your add-on without editor review."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"בקר בעמוד של %1$s כדי לערוך שינויי� בהגשה שלך, �ו %2$s כדי לחזור ללוח בקרה "
+"למפתח ."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "לחץ כ�ן"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "עריכת תוספת"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+" הגירסה הז�ת מוקמה ב�רגז החול  והי� מחכה לסקירה של בוחני �רגז החול ושל עורך "
+"התוספות של מוזילה. �תה תקבל הודעה בדו�\"ל כשהפעולה תבוצע."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "�תה יכול לקרו� עוד �ודות מערכת הסקירה של �רגז החול %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "כ�ן"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"הגירסה הז�ת מוקמה ב�רגז החול לשימוש משתמשי� מנוסי�. כדי שהי� תוצג ב�תר "
+"הציבורי �תה צריך %s �ת התוספת שלך ולעבור �ת תהליך הסקירה."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "הגש"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "שליחת התוספת שלך הסתיימה בהצלחה."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "משו� שהתוספת שלך �מינה, הגירסה הז�ת �וטומטית מ�ושרת ל�זור הציבורי."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "שלח תוספת"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "תוספת עודכנה בהצלחה"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "�תה �ולי תרצה %s להגדיל �ת ההתעניינות בתוספת שלך."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "העלה תצוגה מקדימה"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "מחבר ל� נמצ� [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "הסר"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "בטל"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "ה�� �תה בטוח שברצונך לבטל �ת השליחה?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "הב�"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "שנה סוג תוספת:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "הערות המפתח עודכנו."
 
 #: views/developers/dashboard.thtml:68
 #, fuzzy
@@ -2842,7 +1879,9 @@ msgstr "Change Status"
 #: views/developers/dashboard.thtml:99
 #, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Your add-on was disabled by an administrator and cannot be used.  If you have any questions, please email %s."
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2874,7 +1913,9 @@ msgstr "Last edited on %s"
 #: views/developers/dashboard.thtml:111
 #, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how the process works and submit your first add-on, click Get Started below."
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
 #, fuzzy
@@ -2892,37 +1933,178 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "הוסף תצוגה מקדימה"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "מחבר"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "מחברי�"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "�ין"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "קטגוריות"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "קטגוריה"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "תי�ור"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "מנוטרל"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "מזהה (GUID)"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "פרטי�"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "הערות המפתח"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "תצוגות מקדימות"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "גירס�ות"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "דף בית"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "�ין"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "�ין כותרת"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "ל� נמצ�ו תצוגות מקדימות"
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "עידכון"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "דו�\"ל לתמיכה"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "כתובת דו�\"ל לתמיכה ל� סופקה ע\"י המפתח."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "כתובת �ינטרנט לתמיכה"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "כתובת �ינטרנט לתמיכה ל� סופקה על ידי המפתח."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "�ומת"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "גירסה %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "ל� נמצ�ו גירס�ות."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "בטל וחזור �חורה"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "כן, נטרל �ת זה"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "ה�� �תה בטוח שברצונך לנטרל �ת התוספת הזו?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"ניטרול התוספת הזו יסתיר �ותה מהחיפושי� ומהרשימות. ל� יהיה ניתן להוריד �ותה "
+"מה�תר והי� ל� תופיע במנהל העידכוני�. התוספת למעשה תמחק, למרות שתוכל לחזור "
+"לכ�ן ול�פשר �ותה שוב מתי שתרצה."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "נטרל �ת %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "כן, �פשר �ותה"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "ה�� �תה בטוח שברצונך ל�פשר �ת התוספת הז�ת?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"�יפשור התוספת הזו יגרו� לה לשוב להופיע בחיפושי� וברשימות. It will be "
+"downloadable both from the website and from client update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "�פשר �ת %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -2938,13 +2120,16 @@ msgstr "Replies"
 #: views/developers/discuss.thtml:70
 #, fuzzy
 msgid "devcp_discuss_error_notice"
-msgstr "There was an error saving your reply. Please contact %1$s about the issue."
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 #, fuzzy
 msgid "devcp_discuss_intro"
-msgstr "A Mozilla Add-ons Editor requested further information from you regarding version %2$s of your add-on %1$s."
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
@@ -2961,72 +2146,91 @@ msgstr "Submit Reply"
 #: views/developers/discuss.thtml:72
 #, fuzzy
 msgid "devcp_discuss_success_message"
-msgstr "Your reply was successfully saved. The other participants of the discussion will be notified by email."
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #, fuzzy
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "הוסף מחבר"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "כתובת דו�\"ל של המחבר"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "הסר"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Developer</strong> - Can manage all aspects of the add-on listing, except for adding and removing other authors."
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Owner</strong> - Can manage all aspects of the add-on listing, including adding and removing other authors."
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Viewer</strong> - Can view add-on developer listing and statistics, but can't make any changes."
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
@@ -3034,30 +2238,30 @@ msgstr "<strong>Viewer</strong> - Can view add-on developer listing and statisti
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3103,7 +2307,9 @@ msgstr "No categories are available for this add-on type and application."
 #: views/developers/addon_edit_categories.thtml:86
 #, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Place your add-on into this category only if it does not fit into any other available categories."
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -3119,79 +2325,98 @@ msgstr "Add or remove users that can manage this add-on."
 #: views/developers/addon_edit.thtml:49
 #, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Select the relevant categories for each application your add-on supports."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
 #, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "Add and modify translations for your add-on's summary, description, end-user license, and privacy policy."
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
 #, fuzzy
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Any information end users may want to know that isn't necessarily applicable to the add-on summary or description. Common uses include listing known major bugs, information on how to report bugs, anticipated release date of a new version, etc."
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "The description of your add-on is a longer explanation of features, functionality, and other relevant information. It is displayed under the summary on the add-on's display page."
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "If your add-on has an End-User License Agreement (EULA), please enter its text below. If set below, users will be required to agree to this before installing your add-on. Please note that a EULA is not the same as a code license such as GPL or MPL."
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "If your add-on has a privacy policy, enter its text here. Your add-on's display page will display a link to the policy."
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "The summary is a short explanation of your add-on's basic functionality that is displayed in search and browse listings, as well as at the top of your add-on's display page. <strong>Limit of 250 characters.</strong>"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3216,205 +2441,301 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "�ין קטגוריות זמינות עבור סוג התוספת הז�ת."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "מחברי�"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "הוסף צלמית"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "שנה צלמית"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "הרשה למשתמשי� לצפות בקוד הקבצי� במצב מקוון"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "קטגוריות"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "שפת ברירת מחדל"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "תוספת זו דורשת תוכנה חיצונית"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "נקה �ת הצלמית הקיימת בלבד"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "קובץ צלמית חדש"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "צלמית"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "מידע נוסף על השפה"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "זה קד� שחרור"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "זו תוספת ל�תר מסויי�"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "שפת מטרה"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "מידע קצר נוסף (כמו ש� בשפה המקומית)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "An add-on's default locale is the main locale in which translations must be present. If translations for your add-on's descriptions are unavailable in a user's selected language, they will fall back to this default locale."
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "The GUID of your add-on is specified in its install.rdf and uniquely identifies it. You cannot change your GUID once it is listed on Mozilla Add-ons."
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "The add-on icon is a small image that is displayed next to your add-on's name in browse and search results, display pages, and in the add-on installation dialog. The image will automatically be resized to 32 x 32 pixels.  Please use one of the following image types: %s"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "If your add-on has another homepage, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "If you have an email address for support inquiries, enter it here. Adding other translations is not necessary unless you have different email addresses for different languages."
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "If your add-on has a support website or forum, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "The source of your add-on files can be viewed online by any logged in user if you wish."
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "עדכן"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">ש� שפה מקוצר</"
+"a>, למשל 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3501,14 +2822,68 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "עדכוני� ממתיני� (%s)"
 msgstr[1] "עדכוני� ממתיני� (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "הקבצי� המסומני� ימחקו."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "קבצי�"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "מטרת היישומי�"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "�ין קבצי�."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "הערות לסוקר"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "עדכן"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "�ין לך גישה לתוספת הז�ת."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"סיכומי� מוגבלי� ל-250 תוי�.\n"
+"(�תה הכנסת %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"הש� עבור התוספת שלך כבר רשו� במ�גר הנתוני�. בבקשה היה בטוח ש: <br /"
+"><li>המזהי� (GUID) שלך תו�מי�. הסיבה הנפוצה לשגי�ה הזו הי� מזהי� ש�ינ� "
+"מתו�מי�.</li><li>�ין לך ערך כפול במ�גר הנתוני�. �� יש, עדכן �ת הערך  entry "
+"�ו מחק �ותו ונסה שוב.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3522,23 +2897,30 @@ msgstr "ר�ה בבקשה %s לפירוט."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "עמוד זה"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "ת�ר בבקשה �ת השינויי� שנעשו בעידכון התוספת הזה."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 #, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "A version of that addon already exists. To replace it, you must delete the file %1$s first."
+msgstr ""
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "קובץ ההרחבה הזה (%s) �ינו מורשה עבור סוג התוספת שנבחר. השתמש בבקשה ב�חד מהב�י�: %s"
+msgstr ""
+"קובץ ההרחבה הזה (%s) �ינו מורשה עבור סוג התוספת שנבחר. השתמש בבקשה ב�חד "
+"מהב�י�: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "�ין מזהי קובץ (GUIDs) תו�מי�"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3570,9 +2952,17 @@ msgstr "ל� הועלה קובץ"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "קובץ ההרחבה הזה (%s) �ינו מורשה עבור הצלמית. השתמש בבקשה ב�חד מהב�י�: %s"
+msgstr ""
+"קובץ ההרחבה הזה (%s) �ינו מורשה עבור הצלמית. השתמש בבקשה ב�חד מהב�י�: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "גירסה זהה (%s) כבר קיימת עבור התוספת והפלטפורמה ה�לה."
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "�ין נוכחות install.rdf."
 
@@ -3580,7 +2970,7 @@ msgstr "�ין נוכחות install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "השגי�ות הב�ות נמצ�ו ב- install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "בחר בבקשה סוג תוספת חוקי."
 
@@ -3607,7 +2997,9 @@ msgstr "%s �ינה גירסה חוקית עבור %s: גירס�ות מינימ
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "גירסת התוספת הזו �ינה חוקית: ר�ה בבקשה <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">מפרט</a>"
+msgstr ""
+"גירסת התוספת הזו �ינה חוקית: ר�ה בבקשה <a href=\"http://developer.mozilla."
+"org/en/docs/Toolkit_version_format\">מפרט</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
@@ -3646,6 +3038,18 @@ msgstr "ל� נמצ�ה זהות עבור תוספת זו ב-install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "ל� נבחרה פלטפורמה"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "�תה צריך לספק �ת הפרטי� הנדרשי� על מנת להגיש."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "�תה ל� יכול להגיש תוספת קד�-שחרור."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "�תה יכול להגיש רק תוספות שכרגע ב�רגז החול."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "בחר בבקשה לפחות קטגוריה �חת."
@@ -3659,108 +3063,316 @@ msgstr "חייב להיות לפחות מחבר �חד לתוספת הז�ת."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "קובץ ההרחבה הזה (%s) �ינו מורשה לתצוגה מקדימה. בבקשה השתמש ב�חד מהב�י�:  %s"
+msgstr ""
+"קובץ ההרחבה הזה (%s) �ינו מורשה לתצוגה מקדימה. בבקשה השתמש ב�חד מהב�י�:  %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "התרחשה שגי�ה בניסיון לשמור �ת הנתוני� שלך."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "�ין לך רשות לעדכן �ת התוספת הז�ת."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "תוספות ל� יכולות להשתמש במפתח עדכון. הסר �ותו בבקשה מקובץ  install.rdf ונסה שוב."
+msgstr ""
+"תוספות ל� יכולות להשתמש במפתח עדכון. הסר �ותו בבקשה מקובץ  install.rdf ונסה "
+"שוב."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "תוספת ל� יכולה להשתמש בכתובת עדכון חיצונית. בבקשה הסר ז�ת מ-install.rdf ונסה שוב."
+msgstr ""
+"תוספת ל� יכולה להשתמש בכתובת עדכון חיצונית. בבקשה הסר ז�ת מ-install.rdf ונסה "
+"שוב."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "העלה קובץ בבקשה."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "הוסף קובץ פלטפורמה �חר"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "הוסף מחבר"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "הסר"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "קטגוריות עבור הסוג של התוספת החדשה תהיינה זמינות בצעד הב�."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "�ין קטגוריות זמינות עבור סוג התוספת הזה."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "נ� הכנס תי�ור של התוספת שלך."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "הכנס ש� עבור התוספת שלך."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "בחר בבקשה �ת סוג התוספת ש�תה שולח."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "הכנס סיכו� עבור התוספת שלך."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "קובץ תוספת"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "קובץ תוספת 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "קובץ תוספת 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "סוג תוספת"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "הרשה למשתמשי� לצפות בקוד הקבצי� במצב מקוון"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "כתובת דו�\"ל של המחבר"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "מחברי�"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "קטגוריות"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "שפת ברירת מחדל"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "תי�ור"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "הסכ� רישיון למשתמש קצה (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "תוספת זו דורשת תוכנה חיצונית"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "קבצי�"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "דף הבית"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "צלמית קובץ"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "ש�"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "פלטפורמות נתמכות"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "זה קד�-שחרור"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "מדיניות פרטיות"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "ז�ת תוספת ל�תר מסוי�"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "תקציר"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "דו�\"ל לתמיכה"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "כתובת �ינטרנט לתמיכה"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "יישומי מטרה"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "גירסה"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "הערות גירסה"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "�ין"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "הערות לסוקר"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "משו� שהתוספת שלך �ומתה, בחר בבקשה להיכן הגירסה הז�ת תלך:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "ציבורי"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "�רגז החול"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "הסכ� מפתח"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "שלב 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "העלה קובץ"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "שלב 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "פרטי תוספת"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "שלב 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "פרטי גירסה"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "שלב 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "הת�מות שפה"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "שלב 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "הצלחה"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "התוספות שלי"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "שדות מות�מי שפה"
@@ -3769,15 +3381,18 @@ msgstr "שדות מות�מי שפה"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "כמה מהשדות בעמוד הזה מות�מי� להופיע בשפת ה�� של משתמש הקצה. בחר שפה מלמטה כדי לערוך �ת פרטי התוספת שלך ב�ותה שפה. �� התרגו� לשפה הז�ת �ינו זמין, תוחזר לבחור �ת שפת ברירת המחדל (%s)."
+msgstr ""
+"כמה מהשדות בעמוד הזה מות�מי� להופיע בשפת ה�� של משתמש הקצה. בחר שפה מלמטה "
+"כדי לערוך �ת פרטי התוספת שלך ב�ותה שפה. �� התרגו� לשפה הז�ת �ינו זמין, תוחזר "
+"לבחור �ת שפת ברירת המחדל (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "לוח בקרה למנהל"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "לוח בקרה לעורך"
 
@@ -3786,77 +3401,109 @@ msgid "devcp_myaddons_link"
 msgstr "התוספות שלי"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "חזרה לר�שי"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "לוח סטיסטיקות"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "שלח תוספת"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "כלי מפתח"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "This add-on ID (%1$s) already exists in the database. If this is your add-on, you can <a href=\"%2$s\">upload a new version</a>."
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 #, fuzzy
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "חזרה לפרטי תוספת"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "הגשת %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "סוג תוספת ש�ובחן �וטומטית: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>One or more of your changes couldn't be saved.</span><br />Please look for the errors below. The rest of your changes were successfully saved."
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Your changes have been saved.</span><br />Please note that some changes may take several hours to appear in all areas of the website."
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "תצוגה זו �ינה ברירת המחדל מפני שתצוגה מקדימה �חרת נבחרה �וטומטית להיות ברירת המחדל."
+msgstr ""
+"תצוגה זו �ינה ברירת המחדל מפני שתצוגה מקדימה �חרת נבחרה �וטומטית להיות ברירת "
+"המחדל."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"שפת ברירת המחדל של התוספת הזו (%1$s [%2$s])שונה מהשפה הנוכחית שבחרת  (%3$s [%"
+"4$s]). השדות למטה יושלמו ב- %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "הפיכת התצוגה הזו לברירת המחדל  תסיר �ת מצב ברירת המחדל מתצוגת ברירת המחדל הנוכחית."
+msgstr ""
+"הפיכת התצוגה הזו לברירת המחדל  תסיר �ת מצב ברירת המחדל מתצוגת ברירת המחדל "
+"הנוכחית."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3885,64 +3532,72 @@ msgstr "עריכת תצוגה מקדימה"
 msgid "devcp_preview_updated_successfully"
 msgstr "תצוגה מקדימה עודכנה בהצלחה."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Select an image to upload below. Images larger than the maximum size of 700 pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Click the Update Previews button below to save this image. (<a %s>Cancel?</a>)"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "This preview will be deleted when Update Previews is clicked below. (<a %s>Cancel?</a>)"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "השתמש בטופס הב� כדי להעלות תצלומי מסך (בתבנית PNG, JPG, �ו GIF) של התוספת שלך. תמונות שגדולות יותר מרוחב של 700 פיקסלי�  ומגובה שך 525 פיקסלי� יוקטנו �וטומטית."
+msgstr ""
+"השתמש בטופס הב� כדי להעלות תצלומי מסך (בתבנית PNG, JPG, �ו GIF) של התוספת "
+"שלך. תמונות שגדולות יותר מרוחב של 700 פיקסלי�  ומגובה שך 525 פיקסלי� יוקטנו "
+"�וטומטית."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "הוספת תצוגה מקדימה"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -3951,7 +3606,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "ערוך תצוגה מקדימה"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -3960,35 +3615,37 @@ msgstr "Default Preview"
 msgid "devcp_previews_label_file"
 msgstr "קובץ תצוגה מקדימה"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "קבע �ת זה כברירת מחדל לתמונת תצוגה מקדימה."
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "The preview screenshots for your add-on are shown below. You can make changes to captions or images below. The Default Preview is the preview that is displayed next to your add-on in search and browse listings."
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -4006,36 +3663,52 @@ msgstr "ערוך תצוגה מקדימה"
 msgid "devcp_previews_submit_upload"
 msgstr "העלה תצוגה מקדימה"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "שגוי?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "ה�� �תה בטוח שברצונך למחוק קובץ זה?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "בבקשה קר� ו�שר �ת הסכ� המפתח הב� לפני שתמשיך."
 
 #: views/elements/developers/rolecheck.thtml:42
 #, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>You do not have sufficient privileges to make changes on this page.</span><br />Contact the Add-on Owner if you need to make changes."
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
-msgstr "Please note that some changes may take several hours to appear in all areas of the website."
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
 #, fuzzy
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "דלג על סיקור התוספת הנוכחית"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4060,7 +3733,12 @@ msgstr "<em>%s</em> הורדות לשבוע"
 #: views/developers/addon_status_confirm.thtml:59
 #, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "Marking this add-on active will cause it to show up in public areas appropriate for its status, including search and browse listings. It will be downloadable from the website and could be returned in client update checks, depending on its status. You will be able to return here and disable it again at your convenience."
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
 #, fuzzy
@@ -4075,7 +3753,11 @@ msgstr "Are you sure?"
 #: views/developers/addon_status_confirm.thtml:55
 #, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "Marking this add-on inactive will prevent it from showing up in any public areas, including search and browse listings. It will not be downloadable from the website and will not be returned in client update checks. You will be able to return here and re-enable it at your convenience."
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
 #, fuzzy
@@ -4090,7 +3772,9 @@ msgstr "No, cancel"
 #: views/developers/addon_status_confirm.thtml:67
 #, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "Making this add-on public will make it available for anyone to download and will begin offering updates to existing users."
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
 #, fuzzy
@@ -4100,7 +3784,11 @@ msgstr "Are you sure you wish to make this add-on public?"
 #: views/developers/addon_status_confirm.thtml:63
 #, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Moving this add-on back to the sandbox will require users to login before downloading and updates will no longer be offered to existing users. Because your add-on is currently public, you will be able to return here at any time to make it public again."
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
 #, fuzzy
@@ -4115,24 +3803,70 @@ msgstr "Yes, I'm Sure"
 #: views/developers/addon_status_nominate.thtml:46
 #, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>A nomination message is required.</span><br />Please fill in the text box with the requested information and try again."
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
 #, fuzzy
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "שליחת תוספות כרגע מנוטרלת. בדוק בבקשה מ�וחר יותר."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "�ני מסכי�"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "�ני מסרב"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "תוספת זו נוטרלה בידי מנהל."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "מנוטרל"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "מ�ומת"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "גירסה �חרונה:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "�ין לך �ף תוספת. לחץ %s כדי לשלוח �חת."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "כ�ן"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "בבקשה ווד� ש%s לערכת הנוש� שלך."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "העלת תצוגה מקדימה"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4140,177 +3874,196 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "If a user browses the site and a translation isn't available in their own language, it will fall back to your add-on's Default Locale, specified in the Edit Add-on Properties area. If you don't have any translations, just enter what you can into your Default Locale, which should be a language you speak."
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "This is a <i>Translation Box</i>. It allows you to localize a specific field into any other languages for which you might have a translation. You can add, edit, and remove translations using the locale tabs."
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "The add-on GUID used in this file (%1$s) does not match the existing GUID for this add-on (%2$s)."
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "The version number uploaded (%1$s) already exists for this add-on. If you are trying to add another file to this version, <a href=\"%2$s\">click here</a>."
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "The uploaded version number (%1$s) does not match the existing version number (%2$s)."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
 #, fuzzy
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>Your add-on listing has been successfully created. The basic information obtained from your uploaded file has been stored, but there's a lot more to your listing that can be customized.</p><p>Your add-on is currently marked as <strong>Incomplete</strong>. In order to complete your add-on, you'll need to make sure it has an accurate name, summary, and description, as well as at least one selected category. You can edit your add-on's information using the link below and check the status of your add-on at any time on the <a %s>status page</a>."
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "Your new file has been added to version %1$s and is currently marked as %2$s."
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4321,12 +4074,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4334,76 +4087,94 @@ msgstr "Upload Your File"
 #: views/developers/uploader.thtml:67
 #, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. Hosting your add-on on Mozilla Add-ons is the easiest way to handle distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on will have a public display page with information you provide, such as a brief summary of the add-on's functionality, an optional longer description, and a showcase of preview screenshots of your add-on.</li><li>Your add-on will appear in search and browse listings across the site, and even in the Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your downloads and providing automatic updates to users when you upload a new version.</li><li>You'll have access to a statistics dashboard with detailed information about your user base.</li></ul><p>Add-ons hosted on the site must be reviewed by a Mozilla Add-ons Editor before they will have all of the features listed above. If you're ready to start the process and have your add-on package ready for upload, just click on Get Started below!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "The new file will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "The new version will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "View your new file in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "View your new version in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Upload your add-on file using the form below. If you have multiple, platform-specific files to upload, choose a single file and then upload the others using the Versions and Files Manager."
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4422,26 +4193,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "ר�ה %s  להתייחסות."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "דף זה"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr "Either the XML is invalid or required fields are missing.  Please <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "ערוך גירסה"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "גירסה עודכנה בהצלחה."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4510,80 +4287,79 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Adjusting application information here will allow users to install your add-on even if the install.rdf in the package indicates that the add-on is incompatible. <a %s>List of supported applications</a>"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "Are you <b>sure</b> you wish to remove compatibility with this application?"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4593,77 +4369,80 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr "Please select the appropriate license for your add-on. This license specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Information about changes in this release, new features, known bugs, and other useful information specific to this release/version. This information will also be available to users updating the add-on in the Firefox 3 Add-ons Manager interface."
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>You have unsaved changes.</strong> Compatibility will not be deleted until you click Update Version below."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>You have unsaved changes.</strong> Files will not be deleted until you click Update Version below."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -4687,7 +4466,9 @@ msgstr "Version %s deleted successfully."
 #: views/developers/versions.thtml:73
 #, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "This version has no files associated with it and can be removed. Would you like to remove this version?"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
 #, fuzzy
@@ -4704,7 +4485,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "תוספת זו מנוטרלת"
 
@@ -4755,8 +4536,7 @@ msgstr "סינון"
 msgid "editorcp_logs_filter_by"
 msgstr "סינון לפי סוג/פעולה"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "רישו� ה�ירועי�"
 
@@ -4818,7 +4598,7 @@ msgstr "הצג ערכי� בין %s ל- %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "ל� נמצ�ו סקירות בפרק הזמן."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "רישו� סקירה"
 
@@ -4842,29 +4622,28 @@ msgstr "פעילות עורך �חרונה"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "סה\"כ סקירות"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "סקירת תוספת"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "נ� השל� �ת השדות הב�י�:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "בחר בבקשה לפחות קובץ �חד לסקירה."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "סקירות עצמיות �ינן מותרות."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "תוכנה חיצונית"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "הוסף מ�פיין"
 
@@ -4872,310 +4651,246 @@ msgstr "הוסף מ�פיין"
 msgid "editors_featured_add_feature_submit"
 msgstr "הוסף"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "הוספת המ�פיין נכשלה."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "הוספת המ�פיין הצליחה."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "עריכת המ�פיין נכשלה."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "עריכת המ�פיין הצליחה."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "�חד �ו כמה מהתרגומי� שגויי�."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "הסרת המ�פיין נכשלה."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "הסרת המ�פיין הצליחה."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "�יפיון תוספות"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "לך"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "הסרת מ�פיין"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "תור מסנן"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "קישורי� מועילי�"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "מדריך העורכי�"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "מדיניות תוספת"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "מסנני� �לו יש�רו במקומ� בהפעלה זו �ו עד שימחקו"
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "כרגע �ין %s תוספות לסקירה."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "יו�"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "שעה"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "דקה"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "לוח בקרה לעורכי�"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s בלבד"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "שחרור מקדי�"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "ת�ימות ל־%s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "מחק"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "סנן"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "כל תורות הסקירות כרגע מנוטרלי�. בדוק בבקשה מ�וחר יותר."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "פעולת סיקור"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "דחוף לציבורי"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "דרושה סקירת-על"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "שמור ב�רגז החול"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "הערות סקירה"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
-msgstr "Use this form to request more information from the author. They will receive an email and be able to answer here. You will be notified by email when they reply."
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "זה יסמן �ת התוספת ו�ת הגירסה והקבצי� ה�חרוני� שלה כציבוריי�. גירס�ות עתידיות יופנו ל�רגז החול עד שיסוקרו בידי עורך."
+msgstr ""
+"זה יסמן �ת התוספת ו�ת הגירסה והקבצי� ה�חרוני� שלה כציבוריי�. גירס�ות עתידיות "
+"יופנו ל�רגז החול עד שיסוקרו בידי עורך."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "זה ישמור �ת התוספת ב�רגז החול."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "זה י�שר לגירסת �רגז החול של התוספת הציבורית להופיע בצד הציבורי."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "זה יגרו� שגירסת �רגז החול של התוספת הציבורית תש�ר ב�רגז החול."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "�� יש לך ד�גות �ודות ה�בטחה וזכויות היוצרי� של התוספת הזו �ו ד�גות �חרות שמנהל צריך לבדוק, הכנס �ת ההערות ב�יזור מתחת. ההערות תשלחנה למנהלי�, ל� למחבר."
+msgstr ""
+"�� יש לך ד�גות �ודות ה�בטחה וזכויות היוצרי� של התוספת הזו �ו ד�גות �חרות "
+"שמנהל צריך לבדוק, הכנס �ת ההערות ב�יזור מתחת. ההערות תשלחנה למנהלי�, ל� "
+"למחבר."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "השווה ע� הגירסה הציבורית"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "הצג תכני�"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "מחברי�:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "קטגוריות:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "ת�ימות:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "תי�ור"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "הערות המפתח"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "הסכ� משתמש (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "קבצי�:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "היסטוריית פריט"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "הודעת הגשה"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "תצוגות מקדימות"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "מדיניות פרטיות"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "סקירת %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "הערות לסוקר"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "סיכו�"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "הערות גירסה"
 
@@ -5205,7 +4920,7 @@ msgstr "הגשה �ושרה/ציבורי"
 msgid "editors_review_history_nominated_denied"
 msgstr "הגשה נדחתה/�רגז החול"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "ל� נמצ�ו ערכי סקירה קודמי�."
 
@@ -5233,93 +4948,83 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "יישומי�:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "�ו בחר תגובה מוכנה:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "תגובות:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "מערכות הפעלה:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "למעלה"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr "Notice: Only review more than one file if you have tested EVERY file you select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "ל� נמצ�ו סקירות."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "תור סקירה"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "בצע פעולה"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "פעולה"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "תגובות"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "ת�ריך"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "סוקר"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "גירסה/קובץ"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
-msgstr "Notify me the next time this add-on is updated. (Subsequent updates will not generate an email)"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "הסקירה עובדה בהצלחה."
 
@@ -5345,7 +5050,7 @@ msgstr "פעולה"
 msgid "editors_reviews_in_reply_to"
 msgstr "בתגובה ל:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "הסקירות עובדו בהצלחה!"
 
@@ -5357,88 +5062,87 @@ msgstr "ל� קיימות סקירות לניהול."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "עבד סקירות"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "�תר מסוי�"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "חדש"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "עודכן"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "ישו� נבדק"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "מערכות הפעלה שנבדקו"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "מידע נוסף"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "תוספת"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "סוג"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "סוגי תוספות"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "גיל"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "יישומי�"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "הגבלה לשפות?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "פלטפורמות"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "סוגי הגשה"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ימי�"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s שעות"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s דקות"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "�ין גישה"
 
@@ -5446,42 +5150,34 @@ msgstr "�ין גישה"
 msgid "error_access_denied_message"
 msgstr "�ינך רש�י לצפות בדף זה."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "התוספת ל� נמצ�ה!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "תוספת זו �ינה ניתנת לצפייה כ�ן."
 
@@ -5489,118 +5185,94 @@ msgstr "תוספת זו �ינה ניתנת לצפייה כ�ן."
 msgid "error_addon_selfreview"
 msgstr "�תה ל� יכול לסקור תוספת שלך."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "�ין תוספות בקטגוריה!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "זוהי �ינה כתובת דו�\"ל חוקית."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "שדה זה ל� יכול להיות ריק."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "קובץ ל� נמצ�!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "שגי�ת קובץ: %s ל� קיי�."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "קיימות שגי�ות בטופס זה. בבקשה תקן �ותן ושלח שוב."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "קפ�צ'ה שגוייה, נסה שוב!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "כתובת זו הינה בתבנית שגויה. כתובות תקינות נר�ות בסגנון של http://example.com/my_page."
+msgstr ""
+"כתובת זו הינה בתבנית שגויה. כתובות תקינות נר�ות בסגנון של http://example.com/"
+"my_page."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "טיעון חסר: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "הערה"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "תצוגה מקדימה ל� נמצ�ה!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "�תה חייב לבחור דירוג."
 
@@ -5608,50 +5280,37 @@ msgstr "�תה חייב לבחור דירוג."
 msgid "error_user_already_confirmed"
 msgstr "משתמש זה כבר �ומת בעבר."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "קוד �ימות שגוי!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "הסיסמ�ות ל� תו�מות."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "כתובת דו�\"ל זו כבר נלקחה על־ידי משתמש �חר."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "פג הזמן לשינוי כתובת הדו�\"ל שלך. בבקשה שנה שוב �ת כתובת הדו�\"ל בפרופיל המשתמש שלך ולחץ על הקישור בהודעת ה�ימות מיד כש�תה מקבל �ותה."
-
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr "Users can only have one role at a time.  Please remove the user from any existing roles before continuing."
+msgstr ""
+"פג הזמן לשינוי כתובת הדו�\"ל שלך. בבקשה שנה שוב �ת כתובת הדו�\"ל בפרופיל "
+"המשתמש שלך ולחץ על הקישור בהודעת ה�ימות מיד כש�תה מקבל �ותה."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "כינוי זה כבר נלקח."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "משתמש ל� נמצ�!"
 
@@ -5659,44 +5318,39 @@ msgstr "משתמש ל� נמצ�!"
 msgid "error_user_unconfirmed"
 msgstr "נ� ל�מת �ת החשבון לפני ביצוע הפעולה."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "גירסה ל� נמצ�ה!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "הוכנסה סיסמה שגוייה!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "למד עוד"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "למד עוד על  %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "סקירות"
 msgstr[1] "סקירות"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "צפה בעוד מ"
 
@@ -5741,150 +5395,132 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "כל הזכויות שמורות."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "זכויות יוצרי�"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "קרדיטי�"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "מוזילה מספקת קישורי� ליישומי� �לו מתוך נימוס, ו�ינה מייצגת �ת �ת היישומי� �ו כל מידע בקשר �ליה�.  ש�לות, תלונות �ו טענות בנוגע ליישומי� יש להפנות למספק התוכנה המת�י�."
+msgstr ""
+"מוזילה מספקת קישורי� ליישומי� �לו מתוך נימוס, ו�ינה מייצגת �ת �ת היישומי� �ו "
+"כל מידע בקשר �ליה�.  ש�לות, תלונות �ו טענות בנוגע ליישומי� יש להפנות למספק "
+"התוכנה המת�י�."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "לך"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "הצהרה משפטית"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "שפות �חרות:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "הצהרת פרטיות"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "שמור"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "מילון"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "מילוני�"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "הרחבה"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "הרחבות"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "חבילת שפה (תוספות)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "חבילות שפה (תוספות)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "חבילות שפה (תוכנות)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "חבילות שפה (תוכנות)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "תוסף"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "תוספי�"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "מנוע חיפוש"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "מנועי חיפוש"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "ערכת נוש�"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "ערכות נוש�"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "חזור לדף הבית של תוספות %1$"
@@ -5893,90 +5529,37 @@ msgstr "חזור לדף הבית של תוספות %1$"
 msgid "header_main_firefox_header"
 msgstr "תוספות לפיירפוקס"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr "Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "תוספות"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "תוספות לסימונקי"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "תוספות לס�נבירד"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "תוספות לת'�נדבירד"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "�תר התוספות של Mozilla"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "כניסה"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "התנתקות"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "החשבון שלי"
 
@@ -5984,25 +5567,11 @@ msgstr "החשבון שלי"
 msgid "header_navlink_register"
 msgstr "הרשמה"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -6010,55 +5579,37 @@ msgstr "תצוגה מקדימה של %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">התחבר</a> כדי להתקין �ת התוספת הזו"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr "Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "הוסף  ל-%s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "הוסף �ת %1$sל%2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "הורד �ת %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "תוספת זו ל� זמינה."
 
-#: views/addons/dictionaries.thtml:65
-#, fuzzy
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
-msgstr "List of language packs and dictionaries."
+msgstr ""
 
 #: views/addons/dictionaries.thtml:47
 msgid "langtools_download_dictionary"
@@ -6068,9 +5619,8 @@ msgstr "הורדת מילון"
 msgid "langtools_download_langpack"
 msgstr "הורד חבילת שפה"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "מילוני� וחבילות שפה"
 
@@ -6082,82 +5632,36 @@ msgstr "התקן מילון"
 msgid "langtools_install_langpack"
 msgstr "התקן חבילת שפה"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "מילון"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "חבילת שפה"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "שפה"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "לחץ כ�ן כדי לשוב לעמוד הקדמי."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "ת�ריך"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "הורדות"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "ש� התוספת"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "דירוג"
@@ -6183,21 +5687,27 @@ msgstr "ס�נבירד"
 msgid "main_prettyname_thunderbird"
 msgstr "ת'�נדבירד"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "מילוני� וחבילות שפה"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "תוספי�"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "ערכות נוש�"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "מצ� תוספות ליישומי� �חרי�"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "�חרי�"
 
@@ -6206,35 +5716,14 @@ msgstr "�חרי�"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6271,36 +5760,43 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "מזהה GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "גירס�ות ישו� חוקיות"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "תוספות שנשלחות �ל �תר התוספות של Mozilla חייבות לכלול קובץ install.rdf ע� לפחות �חת מהתוכנות הב�ות נתמכות. רק הגירס�ות הרשומות בהמשך מותרות לתוכנות �לו."
+msgstr ""
+"תוספות שנשלחות �ל �תר התוספות של Mozilla חייבות לכלול קובץ install.rdf ע� "
+"לפחות �חת מהתוכנות הב�ות נתמכות. רק הגירס�ות הרשומות בהמשך מותרות לתוכנות "
+"�לו."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "�� התוכנה הנתמכת ל� דורשת קובץ install.rdf, �תה חייב עדיין לכלול �ותו ע� המ�פייני� הנדרשי� כפי שמצוין ב%s."
+msgstr ""
+"�� התוכנה הנתמכת ל� דורשת קובץ install.rdf, �תה חייב עדיין לכלול �ותו ע� "
+"המ�פייני� הנדרשי� כפי שמצוין ב%s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "כ�ן"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "גירס�ות"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "חזור לעמוד הקוד�"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "דף פרטי �רגז החול"
 
@@ -6308,13 +5804,21 @@ msgstr "דף פרטי �רגז החול"
 msgid "pagination_next_page"
 msgstr "הב�"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "עמוד %1$s מתוך %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "קוד�"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "הכנס בבקשה �ת <strong>שתי המילי�</strong> שמופיעות למטה, <strong>וביניהן רווח</strong>."
+msgstr ""
+"הכנס בבקשה �ת <strong>שתי המילי�</strong> שמופיעות למטה, <strong>וביניהן "
+"רווח</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -6330,24 +5834,28 @@ msgstr "Please type what you hear."
 #: views/elements/recaptcha.thtml:77
 #, fuzzy
 msgid "recaptcha_hardtohear_text"
-msgstr "If this is hard to understand, you can <a href=\"%1$s\">listen to something else</a> or <a href=\"%2$s\">switch back to text</a>."
+msgstr ""
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 #, fuzzy
 msgid "recaptcha_hardtoread_text"
-msgstr "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or <a href=\"%2$s\">listen to something</a> instead."
+msgstr ""
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "ה�� �תה �נושי?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "מה זה?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "סימון על שגי�ה בסקירה זו!"
 
@@ -6356,8 +5864,7 @@ msgstr "סימון על שגי�ה בסקירה זו!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6377,9 +5884,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "תודה; סקירה זו סומנה ל�ישור העורך."
 
@@ -6389,161 +5895,128 @@ msgstr "דווח על סקירה זו"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "ה�� הסקירה הזו ל� הולמת, ל� מדויקת �ו זבל? ליץ כ�ן כדי לסמן �ותה לסקירת עורך."
+msgstr ""
+"ה�� הסקירה הזו ל� הולמת, ל� מדויקת �ו זבל? ליץ כ�ן כדי לסמן �ותה לסקירת עורך."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>הנה כמה טיפי�:</p><ul><li>כתוב כ�ילו �תה מספר לחברך על הניסיון שלך ע� התוספת.  תן פרטי� מדויקי�, כגון �לו תכונות �הבת ו/�ו שנ�ת, �יך נוח להשתמש בה, וכל חיסרון שיש בה.  המנע משפה כללית למשל קרי�ות בסגנון \"גדול\" �ו \"גרוע\" בלי לתת סיבות לכך</li><li>�ל תפרס� דיווח על ב�גי� בסקירות. �נחנו ל� מ�פשרי� למפתחי התוספות לצפות בכתובת הדו�\"ל שלך וה� �ולי יצטרכו ליצור �יתך קשר כדי לפתור �ת הבעיה שלך. בקר ב<a href=\"%1$s\">�יזור התמיכה</a> כדי למצו� היכן תוכל לקבל .</li><li>שמור בבקשה על נקיון הסקירות, המנע משימוש בשפה ש�ינה הולמת ו�ל תפרס� מידע �ישי.</li></ul><p>קר� �ת <a href=\"%2$s\">קוי� מנחי� לסקירה</a> בשביל עוד פרטי� על סקירות של משתמשי�.</p>"
+msgstr ""
+"<p>הנה כמה טיפי�:</p><ul><li>כתוב כ�ילו �תה מספר לחברך על הניסיון שלך ע� "
+"התוספת.  תן פרטי� מדויקי�, כגון �לו תכונות �הבת ו/�ו שנ�ת, �יך נוח להשתמש "
+"בה, וכל חיסרון שיש בה.  המנע משפה כללית למשל קרי�ות בסגנון \"גדול\" �ו \"גרוע"
+"\" בלי לתת סיבות לכך</li><li>�ל תפרס� דיווח על ב�גי� בסקירות. �נחנו ל� "
+"מ�פשרי� למפתחי התוספות לצפות בכתובת הדו�\"ל שלך וה� �ולי יצטרכו ליצור �יתך "
+"קשר כדי לפתור �ת הבעיה שלך. בקר ב<a href=\"%1$s\">�יזור התמיכה</a> כדי למצו� "
+"היכן תוכל לקבל .</li><li>שמור בבקשה על נקיון הסקירות, המנע משימוש בשפה ש�ינה "
+"הולמת ו�ל תפרס� מידע �ישי.</li></ul><p>קר� �ת <a href=\"%2$s\">קוי� מנחי� "
+"לסקירה</a> בשביל עוד פרטי� על סקירות של משתמשי�.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "סקירות עבור %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "תוספות מככבות"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "תוספות חדשות ביותר"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "תוספות שעודכנו"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "החיפוש �ינו זמין כרגע. בבקשה נסה שוב מ�וחר יותר."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "כל התוספות"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "חיפוש תוספות"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "חיפוש תוספות"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "לחץ כדי להכנס למ�פייני החיפוש"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "בתוך"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "כל מנועי החיפוש"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "עיין במנועי חיפוש"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "תוספת %s  מת�ימה"
+msgstr[1] "%s תוספות מת�ימות"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "ל� נמצ�ו תוצ�ות."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "חפש תוספות"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "הזנת תוצ�ות חיפוש"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "תוצ�ות חיפוש עבור %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "כלי מנהל"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "כלי מפתח"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "כלי עריכה"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "ברוך הב�"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "ברוך הב�, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "מילון"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "תוספות מ�ופינות"
 
@@ -6551,7 +6024,7 @@ msgstr "תוספות מ�ופינות"
 msgid "sidebar_pitch_looking_for"
 msgstr "�ני מחפש:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "התוספות החדשות ביותר"
 
@@ -6559,34 +6032,31 @@ msgstr "התוספות החדשות ביותר"
 msgid "sidebar_pitch_search"
 msgstr "תוסף חיפוש"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "הרשמה ל-"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "ערכת נוש�"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "תוספות שעודכנו"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "טר� דורג"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6606,35 +6076,31 @@ msgstr "החלף תוספת"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "חודש, יו�"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "חודש, יו�, שנה"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "יו� בשבוע, חודש, יו�"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s נוצר"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s שוחרר"
@@ -6647,186 +6113,185 @@ msgstr "סגור"
 msgid "statistics_help_link"
 msgstr "עזרה"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "�ו בחר תוספת �חרת"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "�ו בחר תוספת ע� סטיסטיקה ציבורית"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "בחר �חת מהתוספות שלך כדי לצפות בסטיסטיקות שלה"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "בחר תוספת כדי לצפות בסטיסטיקות שלה"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "בחר תוספת ע� סטיסטיקות ציבוריות"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "לוח סטיסטיקות"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "צפה בסטיסטיקות"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "�ין"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "הסר �ת התרשי� הזה"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s נמצ�ו בטווח"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "הוסף תרשי�"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "הוסף תרשי� �חר לגרף זה"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "הסתר מונה כללי"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "הצג מונה כללי"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "צפה במידע (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "הורד קובץ CSV ע� המידע הזה"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "הסתר �ת ה�ירועי� של %s "
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "הצג �ת ה�ירועי� של %s "
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "הצג �ת ת�ריכי השחרור של התוספות על התרשימי�"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "הסתר �ת �ירועי פיירפוקס"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "הצג �ת �רועי פיירפוקס"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "הצג �ת ת�ריכי השחרור של פיירפוקס על התרשימי�"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "צמצ� גרף"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "הרחב גרף"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "שנה גודל גרף"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "פעילות משתמשי� יומית"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "יישו�"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "חופשי"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "הורדות"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "מערכת הפעלה"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "מצב תוספת"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "סיכו�"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "גירסת תוספת"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "יישו�"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "מערכת הפעלה"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "מצב תוספת"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "ל� ידוע"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "גירסת תוספת"
 
@@ -6840,7 +6305,9 @@ msgstr "עדיין ×�ין לנו מידע על התוספת שלך. חזור ב×
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "הסטיסטיקות של התוספת כרגע בתהליך עדכון. המידע ה�חרון �ולי יהיה חלקי כשהתסריטי� שלנו עובדי� כדי לעדכן �ותו. בדוק שוב בעוד כמה דקות."
+msgstr ""
+"הסטיסטיקות של התוספת כרגע בתהליך עדכון. המידע ה�חרון �ולי יהיה חלקי "
+"כשהתסריטי� שלנו עובדי� כדי לעדכן �ותו. בדוק שוב בעוד כמה דקות."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
@@ -6857,7 +6324,7 @@ msgstr "ההגדרות שלך התעדכנו!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "לוח סטיסטיקות"
 
@@ -6885,103 +6352,108 @@ msgstr "התרחקות"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "התרחקות לחודש"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "סיכו� יומי של סטיסטיקות עבור %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "עידכוני RSS של סיכו� המידע"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "יו�, חודש, שנה"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "סטיסטיקות ל-%1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "כברירת מחדל, רק �תה ומוזילה יכולי� לגשת למידע שבלוח שלך. �תה יכול להפוך �ותו לציבורי כך שכל �חד יוכל לצפות במידע על התוספת שלך."
+msgstr ""
+"כברירת מחדל, רק �תה ומוזילה יכולי� לגשת למידע שבלוח שלך. �תה יכול להפוך �ותו "
+"לציבורי כך שכל �חד יוכל לצפות במידע על התוספת שלך."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "גישה ללוח"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "פרטי"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "רק �תה ומוזילה יכולי� לצפות בסטיסטיקות של התוספת הז�ת"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "ציבורי"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "כל �חד יכול לצפות בסטיסטיקות של התוספת הז�ת"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "שנה הגדרות"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "בבקשה התייחס למידע זה כחסוי."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "כרגע לוח זה הו� <b>פרטי</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "כרגע לוח זה הו� <b>ציבורי</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ננעל"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "חזור ללוח"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "שמור הגדרות"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "מ�פייני לוח סטיסטיקות עבור %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "שוחרר"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "ישו�"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "מ\"ה"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "סט"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "ל� ידוע"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "גיר'"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "מומצע הורדות יומי"
 
@@ -6989,46 +6461,37 @@ msgstr "מומצע הורדות יומי"
 msgid "statistics_summary_downloads_heading"
 msgstr "הורדות"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "מונה היו� ה�חרון"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "הורדות בשבוע ה�חרון"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "סה\"כ הורדות"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "מ�ז %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "�ין עדיין מידע"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "פעילות משתמשי� יומית ממוצעת"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "שנה מהסכו� הקוד�"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s ב%2$s"
@@ -7037,165 +6500,164 @@ msgstr "%1$s ב%2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "פעילות משתמשי� יומית"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "פעילות משתמשי� יומית"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "על %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "סטיסטיקות של %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "כל ערכות הנוש�"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "עיין בערכות הנוש�"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "שנה כתובת דו�\"ל"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "שינוי סיסמה"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "קוד ה�ימות נשלח שוב!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
-msgstr "Your user account %1$s has been successfully deleted. If you want to come back some time, you can re-register on the <a href=\"%2$s\">user registration page</a>."
+msgstr ""
+"Your user account %1$s has been successfully deleted. If you want to come "
+"back some time, you can re-register on the <a href=\"%2$s\">user "
+"registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
-msgstr "You cannot delete your account if you are listed as an <a href=\"%1$s\">author of any add-ons</a>. To delete your account, please have another person in your development group delete you from the list of authors for your add-ons. Afterwards you will be able to delete your account here."
+msgstr ""
+"You cannot delete your account if you are listed as an <a href=\"%1$s"
+"\">author of any add-ons</a>. To delete your account, please have another "
+"person in your development group delete you from the list of authors for "
+"your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
-msgstr "You need to check the box \"I understand...\" before we can delete your account."
+msgstr ""
+"You need to check the box \"I understand...\" before we can delete your "
+"account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
-msgstr "An unknown error occured deleting your account. Please contact %1$s with the issue and we will delete it for you. We apologize for the inconvenience."
+msgstr ""
+"An unknown error occured deleting your account. Please contact %1$s with the "
+"issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
-msgstr "By clicking \"delete\" your account is going to be <strong>permanently removed</strong>. That means:"
+msgstr ""
+"By clicking \"delete\" your account is going to be <strong>permanently "
+"removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
-msgstr "Your reviews and ratings will not be deleted, but they will no longer be associated with you."
+msgstr ""
+"Your reviews and ratings will not be deleted, but they will no longer be "
+"associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
-msgstr "If you have a specific problem we may help you with, please do not delete your account now, but contact us at %1$s and we will do our best to assist you in solving it."
+msgstr ""
+"If you have a specific problem we may help you with, please do not delete "
+"your account now, but contact us at %1$s and we will do our best to assist "
+"you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "הודעת דו�\"ל נשלחה �ל %1$s כדי ל�שר �ת כתובת הדו�\"ל החדשה שלך. כדי שהשינוי יכנס לתוקפו, עליך ללחוץ על הקישור שמופיע בהודעה. עד �ז, תוכל להתחבר ע� כתובת הדו�\"ל הנוכחית שלך."
+msgstr ""
+"הודעת דו�\"ל נשלחה �ל %1$s כדי ל�שר �ת כתובת הדו�\"ל החדשה שלך. כדי שהשינוי "
+"יכנס לתוקפו, עליך ללחוץ על הקישור שמופיע בהודעה. עד �ז, תוכל להתחבר ע� כתובת "
+"הדו�\"ל הנוכחית שלך."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7209,8 +6671,10 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "ברוך הב� ל�תר התוספות של %2$s.\n"
 "\n"
-"לפני שתוכל להשתמש בחשבון החדש שלך �תה חייב להפעיל �ותו - פעולה זו תבטיח כי כתובת הדו�\"ל שסיפקת נכונה ו�כן שייכת לך.\n"
-"כדי להפעיל �ת החשבון, לחץ על הקישור שבהמשך �ו בצע העתקה והדבקה שלו לתוך שורת הכתובת בדפדפן שלך:\n"
+"לפני שתוכל להשתמש בחשבון החדש שלך �תה חייב להפעיל �ותו - פעולה זו תבטיח כי "
+"כתובת הדו�\"ל שסיפקת נכונה ו�כן שייכת לך.\n"
+"כדי להפעיל �ת החשבון, לחץ על הקישור שבהמשך �ו בצע העתקה והדבקה שלו לתוך שורת "
+"הכתובת בדפדפן שלך:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -7220,16 +6684,20 @@ msgstr ""
 "-- צוות �תר התוספות של %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "התבקשת לשנות כתובת דו�\"ל עבור התוספת %2$s .\n"
 "\n"
-"על מנת ל�שר �ת הכתובת החדשה, לחץ בבקשה על הקישור למטה �ו העתק �ותו בשלמותו והדבק לתוך שורת הכתובת של הדפדפן:\n"
+"על מנת ל�שר �ת הכתובת החדשה, לחץ בבקשה על הקישור למטה �ו העתק �ותו בשלמותו "
+"והדבק לתוך שורת הכתובת של הדפדפן:\n"
 "\n"
 "%1$s\n"
 "\n"
-"יש לך 48 שעות ל�שר �ת הכתובת החדשה. �� �ינך רוצה לשנות �ת הכתובת, �תה יכול להתעל� מהודעה זו.\n"
+"יש לך 48 שעות ל�שר �ת הכתובת החדשה. �� �ינך רוצה לשנות �ת הכתובת, �תה יכול "
+"להתעל� מהודעה זו.\n"
 "\n"
 "תודה!\n"
 "-- %2$s צוות התוספת"
@@ -7247,7 +6715,8 @@ msgid "user_email_pwreset"
 msgstr ""
 "�יפוס סיסמה ל�תר Mozilla Add-ons\n"
 "\n"
-"התקבלה בקשה ל�יפוס הסיסמה של חשבון זה ב�תר addons.mozilla.org. כדי לשנות �ת הסיסמה בבקשה לחץ על הקישור המצורף, �ו הדבק �ותו לתוך שורת הכתובת בדפדפן:\n"
+"התקבלה בקשה ל�יפוס הסיסמה של חשבון זה ב�תר addons.mozilla.org. כדי לשנות �ת "
+"הסיסמה בבקשה לחץ על הקישור המצורף, �ו הדבק �ותו לתוך שורת הכתובת בדפדפן:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -7256,120 +6725,89 @@ msgstr ""
 "בתודה,\n"
 "-- צוות ה�תר Mozilla Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "�פס �ת הסיסמה שלך ב�תר התוספות"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "שגי�ה!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "�שר בבקשה �ת שינו כתובת הדו�\"ל שלך בתוספת %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "בוצע בהצלחה!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr "כתובת הדו�\"ל שלך שונתה בהצלחה. מעכשיו, השתמש ב- %1$s כדי להתחבר."
 
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr "Introduce yourself to the community, if you like! This text will appear publicly on your user info page. Line breaks will be preserved, but no HTML is allowed."
-
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "ווד� סיסמה"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "עריכת פרופיל משתמש עבור %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "כתובת דו�\"ל"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "ש� פרטי"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "הסתר כתובת דו�ר �לקטרוני"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "כתובת �תר"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "ש� משפחה"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "התחברות משתמש"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "סיסמה חדשה"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "כינוי"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "סיסמה ישנה"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "סיסמה"
 
@@ -7377,65 +6815,69 @@ msgstr "סיסמה"
 msgid "user_form_registration"
 msgstr "רישו� משתמש חדש"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "זכור �ותי על מחשב זה"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "הצג �ת �רגז החול?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "שמירה"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "התחברות"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "הרשמה"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "חבר ב�תר התוספות של %s  מ�ז"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "צור חשבון משתמש חדש"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
-msgstr "From time to time, Mozilla may send you email about upcoming releases and add-on events. Please select the topics you are interested in below:"
+msgstr ""
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla reserves the right to contact you individually about specific concerns with your hosted add-ons."
+msgstr ""
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "�ירעו שגי�ות בשינויי� שביצעת. בבקשה תקן �ותן ושלח שוב."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "הפרופיל עודכן."
 
@@ -7448,15 +6890,15 @@ msgstr "�יפוס סיסמה עבור %s"
 msgid "user_pwreset_header"
 msgstr "�יפוס סיסמה"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "שכחת �ת סיסמתך?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "קישור ל�יפוס הסיסמה נשלח �ל כתובת הדו�ר ה�לקטרוני שלך."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "הסיסמה �ופסה בהצלחה."
 
@@ -7468,7 +6910,7 @@ msgstr "החלף סיסמה"
 msgid "user_pwreset_submit_sendlink"
 msgstr "שלח קישור �יפוס סיסמה"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s תוספות"
@@ -7477,64 +6919,52 @@ msgstr "%s תוספות"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "קישור להפעלת החשבון שלך נשלח בדו�\"ל לכתובת %1$s. הינך נדרש ללחוץ על קישור זה לפני שתוכל להתחבר ל�תר התוספות של %2$s."
+msgstr ""
+"קישור להפעלת החשבון שלך נשלח בדו�\"ל לכתובת %1$s. הינך נדרש ללחוץ על קישור "
+"זה לפני שתוכל להתחבר ל�תר התוספות של %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "הודעת דו�ר �לקטרוני נשלחה לכתובת %1$s לצורך �ימות חשבונך. לפני שתוכל להיכנס, הינך נדרש להפעיל �ת החשבון שלך ב�מצעות לחיצה על הקישור שבהודעת דו�\"ל זו."
+msgstr ""
+"הודעת דו�ר �לקטרוני נשלחה לכתובת %1$s לצורך �ימות חשבונך. לפני שתוכל להיכנס, "
+"הינך נדרש להפעיל �ת החשבון שלך ב�מצעות לחיצה על הקישור שבהודעת דו�\"ל זו."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "נשלח שוב �ת הודעת ה�ימות"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "ברכות! החשבון שלך נוצר בהצלחה."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr "<p>Registration on AMO is <strong>not required</strong> if you simply want to download and install public add-ons.</p><p>You only need to register if:</p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon successful registration, you will be sent a confirmation email to the address you provided. Please follow the instructions there to confirm your account.</p><p>If you like, you can read our <a href='%1$s' title='Legal Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "�� ל� קיבלת �ת הודעת ה�ימות בדו�\"ל, ווד� כי שירות הדו�\"ל שלך ל� סימן �ת ההודעה בתור \"דו�ר זבל\" �ו \"ספ��\". �� יש צורך, �תה יכול לבקש ש%1$s לכתובת שצויינה מעלה. "
+msgstr ""
+"�� ל� קיבלת �ת הודעת ה�ימות בדו�\"ל, ווד� כי שירות הדו�\"ל שלך ל� סימן �ת "
+"ההודעה בתור \"דו�ר זבל\" �ו \"ספ��\". �� יש צורך, �תה יכול לבקש ש%1$s לכתובת "
+"שצויינה מעלה. "
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "תודה שנרשמת וברוך הב� �ל %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -7543,69 +6973,52 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "�ומת בהצלחה!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "עריכת חשבון משתמש"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "תוספות מ�ת %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "ש�"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "פרופיל משתמש"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "כתובת דו�\"ל"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "דף בית"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "כינוי"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "פרטי משתמש עבור %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "כניסת משתמש"
 
@@ -7614,510 +7027,28 @@ msgstr "כניסת משתמש"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "התוספת שחיפשת נמצ� כרגע ב�רגז החול. �� קיי� ברשותך חשבון ב�תר התוספות של Mozilla, בבקשה היכנס לחשבון, �ו <a href=\"%1$s\">למד �ודות �ודות �רגז החול</a>."
+msgstr ""
+"התוספת שחיפשת נמצ� כרגע ב�רגז החול. �� קיי� ברשותך חשבון ב�תר התוספות של "
+"Mozilla, בבקשה היכנס לחשבון, �ו <a href=\"%1$s\">למד �ודות �ודות �רגז החול</"
+"a>."
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "הדף שחיפשת נמצ� כרגע ב�רגז החול. �� קיי� ברשותך חשבון ב�תר התוספות של Mozilla, בבקשה היכנס לחשבון, �ו <a href=\"%1$s\">למד �ודות �ודות �רגז החול</a>."
+msgstr ""
+"הדף שחיפשת נמצ� כרגע ב�רגז החול. �� קיי� ברשותך חשבון ב�תר התוספות של "
+"Mozilla, בבקשה היכנס לחשבון, �ו <a href=\"%1$s\">למד �ודות �ודות �רגז החול</"
+"a>."
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "�יפוס סיסמת משתמש"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "הרשמת משתמש חדש"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "הגירסה ה�חרונה תו�מת ל-"
-#~ msgid "addons_display_version_history"
-#~ msgstr "היסטורית גירס�ות מל�ה"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "החדש ביותר:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "הפופולריי� ביותר:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "ההמלצה שלנו:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "עודכנו ל�חרונה:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "צפה בהכל"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "הר�ה �ת כל התוספות המומלצות"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "מדורגות גבוה ר�שונות"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "עודכנו ל�חרונה ר�שונות"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "הפופולריות ביותר ר�שונות"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "גירסה זו של התוספת שלך �ינה מוגדרת כתו�מת ל־פיירפוקס %1$s. מוזילה מצפה "
-#~ "שהגירסה הב�ה של פיירפוקס תשוחרר בקרוב, לכן בדוק בבקשה �ת התוספת שלך על "
-#~ "הגירסה החדשה ועדכן �ת מידע הת�ימות שלה. תוכל לקרו� עוד בנוש� <a href=\"%2"
-#~ "$s\">כ�ן</a>.  רק רגע של תשומת לב ותוכל להמשיך ולשלוח �ת גירס�ות �ל "
-#~ "addons.mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "תוספת נוטרלה בהצלחה"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "עריכת תוספת"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "תוספת �ופשרה בהצלחה"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "תי�ור התוספת"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "הסכ� משתמש (EULA)"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "דף הבית של התוספת"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "ש� התוספת"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "מדיניות פרטיות "
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "סיכו� תוספת"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "דו�\"ל לתמיכה"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "כתובת �ינטרנט לתמיכה"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "הערות גירסה"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "הגשת תוספת"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "תוספת הוגשה בהצלחה!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "בקר בעמוד של %1$s כדי לערוך שינויי� בהגשה שלך, �ו %2$s כדי לחזור ללוח "
-#~ "בקרה למפתח ."
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "לחץ כ�ן"
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "עריכת תוספת"
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ " הגירסה הז�ת מוקמה ב�רגז החול  והי� מחכה לסקירה של בוחני �רגז החול ושל "
-#~ "עורך התוספות של מוזילה. �תה תקבל הודעה בדו�\"ל כשהפעולה תבוצע."
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "�תה יכול לקרו� עוד �ודות מערכת הסקירה של �רגז החול %s."
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "כ�ן"
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "הגירסה הז�ת מוקמה ב�רגז החול לשימוש משתמשי� מנוסי�. כדי שהי� תוצג ב�תר "
-#~ "הציבורי �תה צריך %s �ת התוספת שלך ולעבור �ת תהליך הסקירה."
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "הגש"
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "שליחת התוספת שלך הסתיימה בהצלחה."
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr "משו� שהתוספת שלך �מינה, הגירסה הז�ת �וטומטית מ�ושרת ל�זור הציבורי."
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "שלח תוספת"
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "תוספת עודכנה בהצלחה"
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "�תה �ולי תרצה %s להגדיל �ת ההתעניינות בתוספת שלך."
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "העלה תצוגה מקדימה"
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "מחבר ל� נמצ� [%s]"
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "הסר"
-#~ msgid "devcp_button_cancel"
-#~ msgstr "בטל"
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "ה�� �תה בטוח שברצונך לבטל �ת השליחה?"
-#~ msgid "devcp_button_next"
-#~ msgstr "הב�"
-#~ msgid "devcp_change_addontype"
-#~ msgstr "שנה סוג תוספת:"
-#~ msgid "devcp_comments_updated"
-#~ msgstr "הערות המפתח עודכנו."
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "הוסף תצוגה מקדימה"
-#~ msgid "devcp_details_author"
-#~ msgstr "מחבר"
-#~ msgid "devcp_details_authors"
-#~ msgstr "מחברי�"
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "�ין"
-#~ msgid "devcp_details_categories"
-#~ msgstr "קטגוריות"
-#~ msgid "devcp_details_category"
-#~ msgstr "קטגוריה"
-#~ msgid "devcp_details_description"
-#~ msgstr "תי�ור"
-#~ msgid "devcp_details_disabled"
-#~ msgstr "מנוטרל"
-#~ msgid "devcp_details_guid"
-#~ msgstr "מזהה (GUID)"
-#~ msgid "devcp_details_header_details"
-#~ msgstr "פרטי�"
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "הערות המפתח"
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "תצוגות מקדימות"
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "גירס�ות"
-#~ msgid "devcp_details_homepage"
-#~ msgstr "דף בית"
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "�ין"
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "�ין כותרת"
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "ל� נמצ�ו תצוגות מקדימות"
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "עידכון"
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "דו�\"ל לתמיכה"
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "כתובת דו�\"ל לתמיכה ל� סופקה ע\"י המפתח."
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "כתובת �ינטרנט לתמיכה"
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "כתובת �ינטרנט לתמיכה ל� סופקה על ידי המפתח."
-#~ msgid "devcp_details_trusted"
-#~ msgstr "�ומת"
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "ל� נמצ�ו גירס�ות."
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "בטל וחזור �חורה"
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "כן, נטרל �ת זה"
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "ה�� �תה בטוח שברצונך לנטרל �ת התוספת הזו?"
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "ניטרול התוספת הזו יסתיר �ותה מהחיפושי� ומהרשימות. ל� יהיה ניתן להוריד "
-#~ "�ותה מה�תר והי� ל� תופיע במנהל העידכוני�. התוספת למעשה תמחק, למרות שתוכל "
-#~ "לחזור לכ�ן ול�פשר �ותה שוב מתי שתרצה."
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "נטרל �ת %s"
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "כן, �פשר �ותה"
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "ה�� �תה בטוח שברצונך ל�פשר �ת התוספת הז�ת?"
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "�יפשור התוספת הזו יגרו� לה לשוב להופיע בחיפושי� וברשימות. It will be "
-#~ "downloadable both from the website and from client update checks."
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "�פשר �ת %s"
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "הוסף מחבר"
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "כתובת דו�\"ל של המחבר"
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "הסר"
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "�ין קטגוריות זמינות עבור סוג התוספת הז�ת."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "מחברי�"
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "הוסף צלמית"
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "שנה צלמית"
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "הרשה למשתמשי� לצפות בקוד הקבצי� במצב מקוון"
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "קטגוריות"
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "שפת ברירת מחדל"
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "נקה �ת הצלמית הקיימת בלבד"
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "קובץ צלמית חדש"
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "צלמית"
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "מידע קצר נוסף (כמו ש� בשפה המקומית)"
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "עדכן"
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">ש� שפה "
-#~ "מקוצר</a>, למשל 'en-US'"
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "הקבצי� המסומני� ימחקו."
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "קבצי�"
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "מטרת היישומי�"
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "�ין קבצי�."
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "הערות לסוקר"
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "עדכן"
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "סיכומי� מוגבלי� ל-250 תוי�.\n"
-#~ "(�תה הכנסת %s)"
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "הש� עבור התוספת שלך כבר רשו� במ�גר הנתוני�. בבקשה היה בטוח ש: <br /"
-#~ "><li>המזהי� (GUID) שלך תו�מי�. הסיבה הנפוצה לשגי�ה הזו הי� מזהי� ש�ינ� "
-#~ "מתו�מי�.</li><li>�ין לך ערך כפול במ�גר הנתוני�. �� יש, עדכן �ת הערך  "
-#~ "entry �ו מחק �ותו ונסה שוב.</li>"
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "ת�ר בבקשה �ת השינויי� שנעשו בעידכון התוספת הזה."
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "�ין מזהי קובץ (GUIDs) תו�מי�"
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "גירסה זהה (%s) כבר קיימת עבור התוספת והפלטפורמה ה�לה."
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "�תה צריך לספק �ת הפרטי� הנדרשי� על מנת להגיש."
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "�תה ל� יכול להגיש תוספת קד�-שחרור."
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "�תה יכול להגיש רק תוספות שכרגע ב�רגז החול."
-#~ msgid "devcp_error_saving"
-#~ msgstr "התרחשה שגי�ה בניסיון לשמור �ת הנתוני� שלך."
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "�ין לך רשות לעדכן �ת התוספת הז�ת."
-#~ msgid "devcp_file_addanother"
-#~ msgstr "הוסף קובץ פלטפורמה �חר"
-#~ msgid "devcp_form_author_add"
-#~ msgstr "הוסף מחבר"
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "הסר"
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "קטגוריות עבור הסוג של התוספת החדשה תהיינה זמינות בצעד הב�."
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "�ין קטגוריות זמינות עבור סוג התוספת הזה."
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "נ� הכנס תי�ור של התוספת שלך."
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "הכנס ש� עבור התוספת שלך."
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "בחר בבקשה �ת סוג התוספת ש�תה שולח."
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "הכנס סיכו� עבור התוספת שלך."
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "קובץ תוספת"
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "קובץ תוספת 2"
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "קובץ תוספת 3"
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "סוג תוספת"
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "הרשה למשתמשי� לצפות בקוד הקבצי� במצב מקוון"
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "כתובת דו�\"ל של המחבר"
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "מחברי�"
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "קטגוריות"
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "שפת ברירת מחדל"
-#~ msgid "devcp_form_label_description"
-#~ msgstr "תי�ור"
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "הסכ� רישיון למשתמש קצה (EULA)"
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "תוספת זו דורשת תוכנה חיצונית"
-#~ msgid "devcp_form_label_files"
-#~ msgstr "קבצי�"
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "דף הבית"
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "צלמית קובץ"
-#~ msgid "devcp_form_label_name"
-#~ msgstr "ש�"
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "פלטפורמות נתמכות"
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "זה קד�-שחרור"
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "מדיניות פרטיות"
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "ז�ת תוספת ל�תר מסוי�"
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "תקציר"
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "דו�\"ל לתמיכה"
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "כתובת �ינטרנט לתמיכה"
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "יישומי מטרה"
-#~ msgid "devcp_form_label_version"
-#~ msgstr "גירסה"
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "הערות גירסה"
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "�ין"
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "הערות לסוקר"
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr "משו� שהתוספת שלך �ומתה, בחר בבקשה להיכן הגירסה הז�ת תלך:"
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "ציבורי"
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "�רגז החול"
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "הסכ� מפתח"
-#~ msgid "devcp_header_step1"
-#~ msgstr "שלב 1"
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "העלה קובץ"
-#~ msgid "devcp_header_step2"
-#~ msgstr "שלב 2"
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "פרטי תוספת"
-#~ msgid "devcp_header_step3"
-#~ msgstr "שלב 3"
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "פרטי גירסה"
-#~ msgid "devcp_header_step4"
-#~ msgstr "שלב 4"
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "הת�מות שפה"
-#~ msgid "devcp_header_step5"
-#~ msgstr "שלב 5"
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "הצלחה"
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "התוספות שלי"
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "חזרה לפרטי תוספת"
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "סוג תוספת ש�ובחן �וטומטית: %s."
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "שפת ברירת המחדל של התוספת הזו (%1$s [%2$s])שונה מהשפה הנוכחית שבחרת  (%3"
-#~ "$s [%4$s]). השדות למטה יושלמו ב- %1$s."
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "שגוי?"
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "ה�� �תה בטוח שברצונך למחוק קובץ זה?"
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "דלג על סיקור התוספת הנוכחית"
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "שליחת תוספות כרגע מנוטרלת. בדוק בבקשה מ�וחר יותר."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "�ני מסכי�"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "�ני מסרב"
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "תוספת זו נוטרלה בידי מנהל."
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "מנוטרל"
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "מ�ומת"
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "�ין לך �ף תוספת. לחץ %s כדי לשלוח �חת."
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "כ�ן"
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "בבקשה ווד� ש%s לערכת הנוש� שלך."
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "העלת תצוגה מקדימה"
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "ערוך גירסה"
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "גירסה עודכנה בהצלחה."
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "חדש"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "עודכן"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "סוגי תוספות"
-#~ msgid "editors_th_age"
-#~ msgstr "גיל"
-#~ msgid "editors_th_applications"
-#~ msgstr "יישומי�"
-#~ msgid "editors_th_platforms"
-#~ msgstr "פלטפורמות"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "סוגי הגשה"
-#~ msgid "error_notice"
-#~ msgstr "הערה"
-#~ msgid "forum_save"
-#~ msgstr "שמור"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-#~ msgid "nav_category_plugins"
-#~ msgstr "תוספי�"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "חזור לעמוד הקוד�"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "עמוד %1$s מתוך %2$s"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "תוספת %s  מת�ימה"
-#~ msgstr[1] "%s תוספות מת�ימות"
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "עידכוני RSS של סיכו� המידע"
-
diff --git a/site/app/locale/hu/LC_MESSAGES/messages.po b/site/app/locale/hu/LC_MESSAGES/messages.po
index c9826af..0e2f777 100644
--- a/site/app/locale/hu/LC_MESSAGES/messages.po
+++ b/site/app/locale/hu/LC_MESSAGES/messages.po
@@ -18,173 +18,164 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Telepítés megszakítása"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "%s letöltése"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Elfogadás és letöltés"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Elfogadás és telepítés"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Nyilvános"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Homokozó"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Frissítve: %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "%s verzió"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "letöltés"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "letöltés összesen"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "letöltés a héten"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s kiegészítő"
 msgstr[1] "%1$s kiegészítő"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "oldalanként"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Rendezés:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "kísérleti"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "ajánlott"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s nem érhető el %2$s platformon."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Vissza ehhez: %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Vissza az értékelésekhez..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Osztályzat:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Értékelés:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Értékelés beküldése"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Értékelés hozzáadása: %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Cím/Összefoglaló:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Törlés"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Válasz"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Biztosan törli az értékelést?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nem"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Igen"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Értékelés törlése"
 
@@ -193,7 +184,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Értékelés sikeresen törölve."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s értékelésének szerkesztése"
@@ -208,19 +199,19 @@ msgstr ""
 
 # Removing an extra comma
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Jegyezze meg: mielőtt az értékelése megjelenne a nyilvános webhelyen, egy "
 "szerkesztő moderálni fogja."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "A fejlesztő válasza:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -243,32 +234,45 @@ msgstr "%s értékelései"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s válasza, dátum: %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "A fejlesztő válasza:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Az értékelését mentettük. Köszönjük!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "értékelte: %1$s, dátum: %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "értékelte: %1$s, dátum: %2$s, (osztályzat: %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Következő kiegészítő"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Előző kiegészítő"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "�llandó hivatkozás erre a verzióra"
@@ -277,27 +281,26 @@ msgstr "�llandó hivatkozás erre a verzióra"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "A legújabb verzió, amely még kompatibilis ezzel: %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ugrás"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "A szerző profilja"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Témák böngészése :: %1$s-kiegészítők"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s böngészése"
@@ -306,114 +309,62 @@ msgstr "%s böngészése"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "%1$s témák böngészése :: %2$s-kiegészítők"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Értékelés hozzáadása"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Részletek"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategóriák"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "részletes értékelés"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nem tetszett"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Értékelés szerkesztése"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Ez a kiegészítő rendelkezik adatvédelmi irányelvekkel."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Utálom"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Fejlesztői megjegyzések"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Honlap"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Értékelések"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Támogatás"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Szeretem"
 
@@ -421,26 +372,22 @@ msgstr "Szeretem"
 msgid "addons_display_long_description"
 msgstr "Hosszú leírás"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Imádom"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Több kép"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s további kiegészítői"
@@ -449,21 +396,21 @@ msgstr[1] "További kiegészítők ezektől a szerzőktől"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Ehhez a kiegészítőhöz a fejlesztő a(z) %s helyen nyújt támogatást."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -471,20 +418,21 @@ msgstr ""
 "címen nyújt támogatást."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Ehhez a kiegészítőhöz a fejlesztő a(z) %s helyen nyújt támogatást."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Értékelés"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Nagyon szeretem"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Kérjük, ne írjon hibajelentést az értékelésbe. Az e-mail címét nem adjuk "
@@ -493,47 +441,52 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Értékelési útmutató</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Nézze meg a <a href=\"%1$s\">támogatás szakaszban</a>, hogy milyen módon "
 "kaphat segítséget a kiegészítővel kapcsolatban."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Mentés"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Minden %1$s kiegészítő megjelenítése"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Minden értékelés (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Minden verzió megjelenítése"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Teljes verziótörténet"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Forrás megtekintése"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statisztika megtekintése"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Mit gondol?"
 
@@ -541,226 +494,108 @@ msgstr "Mit gondol?"
 msgid "addons_display_workswith"
 msgstr "Kompatibilis:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr ":"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Javasoljuk"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "A kiegészítők bővítik a %1$s képességeit, lehetővé teszik a böngésző "
 "testreszabását.  Nézzen körül, és szabja testre a %1$s alkalmazást!"
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Legújabb:"
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Más alkalmazások"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s-kiegészítők"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Legnépszerűbb:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Javasoljuk:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Nemrég frissítve:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Összes"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Az összes újonnan létrehozott kiegészítő megtekintése"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Az összes népszerű kiegészítő megtekintése"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Az összes javasolt kiegészítő megtekintése"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Az összes nemrég frissített kiegészítő megtekintése"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>A fájl mentéséhez kattintson az alábbi hivatkozásra.</li><li>A "
@@ -768,11 +603,11 @@ msgstr ""
 "li><li>Kattintson a Telepítés gombra, majd keresse meg az imént letöltött "
 "fájlt, és kattintson az OK gombra.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Telepítés a Sunbirdben"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Kattintson a jobb egérgombbal az alábbi hivatkozásra, majd válassza "
@@ -781,42 +616,39 @@ msgstr ""
 "Eszközök menü Kiegészítők parancsát.</li><li>Kattintson a Telepítés gombra, "
 "keresse meg az imént letöltött fájlt, majd kattintson az OK gombra.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Telepítés a Thunderbirdben"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "kísérleti kiegészítők megjelenítése"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Ugrás"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr ":"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linuxra"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X-re"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windowsra"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -824,11 +656,11 @@ msgstr ""
 "sorolja fel. A Mozilla-alapú böngészőkhöz való bővítményekről szóló további "
 "információkért keresse fel a %1$s címet."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Olyan bővítményt keres, amely itt nincs felsorolva?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "A bővítmények lehetővé teszik egyes speciális képfájlformátumok vagy "
@@ -837,24 +669,24 @@ msgstr ""
 "funkciót módosítanak vagy bővítenek."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "A %1$s legfontosabb bővítményei"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Bővítmények"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Támogató dokumentáció: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -863,42 +695,37 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s előnézetei"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "A sok kiegészítő közül mindenki megtalálja a magának valót. Kezdésnek "
 "közreadunk egy listát a legnépszerűbbekről. Jó szórakozást!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Javasolt kiegészítők"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Javasolt kiegészítők"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "További források"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Sajnáljuk, de a keresők telepítéséhez Mozilla-alapú böngésző (például "
@@ -915,46 +742,47 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "A %2$s webhelyen olvassa el, hogy %1$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "hozhat létre saját keresőt"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "További keresők között böngészhet a %1$s webhelyen."
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Keresők"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Külön köszönet a Mycroft Projectnek a Firefox keresőivel kapcsolatos "
 "munkájukért."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -996,17 +824,17 @@ msgstr "Nem teljes verzió"
 msgid "addons_status_nominated"
 msgstr "Homokozóban, nyilvánosnak jelölve"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Homokozóban, értékelés függőben"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Nyilvános"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Homokozóban"
@@ -1015,38 +843,26 @@ msgstr "Homokozóban"
 msgid "addons_status_unknown"
 msgstr "Ismeretlen"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "További tudnivalók a kiegészítőről"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Legyen óvatos a régi verziókkal"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Ezek a verziók csak tanulmányozás és tesztelés céljából jelennek meg. Mindig "
 "a kiegészítő legújabb verzióját használja."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Verziótörténet a módosítások naplójával"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s verziótörténete"
@@ -1081,467 +897,153 @@ msgstr "Csoportadminisztrátor"
 msgid "admin_group_saved"
 msgstr "A csoport mentve lett"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Speciális"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Bármikor"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Bármilyen"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Bármelyik"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Alkalmazás"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Kulcsszóegyezés"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Utolsó frissítés"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Név"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Legújabb"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Elmúlt 3 hónap"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Elmúlt 6 hónap"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Múlt nap"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Múlt hónap"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Múlt hét"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Múlt év"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Oldalanként"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Népszerűség"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Osztályzat"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Rendezés"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "-"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Speciális keresés ki-/bekapcsolója"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Típus"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "verzió"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Verzió-ellenőrzés kihagyása"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Ez a kiegészítő a Firefox régebbi verzióihoz való"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "<a href=\"%1$s\">Kipróbálhat egy régebbi verziót</a> vagy <a href=\"#\" "
 "onclick=\"%2$s\">kihagyhatja ezt az ellenőrzést</a>."
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Egy <a href=\"%1$s\">régebbi verzió</a> működhet"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Ez a kiegészítő a még meg nem jelent <a href=\"%1$s\">Firefox %2$s</a> "
 "verziót igényli"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Frissítse a Firefoxot</a> a kiegészítő "
 "használatához"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Kiegészítők név szerint"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Legújabb kiegészítők"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Népszerű kiegészítők"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Kiegészítők osztályzat szerint"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Nemrég frissített kiegészítők"
 
@@ -1550,923 +1052,108 @@ msgid "categories_current_title"
 msgstr "Aktuális kategória"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategóriák"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Kategória választása"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Minden javasolt kiegészítő megjelenítése"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Legjobbra értékelt felül"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Utoljára frissített felül"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Legnépszerűbb felül"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Minden %1$s megjelenítése"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "A gyűjtemény nem található!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Hozzáadva: %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Kiegészítő-kompatibilitási központ"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Készüljön fel a %1$s kiadására a %2$s Add-ons közössége számára alább "
 "rendelkezésre bocsátott eszközök és adatok segítségével."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Adatok betöltése..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Vissza a főoldalra"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Kiegészítő-kompatibilitási jelentés"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Információk kiegészítőfejlesztőknek"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "A maxVersion módosítása feltöltés nélkül"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Saját kiegészítők állapotfelmérése"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Ha vannak kiegészítői a Mozilla Add-ons webhelyen, akkor <a href=\"%1$s"
 "\">jelentkezzen be</a>, hogy megnézze, hogy a kiegészítői kompatibilisek-e a "
 "%2$s verzióval."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center logó"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Nincsenek kiegészítői a Mozilla Add-ons webhelyen."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Kiegészítők állapotfelmérésének eredménye"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "A tárolt kiegészítők állapotának lekérdezése..."
 
@@ -2474,121 +1161,121 @@ msgstr "A tárolt kiegészítők állapotának lekérdezése..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s felhasználó (az összes %3$s&#37;-a)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Az alábbi kiegészítők a Mozilla által ismert kiegészítőhasználat 95&#37;-át "
 "teszik ki, és a felhasználótáboruk mérete szerint vannak rendezve."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Részletes jelentés"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "A(z) %1$s kiegészítő közül, amelyek a Mozilla által ismert "
 "kiegészítőhasználat 95&#37;-át teszik ki, <b>%2$s&#37;</b> jelenleg "
 "kompatibilisnek tekinthető a %3$s legújabb verziójával."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alfaverziók"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "A %1$s alfaverzióival kompatibilis kiegészítők"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Bétaverziók"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "A %1$s bétaverzióival vagy kiadásra jelölt verzióival kompatibilis "
 "kiegészítők"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Legújabb verzió"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "A %1$s legújabb verziójával kompatibilis kiegészítők"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Egyéb verziók"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "A %1$s egyik verziójával sem kompatibilis kiegészítők"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Kiegészítő-kompatibilitási jelentés"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Információk kiegészítő-felhasználóknak"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Kompatibilitási jelentés"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "A hozzájárulással kapcsolatos információkért lásd a %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wikioldalunkat"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "A Mozilla a következő embereknek szeretne köszönetet mondani az addons."
 "mozilla.org projekthez az évek során adott munkájukért:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Fejlesztők"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Szerkesztők"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Honosítók"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Egyéb hozzájárulók"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Korábbi fejlesztők"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Szoftver és képek"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Egyes ikonok a <a href=\"http://www.famfamfam.com/lab/icons/silk/"
@@ -2596,7 +1283,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a> vonatkozik."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2609,20 +1296,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Y. %B %e."
 
@@ -2658,25 +1342,25 @@ msgstr "Statisztikák"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2685,6 +1369,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(automatikus észlelés)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"A kiegészítő ezen verziója nem hirdeti magáról, hogy kompatibilis lenne a "
+"Firefox %1$s verzióval. A Mozilla hamarosan kiadja a Firefox következő "
+"verzióját, ezért kérjük, hogy tesztelje a kiegészítőt ezzel az új verzióval, "
+"és frissítse a kompatibilitási adatokat. További tudnivalókat <a href=\"%2$s"
+"\">itt</a> találhat erről. Ez csak egy figyelmeztetés, folytathatja ennek a "
+"verziónak a beküldését az addons.mozilla.org-ra."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Új ablakban nyílik meg"
@@ -2721,76 +1418,141 @@ msgstr "5. lépés: Siker"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Segítség a beküldéshez"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "A kiegészítő sikeresen le lett tiltva"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Kiegészítő szerkesztése"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "A kiegészítő sikeresen engedélyezve lett"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Kiegészítő leírása"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Kiegészítő honlapja"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Kiegészítő neve"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Előnézet képfelirata"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Adatvédelmi nyilatkozat"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Kiegészítő összefoglalója"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Támogató e-mail cím"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Támogató URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Megjegyzések a verzióhoz"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Kiegészítő jelölése"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "A kiegészítő sikeresen jelölve lett!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2826,7 +1588,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2836,6 +1598,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2847,13 +1614,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2863,7 +1630,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2873,12 +1640,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2887,14 +1654,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -2973,13 +1740,128 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Látogassa meg a %1$s oldalt a beküldés módosításához, vagy %2$s a "
+"Fejlesztőeszközökhöz való visszatéréshez."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "kattintson ide"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Kiegészítő szerkesztése"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Ez a verzió bekerült a homokozóba, és a homokozóban dolgozó tesztelők és egy "
+"Mozilla Add-ons szerkesztő értékelésére vár. Értesítést fog kapni e-mailen "
+"keresztül, ha történt valami."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "%s olvashat bővebben a homokozó értékelési rendszeréről."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "Itt"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Ez a verzió bekerült a homokozóba, ahol gyakorlott felhasználók "
+"tesztelhetik. A nyilvános webhelyen megjelenéshez %s kell a kiegészítőjét, "
+"hogy átmenjen egy értékelési folyamaton."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "jelölnie"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "A kiegészítő beküldése sikeresen véget ért."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Mivel ez a kiegészítő megbízható, ez a verzió automatikusan jóvá lett hagyva "
+"a nyilvános területen való megjelenéshez."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Kiegészítő beküldése"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "A kiegészítő sikeresen frissítve lett"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Fontolja meg, hogy %s megnövelje a kiegészítője iránti érdeklődést."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "előnézet feltöltésével"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nem található szerző [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Eltávolítás"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Mégse"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Biztosan megszakítja a beküldést?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Következő"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Kiegészítő típusának módosítása:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "A fejlesztői megjegyzések frissítve lettek."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3056,37 +1938,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Előnézet hozzáadása"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Szerző"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Szerzők"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Nincs"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategóriák"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategória"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Leírás"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Letiltva"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Részletek"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Fejlesztői megjegyzések"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Előnézetek"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Verziók"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Honlap"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Nincs"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Nincs képfelirat"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nincs előnézet."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Frissítés"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Támogató e-mail cím"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "A fejlesztő nem adott meg támogató e-mail címet."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Támogató URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "A fejlesztő nem adott meg támogató URL-t."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Megbízható"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "%s verzió"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nincsenek verziók."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Mégse és vissza"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Igen, letiltás"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Biztosan letiltja ezt a kiegészítőt?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"A kiegészítő letiltása azt jelenti, hogy nem jelenik meg a kereséseknél és a "
+"felsorolásokban. Nem lesz letölthető a webhelyről, és nem lesz javasolva az "
+"ügyfélprogramok frissítéskereséseinél. A kiegészítő gyakorlatilag törölve "
+"lesz, bár később visszatérhet, és újra engedélyezheti, ha szeretné."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "%s letiltása"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Igen, engedélyezés"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Biztosan engedélyezi ezt a kiegészítőt?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"A kiegészítő engedélyezése azt jelenti, hogy ismét megjelenik a kereséseknél "
+"és a felsorolásokban. Letölthető lesz a webhelyről és az ügyfélprogramok "
+"frissítéskereséseinél."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "%s engedélyezése"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3140,62 +2165,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Szerző hozzáadása"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Szerző e-mail címe"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Eltávolítás"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3208,30 +2245,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3310,22 +2347,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3334,12 +2371,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3347,12 +2384,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3361,24 +2398,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3386,7 +2423,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3411,42 +2448,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Nincsenek kategóriák ehhez a kiegészítőtípushoz."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Szerzők"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Ikon hozzáadása"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Ikon módosítása"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "A felhasználók megtekinthetik online a forrást"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategóriák"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Alapértelmezett területi beállítások"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Ez a kiegészítő külső szoftvert igényel"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Csak a létező ikon törlése"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Új ikonfájl"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "További területi beállítások"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Ez egy előzetes kiadás"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Ez egy webhelyspecifikus kiegészítő"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Cél területi beállítások"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "további infók röviden (pl. a helyi dialektus neve)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3454,12 +2556,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3467,60 +2569,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3529,32 +2631,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3562,22 +2664,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3585,12 +2687,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3598,39 +2700,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Frissítés"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">területi "
+"beállítás egyszerű neve</a> pl. „en-US�"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3720,14 +2832,70 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Függőben levő frissítések (%s)"
 msgstr[1] "Függőben levő frissítések (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "A bejelölt fájlok törölve lesznek."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Fájlok"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Célalkalmazások"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Nincsenek fájlok."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Megjegyzések az értékelőnek"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Frissítés"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nincs hozzáférése ehhez a kiegészítőhöz."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Az összefoglaló legfeljebb 250 karakter lehet.\n"
+"(Beírva %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"A kiegészítő neve már szerepel az adatbázisban. Győződjön meg arról, hogy: "
+"<br /><li>A GUID-ok egyeznek-e. A hiba leggyakoribb oka, hogy a GUID-ok nem "
+"egyeznek.</li><li>Nincs-e duplikált bejegyzés az adatbázisban? Ha van, akkor "
+"frissítenie vagy törölnie kell azt a bejegyzést, és újra megpróbálni.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3741,10 +2909,10 @@ msgstr "Lásd %s referenciaként."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "ezt az oldalt"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"�rja le, hogy milyen módosítások történtek ebben a kiegészítőfrissítésben."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3763,6 +2931,10 @@ msgstr ""
 "Ez a fájlkiterjesztés (%s) nem engedélyezett a kijelölt kiegészítőtípushoz. "
 "Használja a következők egyikét: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nem minden fájl GUID-ja egyezik"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Ne válasszon ötnél több kategóriát."
@@ -3797,7 +2969,15 @@ msgstr ""
 "Ez a fájlkiterjesztés (%s) nem engedélyezett az ikon számára. Használja a "
 "következők egyikét: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Ennek a kiegészítőnek ezen a platformon már van egy megegyező verziója (%s)."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Nincs jelen az install.rdf."
 
@@ -3805,7 +2985,7 @@ msgstr "Nincs jelen az install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "A következő hibák vannak az install.rdf-ben:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Válasszon egy érvényes kiegészítőtípust."
 
@@ -3874,6 +3054,18 @@ msgstr "Nem található azonosító ehhez a kiterjesztéshez az install.rdf-ben.
 msgid "devcp_error_no_platform"
 msgstr "Nincs platform kiválasztva"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "A jelöléshez meg kell adnia a kért részleteket."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Egy kiegészítő előzetes kiadása nem jelölhető."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Csak a homokozóban levő kiegészítők jelölhetők."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Válasszon legalább egy kategóriát."
@@ -3891,6 +3083,16 @@ msgstr ""
 "Ez a fájlkiterjesztés (%s) nem engedélyezett az előnézet számára. Használja "
 "a következők egyikét: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Hiba történt az adatok mentése közben."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Nincs joga frissíteni ezt a kiegészítőt."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3903,98 +3105,294 @@ msgstr ""
 "A kiegészítők nem használhatnak külső updateURL-t. Törölje ezt az install."
 "rdf-ből, és próbálja újra."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Töltsön fel egy fájlt."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Másik platformfájl hozzáadása"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Szerző hozzáadása"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Eltávolítás"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Az új kiegészítőtípus kategóriái a következő lépésben lesznek elérhetők."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Nincsenek kategóriák ehhez a kiegészítőtípushoz."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Adja meg a kiegészítőjének leírását."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Adja meg a kiegészítőjének nevét."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Elküldés előtt adja meg a kiegészítőjének típusát."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Adjon meg egy összefoglalót a kiegészítőjéről."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Kiegészítő fájlja"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Kiegészítő fájlja 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Kiegészítő fájlja 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Kiegészítő típusa"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "A felhasználók megtekinthetik online a forrást"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Szerző e-mail címe"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Szerzők"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategóriák"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Alapértelmezett területi beállítások"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Leírás"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Végfelhasználói licencszerződés (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Ez a kiegészítő külső szoftvert igényel"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Fájlok"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Honlap"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Ikonfájl"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Név"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Támogatott platformok"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Ez egy előzetes kiadás"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Adatvédelmi nyilatkozat"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Ez egy webhelyspecifikus kiegészítő"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Összefoglaló"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Támogató e-mail cím"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Támogató URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Célalkalmazások"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Verzió"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Megjegyzések a verzióhoz"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Nincs"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Megjegyzések az értékelőnek"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Mivel a kiegészítője megbízható, kiválaszthatja, hogy ez a verzió hova "
+"kerüljön:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Nyilvános"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Homokozó"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Fejlesztői megállapodás"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1. lépés"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Fájl feltöltése"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2. lépés"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Kiegészítő leírása"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3. lépés"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Verzió leírása"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4. lépés"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Honosítás"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5. lépés"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Siker"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Saját kiegészítők"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Honosított mezők"
@@ -4012,12 +3410,12 @@ msgstr ""
 "beállítás (%s) lesz érvényes."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Adminisztrációs eszközök"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Szerkesztőeszközök"
 
@@ -4026,28 +3424,28 @@ msgid "devcp_myaddons_link"
 msgstr "Saját kiegészítők"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Vissza a főoldalra"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statisztikák"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Kiegészítő beküldése"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Fejlesztőeszközök"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4059,27 +3457,39 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Vissza a kiegészítő leírásához"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s jelölése"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatikusan felismert kiegészítőtípus: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4093,6 +3503,22 @@ msgstr ""
 "Ha eltávolítja ezt az alapértelmezett előnézetet, akkor egy másik előnézet "
 "lesz automatikusan az alapértelmezett előnézet."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"A kiegészítőhöz beállított alapértelmezett területi beállítás (%1$s [%2$s]) "
+"különbözik a jelenleg kijelölt területi beállítástól (%3$s [%4$s]). Az "
+"alábbi mezők kitöltéséhez használja ezt: %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4100,14 +3526,14 @@ msgstr ""
 "Ha ezt az előnézetet jelöli ki alapértelmezettnek, akkor a jelenlegi "
 "alapértelmezett előnézet elveszíti ezt az állapotát."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4136,46 +3562,46 @@ msgstr "Előnézet szerkesztése"
 msgid "devcp_preview_updated_successfully"
 msgstr "Előnézet sikeresen frissítve."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4183,7 +3609,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4201,7 +3627,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Előnézet hozzáadása"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4210,7 +3636,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Előnézet szerkesztése"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4223,27 +3649,27 @@ msgstr "Előnézeti fájl"
 msgid "devcp_previews_label_makedefault"
 msgstr "Legyen ez az alapértelmezett előnézeti kép"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4267,18 +3693,26 @@ msgstr "Előnézet szerkesztése"
 msgid "devcp_previews_submit_upload"
 msgstr "Előnézet feltöltése"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Helytelen?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Biztosan törli a fájlt?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Mielőtt folytatja, olvassa el és fogadja el a következő Fejlesztői "
@@ -4291,7 +3725,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4303,6 +3737,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "A jelenlegi kiegészítőinformációk frissítésének kihagyása"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4406,17 +3844,63 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Jelenleg nem lehet kiegészítőket feltölteni. Jöjjön vissza később."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Elfogadom"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Elutasítom"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Ez a kiegészítőt egy adminisztrátor letiltotta."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Letiltva"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Megbízható"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Legújabb verzió:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nincsenek kiegészítői. Kattintson %s egy beküldéséhez."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "ide"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Ne felejtsen el %s a témájához."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "előnézetet feltölteni"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4424,44 +3908,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4471,7 +3955,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4479,64 +3963,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4545,7 +4029,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4557,33 +4041,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4596,29 +4075,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4629,12 +4108,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4658,23 +4137,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4683,7 +4157,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4692,14 +4166,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4709,7 +4183,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4717,7 +4191,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4725,22 +4199,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4759,29 +4227,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Lásd %s referenciaként."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "ezt az oldalt"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Verzió szerkesztése"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Verzió sikeresen frissítve."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4850,34 +4321,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4885,49 +4356,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4937,59 +4403,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4998,26 +4457,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5060,7 +4519,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Ez a kiegészítő le van tiltva"
 
@@ -5104,7 +4563,7 @@ msgstr "Szűrő"
 msgid "editorcp_logs_filter_by"
 msgstr "Szűrés típus/művelet szerint"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Eseménynapló"
 
@@ -5166,7 +4625,7 @@ msgstr "%s és %s közötti bejegyzések megtekintése"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Nincsenek értékelések ebben az időszakban."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Értékelési napló"
 
@@ -5190,24 +4649,24 @@ msgstr "Szerkesztői tevékenység a közelmúltban"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Összes értékelés"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Kiegészítő értékelése"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Töltse ki a következő mezőket:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Válasszon legalább egy fájlt az értékeléshez."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Saját magát nem értékelheti."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Külső szoftver"
 
@@ -5219,39 +4678,39 @@ msgstr "Kiemelés hozzáadása"
 msgid "editors_featured_add_feature_submit"
 msgstr "Hozzáadás"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "A kiemelés hozzáadása sikertelen."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "A kiemelés hozzáadása sikeres."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "A kiemelés szerkesztése sikertelen."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "A kiemelés szerkesztése sikeres."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Egy vagy több területi beállítás érvénytelen."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "A kiemelés eltávolítása sikertelen."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "A kiemelés eltávolítása sikeres."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Kiemelt kiegészítők"
 
@@ -5263,169 +4722,106 @@ msgstr "Ugrás"
 msgid "editors_featured_remove_feature"
 msgstr "Kiemelés eltávolítása"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Szűrősor"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Hasznos hivatkozások"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Útmutató szerkesztőknek"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Irányelvek a kiegészítőkhöz"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Ezek a szűrők aktívak maradnak a munkamenet alatt, vagy amíg nem törli őket."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Jelenleg nincsenek értékelendő kiegészítők ebből a típusból."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 nap"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 óra"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 perc"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Szerkesztőeszközök"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "csak %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Előzetes kiadás"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s kompatibilitás"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Törlés"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Szűrő"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Jelenleg nem lehet értékelni. Jöjjön vissza később."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Értékelési művelet"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Nyilvánossá tétel"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Super-Review kérése"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Homokozóban tartás"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Értékelési megjegyzések"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5433,29 +4829,29 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "A kiegészítő legfrissebb verziójához tartozó fájlok publikussá válnak. A "
 "jövőbeli verziók a homokozóba kerülnek, amíg egy szerkesztő nem értékeli "
 "Å‘ket."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "A kiegészítő a homokozóban marad."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Egy már nyilvános kiegészítő homokozóban levő verziója megjelenhet "
 "nyilvánosan."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Egy már nyilvános kiegészítő homokozóban levő verziója a homokozóban marad."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Ha kétségei vannak a kiegészítő biztonságát, szerzői jogi státuszát vagy "
@@ -5463,74 +4859,74 @@ msgstr ""
 "megjegyzést az alábbi területre. Ez az üzenet az adminisztrátorhoz kerül, "
 "nem a szerzőhöz."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Összehasonlítás a nyilvános verzióval"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Tartalom megtekintése"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Szerzők:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategóriák:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitás:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Leírás"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Fejlesztői megjegyzések"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Fájlok:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Elem története"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Jelölési üzenet"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Előnézetek"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Adatvédelmi nyilatkozat"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s értékelése"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Megjegyzések az értékelőnek"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Összefoglaló"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Megjegyzések a verzióhoz"
 
@@ -5560,7 +4956,7 @@ msgstr "Jelölés jóváhagyva/Nyilvános"
 msgid "editors_review_history_nominated_denied"
 msgstr "Jelölés elutasítva/Homokozó"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nincsenek korábbi értékelő bejegyzések."
 
@@ -5588,93 +4984,80 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Alkalmazások:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "vagy válasszon egy konzervválaszt:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Megjegyzések:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operációs rendszerek:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Fel"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "következő &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nincs előnézet."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; előző"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Értékelési sor"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> / %2$s a sorban"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Művelet feldolgozása"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Művelet"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Megjegyzések"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dátum"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Értékelő"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Verzió/Fájl"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Értesítés kérése a kiegészítő következő frissítésekor. (A további "
 "frissítésekről nem küld e-mailt a rendszer.)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Az értékelés sikeresen fel lett dolgozva."
 
@@ -5698,7 +5081,7 @@ msgstr "Művelet"
 msgid "editors_reviews_in_reply_to"
 msgstr "Válasz:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Az értékelések sikeresen fel lettek dolgozva!"
 
@@ -5710,82 +5093,87 @@ msgstr "Jelenleg nincsenek moderálandó értékelések."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Értékelések feldolgozása"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Webhelyspecifikus"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Új"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Frissített"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tesztelt alkalmazás"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tesztelt operációs rendszer"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "További információk"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Kiegészítő"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Típus"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Kiegészítőtípusok"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Kor"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Alkalmazások"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Korlátozás adott területi beállításokra?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platformok"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Beküldési típusok"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s nap"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s óra"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s perc"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Hozzáférés megtagadva"
 
@@ -5793,19 +5181,17 @@ msgstr "Hozzáférés megtagadva"
 msgid "error_access_denied_message"
 msgstr "Nincs joga megtekinteni ezt az oldalt."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5814,14 +5200,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "A kiegészítő nem található!"
 
@@ -5833,7 +5216,7 @@ msgstr "Ez a kiegészítő nem megtekinthető innen."
 msgid "error_addon_selfreview"
 msgstr "A saját kiegészítő nem értékelhető."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Nincsenek kiegészítők ebben a kategóriában!"
 
@@ -5841,45 +5224,50 @@ msgstr "Nincsenek kiegészítők ebben a kategóriában!"
 msgid "error_collection_feed_notfound"
 msgstr "A kiegészítő hírforrása nem található."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Ez nem érvényes e-mail cím."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Ez a mező nem maradhat üresen."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "A fájl nem található!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fájlhiba: %s nem létezik."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Hibák vannak az űrlapon. Javítsa ki őket, és küldje újra."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Érvénytelen captcha, próbálja újra!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Ez az URL érvénytelen formátumban van. Az érvényes URL-ek formátuma ehhez "
@@ -5887,46 +5275,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Hiányzó argumentum: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Nincsenek fájlok"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Értesítés"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Nincs előnézet!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Kötelező osztályzatot választani."
 
@@ -5934,47 +5310,38 @@ msgstr "Kötelező osztályzatot választani."
 msgid "error_user_already_confirmed"
 msgstr "Ezt a felhasználói fiókot már jóváhagyták."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Érvénytelen megerősítő kód!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "A jelszavak nem egyeznek."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Ezt az e-mail címet már egy másik felhasználó használja."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "A e-mail váltás lejárt. Változtassa meg ismét az e-mail címét a felhasználói "
 "profiljában, és kattintson a megerősítő e-mailben levő hivatkozásra a "
 "megérkezése után azonnal."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Ezt a felhasználónevet már más használja."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "A felhasználó nem található!"
 
@@ -5984,43 +5351,40 @@ msgstr ""
 "Először igazolja vissza a felhasználói fiókját az e-mailben kapott kód "
 "segítségével."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Rossz felhasználónév vagy jelszó"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "A verzió nem található!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Rossz jelszót írt be!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Több infó"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s - további tudnivalók"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s értékelés"
 msgstr[1] "%1$s értékelés"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Még több"
 
@@ -6059,43 +5423,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Minden jog fenntartva."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Stáblista"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "A Mozilla szívességből hivatkozásokat ad ezekre az alkalmazásokra, de nem "
@@ -6103,105 +5466,98 @@ msgstr ""
 "alkalmazásokkal kapcsolatos minden kérdést, panaszt vagy követelést a "
 "megfelelő szoftvergyártó felé kell irányítani."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Ugrás"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Jogi megjegyzések"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Más nyelvek:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Adatvédelmi nyilatkozat"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Mentés"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Szótár"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Szótárak"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Kiterjesztés"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Kiterjesztések"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Nyelvi csomag (kiegészítő)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Nyelvi csomagok (kiegészítő)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Nyelvi csomag (alkalmazás)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Nyelvi csomagok (alkalmazás)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Bővítmény"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Bővítmények"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Kereső"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Keresők"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Téma"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Témák"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Visszatérés a %1$s-kiegészítők honlapjára"
@@ -6210,95 +5566,37 @@ msgstr "Visszatérés a %1$s-kiegészítők honlapjára"
 msgid "header_main_firefox_header"
 msgstr "Firefox-kiegészítők"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Kiegészítők"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey-kiegészítők"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird-kiegészítők"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird-kiegészítők"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Kiegészítők"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Bejelentkezés"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Kijelentkezés"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Saját fiók"
 
@@ -6306,24 +5604,12 @@ msgstr "Saját fiók"
 msgid "header_navlink_register"
 msgstr "Regisztrálás"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s előnézeti képe"
@@ -6332,49 +5618,38 @@ msgstr "%s előnézeti képe"
 # %2 is the link to an explanatory page.
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Jelentkezzen be</a> a kísérleti kiterjesztés telepítéséhez. "
 "<a href=\"%2$s\">Miért</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Hozzáadás: %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s hozzáadása: %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s letöltése"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Ez a kiegészítő nem érhető el."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Nyelvi csomagok és szótárak listája"
 
@@ -6386,8 +5661,8 @@ msgstr "Szótár letöltése"
 msgid "langtools_download_langpack"
 msgstr "Nyelvi csomag letöltése"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Szótárak és nyelvi csomagok"
 
@@ -6399,80 +5674,36 @@ msgstr "Szótár telepítése"
 msgid "langtools_install_langpack"
 msgstr "Nyelvi csomag telepítése"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Szótár"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Nyelvi csomag"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Nyelv"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Kattintson ide a főoldalra való visszatéréshez."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dátum"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Letöltések"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Kiegészítő neve"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Osztályzat"
@@ -6497,21 +5728,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Szótárak és nyelvi csomagok"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Bővítmények"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Témák"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Kiegészítők keresése más alkalmazásokhoz"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "mások"
 
@@ -6519,34 +5757,12 @@ msgstr "mások"
 msgid "page_title_appversions"
 msgstr "Alkalmazásverziók"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Stáblista"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Kísérleti kiegészítők"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6576,15 +5792,15 @@ msgstr "A homokozó értékelési rendszere"
 msgid "page_title_submissionhelp"
 msgstr "Segítség a beküldéshez"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Érvényes alkalmazásverziók"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "A Mozilla Add-ons webhelyre beküldött kiegészítőknek rendelkezniük kell "
@@ -6593,7 +5809,7 @@ msgstr ""
 "alábbi verziók engedélyezettek."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6602,15 +5818,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "itt"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Verziók"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Vissza az előző oldalra"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Homokozó információs oldala"
 
@@ -6618,6 +5837,13 @@ msgstr "Homokozó információs oldala"
 msgid "pagination_next_page"
 msgstr "következő"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "%1$s / %2$s oldal"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "előző"
@@ -6656,15 +5882,15 @@ msgstr ""
 "Ha ezt nehéz elolvasni, akkor <a href=\"%1$s\">próbálkozhat más szavakkal</"
 "a>, vagy inkább <a href=\"%2$s\">meghallgathat valamit</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Ön ember?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Mi ez?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Hiba az értékelés megjelölésénél!"
 
@@ -6672,7 +5898,7 @@ msgstr "Hiba az értékelés megjelölésénél!"
 msgid "review_flag_reason_bug_support"
 msgstr "Rossz helyre küldött hibajelentés vagy támogatási kérés"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Értékelés feljelentése (válasszon okot)"
 
@@ -6688,8 +5914,8 @@ msgstr "Egyéb (adja meg)"
 msgid "review_flag_reason_spam"
 msgstr "Hirdetés vagy nem értékeléssel kapcsolatos tartalom"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Köszönjük, ez az értékelés szerkesztői jóváhagyásra meg lett jelölve."
 
@@ -6705,7 +5931,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Tartsa észben a következőket:</p><ul><li>�rjon úgy, mint ha egy "
@@ -6724,131 +5950,101 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s értékelései"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Kiemeltek"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Legújabbak"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Frissítettek"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "A keresés jelenleg le van tiltva. Próbálja újra később."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "minden kiegészítő"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "kiegészítők keresése"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Kiegészítők keresése"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Kattintson a keresési kifejezések beviteléhez"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "itt"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Minden kereső"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Tallózás a keresők között"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s egyező kiegészítő"
+msgstr[1] "%s egyező kiegészítő"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "A keresés eredménytelen."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Kiegészítők keresése"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Keresés eredményének hírforrása"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Keresés eredményének: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Adminisztrációs eszközök"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Fejlesztőeszközök"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Szerkesztőeszközök"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Üdvözlet"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Üdvözlet, %s"
@@ -6857,7 +6053,7 @@ msgstr "Üdvözlet, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Szótár"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Kiemeltek"
 
@@ -6865,7 +6061,7 @@ msgstr "Kiemeltek"
 msgid "sidebar_pitch_looking_for"
 msgstr "Keresés:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Legújabbak"
 
@@ -6873,7 +6069,7 @@ msgstr "Legújabbak"
 msgid "sidebar_pitch_search"
 msgstr "Kereső"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Feliratkozás"
 
@@ -6881,24 +6077,25 @@ msgstr "Feliratkozás"
 msgid "sidebar_pitch_theme"
 msgstr "Téma"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Frissítettek"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Még nem osztályozott"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Az osztályzat %s csillag az 5-ből"
@@ -6935,13 +6132,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s létrehozva"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s kiadva"
@@ -6954,179 +6151,179 @@ msgstr "Bezárás"
 msgid "statistics_help_link"
 msgstr "Súgó"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "vagy válasszon másik kiegészítőt"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "vagy válasszon nyilvános statisztikájú kiegészítőt"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Válassza ki az egyik kiegészítőjét, és nézze meg a statisztikáját"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Válasszon ki egy kiegészítőt, és nézze meg a statisztikáját"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Válasszon nyilvános statisztikájú kiegészítőt"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statisztikák"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Statisztika megtekintése"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Táblázat megtekintése CSV formátumban"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "nincs"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Grafikon eltávolítása"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Csoportosítás: nap"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Csoportosítás: hónap"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Csoportosítás: hét"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Összehasonlítás: hét"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s van a tartományban"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Grafikon hozzáadása"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Másik grafikon hozzáadása"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Teljes szám elrejtése"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Teljes szám megjelenítése"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "A teljes szám megjelenítése ehhez a diagramhoz"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Adatok megtekintése (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Az adatok vesszővel elválasztott formában letölthetők"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s-események elrejtése"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s-események megjelenítése"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "A kiegészítő kiadási dátumainak felírása a grafikonokra"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox-események elrejtése"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox-események megjelenítése"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "A Firefox kiadási dátumainak felírása a grafikonokra"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Diagram összecsukása"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Diagram széthúzása"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Diagram átméretezése"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktív felhasználók"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Alkalmazás"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Egyéni"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Letöltések"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operációs rendszer"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Kiegészítő állapota"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Összefoglaló"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Kiegészítő verziója"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Alkalmazás"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operációs rendszer"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Kiegészítő állapota"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Ismeretlen"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Kiegészítő verziója"
 
@@ -7162,7 +6359,7 @@ msgstr "A beállítások frissítve lettek!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statisztikák"
 
@@ -7190,106 +6387,110 @@ msgstr "Kicsinyítés"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Kicsinyítés egy hónapra"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s statisztikájának napi összefoglalója"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Összesített adatok RSS-forrása"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%Y. %B %e., %A"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "%1$s statisztikája"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Alapértelmezés szerint csak Ön és a Mozilla érheti el ezeket az "
 "információkat. Megnyithatja a nagyközönség számára, hogy bárki megnézhesse a "
 "kiegészítőjének adatait."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Hozzáférés-kezelés"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privát"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr ""
 "Csak Ön és a Mozilla nézheti meg ennek a kiegészítőnek a statisztikáit."
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Nyilvános"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Bárki megnézheti ennek a kiegészítőnek a statisztikáit."
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Beállítások megváltoztatása"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Kezelje bizalmasan ezt az információt."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ez az oldal jelenleg <b>privát</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ez az oldal jelenleg <b>nyilvános</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zárolva"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Vissza a statisztikákhoz"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Beállítások mentése"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s statisztikaoldalának beállításai"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Nem zárolt"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Alk."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "�ll."
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Is"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�tlagos napi letöltésszám"
 
@@ -7301,7 +6502,7 @@ msgstr "Letöltések"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Utolsó napi szám"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Letöltések az elmúlt 7 napon"
 
@@ -7319,7 +6520,7 @@ msgstr "%1$s óta"
 msgid "statistics_summary_nodata"
 msgstr "Nincsenek még adatok"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Aktív felhasználók átlaga"
 
@@ -7345,73 +6546,56 @@ msgstr "Aktív felhasználók"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Dátum: %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s statisztikája"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Minden téma"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Tallózás a témák között"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "E-mail cím módosítása"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Jelszó módosítása"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "A megerősítő kódot újra elküldtük!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "A(z) %1$s felhasználói fiók sikeresen törlődött. Ha később visszatérne, "
 "regisztrálhatja magát a <a href=\"%2$s\">felhasználói regisztrációs oldalon</"
 "a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "A Mozilla Add-ons közössége szomorúan veszi tudomásul a távozását."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Jelszó megerősítése"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Felhasználói fiók törlése"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Nem törölheti a fiókját, ha <a href=\"%1$s\">bármelyik kiegészítő "
@@ -7421,52 +6605,52 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "További kérdéseivel forduljon segítségért az %1$s levelezőlistához."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "A fiók törlése előtt be kell jelölnie a „Megértettem...� négyzetet."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "A lépés végrehajtásához írja be a jelszavát."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Ismeretlen hiba történt a fiókjának törlésekor. A problémával forduljon az %1"
 "$s levelezőlistához, majd mi töröljük a fiókot. Elnézést kérünk a "
 "kellemetlenségért."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Fiók törlésének jóváhagyása"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "%1$s felhasználói fiókjának törlése"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Viszlát!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Nem fog tudni többé belépni a Mozilla Add-ons webhelyre."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "A „törlés�-re kattintva a fiók <strong>véglegesen törlődik</strong>. Ez azt "
 "jelenti, hogy:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Értékelései és osztályzatai nem lesznek törölve, de többé nem lesznek Önhöz "
@@ -7474,24 +6658,24 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Ha olyan problémája van, amiben segíthetünk, kérjük, ne törölje még a "
 "fiókját, hanem forduljon hozzánk az %1$s levelezőlistán. Megpróbálunk "
 "legjobb tudásunk szerint segíteni."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Megértettem, hogy ez a lépés nem vonható vissza."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Felhasználó törlése"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Az új e-mail címet megerősítő hivatkozást e-mailben küldtük el a(z) %1$s "
@@ -7499,7 +6683,7 @@ msgstr ""
 "mailben levő hivatkozásra. Addig továbbra is a régi e-mail címével "
 "jelentkezhet be."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Felhasználói fiók törlése"
 
@@ -7529,7 +6713,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "E-mail címének módosítását kérte a %2$s Add-ons webhelyen.\n"
@@ -7571,113 +6757,92 @@ msgstr ""
 "Köszönjük!\n"
 "-- A %2$s Add-ons munkatársai"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "A %s Add-ons jelszavának törlése"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Hiba!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Erősítse meg az e-mail címének módosítását a %1$sAdd-ons webhelyen"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Sikeres!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Az e-mail címe sikeresen megváltozott. Ezentúl használja a(z) %1$s címet a "
 "bejelentkezéshez."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Jelszó megerősítése"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "%s felhasználói profiljának szerkesztése"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-mail cím"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Utónév"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "E-mail cím elrejtése"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Webhely URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Vezetéknév"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Felhasználó bejelentkezése"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Új jelszó"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Becenév"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Régi jelszó"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Egyéb műveletek"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Jelszó"
 
@@ -7685,64 +6850,64 @@ msgstr "Jelszó"
 msgid "user_form_registration"
 msgstr "Új felhasználó regisztrációja"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Megjegyzés ezen a számítógépen"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Homokozó megjelenítése?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Mentés"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Bejelentkezés"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Regisztrálás"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons felhasználója ezóta:"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Új felhasználói fiók létrehozása"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kiegészítő kompatibilitása (nagyon ajánlott)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Soron következő események és versenyek"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Jelenleg nincsenek konfigurálható értesítések."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "A Mozilla időként küldhet e-mailt a soron következő kiadásokról és a "
 "kiegészítőket érintő eseményekről. Válassza ki az Önt érdeklő témákat:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "A Mozilla fenntartja a jogot, hogy egyénileg felvegye Önnel a kapcsolatot, "
 "ha aggasztónak találja az Ön által beküldött kiegészítőket."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "Hibák voltak a módosításokban. Javítsa ki őket, és küldje újra."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "A profil frissítve lett."
 
@@ -7755,15 +6920,15 @@ msgstr "%s jelszavának törlése"
 msgid "user_pwreset_header"
 msgstr "Jelszó törlése"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Elfelejtette a jelszavát?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "A jelszót törlő hivatkozást e-mailben küldtük el."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "A jelszó törlése sikeresen megtörtént."
 
@@ -7775,7 +6940,7 @@ msgstr "Jelszómódosítás beküldése"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Jelszót törlő hivatkozás küldése"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s kiegészítők"
@@ -7792,7 +6957,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7804,24 +6969,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "megerősítő üzenet újra elküldésére"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Gratulálunk! A felhasználói fiók sikeresen létrejött."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -7834,30 +6985,20 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Köszönjük, hogy regisztrált, és üdvözli a %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Utónév, vezetéknév vagy becenév szükséges."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Értesítések"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Felhasználói profil"
 
@@ -7865,67 +7006,51 @@ msgstr "Felhasználói profil"
 msgid "user_verified_okay"
 msgstr "Sikeresen ellenőrizve!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Felhasználói fiók törlése"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Felhasználói fiók szerkesztése"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s kiegészítői"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Név"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Felhasználói profil"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-mail cím"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Honlap"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Becenév"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s felhasználói adatai"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "%s értékelései"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Felhasználó bejelentkezése"
 
@@ -7961,716 +7086,5 @@ msgstr "Felhasználó jelszavának törlése"
 msgid "users_register_pagetitle"
 msgstr "Új felhasználó regisztrációja"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Következő kiegészítő"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Előző kiegészítő"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "A legújabb verzió, amely még kompatibilis ezzel:"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Teljes verziótörténet"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Legújabb:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Legnépszerűbb:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Javasoljuk:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Nemrég frissítve:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Összes"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Minden javasolt kiegészítő megjelenítése"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Legjobbra értékelt felül"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Utoljára frissített felül"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Legnépszerűbb felül"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "A kiegészítő ezen verziója nem hirdeti magáról, hogy kompatibilis lenne a "
-#~ "Firefox %1$s verzióval. A Mozilla hamarosan kiadja a Firefox következő "
-#~ "verzióját, ezért kérjük, hogy tesztelje a kiegészítőt ezzel az új "
-#~ "verzióval, és frissítse a kompatibilitási adatokat. További tudnivalókat "
-#~ "<a href=\"%2$s\">itt</a> találhat erről. Ez csak egy figyelmeztetés, "
-#~ "folytathatja ennek a verziónak a beküldését az addons.mozilla.org-ra."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "A kiegészítő sikeresen le lett tiltva"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Kiegészítő szerkesztése"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "A kiegészítő sikeresen engedélyezve lett"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Kiegészítő leírása"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Kiegészítő honlapja"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Kiegészítő neve"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Adatvédelmi nyilatkozat"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Kiegészítő összefoglalója"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Támogató e-mail cím"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Támogató URL"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Megjegyzések a verzióhoz"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Kiegészítő jelölése"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "A kiegészítő sikeresen jelölve lett!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Látogassa meg a %1$s oldalt a beküldés módosításához, vagy %2$s a "
-#~ "Fejlesztőeszközökhöz való visszatéréshez."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "kattintson ide"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Kiegészítő szerkesztése"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Ez a verzió bekerült a homokozóba, és a homokozóban dolgozó tesztelők és "
-#~ "egy Mozilla Add-ons szerkesztő értékelésére vár. Értesítést fog kapni e-"
-#~ "mailen keresztül, ha történt valami."
-
-# %1 is the link to the sandbox information page
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "%s olvashat bővebben a homokozó értékelési rendszeréről."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "Itt"
-
-# %1 is the "nominate" link
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Ez a verzió bekerült a homokozóba, ahol gyakorlott felhasználók "
-#~ "tesztelhetik. A nyilvános webhelyen megjelenéshez %s kell a "
-#~ "kiegészítőjét, hogy átmenjen egy értékelési folyamaton."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "jelölnie"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "A kiegészítő beküldése sikeresen véget ért."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Mivel ez a kiegészítő megbízható, ez a verzió automatikusan jóvá lett "
-#~ "hagyva a nyilvános területen való megjelenéshez."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Kiegészítő beküldése"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "A kiegészítő sikeresen frissítve lett"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Fontolja meg, hogy %s megnövelje a kiegészítője iránti érdeklődést."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "előnézet feltöltésével"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Nem található szerző [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Eltávolítás"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Mégse"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Biztosan megszakítja a beküldést?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Következő"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Kiegészítő típusának módosítása:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "A fejlesztői megjegyzések frissítve lettek."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Előnézet hozzáadása"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Szerző"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Szerzők"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Nincs"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Kategóriák"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Kategória"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Leírás"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Letiltva"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Részletek"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Fejlesztői megjegyzések"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Előnézetek"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Verziók"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Honlap"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Nincs"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Nincs képfelirat"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Nincs előnézet."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Frissítés"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Támogató e-mail cím"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "A fejlesztő nem adott meg támogató e-mail címet."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Támogató URL"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "A fejlesztő nem adott meg támogató URL-t."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Megbízható"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Nincsenek verziók."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Mégse és vissza"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Igen, letiltás"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Biztosan letiltja ezt a kiegészítőt?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "A kiegészítő letiltása azt jelenti, hogy nem jelenik meg a kereséseknél "
-#~ "és a felsorolásokban. Nem lesz letölthető a webhelyről, és nem lesz "
-#~ "javasolva az ügyfélprogramok frissítéskereséseinél. A kiegészítő "
-#~ "gyakorlatilag törölve lesz, bár később visszatérhet, és újra "
-#~ "engedélyezheti, ha szeretné."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "%s letiltása"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Igen, engedélyezés"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Biztosan engedélyezi ezt a kiegészítőt?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "A kiegészítő engedélyezése azt jelenti, hogy ismét megjelenik a "
-#~ "kereséseknél és a felsorolásokban. Letölthető lesz a webhelyről és az "
-#~ "ügyfélprogramok frissítéskereséseinél."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "%s engedélyezése"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Szerző hozzáadása"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Szerző e-mail címe"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Eltávolítás"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Nincsenek kategóriák ehhez a kiegészítőtípushoz."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Szerzők"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Ikon hozzáadása"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Ikon módosítása"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "A felhasználók megtekinthetik online a forrást"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Kategóriák"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Alapértelmezett területi beállítások"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Csak a létező ikon törlése"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Új ikonfájl"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Ikon"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "további infók röviden (pl. a helyi dialektus neve)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Frissítés"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">területi "
-#~ "beállítás egyszerű neve</a> pl. „en-US�"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "A bejelölt fájlok törölve lesznek."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Fájlok"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Célalkalmazások"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Nincsenek fájlok."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Megjegyzések az értékelőnek"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Frissítés"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Az összefoglaló legfeljebb 250 karakter lehet.\n"
-#~ "(Beírva %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "A kiegészítő neve már szerepel az adatbázisban. Győződjön meg arról, "
-#~ "hogy: <br /><li>A GUID-ok egyeznek-e. A hiba leggyakoribb oka, hogy a "
-#~ "GUID-ok nem egyeznek.</li><li>Nincs-e duplikált bejegyzés az "
-#~ "adatbázisban? Ha van, akkor frissítenie vagy törölnie kell azt a "
-#~ "bejegyzést, és újra megpróbálni.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr ""
-#~ "�rja le, hogy milyen módosítások történtek ebben a kiegészítőfrissítésben."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Nem minden fájl GUID-ja egyezik"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Ennek a kiegészítőnek ezen a platformon már van egy megegyező verziója (%"
-#~ "s)."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "A jelöléshez meg kell adnia a kért részleteket."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Egy kiegészítő előzetes kiadása nem jelölhető."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Csak a homokozóban levő kiegészítők jelölhetők."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Hiba történt az adatok mentése közben."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Nincs joga frissíteni ezt a kiegészítőt."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Másik platformfájl hozzáadása"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Szerző hozzáadása"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Eltávolítás"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Az új kiegészítőtípus kategóriái a következő lépésben lesznek elérhetők."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Nincsenek kategóriák ehhez a kiegészítőtípushoz."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Adja meg a kiegészítőjének leírását."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Adja meg a kiegészítőjének nevét."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Elküldés előtt adja meg a kiegészítőjének típusát."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Adjon meg egy összefoglalót a kiegészítőjéről."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Kiegészítő fájlja"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Kiegészítő fájlja 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Kiegészítő fájlja 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Kiegészítő típusa"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "A felhasználók megtekinthetik online a forrást"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Szerző e-mail címe"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Szerzők"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Kategóriák"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Alapértelmezett területi beállítások"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Leírás"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Végfelhasználói licencszerződés (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Ez a kiegészítő külső szoftvert igényel"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Fájlok"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Honlap"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Ikonfájl"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Név"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Támogatott platformok"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Ez egy előzetes kiadás"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Adatvédelmi nyilatkozat"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Ez egy webhelyspecifikus kiegészítő"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Összefoglaló"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Támogató e-mail cím"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Támogató URL"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Célalkalmazások"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Verzió"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Megjegyzések a verzióhoz"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Nincs"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Megjegyzések az értékelőnek"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Mivel a kiegészítője megbízható, kiválaszthatja, hogy ez a verzió hova "
-#~ "kerüljön:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Nyilvános"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Homokozó"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Fejlesztői megállapodás"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "1. lépés"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Fájl feltöltése"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "2. lépés"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Kiegészítő leírása"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "3. lépés"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Verzió leírása"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "4. lépés"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Honosítás"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "5. lépés"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Siker"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Saját kiegészítők"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Vissza a kiegészítő leírásához"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatikusan felismert kiegészítőtípus: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "A kiegészítőhöz beállított alapértelmezett területi beállítás (%1$s [%2"
-#~ "$s]) különbözik a jelenleg kijelölt területi beállítástól (%3$s [%4$s]). "
-#~ "Az alábbi mezők kitöltéséhez használja ezt: %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Helytelen?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Biztosan törli a fájlt?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "A jelenlegi kiegészítőinformációk frissítésének kihagyása"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "Jelenleg nem lehet kiegészítőket feltölteni. Jöjjön vissza később."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Elfogadom"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Elutasítom"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Ez a kiegészítőt egy adminisztrátor letiltotta."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Letiltva"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Megbízható"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Nincsenek kiegészítői. Kattintson %s egy beküldéséhez."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "ide"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Ne felejtsen el %s a témájához."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "előnézetet feltölteni"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Verzió szerkesztése"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Verzió sikeresen frissítve."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Új"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Frissített"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Kiegészítőtípusok"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Kor"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Alkalmazások"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platformok"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Beküldési típusok"
-
-#~ msgid "error_notice"
-#~ msgstr "Értesítés"
-
-#~ msgid "forum_save"
-#~ msgstr "Mentés"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Bővítmények"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Kísérleti kiegészítők"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Vissza az előző oldalra"
-
-# %1 is page number, %2 is total page count
-#~ msgid "pagination_page_number_title"
-#~ msgstr "%1$s / %2$s oldal"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s egyező kiegészítő"
-#~ msgstr[1] "%s egyező kiegészítő"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Összesített adatok RSS-forrása"
diff --git a/site/app/locale/id/LC_MESSAGES/messages.po b/site/app/locale/id/LC_MESSAGES/messages.po
index 1cb7fea..f3420e3 100644
--- a/site/app/locale/id/LC_MESSAGES/messages.po
+++ b/site/app/locale/id/LC_MESSAGES/messages.po
@@ -18,169 +18,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Batalkan Pemasangan"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Unduh Sekarang %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Setuju dan Unduh"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Setuju dan Pasang"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Publik"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Diperbarui pada %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versi %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "unduhan"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total unduhan"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "unduhan mingguan"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s pengaya"
 msgstr[1] "%1$s pengaya"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per halaman"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Urut berdasar:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "eksperimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "rekomendasi kami"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s tidak tersedia untuk %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Kembali ke %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Kembali ke tinjauan..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Peringkat:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Tinjauan:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Kirim tinjauan anda"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Tambah tinjauan untuk %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Judul/Ringkasan:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Hapus"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Balas"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Yakin akan menghapus tinjauan ini?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Tidak"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ya"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Hapus Tinjauan"
 
@@ -189,7 +180,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Tinjauan sukses dihapus."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Sunting Tinjauan untuk %s"
@@ -203,18 +194,18 @@ msgstr ""
 "karakter. Jumlah karakter yang Anda tulis: %1$S."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Catatan: Sebelum tinjauan anda muncul pada situs publik, tinjauan akan "
 "dimoderasi oleh penyunting."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Balasan dari pengembang kepada:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -235,171 +226,131 @@ msgid "addon_review_pagetitle"
 msgstr "Tinjauan untuk %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Balasan oleh %1$s pada %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Balasan Pengembang:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Tinjauan anda sukses disimpan. Terima kasih!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "oleh %1$s pada %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "oleh %1$s pada %2$s (peringkat %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Pengaya Berikutnya"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Pengaya Sebelumnya"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Taut permanen ke versi ini"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Versi terbaru yang kompatibel dengan %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Kirim"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Tampilkan profil penyusun"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Jelajahi semua Tema :: Pengaya %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Jelajahi %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Jelajahi Tema %1$s :: Pengaya %2$s"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Tambahkan tinjauan"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detil Lebih Lanjut"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategori"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "form tinjauan"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Tidak suka"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Sunting tinjauan anda"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Pengaya ini memiliki kebijakan privasi."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Benci"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentar Pengembang"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Beranda"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Tinjauan"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Layanan Dukungan"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Suka"
 
@@ -407,23 +358,19 @@ msgstr "Suka"
 msgid "addons_display_long_description"
 msgstr "Deskripsi Lengkap"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Sangat suka sekali"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Gambar Lainnya"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Pengaya lain dari %1$s"
@@ -432,14 +379,14 @@ msgstr[1] "Pengaya lain dari penyusun ini"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -447,7 +394,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -455,20 +402,21 @@ msgstr ""
 "email ke %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Dukungan untuk pengaya ini disediakan oleh pengembang di %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Peringkat"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Sangat suka"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Mohon tidak mengirimkan laporan bug atau kesalahan pada form tinjauan. Kami "
@@ -476,45 +424,50 @@ msgstr ""
 "mereka butuhkan untuk menghubungi anda agar masalah anda dapat diselesaikan."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Petunjuk tentang Tinjauan</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Lihat <a href=\"%1$s\">bagian dukungan</a> untuk mencari tahu di mana anda "
 "menemukan bantuan untuk pengaya ini."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Simpan"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Tampilkan Semua Pengaya %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Tampilkan semua tinjauan (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Tampilkan Semua Versi"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Riwayat Versi Lengkap"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Tampilkan kode sumber"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Tampilkan statistik"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Pendapat anda?"
 
@@ -522,226 +475,108 @@ msgstr "Pendapat anda?"
 msgid "addons_display_workswith"
 msgstr "Bekerja pada:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "oleh"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Rekomendasi Kami"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Pengaya (Add-on) memperkaya %1$s, membuat penjelajahan web anda lebih "
 "personal. Silakan melihat-lihat dan buat %1$s sesuai keinginan anda."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Terbaru:"
 
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Aplikasi Lain"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Pengaya %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Terpopuler:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Rekomendasi Kami:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Baru Dimutakhirkan:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Tampilkan semua"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Tampilkan semua pengaya yang baru dibuat"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Tampilkan pengaya populer"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Tampilkan semua rekomendasi pengaya"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Tampilkan semua pengaya yang versinya dimutakhirkan"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Klik tautan di bawah untuk disimpan sebagai berkas.</li><li>Di "
@@ -749,11 +584,11 @@ msgstr ""
 "Pasang, dan pilih berkas yang anda unduh sebelumnya dan klik \"OK\".</li></"
 "ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Cara Memasang di Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Klik kanan tautan di bawah dan pilih \"Simpan Tautan dengan Nama..."
@@ -762,42 +597,39 @@ msgstr ""
 "Pasang, dan pilih berkas yang anda unduh sebelumnya dan klik \"OK\".</li></"
 "ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Cara Memasang di Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "tampilkan pengaya eksperimental"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Buka"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Oleh"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "untuk Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "untuk Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "untuk Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -805,11 +637,11 @@ msgstr ""
 "informasi lebih lanjut tentang plugin untuk browser berbasis Mozilla "
 "lainnya, kunjungi %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Mencari plugin yang tidak ada di sini?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugin membantu browser untuk fungsi tertentu seperti menampilkan format "
@@ -818,24 +650,24 @@ msgstr ""
 "sebelumnya."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin yang Umum untuk %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentasi Dukungan: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -843,42 +675,37 @@ msgstr ""
 "Agreement-EULA) sebelum pemasangan dapat dilanjutkan:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Pratinjau %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Dari sekian banyak pengaya yang bagus yang tersedia, pasti ada satu yang "
 "cocok dengan selera anda. Untuk memulai, berikut adalah daftar pengaya "
 "terpopuler. Selamat menikmati!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Pengaya yang Direkomendasikan"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Pengaya yang Direkomendasikan"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Informasi terkait"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Maaf, anda membutuhkan browser berbasis Mozilla (seperti Firefox) untuk "
@@ -893,42 +720,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Pelajari cara %1$s di %2$s (dalam Bahasa Inggris)."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "membuat sendiri"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Jelajahi lebih banyak mesin pencari di %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Mesin Pencari"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Terima kasih khusus kepada Proyek Mycroft atas hasil karyanya untuk Mesin "
 "Pencari Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -970,17 +798,17 @@ msgstr "Versi Tidak Lengkap"
 msgid "addons_status_nominated"
 msgstr "Dalam Sandbox; Nominasi Publik"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Dalam Sandbox; Tinjauan Ditunda"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Publik"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Dalam Sandbox"
@@ -989,38 +817,26 @@ msgstr "Dalam Sandbox"
 msgid "addons_status_unknown"
 msgstr "Tidak Dikenali"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Informasi lebih lanjut tentang pengaya ini"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Hati-hati dengan Versi Lama"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Versi berikut ditampilkan sebagai referensi dan untuk tujuan pengujian. "
 "Sebaiknya anda harus selalu menggunakan versi terbaru pengaya."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Riwayat Versi dengan Log Perubahan (Changelog)"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Riwayat Versi %1$s"
@@ -1055,467 +871,153 @@ msgstr "Admin Grup"
 msgid "admin_group_saved"
 msgstr "Grup telah disimpan"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Canggih"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Kapan saja"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Semua"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Apapun"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplikasi"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Kata yang Cocok"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Terakhir Diperbarui"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nama"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Terbaru"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 bulan terakhir"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 bulan terakhir"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Hari ini"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Sebulan terakhir"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Seminggu terakhir"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Setahun terakhir"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Item Per Halaman"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitas"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Peringkat"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Urut berdasar"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "hingga"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Aktif/matikan mode pencarian canggih"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Jenis"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versi"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Abaikan pengecekan versi"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Hanya untuk versi lama Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Anda dapat <a href=\"%1$s\">mencoba versi yang lebih lama</a> atau <a href="
 "\"#\" onclick=\"%2$s\">mengabaikan proses pemeriksaan ini</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Versi <a href=\"%1$s\">yang lama</a> mungkin dapat bekerja"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Pengaya ini membutuhkan versi <a href=\"%1$s\">Firefox %2$s</a> yang belum "
 "dirilis"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Perbarui Firefox</a> anda untuk "
 "menggunakan pengaya ini"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Urut Nama"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Pengaya Baru"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Pengaya Terpopuler"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Urut Peringkat"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Pengaya yang Baru Dimutakhirkan"
 
@@ -1524,923 +1026,108 @@ msgid "categories_current_title"
 msgstr "Kategori Sekarang"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategori"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Pilih kategori"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Tampilkan Semua %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Tampilkan Semua Rekomendasi Pengaya"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Peringkat Tertinggi"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Paling Terakhir Diperbarui"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Paling Populer"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Tampilkan Semua %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Koleksi tidak ditemukan!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "%s ditambahkan"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Pusat Kompatibilitas Pengaya"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Persiapkan selalu untuk rilis %1$s dengan perangkat dan informasi yang "
 "tersedia melalui komunitas Pengaya %2$s yang ada di bawah ini."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Memuat data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Kembali ke Utama"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Laporan Kompatibilitas Pengaya"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informasi untuk Pengembang Pengaya"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Sesuaikan maxVersion tanpa mengunggah lagi"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Perikas Status Pengaya Saya"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Jika anda memiliki pengaya yang diletakkan di situs Pengaya Mozilla, <a href="
 "\"%1$s\">silakan log-masuk</a> untuk menganalisis status pengaya anda untuk %"
 "2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr ""
 "Anda tidak memiliki pengaya yang diletakkan pada situs Pengaya Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Hasil Pemeriksaan Status Pengaya"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Mengambil status pengaya yang diletakkan di sini..."
 
@@ -2448,119 +1135,119 @@ msgstr "Mengambil status pengaya yang diletakkan di sini..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s pengguna (total %3$s&#37;)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Pengaya berikut memiliki penggunaan hingga 95% yang diketahui Mozilla dan "
 "diurut berdasar ukuran penggunaannya."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Tampilkan Laporan Detail"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Dari sebanyak %1$s pengaya yang memiliki penggunaan hingga 95&#37; yang "
 "diketahui Mozilla, <b>%2$s&#37;</b> dapat dipertimbangkan sebagai kompatibel "
 "dengan build terakhir %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versi Alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Pengaya yang kompatibel dengan versi alfa %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versi Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Pengaya yang kompatibel dengan versi beta atau kandidat rilis %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Versi Terbaru"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Pengaya sudah up-to-date dengan build terakhir %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Versi Lainnya"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Pengaya yang tidak kompatibel dengan versi %1$s apapun"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Laporan Kompatibilitas Pengaya"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informasi untuk Pengguna Pengaya"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Tampilkan Laporan Kompatibilitas"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Untuk informasi cara berkontribusi, silakan kunjungi %s kami."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "halaman wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla mengucapkan terima kasih kepada pihak-pihak berikut atas kontribusi "
 "mereka kepada proyek addons.mozilla.org selama ini:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Pengembang"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Penyunting"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Alih Bahasa"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Kontributor Lainnya"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Pengembang Sebelumnya"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Perangkat Lunak dan Gambar"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Beberapa ikon yang digunakan berasal dari <a href=\"http://www.famfamfam.com/"
@@ -2568,7 +1255,7 @@ msgstr ""
 "href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2579,20 +1266,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2627,25 +1311,25 @@ msgstr "Panel Statistik"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2654,6 +1338,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(deteksi otomatis)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Versi pengaya anda tidak menyebutkan kompatibilitas dengan Firefox %1$s. "
+"Mozilla berharap versi terbaru Firefox akan dirilis secepatnya. Oleh karena "
+"itu, mohon pengaya anda diuji pada versi baru Firefox dan perbarui informasi "
+"kompatibilitas yang berkaitan. Anda dapat membaca tentang hal tersebut <a "
+"href=\"%2$s\">di sini</a>. Tulisan ini hanya bersifat peringatan dan anda "
+"tetap dapat melanjutkan proses pengajuan versi ini kepada addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Buka di jendela baru"
@@ -2690,76 +1387,141 @@ msgstr "Langkah ke-5: Sukses"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Bantuan untuk Pengajuan"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Pengaya sukses dimatikan"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Ubah Pengaya"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Pengaya sukses diaktifkan"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Deskripsi Pengaya"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Beranda Pengaya"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nama Pengaya"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Judul Pratinjau"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Kebijakan Privasi"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Ringkasan Pengaya"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Email Layanan Dukungan"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL Layanan Dukungan"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Catatan Versi"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Calonkan Pengaya"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Pengaya sukses dicalonkan!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2795,7 +1557,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2805,6 +1567,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2816,13 +1583,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2832,7 +1599,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2842,12 +1609,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2856,14 +1623,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -2942,13 +1709,122 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Kunjungi halaman %1$s untuk membuat perubahan pada pengaya yang anda ajukan, "
+"atau %2$s untuk kembali ke Perangkat Pengembang."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "klik di sini"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Ubah Pengaya"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Versi ini telah ditempatkan di sandbox untuk menunggu proses peninjauan dari "
+"para penguji sandbox dan seorang penyunting dari pihak Mozilla. Jika sudah "
+"ada aksi yang dilakukan maka anda akan diberitahu melalui email."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Anda dapat membaca tentang Sistem Peninjauan Sandbox %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "di sini"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Versi ini telah ditempatkan pada sandbox untuk digunakan oleh pengguna "
+"berpengalaman. Agar dapat tampil pada situs publik, anda harus %s pengaya "
+"anda dan melewati proses peninjauan."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "mencalonkan"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Pengajuan pengaya anda sukses."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Oleh karena pengaya ini terpercaya, versi ini secara otomatis disetujui "
+"untuk tampil pada situs publik."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Ajukan Pengaya"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Pengaya sukses diperbarui"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Mungkin anda ingin untuk %s agar pengaya anda lebih menarik."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "mengunggah pratinjau"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Tidak ada penyusun ditemukan [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Hapus"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Batal"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Yakin akan membatalkan pengajuan?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Lanjut"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Ganti jenis pengaya:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Komentar Pengembang diperbarui."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3025,37 +1901,181 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Tambah Pratinjau"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Penyusun"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Penyusun"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Tidak ada"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategori"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategori"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Deskripsi"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Dimatikan"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detil"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Komentar Pengembang"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Pratinjau"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versi"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Beranda"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Tidak Ada"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Tanpa Judul"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Tidak ada pratinjau ditemukan."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Perbarui"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Email Layanan Dukungan"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Tidak ada email layanan dukungan yang disediakan pengembang."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL Layanan Dukungan"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Tidak ada URL layanan dukungan yang disediakan pengembang."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Terpercaya"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versi %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Tidak ada versi ditemukan."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Batal dan kembali"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Ya, matikan"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Yakin akan mematikan pengaya ini?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Mematikan pengaya ini akan berakibat pengaya ini akan disembunyikan dari "
+"pencarian dan daftar pengaya. Pengaya juga tidak akan dapat diunduh dari "
+"situs dan tidak akan tersedia pada pemutakhiran versi dari aplikasi. Secara "
+"singkat, pengaya akan 'dihapus'. Akan tetapi anda dapat kembali mengunjungi "
+"situs sini dan mengaktifkannya lagi."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Matikan %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Ya, aktifkan"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Yakin akan mengaktifkan pengaya ini?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Mengaktifkan pengaya ini akan berakibat pengaya ini akan segera tampil pada "
+"pencarian dan daftar pengaya. Pengaya juga akan dapat diunduh dari situs dan "
+"juga dari pemeriksaan versi baru dari aplikasi."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Aktifkan %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Tambah Balasan"
@@ -3102,62 +2122,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "ditulis oleh %1$s pada %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Tambah Penyusun"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Alamat Email Penyusun"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Hapus"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3170,30 +2202,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3272,22 +2304,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3296,12 +2328,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3309,12 +2341,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3323,24 +2355,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3348,7 +2380,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3373,42 +2405,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Tidak ada kategori yang cocok dengan jenis pengaya ini."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Penyusun"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Tambah Ikon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Ganti Ikon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Izinkan pengguna untuk melihat kode sumber secara online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategori"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Bahasa (Locale) Default"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Pengaya ini membutuhkan perangkat lunak eksternal"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Hanya bersihkan ikon yang ada"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Berkas Ikon Baru"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Keterangan Bahasa (Locale) Tambahan"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Masih prarilis"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Pengaya ini hanya untuk situs tertentu"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Bahasa (Locale)"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "keterangan tambahan singkat (contohnya nama dialek bahasa)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3416,12 +2513,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3429,60 +2526,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3491,32 +2588,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3524,22 +2621,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3547,12 +2644,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3560,39 +2657,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Perbarui"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\"><em>simple "
+"locale name</em></a>, contohnya 'en-US' atau 'id'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3679,14 +2786,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Pemutakhiran Tertunda (%s)"
 msgstr[1] "Pemutakhiran Tertunda (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Berkas yang ditandai akan dihapus."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Berkas"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplikasi Target"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Tidak ada berkas."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Catatan untuk Peninjau"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Perbarui"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Anda tidak mempunyai hak akses pada pengaya tersebut."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Jumlah karakter untuk ringkasan dibatasi sebanyak 250 karakter.\n"
+"(Anda memasukkan %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Nama pengaya anda telah ada pada basis data. Pastikan bahwa: <br /><li>GUID "
+"pengaya sesuai. Kesalahan umum yang sering terjadi adalah karena GUID tidak "
+"cocok.</li><li>anda tidak mempunyai entri ganda pada basis data. Jika ada, "
+"anda seharusnya memperbarui entri tersebut atau hapus entri tersebut dan "
+"coba lagi.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3700,10 +2862,9 @@ msgstr "Silakan lihat referensi di %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "halaman ini"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Ceritakan perubahan yang terjadi pada versi baru pengaya ini."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3721,6 +2882,10 @@ msgstr ""
 "Ekstensi berkas (%s) tidak diizinkan untuk digunakan pada jenis pengaya yang "
 "dipilih. Silakan gunakan salah satu dari daftar di bawah ini: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Tidak semua GUID berkas cocok"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Mohon tidak memilih lebih dari lima kategori."
@@ -3755,7 +2920,14 @@ msgstr ""
 "Ekstensi berkas (%s) tidak diizinkan untuk digunakan sebagai ikon. Silakan "
 "gunakan salah satu dari daftar di bawah ini: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Versi yang sama (%s) telah ada untuk pengaya dan platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Tidak ada berkas install.rdf pada pengaya."
 
@@ -3763,7 +2935,7 @@ msgstr "Tidak ada berkas install.rdf pada pengaya."
 msgid "devcp_error_install_manifest"
 msgstr "Kesalahan berikut ditemukan pada berkas install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Mohon pilih jenis pengaya yang sah."
 
@@ -3834,6 +3006,19 @@ msgstr "Tidak ada ID yang ditemukan pada berkas install.rdf pada pengaya ini."
 msgid "devcp_error_no_platform"
 msgstr "Tidak ada platform yang dipilih"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Anda harus mengisi informasi yang diminta untuk proses pencalonan."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr ""
+"Anda tidak dapat mencalonkan pengaya yang sedang dalam status prarilis."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Anda hanya dapat mencalonkan pengaya yang berada pada sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Pilih paling sedikit satu kategori."
@@ -3851,6 +3036,16 @@ msgstr ""
 "Ekstensi berkas ini (%s) tidak diizinkan untuk diunggah sebagai pratinjau. "
 "Silakan gunakan salah satu dari daftar di bawah ini: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Kesalahan saat menyimpan data anda."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Anda tidak diizinkan untuk memperbarui pengaya ini."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3863,98 +3058,293 @@ msgstr ""
 "Pengaya tidak diperbolehkan menggunakan tautan updateURL eksternal. Mohon "
 "hapus tautan dari install.rdf dan coba lagi."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Mohon unggah satu berkas."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Tambah Berkas untuk Platform Lain"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Tambah Penyusun"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Hapus"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Kategori pengaya anda akan tersedia pada langkah berikutnya."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Tidak ada kategori yang cocok yang tersedia untuk jenis pengaya ini."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Isi deskripsi pengaya anda."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Isi nama pengaya anda."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Pilih jenis pengaya yang anda ajukan."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Isi ringkasan tentang pengaya anda."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Berkas Pengaya"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Berkas Pengaya 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Berkas Pengaya 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Jenis Pengaya"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Izinkan pengguna untuk membaca kode sumber secara online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Alamat Email Penyusun"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Penyusun"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategori"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Bahasa (Locale) Default"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Deskripsi"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Perjanjian Lisensi End-User (End User License Agreement-EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Pengaya ini membutuhkan perangkat lunak eksternal"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Berkas"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Beranda"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Berkas Ikon"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nama"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Platform yang Didukung"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Masih prarilis"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Kebijakan Privasi"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Pengaya ini untuk hanya bekerja situs tertentu"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Ringkasan"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Email Layanan Dukungan"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL Layanan Dukungan"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplikasi Target"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versi"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Catatan Versi"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Tidak Ada"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Catatan untuk Peninjau"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Oleh karena pengaya anda terpercaya, silakan pilih ke mana versi ini akan "
+"ditempatkan:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publik"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Perjanjian Pengembang"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Langkah Pertama"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Unggah Berkas"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Langkah ke-2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detil Pengaya"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Langkah ke-3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detil Versi"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Langkah ke-4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Bahasa (Localization)"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Langkah ke-5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Sukses"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Pengayaku"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Isian Alih Bahasa"
@@ -3970,12 +3360,12 @@ msgstr ""
 "ditampilkan bahasa yang default (%s). "
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Perangkat Admin"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Perangkat Penyunting"
 
@@ -3984,28 +3374,28 @@ msgid "devcp_myaddons_link"
 msgstr "Pengayaku"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Kembali ke Awal"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Panel Statistik"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Ajukan Pengaya"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Perangkat Pengembang"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4017,26 +3407,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Kembali ke detil pengaya"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Calonkan %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Deteksi otomatis jenis pengaya: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4050,6 +3451,17 @@ msgstr ""
 "Menghapus pratinjau berikut akan menyebabkan pratinjau lain (jika ada) "
 "secara otomatis menjadi pratinjau default."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Bahasa (locale) default pengaya ini (%1$s [%2$s]) berbeda dengan bahasa yang "
+"anda pilih (%3$s [%4$s]). Isian berikut harus dilengkapi dalam %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4057,14 +3469,14 @@ msgstr ""
 "Jika pratinjau ini disetel sebagai pratinjau default, status default pada "
 "pratinjau yang lama akan dihapus."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4093,46 +3505,46 @@ msgstr "Ubah Pratinjau"
 msgid "devcp_preview_updated_successfully"
 msgstr "Pratinjau sukses diperbarui."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4140,7 +3552,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4158,7 +3570,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Tambah Pratinjau"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4167,7 +3579,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Ubah Pratinjau"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4180,27 +3592,27 @@ msgstr "Berkas Pratinjau"
 msgid "devcp_previews_label_makedefault"
 msgstr "Jadikan sebagai gambar pratinjau default"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4224,18 +3636,26 @@ msgstr "Ubah Pratinjau"
 msgid "devcp_previews_submit_upload"
 msgstr "Unggah Pratinjau"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Salah?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Yakin akan menghapus berkas ini?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Mohon dibaca dan disetujui Perjanjian Pengembang berikut sebelum melanjutkan."
@@ -4247,7 +3667,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4259,6 +3679,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Lewati pemutakhiran informasi pengaya yang ada"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4362,17 +3786,61 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Fitur Pengajuan Pengaya sedang dimatikan. Mohon kembali lagi nanti."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Saya Setuju"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Saya Tidak Setuju"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Pengaya ini telah dimatikan oleh administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Dimatikan"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Terpercaya"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Versi Terbaru:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Anda tidak mempunyai pengaya. Klik %s untuk mengajukan."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "di sini"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Pastikan untuk %s untuk tema anda."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "mengunggah pratinjau"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4380,44 +3848,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4427,7 +3895,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4435,64 +3903,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4501,7 +3969,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4513,33 +3981,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4552,29 +4015,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4585,12 +4048,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4614,23 +4077,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4639,7 +4097,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4648,14 +4106,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4665,7 +4123,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4673,7 +4131,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4681,22 +4139,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4715,29 +4167,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Silakan lihat %s untuk referensi."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "halaman ini"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Ubah Versi"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versi sukses diperbarui."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4806,34 +4261,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4841,49 +4296,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4893,59 +4343,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4954,26 +4397,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5016,7 +4459,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Pengaya ini dimatikan"
 
@@ -5060,7 +4503,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter berdasar jenis/aksi"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Log Event"
 
@@ -5122,7 +4565,7 @@ msgstr "Tampikan entri sejak %s hingga %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Tidak ada tinjauan untuk periode ini."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Log Tinjauan"
 
@@ -5146,24 +4589,24 @@ msgstr "Aktivitas Penyunting Terbaru"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Tinjauan"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Tinjau Pengaya"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Mohon lengkapi isian berikut:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Silakan pilih minimum satu berkas untuk ditinjau."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Tinjauan untuk pengaya milik diri sendiri tidak diizinkan."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Perangkat Lunak Eksternal"
 
@@ -5175,39 +4618,39 @@ msgstr "Tambah pengaya istimewa"
 msgid "editors_featured_add_feature_submit"
 msgstr "Tambah"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Gagal menambah pengaya istimewa."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Sukses menambah pengaya istimewa."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Gagal menyunting pengaya istimewa."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Sukses menyunting pengaya istimewa"
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Satu atau lebih bahasa (locale) tidak sah."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Gagal menghapus pengaya istimewa."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Sukses menghapus pengaya istimewa."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Pengaya Istimewa"
 
@@ -5219,195 +4662,132 @@ msgstr "Kirim"
 msgid "editors_featured_remove_feature"
 msgstr "Hapus pengaya istimewa"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Antrian Filter"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Tautan yang Berkaitan"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Petunjuk untuk Penyunting"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Kebijakan Pengaya"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Filter ini akan tetap berlaku untuk sesi ini atau hingga dibersihkan."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Tidak ada pengaya yang berada pada jenis tinjauan ini."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 hari"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 jam"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 menit"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Perangkat Penyunting"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "hanya %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Prarilis"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Kompatibilitas dengan %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Bersihkan"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Semua tinjauan sedang dimatikan. Mohon kembali lagi nanti."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Aksi Peninjauan"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Permintaan Informasi Lebih Lanjut"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Masukkan ke Status Publik"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Permintaan Tinjauan-Super"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Tetapkan dalam Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Tinjau Komentar"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "Gunakan formulir ini untuk meminta informasi tambahan dari penyusun. "
 "Penyusun akan menerima email dan dapat menjawabnya di sini. Anda akan "
 "diberitahukan melalui email ketika ada balasan."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Ini akan menandai pengaya dan versi terbarunya dengan status publik. Versi "
 "yang akan datang akan tetap berada pada sandbox sampai ditinjau oleh seorang "
 "penyunting."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Ini akan menetapkan pengaya dalam status sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Ini akan menetapkan persetujuan pada versi sandbox untuk ditampilkan pada "
 "situs publik."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Ini berakibat pada versi publik yang berada dalam sandbox akan tetap berada "
 "dalam sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Jika anda mempunyai kekhawatiran yang ingin disampaikan kepada administrator "
@@ -5415,73 +4795,73 @@ msgstr ""
 "masukkan komentar pada isian di bawah ini. Data ini akan dikirimkan kepada "
 "administrator, bukan kepada penyusun."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Bandingkan dengan versi publik"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Tampilkan Isi"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Penyusun:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategori:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitas:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Deskripsi"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentar oleh Pengembang"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Berkas:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Riwayat Item"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Pesan Pencalonan"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Pratinjau"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Kebijakan Privasi"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Tinjau %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Catatan untuk Peninjau"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Ringkasan"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Catatan Versi"
 
@@ -5509,7 +4889,7 @@ msgstr "Persetujuan Pencalonan/Publik"
 msgid "editors_review_history_nominated_denied"
 msgstr "Penolakan Pencalonan/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Tidak ada entri tinjauan ditemukan."
 
@@ -5536,92 +4916,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Tampilkan/Sembunyikan Balasan (%1$s)"
 msgstr[1] "Tampilkan/Sembunyikan Balasan (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplikasi:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "atau pilih balasan tertentu:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentar:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistem Operasi:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Atas"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "selanjutnya &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Tidak ada pratinjau ditemukan."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; sebelumnya"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Antrian Tinjauan"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> dari %2$s dalam antrian"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Proses Aksi"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Aksi"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentar"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Tanggal"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Peninjau"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versi/Berkas"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Kirim pemberitahuan kepada saya saat pengaya ini dimutakhirkan (Pemutakhiran "
 "berikutnya tidak akan menyebabkan email dikirim)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Tinjauan sukses diproses."
 
@@ -5645,7 +5012,7 @@ msgstr "Aksi"
 msgid "editors_reviews_in_reply_to"
 msgstr "Balasan untuk:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Tinjauan sukses diproses!"
 
@@ -5657,82 +5024,87 @@ msgstr "Tidak ada tinjauan pada antrian moderasi."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Proses Tinjauan"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Situs Tertentu"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Baru"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Diperbarui"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplikasi yang Diujikan"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistem Operasi yang Diujikan"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informasi Lain"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Pengaya"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Jenis"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Jenis Pengaya"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Umur"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplikasi"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Dibatasi untuk bahasa (locale)?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platform"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Jenis Pengajuan"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s hari"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s jam"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s menit"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Akses ditolak"
 
@@ -5740,19 +5112,17 @@ msgstr "Akses ditolak"
 msgid "error_access_denied_message"
 msgstr "Anda tidak diizinkan untuk membuka halaman ini."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5761,14 +5131,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Pengaya tidak ditemukan!"
 
@@ -5780,54 +5147,58 @@ msgstr "Tidak ada pengaya pada kategori ini!"
 msgid "error_addon_selfreview"
 msgstr "Anda tidak bisa memberikan tinjauan kepada pengaya anda sendiri."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Tidak ada pengaya pada kategori ini!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Alamat email ini tidak sah."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Isian ini tidak boleh kosong."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Berkas tidak ditemukan!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Kesalahan pada berkas: %s tidak ada."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Ada kesalahan pada form ini. Mohon dikoreksi kemudian kirim ulang."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Kata atau angka yang anda ketikkan salah, silakan coba lagi!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Format URL salah. Format yang benar adalah seperti http://example.com/"
@@ -5835,46 +5206,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argumen tidak lengkap: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Tidak ada berkas"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Perhatian"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Pratinjau tidak ditemukan!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Anda harus memilih salah satu peringkat."
 
@@ -5882,47 +5241,38 @@ msgstr "Anda harus memilih salah satu peringkat."
 msgid "error_user_already_confirmed"
 msgstr "Akun pengguna ini sudah dikonfirmasi."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Kode konfirmasi tidak cocok!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Kata sandi yang dimasukkan tidak cocok."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Alamat email ini sudah digunakan pengguna lain."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Proses perubahan email telah kadaluarsa. Mohon ganti alamat email anda lagi "
 "pada profil pengguna anda dan klik tautan pada email yang dikirimkan kepada "
 "anda untuk mengkonfirmasi perubahan alamat email tersebut."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Nama alias (nick) sudah diambil."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Pengguna tidak ditemukan!"
 
@@ -5932,42 +5282,39 @@ msgstr ""
 "Mohon akun anda dikonfirmasi terlebih dahulu dengan kode yang telah dikirim "
 "melalui email yang anda terima."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Nama pengguna atau kata sandi salah!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versi tidak ditemukan!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Kata sandi salah!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Lebih lanjut"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lebih lanjut tentang %s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "Satu tinjauan"
 msgstr[1] "%1$s tinjauan"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "tampilkan lebih banyak dari kategori"
 
@@ -6006,43 +5353,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Hak Cipta dilindungi undang-undang."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Hak Cipta"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Kredit"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla menyediakan tautan ke aplikasi ini dengan alasan kesopanan dan tidak "
@@ -6050,98 +5396,91 @@ msgstr ""
 "dengannya. Semua pertanyaan, keluhan, atau klaim tentang aplikasi tersebut "
 "harus langsung ditujukan kepada vendor perangkat lunak yang bersangkutan."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Kirim"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Pernyataan Hukum"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Bahasa lainnya:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Kebijakan Privasi"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Simpan"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Kamus"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Kamus"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Ekstensi"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Ekstensi"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Paket Bahasa (Pengaya)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paket Bahasa (Pengaya)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Paket Bahasa (Aplikasi)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paket Bahasa (Aplikasi)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugin"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Mesin Pencari"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Mesin pencari"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Tema"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Kembali ke beranda Pengaya %1$s"
@@ -6150,95 +5489,37 @@ msgstr "Kembali ke beranda Pengaya %1$s"
 msgid "header_main_firefox_header"
 msgstr "Pengaya Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Pengaya"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Pengaya Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Pengaya Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Pengaya Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Pengaya"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Log-masuk"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Log-keluar"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Akun Saya"
 
@@ -6246,72 +5527,49 @@ msgstr "Akun Saya"
 msgid "header_navlink_register"
 msgstr "Daftar"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Gambar Pratinjau %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log-Masuk</a> untuk memasang pengaya ini. <a href=\"%2$s"
 "\">Mengapa</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Pasang untuk %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Pasang %1$s untuk %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Unduh %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Pengaya ini tidak tersedia."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Daftar paket bahasa dan kamus."
 
@@ -6323,8 +5581,8 @@ msgstr "Unduh Kamus"
 msgid "langtools_download_langpack"
 msgstr "Unduh Paket Bahasa"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Kamus & Paket Bahasa"
 
@@ -6336,80 +5594,36 @@ msgstr "Pasang Kamus"
 msgid "langtools_install_langpack"
 msgstr "Pasang Paket Bahasa"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Kamus"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Paket Bahasa"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Bahasa"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klik di sini untuk kembali ke halaman utama."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Tanggal"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Unduhan"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nama"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Peringkat"
@@ -6434,20 +5648,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Kamus & Paket Bahasa"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugin"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Tema"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Temukan pengaya untuk aplikasi lain"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "lainnya"
 
@@ -6455,34 +5676,12 @@ msgstr "lainnya"
 msgid "page_title_appversions"
 msgstr "Versi Aplikasi"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Kredit"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Pengaya Eksperimental"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -6512,15 +5711,15 @@ msgstr "Sistem Peninjauan Sandbox"
 msgid "page_title_submissionhelp"
 msgstr "Bantuan Pengajuan"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versi Aplikasi yang Sah"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Pengaya yang diajukan ke Pengaya Mozilla harus memiliki berkas install.rdf "
@@ -6528,7 +5727,7 @@ msgstr ""
 "ini. Hanya versi di bawah ini yang diizinkan untuk aplikasi tersebut."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6538,15 +5737,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "di sini"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versi"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Kembali ke halaman sebelumnya"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Halaman Informasi Sandbox"
 
@@ -6554,6 +5756,12 @@ msgstr "Halaman Informasi Sandbox"
 msgid "pagination_next_page"
 msgstr "selanjutnya"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Halaman %1$s dari %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "sebelumnya"
@@ -6588,15 +5796,15 @@ msgstr ""
 "Jika susah dibaca, Anda dapat <a href=\"%1$s\">mencoba kata lains</a> atau "
 "<a href=\"%2$s\">mendengarkan sesuatu</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Benarkah anda manusia?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Apa artinya?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Kesalahan terjadi saat menandai tinjauan ini!"
 
@@ -6604,7 +5812,7 @@ msgstr "Kesalahan terjadi saat menandai tinjauan ini!"
 msgid "review_flag_reason_bug_support"
 msgstr "Laporan kesalahan atau permintaan layanan dukungan yang salah sasaran"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Laporkan tinjauan ini (dan pilih alasannya)"
 
@@ -6620,8 +5828,8 @@ msgstr "Lainnya (silakan tulis)"
 msgid "review_flag_reason_spam"
 msgstr "Spam atau isi yang tidak dapat ditinjau"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Terima kasih, tinjauan ini telah ditandai untuk mendapatkan persetujuan "
@@ -6638,7 +5846,7 @@ msgstr ""
 "sini untuk menandai tinjauan ini agar ditinjau oleh penyunting."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Perhatikan tips berikut ini:</p><ul><li>Tulislah tinjauan seperti anda "
@@ -6659,131 +5867,101 @@ msgstr ""
 "untuk pengaya ini</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Tinjauan untuk for %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Rekomendasi Pengaya"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Pengaya Baru"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Versi Baru Pengaya"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Pencarian sedang dimatikan. Mohon coba lagi nanti."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "semua pengaya"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "cari pengaya"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Cari pengaya"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klik untuk mengetikkan kata yang dicari"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "di"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Semua Mesin Pencari"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Jelajahi Mesin Pencari"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s pengaya yang cocok"
+msgstr[1] "%s pengaya yang cocok"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Tidak ada yang ditemukan."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Cari Pengaya"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed hasil pencarian"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Hasil pencarian untuk: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Perangkat Admin"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Perangkat Pengembang"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Perangkat Penyunting"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Selamat Datang"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Selamat Datang, %s"
@@ -6792,7 +5970,7 @@ msgstr "Selamat Datang, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Kamus"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Rekomendasi Kami"
 
@@ -6800,7 +5978,7 @@ msgstr "Rekomendasi Kami"
 msgid "sidebar_pitch_looking_for"
 msgstr "Saya mencari:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Pengaya Baru"
 
@@ -6808,7 +5986,7 @@ msgstr "Pengaya Baru"
 msgid "sidebar_pitch_search"
 msgstr "Mesin Pencari"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Berlangganan"
 
@@ -6816,23 +5994,24 @@ msgstr "Berlangganan"
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Versi Baru Pengaya"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Belum diperingkat"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Peringkat %s dari 5 bintang"
@@ -6869,13 +6048,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s dibuat"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s dirilis"
@@ -6888,179 +6067,179 @@ msgstr "Tutup"
 msgid "statistics_help_link"
 msgstr "Bantuan"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "atau pilih pengaya lain"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "atau pilih pengaya dengan statistik publik"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Pilih salah satu pengaya anda untuk ditampilkan statistiknya"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Pilih sebuah pengaya untuk ditampilkan statistiknya"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Pilih pengaya dengan statistik publik"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Panel Statistik"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Tampilkan Statistik"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Tampilkan tabel ini dalam format CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "tidak ada"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Hapus plot ini"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Dikelompokkan: Hari"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Dikelompokkan: Bulan"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Dikelompokkan: Mingguan"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Bandingkan dalam: Mingguan"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s ditemukan pada rentang"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Tambahkan plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Tambahkan plot lain pada grafik ini"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Sembunyikan Jumlah Total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Tampilkan Jumlah Total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Buat plot jumlah total pada grafik ini"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Tampilkan data (format CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Ambil berkas Comma Separated Values untuk data ini"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Sembunyikan Event untuk %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Tampilkan Event untuk %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Tampilkan tanggal rilis pengaya di atas plot"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Sembunyikan Event untuk Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Tampilkan Event untuk Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Tampilkan tanggal rilis Firefox di atas plot"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Perkecil Grafik"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Perlebar Grafik"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ganti ukuran grafik"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Pengguna Aktif Harian"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikasi"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Suka-suka"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Jumlah Unduhan"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem Operasi"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status Pengaya"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Ringkasan"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versi Pengaya"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplikasi"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistem Operasi"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Status Pengaya"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Tidak Diketahui"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versi Pengaya"
 
@@ -7098,7 +6277,7 @@ msgstr "Pengaturan baru anda telah disimpan!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Panel Statistik"
 
@@ -7126,105 +6305,109 @@ msgstr "Perkecil"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Perkecil satu bulan"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Ringkasan harian statistik untuk %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Feed RSS data ringkasan"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistik untuk %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Secara default, hanya anda dan pihak Mozilla yang dapat mengakses informasi "
 "pada panel anda. Anda dapat membukanya untuk publik sehingga semua orang "
 "dapat melihat data pengaya anda."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Hak Akses Panel"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Pribadi"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Hanya anda dan pihak Mozilla yang dapat melihat statistik pengaya ini"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Publik"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Semua orang dapat melihat statistik pengaya ini"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ubah Pengaturan"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mohon perlakukan informasi ini secara rahasia."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Panel dalam mode <b>pribadi</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Panel dalam mode <b>publik</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Terkunci"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Kembali ke Panel"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Simpan Pengaturan"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Pengaturan Panel Statistik untuk %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Tidak Terkunci"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Rata-rata Jumlah Unduhan Harian"
 
@@ -7236,7 +6419,7 @@ msgstr "Unduhan"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Perhitungan Harian Terakhir"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Unduhan sejak 7 hari terakhir"
 
@@ -7254,7 +6437,7 @@ msgstr "Sejak %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Belum ada data"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Rata-rata Pengguna Aktif Harian"
 
@@ -7280,70 +6463,53 @@ msgstr "Pengguna Aktif Harian"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Pada %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistik %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Semua Tema"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Jelajahi Tema"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Ganti Alamat Email"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Ubah kata sandi"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Kode konfirmasi telah dikirim ulang!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Akun anda %1$s telah sukses dihapus. Jika nanti anda ingin kembali, anda "
 "dapat mendaftar ulang dari <a href=\"%2$s\">halaman pendaftaran pengguna</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Komunitas Pengaya Mozilla bersedih hati, melihat anda melangkah pergi."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Konfirmasi Kata Sandi"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Hapus akun pengguna saya sekarang"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Anda tidak dapat menghapus akun anda jika akun tersebut terdaftar sebagai "
@@ -7353,63 +6519,63 @@ msgstr ""
 "Setelah itu, baru anda dapat menghapus akun anda dari halaman ini."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Jika anda memiliki pertanyaan lainnya, silakan hubungi %1$s untuk "
 "mendapatkan bantuan."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Anda harus mencentang pilihan \"Saya paham...\" sebelum kami dapat menghapus "
 "akun anda."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Silakan masukkan kata sandi dengan benar untuk melanjutkan proses ini."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Kesalahan yang tidak dikenali terjadi ketika menghapus akun anda. Mohon "
 "menghubungi %1$s beserta penjelasan masalah ini dan kami akan menghapusnya "
 "untuk anda. Kami mohon maaf atas ketidaknyamanan ini."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Konfirmasi penghapusan akun"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Hapus Akun Pengguna %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Selamat Tinggal!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr ""
 "Anda tidak akan lagi dapat log-masuk ke situs Pengaya Mozilla dengan "
 "menggunakan informasi log-masuk ini."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Dengan mengklik tombol \"hapus\" akun anda akan <strong>dihapus selamanya</"
 "strong>. Artinya:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Tinjauan dan pemeringkatan yang anda kirimkan tidak akan dihapus, tetapi "
 "tidak akan lagi dihubungkan dengan informasi tentang anda."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Jika anda mempunyai masalah tertentu yang sekiranya dapat kami bantu, "
@@ -7417,18 +6583,18 @@ msgstr ""
 "%1$s dan kami akan berusaha sebaik mungkin untuk membantu anda memecahkan "
 "masalah tersebut."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr ""
 "Saya sadar dan paham bahwa langkah ini tidak akan dapat mengembalikan "
 "informasi akun saya seperti sedia kala."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Pengguna yang Dihapus"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Sebuah email telah dikirim ke %1$s untuk mengkonfirmasi alamat email baru "
@@ -7436,7 +6602,7 @@ msgstr ""
 "yang tersedia pada email tersebut. Sebelum anda mengklik tautan tersebut, "
 "anda masih dapat log-masuk dengan alamat email lama anda."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Hapus akun pengguna"
 
@@ -7463,7 +6629,9 @@ msgstr ""
 "-- Staf Pengaya %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Anda telah meminta perubahan alamat email akun anda pada situs Pengaya %2"
@@ -7505,111 +6673,90 @@ msgstr ""
 "Terima Kasih,\n"
 "-- Staf Pengaya %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reset kata sandi Pengaya %s anda"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Kesalahan!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Mohon konfirmasi perubahan alamat email anda di Pengaya %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Sukses!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Alamat email anda telah sukses diubah. Sejak saat ini, selalu gunakan %1$s "
 "untuk melakukan proses log-masuk situs ini."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Konfirmasi kata sandi"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Ubah profil pengguna untuk %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Alamat email"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Nama depan"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Sembunyikan alamat email"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL Situs Web"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Nama belakang"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Log-masuk Pengguna"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Kata sandi baru"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nama alias (nick)"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Kata sandi lama"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Aksi Lainnya"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Kata sandi"
 
@@ -7617,67 +6764,67 @@ msgstr "Kata sandi"
 msgid "user_form_registration"
 msgstr "Pendaftaran Pengguna Baru"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Otomatis log-masuk dari komputer ini"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Tampilkan sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Simpan"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Log-masuk"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Daftar"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Pengguna %s sejak"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Pendaftaran akun pengguna baru"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kompatibilitas Pengaya (sangat disarankan)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Event dan Kontes yang Akan Berlangsung"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Tidak ada peringatan yang tersedia untuk diatur."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Dari waktu ke waktu, Mozilla mungkin akan mengirimkan email kepada Anda "
 "mengenai event dan rilis pengaya yang akan berlangsung. Silakan pilih topik "
 "yang anda sukai di bawah ini:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla mempunyai hak untuk menghubungi anda secara pribadi mengenai hal "
 "tertentu yang bersangkutan dengan pengaya anda yang diletakkan di sini."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Ada kesalahan pada perubahan yang dilakukan sebelumnya. Mohon dikoreksi dan "
 "simpan ulang."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil diperbarui."
 
@@ -7690,15 +6837,15 @@ msgstr "Reset kata sandi untuk %s"
 msgid "user_pwreset_header"
 msgstr "Reset Kata Sandi"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Lupa kata sandi?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Tautan untuk mereset kata sandi telah dikirimkan ke alamat email anda."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Kata sandi sukses direset."
 
@@ -7710,7 +6857,7 @@ msgstr "Simpan perubahan kata sandi"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Kirim tautan untuk mereset kata sandi"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Pengaya %s"
@@ -7725,7 +6872,7 @@ msgstr ""
 "Pengaya %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7737,24 +6884,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "kirim ulang email konfirmasi"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Selamat! Akun anda telah sukses dibuat."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7765,32 +6898,22 @@ msgstr ""
 "ada anda bisa meminta %1$s untuk mengirim ulang ke alamat email di atas."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Terima kasih telah mendaftar dan selamat datang di %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr ""
 "Salah satu dari: nama depan, atau nama belakang, atau nama alias (nick) "
 "diwajibkan untuk diisi."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Peringatan"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil Pengguna"
 
@@ -7798,66 +6921,50 @@ msgstr "Profil Pengguna"
 msgid "user_verified_okay"
 msgstr "Verifikasi sukses!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Hapus Akun Pengguna"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Pengubahan Akun Pengguna"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Pengaya oleh %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nama"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil Pengguna"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Alamat email"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Beranda"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nama alias (nick)"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Keterangan Pengguna %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Tinjauan oleh %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Log-masuk Pengguna"
 
@@ -7889,698 +6996,5 @@ msgstr "Reset Kata Sandi Pengguna"
 msgid "users_register_pagetitle"
 msgstr "Pendaftaran Pengguna Baru"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Pengaya Berikutnya"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Pengaya Sebelumnya"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Versi terakhir kompatibel dengan"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Riwayat Versi Lengkap"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Terbaru:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Terpopuler:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Rekomendasi Kami:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Baru Dimutakhirkan:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Tampilkan semua"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Tampilkan Semua Rekomendasi Pengaya"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Peringkat Tertinggi"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Paling Terakhir Diperbarui"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Paling Populer"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Versi pengaya anda tidak menyebutkan kompatibilitas dengan Firefox %1$s. "
-#~ "Mozilla berharap versi terbaru Firefox akan dirilis secepatnya. Oleh "
-#~ "karena itu, mohon pengaya anda diuji pada versi baru Firefox dan perbarui "
-#~ "informasi kompatibilitas yang berkaitan. Anda dapat membaca tentang hal "
-#~ "tersebut <a href=\"%2$s\">di sini</a>. Tulisan ini hanya bersifat "
-#~ "peringatan dan anda tetap dapat melanjutkan proses pengajuan versi ini "
-#~ "kepada addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Pengaya sukses dimatikan"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Ubah Pengaya"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Pengaya sukses diaktifkan"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Deskripsi Pengaya"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Beranda Pengaya"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nama Pengaya"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Kebijakan Privasi"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Ringkasan Pengaya"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Email Layanan Dukungan"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL Layanan Dukungan"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Catatan Versi"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Calonkan Pengaya"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Pengaya sukses dicalonkan!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Kunjungi halaman %1$s untuk membuat perubahan pada pengaya yang anda "
-#~ "ajukan, atau %2$s untuk kembali ke Perangkat Pengembang."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "klik di sini"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Ubah Pengaya"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Versi ini telah ditempatkan di sandbox untuk menunggu proses peninjauan "
-#~ "dari para penguji sandbox dan seorang penyunting dari pihak Mozilla. Jika "
-#~ "sudah ada aksi yang dilakukan maka anda akan diberitahu melalui email."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Anda dapat membaca tentang Sistem Peninjauan Sandbox %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "di sini"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Versi ini telah ditempatkan pada sandbox untuk digunakan oleh pengguna "
-#~ "berpengalaman. Agar dapat tampil pada situs publik, anda harus %s pengaya "
-#~ "anda dan melewati proses peninjauan."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "mencalonkan"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Pengajuan pengaya anda sukses."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Oleh karena pengaya ini terpercaya, versi ini secara otomatis disetujui "
-#~ "untuk tampil pada situs publik."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Ajukan Pengaya"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Pengaya sukses diperbarui"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Mungkin anda ingin untuk %s agar pengaya anda lebih menarik."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "mengunggah pratinjau"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Tidak ada penyusun ditemukan [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Hapus"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Batal"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Yakin akan membatalkan pengajuan?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Lanjut"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Ganti jenis pengaya:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Komentar Pengembang diperbarui."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Tambah Pratinjau"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Penyusun"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Penyusun"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Tidak ada"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Kategori"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Kategori"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Deskripsi"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Dimatikan"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detil"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Komentar Pengembang"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Pratinjau"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versi"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Beranda"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Tidak Ada"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Tanpa Judul"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Tidak ada pratinjau ditemukan."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Perbarui"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Email Layanan Dukungan"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Tidak ada email layanan dukungan yang disediakan pengembang."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL Layanan Dukungan"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Tidak ada URL layanan dukungan yang disediakan pengembang."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Terpercaya"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Tidak ada versi ditemukan."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Batal dan kembali"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Ya, matikan"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Yakin akan mematikan pengaya ini?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Mematikan pengaya ini akan berakibat pengaya ini akan disembunyikan dari "
-#~ "pencarian dan daftar pengaya. Pengaya juga tidak akan dapat diunduh dari "
-#~ "situs dan tidak akan tersedia pada pemutakhiran versi dari aplikasi. "
-#~ "Secara singkat, pengaya akan 'dihapus'. Akan tetapi anda dapat kembali "
-#~ "mengunjungi situs sini dan mengaktifkannya lagi."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Matikan %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Ya, aktifkan"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Yakin akan mengaktifkan pengaya ini?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Mengaktifkan pengaya ini akan berakibat pengaya ini akan segera tampil "
-#~ "pada pencarian dan daftar pengaya. Pengaya juga akan dapat diunduh dari "
-#~ "situs dan juga dari pemeriksaan versi baru dari aplikasi."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Aktifkan %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Tambah Penyusun"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Alamat Email Penyusun"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Hapus"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Tidak ada kategori yang cocok dengan jenis pengaya ini."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Penyusun"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Tambah Ikon"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Ganti Ikon"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Izinkan pengguna untuk melihat kode sumber secara online"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Kategori"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Bahasa (Locale) Default"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Hanya bersihkan ikon yang ada"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Berkas Ikon Baru"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Ikon"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "keterangan tambahan singkat (contohnya nama dialek bahasa)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Perbarui"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\"><em>simple "
-#~ "locale name</em></a>, contohnya 'en-US' atau 'id'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Berkas yang ditandai akan dihapus."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Berkas"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Aplikasi Target"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Tidak ada berkas."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Catatan untuk Peninjau"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Perbarui"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Jumlah karakter untuk ringkasan dibatasi sebanyak 250 karakter.\n"
-#~ "(Anda memasukkan %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Nama pengaya anda telah ada pada basis data. Pastikan bahwa: <br /"
-#~ "><li>GUID pengaya sesuai. Kesalahan umum yang sering terjadi adalah "
-#~ "karena GUID tidak cocok.</li><li>anda tidak mempunyai entri ganda pada "
-#~ "basis data. Jika ada, anda seharusnya memperbarui entri tersebut atau "
-#~ "hapus entri tersebut dan coba lagi.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Ceritakan perubahan yang terjadi pada versi baru pengaya ini."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Tidak semua GUID berkas cocok"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "Versi yang sama (%s) telah ada untuk pengaya dan platform."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Anda harus mengisi informasi yang diminta untuk proses pencalonan."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr ""
-#~ "Anda tidak dapat mencalonkan pengaya yang sedang dalam status prarilis."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Anda hanya dapat mencalonkan pengaya yang berada pada sandbox."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Kesalahan saat menyimpan data anda."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Anda tidak diizinkan untuk memperbarui pengaya ini."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Tambah Berkas untuk Platform Lain"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Tambah Penyusun"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Hapus"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "Kategori pengaya anda akan tersedia pada langkah berikutnya."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr ""
-#~ "Tidak ada kategori yang cocok yang tersedia untuk jenis pengaya ini."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Isi deskripsi pengaya anda."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Isi nama pengaya anda."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Pilih jenis pengaya yang anda ajukan."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Isi ringkasan tentang pengaya anda."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Berkas Pengaya"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Berkas Pengaya 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Berkas Pengaya 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Jenis Pengaya"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Izinkan pengguna untuk membaca kode sumber secara online"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Alamat Email Penyusun"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Penyusun"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Kategori"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Bahasa (Locale) Default"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Deskripsi"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Perjanjian Lisensi End-User (End User License Agreement-EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Pengaya ini membutuhkan perangkat lunak eksternal"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Berkas"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Beranda"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Berkas Ikon"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nama"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Platform yang Didukung"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Masih prarilis"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Kebijakan Privasi"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Pengaya ini untuk hanya bekerja situs tertentu"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Ringkasan"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Email Layanan Dukungan"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL Layanan Dukungan"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Aplikasi Target"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versi"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Catatan Versi"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Tidak Ada"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Catatan untuk Peninjau"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Oleh karena pengaya anda terpercaya, silakan pilih ke mana versi ini akan "
-#~ "ditempatkan:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Publik"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Perjanjian Pengembang"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Langkah Pertama"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Unggah Berkas"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Langkah ke-2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detil Pengaya"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Langkah ke-3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Detil Versi"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Langkah ke-4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Bahasa (Localization)"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Langkah ke-5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Sukses"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Pengayaku"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Kembali ke detil pengaya"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Deteksi otomatis jenis pengaya: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Bahasa (locale) default pengaya ini (%1$s [%2$s]) berbeda dengan bahasa "
-#~ "yang anda pilih (%3$s [%4$s]). Isian berikut harus dilengkapi dalam %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Salah?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Yakin akan menghapus berkas ini?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Lewati pemutakhiran informasi pengaya yang ada"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "Fitur Pengajuan Pengaya sedang dimatikan. Mohon kembali lagi nanti."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Saya Setuju"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Saya Tidak Setuju"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Pengaya ini telah dimatikan oleh administrator."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Dimatikan"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Terpercaya"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Anda tidak mempunyai pengaya. Klik %s untuk mengajukan."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "di sini"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Pastikan untuk %s untuk tema anda."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "mengunggah pratinjau"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Ubah Versi"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versi sukses diperbarui."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Baru"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Diperbarui"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Jenis Pengaya"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Umur"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplikasi"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platform"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Jenis Pengajuan"
-
-#~ msgid "error_notice"
-#~ msgstr "Perhatian"
-
-#~ msgid "forum_save"
-#~ msgstr "Simpan"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugin"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Pengaya Eksperimental"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Kembali ke halaman sebelumnya"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Halaman %1$s dari %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s pengaya yang cocok"
-#~ msgstr[1] "%s pengaya yang cocok"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Feed RSS data ringkasan"
diff --git a/site/app/locale/it/LC_MESSAGES/messages.po b/site/app/locale/it/LC_MESSAGES/messages.po
index b676edf..0a5a6d0 100644
--- a/site/app/locale/it/LC_MESSAGES/messages.po
+++ b/site/app/locale/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-05 19:42+0100\n"
+"PO-Revision-Date: 2009-03-23 12:24+0100\n"
 "Last-Translator: Francesco Lodolo <francesco.lodolo@mozillaitalia.org>\n"
 "Language-Team: ITALIAN <francesco.lodolo@mozillaitalia.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,190 +16,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Annulla installazione"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
-msgstr "Scarica ora %$1s"
+msgstr "Scarica ora %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accetta e scarica"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accetta e installa"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "Pubblicato"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Aggiornato il %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versione %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "download"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "download totali"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "download settimanali"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s componente aggiuntivo"
 msgstr[1] "%1$s componenti aggiuntivi"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per pagina"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordinato per:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "sperimentale"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "consigliato"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s non è disponibile per %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Torna a %1$s…"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Torna alle recensioni…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Voto:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Recensione:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Invia la tua recensione"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Aggiungi una recensione per %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titolo/Sommario:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Elimina"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Rispondi"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Sei sicuro di voler eliminare questa recensione?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Sì"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Elimina recensione"
 
@@ -208,7 +178,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Recensione eliminata con successo."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Modifica la recensione per %s"
@@ -216,24 +186,32 @@ msgstr "Modifica la recensione per %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Problema durante la segnalazione: la lunghezza massima delle note è compresa tra 10 e 100 caratteri, la nota inserita conteneva %1$s caratteri."
+msgstr ""
+"Problema durante la segnalazione: la lunghezza massima delle note è compresa "
+"tra 10 e 100 caratteri, la nota inserita conteneva %1$s caratteri."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Attenzione: affinché la recensione possa apparire sul sito pubblico, dovrà essere approvata da un revisore."
+msgstr ""
+"Attenzione: affinché la recensione possa apparire sul sito pubblico, dovrà "
+"essere approvata da un revisore."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Risposta dello sviluppatore a:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
-msgstr[0] "Visualizza %1$s recensione precedente inserita da %2$s per questo componente aggiuntivo."
-msgstr[1] "Visualizza %1$s recensioni precedenti inserite da %2$s per questo componente aggiuntivo."
+msgstr[0] ""
+"Visualizza %1$s recensione precedente inserita da %2$s per questo componente "
+"aggiuntivo."
+msgstr[1] ""
+"Visualizza %1$s recensioni precedenti inserite da %2$s per questo componente "
+"aggiuntivo."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -245,169 +223,131 @@ msgid "addon_review_pagetitle"
 msgstr "Recensioni per %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Risposta di %1$s su %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Risposta dello sviluppatore:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "La tua recensione è stata salvata con successo."
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "di %1$s del %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "di %1$s del %2$s (voto %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Componente aggiuntivo successivo"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Componente aggiuntivo precedente"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Collegamento permanente a questa versione"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "La versione più recente compatibile con %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Vai"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Visualizza il profilo dell'autore"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Visualizza tutti i temi :: %1$s Add-on"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Visualizza %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Visualizza i temi in %1$s :: %2$s Add-on"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Che cos'è questo?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Aggiungi una recensione"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Dettagli"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorie"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Aggiungi alla raccolta:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nuova raccolta…"
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Seleziona una raccolta…"
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Pubblica"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s è stata aggiunto alla raccolta %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Che cos'è questo?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "e un'altra raccolta"
-msgstr[1] "e altre %1$s raccolte"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Recensione completa"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Non mi piace"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Modifica la tua recensione"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Questo componente aggiuntivo include un'informativa sulla privacy"
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Lo odio"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Raccolte correlate"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Commenti dello sviluppatore"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Sito web"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licenza del codice sorgente"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recensioni"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Supporto"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Mi piace"
 
@@ -415,23 +355,19 @@ msgstr "Mi piace"
 msgid "addons_display_long_description"
 msgstr "Descrizione"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Lo adoro"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Altre immagini"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Questo componente aggiuntivo non fa ancora parte di alcuna raccolta."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Altri componenti aggiuntivi di %1$s"
@@ -440,84 +376,96 @@ msgstr[1] "Altri componenti aggiuntivi dei seguenti autori"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Il supporto per questa estensione è fornito dalla sviluppatore inviando una e-mail a %s."
+msgstr ""
+"Il supporto per questa estensione è fornito dalla sviluppatore inviando una "
+"e-mail a %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Il supporto per questa estensione è fornito dallo sviluppatore su %1$s o inviando una e-mail a %2$s."
+msgstr ""
+"Il supporto per questa estensione è fornito dallo sviluppatore su %s o "
+"inviando una e-mail a %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Il supporto per questa estensione è fornito dallo sviluppatore su %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Vota"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Mi piace molto"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Non segnalare dei bug attraverso le recensioni. Il tuo indirizzo e-mail non è visibile allo sviluppatore che potrebbe avere bisogno di contattarti per risolvere il problema."
+msgstr ""
+"Non segnalare dei bug attraverso le recensioni. Il tuo indirizzo e-mail non "
+"è visibile allo sviluppatore che potrebbe avere bisogno di contattarti per "
+"risolvere il problema."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Linee guida per la recensione</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Consultare la <a href=\"%1$s\">sezione del supporto</a> per scoprire dove ottenere assistenza per questo componente aggiuntivo."
+msgstr ""
+"Consultare la <a href=\"%1$s\">sezione del supporto</a> per scoprire dove "
+"ottenere assistenza per questo componente aggiuntivo."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Invia"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Visualizza tutti i componenti aggiuntivi in %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Visualizza tutte le recensioni (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Mostra tutte le versioni"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Cronologia completa delle versioni"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visualizza i sorgenti"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Visualizza statistiche"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Che cosa ne pensi?"
 
@@ -525,447 +473,342 @@ msgstr "Che cosa ne pensi?"
 msgid "addons_display_workswith"
 msgstr "È compatibile con:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Appena aggiunti"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Più popolari"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Consigliati"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Iscriviti"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Esplora i componenti aggiuntivi"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Aggiornati"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "di"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Raccolte più popolari"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Raccolte"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> componente aggiuntivo"
-msgstr[1] "<strong>%1$s</strong> componenti aggiuntivi"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Visualizza tutte le raccolte"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Le raccolte sono uno strumento per suddividere in categorie, combinare e associare i componenti aggiuntivi. Puoi abbonarti alle raccolte pubblicate da altri utenti o crearne di tue."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> iscritto"
-msgstr[1] "<strong>%1$s</strong> iscritti"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Consigliati da noi"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "I componenti aggiuntivi permettono di estendere %1$s e personalizzare la tua esperienza di navigazione.  Dai un'occhiata in giro e rendi %1$s veramente unico."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Ti piace? Scopri altri componenti aggiuntivi in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Oltre 5000 componenti aggiuntivi gratuiti</strong> che ti permettono di personalizzare Firefox e adattarlo alle tue esigenze."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Che cosa sono i componenti aggiuntivi?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Facili da installare</strong> e da aggiornare."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introduzione"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Barre degli strumenti, temi e motori di ricerca in grado di <strong>aiutarti nelle operazioni di ogni giorno.</strong>"
+msgstr ""
+"I componenti aggiuntivi permettono di estendere %1$s e personalizzare la tua "
+"esperienza di navigazione.  Dai un'occhiata in giro e rendi %1$s veramente "
+"unico."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "Novità"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Nuovi:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Altre applicazioni"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Componenti aggiuntivi per %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>componente aggiuntivo scaricato</span>"
-msgstr[1] "<strong>%1$s</strong> <span>componenti aggiuntivi scaricati</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Più popolari:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>componente aggiuntivo in uso</span>"
-msgstr[1] "<strong>%1$s</strong> <span>componenti aggiuntivi in uso</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Consigliati da noi:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Aggiornati di recente:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Visualizza tutti"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Visualizza tutti i nuovi componenti aggiuntivi"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Visualizza tutti i componenti aggiuntivi più popolari"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Visualizza tutti i componenti aggiuntivi consigliati"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Visualizza tutti i componenti aggiuntivi aggiornati di recente"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Fare clic sul link seguente per salvare il file.</li><li>In Mozilla Sunbird selezionare Componenti aggiuntivi dal menu Strumenti.</li><li>Fare clic sul pulsante Installa, individuare il file scaricato e fare clic su \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Fare clic sul link seguente per salvare il file.</li><li>In Mozilla "
+"Sunbird selezionare Componenti aggiuntivi dal menu Strumenti.</li><li>Fare "
+"clic sul pulsante Installa, individuare il file scaricato e fare clic su \"OK"
+"\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Come installare in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Fai clic con il tasto destro sul collegamento seguente e seleziona \"Salva destinazione con nome…\" per scaricare il file sul tuo disco fisso.</li><li>In Mozilla Thunderbird seleziona Componenti aggiuntivi nel menu Strumenti.</li><li>Fai clic sul pulsante Installa, seleziona il file scaricato in precedenza e premi \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Fai clic con il tasto destro sul collegamento seguente e seleziona "
+"\"Salva destinazione con nome…\" per scaricare il file sul tuo disco fisso.</"
+"li><li>In Mozilla Thunderbird seleziona Componenti aggiuntivi nel menu "
+"Strumenti.</li><li>Fai clic sul pulsante Installa, seleziona il file "
+"scaricato in precedenza e premi \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Come installare componenti aggiuntivi in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Visualizza i componenti aggiuntivi sperimentali"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Vai"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Di"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "per Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "per Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "per Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Questa pagina contiene un elenco dei plugin più comuni e popolari. Per ulteriori informazioni sugli altri plugin disponibili per i browser basati su Mozilla, visita %1$s"
+msgstr ""
+"Questa pagina contiene un elenco dei plugin più comuni e popolari. Per "
+"ulteriori informazioni sugli altri plugin disponibili per i browser basati "
+"su Mozilla, visita %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Stai cercando un plugin che non risulta tra quelli disponibili?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "I plugin consentono al browser di eseguire operazioni specifiche come visualizzare determinati formati grafici oppure riprodurre file multimediali. I plugin sono leggermente diversi dalle estensioni, in grado di modificare o aggiungere nuove funzionalità al software."
+msgstr ""
+"I plugin consentono al browser di eseguire operazioni specifiche come "
+"visualizzare determinati formati grafici oppure riprodurre file "
+"multimediali. I plugin sono leggermente diversi dalle estensioni, in grado "
+"di modificare o aggiungere nuove funzionalità al software."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin più comuni per %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentazione di supporto: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s richiede l'accettazione della seguente End User License Agreement (accordo di licenza con l'utente finale) prima di procedere con l'installazione:"
+msgstr ""
+"%s richiede l'accettazione della seguente End User License Agreement "
+"(accordo di licenza con l'utente finale) prima di procedere con "
+"l'installazione:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Anteprime per %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Aggiunto di recente"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Con una simile varietà di straordinari componenti aggiuntivi c'è sicuramente qualcosa di interessante per tutti. Per cominciare ecco un elenco dei più popolari. Divertiti!"
+msgstr ""
+"Con una simile varietà di straordinari componenti aggiuntivi c'è sicuramente "
+"qualcosa di interessante per tutti. Per cominciare ecco un elenco dei più "
+"popolari. Divertiti!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Componenti aggiuntivi consigliati"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "consigliati da noi"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Risorse aggiuntive"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Spiacente, bisogna utilizzare un browser basato su Mozilla (come Firefox) per poter installare un motore di ricerca."
+msgstr ""
+"Spiacente, bisogna utilizzare un browser basato su Mozilla (come Firefox) "
+"per poter installare un motore di ricerca."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "JavaScript deve essere attivo per installare un motore di ricerca e sembra che sia stato disattivato. Attivare JavaScript prima di tentare l'installazione di uno dei plugin di ricerca disponibili."
+msgstr ""
+"JavaScript deve essere attivo per installare un motore di ricerca e sembra "
+"che sia stato disattivato. Attivare JavaScript prima di tentare "
+"l'installazione di uno dei plugin di ricerca disponibili."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Scopri come %1$s nel %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "realizzare il tuo"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Scopri altri motori di ricerca su %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motori di ricerca"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Un ringraziamento speciale al progetto Mycroft per il lavoro sui motori di ricerca di Firefox."
+msgstr ""
+"Un ringraziamento speciale al progetto Mycroft per il lavoro sui motori di "
+"ricerca di Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Condividi"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Disattivato"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Versione incompleta"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "Nella Sandbox; segnalato"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Nella Sandbox; in attesa di revisione"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
-msgstr "pubblicato"
+msgstr "Pubblicato"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Nella Sandbox"
@@ -974,34 +817,26 @@ msgstr "Nella Sandbox"
 msgid "addons_status_unknown"
 msgstr "Sconosciuto"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Scopri ulteriori informazioni su questo componente aggiuntivo"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "I più scaricati"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "I più votati"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Attenzione alle vecchie versioni"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Queste versioni sono visualizzate solo a scopo di test e archivio. Dovresti sempre utilizzare l'ultima versione disponibile di un componente aggiuntivo."
+msgstr ""
+"Queste versioni sono visualizzate solo a scopo di test e archivio. Dovresti "
+"sempre utilizzare l'ultima versione disponibile di un componente aggiuntivo."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Cronologia delle versioni con elenco delle modifiche (changelog)"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s cronologia delle versioni"
@@ -1024,8 +859,7 @@ msgstr "Il gruppo con ID %s è stato eliminato"
 msgid "admin_group_edit_pagetitle"
 msgstr "Modifica gruppo"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "ID non valido per il gruppo"
 
@@ -1033,1377 +867,439 @@ msgstr "ID non valido per il gruppo"
 msgid "admin_group_pagetitle"
 msgstr "Amministratore del gruppo"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Il gruppo è stato salvato"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avanzata"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "qualsiasi periodo"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "qualsiasi"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "qualsiasi"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Applicazione"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "corrispondenza"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Ultimo aggiornamento"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "nome"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "più recente"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "ultimi 3 mesi"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "ultimi 6 mesi"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "ultime 24 ore"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "ultimo mese"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "ultima settimana"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "ultimo anno"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Per pagina"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Piattaforma"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "popolarità"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "voto"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordina per"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "a"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Attiva la ricerca avanzata"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tipo"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versione"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Successivo"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Precedente"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignora i controlli di compatibilità"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
-msgstr "Questo componente aggiuntivo è compatibile con le versioni precedenti di Firefox"
+msgstr ""
+"Questo componente aggiuntivo è compatibile con le versioni precedenti di "
+"Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "È possibile <a href=\"%1$s\">provare una vecchia versione</a> oppure <a href=\"#\" onclick=\"%2$s\">ignorare questo controllo</a>"
+msgstr ""
+"È possibile <a href=\"%1$s\">provare una vecchia versione</a> oppure <a href="
+"\"#\" onclick=\"%2$s\">ignorare questo controllo</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Una <a href=\"%1$s\">versione precedente</a> potrebbe funzionare"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Questo componente aggiuntivo richiede una versione di <a href=\"%1$s\">Firefox %2$s</a> non ancora rilasciata"
+msgstr ""
+"Questo componente aggiuntivo richiede una versione di <a href=\"%1$s"
+"\">Firefox %2$s</a> non ancora rilasciata"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Aggiorna Firefox</a> per utilizzare questo componente aggiuntivo"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s ha modificato in %3$s lo stato di %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s ha eseguito un'azione amministrativa sconosciuta %2$s all'elemento con ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s ha eliminato la funzione %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s ha creato l'applicazione %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s ha modificato l'applicazione %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s ha creato la versione %2$s per %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s ha eliminato la versione %2$s per %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s ha modificato il parametro '%2$s' da '%3$s' a '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s ha eseguito un'azione di revisione sconosciuto %2$s all'elemento con ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s ha eliminato %2$s dall'elenco dei componenti consigliati"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s ha aggiunto %2$s all'elenco dei componenti consigliati"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s ha modificato una funzione per il locale %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s ha modificato i locale per %2$s nella lista dei componenti consigliati"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s ha ricalcolato l'hash per il file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s ha aggiunto %2$s al gruppo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s si è aggiunto al gruppo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s ha creato il gruppo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s ha eliminato il gruppo %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s ha modificato il gruppo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s ha eliminato %2$s dal gruppo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s ha eseguito un'azione sconosciuta %2$s per %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s ha cercato di modificare il gruppo bloccato %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s ha cercato di modificare le traduzioni in %2$s senza averne i permessi"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s ha creato la piattaforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s da eliminato la piattaforma %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s ha modificato la piattaforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s non è riuscito a rieffettuare l'autenticazione per l'accesso a %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s ha creato la risposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s ha eliminato la risposta %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s ha modificato la risposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s ha approvato la recensione %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s ha eliminato la recensione %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s ha eseguito un'azione di sicurezza sconosciuta %2$s sull'elemento con ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s ha creato l'etichetta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s ha eliminato la categoria %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s ha modificato la categoria %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s ha aggiornato la traduzione delle applicazioni per %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s ha aggiornato la traduzione del post sul blog per %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s ha aggiornato la traduzione delle piattaforme per %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s ha aggiornato la traduzione delle categorie per %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s ha modificato le informazioni utente di %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Aggiorna Firefox</a> per utilizzare questo "
+"componente aggiuntivo"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "componenti per nome"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "i nuovi arrivi"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "i più popolari"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "componenti per voto"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "ultimi aggiornamenti"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Categoria corrente"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorie"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Scegliere una categoria"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Visualizza tutti %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "La descrizione deve essere lunga meno di %1$s caratteri."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Raccolta %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Visualizza tutti i componenti aggiuntivi consigliati"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Errore durante l'eliminazione del componente aggiuntivo"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Ordina per voto"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Errore durante il salvataggio del componente aggiuntivo"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Ordina per aggiornamento"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Errore durante il salvataggio del commento"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Ordina per popolarità"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "La lunghezza del nome deve essere inferiore a %1$s caratteri."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Visualizza tutti %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Raccolta non trovata!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Se sai già quali componenti aggiuntivi inserire nella tua raccolta, inizia ad inserire i nome nel campo seguenti. Se preferisci farlo in un secondo momento, fai clic su %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Scegli il primo componente aggiuntivo"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Crea una raccolta"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Componenti selezionati"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Per creare la tua raccolta di componenti aggiuntivi è sufficiente compilare i seguenti campi."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Crea raccolta"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Raccolte"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Ulteriori informazioni"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Aggiungi ai preferiti"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Rimuovi dai preferiti"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>In questa sezione puoi visualizzare le tue raccolte. Se vuoi impostare uno pseudonimo, caricare un'immagine o modificare altre impostazioni, consulta la pagina <a href='%1$s'>Gestione raccolte</a>.</p><p>La tua raccolta può essere visualizzata a questo indirizzo: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "La tua raccolta è pronta"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Informazioni su questa raccolta"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s elemento in questa raccolta"
-msgstr[1] "%1$s elementi in questa raccolta"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Realizzata da:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Aggiornata:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Inserimento in corso nei preferiti&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Rimozione in corso dai preferiti&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Accedi</a> per aggiungere questa raccolta ai tuoi preferiti."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Gestione raccolte"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Data inserimento"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Nome"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popolarità"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download questa settimana"
-msgstr[1] "%1$s download questa settimana"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "I componenti aggiuntivi selezionati verranno rimossi in fase di salvataggio"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Per aggiungere nuovi componenti aggiuntivi a questa raccolta, digitarne i nomi nel campo seguente."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Per pubblicare nuovi elementi in questa raccolta, inserisci un elenco di ID dei componenti aggiuntivi separandoli con delle virgole."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "È possibile pubblicare un componente aggiuntivo anche dalla sua scheda."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Aggiunto il %1$s da %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Aggiungi commento"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Elimina commento"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Modificato commento"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Nota: il commento risulterà scritto dall'autore originale della raccolta nella data di pubblicazione della raccolta stessa"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Salva commento"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Rimuovi"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Aggiungi ad una raccolta"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Controlla disponibilità"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Sì, voglio eliminare questa raccolta."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Selezionare la casella e fare clic su \"%1$s\" per eliminare questa raccolta."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Facendo clic su \"%1$s\", la raccolta verrà eliminata. Se non vuoi eliminare la tua raccolta, disattiva l'opzione nella scheda \"%2$s\" e prosegui con le modifiche. Se abbandoni questa pagina senza salvare, la raccolta non verrà eliminata."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Questa raccolta sta per essere eliminata."
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "La descrizione della raccolta è un campo obbligatorio."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Si è verificato un errore durante il caricamento dell'immagine."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "È necessario assegnare un nome alla raccolta."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Se scegli di assegnare uno pseudonimo, deve essere unico."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Nome componente aggiuntivo:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Applicazione associata"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Selezionare l'applicazione compatibile con la tua raccolta."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Tipo di raccolta"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Elimina raccolta"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "L'eliminazione della raccolta è un'operazione non reversibile."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Descrizione raccolta"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Descrivi brevemente la tua raccolta e il tipo di componenti aggiuntivi presenti"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Immagine"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "È possibile utilizzare un'immagine JPG, GIF o PNG che verrà ridimensionata a 32x32 pixel."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Chi può visualizzare la tua raccolta?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Come impostazioni predefinita, le raccolte appaiono in un elenco pubblico e sono consultabili da qualsiasi utente. Se vuoi fare in modo che la tua raccolta sia visibile solo ad un numero ristretto di persone a cui hai comunicato l'apposito link, seleziona l'opzione seguente."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Sole le persone che ricevono un mio invito possono visualizzare la mia raccolta"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Chiunque può visualizzare la mia raccolta"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Chi può gestire la mia raccolta?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Questi utenti possono aggiungere elementi alla tua raccolta, gestire tutti i componenti aggiuntivi e le impostazioni, e modificare i permessi degli altri utenti."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Nome raccolta"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Assegna alla tua raccolta un nome descrittivo, come ad esempio \"Estensioni preferite di Paolo per netbook\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Pseudonimo raccolta"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Se vuoi, è possibile assegnare un pseudonimo alla tua raccolta per velocizzare l'accesso:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Chi può pubblicare elementi nella tua raccolta?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Questi utenti possono aggiungere componenti aggiuntivi alla tua raccolta ed eliminare gli elementi che hanno pubblicato."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Inserisci l'indirizzo e-mail di un account per questo sito (Firefox Add-ons):"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Gli account selezionati verranno rimossi in fase di salvataggio"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Inserisci gli indirizzi e-mail degli account per Firefox Add-ons separandoli con delle virgole"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Solo io"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Io e questi utenti:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Aggiungi"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Gestione %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Gestisci il contenuto della raccolta"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Elementi correnti:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Impostazioni avanzate"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Gestisci i permessi della raccolta"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Annulla"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Elimina immagine"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Sostituisci immagine"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "L'immagine verrà rimossa facendo clic su \"%1$s\""
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Pseudonimo disponibile"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Lo pseudonimo scelto contiene caratteri non validi ed è stato corretto. Riprovare."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Pseudonimo già utilizzato"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "La tua raccolta è disponibile a questo indirizzo:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "La raccolta è stata salvata con successo."
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Aggiorna raccolta"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Elimina raccolta"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Componenti aggiuntivi"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avanzate"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Nome e dettagli"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permessi"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Tieni d'occhio i tuoi bambini e la tua agenda."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Famiglia"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Prova Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Crea una raccolta"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Vai"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Non hai ancora nessuna raccolta preferita.</strong></p> <p>Le raccolte che imposti come preferite possono essere gestite attraverso questa pagina e, se hai installata questa estensione, appariranno anche in <a href='%1$s'>Add-on Collector</a>.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Non hai ancora creato nessuna raccolta. È molto semplice creare nuove raccolte con i tuoi componenti aggiuntivi preferiti. <a href='%1$s'>Fai una prova</a>.</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Raccolte"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "realizzata da %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Che cosa sono le raccolte?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Ordina per"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Le nostre scelte"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Mie preferite"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Mie raccolte"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popolare"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Più popolare di sempre"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Più popolare di questo mese"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Più recente"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Più popolare di questa settimana"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "C'è un nuovo modo per gestire e trovare i tuoi componenti aggiuntivi preferiti. Commenta, condividi e sincronizza le raccolte, tutto direttamente dal tuo browser."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Le raccolte sono gruppi di componenti aggiuntivi, aggregati per renderne più semplice la condivisione."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Aggiunto %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Cerca informazioni online."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Informazioni"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Gestisci i tuoi social network."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Social"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Chiudi"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Si è verificato un errore nel tentativo di impostare questa raccolta come preferita. Questa raccolta è già presente tra i preferiti?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Non visualizzare questo messaggio in futuro."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s è stata aggiunta alle tue raccolte preferite."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Da questo momento puoi trovare questa raccolta nella scheda <a href=\"%1$s\">%2$s</a>. Per una gestire le tue raccolte in modo ancora più semplice, prova la nostra estensione <a href=\"%3$s\">Add-on Collector</a> per Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "La raccolta è stata eliminata."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Progetta viaggi di lavoro e vacanze indimenticabili."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Viaggi"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Pubblicazione automatica"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Scelta da noi"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normale"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Si è verificato un errore durante la rimozione della raccolta dai preferiti. La raccolta non era presente tra i tuoi preferiti?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s è stata rimossa dalle tue raccolte preferite."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Realizza siti web perfetti."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Sviluppo web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Che cosa sono le raccolte?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Leggi le FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "C'è un nuovo modo per gestire e trovare i tuoi componenti aggiuntivi preferiti. Commenta, condividi e sincronizza le raccolte, tutto direttamente dal tuo browser."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Add-on Collector"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Scarica Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo di Add-on Collector"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centro compatibilità componenti aggiuntivi"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Preparati al rilascio di %1$s con gli strumenti e le informazioni disponibili per la community %2$s Add-on."
+msgstr ""
+"Preparati al rilascio di %1$s con gli strumenti e le informazioni "
+"disponibili per la community %2$s Add-on."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Caricamento dati…"
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Ritorna alla pagina principale"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Rapporto compatibilità componenti aggiuntivi"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informazioni per gli sviluppatori"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Modifica maxVersion senza upload"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Controlla lo stato dei miei componenti aggiuntivi"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Se alcuni dei tuoi componenti aggiuntivi sono ospitati su Mozilla Add-On, <a href=\"%1$s\">accedi</a> per esaminare lo stato dei tuoi componenti aggiuntivi per %2$s."
+msgstr ""
+"Se alcuni dei tuoi componenti aggiuntivi sono ospitati su Mozilla Add-On, <a "
+"href=\"%1$s\">accedi</a> per esaminare lo stato dei tuoi componenti "
+"aggiuntivi per %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Non risultati tuoi componenti aggiuntivi ospitati su Mozilla Add-on."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Risultati del controllo compatibilità"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Recupero stato dei componenti aggiuntivi ospitati…"
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s utenti (%3$s&#37; del totale)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "In base ai dati in possesso di Mozilla, i seguenti componenti aggiuntivi costituiscono il 95% degli utilizzatori. L'ordine di visualizzazione è dato dalla dimensione della base utenti."
+msgstr ""
+"In base ai dati in possesso di Mozilla, i seguenti componenti aggiuntivi "
+"costituiscono il 95% degli utilizzatori. L'ordine di visualizzazione è dato "
+"dalla dimensione della base utenti."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Mostra rapporto dettagliato"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Dei %1$s componenti aggiuntivi che rappresentano il 95&#37; degli utilizzatori noti a Mozilla, il <b>%2$s&#37;</b> è attualmente considerato compatibile con le ultime versioni di %3$s."
+msgstr ""
+"Dei %1$s componenti aggiuntivi che rappresentano il 95&#37; degli "
+"utilizzatori noti a Mozilla, il <b>%2$s&#37;</b> è attualmente considerato "
+"compatibile con le ultime versioni di %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versioni alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Componenti aggiuntivi compatibili con una versione alfa di %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versioni beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Componenti aggiuntivi compatibili con una versione beta o release candidate di %1$s"
+msgstr ""
+"Componenti aggiuntivi compatibili con una versione beta o release candidate "
+"di %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Ultima versione"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Componenti aggiuntivi compatibili con le ultime versioni di %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Altre versioni"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Componenti aggiuntivi non compatibili con alcuna versione di %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Rapporto compatibilità componenti aggiuntivi"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informazioni per gli utenti"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Visualizza il rapporto compatibilità"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Per informazioni su come contribuire, consultare il nostro %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pagina wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla desidera ringraziare le seguenti persone per il loro contributo al progetto addons.mozilla.org nel corso degli anni:"
+msgstr ""
+"Mozilla desidera ringraziare le seguenti persone per il loro contributo al "
+"progetto addons.mozilla.org nel corso degli anni:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Sviluppatori"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Revisori"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Localizzatori"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Altri collaboratori"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Sviluppatori precedenti"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software e immagini"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Alcune delle icone utilizzate appartengono al <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, rilasciato sotto <a href=\"http://creativecommons.org/licenses/by/2.5/\">Licenza Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Alcune delle icone utilizzate appartengono al <a href=\"http://www.famfamfam."
+"com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, rilasciato sotto <a href="
+"\"http://creativecommons.org/licenses/by/2.5/\">Licenza Creative Commons "
+"Attribution 2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
-msgstr "Alcune pagine utilizzano elementi di <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, distribuito con <a href=\"http://simile.mit.edu/license.html\">licenza BSD</a>."
+msgstr ""
+"Alcune pagine utilizzano elementi di <a href=\"http://www.simile-widgets.org/"
+"timeplot/\">Timeplot</a>, distribuito con <a href=\"http://simile.mit.edu/"
+"license.html\">licenza BSD</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e %B %Y, %I:%M:%p"
 
 #: views/elements/developers/actionbar.thtml:47
 msgid "devcp_actionbar_link_details"
-msgstr "Dettaglio"
+msgstr "Informazioni dettagliate"
 
 #: views/elements/developers/actionbar.thtml:42
 #: views/elements/developers/actionbar.thtml:50
 #: views/developers/dashboard.thtml:64
 msgid "devcp_actionbar_link_edit"
-msgstr "Modifica"
+msgstr "Modifica componente aggiuntivo"
 
 #: views/elements/developers/actionbar.thtml:51
 msgid "devcp_actionbar_link_newversion"
@@ -2418,29 +1314,46 @@ msgstr "Pannello statistiche"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
-msgstr "Il file %1$s ha un'estensione non valida (%2$s). Estensioni consentite: %3$s"
+msgstr ""
+"Il file %1$s ha un'estensione non valida (%2$s). Estensioni consentite: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "Il file %s non può essere salvato nel database. Riprovare in seguito."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "L'anteprima %1$s è stata sostituita correttamente con il file %2$s."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
-msgstr "Il file %s è stato caricato correttamente. È possibile aggiungere una descrizione."
+msgstr ""
+"Il file %s è stato caricato correttamente. È possibile aggiungere una "
+"descrizione."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(rilevazione automatica)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Questa versione del componente aggiuntivo non dichiara la propria "
+"compatibilità con Firefox %1$s. Mozilla ha in programma di rilasciare la "
+"prossima versione in tempi brevi, consigliamo di verificare il componente "
+"aggiuntivo con la nuova versione e aggiornarne la compatibilità. Ulteriori "
+"informazioni su questo argomento sono disponibili <a href=\"%2$s\">qui</a>. "
+"Questo è solo un avviso e sarà comunque possibile proseguire con "
+"l'inserimento di questa versione in addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Apri in una nuova finestra"
@@ -2455,7 +1368,7 @@ msgstr "Accordo di licenza per sviluppatori"
 
 #: views/elements/developers/additem.thtml:46
 msgid "devcp_additem_step1_link"
-msgstr "Passaggio 1: carica il file"
+msgstr "Passaggio 1: caricare il file"
 
 #: views/elements/developers/additem.thtml:47
 msgid "devcp_additem_step2_link"
@@ -2471,76 +1384,156 @@ msgstr "Passaggio 4: localizzazione"
 
 #: views/elements/developers/additem.thtml:50
 msgid "devcp_additem_step5_link"
-msgstr "Passaggio 5: operazione terminata"
+msgstr "Passaggio 5: operazione conclusa"
 
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Guida per l'inserimento"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Componente aggiuntivo disattivato con successo"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Modifica componente aggiuntivo"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Componente aggiuntivo attivato con successo"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descrizione"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Sito web"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nome"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Descrizione dell'anteprima"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Informativa sulla privacy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Riepilogo"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "E-mail per il supporto"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL per il supporto"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Note sulla versione"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Segnala il componente aggiuntivo"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Componente aggiuntivo segnalato con successo"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Attiva"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Attiva il componente aggiuntivo per farlo comparire nell'elenco pubblico e attivare il servizio di aggiornamento automatico."
+msgstr ""
+"Attiva il componente aggiuntivo per farlo comparire nell'elenco pubblico e "
+"attivare il servizio di aggiornamento automatico."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Imposta come completo"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Imposta come completo il componente aggiuntivo e spostalo nella Sandbox"
+msgstr ""
+"Imposta come completo il componente aggiuntivo e spostalo nella Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Disattiva"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Disattiva il componente aggiuntivo per rimuoverlo dall'elenco pubblico e disattivare il servizio di aggiornamento automatico."
+msgstr ""
+"Disattiva il componente aggiuntivo per rimuoverlo dall'elenco pubblico e "
+"disattivare il servizio di aggiornamento automatico."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Sposta nella Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
-msgstr "Sposta il componente aggiuntivo nella Sandbox. L'azione può essere annullata."
+msgstr ""
+"Sposta il componente aggiuntivo nella Sandbox. L'azione può essere annullata."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nomina per la pubblicazione"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nomina il componente aggiuntivo per la pubblicazione"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Pubblica"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Rendi nuovamente disponibile al pubblico il componente aggiuntivo."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
-msgstr "Il componente aggiuntivo è <span class=\"inactive-0\">attivo</span>. Questo significa che verrà visualizzato in tutti gli elenchi disponibili e riservati ai componenti in questo stato."
+msgstr ""
+"Il componente aggiuntivo è <span class=\"inactive-0\">attivo</span>. Questo "
+"significa che verrà visualizzato in tutti gli elenchi disponibili e "
+"riservati ai componenti in questo stato."
 
 #: views/developers/addon_status.thtml:111
 msgid "devcp_addon_status_completion_disabled"
-msgstr "È necessario soddisfare i criteri indicati per poter impostare il componente aggiuntivo come completo e spostarlo nella <span class=\"status-1\">Sandbox</span>."
+msgstr ""
+"È necessario soddisfare i criteri indicati per poter impostare il componente "
+"aggiuntivo come completo e spostarlo nella <span class=\"status-1\">Sandbox</"
+"span>."
 
 #: views/developers/addon_status.thtml:108
 msgid "devcp_addon_status_completion_enabled"
-msgstr "È ora possibile impostare il componente aggiuntivo come completo e spostarlo nella <span class=\"status-1\">Sandbox</span> facendo clic sul pulsante seguente."
+msgstr ""
+"È ora possibile impostare il componente aggiuntivo come completo e spostarlo "
+"nella <span class=\"status-1\">Sandbox</span> facendo clic sul pulsante "
+"seguente."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2554,7 +1547,7 @@ msgstr "La descrizione è obbligatoria"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Il nome è obbligatorio"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Il componente aggiuntivo non è segnalato come pre-release."
 
@@ -2562,6 +1555,11 @@ msgstr "Il componente aggiuntivo non è segnalato come pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "È necessario inserire almeno un'anteprima per estensioni e temi."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr ""
+"Diverse recensioni di utenti (possono essere anche recensioni esterne)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Il riepilogo è obbligatorio"
@@ -2571,12 +1569,12 @@ msgstr "Il riepilogo è obbligatorio"
 msgid "devcp_addon_status_header"
 msgstr "Stato: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Azioni disponibili"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Stato attività: <span class=\"inactive-0\">attivo</span>"
 
@@ -2584,29 +1582,37 @@ msgstr "Stato attività: <span class=\"inactive-0\">attivo</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Criteri per il completamento"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
-msgstr "Stato attività: <span class=\"inactive-1\">disattivato</span>"
+msgstr "Stato attività: <span class=\"inactive-1\">disattivo</span>"
 
 #: views/developers/addon_status.thtml:117
 msgid "devcp_addon_status_header_nomination"
 msgstr "Criteri per la pubblicazione"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Stato fiducia: <span class=\"status-4\">affidabile</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
-msgstr "Il componente aggiuntivo è <span class=\"inactive-1\">disattivato</span>. Questo significa che non verrà mostrato in nessun elenco, a prescindere dallo stato. Inoltre <b>non</b> verranno distribuiti aggiornamenti attraverso il meccanismo di aggiornamento automatico."
+msgstr ""
+"Il componente aggiuntivo è <span class=\"inactive-1\">disattivo</span>. "
+"Questo significa che non verrà mostrato in nessun elenco, a prescindere "
+"dallo stato. Inoltre <b>non</b> verranno distribuiti aggiornamenti "
+"attraverso il meccanismo di aggiornamento automatico."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "È necessario soddisfare i criteri indicati prima di nominare un componente aggiuntivo e renderlo <span class=\"status-4\">pubblicato</span>."
+msgstr ""
+"È necessario soddisfare i criteri indicati prima di nominare un componente "
+"aggiuntivo e renderlo <span class=\"status-4\">pubblicato</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "È ora possibile nominare il componente aggiuntivo per la <span class=\"status-4\">pubblicazione</span> facendo clic sul pulsante seguente."
+msgstr ""
+"È ora possibile nominare il componente aggiuntivo per la <span class="
+"\"status-4\">pubblicazione</span> facendo clic sul pulsante seguente."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2619,30 +1625,53 @@ msgstr "Sandbox"
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Il componente aggiuntivo è stato <span class=\"status-5\">disattivato</span> da un amministratore e non può essere usato. Per ulteriori informazioni inviare una e-mail a %s."
+msgstr ""
+"Il componente aggiuntivo è stato <span class=\"status-5\">disattivato</span> "
+"da un amministratore e non può essere usato. Per ulteriori informazioni "
+"inviare una e-mail a %s."
 
 #: views/developers/addon_status.thtml:67
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Il componente aggiuntivo è attualmente <span class=\"status-0\">incompleto</span>. Questo significa che non appare in nessuna sezione del sito e non può utilizzare il meccanismo di aggiornamento automatico. È possibile ritornare a questa pagina dopo aver soddisfatto i criteri necessari per il completamento e spostarlo nella \"status-1\">Sandbox</span>."
+msgstr ""
+"Il componente aggiuntivo è attualmente <span class=\"status-0\">incompleto</"
+"span>. Questo significa che non appare in nessuna sezione del sito e non può "
+"utilizzare il meccanismo di aggiornamento automatico. È possibile ritornare "
+"a questa pagina dopo aver soddisfatto i criteri necessari per il "
+"completamento e spostarlo nella \"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Il componente aggiuntivo è stato nominato per la <span class=\"status-4\">pubblicazione</span> ed è in attesa della revisione. Attualmente ci sono altri %s elementi in coda."
+msgstr ""
+"Il componente aggiuntivo è stato nominato per la <span class=\"status-4"
+"\">pubblicazione</span> ed è in attesa della revisione. Attualmente ci sono "
+"altri %s elementi in coda."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 msgid "devcp_addon_status_switch_pending"
-msgstr "Il componente aggiuntivo è in sospeso. Questo non dovrebbe accadere. Inviare una e-mail a %s con l'ID del componente aggiuntivo e segnalare questo errore."
+msgstr ""
+"Il componente aggiuntivo è in sospeso. Questo non dovrebbe accadere. Inviare "
+"una e-mail a %s con l'ID del componente aggiuntivo e segnalare questo errore."
 
 #: views/developers/addon_status.thtml:85
 msgid "devcp_addon_status_switch_public"
-msgstr "Il componente aggiuntivo è <span class=\"status-4\">pubblicato</span>, questo significa che verrà visualizzato in tutti gli elenchi, nei risultati di ricerca e potrà essere scaricato senza restrizioni. Gli aggiornamenti per questo componente aggiuntivo saranno disponibili attraverso il sistema di aggiornamento automatico."
+msgstr ""
+"Il componente aggiuntivo è <span class=\"status-4\">pubblicato</span>, "
+"questo significa che verrà visualizzato in tutti gli elenchi, nei risultati "
+"di ricerca e potrà essere scaricato senza restrizioni. Gli aggiornamenti per "
+"questo componente aggiuntivo saranno disponibili attraverso il sistema di "
+"aggiornamento automatico."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Il componente aggiuntivo si trova nella <span class=\"status-1\">Sandbox</span>, questo significa che verrà visualizzato negli elenchi e tra i risultati di ricerca, ma gli utenti dovranno effettuare il login per scaricarlo. Gli aggiornamenti <b>non</b> verranno forniti con il sistema di aggiornamento automatico."
+msgstr ""
+"Il componente aggiuntivo si trova nella <span class=\"status-1\">Sandbox</"
+"span>, questo significa che verrà visualizzato negli elenchi e tra i "
+"risultati di ricerca, ma gli utenti dovranno effettuare il login per "
+"scaricarlo. Gli aggiornamenti <b>non</b> verranno forniti con il sistema di "
+"aggiornamento automatico."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2651,20 +1680,138 @@ msgstr "Il componente aggiuntivo si trova nella <span class=\"status-1\">Sandbox
 msgid "devcp_addon_status_title"
 msgstr "Stato %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
-msgstr "Il componente aggiuntivo è segnalato come <span class=\"status-4\">affidabile</span>. Questo significa che puoi caricare aggiornamenti senza passare attraverso il controllo di un revisore."
+msgstr ""
+"Il componente aggiuntivo è segnalato come <span class=\"status-4"
+"\">affidabile</span>. Questo significa che puoi caricare aggiornamenti senza "
+"passare attraverso il controllo di un revisore."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visita la pagina %1$s per modificare le tue estensioni, oppure %2$s per "
+"tornare agli strumenti per sviluppatori."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "fai clic qui"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "modifica componente aggiuntivo"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Questa versione è stata inserita nella sandbox in attesa di verifiche da "
+"parte dei tester e di un revisore di Mozilla Add-ons. Riceverai una notifica "
+"via e-mail non appena ne verrà ultimato il controllo."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Puoi ottenere ulteriori informazioni sul sistema di revisione collegato alla "
+"Sandbox leggendo %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "questa pagina"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Questa versione è stata inserita nella sandbox e l'utilizzo è consigliato "
+"solo ad utenti esperti. Affinché l'estensione venga pubblicata sul sito "
+"ufficiale, è necessario %s il proprio componente aggiuntivo e attendere "
+"l'esito del processo di revisione."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "segnalare"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr ""
+"L'inserimento del componente aggiuntivo è stato completato con successo."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Dal momento che il componente aggiuntivo è considerato affidabile, questa "
+"versione è stata automaticamente approvata e inserita nella sezione pubblica."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Inserisci un nuovo componente aggiuntivo"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Componente aggiuntivo aggiornato con successo"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"È consigliabile %s per accrescere l'interesse nei confronti del tuo "
+"componente aggiuntivo"
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "caricare un'anteprima"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Impossibile trovare l'autore [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Rimuovi"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Annulla"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Vuoi annullare l'inserimento?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Successivo"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Modifica tipologia del componente aggiuntivo:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "I commenti dello sviluppatore sono stati aggiornati."
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
-msgstr "attivo"
+msgstr "Attivo"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
 msgid "devcp_dashboard_addontype_status"
-msgstr "è attualmente %2$s e %3$s nella categoria %1$s"
+msgstr "%1$s è attualmente %2$s e %3$s"
 
 #: views/developers/dashboard.thtml:67
 msgid "devcp_dashboard_change_status"
@@ -2673,7 +1820,9 @@ msgstr "Modifica stato"
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Il componente aggiuntivo è stato disattivato da un amministratore e non può essere usato. Per ulteriori informazioni inviare una email a %s."
+msgstr ""
+"Il componente aggiuntivo è stato disattivato da un amministratore e non può "
+"essere usato. Per ulteriori informazioni inviare una email a %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2690,7 +1839,7 @@ msgstr "Benvenuto nella dashboard per sviluppatori"
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_inactive"
-msgstr "disattivato"
+msgstr "Disattivo"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
@@ -2699,7 +1848,10 @@ msgstr "Ultima modifica il %s"
 
 #: views/developers/dashboard.thtml:111
 msgid "devcp_dashboard_learn"
-msgstr "Al momento non risultano presenti tuoi componenti aggiuntivi ospitati su Mozilla Add-ons. Per scoprire come funziona la procedura e inviare il tuo primo componente aggiuntivo, fare clic su Per iniziare."
+msgstr ""
+"Al momento non risultano presenti tuoi componenti aggiuntivi ospitati su "
+"Mozilla Add-ons. Per scoprire come funziona la procedura e inviare il tuo "
+"primo componente aggiuntivo, fare clic su Per iniziare."
 
 #: views/developers/dashboard.thtml:112
 msgid "devcp_dashboard_start"
@@ -2714,33 +1866,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Carica una nuova versione"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
-msgstr "L'anteprima %s non può essere eliminata dal database. Riprovare in seguito."
+msgstr ""
+"L'anteprima %s non può essere rimossa dal database. Riprovare in seguito."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "L'anteprima %s è stata eliminata correttamente."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "Non si dispone dei permessi necessari per rimuovere versioni e file."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s file %2$s"
-msgstr[1] "%1$s file %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Aggiungi anteprima"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autore"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autori"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Non presente"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorie"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descrizione"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Disattivato"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Dettagli"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Commenti dello sviluppatore"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Anteprime"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versioni"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Sito web"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Non presente"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Descrizione non presente"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Anteprime non presenti."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Aggiorna"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "E-mail per il supporto"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Lo sviluppatore non ha fornito una e-mail per il supporto."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL per il supporto"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Lo sviluppatore non ha fornito una URL per il supporto."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Affidabile"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versione %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nessuna versione disponibile."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Annulla e torna indietro"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Sì, disabilita"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Disabilitare questo componente aggiuntivo?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Un componente aggiuntivo disabilitato non verrà mostrato nei risultati delle "
+"ricerche e negli elenchi. Non sarà possibile scaricarlo dal sito e non verrà "
+"segnalato dagli aggiornamenti automatici dei software client. A tutti gli "
+"effetti il componente aggiuntivo verrà eliminato, anche se in realtà sarà "
+"possibile ritornare in questa sezione e riabilitarlo in caso di necessità."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disabilita %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Sì, abilita"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Abilitare questo componente aggiuntivo?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Questo componente aggiuntivo, una volta abilitato, verrà nuovamente mostrato "
+"nei risultati delle ricerche e negli elenchi. Sarà inoltre possibile "
+"scaricarlo dal sito e verrà segnalato dagli aggiornamenti automatici dei "
+"software client."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Abilita %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Rispondi"
@@ -2753,17 +2052,23 @@ msgstr "Risposte"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "Si è verificato un errore nel salvataggio della risposta. Contattare %1$s per segnalare il problema."
+msgstr ""
+"Si è verificato un errore nel salvataggio della risposta. Contattare %1$s "
+"per segnalare il problema."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "Un revisore di Mozilla Add-ons ha richiesto ulteriori informazioni sulla versione %2$s del componente aggiuntivo %1$s."
+msgstr ""
+"Un revisore di Mozilla Add-ons ha richiesto ulteriori informazioni sulla "
+"versione %2$s del componente aggiuntivo %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
 msgid "devcp_discuss_pagetitle"
-msgstr "Fornisci ulteriori informazioni per la revisione del componente aggiuntivo %1$s"
+msgstr ""
+"Fornisci ulteriori informazioni per la revisione del componente aggiuntivo %1"
+"$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
@@ -2772,86 +2077,105 @@ msgstr "Invia risposta"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "La risposta è stata salvata correttamente. Gli altri partecipanti alla discussione riceveranno una notifica via e-mail."
+msgstr ""
+"La risposta è stata salvata correttamente. Gli altri partecipanti alla "
+"discussione riceveranno una notifica via e-mail."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "scritto da %1$s il %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Aggiungi autore"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Indirizzo e-mail dell'autore"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Rimuovi"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Aggiungi nuovo autore"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Aggiungi autore"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "E-mail autore:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Controllo e-mail..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Fare clic sul pulsante Aggiorna autori per salvare."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Autori attuali"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Gestione autori"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "Indica come autore nella pagina pubblica"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Sviluppatore</strong> - Può gestire tutti gli aspetti di questo componente, tranne aggiungere o rimuovere altri autori."
+msgstr ""
+"<strong>Sviluppatore</strong> - Può gestire tutti gli aspetti di questo "
+"componente, tranne aggiungere o rimuovere altri autori."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Proprietario</strong> - Può gestire tutti gli aspetti di questo componente, compreso aggiungere o rimuovere altri autori."
+msgstr ""
+"<strong>Proprietario</strong> - Può gestire tutti gli aspetti di questo "
+"componente, compreso aggiungere o rimuovere altri autori."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Ospite</strong> - Può visualizzare i dettagli e le statistiche del componente aggiuntivo, ma non può effettuare alcuna modifica."
+msgstr ""
+"<strong>Ospite</strong> - Può visualizzare i dettagli e le statistiche del "
+"componente aggiuntivo, ma non può effettuare alcuna modifica."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Selezionare un ruolo per l'autore:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Autore"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Visualizzato"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Ruolo"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Aggiorna autori"
 
@@ -2861,7 +2185,9 @@ msgstr "Aggiorna categorie"
 
 #: views/developers/addon_edit_categories.thtml:88
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Il mio componente aggiuntivo non rientra in nessuna delle categorie disponibili."
+msgstr ""
+"Il mio componente aggiuntivo non rientra in nessuna delle categorie "
+"disponibili."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
@@ -2874,7 +2200,8 @@ msgstr "Gestione categorie componenti aggiuntivi"
 
 #: views/developers/addon_edit_categories.thtml:91
 msgid "devcp_edit_categories_hover"
-msgstr "Posizionare il mouse sopra ad una categoria per visualizzare la descrizione."
+msgstr ""
+"Posizionare il mouse sopra ad una categoria per visualizzare la descrizione."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
@@ -2884,11 +2211,15 @@ msgstr "Categoria %s"
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
 msgid "devcp_edit_categories_none_available"
-msgstr "Nessuna categoria disponibile per questo tipo di componente aggiuntivo e applicazione."
+msgstr ""
+"Nessuna categoria disponibile per questo tipo di componente aggiuntivo e "
+"applicazione."
 
 #: views/developers/addon_edit_categories.thtml:86
 msgid "devcp_edit_categories_other"
-msgstr "Utilizzare questa categoria solo se il componente aggiuntivo non è adatto a nessuno delle altre categorie disponibili."
+msgstr ""
+"Utilizzare questa categoria solo se il componente aggiuntivo non è adatto a "
+"nessuno delle altre categorie disponibili."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -2897,69 +2228,98 @@ msgstr "Selezionare fino a 3 categorie per %s"
 
 #: views/developers/addon_edit.thtml:47
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Aggiungi o rimuovi utenti in grado di gestire questo componente aggiuntivo."
+msgstr ""
+"Aggiungi o rimuovi utenti in grado di gestire questo componente aggiuntivo."
 
 #: views/developers/addon_edit.thtml:49
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Selezionare le categorie rilevanti per ogni applicazione con cui il componente aggiuntivo è compatibile."
+msgstr ""
+"Selezionare le categorie rilevanti per ogni applicazione con cui il "
+"componente aggiuntivo è compatibile."
 
 #: views/developers/addon_edit.thtml:51
 msgid "devcp_edit_dd_manage_description"
-msgstr "Aggiungi o modifica le traduzioni del riepilogo, della descrizione, della licenza per l'utente finale e dell'informativa sulla privacy."
+msgstr ""
+"Aggiungi o modifica le traduzioni del riepilogo, della descrizione, della "
+"licenza per l'utente finale e dell'informativa sulla privacy."
 
 #: views/developers/addon_edit.thtml:53
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Modifica il nome del componente aggiuntivo, il sito web, l'icona e altri parametri."
+msgstr ""
+"Modifica il nome del componente aggiuntivo, il sito web, l'icona e altri "
+"parametri."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Aggiorna descrizioni"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Correggere gli errori evidenziati in colore rosso."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Modifica la descrizione"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Inserire qualsiasi informazione utile per l'utente che non è adatta ai campi riepilogo e descrizione. Ad esempio è possibile inserire eventuali bug, informazioni su come segnalare bug, anticipare la data di rilascio di una nuova versione, ecc. "
+msgstr ""
+"Inserire qualsiasi informazione utile per l'utente che non è adatta ai campi "
+"riepilogo e descrizione. Ad esempio è possibile inserire eventuali bug, "
+"informazioni su come segnalare bug, anticipare la data di rilascio di una "
+"nuova versione, ecc. "
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Commenti dello sviluppatore"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "La descrizione del componente aggiuntivo è una spiegazione più dettagliata delle caratteristiche, delle funzioni e di altre informazioni rilevanti. Viene visualizzata sotto al riepilogo nella scheda del componente aggiuntivo."
+msgstr ""
+"La descrizione del componente aggiuntivo è una spiegazione più dettagliata "
+"delle caratteristiche, delle funzioni e di altre informazioni rilevanti. "
+"Viene visualizzata sotto al riepilogo nella scheda del componente aggiuntivo."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Descrizione"
 
-#: views/developers/addon_edit_descriptions.thtml:103
-msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Se il componente aggiuntivo prevede una Licenza per l'utente finale (EULA), inserirne il testo in questo spazio. È possibile fare in modo che l'accettazione della licenza sia un passo obbligatorio per l'installazione. Attenzione: un EULA non è la stessa cosa di una licenza software, come ad esempio GPL o MPL.If your add-on has an End-User License Agreement (EULA), please enter its text below. If set below, users will be required to agree to this before installing your add-on. Please note that a EULA is not the same as a code license such as GPL or MPL."
-
 #: views/developers/addon_edit_descriptions.thtml:102
+msgid "devcp_edit_descriptions_transbox_eula_description"
+msgstr ""
+"Se il componente aggiuntivo prevede una Licenza per l'utente finale (EULA), "
+"inserirne il testo in questo spazio. È possibile fare in modo che "
+"l'accettazione della licenza sia un passo obbligatorio per l'installazione. "
+"Attenzione: un EULA non è la stessa cosa di una licenza software, come ad "
+"esempio GPL o MPL.If your add-on has an End-User License Agreement (EULA), "
+"please enter its text below. If set below, users will be required to agree "
+"to this before installing your add-on. Please note that a EULA is not the "
+"same as a code license such as GPL or MPL."
+
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Licenza per l'utente finale"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Se il componente aggiuntivo prevede un'informativa per la privacy, inserirne il testo in questo spazio. Verrà visualizzato un link all'informativa nella scheda del componente aggiuntivo."
+msgstr ""
+"Se il componente aggiuntivo prevede un'informativa per la privacy, inserirne "
+"il testo in questo spazio. Verrà visualizzato un link all'informativa nella "
+"scheda del componente aggiuntivo."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Informativa sulla privacy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Il riepilogo è una breve spiegazione delle funzioni di base del componente aggiuntivo e viene visualizzato nelle ricerche e negli elenchi, così come nella parte superiore della scheda del componente aggiuntivo. <strong>Limitare il testo a 250 caratteri.</strong>"
+msgstr ""
+"Il riepilogo è una breve spiegazione delle funzioni di base del componente "
+"aggiuntivo e viene visualizzato nelle ricerche e negli elenchi, così come "
+"nella parte superiore della scheda del componente aggiuntivo. "
+"<strong>Limitare il testo a 250 caratteri.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Riepilogo"
 
@@ -2979,170 +2339,271 @@ msgstr "Gestisci descrizioni"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Gestisci altre proprietà"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr ""
+"Nessuna categoria disponibile per questo tipo di componente aggiuntivo."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Trasferimento non completato"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Nessun file caricato"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Il file eccede la dimensione massima per l'upload"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autori"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Aggiungi icona"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Modifica icona"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permetti agli utenti di visualizzare i sorgenti online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorie"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Locale predefinito"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Questo componente aggiuntivo richiede la presenza di software esterno"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Elimina solo l'icona esistente"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nuovo file icona"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icona"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Altre informazioni sul locale"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Questa è una pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Questo componente aggiuntivo è specifico per un determinato sito web"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Locale di riferimento"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "brevi dettagli (ad es. il nome del dialetto locale)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Aggiorna proprietà"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Modificare solo se si comprendono tutte le possibili conseguenze."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Icona attuale"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
-msgstr "Il locale predefinito di un componente aggiuntivo è il locale principale per cui deve essere presente la traduzione. Se la traduzione di una descrizione non è disponibile nella lingua dell'utente, verrà utilizzata la descrizione nel locale predefinito."
+msgstr ""
+"Il locale predefinito di un componente aggiuntivo è il locale principale per "
+"cui deve essere presente la traduzione. Se la traduzione di una descrizione "
+"non è disponibile nella lingua dell'utente, verrà utilizzata la descrizione "
+"nel locale predefinito."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
-msgstr "Questi parametri vengono usati per filtrare e classificare i componenti aggiuntivi."
+msgstr ""
+"Questi parametri vengono usati per filtrare e classificare i componenti "
+"aggiuntivi."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
-msgstr "Il GUID viene specificato nel file install.rdf e identifica in modo univoco un componente aggiuntivo. Non è possibile modificare il GUID una volta che l'estensione è presente su Mozilla Add-ons."
+msgstr ""
+"Il GUID viene specificato nel file install.rdf e identifica in modo univoco "
+"un componente aggiuntivo. Non è possibile modificare il GUID una volta che "
+"l'estensione è presente su Mozilla Add-ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Modifica proprietà"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Tipo"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Impostazioni amministratore"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Locale predefinito"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Parametri"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Icona"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Altre impostazioni"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Affidabile?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Visualizza sorgente online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
-msgstr "L'icona del componente aggiuntivo è una piccola immagine visualizzata accanto al nome nei risultati di ricerca, nella scheda e nella finestra di installazione. L'immagine verrà automaticamente ridimensionata a 32x32 pixel. Utilizzare uno dei seguenti formati: %s"
+msgstr ""
+"L'icona del componente aggiuntivo è una piccola immagine visualizzata "
+"accanto al nome nei risultati di ricerca, nella scheda e nella finestra di "
+"installazione. L'immagine verrà automaticamente ridimensionata a 32x32 "
+"pixel. Utilizzare uno dei seguenti formati: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Questo componente aggiuntivo contiene elementi compilati"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Non affidabile"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Affidabile"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Nuova icona"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Rimuovi icona"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Se il componente aggiuntivo ha un altro sito web, inserire l'indirizzo in questo campo. Non è necessario aggiungere altre traduzioni, a meno che il sito sia localizzato in diverse lingue."
+msgstr ""
+"Se il componente aggiuntivo ha un altro sito web, inserire l'indirizzo in "
+"questo campo. Non è necessario aggiungere altre traduzioni, a meno che il "
+"sito sia localizzato in diverse lingue."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Sito web"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Il nome del componente aggiuntivo viene utilizzato in tutti gli elenchi."
+msgstr ""
+"Il nome del componente aggiuntivo viene utilizzato in tutti gli elenchi."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Nome"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Se esiste un indirizzo e-mail per richieste di supporto, inserirlo in questo campo. Non è necessario aggiungere altre traduzioni, a meno che vengano usati indirizzi e-mail diversi per lingue diverse."
+msgstr ""
+"Se esiste un indirizzo e-mail per richieste di supporto, inserirlo in questo "
+"campo. Non è necessario aggiungere altre traduzioni, a meno che vengano "
+"usati indirizzi e-mail diversi per lingue diverse."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Indirizzo e-mail per il supporto"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Se esiste un sito web o un forum di supporto, inserire l'indirizzo in questo campo. Non è necessario aggiungere altre traduzioni, a meno che il sito sia localizzato in diverse lingue."
+msgstr ""
+"Se esiste un sito web o un forum di supporto, inserire l'indirizzo in questo "
+"campo. Non è necessario aggiungere altre traduzioni, a meno che il sito sia "
+"localizzato in diverse lingue."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Sito web per il supporto"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
-msgstr "Un componente aggiuntivo affidabile può venire pubblicato senza l'intervento di un revisore."
+msgstr ""
+"Un componente aggiuntivo affidabile può venire pubblicato senza l'intervento "
+"di un revisore."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
-msgstr "Proseguendo con il salvataggio l'icona verrò eliminata. <a %s>Annullare?</a>"
+msgstr ""
+"Proseguendo con il salvataggio l'icona verrò eliminata. <a %s>Annullare?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
-msgstr "È possibile fare in modo che il codice sorgente del componente aggiuntivo venga visualizzato solo dagli utenti registrati."
+msgstr ""
+"È possibile fare in modo che il codice sorgente del componente aggiuntivo "
+"venga visualizzato solo dagli utenti registrati."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Consenti la visualizzazione online dei sorgenti"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Impedisci la visualizzazione online dei sorgenti"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Aggiorna"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nome "
+"semplificato del locale</a>, come ad es. 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Autori"
@@ -3218,14 +2679,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Aggiornamenti in sospeso (%s)"
 msgstr[1] "Aggiornamenti in sospeso (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "I file selezionati verranno eliminati."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "File"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Applicazioni di destinazione"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Nessun file."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Note per i revisori"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Aggiorna"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Non hai accesso a questo componente aggiuntivo."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"La lunghezza massima per un riepilogo è di 250 caratteri.\n"
+"(Ne hai inseriti %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Il nome scelto per il componente aggiuntivo è già presente nel database. "
+"Assicurati che: <br /><li>il GUID sia corretto. La causa più comune per "
+"questo tipo di errori è un GUID errato.</li><li>nel database non sia "
+"effettivamente presente un elemento duplicato. In questo caso è necessario "
+"modificare l'elemento esistente oppure eliminarlo e riprovare.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3239,21 +2755,29 @@ msgstr "Consultare %s come riferimento."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "questa pagina"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Il componente aggiuntivo deve avere almeno un proprietario."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Descrivi le modifiche introdotte in questo aggiornamento."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 msgid "devcp_error_file_exists"
-msgstr "È già presente una versione di questo componente aggiuntivo. Per sostituirla, è prima necessario rimuovere il file %1$s."
+msgstr ""
+"È già presente una versione di questo componente aggiuntivo. Per "
+"sostituirla, è prima necessario rimuovere il file %1$s."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "Questa estensione (%s) non è consentita per questo tipo di componente aggiuntivo. Utilizzare una delle seguenti estensioni: %s"
+msgstr ""
+"Questa estensione (%s) non è consentita per questo tipo di componente "
+"aggiuntivo. Utilizzare una delle seguenti estensioni: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Non tutte le GUID del file corrispondono"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3261,7 +2785,8 @@ msgstr "Non selezionare più di cinque categorie."
 
 #: controllers/components/developers.php:526
 msgid "devcp_error_guid_application"
-msgstr "L'ID di questo componente aggiuntivo è già utilizzato da un'applicazione."
+msgstr ""
+"L'ID di questo componente aggiuntivo è già utilizzato da un'applicazione."
 
 #: controllers/components/developers.php:337
 #: controllers/components/developers.php:389
@@ -3285,9 +2810,20 @@ msgstr "Non è stato caricato nessun file"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Questa estensione (%1$s) non è consentita per un'icona. Utilizzare una delle seguenti estensioni: %1$s"
+msgstr ""
+"Questa estensione (%s) non è consentita per un'icona. Utilizzare una delle "
+"seguenti estensioni: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Una versione identica (%s) è già presente per questo componente aggiuntivo e "
+"questa piattaforma."
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Non è presente il file install.rdf."
 
@@ -3295,9 +2831,9 @@ msgstr "Non è presente il file install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Sono stati rilevati i seguenti errori nel file install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "Selezionare una tipologia valida per il componente aggiuntivo."
+msgstr "Seleziona una tipologia valida per il componente aggiuntivo."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3305,7 +2841,7 @@ msgstr "Selezionare una tipologia valida per il componente aggiuntivo."
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "%1$s non è una versione valida per %2$s"
+msgstr "%s non è una versione valida per %s"
 
 #. %s is a string
 #: controllers/components/developers.php:521
@@ -3318,21 +2854,30 @@ msgstr "L'ID di questo componente aggiuntivo non è valido: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%1$s non è una versione valida per %2$s: le versioni minime non possono contenere *"
+msgstr ""
+"%s non è una versione valida per %s: le versioni minime non possono "
+"contenere *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "La versione di questo componente aggiuntivo non è valida: consultare le <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">specifiche</a>"
+msgstr ""
+"La versione di questo componente aggiuntivo non è valida: consultare le <a "
+"href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format"
+"\">specifiche</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "La versione di questo componente aggiuntivo non è valida: le versioni non possono contenere spazi."
+msgstr ""
+"La versione di questo componente aggiuntivo non è valida: le versioni non "
+"possono contenere spazi."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
 #, php-format
 msgid "devcp_error_manifest_parse"
-msgstr "Si sono verificati i seguenti errori durante l'elaborazione del file install.rdf: %s"
+msgstr ""
+"Si sono verificati i seguenti errori durante l'elaborazione del file install."
+"rdf: %s"
 
 #: controllers/components/developers.php:373
 msgid "devcp_error_move_file"
@@ -3355,110 +2900,357 @@ msgstr "È necessario indicare almeno un'applicazione Mozilla di riferimento."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
-msgstr "Impossibile trovare un ID per questo componente aggiuntivo nel file install.rdf."
+msgstr ""
+"Impossibile trovare un ID per questo componente aggiuntivo nel file install."
+"rdf."
 
 #: controllers/components/developers.php:287
 msgid "devcp_error_no_platform"
 msgstr "Nessuna piattaforma selezionata"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "È necessario fornire i dettagli richiesti per la segnalazione."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Non è possibile segnalare un componente aggiuntivo in pre-release."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Puoi segnalare solamente i componenti aggiuntivi che si trovano nella "
+"sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Selezionare almeno una categoria."
 
 #: controllers/components/developers.php:92
 msgid "devcp_error_one_user"
-msgstr "È necessario indicare almeno un autore per questo componente aggiuntivo."
+msgstr ""
+"È necessario indicare almeno un autore per questo componente aggiuntivo."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Questa estensione (%1$s) non è consentita per un'anteprima. Utilizzare una delle seguenti estensioni: %2$s"
+msgstr ""
+"Questa estensione (%s) non è consentita per un'anteprima. Utilizzare una "
+"delle seguenti estensioni: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Si è verificato un errore durante il salvataggio dei dati."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Non hai il permesso per aggiornare questo componente aggiuntivo."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "I componenti aggiuntivi non possono avere un updateKey. Rimuovere questa chiave dal file install.rdf e riprovare."
+msgstr ""
+"I componenti aggiuntivi non possono avere un updateKey. Rimuovere questa "
+"chiave dal file install.rdf e riprovare."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "I componenti aggiuntivi non possono utilizzare un updateURL esterno. Rimuoverlo da install.rdf e riprovare."
+msgstr ""
+"I componenti aggiuntivi non possono utilizzare un updateURL esterno. "
+"Rimuoverlo da install.rdf e riprovare."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Inserire un file da caricare."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Aggiungi un file per un'altra piattaforma"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Aggiungi autore"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Rimuovi"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Le categorie per la nuova tipologia di componente aggiuntivo saranno "
+"disponibili al passaggio successivo."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr ""
+"Non sono disponibili categorie per questo tipo di componente aggiuntivo."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Inserisci una descrizione per il componente aggiuntivo."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Inserisci un nome per il componente aggiuntivo."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Seleziona la tipologia del componente aggiuntivo."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Inserisci un riepilogo per il componente aggiuntivo."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Componente aggiuntivo"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Componente aggiuntivo 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Componente aggiuntivo 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tipologia del componente aggiuntivo"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permetti agli utenti di visualizzare i sorgenti online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Indirizzo e-mail dell'autore"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autori"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorie"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Locale predefinito"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descrizione"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Accordo di licenza con l'utente finale (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Questo componente aggiuntivo richiede la presenza di software esterno"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "File"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Sito web"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "File icona"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nome"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Piattaforme supportate"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Si tratta di una pre-release"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Informativa sulla privacy"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Questo componente aggiuntivo è specifico per un determinato sito web"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Riepilogo"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-mail per il supporto"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL per il supporto"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Applicazioni di destinazione"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versione"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Note sulla versione"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Nessuna"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Note per i revisori"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Poiché il componente aggiuntivo è considerato affidabile, puoi scegliere "
+"dove inserire questa versione:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "area pubblica"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Accordo di licenza per sviluppatori"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Passaggio 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Carica i file"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Passaggio 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Informazioni sul componente aggiuntivo"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Passaggio 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Dettagli sulla versione"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Passaggio 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localizzazione"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Passaggio 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Operazione completata"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "I miei componenti aggiuntivi"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Carica file"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Annulla"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Inserire l'indirizzo e-mail dell'autore da aggiungere."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Sposta in basso"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Sposta in alto"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Rimuovi compatibilità applicazione"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Visualizza come autore negli elenchi pubblici"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Selezionare una licenza."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Inserire il testo della licenza."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Sviluppatore"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Proprietario"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Ospite"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Rimuovi autore"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "<strong>Rimuovere</strong> questo autore?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Selezionare il file da caricare."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Licenza personalizzata per %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3468,15 +3260,20 @@ msgstr "Campi localizzati"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "È possibile far comparire alcuni campi presenti in questa pagina nella lingua dell'utente finale. Selezionare un locale tra quelli disponibili per farlo comparire nelle lingue di destinazione. Se la traduzione in una determinata lingua non è disponibile le informazioni verranno visualizzate utilizzando il locale predefinito (%s)."
+msgstr ""
+"È possibile far comparire alcuni campi presenti in questa pagina nella "
+"lingua dell'utente finale. Selezionare un locale tra quelli disponibili per "
+"farlo comparire nelle lingue di destinazione. Se la traduzione in una "
+"determinata lingua non è disponibile le informazioni verranno visualizzate "
+"utilizzando il locale predefinito (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Pannello di amministrazione"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Pannello di amministrazione per revisori"
 
@@ -3485,72 +3282,106 @@ msgid "devcp_myaddons_link"
 msgstr "I miei componenti aggiuntivi"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Torna alla pagina principale"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Pannello statistiche"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Inserisci un nuovo componente aggiuntivo"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Strumenti per sviluppatori"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
-msgstr "L'ID (%1$s) di questo componente aggiuntivo risulta già presente nel database. Se questo è il tuo componente aggiuntivo, puoi <a href=\"%2$s\">caricare una nuova versione</a>."
+msgstr ""
+"L'ID (%1$s) di questo componente aggiuntivo risulta già presente nel "
+"database. Se questo è il tuo componente aggiuntivo, puoi <a href=\"%2$s"
+"\">caricare una nuova versione</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 msgid "devcp_nominate_cancel"
 msgstr "Annullare e tornare indietro"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Ritorno ai dettagli del componente aggiuntivo"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Segnala %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Tipologia del componente aggiuntivo rilevata automaticamente: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
-msgstr "<span>Impossibile salvare una o più modifiche.</span><br />Verificare gli errori segnalati. Le altre modifiche sono state salvate correttamente."
+msgstr ""
+"<span>Impossibile salvare una o più modifiche.</span><br />Verificare gli "
+"errori segnalati. Le altre modifiche sono state salvate correttamente."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Le modifiche sono state salvate.</span><br /> Potrebbero trascorrere diverse ore prima che le modifiche appaiano in tutte le sezioni del sito web."
+msgstr ""
+"<span>Le modifiche sono state salvate.</span><br /> Potrebbero trascorrere "
+"diverse ore prima che le modifiche appaiano in tutte le sezioni del sito web."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Se si elimina questa immagine come anteprima predefinita, un'altra immagine verrà scelta automaticamente al suo posto."
+msgstr ""
+"Se si elimina questa immagine come anteprima predefinita, un'altra immagine "
+"verrà scelta automaticamente al suo posto."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Il locale predefinito di questo componente aggiuntivo (%1$s [%2$s]) è "
+"diverso dal locale attualmente  selezionato (%3$s [%4$s]). I campi "
+"successivi dovrebbero essere compilati in %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "Se si usa questa immagine come anteprima predefinita ne verrà automaticamente eliminato lo status dall'immagine usata in precedenza."
+msgstr ""
+"Se si usa questa immagine come anteprima predefinita ne verrà "
+"automaticamente rimosso lo status dall'immagine usata in precedenza."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Sono presenti modifiche non salvate."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3579,55 +3410,65 @@ msgstr "Modifica anteprima"
 msgid "devcp_preview_updated_successfully"
 msgstr "Anteprima aggiornata con successo."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Aggiungi un'altra anteprima"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Elimina anteprima"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Sostituisci anteprima"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Aggiorna anteprima"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Aggiungi nuova anteprima"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
-msgstr "Selezionare un'immagine da caricare. Le immagini che eccedono la larghezza di 700 pixel e l'altezza di 525 pixel verranno ridimensionate. Formati accettati: %s"
+msgstr ""
+"Selezionare un'immagine da caricare. Le immagini che eccedono la larghezza "
+"di 700 pixel e l'altezza di 525 pixel verranno ridimensionate. Formati "
+"accettati: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Fare clic sul pulsante Aggiorna anteprima per caricare il file."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
-msgstr "Fare clic sul pulsante Aggiorna anteprime per salvare questa immagine. (<a %s>Annulla?</a>)"
+msgstr ""
+"Fare clic sul pulsante Aggiorna anteprime per salvare questa immagine. (<a %"
+"s>Annulla?</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
-msgstr "Questa anteprima verrà eliminata premendo il pulsante Aggiorna anteprime. (<a %s>Annulla?</a>)"
+msgstr ""
+"Questa anteprima verrà eliminata premendo il pulsante Aggiorna anteprime. "
+"(<a %s>Annulla?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Usare il modulo seguente per caricare uno screenshot in formato PNG, JPG o GIF del proprio componente aggiuntivo. Le immagini con dimensioni superiori a 700 pixel di larghezza e 525 pixel di altezza verranno automaticamente ridimensionate."
+msgstr ""
+"Usare il modulo seguente per caricare uno screenshot in formato PNG, JPG o "
+"GIF del proprio componente aggiuntivo. Le immagini con dimensioni superiori "
+"a 700 pixel di larghezza e 525 pixel di altezza verranno automaticamente "
+"ridimensionate."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Aggiungi anteprima"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Descrizione anteprima"
 
@@ -3635,7 +3476,7 @@ msgstr "Descrizione anteprima"
 msgid "devcp_previews_header_edit"
 msgstr "Modifica anteprima"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Anteprima predefinita"
 
@@ -3643,30 +3484,33 @@ msgstr "Anteprima predefinita"
 msgid "devcp_previews_label_file"
 msgstr "Anteprima"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Usa questa immagine come anteprima predefinita"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Nuova immagine:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Carica anteprima: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "Impossibile salvare una o più nuove anteprime."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "L'anteprima è stata aggiornata correttamente."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
-msgstr "Le anteprime del componente aggiuntivo sono visualizzate in seguito. È possibile modificare le descrizioni o le immagini. L'anteprima predefinita verrà mostrata accanto al componente aggiuntivo negli elenchi e nei risultati di ricerca."
+msgstr ""
+"Le anteprime del componente aggiuntivo sono visualizzate in seguito. È "
+"possibile modificare le descrizioni o le immagini. L'anteprima predefinita "
+"verrà mostrata accanto al componente aggiuntivo negli elenchi e nei "
+"risultati di ricerca."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3684,31 +3528,52 @@ msgstr "Modifica anteprima"
 msgid "devcp_previews_submit_upload"
 msgstr "Carica anteprima"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniatura"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "Gestione anteprime - %s"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Non corretto?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Vuoi eliminare questo file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Prima di procedere è necessario leggere e accettare il seguente accordo di licenza per sviluppatori."
+msgstr ""
+"Prima di procedere controlla e accetta il seguente accordo di licenza per "
+"sviluppatori."
 
 #: views/elements/developers/rolecheck.thtml:42
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Non si dispone di permessi sufficienti per modificare questa pagina.</span><br />Contattare il proprietario del componente aggiuntivo per eventuali modifiche."
+msgstr ""
+"<span>Non si dispone di permessi sufficienti per modificare questa pagina.</"
+"span><br />Contattare il proprietario del componente aggiuntivo per "
+"eventuali modifiche."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
-msgstr "Potrebbero trascorrere diverse ore prima che le modifiche appaiano in tutte le sezioni del sito web."
+msgstr ""
+"Potrebbero trascorrere diverse ore prima che le modifiche appaiano in tutte "
+"le sezioni del sito web."
 
 #: views/elements/developers/sidebar.thtml:52
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr ""
+"Non effettuare la revisione delle informazioni per questa versione del "
+"componente aggiuntivo"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3732,7 +3597,13 @@ msgstr "<em>%s</em> download settimanali"
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active"
-msgstr "Se si imposta il componente aggiuntivo come attivo, verrà visualizzato in tutte le sezioni pubbliche riservate a questo stato, inclusi risultati di ricerca ed elenchi. Potrà essere scaricato dal sito web e verrà incluso negli aggiornamenti automatici, a seconda dello stato. Sarà comunque possibile ritornare a questa sezione e disattivarlo nel caso lo si ritenga necessario."
+msgstr ""
+"Se si imposta il componente aggiuntivo come attivo, verrà visualizzato in "
+"tutte le sezioni pubbliche riservate a questo stato, inclusi risultati di "
+"ricerca ed elenchi. Potrà essere scaricato dal sito web e verrà incluso "
+"negli aggiornamenti automatici, a seconda dello stato. Sarà comunque "
+"possibile ritornare a questa sezione e disattivarlo nel caso lo si ritenga "
+"necessario."
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active_sure"
@@ -3744,11 +3615,20 @@ msgstr "Sei sicuro?"
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive"
-msgstr "Se si imposta il componente aggiuntivo come disattivato, verrà escluso da tutte le sezioni pubbliche, inclusi risultati di ricerca ed elenchi. Non potrà essere scaricato dal sito web e non verrà incluso negli aggiornamenti automatici.Sarà comunque possibile ritornare a questa sezione e riattivarlo nel caso lo si ritenga necessario.Marking this add-on inactive will prevent it from showing up in any public areas, including search and browse listings. It will not be downloadable from the website and will not be returned in client update checks. You will be able to return here and re-enable it at your convenience."
+msgstr ""
+"Se si imposta il componente aggiuntivo come disattivo, verrà escluso da "
+"tutte le sezioni pubbliche, inclusi risultati di ricerca ed elenchi. Non "
+"potrà essere scaricato dal sito web e non verrà incluso negli aggiornamenti "
+"automatici.Sarà comunque possibile ritornare a questa sezione e riattivarlo "
+"nel caso lo si ritenga necessario.Marking this add-on inactive will prevent "
+"it from showing up in any public areas, including search and browse "
+"listings. It will not be downloadable from the website and will not be "
+"returned in client update checks. You will be able to return here and re-"
+"enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Impostare questo componente aggiuntivo come disattivato?"
+msgstr "Impostare questo componente aggiuntivo come disattivo?"
 
 #: views/developers/addon_status_confirm.thtml:74
 msgid "devcp_status_confirm_no"
@@ -3756,7 +3636,10 @@ msgstr "No, annulla"
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public"
-msgstr "Se si imposta questo componente aggiuntivo come pubblicato, qualunque utente potrà scaricarlo e verranno forniti aggiornamenti automatici agli utenti esistenti."
+msgstr ""
+"Se si imposta questo componente aggiuntivo come pubblicato, qualunque utente "
+"potrà scaricarlo e verranno forniti aggiornamenti automatici agli utenti "
+"esistenti."
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public_sure"
@@ -3764,7 +3647,12 @@ msgstr "Impostare questo componente aggiuntivo come pubblicato?"
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
-msgstr "Se si sposta questo componente aggiuntivo nella sandbox, gli utenti dovranno effettuare il login per poterlo scaricare e gli utenti esistenti non riceveranno gli aggiornamenti automatici. Dal momento che il componente aggiuntivo è attualmente pubblico, sarà possibile ritornare in questa sezione e renderlo nuovamente pubblico."
+msgstr ""
+"Se si sposta questo componente aggiuntivo nella sandbox, gli utenti dovranno "
+"effettuare il login per poterlo scaricare e gli utenti esistenti non "
+"riceveranno gli aggiornamenti automatici. Dal momento che il componente "
+"aggiuntivo è attualmente pubblico, sarà possibile ritornare in questa "
+"sezione e renderlo nuovamente pubblico."
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox_sure"
@@ -3776,168 +3664,245 @@ msgstr "Sì, sono sicuro"
 
 #: views/developers/addon_status_nominate.thtml:46
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>È obbligatorio inserire un messaggio per la segnalazione.</span><br />Inserire il testo richiesto e riprovare."
+msgstr ""
+"<span>È obbligatorio inserire un messaggio per la segnalazione.</span><br /"
+">Inserire il testo richiesto e riprovare."
 
 #: views/developers/addon_status_nominate.thtml:55
 msgid "devcp_status_nominate_header"
 msgstr "Segnalazione componente aggiuntivo"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Al momento non è possibile inserire nuovi componenti aggiuntivi. Riprovare "
+"più tardi."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Accetto"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Non accetto"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Questo componente aggiuntivo è stato disattivato da un amministratore."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Disattivato"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Affidabile"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Ultima versione:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr ""
+"Non hai ancora pubblicato alcun componente aggiuntivo. Fai clic %s per "
+"inserirne uno."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "qui"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Assicurati di %s per il tuo tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "aver caricato un'anteprima"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Modifica %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Guida (la pagina corrente non verrà chiusa)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Guida"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Caratteri utilizzati: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Eliminare questa traduzione?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "Cosa sono queste schede %s?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "Cosa succede se non ho nessuna traduzione?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Nascondi guida"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
-msgstr "Se un utente naviga sul sito e non è disponibile una traduzione nella sua lingua, verrà utilizzato il locale predefinito specificato nella sezione Modifica proprietà.Se non è disponibile alcuna traduzione, inserire le informazioni disponibili nel locale predefinito (dovrebbe corrispondere alla tua lingua madre)."
+msgstr ""
+"Se un utente naviga sul sito e non è disponibile una traduzione nella sua "
+"lingua, verrà utilizzato il locale predefinito specificato nella sezione "
+"Modifica proprietà.Se non è disponibile alcuna traduzione, inserire le "
+"informazioni disponibili nel locale predefinito (dovrebbe corrispondere alla "
+"tua lingua madre)."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
-msgstr "Questo è un <i>campo per la traduzione</i>. Permette di localizzare un campo specifico in qualsiasi lingua in cui è disponibile il componente aggiuntivo. È possibile aggiungere, modificare o eliminare le traduzioni usando la scheda Locale."
+msgstr ""
+"Questo è un <i>campo per la traduzione</i>. Permette di localizzare un campo "
+"specifico in qualsiasi lingua in cui è disponibile il componente aggiuntivo. "
+"È possibile aggiungere, modificare o eliminare le traduzioni usando la "
+"scheda Locale."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Aggiungi traduzione"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Elimina traduzione"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Aggiungi locale a tutti"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Aggiungi locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Annulla"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Elimina"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Selezionare il locale della traduzione da aggiungere:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
-msgstr "Il GUID usato in questo file (%1$s) non corrisponde al GUID di questo componente aggiuntivo (%2$s)."
+msgstr ""
+"Il GUID usato in questo file (%1$s) non corrisponde al GUID di questo "
+"componente aggiuntivo (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
-msgstr "Non si dispone dei permessi necessari per aggiornare questo componente aggiuntivo."
+msgstr ""
+"Non si dispone dei permessi necessari per aggiornare questo componente "
+"aggiuntivo."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
-msgstr "La versione specificata (%1$s) non appartiene a questo componente aggiuntivo (%2$s)."
+msgstr ""
+"La versione specificata (%1$s) non appartiene a questo componente aggiuntivo "
+"(%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Il numero di versione caricato (%1$s) è già presente per questo componente aggiuntivo. Se stai cercando di aggiungere un nuovo file a questa versione, <a href=\"%2$s\">fai clic qui</a>."
+msgstr ""
+"Il numero di versione caricato (%1$s) è già presente per questo componente "
+"aggiuntivo. Se stai cercando di aggiungere un nuovo file a questa versione, "
+"<a href=\"%2$s\">fai clic qui</a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
-msgstr "Il numero di versione caricato (%1$s) non corrisponde al numero di versione esistente (%2$s)."
+msgstr ""
+"Il numero di versione caricato (%1$s) non corrisponde al numero di versione "
+"esistente (%2$s)."
 
 #: views/developers/uploader.thtml:68
 msgid "devcp_uploader_a_start"
 msgstr "Per iniziare"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Caricamento file in corso..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Accetta e continua"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Modifica il mio componente aggiuntivo"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Completerò il componente aggiuntivo in seguito."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Aggiungi note di versione"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
-msgstr "<p>Le informazioni sul componente aggiuntivo sono state correttamente registrate. Sono stati salvati i dati principali recuperati dal file caricato, ma ci sono molte altre informazioni che possono essere personalizzate.</p><p>Il componente aggiuntivo è attualmente considerato come <strong>Incompleto</strong>. Per completarlo, bisogna verificare il nome, il riepilogo, la descrizione e controllare che sia inserito in almeno una categoria. È possibile modificare queste informazioni utilizzando i link seguenti e verificare lo stato del componente aggiuntivo controllando la <a %s>pagina sullo stato</a>."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Le informazioni sul componente aggiuntivo sono state correttamente "
+"registrate. Sono stati salvati i dati principali recuperati dal file "
+"caricato, ma ci sono molte altre informazioni che possono essere "
+"personalizzate.</p><p>Il componente aggiuntivo è attualmente considerato "
+"come <strong>Incompleto</strong>. Per completarlo, bisogna verificare il "
+"nome, il riepilogo, la descrizione e controllare che sia inserito in almeno "
+"una categoria. È possibile modificare queste informazioni utilizzando i link "
+"seguenti e verificare lo stato del componente aggiuntivo controllando la <a %"
+"s>pagina sullo stato</a>."
+
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Correggere questo problema e caricare nuovamente il file."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
-msgstr "Il nuovo file è stato aggiunto alla versione %1$s ed è attualmente impostato come %2$s."
+msgstr ""
+"Il nuovo file è stato aggiunto alla versione %1$s ed è attualmente impostato "
+"come %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Creazione componente aggiuntivo completata"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Oops! Sembra esserci un problema con questo file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "File aggiunto"
 
@@ -3946,74 +3911,101 @@ msgid "devcp_uploader_header_how"
 msgstr "Come funziona il sistema?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Creata versione %s"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Carica il file"
 
 #: views/developers/uploader.thtml:67
 msgid "devcp_uploader_how"
-msgstr "<p>Grazie per aver caricato il tuo componente aggiuntivo su Mozilla Add-ons. Ospitare il tuo componente aggiuntivo su Mozilla Add-ons è la scelto più semplice per assicurare la migliore distribuzione del tuo lavoro. Ecco alcuni vantaggi: </p><ul><li>ogni componente aggiuntivo avrà una scheda pubblica con le informazioni che inserirai, come un breve riepilogo delle funzionalità dei componenti aggiuntivi, le funzioni disponibili e una galleria di anteprime del componente aggiuntivo in funzione;</li><li>il componente aggiuntivo verrà visualizzato nei risultati di ricerca, negli elenchi pubblici e anche nella finestra del Gestore dei componenti aggiuntivi di Firefox 3;</li><li>ci prenderemo cura di ospitare tutti i file per il download e di fornire aggiornamenti automatici;</li><li>avrai accesso ad una bacheca delle statistiche con informazioni dettagliate sugli utenti che utilizzano il tuo componente aggiuntivo.</li><li></ul><p>I componenti aggiuntivi ospitati su Mozilla Add-ons devono essere approvati da un revisore prima di beneficiare di tutte le possibilità descritte. Se sei pronto per iniziare il processo e il pacchetto è già pronto per essere caricato, fai clic su Per iniziare.<p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Grazie per aver caricato il tuo componente aggiuntivo su Mozilla Add-ons. "
+"Ospitare il tuo componente aggiuntivo su Mozilla Add-ons è la scelto più "
+"semplice per assicurare la migliore distribuzione del tuo lavoro. Ecco "
+"alcuni vantaggi: </p><ul><li>ogni componente aggiuntivo avrà una scheda "
+"pubblica con le informazioni che inserirai, come un breve riepilogo delle "
+"funzionalità dei componenti aggiuntivi, le funzioni disponibili e una "
+"galleria di anteprime del componente aggiuntivo in funzione;</li><li>il "
+"componente aggiuntivo verrà visualizzato nei risultati di ricerca, negli "
+"elenchi pubblici e anche nella finestra del Gestore dei componenti "
+"aggiuntivi di Firefox 3;</li><li>ci prenderemo cura di ospitare tutti i file "
+"per il download e di fornire aggiornamenti automatici;</li><li>avrai accesso "
+"ad una bacheca delle statistiche con informazioni dettagliate sugli utenti "
+"che utilizzano il tuo componente aggiuntivo.</li><li></ul><p>I componenti "
+"aggiuntivi ospitati su Mozilla Add-ons devono essere approvati da un "
+"revisore prima di beneficiare di tutte le possibilità descritte. Se sei "
+"pronto per iniziare il processo e il pacchetto è già pronto per essere "
+"caricato, fai clic su Per iniziare.<p>"
+
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Piattaforme supportate:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "File: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Altro"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
-msgstr "Il nuovo file sarà disponibile al pubblico non appena un revisore l'avrà controllata. Attualmente ci sono altri %1$s componenti aggiuntivi in coda. Vorresti una revisione più rapida? Perché non <a %2$s>diventare un revisore</a>?"
+msgstr ""
+"Il nuovo file sarà disponibile al pubblico non appena un revisore l'avrà "
+"controllata. Attualmente ci sono altri %1$s componenti aggiuntivi in coda. "
+"Vorresti una revisione più rapida? Perché non <a %2$s>diventare un revisore</"
+"a>?"
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
-msgstr "La nuova versione sarà disponibile al pubblico non appena un revisore l'avrà controllata. Attualmente ci sono altri %1$s componenti aggiuntivi in coda. Vorresti una revisione più rapida? Perché non <a %2$s>diventare un revisore</a>?"
+msgstr ""
+"La nuova versione sarà disponibile al pubblico non appena un revisore l'avrà "
+"controllata. Attualmente ci sono altri %1$s componenti aggiuntivi in coda. "
+"Vorresti una revisione più rapida? Perché non <a %2$s>diventare un revisore</"
+"a>?"
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "È stata creata una nuova versione ed è attualmente impostata come %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
-msgstr "Visualizza il nuovo file nella pagina <a %1$s>Versioni e file</a>, controlla lo <a %2$s>stato</a> del tuo componente aggiuntivo, oppure <b>aggiungi le note di versione</b> facendo clic sul pulsante seguente (altamente raccomandato)."
+msgstr ""
+"Visualizza il nuovo file nella pagina <a %1$s>Versioni e file</a>, controlla "
+"lo <a %2$s>stato</a> del tuo componente aggiuntivo, oppure <b>aggiungi le "
+"note di versione</b> facendo clic sul pulsante seguente (altamente "
+"raccomandato)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
-msgstr "Visualizza la nuova versione nella pagina <a %1$s>Versioni e file</a>, controlla lo <a %2$s>stato</a> del tuo componente aggiuntivo, oppure <b>aggiungi le note di versione</b> facendo clic sul pulsante seguente (altamente raccomandato)."
+msgstr ""
+"Visualizza la nuova versione nella pagina <a %1$s>Versioni e file</a>, "
+"controlla lo <a %2$s>stato</a> del tuo componente aggiuntivo, oppure "
+"<b>aggiungi le note di versione</b> facendo clic sul pulsante seguente "
+"(altamente raccomandato)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
-msgstr "Utilizzare il seguente modulo per caricare nuovi file. Se sono presenti più file, oppure file specifici per una piattaforma, selezionare un singolo file e caricare i successivi usando la Gestione versioni e file."
+msgstr ""
+"Utilizzare il seguente modulo per caricare nuovi file. Se sono presenti più "
+"file, oppure file specifici per una piattaforma, selezionare un singolo file "
+"e caricare i successivi usando la Gestione versioni e file."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Tutto"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specifico:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Selezionare un elemento…"
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4029,24 +4021,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Aggiorna %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Consultare %s per ulteriori riferimenti."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "questa pagina"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Nessun account trovato per questo indirizzo e-mail."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Il file XML non è valido oppure uno dei campi obbligatori non è stato compilato. <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">Consulta la documentazione</a>, verifica il componente aggiuntivo e riprova."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Modifica versione"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versione aggiornata con successo."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4103,66 +4102,66 @@ msgstr[1] "%s recensioni"
 msgid "devcp_versions_delete_sure"
 msgstr "Eliminare in modo permanente la versione %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Annulla"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Elimina file"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Aggiungi nuova applicazione"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Elimina applicazione"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Aggiungi nuovo file"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
-msgstr "Se si modificano le informazioni relative alle applicazioni in questa sezione, gli utenti saranno in grado di completare l'installazione anche se il file install.rdf presente nel pacchetto indica che il componente aggiuntivo non è compatibile. <a %s>Elenco delle applicazioni supportate</a>"
+msgstr ""
+"Se si modificano le informazioni relative alle applicazioni in questa "
+"sezione, gli utenti saranno in grado di completare l'installazione anche se "
+"il file install.rdf presente nel pacchetto indica che il componente "
+"aggiuntivo non è compatibile. <a %s>Elenco delle applicazioni supportate</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr "Eliminare la compatibilità con questa applicazione?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Eliminare in modo permanente questo file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Informazioni approvazione"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Applicazioni compatibili"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Informazioni file"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licenza"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Gestisci versione %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Note approvazione"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Elimina file"
 
@@ -4171,63 +4170,69 @@ msgstr "Elimina file"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) creato il %3$s e impostato come %4$s il %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Selezionare la licenza adatta al proprio componente aggiuntivo. Questa licenza specifica i diritti concessi sull'utilizzo del codice sorgente."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Nessun file trovato."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
-msgstr "Informazioni facoltative per il revisore che effettuerà la revisione di questo componente aggiuntivo."
+msgstr ""
+"Informazioni facoltative per il revisore che effettuerà la revisione di "
+"questo componente aggiuntivo."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Rimuovi compatibilità applicazione"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Selezionare un'applicazione"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Piattaforma"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Dimensione"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Stato"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Informazioni sulle modifiche contenute in questa versione, nuove funzioni, bug conosciuti e altre informazioni utili specifiche per questa versione. Questa informazione verrà visualizzata dagli utenti che utilizzano la gestione integrata degli aggiornamenti di Firefox 3."
+msgstr ""
+"Informazioni sulle modifiche contenute in questa versione, nuove funzioni, "
+"bug conosciuti e altre informazioni utili specifiche per questa versione. "
+"Questa informazione verrà visualizzata dagli utenti che utilizzano la "
+"gestione integrata degli aggiornamenti di Firefox 3."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Note di versione"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Sono presenti modifiche non salvate.</strong> La compatibilità verrà eliminata facendo clic su Aggiorna versione."
+msgstr ""
+"<strong>Sono presenti modifiche non salvate.</strong> La compatibilità verrà "
+"rimossa facendo clic su Aggiorna versione."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Sono presenti modifiche non salvate.</strong> I file verranno eliminati facendo clic su Aggiorna versione."
+msgstr ""
+"<strong>Sono presenti modifiche non salvate.</strong> I file verranno "
+"rimossi facendo clic su Aggiorna versione."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Aggiorna versioni"
 
@@ -4246,7 +4251,9 @@ msgstr "Versione %s eliminata correttamente."
 
 #: views/developers/versions.thtml:73
 msgid "devcp_versions_p_remove"
-msgstr "Questa versione non ha file associati e può essere eliminata. Rimuovere questa versione?"
+msgstr ""
+"Questa versione non ha file associati e può essere rimossa. Rimuovere questa "
+"versione?"
 
 #: views/developers/versions.thtml:58
 msgid "devcp_versions_th_created"
@@ -4260,7 +4267,7 @@ msgstr "Stato"
 msgid "devcp_versions_th_version"
 msgstr "Versione"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Questo componente aggiuntivo è disattivato"
 
@@ -4304,8 +4311,7 @@ msgstr "Filtra"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtra per tipo/azione"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registro eventi"
 
@@ -4361,13 +4367,13 @@ msgstr "Visualizza commenti"
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "Visualizza elementi compresi tra %1$s e %2$s"
+msgstr "Visualizza elementi compresi tra %s e %s"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "Nessuna revisione disponibile nel periodo richiesto."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registro revisioni"
 
@@ -4391,29 +4397,28 @@ msgstr "Ultime operazioni del revisore"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totale revisioni"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Revisione componente aggiuntivo"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Compila i campi seguenti:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Seleziona almeno un file da revisionare."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Le auto-revisioni non sono consentite."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Software esterno"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Aggiungi funzionalità"
 
@@ -4421,296 +4426,253 @@ msgstr "Aggiungi funzionalità"
 msgid "editors_featured_add_feature_submit"
 msgstr "Aggiungi"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Impossibile aggiungere la funzionalità."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Funzionalità aggiunta con successo."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Impossibile modificare la funzionalità."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Funzionalità modificata con successo."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Uno o più locale risultano non validi."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Impossibile rimuovere la funzionalità."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
-msgstr "Funzionalità eliminata con successo."
+msgstr "Funzionalità rimossa con successo."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Componenti aggiuntivi consigliati"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Vai"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Rimuovi funzionalità"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtra la coda"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Link utili"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guida per i revisori"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Policy dei componenti aggiuntivi"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "I filtri impostati rimarranno attivi per questa sessione oppure fino a quando non verranno reimpostati."
+msgstr ""
+"I filtri impostati rimarranno attivi per questa sessione oppure fino a "
+"quando non verranno reimpostati."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Attualmente non ci sono componenti aggiuntivi da revisionare."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 giorno"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ora"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Strumenti per revisori"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Solo %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilità %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "E-mail componente aggiuntivo o autore"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tipologie componenti"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Applicazione"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Versione massima"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Piattaforme"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Tempo trascorso dalla richiesta (giorni)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Risultati della ricerca con filtro: <strong>%1$s</strong> elemento"
-msgstr[1] "Risultati della ricerca con filtro: <strong>%1$s</strong> elementi"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Reimposta"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtro"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Al momento tutte le code di revisione sono disattivate. Riprovare più tardi."
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Modifica"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Cronologia"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Sito web"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Anteprima elemento"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Anteprime"
+msgstr ""
+"Al momento tutte le code di revisione sono disattivate. Riprovare più tardi."
 
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Revisione"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Richiedi ulteriori informazioni"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Rendi pubblica"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Richiedi revisione più approfondita"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Lascia nella sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Commenti del revisore"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "È possibile utilizzare questo modulo per chiedere informazioni all'autore, che riceverà una e-mail e potrà rispondere direttamente. Riceverai una notifica via e-mail quando l'autore avrà risposto."
+msgstr ""
+"È possibile utilizzare questo modulo per chiedere informazioni all'autore, "
+"che riceverà una e-mail e potrà rispondere direttamente. Riceverai una "
+"notifica via e-mail quando l'autore avrà risposto."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "In questo modo l'ultima versione del componente aggiuntivo verrà reso pubblico con i relativi file. Le versioni future verranno inserite nella sandbox e dovranno essere approvate da un revisore."
+msgstr ""
+"In questo modo l'ultima versione del componente aggiuntivo verrà reso "
+"pubblico con i relativi file. Le versioni future verranno inserite nella "
+"sandbox e dovranno essere approvate da un revisore."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "In questo modo il componente aggiuntivo verrà lasciato nella sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "In questo modo la nuova versione del componente aggiuntivo presente nella sandbox verrà rilasciata nella sezione pubblica."
+msgstr ""
+"In questo modo la nuova versione del componente aggiuntivo presente nella "
+"sandbox verrà rilasciata nella sezione pubblica."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "In questo modo la nuova versione del componente aggiuntivo presente nella sandboxrimarrà nella sandbox."
+msgstr ""
+"In questo modo la nuova versione del componente aggiuntivo presente nella "
+"sandboxrimarrà nella sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Se temi che questo componente aggiuntivo violi: la tua sicurezza, il copyright o altri punti che dovrebbero essere comunicati a un amministratore, inserisci i tuoi commenti nell'area seguente. Questi commenti verranno inviati solo agli amministratori ma non all'autore."
+msgstr ""
+"Se temi che questo componente aggiuntivo violi: la tua sicurezza, il "
+"copyright o altri punti che dovrebbero essere comunicati a un "
+"amministratore, inserisci i tuoi commenti nell'area seguente. Questi "
+"commenti verranno inviati solo agli amministratori ma non all'autore."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Confronta con la versione pubblica"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Visualizza contenuti"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autori:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorie:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilità:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrizione"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Commenti dello sviluppatore"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "File:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Cronologia delle versioni"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Messaggio di segnalazione"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Anteprime"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Informativa sulla privacy"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisioni %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Note per i revisori"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Riepilogo"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Note sulla versione"
 
@@ -4738,7 +4700,7 @@ msgstr "Approva segnalazione/Area pubblica"
 msgid "editors_review_history_nominated_denied"
 msgstr "Non approvare la segnalazione/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Non sono disponibili revisioni precedenti."
 
@@ -4765,87 +4727,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Mostra/Nascondi risposta (%1$s)"
 msgstr[1] "Mostra/Nascondi risposte (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applicazioni:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "o seleziona una risposta preimpostata:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Commenti:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemi operativi:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Torna all'inizio"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Attenzione: selezionare solo i file effettivamente verificati."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "successiva &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nessuna anteprima disponibile."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; precedente"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Coda di revisione"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> di %2$s in coda"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> di %2$s in coda (con filtro)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Esegui azione"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Azione"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Commenti"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisore"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versione/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "Invia una segnalazione al prossimo aggiornamento di questo componente aggiuntivo. (non verranno inviate e-mail per aggiornamenti successivi)"
+msgstr ""
+"Invia una segnalazione al prossimo aggiornamento di questo componente "
+"aggiuntivo. (non verranno inviate e-mail per aggiornamenti successivi)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Revisione eseguita con successo."
 
@@ -4869,7 +4823,7 @@ msgstr "Azione"
 msgid "editors_reviews_in_reply_to"
 msgstr "In risposta a:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Processo di revisione completato con successo."
 
@@ -4881,85 +4835,87 @@ msgstr "Attualmente non ci sono revisioni in moderazione."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Elabora revisioni"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Specifico per un determinato sito web"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nuovo"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Aggiornato"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Applicazione verificata"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemi operativi verificati"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informazioni aggiuntive"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Componente aggiuntivo"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tipologia"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipologie di componente aggiuntivo"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Età"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applicazioni"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Limita ai locale?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tempo in coda"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Ordine ascendente"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Piattaforme"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Ordine discendente"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipi di proposta"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s giorni"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ore"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuti"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Accesso negato"
 
@@ -4967,41 +4923,34 @@ msgstr "Accesso negato"
 msgid "error_access_denied_message"
 msgstr "Non possiedi l'autorizzazione per visualizzare questa pagina."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Il componente aggiuntivo è già presente"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Impossibile trovare il componente aggiuntivo"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Questo componente aggiuntivo non può essere visualizzato."
 
@@ -5009,116 +4958,95 @@ msgstr "Questo componente aggiuntivo non può essere visualizzato."
 msgid "error_addon_selfreview"
 msgstr "Non è consentito fare la recensione di un componente aggiuntivo."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Impossibile trovare componenti aggiuntivi in questa categoria"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Impossibile trovare il feed del componente aggiuntivo."
+msgstr ""
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Indirizzo e-mail non valido."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Questo campo non può essere lasciato vuoto."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Impossibile trovare il file."
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Errore: %s non esiste."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
-msgstr "Sono presenti degli errori nel modulo: si prega di correggerli e inviare nuovamente."
+msgstr ""
+"Sono presenti degli errori nel modulo: si prega di correggerli e inviare "
+"nuovamente."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha non valido, riprova"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "Questo URL è in formato non valido. Un URL valido deve avere una struttura del tipo http://example.com/my_page."
+msgstr ""
+"Questo URL è in formato non valido. Un URL valido deve avere una struttura "
+"del tipo http://example.com/my_page."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argomento assente: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Nessun file"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Notifica"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Impossibile trovare l'anteprima"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Bisogna assegnare un voto."
 
@@ -5126,94 +5054,80 @@ msgstr "Bisogna assegnare un voto."
 msgid "error_user_already_confirmed"
 msgstr "Questo account utente è già attivo."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Codice di conferma non valido"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Le password non corrispondono."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Questo indirizzo e-mail è già utilizzato da un altro utente."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Il tempo massimo per il cambio e-mail è scaduto. Modificare nuovamente l'indirizzo e-mail nel profilo utente e fare clic sul link nella mail di conferma non appena si riceve il messaggio."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Un utente può avere un solo ruolo. Rimuovere i ruoli esistenti prima di proseguire."
+msgstr ""
+"Il tempo massimo per il cambio e-mail è scaduto. Modificare nuovamente "
+"l'indirizzo e-mail nel profilo utente e fare clic sul link nella mail di "
+"conferma non appena si riceve il messaggio."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Questo nome utente è già utilizzato."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Utente non trovato"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Attivare il proprio account utilizzando il codice di conferma ricevuto via e-mail."
+msgstr ""
+"Attivare il proprio account utilizzando il codice di conferma ricevuto via e-"
+"mail."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
-msgstr "Nome utente o password non corretti"
+msgstr "Nome utente o password sbagliati"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Impossibile trovare la versione"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "La password inserita non è corretta"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Dettagli"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Ulteriori informazioni su %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s recensioni"
 msgstr[1] "%1$s recensioni"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Visualizza altri in"
 
@@ -5253,144 +5167,133 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Informazioni su"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Domande più frequenti"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Tutti i diritti riservati."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Copyright"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Crediti"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla fornisce link a queste applicazioni ma non garantisce in alcun modo il corretto funzionamento di tali software o l'attendibilità delle informazioni visualizzate. Qualsiasi domanda, reclamo o pretesa riguardanti queste applicazioni va diretta al rivenditore di riferimento del software."
+msgstr ""
+"Mozilla fornisce link a queste applicazioni ma non garantisce in alcun modo "
+"il corretto funzionamento di tali software o l'attendibilità delle "
+"informazioni visualizzate. Qualsiasi domanda, reclamo o pretesa riguardanti "
+"queste applicazioni va diretta al rivenditore di riferimento del software."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Vai"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Note legali"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Altre lingue:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Informativa sulla privacy"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Salva"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "dizionari"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "dizionari"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "estensioni"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "estensioni"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "language pack (componente aggiuntivo)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "language pack (componente aggiuntivo)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "language pack (applicazione)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "language pack (applicazione)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "plugin"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "motori di ricerca"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "motori di ricerca"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
-msgstr "tema"
+msgstr "temi"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "temi"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Tutti i locale"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Ritorna alla pagina iniziale di %1$s Add-ons"
@@ -5399,81 +5302,37 @@ msgstr "Ritorna alla pagina iniziale di %1$s Add-ons"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Add-ons <em>per</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Add-ons <em>per</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Add-ons <em>per</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Add-ons <em>per</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Vai al menu altre applicazioni"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Vai al menu categorie"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Vai al contenuto principale"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Vai al campo di ricerca"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Componenti aggiuntivi"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Accedi"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Disconnetti"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Il mio profilo"
 
@@ -5481,23 +5340,11 @@ msgstr "Il mio profilo"
 msgid "header_navlink_register"
 msgstr "Registrati"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Registrati</a> o <a href=\"%2$s\">accedi</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Strumenti"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5505,51 +5352,37 @@ msgstr "Anteprima immagine di %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">Accedere</a> per installare questo componente aggiuntivo. <a href=\"%2$s\">Perché</a>?"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Lasciami installare questo componente aggiuntivo sperimentale. <a href=\"%1$s\">Che cos'è questo?</a>"
+msgstr ""
+"<a href=\"%1$s\">Accedere</a> per installare questo componente aggiuntivo. "
+"<a href=\"%2$s\">Perché</a>?"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Aggiungi a %1$s %2$s"
+msgstr "Aggiungi a %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Aggiungi %1$s a %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Scarica %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Questo componente aggiuntivo non è disponibile."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Elenco dei language pack e dei dizionari."
 
@@ -5561,11 +5394,10 @@ msgstr "Scarica dizionario"
 msgid "langtools_download_langpack"
 msgstr "Scarica language pack"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
-msgstr "Dizionari e language pack"
+msgstr "Dizionari e Language pack"
 
 #: views/addons/dictionaries.thtml:44
 msgid "langtools_install_dictionary"
@@ -5575,74 +5407,36 @@ msgstr "Installa dizionario"
 msgid "langtools_install_langpack"
 msgstr "Installa language pack"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dizionari"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Language pack"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Lingua"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Licenza personalizzata"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licenza BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Licenza GNU General Public License, versione 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Licenza GNU General Public License, versione 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Licenza GNU Lesser General Public License, versione 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Licenza GNU Lesser General Public License, versione 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licenza MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Licenza Mozilla Public License, versione 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Fare clic qui per tornare alla pagina iniziale."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Data"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Download"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nome"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Voto"
@@ -5667,21 +5461,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dizionari e language pack"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugin"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temi"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Scopri i componenti aggiuntivi per le altre applicazioni"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "altri"
 
@@ -5689,29 +5489,12 @@ msgstr "altri"
 msgid "page_title_appversions"
 msgstr "Versioni applicazione"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ di Add-on Collector"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Funzioni di Add-on Collector"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Benvenuto in Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Credit"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ sviluppatori"
+msgid "page_title_experimental_addons"
+msgstr "Componenti aggiuntivi sperimentali"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5741,36 +5524,45 @@ msgstr "Sistema di revisione e Sandbox"
 msgid "page_title_submissionhelp"
 msgstr "Guida per l'inserimento"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versioni consentite delle applicazioni"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "I componenti aggiuntivi inviati a Mozilla Add-ons devono contenere un file install.rdf con il supporto ad almeno una delle seguenti applicazioni. Verranno accettate solo le versioni delle applicazioni indicate nell'elenco seguente."
+msgstr ""
+"I componenti aggiuntivi inviati a Mozilla Add-ons devono contenere un file "
+"install.rdf con il supporto ad almeno una delle seguenti applicazioni. "
+"Verranno accettate solo le versioni delle applicazioni indicate nell'elenco "
+"seguente."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Se l'applicazione di riferimento non richiede la presenza del file install.rdf, è comunque necessario includerne uno con le caratteristiche specificate %s."
+msgstr ""
+"Se l'applicazione di riferimento non richiede la presenza del file install."
+"rdf, è comunque necessario includerne uno con le caratteristiche specificate "
+"%s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "qui"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versioni"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Torna alla pagina precedente"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Pagina di informazioni sulla sandbox"
 
@@ -5778,13 +5570,21 @@ msgstr "Pagina di informazioni sulla sandbox"
 msgid "pagination_next_page"
 msgstr "successivo"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Pagina %1$s di %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "precedente"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Inserire <strong>entrambe le parole</strong> seguenti, <strong>separate da uno spazio</strong>."
+msgstr ""
+"Inserire <strong>entrambe le parole</strong> seguenti, <strong>separate da "
+"uno spazio</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5798,32 +5598,36 @@ msgstr "Digita quello che hai ascoltato."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Se è difficile da comprendere, puoi <a href=\"%1$s\">provare con un testo diverso</a> oppure <a href=\"%2$s\">tornare al testo</a>."
+msgstr ""
+"Se è difficile da comprendere, puoi <a href=\"%1$s\">provare con un testo "
+"diverso</a> oppure <a href=\"%2$s\">tornare al testo</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Se è difficile da leggere, puoi <a href=\"%1$s\">provare con un testo diverso</a> oppure <a href=\"%2$s\">tornare al testo</a>."
+msgstr ""
+"Se è difficile da leggere, puoi <a href=\"%1$s\">provare con un testo "
+"diverso</a> oppure <a href=\"%2$s\">tornare al testo</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Sei umano?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Che cos'è questo?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Errore durante la segnalazione di questa recensione"
 
 #: models/reviews_moderation_flag.php:69
 msgid "review_flag_reason_bug_support"
-msgstr "Segnalazione bug o richiesta di supporto inserita nella sezione non corretta"
+msgstr ""
+"Segnalazione bug o richiesta di supporto inserita nella sezione sbagliata"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Segnala questa recensione (selezionare un motivo)"
 
@@ -5839,11 +5643,12 @@ msgstr "Altro (specificare)"
 msgid "review_flag_reason_spam"
 msgstr "Spam o contenuti fuori luogo"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
-msgstr "Grazie; questa recensione è stata segnalata e verrà controllata da un revisore."
+msgstr ""
+"Grazie; questa recensione è stata segnalata e verrà controllata da un "
+"revisore."
 
 #: views/reviews/display.thtml:41
 msgid "review_flag_this"
@@ -5851,163 +5656,143 @@ msgstr "Segnala questa recensione"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Questa recensione è inappropriata, non accurata o si tratta di spam? Fai clic qui per segnalarla e farla verificare da un revisore."
+msgstr ""
+"Questa recensione è inappropriata, non accurata o si tratta di spam? Fai "
+"clic qui per segnalarla e farla verificare da un revisore."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Ricorda questi suggerimenti:</p><ul><li>scrivi come se stessi descrivendo a un amico la tua esperienza con questo componente aggiuntivo. Fornisci informazioni utili e dettagliate, ad esempio spiegando quali funzioni hai apprezzato oppure non hai trovato utili, quanto è semplice usarlo e quali sono i difetti. Evita espressioni generiche come \"Grandioso\" oppure \"Pessimo\", a meno di fornire delle motivazioni valide per simili giudizi.</li><li>non inserire segnalazioni di bug o errori. Gli sviluppatori non sono in grado di visualizzare il tuo indirizzo e-mail e potrebbero aver bisogno di contattarti per aiutarti a risolvere il problema. Consulta la <a href=\"%1$s\">sezione di supporto</a> per scoprire come ottenere assistenza per questo componente aggiuntivo.</li><li>cerca di mantenere in ordine le recensioni, evita l'utilizzo di un linguaggio non appropriato e non inserire alcuna informazione personale.</li></ul><p>Consulta le <a href=\"%2$s\">Guide linea per la recensione</a> per ulteriori dettagli sulle recensioni dei componenti aggiuntivi.</p>"
+msgstr ""
+"<p>Ricorda questi suggerimenti:</p><ul><li>scrivi come se stessi descrivendo "
+"a un amico la tua esperienza con questo componente aggiuntivo. Fornisci "
+"informazioni utili e dettagliate, ad esempio spiegando quali funzioni hai "
+"apprezzato oppure non hai trovato utili, quanto è semplice usarlo e quali "
+"sono i difetti. Evita espressioni generiche come \"Grandioso\" oppure "
+"\"Pessimo\", a meno di fornire delle motivazioni valide per simili giudizi.</"
+"li><li>non inserire segnalazioni di bug o errori. Gli sviluppatori non sono "
+"in grado di visualizzare il tuo indirizzo e-mail e potrebbero aver bisogno "
+"di contattarti per aiutarti a risolvere il problema. Consulta la <a href=\"%1"
+"$s\">sezione di supporto</a> per scoprire come ottenere assistenza per "
+"questo componente aggiuntivo.</li><li>cerca di mantenere in ordine le "
+"recensioni, evita l'utilizzo di un linguaggio non appropriato e non inserire "
+"alcuna informazione personale.</li></ul><p>Consulta le <a href=\"%2$s"
+"\">Guide linea per la recensione</a> per ulteriori dettagli sulle recensioni "
+"dei componenti aggiuntivi.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Recensioni per %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Componenti aggiuntivi disponibili"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Nuovi componenti aggiuntivi"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Componenti aggiuntivi più popolari"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Componenti aggiornati"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Cerca"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Risultati ricerca raccolte"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Risultati ricerca raccolte"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "La ricerca è attualmente disattivata. Riprovare più tardi."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
-msgstr "tutte le categorie"
-
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "tutte le raccolte"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+msgstr "tutti i componenti aggiuntivi"
+
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "cerca tra i componenti aggiuntivi"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "cerca una raccolta"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Cerca tra i componenti aggiuntivi"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Fare clic per digitare i termini di ricerca"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "in"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Tutti i Motori di ricerca"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Esplora i Motori di ricerca"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s componente aggiuntivo corrispondente"
+msgstr[1] "%s componenti aggiuntivi corrispondenti"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Nessun risultato."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Cerca componenti aggiuntivi"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed dei risultati di ricerca"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Risultati della ricerca per: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Strumenti di amministrazione"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Strumenti per sviluppatori"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Strumenti per revisori"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Benvenuto"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Benvenuto, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "dizionario"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Consigliati da noi"
 
 #: views/elements/pitch.thtml:61
 msgid "sidebar_pitch_looking_for"
-msgstr "Stai cercando un:"
+msgstr "Sto cercando un:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Nuovi arrivi"
 
@@ -6015,34 +5800,31 @@ msgstr "Nuovi arrivi"
 msgid "sidebar_pitch_search"
 msgstr "motore di ricerca"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Abbonati a:"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aggiornamenti"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Nessun voto"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6062,35 +5844,31 @@ msgstr "Cambia componente aggiuntivo"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e %b."
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e %b. %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s realizzati"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s rilasciati"
@@ -6103,202 +5881,214 @@ msgstr "Chiudi"
 msgid "statistics_help_link"
 msgstr "Guida"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "oppure selezionare un altro componente aggiuntivo"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "oppure selezionare un componente aggiuntivo con statistiche pubbliche"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
-msgstr "Selezionare uno dei propri componenti aggiuntivi per visualizzarne le statistiche"
+msgstr ""
+"Selezionare uno dei propri componenti aggiuntivi per visualizzarne le "
+"statistiche"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Selezionare un componente aggiuntivo per visualizzarne le statistiche"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Selezionare un componente aggiuntivo con statistiche pubbliche"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Pannello statistiche"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Visualizza statistiche"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Visualizza questa tabella in formato CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "nessuno"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Rimuovi questo plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Raggruppa per: giorno"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Raggruppa per: mese"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Raggruppa per: settimana"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Confronta per: settimana"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s trovato nei criteri"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Aggiungi plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Aggiungi un altro plot a questo grafico"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Nascondi il conteggio totale"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Visualizza il conteggio totale"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Aggiungi al grafico il conteggio totale"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visualizza dati (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Scarica questi dati in un file separato da virgole (CVS)"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Nascondi %s eventi"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Visualizza %s eventi"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Sovrapponi date di rilascio dei componenti aggiuntivi ai grafici"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Nascondi eventi Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Visualizza eventi Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Sovrapponi date di rilascio di Firefox ai grafici"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Contrai il grafico"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Espandi il grafico"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ridimensiona il grafico"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utenti attivi per giorno"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Applicazione"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizzato"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Download"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operativo"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stato del componente aggiuntivo"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sommario"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versione del componente aggiuntivo"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Applicazione"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema operativo"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Stato del componente aggiuntivo"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Sconosciuto"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versione del componente aggiuntivo"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Non sono presenti dati sufficienti per visualizzare questo grafico. Riprovare più tardi."
+msgstr ""
+"Non sono presenti dati sufficienti per visualizzare questo grafico. "
+"Riprovare più tardi."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "Non sono ancora presenti dati per questo componente aggiuntivo. Riprovare tra qualche giorno."
+msgstr ""
+"Non sono ancora presenti dati per questo componente aggiuntivo. Riprovare "
+"tra qualche giorno."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "È in corso un ricalcolo delle statistiche. I dati recenti potrebbero non essere significativi in quanto gli script stanno aggiornando queste informazioni. Riprovare tra alcuni minuti."
+msgstr ""
+"È in corso un ricalcolo delle statistiche. I dati recenti potrebbero non "
+"essere significativi in quanto gli script stanno aggiornando queste "
+"informazioni. Riprovare tra alcuni minuti."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "Il pannello statistiche in questo momento risulta disabilitato. Riprovare più tardi."
+msgstr ""
+"Il pannello statistiche in questo momento risulta disabilitato. Riprovare "
+"più tardi."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
-msgstr "JavaScript deve essere abilitato per visualizzare i grafici nel pannello statistiche."
+msgstr ""
+"JavaScript deve essere abilitato per visualizzare i grafici nel pannello "
+"statistiche."
 
 #: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
@@ -6307,7 +6097,7 @@ msgstr "Le impostazioni sono state aggiornate"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Pannello statistiche"
 
@@ -6335,103 +6125,113 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out (un mese)"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sintesi quotidiana delle statistiche per %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Feed RSS dei dati sintetici"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A %e %b. %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistiche per %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Come impostazione predefinita solo l'autore e Mozilla hanno accesso alle informazioni presenti nel pannello. È comunque possibile aprire l'accesso al pubblico in modo che qualsiasi persona possa visualizzare le informazioni relative a questo componente aggiuntivo."
+msgstr ""
+"Come impostazione predefinita solo l'autore e Mozilla hanno accesso alle "
+"informazioni presenti nel pannello. È comunque possibile aprire l'accesso al "
+"pubblico in modo che qualsiasi persona possa visualizzare le informazioni "
+"relative a questo componente aggiuntivo."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Accesso al pannello"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privato"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
-msgstr "Solo tu e Mozilla potete visualizzare le statistiche di questo componente aggiuntivo"
+msgstr ""
+"Solo tu e Mozilla potete visualizzare le statistiche di questo componente "
+"aggiuntivo"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Pubblico"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
-msgstr "Chiunque può visualizzare le statistiche di questo componente aggiuntivo"
+msgstr ""
+"Chiunque può visualizzare le statistiche di questo componente aggiuntivo"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Cambia impostazioni"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Mantenere queste informazioni come confidenziali."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Questo pannello è attualmente <b>privato</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Questo pannello è attualmente <b>pubblico</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloccato"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Ritorna al pannello"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Salva impostazioni"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Impostazioni pannello statistiche per %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Sbloccato"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Sc"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Media download per giorno"
 
@@ -6439,46 +6239,37 @@ msgstr "Media download per giorno"
 msgid "statistics_summary_downloads_heading"
 msgstr "Download"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Totale ultimo giorno"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Download negli ultimi 7 giorni"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Download complessivi"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Dal %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Nessun dato presente"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Numero medio di utenti attivi per giorno"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Cambiamento dal conteggio precedente"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s il %2$s"
@@ -6487,144 +6278,150 @@ msgstr "%1$s il %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Utenti attivi per giorno"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Utenti attivi per giorno"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Il %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Media giornaliera degli utenti attivi in questa settimana"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s dalla settimana scorsa"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistiche %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Tutti i temi"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Esplora temi"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Cambia indirizzo e-mail"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Modifica password"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Cambia password o e-mail"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Il codice di conferma è stato reinviato"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "L'account %1$s è stato eliminato. Per tornare a visitarci in futuro, è possibile registrarsi nuovamente nella <a href=\"%2$s\">pagina di registrazione</a>."
+msgstr ""
+"L'account %1$s è stato eliminato. Per tornare a visitarci in futuro, è "
+"possibile registrarsi nuovamente nella <a href=\"%2$s\">pagina di "
+"registrazione</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "La community di Mozilla Add-ons è triste per il tuo abbandono."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Conferma password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Elimina ora il mio account utente"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Non è possibile eliminare l'account nel caso in cui si risulti come <a href=\"%1$s\">autore</a> di un qualsiasi componente aggiuntivo. Per eliminare l'account, chiedere a un altro componente del team di sviluppo di rimuovere l'account dall'elenco degli autori. Una volta completata questa operazione, sarà possibile procedere con l'eliminazione dell'account in questa sezione."
+msgstr ""
+"Non è possibile eliminare l'account nel caso in cui si risulti come <a href="
+"\"%1$s\">autore</a> di un qualsiasi componente aggiuntivo. Per eliminare "
+"l'account, chiedere a un altro componente del team di sviluppo di rimuovere "
+"l'account dall'elenco degli autori. Una volta completata questa operazione, "
+"sarà possibile procedere con l'eliminazione dell'account in questa sezione."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "In caso di dubbi o domande, contattare %1$s per assistenza."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "È necessario selezionare la casella \"Ho compreso…\" per poter eliminare l'account."
+msgstr ""
+"È necessario selezionare la casella \"Ho compreso…\" per poter eliminare "
+"l'account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Inserire correttamente la password per procedere."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Si è verificato un errore sconosciuto durante l'eliminazione dell'account. Contattare %1$s spiegando il problema, in questo modo potremo procedere alla rimozione dell'account. Ci scusiamo per l'inconveniente."
+msgstr ""
+"Si è verificato un errore sconosciuto durante l'eliminazione dell'account. "
+"Contattare %1$s spiegando il problema, in questo modo potremo procedere alla "
+"rimozione dell'account. Ci scusiamo per l'inconveniente."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Conferma eliminazione account"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Elimina account utente %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Arrivederci"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
-msgstr "da questo momento non sarà più possibile fare il login su Mozilla Add-ons"
+msgstr ""
+"da questo momento non sarà più possibile fare il login su Mozilla Add-ons"
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Facendo clic su \"elimina\" l'account verrà <strong>eliminato definitivamente</strong>. Questo significa che:"
+msgstr ""
+"Facendo clic su \"elimina\" l'account verrà <strong>eliminato "
+"definitivamente</strong>. Questo significa che:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "le recensioni e i voti non verranno eliminati, ma non saranno più associati a questo account"
+msgstr ""
+"le recensioni e i voti non verranno eliminati, ma non saranno più associati "
+"a questo account"
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Se si tratta di un problema specifico per cui possiamo essere d'aiuto, non eliminare l'account ma contattaci via  %1$s e cercheremo di fornire assistenza nel migliore dei modi per risolverlo."
+msgstr ""
+"Se si tratta di un problema specifico per cui possiamo essere d'aiuto, non "
+"eliminare l'account ma contattaci via  %1$s e cercheremo di fornire "
+"assistenza nel migliore dei modi per risolverlo."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Ho compreso che questo passaggio non potrà essere annullato."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Utente eliminato"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Una e-mail è stata inviata a %1$s per confermare il nuovo indirizzo e-mail. Per rendere effettiva la modifica è necessario fare clic sul link contenuto in questa mail. Fino a quel momento sarò possibile continuare ad accedere con l'indirizzo e-mail corrente."
+msgstr ""
+"Una e-mail è stata inviata a %1$s per confermare il nuovo indirizzo e-mail. "
+"Per rendere effettiva la modifica è necessario fare clic sul link contenuto "
+"in questa mail. Fino a quel momento sarò possibile continuare ad accedere "
+"con l'indirizzo e-mail corrente."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Elimina account utente"
 
@@ -6637,27 +6434,35 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Benvenuto in %2$s Add-ons.\n"
 "\n"
-"Per potere utilizzare il tuo nuovo account devi prima attivarlo. Ciò garantisce che l'indirizzo e-mail utilizzato sia valido e appartenga davvero a te.\n"
-"Per attivare il tuo nuovo account fai clic sul link successivo oppure copia e incolla il link completo nella barra degli indirizzi del tuo browser:\n"
+"Per potere utilizzare il tuo nuovo account devi prima attivarlo. Ciò "
+"garantisce che l'indirizzo e-mail utilizzato sia valido e appartenga davvero "
+"a te.\n"
+"Per attivare il tuo nuovo account fai clic sul link successivo oppure copia "
+"e incolla il link completo nella barra degli indirizzi del tuo browser:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Dopo aver attivato il tuo account potrai tranquillamente cestinare questa e-mail.\n"
+"Dopo aver attivato il tuo account potrai tranquillamente cestinare questae-"
+"mail.\n"
 "\n"
 "Grazie per aver scelto %2$s Add-ons\n"
 "-- Lo staff di %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Hai richiesto un cambio di indirizzo e-mail su %2$s Add-ons.\n"
 "\n"
-"Per confermare il nuovo indirizzo fai clic sul link seguente oppure copia e incolla l'intera stringa nella barra degli indirizzi del browser:\n"
+"Per confermare il nuovo indirizzo fai clic sul link seguente oppure copia e "
+"incolla l'intera stringa nella barra degli indirizzi del browser:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Hai 48 ore per confermare il nuovo indirizzo e-mail. Se non desideri modificare l'indirizzo, puoi semplicemente ignorare questo messaggio.\n"
+"Hai 48 ore per confermare il nuovo indirizzo e-mail. Se non desideri "
+"modificare l'indirizzo, puoi semplicemente ignorare questo messaggio.\n"
 "\n"
 "Grazie.\n"
 "-- Lo staff di %2$s Add-ons"
@@ -6675,7 +6480,10 @@ msgid "user_email_pwreset"
 msgstr ""
 "%2$s Add-ons reimpostazione della password\n"
 "\n"
-"Abbiamo ricevuto la richiesta di reimpostare la password per questo account su addons.mozilla.org. Per modificare la password fai clic sul link successivo oppure copia e incolla il link completo nella barra degli indirizzi del tuo browser:\n"
+"Abbiamo ricevuto la richiesta di reimpostare la password per questo account "
+"su addons.mozilla.org. Per modificare la password fai clic sul link "
+"successivo oppure copia e incolla il link completo nella barra degli "
+"indirizzi del tuo browser:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6684,115 +6492,90 @@ msgstr ""
 "Grazie,\n"
 "-- Lo staff di %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Reimposta la tua password per %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Errore"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Confermare il cambio di indirizzo e-mail per %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Operazione completata"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Il tuo indirizzo e-mail è stato modificato con successo. Da questo momento, utilizza %1$s per accedere al sito."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Chi sono"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Presentati alla comunità! Questo testo apparirà nella sezione pubblica della pagina di informazioni sul tuo utente. Le interruzioni di linea verranno mantenute, non è consentito l'uso di HTML."
+msgstr ""
+"Il tuo indirizzo e-mail è stato modificato con successo. Da questo momento, "
+"utilizza %1$s per accedere al sito."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Conferma password"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Visualizza nel mio profilo utente le raccolte che ho creato"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Visualizza nel mio profilo utente le raccolte preferite"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Modifica il profilo utente di %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Indirizzo e-mail"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Nome"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Nascondi indirizzo e-mail"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL sito web"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Cognome"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Accesso utente"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nuova password"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nickname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Vecchia password"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Altre azioni"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Password"
 
@@ -6800,60 +6583,67 @@ msgstr "Password"
 msgid "user_form_registration"
 msgstr "Registrazione nuovo utente"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Ricordami su questo computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Visualizza sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Salva"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Accedi"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registra"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Utente di %s Add-ons dal"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Crea un nuovo account utente"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilità componenti aggiuntivi (fortemente consigliato)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Eventi e concorsi in programma"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Al momento non sono presenti notifiche da configurare."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Mozilla può inviarti periodicamente delle e-mail per segnalare nuove versioni o eventi legati ai componenti aggiuntivi. Scegli gli argomenti a cui sei interessato:"
+msgstr ""
+"Mozilla può inviarti periodicamente delle e-mail per segnalare nuove "
+"versioni o eventi legati ai componenti aggiuntivi. Scegli gli argomenti a "
+"cui sei interessato:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla si riserva il diritto di contattarti personalmente per problemi legati ai componenti aggiuntivi che hai realizzato e che sono ospitati su questo sito."
+msgstr ""
+"Mozilla si riserva il diritto di contattarti personalmente per problemi "
+"legati ai componenti aggiuntivi che hai realizzato e che sono ospitati su "
+"questo sito."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Le modifiche effettuate contengono degli errori. Correggili e invia di nuovo…"
+msgstr ""
+"Le modifiche effettuate contengono degli errori. Correggili e invia di nuovo…"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profilo aggiornato."
 
@@ -6866,15 +6656,16 @@ msgstr "Reimposta la password  %s"
 msgid "user_pwreset_header"
 msgstr "Reimposta la password"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Password dimenticata?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
-msgstr "Il link per reimpostare la password è stato inviato al tuo indirizzo e-mail."
+msgstr ""
+"Il link per reimpostare la password è stato inviato al tuo indirizzo e-mail."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Password reimpostata con successo."
 
@@ -6886,7 +6677,7 @@ msgstr "Salva modifica password"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Invia il link per reimpostare la password"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -6895,59 +6686,51 @@ msgstr "%s Add-ons"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Un link per attivare il tuo account è stato inviato al tuo indirizzo e-mail %1$s. Fai clic su questo link per accedere a %2$s Add-ons."
+msgstr ""
+"Un link per attivare il tuo account è stato inviato al tuo indirizzo e-mail %"
+"1$s. Fai clic su questo link per accedere a %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "È stata inviata una e-mail al tuo indirizzo %1$s per attivare il tuo account. Per poter accedere è necessario fare clic sul link contenuto in questo messaggio e-mail."
+msgstr ""
+"È stata inviata una e-mail al tuo indirizzo %1$s per attivare il tuo "
+"account. Per poter accedere è necessario fare clic sul link contenuto in "
+"questo messaggio e-mail."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "reinviare l'e-mail di conferma"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Complimenti, il tuo account utente è stato creato con successo."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>La registrazione su AMO <strong>non è obbligatoria</strong> per scaricare e installare i componenti aggiuntivi presenti nella sezione pubblica.</p><p>È necessario registrarsi solo se:</p><ul><li>vuoi inserire delle recensioni</li><li>sei uno sviluppatore e vuoi usare AMO per ospitare il tuo componente aggiuntivo</li></ul><p> Dopo aver completato la registrazione, riceverai una mail di conferma all'indirizzo fornito: segui le istruzioni presenti nel messaggio per concludere la creazione dell'account.</p><p>Per ulteriori informazioni sono disponibili le <a href='%1$s' title='Note legali'>Note legali</a> e l'<a href='%2$s' title='Informativa sulla privacy'>Informativa sulla privacy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Se non hai ricevuto una e-mail di conferma, verifica che il messaggio non sia stato contrassegnato come \"posta indesiderata\" o \"spam\". Se necessario possiamo %1$s all'indirizzo indicato."
+msgstr ""
+"Se non hai ricevuto una e-mail di conferma, verifica che il messaggio non "
+"sia stato contrassegnato come \"posta indesiderata\" o \"spam\". Se "
+"necessario possiamo %1$s all'indirizzo indicato."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Grazie per esserti registrato e benvenuto in %1$s"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Benvenuto su addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "È necessario inserire il nome, il cognome oppure il nick."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Raccolte"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notifiche"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profilo utente"
 
@@ -6955,64 +6738,50 @@ msgstr "Profilo utente"
 msgid "user_verified_okay"
 msgstr "Verificato con successo"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Eliminazione account utente"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Modifica account utente"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Chi sono"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Componenti aggiuntivi di %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nome"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profilo autore"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Raccolte di %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Indirizzo e-mail"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Raccolte preferite"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Sito web"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Informazioni utente per %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Recensioni di %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Accesso utente"
 
@@ -7021,524 +6790,25 @@ msgstr "Accesso utente"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Il componente aggiuntivo che stai cercando al momento si trova nella sandbox. Se già possiedi un account su Mozilla Add-ons, effettua l'accesso oppure <a href=\"%1$s\">leggi ulteriori informazioni sulla sandbox.</a>"
+msgstr ""
+"Il componente aggiuntivo che stai cercando al momento si trova nella "
+"sandbox. Se già possiedi un account su Mozilla Add-ons, effettua l'accesso "
+"oppure <a href=\"%1$s\">leggi ulteriori informazioni sulla sandbox.</a>"
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "La pagina che stai cercando fa parte della sandbox. Se già possiedi un account su Mozilla Add-ons, effettua l'accesso oppure <a href=\"%1$s\">leggi ulteriori informazioni sulla sandbox.</a>"
+msgstr ""
+"La pagina che stai cercando fa parte della sandbox. Se già possiedi un "
+"account su Mozilla Add-ons, effettua l'accesso oppure <a href=\"%1$s\">leggi "
+"ulteriori informazioni sulla sandbox.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Reimposta la password dell'utente"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrazione nuovo utente"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licenza del codice sorgente per %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Visualizza elementi aggiunti di recente"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Visualizza i più scaricati"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Visualizza i più votati"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Componente aggiuntivo successivo"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Componente aggiuntivo precedente"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Cronologia completa delle versioni"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Nuovi:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Più popolari:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Consigliati da noi:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Aggiornati di recente:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "Visualizza tutti"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Visualizza tutti i componenti aggiuntivi consigliati"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Ordina per voto"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Ordina per aggiornamento"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Ordina per popolarità"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Caricamento in corso"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Visualizza altre informazioni"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Questa versione del componente aggiuntivo non dichiara la propria "
-#~ "compatibilità con Firefox %1$s. Mozilla ha in programma di rilasciare la "
-#~ "prossima versione in tempi brevi, consigliamo di verificare il componente "
-#~ "aggiuntivo con la nuova versione e aggiornarne la compatibilità. "
-#~ "Ulteriori informazioni su questo argomento sono disponibili <a href=\"%2$s"
-#~ "\">qui</a>. Questo è solo un avviso e sarà comunque possibile proseguire "
-#~ "con l'inserimento di questa versione in addons.mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Componente aggiuntivo disattivato con successo"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Modifica componente aggiuntivo"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Componente aggiuntivo attivato con successo"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Descrizione"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Sito web"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nome"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Informativa sulla privacy"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Riepilogo"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "E-mail per il supporto"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL per il supporto"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Note sulla versione"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Segnala il componente aggiuntivo"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Componente aggiuntivo segnalato con successo"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Diverse recensioni di utenti (possono essere anche recensioni esterne)."
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visita la pagina %1$s per modificare le tue estensioni, oppure %2$s per "
-#~ "tornare agli strumenti per sviluppatori."
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "fai clic qui"
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "modifica componente aggiuntivo"
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Questa versione è stata inserita nella sandbox in attesa di verifiche da "
-#~ "parte dei tester e di un revisore di Mozilla Add-ons. Riceverai una "
-#~ "notifica via e-mail non appena ne verrà ultimato il controllo."
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Puoi ottenere ulteriori informazioni sul sistema di revisione collegato "
-#~ "alla Sandbox leggendo %s."
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "questa pagina"
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Questa versione è stata inserita nella sandbox e l'utilizzo è consigliato "
-#~ "solo ad utenti esperti. Affinché l'estensione venga pubblicata sul sito "
-#~ "ufficiale, è necessario %s il proprio componente aggiuntivo e attendere "
-#~ "l'esito del processo di revisione."
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "segnalare"
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr ""
-#~ "L'inserimento del componente aggiuntivo è stato completato con successo."
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Dal momento che il componente aggiuntivo è considerato affidabile, questa "
-#~ "versione è stata automaticamente approvata e inserita nella sezione "
-#~ "pubblica."
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Carica un nuovo componente aggiuntivo"
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Componente aggiuntivo aggiornato con successo"
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr ""
-#~ "È consigliabile %s per accrescere l'interesse nei confronti del tuo "
-#~ "componente aggiuntivo"
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "caricare un'anteprima"
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Impossibile trovare l'autore [%s]"
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Rimuovi"
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Annulla"
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Vuoi annullare l'inserimento?"
-#~ msgid "devcp_button_next"
-#~ msgstr "Successivo"
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Modifica tipologia del componente aggiuntivo:"
-#~ msgid "devcp_comments_updated"
-#~ msgstr "I commenti dello sviluppatore sono stati aggiornati."
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Aggiungi anteprima"
-#~ msgid "devcp_details_author"
-#~ msgstr "Autore"
-#~ msgid "devcp_details_authors"
-#~ msgstr "Autori"
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Non presente"
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categorie"
-#~ msgid "devcp_details_category"
-#~ msgstr "Categoria"
-#~ msgid "devcp_details_description"
-#~ msgstr "Descrizione"
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Disattivato"
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Dettagli"
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Commenti dello sviluppatore"
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Anteprime"
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versioni"
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Sito web"
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Non presente"
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Descrizione non presente"
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Anteprime non presenti."
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Aggiorna"
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "E-mail per il supporto"
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Lo sviluppatore non ha fornito una e-mail per il supporto."
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL per il supporto"
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Lo sviluppatore non ha fornito una URL per il supporto."
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Affidabile"
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Nessuna versione disponibile."
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Annulla e torna indietro"
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Sì, disabilita"
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Disabilitare questo componente aggiuntivo?"
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Un componente aggiuntivo disabilitato non verrà mostrato nei risultati "
-#~ "delle ricerche e negli elenchi. Non sarà possibile scaricarlo dal sito e "
-#~ "non verrà segnalato dagli aggiornamenti automatici dei software client. A "
-#~ "tutti gli effetti il componente aggiuntivo verrà eliminato, anche se in "
-#~ "realtà sarà possibile ritornare in questa sezione e riabilitarlo in caso "
-#~ "di necessità."
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Disabilita %s"
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Sì, abilita"
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Abilitare questo componente aggiuntivo?"
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Questo componente aggiuntivo, una volta abilitato, verrà nuovamente "
-#~ "mostrato nei risultati delle ricerche e negli elenchi. Sarà inoltre "
-#~ "possibile scaricarlo dal sito e verrà segnalato dagli aggiornamenti "
-#~ "automatici dei software client."
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Abilita %s"
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Aggiungi autore"
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Indirizzo e-mail dell'autore"
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Rimuovi"
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr ""
-#~ "Nessuna categoria disponibile per questo tipo di componente aggiuntivo."
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Trasferimento non completato"
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "Nessun file caricato"
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Il file eccede la dimensione massima per l'upload"
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Autori"
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Aggiungi icona"
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Modifica icona"
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permetti agli utenti di visualizzare i sorgenti online"
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categorie"
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Locale predefinito"
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Elimina solo l'icona esistente"
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Nuova icona"
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icona"
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "brevi dettagli (ad es. il nome del dialetto locale)"
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Aggiorna"
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nome "
-#~ "semplificato del locale</a>, come ad es. 'en-US'"
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "I file selezionati verranno eliminati."
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "File"
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Applicazioni di destinazione"
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Nessun file."
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Note per i revisori"
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Aggiorna"
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "La lunghezza massima per un riepilogo è di 250 caratteri.\n"
-#~ "(Ne hai inseriti %s)"
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Il nome scelto per il componente aggiuntivo è già presente nel database. "
-#~ "Assicurati che: <br /><li>il GUID sia corretto. La causa più comune per "
-#~ "questo tipo di errori è un GUID errato.</li><li>nel database non sia "
-#~ "effettivamente presente un elemento duplicato. In questo caso è "
-#~ "necessario modificare l'elemento esistente oppure eliminarlo e riprovare."
-#~ "</li>"
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Descrivi le modifiche introdotte in questo aggiornamento."
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Non tutte le GUID del file corrispondono"
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Una versione identica (%s) è già presente per questo componente "
-#~ "aggiuntivo e questa piattaforma."
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "È necessario fornire i dettagli richiesti per la segnalazione."
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Non è possibile segnalare un componente aggiuntivo in pre-release."
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr ""
-#~ "Puoi segnalare solamente i componenti aggiuntivi che si trovano nella "
-#~ "sandbox."
-#~ msgid "devcp_error_saving"
-#~ msgstr "Si è verificato un errore durante il salvataggio dei dati."
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Non hai il permesso per aggiornare questo componente aggiuntivo."
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Aggiungi un file per un'altra piattaforma"
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Aggiungi autore"
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Rimuovi"
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Le categorie per la nuova tipologia di componente aggiuntivo saranno "
-#~ "disponibili al passaggio successivo."
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr ""
-#~ "Non sono disponibili categorie per questo tipo di componente aggiuntivo."
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Inserisci una descrizione per il componente aggiuntivo."
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Inserisci un nome per il componente aggiuntivo."
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Seleziona la tipologia del componente aggiuntivo."
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Inserisci un riepilogo per il componente aggiuntivo."
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Componente aggiuntivo"
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Componente aggiuntivo 2"
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Componente aggiuntivo 3"
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tipologia"
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permetti agli utenti di visualizzare i sorgenti online"
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Indirizzo e-mail dell'autore"
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Autori"
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categorie"
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Locale predefinito"
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Descrizione"
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Accordo di licenza con l'utente finale (EULA)"
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr ""
-#~ "Questo componente aggiuntivo richiede la presenza di software esterno"
-#~ msgid "devcp_form_label_files"
-#~ msgstr "File"
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Sito web"
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Icona"
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nome"
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Piattaforme supportate"
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Si tratta di una pre-release"
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Informativa sulla privacy"
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr ""
-#~ "Questo componente aggiuntivo è specifico per un determinato sito web"
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Riepilogo"
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "E-mail per il supporto"
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL per il supporto"
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Applicazioni di destinazione"
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versione"
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Note sulla versione"
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Nessuna"
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Note per i revisori"
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Poiché il componente aggiuntivo è considerato affidabile, puoi scegliere "
-#~ "dove inserire questa versione:"
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "area pubblica"
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Accordo di licenza per sviluppatori"
-#~ msgid "devcp_header_step1"
-#~ msgstr "Passaggio 1"
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Carica i file"
-#~ msgid "devcp_header_step2"
-#~ msgstr "Passaggio 2"
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Informazioni sul componente aggiuntivo"
-#~ msgid "devcp_header_step3"
-#~ msgstr "Passaggio 3"
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Dettagli sulla versione"
-#~ msgid "devcp_header_step4"
-#~ msgstr "Passaggio 4"
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localizzazione"
-#~ msgid "devcp_header_step5"
-#~ msgstr "Passaggio 5"
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Operazione completata"
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "I miei componenti aggiuntivi"
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Ritorno ai dettagli del componente aggiuntivo"
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Tipologia del componente aggiuntivo rilevata automaticamente: %s."
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Il locale predefinito di questo componente aggiuntivo (%1$s [%2$s]) è "
-#~ "diverso dal locale attualmente  selezionato (%3$s [%4$s]). I campi "
-#~ "successivi dovrebbero essere compilati in %1$s."
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Non corretto?"
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Vuoi eliminare questo file?"
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr ""
-#~ "Non effettuare la revisione delle informazioni per questa versione del "
-#~ "componente aggiuntivo"
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Al momento non è possibile inserire nuovi componenti aggiuntivi. "
-#~ "Riprovare più tardi."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Accetto"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Non accetto"
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr ""
-#~ "Questo componente aggiuntivo è stato disattivato da un amministratore."
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Disattivato"
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Affidabile"
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr ""
-#~ "Non hai ancora pubblicato alcun componente aggiuntivo. Fai clic %s per "
-#~ "inserirne uno."
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "qui"
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Assicurati di %s per il tuo tema."
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "aver caricato un'anteprima"
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Modifica versione"
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versione aggiornata con successo."
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nuovo"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Aggiornato"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Età"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tipologie di componente aggiuntivo"
-#~ msgid "editors_th_age"
-#~ msgstr "Età"
-#~ msgid "editors_th_applications"
-#~ msgstr "Applicazioni"
-#~ msgid "editors_th_platforms"
-#~ msgstr "Piattaforme"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Tipi di proposta"
-#~ msgid "error_notice"
-#~ msgstr "Notifica"
-#~ msgid "forum_save"
-#~ msgstr "Salva"
-#~ msgid "home"
-#~ msgstr "home"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugin"
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Componenti aggiuntivi sperimentali"
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Torna alla pagina precedente"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Pagina %1$s di %2$s"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s componente aggiuntivo corrispondente"
-#~ msgstr[1] "%s componenti aggiuntivi corrispondenti"
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Feed RSS dei dati sintetici"
-
diff --git a/site/app/locale/ja/LC_MESSAGES/messages.po b/site/app/locale/ja/LC_MESSAGES/messages.po
index 99e0ba6..40503dd 100644
--- a/site/app/locale/ja/LC_MESSAGES/messages.po
+++ b/site/app/locale/ja/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-05-26 13:17+0900\n"
+"PO-Revision-Date: 2009-03-26 23:25+0900\n"
 "Last-Translator: Wil Clouser <clouserw@mozilla.com>\n"
 "Language-Team: Kohei Yoshino <yoshino@mozilla-japan.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,169 +17,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "�����"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "今��ダウンロード %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "����ダウンロード"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "����インストール"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "公開ページ"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "サンドボックス"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "%s æ›´æ–°"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "�ージョン %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "ダウンロード"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "ダウンロード (累計)"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "ダウンロード (週間)"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s 個�アドオン"
 msgstr[1] "%1$s 個�アドオン"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "件���表示"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "並�替�:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "実験的�アドオン"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "�����アドオン"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s � %2$s ��利用����ん"
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "%1$s �ページ�戻る"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "レビュー�ページ�戻る"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "評価:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "レビュー:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "レビューを�信"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "%s �レビューを投稿"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "タイトル・概�:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "削除"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "返信"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "��レビューを削除��もよ������？"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "���"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "��"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "レビュー�削除"
 
@@ -188,7 +179,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "レビュー�削除�れ���。"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s �レビューを編集"
@@ -201,18 +192,18 @@ msgstr ""
 "10 文字以上 100 文字以下���れ��り��ん。入力�れ�文字数� %1$s ��。"
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "注�: 投稿�れ�レビュー�内容��公開ページ�掲載�れる��エディタ�よ��"
 "確��れ��。"
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "開発者�返信:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -229,161 +220,131 @@ msgid "addon_review_pagetitle"
 msgstr "%s �レビュー"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s �よる返信 - 投稿日時: %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "開発者�返信:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "レビュー��信�れ���。"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "投稿者: %1$s - 投稿日時: %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "投稿者: %1$s - 投稿日時: %2$s - 評価: %3$s"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "次�アドオン"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "��アドオン"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "���ージョン��固定リンク"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "%1$s %2$s �互�性��る最新版"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�信"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "作者�プロフィールを見る"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "����テーマをブラウズ :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s をブラウズ"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "「%1$s�カテゴリ�テーマをブラウズ :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "�れ�何？"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "レビューを投稿"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "詳細"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "カテゴリ"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "コレクション�追加:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "新��コレクション..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "コレクションを�択..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "公開"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s � %2$s コレクション�追加�れ���。"
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "�れ�何？"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "� %1$s 個�コレクション"
-msgstr[1] "� %1$s 個�コレクション"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "詳細"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "嫌�"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "レビューを編集"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "��アドオン��プライ�シー�リシー��供�れ����。"
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "大嫌�"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "関連�るコレクション"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "作者�コメント"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "ホームページ"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "ソースコードライセンス"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "レビュー"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "サ�ート"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "好�"
 
@@ -391,22 +352,19 @@ msgstr "好�"
 msgid "addons_display_long_description"
 msgstr "詳��説明"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "�常�好�"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "他�画�"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "��アドオン���コレクション�も追加�れ����ん。"
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s �よ��作��れ��る他�アドオン"
@@ -415,21 +373,21 @@ msgstr[1] "�れら�作者�よ��作��れ��る他�アドオン
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "��アドオン�サ�ート�開発者 (%s) �ら��られ��。"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -437,20 +395,21 @@ msgstr ""
 "先 (%s) も公開�れ����。"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "��アドオン�サ�ート�開発者�サイト (%s) ���られ��。"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "評価�る"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "大好�"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "�グ報告をレビュー���投稿��������。����メールアドレス�アドオ"
@@ -458,45 +417,50 @@ msgstr ""
 "���も�連絡を�る�������ん。"
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">レビューガイドライン</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "��アドオン����何�サ�ートを必���れ��る場���<a href=\"%1$s\">サ"
 "�ート</a> �項目を�照������。"
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "�信"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "「%1$s�カテゴリ�����アドオンを見る"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "����レビュー (%1$s) を表示"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "�����ージョンを表示"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "�����ージョン履歴"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "ソースを表示"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "統計を表示"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "�����見を��������"
 
@@ -504,83 +468,24 @@ msgstr "�����見を��������"
 msgid "addons_display_workswith"
 msgstr "対応�ージョン"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "最近追加�れ�アドオン"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "人気�アドオン"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "�����アドオン"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "購読"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "アドオンをブラウズ"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "最近更新�れ�アドオン"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "作者:"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "人気�コレクション"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "コレクション"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> 個�アドオン"
-msgstr[1] "<strong>%1$s</strong> 個�アドオン"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "����コレクションを見る"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"コレクション��アドオンを分類�調和�一致�混���る���方法��。他�人"
-"�作��コレクションを購読��り�自分�コレクションを作る�������。"
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> 人�購読者"
-msgstr[1] "<strong>%1$s</strong> 人�購読者"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "スタッフ�����"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -589,127 +494,84 @@ msgstr ""
 "オン������ん��日本語化�れ����ん。日本語化�れ��るアドオン�一"
 "覧� Mozilla Japan �サイト (https://addons.mozilla.jp/) ��覧������。"
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "�れ�気�入り����？ %1$s �も��多��アドオンを見����ょ�。"
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"自分�ニーズ����� Firefox をカスタマイズ�拡張��る�<strong>5000 以上"
-"�無料�追加機能</strong>��。"
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "アドオン��？"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>インストール�簡�</strong>��新�ージョン�公開�れ����自動的�"
-"�知ら��表示�れ��。"
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "イントロダクション"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "最近公開�れ�アドオン:"
 
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"<strong>一般的�作業を支��る</strong>��種ツール�ー�テーマ�検索エンジン"
-"��。"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "新��"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "他�アプリケーション"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] ""
-"<strong>%1$s</strong> <span>個�アドオン�ダウンロード�れ���</span>"
-msgstr[1] ""
-"<strong>%1$s</strong> <span>個�アドオン�ダウンロード�れ���</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>個�アドオン�利用�れ����</span>"
-msgstr[1] "<strong>%1$s</strong> <span>個�アドオン�利用�れ����</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "人気�アドオン"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "�����アドオン"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "最近更新�れ�アドオン:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "���見る"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "最近公開�れ�アドオンを���見る"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "人気�アドオンを���見る"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "�����アドオンを���見る"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "最近更新�れ�アドオンを���見る"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>以下�リンクをクリック��ファイルを�存������。</"
@@ -717,11 +579,11 @@ msgstr ""
 "li><li>[インストール] ボタンをクリック��ダウンロード��ファイルを見���"
 "�択��ら [OK] をクリック���。</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Sunbird ��インストール方法"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>下�リンクを�クリック�� [��を付��リンク先を�存] を�択��"
@@ -729,42 +591,39 @@ msgstr ""
 "[ツール] メニュー�ら [アドオン] を�択���。</li><li>[インストール] ボタン"
 "をクリック���ダウンロード��ファイルを�択��[OK] をクリック���。"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Thunderbird ��インストール方法"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "実験的�アドオンを表示�る"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "移動"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "開発元:"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linux 版"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X 版"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windows 版"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -772,11 +631,11 @@ msgstr ""
 "Firefox �� Mozilla ベース�ブラウザ�利用�能�他�プラグイン�情報��%1"
 "$s を�覧����。"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "���載�����プラグインを�探����？"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "プラグイン��特殊�形��画�を表示��り�マル�メディアファイルを�生�る"
@@ -784,24 +643,24 @@ msgstr ""
 "ザ�機能を追加��り変更を加�る拡張機能��若干性質�異�り��。"
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 用�一般的�プラグイン"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "プラグイン"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "サ�ート情報: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -809,41 +668,37 @@ msgstr ""
 "り��。"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s �プレビュー画�"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "最近追加�れ�アドオン"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "アドオン�����ん�種類��り������気�入り�も�����見��る�"
 "���。����スタッフ�����アドオンを�紹介���。���試����"
 "�。"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "�����アドオン"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "�����アドオン"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "関連情報"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "申�訳�り��ん。検索エンジンをインストール�る���Firefox �� Mozilla "
@@ -858,42 +713,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "%1$s 方法��%2$s を�覧����。"
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/ja/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "独自�検索エンジンを作��る"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "%1$s ��ら�多��検索エンジンをブラウズ"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "検索エンジン"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "����紹介���る検索エンジン�作��� Mycroft プロジェクト��力を���"
 "�����。"
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "��アドオンを共有"
 
@@ -929,17 +785,17 @@ msgstr "�完全��ージョン"
 msgid "addons_status_nominated"
 msgstr "サンドボックス内 - 公開申請中"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "サンドボックス内 - レビュー待�"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "公開"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "サンドボックス内"
@@ -948,36 +804,26 @@ msgstr "サンドボックス内"
 msgid "addons_status_unknown"
 msgstr "�明"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "��アドオン�関�る詳細"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "人気�アドオン"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "評価�高�アドオン"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "���載���る�����ージョン��"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "�れら��ージョン���考������テスト目的�利用��るよ��公開�れ�"
 "���。特別��由����り�常�最新��ージョンを�利用����。"
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "�ージョン履歴・変更点"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s ��ージョン履歴"
@@ -1012,425 +858,153 @@ msgstr "グループ管�者"
 msgid "admin_group_saved"
 msgstr "グループ�設定��存�れ���"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "検索オプション"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "指定��"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "���"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "�����ージョン"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "アプリケーション"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "一致順"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "最終更新日"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "タイトル"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "æ›´æ–°æ—¥"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 �月以内"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 �月以内"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "24 時間以内"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "1 �月以内"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "1 週間以内"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "1 年以内"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "表示件数"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "プラットフォーム"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "ダウンロード数"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "評価"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "並�替�"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "�ら"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "検索オプション�表示・�表示を切り替�"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "種類"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "�ージョン"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "次�"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "��"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "�ージョン�ェックを無視"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "��アドオン����ージョン� Firefox ����"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "<a href=\"%1$s\">�去��ージョンを試�</a> � <a href=\"#\" onclick=\"%2$s"
 "\">���ェックを無視</a> ����"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">���ージョン</a> �利用��る�能性も�り��"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "��アドオン����リリース�れ���� <a href=\"%1$s\">Firefox %2$s</a> を"
 "必�������。"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "��アドオンを利用�る�� <a href=\"http://getfirefox.com\">Firefox をアップ"
 "グレード</a> ������"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s � %2$s �ステータスを %3$s �変更����"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s ��明�管�者アクション %2$s を ID %3$s �コミット����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s �機能 %2$s を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s �アプリケーション %2$s を作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s �アプリケーション %2$s を編集����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s � %3$s ��ージョン %2$s を作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s � %3$s ��ージョン %2$s を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s � '%2$s' �設定を '%3$s' �ら '%4$s' �変更����"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s ��明�エディタアクション %2$s を ID %3$s �コミット����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s �アドオン %2$s を注目リスト�ら削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s �アドオン %2$s を注目リスト�追加����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s �ロケール %2$s �機能を変更����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr ""
-"%1$s �注目リスト�掲載�れ��るアドオン %2$s �ロケールを変更����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s �ファイル %2$s ��ッシュ値を�計算����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s � %2$s を %3$s グループ�追加����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s �自分自身を %2$s グループ�関連付����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s � %2$s グループを作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s � %2$s グループ (ID %3$s) を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s � %2$s グループを編集����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s � %2$s を %3$s グループ�ら削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s ��明�アクション %2$s を ID %3$s �コミット����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s �ロック�れ��る %2$s グループを編集�よ������"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s � %2$s �翻訳を許���編集�よ������"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s � %2$s プラットフォームを作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s � %2$s プラットフォーム (ID %3$s) を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s � %2$s プラットフォームを編集����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s � %2$s �アクセス�る�����証�失敗����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s �返信 %2$s を作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s �返信 %2$s (ID %3$s) を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s �返信 %2$s を編集����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s �レビュー %2$s を承�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s �レビュー %2$s を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s ��明�セキュリティアクション %2$s を ID %3$s �コミット����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s �タグ %2$s を作�����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s �カテゴリ %2$s (ID %3$s) を削除����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s �カテゴリ %2$s を編集����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s � %2$s ロケール�アプリケーション�翻訳を更新����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s � %2$s ロケール�ブログ記事�翻訳を更新����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s � %2$s ロケール�プラットフォーム�翻訳を更新����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s � %2$s ロケール�カテゴリ�翻訳を更新����"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s � %2$s �ユーザ情報を編集����"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "タイトル順"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "最近公開�れ�アドオン"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "人気�アドオン"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "評価順"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "最近更新�れ�アドオン"
 
@@ -1439,784 +1013,106 @@ msgid "categories_current_title"
 msgstr "�在�カテゴリ"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "カテゴリ"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "カテゴリを�択"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "「%1$s�カテゴリ�アドオンを���見る"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "説明文� %1$s 文字以下�記述������。"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "����"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s コレクション"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "アドオン�削除中�エラー�発生�����"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "評価順"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "アドオン��存中�エラー�発生�����"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "最終更新順"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "コメント��存中�エラー�発生�����"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "人気順"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "��� %1$s 文字以下�記述������。"
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "「%1$s�カテゴリ�アドオンを���見る"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "コレクション�見��り��ん"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"コレクション�追加���アドオン�分����る場���下�����を入力��"
-"����。今�何も��後�追加�る場�� %1$s をクリック������。"
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "最��アドオンを�択"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "コレクションを作�"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "�択�れ�アドオン"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"自分�アドオンコレクションを作る��簡���。下�入力欄�必�事項を記入��"
-"����。"
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "コレクションを作�"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "コレクション"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "詳細"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "�気�入り�追加"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "�気�入り�ら削除"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>新��コレクション�下�見る�������。コレクション�ニック�ームを付"
-"��り�アイコンをアップロード��り�詳細設定を変更���場���<a href=\""
-"%1$s\">コレクション�管�</a> ページ�移動������。</p><p>����コレク"
-"ション���場所�アクセス����: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "����コレクション�作��れ����"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "��コレクション����"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "��コレクション�� %1$s 個�アドオン���れ����"
-msgstr[1] "��コレクション�� %1$s 個�アドオン���れ����"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>作�者:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>æ›´æ–°æ—¥</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "�気�入り�追加..."
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "�気�入り�ら削除..."
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr ""
-"��コレクションを�����気�入り�追加�る�� <a href=\"%1$s\">ログイン"
-"</a> ������。"
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "コレクション�管�"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "追加日"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "��"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "人気度"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "今週�ダウンロード数: %1$s"
-msgstr[1] "今週�ダウンロード数: %1$s"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "�択�れ�アドオン��存時�削除�れ��"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"��コレクション�新��アドオンを追加��公開�る���下�欄���を入力�"
-"�����。"
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"��コレクション�新��アドオンを追加��公開�る���下�欄�アドオン ID "
-"をカンマ区切り�入力������。"
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "通常�一覧ページ�らアドオンを追加�る��も����。"
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "追加日: %1$s / ユーザ: %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "公開者�コメントを追加"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "公開者�コメントを削除"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "公開者�コメントを編集"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"注�: コメント��元�公開日�元�公開者�よ��書�れ�も����記載�れ�"
-"�。"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "コメントを�存"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "削除"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "コレクション�追加"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "利用�能����を確�"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "�����コレクションを削除���。"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-"��コレクションを削除�る����ェックボックス��ェックを入れ��ら「%1"
-"$s�をクリック������。"
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"下�「%1$s�をクリック�る������コレクション�削除�れ��。コレクショ"
-"ンを削除�����場���「%2$s�タブ��る確��ェックボックス��ェックを"
-"外���らコレクション�編集を続������。����存�����ページ�ら"
-"離れ�も�コレクション�削除�れ��ん。"
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "����コレクション�削除�れ���"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "コレクション�説明を入力������。"
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "アイコン�アップロード中�エラー�発生����。"
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "コレクション���を入力������。"
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "ニック�ームを�択��場���一���る必���り��。"
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "アドオン���:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "対応アプリケーション"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "��コレクション�対応�るアプリケーションを�択������。"
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "コレクション�種類"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "コレクションを削除"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "コレクションを削除�る��元�戻��������ん。"
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "コレクション�説明"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "コレクション���中���れ��るアドオン�種類�関�る簡��説明"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "アイコン"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"JPG�GIF も��� PNG 形��アイコンをアップロード����。アップロード�れ"
-"�アイコン� 32x32 ピクセル�リサイズ�れ��。"
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "自分�コレクションを見る�����るユーザ"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"�期設定���コレクション�公開�コレクションディレクトリ�公開�れ�誰�も"
-"見る�������。特別�リンクを�����人���コレクションを見られるよ"
-"��制�を掛���場���下�オプションを�択������。"
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "自分�招待��人���自分�コレクションを見る�������"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "誰�も自分�コレクションをディレクトリ内�見る�������"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "自分�コレクションを管���るユーザ"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"以下�ユーザ������コレクション�アドオンを追加��り�����アドオン"
-"や設定を管���り�他�ユーザ�権�を与�る�������。"
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "コレクション���"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"コレクション�分�りや����を付������。例��「デイブ��気�入り旅"
-"行用アドオン����良�例��。"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "コレクション�ニック�ーム"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-"オプション����簡��アクセス��るよ��コレクション�一��ニック�ーム"
-"を付�る�������:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "コレクション�アドオンを追加��るユーザ"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"以下�ユーザ������コレクション�アドオンを追加��り�コレクション�ら"
-"アドオンを削除�る�������。"
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Firefox Add-ons �登録�れ��るメールアドレスを入力������:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "�択�れ�アカウント��存時�削除�れ��"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Firefox Add-ons �登録�れ��るアカウント�メールアドレスをカンマ区切り�入"
-"力������"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "自分��"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "自分�以下�ユーザ:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "追加"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "%1$s を管�"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "コレクション�内容を管�"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "�在��れ��るアドオン:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "詳細設定"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "コレクション�権�を管�"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "キャンセル"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "アイコンを削除"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "アイコンを変更"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "下�「%1$s�をクリック�る�アイコン�削除�れ��"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "使用�能�ニック�ーム"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"����入力��ニック�ーム���正�文字���れ��り�修正�行�れ��"
-"�。�度試������。"
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "既�使用�れ��るニック�ーム"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "����コレクション�以下� URL �アクセス����:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "コレクション��存�完了�����"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "コレクションを更新"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "コレクションを削除"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "アドオン"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "詳細"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "���詳細"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "権�"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "������もやカレンダーを見守るアドオン"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "家��スケジュール管�"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "アドオンコレクターを�ェック"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "コレクションを作�"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "表示"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>���������も�気�入り�コレクションを������ん。"
-"</strong></p><p>�気�入り�追加��コレクション���ページ�ら��や�アク"
-"セス��るよ���り�<a href='%1$s'>アドオンコレクター</a> をインストール�"
-"��る場����画��も表示�れ��。"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>������コレクションを作������ん。コレクション�簡��作れ���"
-"気�入り�アドオンを�������������。<a href=\"%1$s\">���試��"
-"���</a>。</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "コレクション"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "アドオンコレクター"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "作�者: %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "コレクション��？"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "並�替�"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "エディタ・ピックアップ"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "自分��気�入り"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "自分�コレクション"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "人気"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "�れ���最も人気"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "今月最も人気"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "最新"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "今週最も人気"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"�気�入り�アドオンを管��発見�る新��方法��り��。コレクション�コメ"
-"ント�共有��期を����ブラウザ上�行���。"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"コレクション���関連�るアドオンを集��簡��共有��るよ�グループ��。"
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "追加日: %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "オンライン��調査を支��るアドオン"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "リファレンス・デスク"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "自分�ソーシャル�ットワークを管��るアドオン"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "ソーシャル・サーキット"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "閉�る"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"�気�入り�コレクションを追加�る際�エラー�発生����。��コレクション"
-"�����気�入り���追加�れ����ん�？"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "今後��メッセージを表示���"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s ��気�入り�コレクション�追加�れ���。"
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"今後��コレクション�ディレクトリ内� <a href=\"%1$s\">%2$s</a> タブ�ら��"
-"や�見��る�������。も��簡���気�入り�コレクションを�ェック�"
-"る方法も�り��。Firefox 用� <a href=\"%3$s\">アドオンコレクター</a> を�試"
-"�����。"
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "��コレクション�削除�れ���。"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "���を旅行代�店�変身��るアドオン"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "旅行者��パック"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "自動追加"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "エディタ�����"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "通常"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"�気�入り�コレクションを削除�る際�エラー�発生����。��コレクション"
-"��気�入り�����能性��り��。"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s ��気�入り�コレクション�ら削除�れ���。"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "完璧� Web サイトを簡��作る���アドオン"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Web 開発者��ツール"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "コレクション��？"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "FAQ を読む"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"�気�入り�アドオンを管��発見�る新��方法��り��。コレクション�コメ"
-"ント�共有��期を����ブラウザ上�行���。"
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "アドオンコレクター�ホーム"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "アドオンコレクターをダウンロード:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "アドオンコレクター�ロゴ"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "アドオン互�性センター"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "%2$s Add-ons コミュニティ����公開�れ��る�れら�ツール�情報を活用�"
 "��%1$s �リリース�備���ょ�。"
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "データを読�込ん����..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "メインページ�戻る"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "アドオン互�性レ�ート"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "アドオン開発者���情報"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "アップロードを行��� maxVersion を変更"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "自分�アドオン�ステータスを確�"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Mozilla Add-ons �アドオンを登録�れ��る場���<a href=\"%1$s\">ログイン</"
 "a> ���%2$s ����アドオン�ステータスを分�������。"
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center ロゴ"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Mozilla Add-ons �登録�れ��る����アドオン��り��ん。"
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "アドオン�ステータス確���果"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "登録�れ��るアドオン�ステータスを�得�����..."
 
@@ -2224,119 +1120,119 @@ msgstr "登録�れ��るアドオン�ステータスを�得����
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s ユーザ (全体� %3$s&#37;)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "以下�アドオン��Mozilla �把����るアドオン利用者� 95% �使�れ��るも"
 "���利用者�多�順�並�られ����。"
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "詳細�レ�ートを表示"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Mozilla �把����るアドオン利用者� 95% �使�れ��る %1$s 個�アドオン�"
 "����時点� <b>%2$s&#37;</b> 個� %3$s �最新ビルド�対応���る�判断�"
 "れ����。"
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "アルファ版"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "%1$s �アルファ版�互�性��るアドオン"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "ベータ版"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "%1$s �ベータ版も���リリース候補版�互�性��るアドオン"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "最新版"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "%1$s �最新ビルド�対応���るアドオン"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "��他��ージョン"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "%1$s ���れ��ージョン�も互�性���アドオン"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "アドオン互�性レ�ート"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "アドオンユーザ���情報"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "互�性レ�ートを表示"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "�力方法�関�る情報� %s を�覧����。"
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "MozillaWiki �ページ"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla ��addons.mozilla.org プロジェクト�長����力������る以下�"
 "皆様�感������。"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "開発者"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "エディタ"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "ローカライズ担当者"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "��他��力者"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "�去��力�����開発者"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "ソフトウェア�画�"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "��サイト�使用���る一部�アイコン��<a href=\"http://creativecommons."
@@ -2344,7 +1240,7 @@ msgstr ""
 "開�れ��る <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam "
 "Silk Icon Set</a> ���れ��るも���。"
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
 "一部�ページ���<a href=\"http://simile.mit.edu/license.html\">BSD ライセン"
@@ -2354,20 +1250,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Yå¹´ %b %eæ—¥"
 
@@ -2402,22 +1295,22 @@ msgstr "統計ダッシュボード"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "ファイル %1$s �拡張� (%2$s) �無効��。有効�拡張�� %3$s ��。"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "ファイル %s をデータベース��存����ん���。�度�試�����。"
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "プレビュー %1$s �ファイル %2$s �置���られ���。"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr ""
 "ファイル %s �アップロード�完了����。下�フォーム�キャプションを追加�"
@@ -2427,6 +1320,19 @@ msgstr ""
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(自動判別)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"����アドオン����ージョン� Firefox %1$s ��互�性�明記�れ����"
+"ん。Mozilla ��次��ージョン� Firefox を�も��リリース�る予定�����"
+"��新���ージョン�アドオンをテスト���互�性情報を更新������。詳"
+"��� <a href=\"%2$s\">��ら�記事</a> を�覧����。�れ���る通知��"
+"���ん������ージョンを���� addons.mozilla.org �登録�れ�も構�"
+"��ん。"
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "新��ウィンドウ�開�"
@@ -2463,65 +1369,130 @@ msgstr "ステップ 5: 完了"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "申請�関�るヘルプ"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "アドオン�公開�中止�れ���"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "アドオン�編集"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "アドオン�有効��り���"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "アドオン�説明"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "アドオン�ホームページ"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "アドオン�タイトル"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "プレビュー画��キャプション"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "プライ�シー�リシー"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "アドオン�概�"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "サ�ート用メールアドレス"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "サ�ート用 URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "�ージョン�説明"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "アドオン�申請"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "アドオン�申請�完了����。"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "有効化"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "アドオンを有効化�る��公開ページ��掲載�開始�れる��も��更新確�サー"
 "ビス�有効��り��。"
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "アドオンを完���る"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "��アドオンを完����サンドボックス�移動���。"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "無効化"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "アドオンを無効化�る��公開ページ�掲載�れ���り�更新確�サービスも無効"
 "��り��。"
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "サンドボックス�移動"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr ""
 "��アドオンをサンドボックス�戻���。後���公開�る��も����。"
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "公開を申請"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "��アドオン�一般公開を申請���。"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "公開"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "��アドオンを�度公開���。"
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
 "��アドオン� <span class=\"inactive-0\">有効</span> ��。上記�ステータス"
@@ -2551,7 +1522,7 @@ msgstr "アドオン�説明を入力������。"
 msgid "devcp_addon_status_criteria_name"
 msgstr "アドオン�タイトルを入力������。"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "「リリース��アドオン��指定�れ����ん。"
 
@@ -2559,6 +1530,10 @@ msgstr "「リリース��アドオン��指定�れ����ん。"
 msgid "devcp_addon_status_criteria_preview"
 msgstr "拡張機能�テーマ���少���も����プレビュー画��必���。"
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "ユーザ�よるレビュー�必���。(外部サイト�レビュー�も�)"
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "アドオン��約を入力������。"
@@ -2568,12 +1543,12 @@ msgstr "アドオン��約を入力������。"
 msgid "devcp_addon_status_header"
 msgstr "アドオン�ステータス: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "�能�アクション"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "有効ステータス: <span class=\"inactive-0\">有効</span>"
 
@@ -2581,7 +1556,7 @@ msgstr "有効ステータス: <span class=\"inactive-0\">有効</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "アドオン完��件"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "有効ステータス: <span class=\"inactive-1\">無効</span>"
 
@@ -2589,24 +1564,24 @@ msgstr "有効ステータス: <span class=\"inactive-1\">無効</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "公開申請�件"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "信頼ステータス: <span class=\"status-4\">信頼�れ����</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
 "��アドオン� <span class=\"inactive-1\">無効</span> ��。上記��件���"
 "�ら����公開ページ�も掲載�れ��ん。更新確�サービスを通��アドオン�"
 "更新も<b>�供�れ��ん</b>。"
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "��アドオン� <span class=\"status-4\">公開</span> を申請�る���上記��"
 "件を満�������。"
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 "下�ボタンをクリック�る����アドオン� <span class=\"status-1\">公開</"
@@ -2674,12 +1649,121 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s �ステータス"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "��アドオン� <span class=\"status-4\">信頼�れ����</span>。エディタ�よ"
 "るレビューを��る����新���ージョンを公開����。"
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"申請内容�変更� %1$s �ページ�行���。開発者用コントロールパ�ル�戻る�"
+"� %2$s ������。"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "��をクリック"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "アドオン�編集"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"���ージョン��サンドボックステスター� Mozilla Add-ons エディタ�レビュー"
+"を��る���サンドボックス�置�れ��。最新�ステータス�メール��知ら�"
+"���。"
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "サンドボックス�レビューシステム����� %s を�覧����。"
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "��ら"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"���ージョン��経験豊富�ユーザ�よるテストを��る���サンドボックス�"
+"置�れ��。サイト上�一般�公開�る���%s を行��レビューを��る必���"
+"り��。"
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "公開申請"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "アドオン�登録�完了����。"
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"��アドオン�信頼�れ��る������ージョン�自動的�承��れ�公開ペー"
+"ジ�掲載�れ���。"
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "アドオン�登録"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "アドオン�更新�完了����。"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "アドオン��関心を高�る����%s �れる��を�勧����。"
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "プレビュー画�を登録"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "該当�る作者�見��り��ん��� [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "削除"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "キャンセル"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "登録を中止��もよ������？"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "次�"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "アドオン�種類を変更:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "作者�コメント�更新�れ���。"
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "有効"
@@ -2744,34 +1828,177 @@ msgid "devcp_dashboard_versions_new"
 msgstr "新���ージョンをアップロード"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr ""
 "プレビュー %s をデータベース�ら削除����ん���。�度�試�����。"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "プレビュー %s �削除�完了����。"
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "��������ージョンも���ファイルを削除�る権���り��ん。"
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s 件� %2$s ファイル"
 msgstr[1] "%1$s 件� %2$s ファイル"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "プレビュー画�を追加"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "��"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "カテゴリ"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "カテゴリ"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "説明"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "公開�中止�れ����"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "詳細"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "作者�コメント"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "プレビュー画�"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "�ージョン"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "ホームページ"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "��"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "キャプション��り��ん。"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "プレビュー画���り��ん。"
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "サ�ート用メールアドレス"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "開発者�サ�ート用メールアドレス�公開�れ����ん。"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "サ�ート用 URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "開発者�サ�ート用 URL �公開�れ����ん。"
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "信頼�れ����"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "�ージョン %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "�ージョン��り��ん。"
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "キャンセル��元�戻る"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "���無効����"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "��アドオンを無効���もよ������？"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"アドオンを無効��る��検索�果や一覧�表示�れ���り��。サイト�ら�ダ"
+"ウンロード���能��り�製��ソフトウェアアップデート機能�よる�ージョン"
+"確��も更新情報を返����り��。��り�事実上削除�れ�����状態��"
+"り�������戻れ�����も必��応���度有効��る�������。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "%s を無効��る"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "���有効����"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "��アドオンを有効���もよ������？"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"アドオンを有効��る����検索�果や一覧�表示�れるよ���り��。サイト"
+"�ら�ダウンロード�製��ソフトウェアアップデート機能�よる�ージョン確��"
+"�能��り��。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "%s を有効��る"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "返信を追加"
@@ -2817,52 +2044,64 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "投稿者: %1$s - 投稿日時: %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "作者を追加"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "作者�メールアドレス"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "削除"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "新��作者を追加"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "作者を追加"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "作者アカウント�メールアドレス:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "アカウント�メールアドレスを確������..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "�存�る���下�「作者情報を更新�ボタンをクリック������。"
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "�在�作者"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "アドオン�作者を管�"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "公開ページ�作者���記載�る"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>開発者</strong> - アドオン�公開�関�る����情報を管�����。"
 "����他�作者を追加��り削除�る�������ん。"
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>オーナー</strong> - アドオン�公開�関�る����情報を管����"
 "�。他�作者を追加��り削除�る��も����。"
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 "<strong>閲覧者</strong> - アドオン�開発者情報や統計情報を見る�������"
@@ -2873,26 +2112,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "作者�役割を�択������:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "作者"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "表示"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "役割"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "作者情報を更新"
 
@@ -2958,40 +2197,40 @@ msgid "devcp_edit_dd_manage_properties"
 msgstr ""
 "��アドオン�タイトル�ホームページ�アイコン���他�フラグを変更���。"
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "説明を更新"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "赤色�示�れ��る上記�エラーを訂正������。"
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "アドオン�説明を編集"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 "アドオン��約や説明��該当����エンドユーザ�知り�����れる�らゆる"
 "情報を記述���。例���主�既知��グ��グ報告�手順�新�ージョン�リ"
 "リース予定日��を記載�る��使用����。"
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "開発者�コメント"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 "説明�����アドオン�機能や特長���他関連情報をより詳��記述���。�"
 "�情報�アドオン公開ページ��約�下�表示�れ��。"
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "アドオン�説明"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 "��アドオン�エンドユーザライセンス契約 (EULA) �付��る場�����内容を"
@@ -2999,27 +2238,27 @@ msgstr ""
 "ストール�る����を求�られ��。EULA ��GPL や MPL ��ソースコード�ラ"
 "イセンス����������注�������。"
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "エンドユーザライセンス契約"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "��アドオン�プライ�シー�リシー�付��る場�����内容を以下�欄�入力"
 "������。アドオン�公開ページ��リシー��リンク�表示�れ��。"
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "プライ�シー�リシー"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 "�約���検索�果やアドオン公開ページ�最上部�表示�れる�アドオン�基本機"
 "能�簡��説明を記述���。<strong>�角 250 文字��</strong>入力����。"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "アドオン��約"
 
@@ -3039,191 +2278,263 @@ msgstr "アドオン�説明を管�"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "アドオン�プロパティを管�"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "��アドオン�種類���択��るカテゴリ��り��ん。"
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "�完全�アップロード"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "アップロード�れ��るファイル��り��ん。"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "最大アップロードサイズを超�����。"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "作者"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "アイコンを追加"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "アイコンを変更"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "サイト上��ソースファイル�表示を許��る"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "カテゴリ"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "既定�ロケール"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "��アドオン�外部アプリケーションを必�����"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "アイコンを削除"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "新��アイコンファイル"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "アイコン"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "追加�ロケール情報"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "�れ�正�リリース��アドオン��"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "�れ�特定�サイト用�アドオン��"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "対象ロケール"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "短�追加情報 (方言��呼�方��)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "プロパティを更新"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "変更���果を完全��解���る場����変更を行������。"
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "�在�アイコン"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 "既定�ロケール���必�翻訳を用����れ��ら��主�ロケール��。アドオ"
 "ン�説明�ユーザ��択��言語�翻訳�れ����場�も���既定�ロケール�"
 "表示�れ��。"
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "�れら�フラグ��アドオン�検索や分類�使用�れ��。"
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 "アドオン� GUID ��install.rdf 内�指定����アドオンを一��識別�るも�"
 "��。一度アドオンを Mozilla Add-ons �登録��ら�GUID を変更�る�����"
 "��ん。"
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "アドオン�プロパティを編集"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "アドオン�種類"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "管�者設定"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "既定�ロケール"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "アドオン�フラグ"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "アドオン� GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "アドオン�アイコン"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "��他�設定"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "信頼�れ��るアドオン"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "ソースをオンライン�表示"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 "アイコン��検索�果�公開ページ�インストールダイアログ上����アドオン�"
 "タイトル��も�表示�れる����画���。画�� 32 x 32 ピクセル�自動的�"
 "サイズ調整�れ��。画��種類� %s ���れ�を使用������。"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "��アドオン���イナリコン�ー�ント���れ����"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "信頼�れ����ん"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "信頼�れ����"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "新��アイコン"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "アイコンを削除"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 "��アドオン�ホームページを別�����る場���URL を入力������。�"
 "�サイト�他�言語�ローカライズ�れ�������れ��他�翻訳を追加�る必"
 "���り��ん。"
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "アドオン�ホームページ"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "アドオン�掲載�れる�らゆる場所�表示�れる�アドオン�����。"
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "アドオン�タイトル"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 "サ�ート�関�る�����を��付�るメールアドレスを����る場�����"
 "アドレスを入力������。他�言語�対応�るアドレスを���������れ"
 "��他�翻訳を追加�る必���り��ん。"
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "サ�ート用メールアドレス"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 "サ�ートを�供�る Web サイトやフォーラムを����る場����� URL を入力"
 "������。��サイト�他�言語�ローカライズ�れ�������れ��他�"
 "翻訳を追加�る必���り��ん。"
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "サ�ート用 Web サイト"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr ""
 "信頼�れ��るアドオン��エディタ�レビューを��る����公開�れ��。"
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "アイコン��存時�削除�れ��。<a %s>キャンセル</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "����許��れ��アドオン���れ��るファイル�ソースコードを�ログイン"
 "���る����ユーザ�表示����。"
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "オンライン��ソース�表示を許��る"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "オンライン��ソース�表示を許����"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"https://wiki.mozilla.org/L10n:Simple_locale_names\">�純�ロケール"
+"�</a> (en-US ��)"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "作者"
@@ -3299,14 +2610,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "�留�れ��る更新 (%s)"
 msgstr[1] "�留�れ��る更新 (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "�択��ファイル�削除�れ��。"
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "ファイル"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "対応アプリケーション"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "ファイル��り��ん。"
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "レビュー担当者��連絡事項"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "æ›´æ–°"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "��アドオン�アクセス�る権���り��ん。"
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"概���角 250 文字����入力����ん。\n"
+"(%s 文字入力�れ����)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"��アドオン�タイトル�既�データベース上�存在���。以下���を�確��"
+"���。<br /><li>GUID �一致: ��エラー�最もよ��る原因� GUID ��一致�"
+"�。</li><li>データベース��複��エントリーを登録�る�������ん。既�"
+"登録�れ��る場���該当�るエントリーを更新�る�削除���ら��度登録を"
+"行������。</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3320,9 +2686,9 @@ msgstr "%s を�考�������。"
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "��ら�ページ"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "アドオン���少���も��り�オーナーを設定�る必���り��。"
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "今回�更新�変更点を入力������。"
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3340,6 +2706,10 @@ msgstr ""
 "��ファイル拡張� (%s) ��択�れ�種類�アドオン��使用����ん。以下�"
 "��れ�を使用������: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "����ファイル� GUID �一致���ん"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "�択��るカテゴリ� 5 �����。"
@@ -3374,7 +2744,15 @@ msgstr ""
 "��ファイル拡張� (%s) �アイコン��使用����ん。以下���れ�を使用�"
 "�����: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"��アドオン�プラットフォーム��既����ージョン (%s) �存在���。"
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf ファイル���れ����ん。"
 
@@ -3382,9 +2760,9 @@ msgstr "install.rdf ファイル���れ����ん。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf ファイル�以下�エラー��り��:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "正��アドオン�種類を�択������。"
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3456,6 +2834,19 @@ msgstr "ã�“ã�®ã‚¢ãƒ‰ã‚ªãƒ³ã�® ID ã�Œ install.rdf ファイルã�§æŒ‡å®šã�•ã‚Œã�¦ã
 msgid "devcp_error_no_platform"
 msgstr "プラットフォーム��択�れ����ん"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr ""
+"公開申請を行����説明を求�られ�部分����詳述�る必���り��。"
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "リリース��アドオンを公開申請�る�������ん。"
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "公開申請��るアドオン�サンドボックス��るも�����。"
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "少���も����カテゴリを�択������。"
@@ -3473,6 +2864,16 @@ msgstr ""
 "��ファイル拡張� (%s) �プレビュー画���使用����ん。以下���れ�を"
 "使用������: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "データを�存�る際�エラー�発生����。"
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "��アドオンを更新�る権���り��ん。"
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3485,82 +2886,280 @@ msgstr ""
 "addons.mozilla.org 以外� updateURL を指定�る�������ん。install.rdf"
 "ファイル�ら updateURL を削除��上���度アップロード������。"
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "ファイルをアップロード������。"
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "他�プラットフォームファイルを追加"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "作者を追加"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "削除"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "新��登録�るアドオン�カテゴリ�次�ステップ��択����。"
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "��アドオン�種類���択��るカテゴリ��り��ん。"
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "アドオン�説明を入力������。"
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "アドオン�タイトルを入力������。"
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "登録�るアドオン�種類を�択������。"
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "アドオン�概�を入力������。"
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "アドオンファイル"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "アドオンファイル 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "アドオンファイル 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "アドオン�種類"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "サイト上��ソースファイル�表示を許��る"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "作者�メールアドレス"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "作者"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "カテゴリ"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "既定�ロケール"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "説明"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "エンドユーザライセンス契約 (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "��アドオン�外部アプリケーションを必�����"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "ファイル"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "ホームページ"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "アイコンファイル"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "タイトル"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "対応プラットフォーム"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "�れ�正�リリース��アドオン��"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "プライ�シー�リシー"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "�れ�特定�サイト用�アドオン��"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "概�"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "サ�ート用メールアドレス"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "サ�ート用 URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "対応アプリケーション"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "�ージョン"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "�ージョン�説明"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "��"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "レビュー担当者��連絡事項"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"��アドオン�信頼�れ����。���ージョンを���公開�る��択����"
+"��。"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "公開ページ"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "サンドボックス"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "開発者利用�約"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "ステップ 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "ファイル�アップロード"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "ステップ 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "アドオン�詳細"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "ステップ 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "�ージョン�詳細"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "ステップ 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "ローカライズ"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "ステップ 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "完了"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "自分�アドオン"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "ファイルをアップロード"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "キャンセル"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
 msgstr "追加���作者�登録メールアドレスを入力������。"
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "下�移動"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "上�移動"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "アプリケーション互�性を削除"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "公開ページ�作者���記載�る"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "ライセンスを�択������。"
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "ライセンスを入力������。"
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "開発者"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "オーナー"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "閲覧者"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "作者を削除"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "��作者を削除��もよ������？"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "アップロード�るファイルを�択������。"
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "アドオン %1$s �ージョン %2$s �独自ライセンス"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "ローカライズ�能�項目"
@@ -3576,12 +3175,12 @@ msgstr ""
 "既定�ロケール (%s) �表示�れ��。"
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "管�者用コントロールパ�ル"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "エディタ用コントロールパ�ル"
 
@@ -3590,28 +3189,28 @@ msgid "devcp_myaddons_link"
 msgstr "自分�アドオン"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "メインページ�戻る"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "統計ダッシュボード"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "アドオンを登録"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "開発者用ツール"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 "��アドオン� ID (%1$s) �既�データベース上�存在���。�れ�����アド"
@@ -3622,25 +3221,36 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "キャンセル��戻る"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "アドオン�詳細�戻る"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s �公開を申請"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "自動判別�れ�アドオン�種類� %s ��。"
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>����る��複数�変更を�存����ん���。</span><br />以下�エ"
 "ラーを�照������。��他�変更�正���存�れ���。"
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3653,6 +3263,17 @@ msgstr ""
 "��画�を既定�プレビュー画��設定����削除�る��他�プレビュー画��"
 "自動的�既定�プレビュー画���り��。"
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"��アドオン�既定�ロケール %1$s [%2$s]) ���択�れ��るロケール (%3$s [%"
+"4$s]) �異�り��。以下�項目� %1$s ��る必���り��。"
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3660,13 +3281,13 @@ msgstr ""
 "��画�を既定�プレビュー画���る���在�既定�プレビュー画��既定��"
 "���り��。"
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "�存�れ����変更��り��。"
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3695,47 +3316,47 @@ msgstr "プレビュー画��編集"
 msgid "devcp_preview_updated_successfully"
 msgstr "プレビュー画��更新�れ���。"
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "他�プレビュー画�を追加"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "プレビュー画�を削除"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "プレビュー画�を置���"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "プレビュー画�を更新"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "新��プレビュー画�を追加"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 "アップロード�る画�を�択������。幅 700 ピクセル�高� 525 ピクセル以"
 "上�画��自動的�縮��れ��。使用�能�形�� %s ��。"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr ""
 "アップロードを行����下�「プレビュー画�を更新�をクリック������。"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 "��画�を�存�る���下�「プレビュー画�を更新�をクリック������。"
 "(<a %s>キャンセル</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 "��プレビュー画���下�「プレビュー画�を更新�をクリック�る�削除�れ�"
@@ -3752,7 +3373,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "プレビュー画�を追加"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "プレビュー画��キャプション"
 
@@ -3760,7 +3381,7 @@ msgstr "プレビュー画��キャプション"
 msgid "devcp_previews_header_edit"
 msgstr "プレビュー画�を編集"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "既定�プレビュー画�"
 
@@ -3772,23 +3393,23 @@ msgstr "プレビュー画��ファイル"
 msgid "devcp_previews_label_makedefault"
 msgstr "��画�を既定�プレビュー画���る"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "新��画�:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "プレビュー画�をアップロード: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "�����������プレビュー画�を�存����ん���。"
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "プレビュー画��アップロード�完了����。"
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 "��アドオン�プレビュー用スクリーンショット�下�表示�れ����。���"
@@ -3811,16 +3432,24 @@ msgstr "プレビュー画�を編集"
 msgid "devcp_previews_submit_upload"
 msgstr "プレビュー画�をアップロード"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "サム�イル"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "%s �プレビュー画�マ�ージャ"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "正����よ���。"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "��ファイルを削除��もよ������？"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "次�進む���以下�利用�約をよ�読ん����る必���り��。"
 
@@ -3830,7 +3459,7 @@ msgstr ""
 "<span>�������ページを変更��る権���り��ん。</span><br />変更を行"
 "���場��アドオン�オーナー�連絡を�������。"
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 "一部�変更��Mozilla Add-ons �����ページ��映�れる��数時間��る�"
@@ -3840,6 +3469,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "ダッシュボード"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "�在登録�れ��るアドオン�情報を更新���"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3929,54 +3562,100 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "アドオン�公開申請"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "�在アドオン�登録�中止�れ����。後日���ェック������。"
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "���る"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "�����"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "��アドオン�管�者�よ��公開�中止�れ����。"
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "公開�中止�れ����"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "信頼�れ����"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "最新�ージョン:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr ""
+"登録�れ��るアドオン��り��ん。登録を行��� %s をクリック�����"
+"�。"
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "��ら"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "テーマを登録�れる場���必� %s ������。"
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "プレビュー画�をアップロード"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "%s を編集"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "ヘルプ (��ページ�ら移動���ん)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "ヘルプ"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "入力済�文字数: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "��翻訳を削除��もよ������？"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "�れら� %s タブ�何���？"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "翻訳を用������場�����り���？"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "ヘルプを隠�"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
 msgstr ""
 "ユーザ�サイトを閲覧������国語�翻訳��供�れ����場���アドオン"
@@ -3984,68 +3663,68 @@ msgstr ""
 "����用������場���入力�能�言語���り���自身��国語を既定"
 "�ロケール�指定������。"
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
 msgstr ""
 "�れ� <b>翻訳ボックス</b> ��。特定�入力欄を�翻訳を用����る他�言語�"
 "ローカライズ����。ロケール�タブを使用�る����翻訳を追加�編集�削除"
 "����。"
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "翻訳を追加"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "翻訳を削除"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "����欄�ロケールを追加"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "ロケールを追加"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "キャンセル"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "削除"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "追加�る翻訳�ロケールを�択������:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "��ファイル�使用�れ��るアドオン� GUID (%1$s) ����アドオン�既存�"
 "GUID (%2$s) �一致���ん。"
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "�������アドオン更新�る権���り��ん。"
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "指定�れ��ージョン (%1$s) ���アドオン (%2$s) �属���ん。"
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
 "アップロード�れ��ージョン (%1$s) �既�存在���。���ージョン�他�"
 "ファイルを追加�る���<a href=\"%2$s\">��をクリック</a> ������。"
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
 "アップロード�れ��ージョン番� (%1$s) ��既存��ージョン番� (%2$s) �一"
@@ -4055,28 +3734,24 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "スタート"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "ファイルをアップロード�����..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "����続�る"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "自分�アドオンを編集"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "アドオン�後�完�����。"
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "リリースノートを追加"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
 msgstr ""
 "<p>アドオン�登録�完了����。アップロード�れ�ファイル�ら�得�れ�基本"
@@ -4087,24 +3762,24 @@ msgstr ""
 "��編集����。���アドオン�ステータス� <a %s>ステータスページ</a> �"
 "���も確�����。"
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "���題を修正��上��度ファイルをアップロード������。"
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
-msgstr "新��ファイル��ージョン %1$s �追加�れ��在 %2$s ��れ����。"
+msgstr "新��ファイル��ージョン %1$s �追加�れ��在 %2$s ��れ����。"
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "アドオン�作��れ���。"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "��ファイル���題��るよ���。"
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "ファイル�追加�れ���。"
 
@@ -4113,11 +3788,11 @@ msgid "devcp_uploader_header_how"
 msgstr "�れ���よ��使�����？"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "�ージョン %s �作��れ���"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "ファイルをアップロード"
 
@@ -4139,20 +3814,16 @@ msgstr ""
 "�。��プロセスを始�る準備�������既�アップロード�るアドオンパッ"
 "ケージを����ら�下�「スタート�をクリック�������</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "対応プラットフォーム:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "アドオン�ファイル: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "��他"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 "新��ファイル��エディタ�よるレビュー�完了次第�一般�公開�れ��。�在"
@@ -4160,7 +3831,7 @@ msgstr ""
 "���？ �れ�ら <a %2$s>エディタ��る</a> ��を�検討����。"
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 "新���ージョン��エディタ�よるレビュー�完了次第�一般�公開�れ��。�"
@@ -4168,13 +3839,13 @@ msgstr ""
 "����？ �れ�ら <a %2$s>エディタ��る</a> ��を�検討����。"
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "新���ージョン�作��れ��在 %s ��れ����。"
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 "新��ファイル� <a %1$s>�ージョン�ファイル</a> �ページ�表示����。ア"
@@ -4183,14 +3854,14 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 "新���ージョン� <a %1$s>�ージョン�ファイル</a> �ページ�表示����。"
 "アドオン� <a %2$s>�在�ステータス</a> を確���り�下�ボタンをクリック�"
 "�<b>リリースノートを追加</b>�る��も���� (強�推奨���)。"
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
 msgstr ""
 "アドオン�ファイルをアップロード�る��下�フォームを使用���。複数�プ"
@@ -4198,19 +3869,14 @@ msgstr ""
 "ルを�択���れ�ら他�ファイルを「�ージョン�ファイル�管�画��アップ"
 "ロード������。"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "���"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "特定:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "�択������..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4226,27 +3892,31 @@ msgid "devcp_uploader_title_update"
 msgstr "%s ã‚’æ›´æ–°"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "�考��� %s を�覧����。"
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "��ら�ページ"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "��メールアドレスを��アカウント�見��り��ん���。"
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"XML �形��正������必須項目��足�����。<a href=\"https://"
-"developer.mozilla.org/ja/Creating_OpenSearch_plugins_for_Firefox\">ドキュメン"
-"ト</a> を読ん�アドオンを確����度試������。"
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "�ージョン�編集"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "�ージョン�更新�れ���。"
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4303,69 +3973,65 @@ msgstr[1] "%s レビュー"
 msgid "devcp_versions_delete_sure"
 msgstr "�ージョン %s を完全�削除��もよ������？"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "キャンセル"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "ファイルを削除"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "新��アプリケーションを追加"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "アプリケーションを削除"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "新��ファイルを追加"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
 msgstr ""
 "���アプリケーション情報を編集�る��アドオン�パッケージ���れ��る "
 "install.rdf ��互�性����判断�れる場�����も�ユーザ�インストール"
 "��るよ���り��。<a %s>対応アプリケーション�一覧</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr "��アプリケーション��互�性を削除��もよ������？"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "��ファイルを完全�削除��もよ������？"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "承��関�る情報"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "互�性��るアプリケーション"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "ファイル情報"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "ライセンス"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "�ージョン %s を管�"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "承��関�る注�"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "ファイルを削除"
 
@@ -4374,72 +4040,66 @@ msgstr "ファイルを削除"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "ファイル %1$s (%2$s) � %3$s �作��れ�%5$s � %4$s �変更�れ���"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"����アドオン��切�ライセンスを�択������。��ライセンス��アド"
-"オン���れるソースコード�対��与�る権利を明記�るも���。"
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "ファイル�見��り��ん���。"
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "���ージョンをレビュー�るエディタ�����任��情報��。"
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "アプリケーション互�性を削除"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "アプリケーションを�択������"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "ファイル"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "プラットフォーム"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "サイズ"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "ステータス"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
 "���ージョン��変更点�新機能�既知��グ���他���ージョン�����"
 "考��る情報を入力���。�れら�情報��ユーザ� Firefox 3 �アドオンマ�ー"
 "ジャ画��らアドオンを更新�る際�も表示��る�������。"
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "リリースノート"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>�存�れ����変更��り��。</strong> 互�性情報��下�「�ー"
 "ジョン情報を更新�をクリック�る��削除�れ��ん。"
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>�存�れ����変更��り��。</strong> ファイル��下�「�ージョ"
 "ン情報を更新�をクリック�る��削除�れ��ん。"
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "�ージョン情報を更新"
 
@@ -4474,7 +4134,7 @@ msgstr "ステータス"
 msgid "devcp_versions_th_version"
 msgstr "�ージョン"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "��アドオン�公開�中止�れ����"
 
@@ -4518,7 +4178,7 @@ msgstr "フィルタ"
 msgid "editorcp_logs_filter_by"
 msgstr "種類・アクション�よるフィルタ"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "イベントログ"
 
@@ -4580,7 +4240,7 @@ msgstr "%s �ら %s ���エントリーを表示"
 msgid "editorcp_reviewlog_none_found"
 msgstr "��期間�レビュー�行�れ�アドオン��り��ん。"
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "レビュー履歴"
 
@@ -4604,24 +4264,24 @@ msgstr "最近�エディタ�活動"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "レビュー��計"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "アドオン�レビュー"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "以下�項目を入力������:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "少���も����レビューを行�ファイルを�択������。"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "作者自身�よるレビュー�許��れ����ん。"
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部アプリケーション"
 
@@ -4633,39 +4293,39 @@ msgstr "注目�アドオンを追加"
 msgid "editors_featured_add_feature_submit"
 msgstr "追加"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "注目�アドオンを追加����ん���。"
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "注目�アドオン�追加�完了����。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "注目�アドオンを編集����ん���。"
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "注目�アドオン�編集�完了����。"
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "1 ����複数�ロケール��正��。"
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "注目�アドオンを削除����ん���。"
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "注目�アドオン�削除�完了����。"
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "注目�アドオン"
 
@@ -4677,254 +4337,203 @@ msgstr "実行"
 msgid "editors_featured_remove_feature"
 msgstr "注目�アドオンを削除"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "レビュー待�を�件�絞り込�"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "�考リンク"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "エディタ��ガイド"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "アドオン�リシー"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "�れら�フィルタ���在�セッション中���クリアを�択�る���用�れ�"
 "�。"
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "�在レビュー待�� %s アドオン��り��ん。"
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 æ—¥"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 時間"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 分"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "エディタ用コントロールパ�ル"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s 専用"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "正�リリース��アドオン"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s ��互�性"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "アドオンも���作者�メールアドレス"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "アドオン�種類"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "アプリケーション"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "最大�ージョン"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "プラットフォーム"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "登録�ら�期間 (日数)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "絞り込�検索��果: <strong>%1$s</strong> 個�アドオン"
-msgstr[1] "絞り込�検索��果: <strong>%1$s</strong> 個�アドオン"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "クリア"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "フィルタ"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "�在レビュー待��中止�れ����。後日���ェック������。"
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "アイテムを編集"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "アイテム�履歴"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "アイテム�ホームページ"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "アイテム�概�"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "プレビュー"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "レビューアクション"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "より詳��情報を求�る"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "公開ページ�掲載"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "スーパーレビューを申請"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "サンドボックス��留"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "レビュー担当者�コメント"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "作者�より詳��情報を求�る����フォームを使用������。作者��メー"
 "ル��られ����回答を行�るよ���り��。返信������������も"
 "メール�よる通知��られ��。"
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "アドオン����最新�ージョン�最新ファイル�公開を承����。今後��ー"
 "ジョン��エディタ�よるレビューを��る���サンドボックス�置�れ��。"
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "アドオンをサンドボックス��留���。"
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "公開済�アドオン�サンドボックス��る�ージョンを公開ページ�掲載���。"
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "公開済�アドオン�サンドボックス��る�ージョンを�����留���。"
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "アドオン�セキュリティや著作権�������管�者�よる調査を必���るよ�"
 "�懸念��る場���下�欄�コメントを入力������。��内容��作者��"
 "��管�者��られ��。"
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "公開�れ��る�ージョン�比較"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "コメントを表示"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "作者:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "カテゴリ:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "互�性:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "説明"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "作者�コメント"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "ファイル:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "履歴"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "公開申請メッセージ"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "プレビュー画�"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "プライ�シー�リシー"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s をレビュー"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "レビュー担当者��注�"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "概�"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "�ージョン�説明"
 
@@ -4952,7 +4561,7 @@ msgstr "申請を承� (一般�公開)"
 msgid "editors_review_history_nominated_denied"
 msgstr "申請を�下 (サンドボックス��留)"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�れ���レビューを����ージョン��り��ん。"
 
@@ -4979,90 +4588,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "返信を表示・隠� (%1$s)"
 msgstr[1] "返信を表示・隠� (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "アプリケーション:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "���定型文を�択������:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "コメント:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "OS:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "トップ"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"注�: �択������ファイルをテスト��場������以上�ファイルをレ"
-"ビュー������。"
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "次� &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "プレビュー画���り��ん。"
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; ��"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "レビュー待�"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "レビュー待�アドオン: %2$s 件中 <strong>%1$s</strong> 件目"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "レビュー待� %2$s 件中� <strong>%1$s</strong> 件目 (フィルタ�用済�)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "アクションを実行"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "アクション"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "コメント"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日付"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "レビュー担当者"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "�ージョン・ファイル"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "次回��アドオン�更新�れ����メール�よる通知を���る (��後�更新時"
 "��メール��られ��ん)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "レビュー�完了����。"
 
@@ -5086,7 +4684,7 @@ msgstr "アクション"
 msgid "editors_reviews_in_reply_to"
 msgstr "��メッセージ��返信:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "レビュー�完了����。"
 
@@ -5098,79 +4696,87 @@ msgstr "担当���るレビュー��り��ん。"
 msgid "editors_reviews_submit_process_reviews"
 msgstr "レビュー処�を実行"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "特定�サイト用"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "新�"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "æ›´æ–°"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "テストを行��アプリケーション"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "テストを行�� OS"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "備考"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "アドオン"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "種類"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "アドオン�種類"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "期間"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "アプリケーション"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "ロケールを�定����？"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "待�時間"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "昇順�並�替�"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "プラットフォーム"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "�順�並�替�"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "申請�種類"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s æ—¥"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s 時間"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "アクセス�拒��れ���"
 
@@ -5178,18 +4784,17 @@ msgstr "アクセス�拒��れ���"
 msgid "error_access_denied_message"
 msgstr "��ページを表示�る権���り��ん。"
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "アドオン�既�存在����"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5198,14 +4803,11 @@ msgstr "アドオン�既�存在����"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "該当�るアドオン��り��ん。"
 
@@ -5217,53 +4819,58 @@ msgstr "��アドオン��在表示����ん。"
 msgid "error_addon_selfreview"
 msgstr "自分�アドオンをレビュー�る�������ん。"
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "��カテゴリ����アドオン�登録�れ����ん。"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "アドオン�フィード�見��り��ん���。"
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "メールアドレス�形��正���り��ん。"
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "��項目�必須��。"
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "ファイル��り��ん。"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "ファイルエラー: %s �存在���ん。"
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "入力内容�エラー��り��。確��上��度�信������。"
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "�正� captcha ��。も�一度入力������。"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "�� URL ��正�形���。有効� URL � http://example.com/my_page �よ��"
@@ -5271,46 +4878,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "引数��足�����: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "ファイル��り��ん"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "注�"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "プレビュー画���り��ん。"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "評価を�択������。"
 
@@ -5318,46 +4913,38 @@ msgstr "評価を�択������。"
 msgid "error_user_already_confirmed"
 msgstr "��ユーザアカウント�確��完了�����。"
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "�正�確�コード��。"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "パスワード�一致���ん。"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "��メールアドレス�既�他�ユーザ�使�れ����。"
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "メールアドレス�変更�時間切れ��り���。ユーザプロフィール�ら�度アドレ"
 "スを変更���確��メール�届��ら����本文中�リンクをクリック����"
 "��。"
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"ユーザ�割り当�られるロール�一度��������。続�る���既存�ロール"
-"�らユーザを削除������。"
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "��ニック�ーム�既�他�ユーザ�使�れ����。"
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "該当�るユーザ�見��り��ん。"
 
@@ -5365,42 +4952,39 @@ msgstr "該当�るユーザ�見��り��ん。"
 msgid "error_user_unconfirmed"
 msgstr "����メール������コード�アカウント��証を行������。"
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "ユーザ����パスワード�正���り��ん。"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "�ージョン��り��ん。"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "入力�れ�パスワード�正���り��ん。"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "詳細"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s �詳細"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "レビュー (%1$s)"
 msgstr[1] "レビュー (%1$s)"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "��カテゴリ�他�アドオンを見る:"
 
@@ -5439,39 +5023,38 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 msgid "footer_a_about"
 msgstr "��サイト����"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 msgid "footer_a_blog"
 msgstr "ブログ"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 msgid "footer_abbr_faq"
 msgstr "よ��る質�"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "All rights reserved."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "クレジット"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla Add-ons �登録�れ��るアドオン��リンク��Mozilla �便宜的��供"
@@ -5479,96 +5062,91 @@ msgstr ""
 "負���ん。アドオン�関�る��見や�質���れ�れ�作者���願�����"
 "�。"
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "変更"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
-msgstr "法的通知"
+msgstr "�責事項"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "他�言語:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "プライ�シー�リシー"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "�存"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "スペル�ェック辞書"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "スペル�ェック辞書"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "拡張機能"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "拡張機能"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "言語パック (アドオン)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "言語パック (アドオン)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "言語パック (アプリケーション)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "言語パック (アプリケーション)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "プラグイン"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "プラグイン"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "検索エンジン"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "検索エンジン"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "テーマ"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "テーマ"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "����ロケール"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "%1$s Add-ons �ホームページ�戻る"
@@ -5577,86 +5155,37 @@ msgstr "%1$s Add-ons �ホームページ�戻る"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "他�アプリケーションメニュー�スキップ"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "カテゴリメニュー�スキップ"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "メインコンテンツ�スキップ"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "検索フォーム�スキップ"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "アドオン"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "ログイン"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "ログアウト"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "アカウント"
 
@@ -5664,69 +5193,49 @@ msgstr "アカウント"
 msgid "header_navlink_register"
 msgstr "ユーザ登録"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">ユーザ登録</a> / <a href=\"%2$s\">ログイン</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "ツール"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s �プレビュー画�"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "��実験的�アドオンをインストール�る�� <a href=\"%1$s\">ログイン</a> ��"
 "����。<a href=\"%2$s\">詳細</a>"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"��実験的�アドオンをインストール���。<a href=\"%1$s\">�れ�何？</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "%s %s �インストール"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s を %2$s �インストール"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s をダウンロード"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "��アドオン�利用����ん。"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "言語パック�スペル�ェック辞書�一覧��。"
 
@@ -5738,8 +5247,8 @@ msgstr "辞書をダウンロード"
 msgid "langtools_download_langpack"
 msgstr "言語パックをダウンロード"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "スペル�ェック辞書�言語パック"
 
@@ -5751,72 +5260,36 @@ msgstr "辞書をインストール"
 msgid "langtools_install_langpack"
 msgstr "言語パックをインストール"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "スペル�ェック辞書"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "言語パック"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "言語"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "独自ライセンス"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License �ージョン 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License �ージョン 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License �ージョン 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License �ージョン 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License �ージョン 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "トップページ�戻る����をクリック������。"
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "æ›´æ–°æ—¥"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "ダウンロード数"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "タイトル"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "評価"
@@ -5841,20 +5314,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "スペル�ェック辞書�言語パック"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "プラグイン"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "テーマ"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "他�アプリケーション用�アドオンを探�"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "��他"
 
@@ -5862,29 +5342,12 @@ msgstr "��他"
 msgid "page_title_appversions"
 msgstr "アプリケーション��ージョン"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "アドオンコレクター"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "アドオンコレクター� FAQ"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "アドオンコレクター�機能"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "アドオンコレクター�よ���"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "クレジット"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "開発者�� FAQ"
+msgid "page_title_experimental_addons"
+msgstr "実験的�アドオン"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5914,15 +5377,15 @@ msgstr "サンドボックスレビューシステム"
 msgid "page_title_submissionhelp"
 msgstr "申請�関�るヘルプ"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "正��アプリケーション��ージョン"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Mozilla Add-ons �登録�るアドオン���以下�アプリケーション���少���"
@@ -5930,7 +5393,7 @@ msgstr ""
 "ケーション�も�以下�表記�れ��ージョン��指定�能��。"
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5940,15 +5403,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "��ら�ページ"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "�ージョン"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "��ページ�戻る"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "サンドボックス�関�る情報"
 
@@ -5956,6 +5422,12 @@ msgstr "サンドボックス�関�る情報"
 msgid "pagination_next_page"
 msgstr "次�"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "�在 %2$s ページ中 %1$s ページ目を表示�����"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "��"
@@ -5990,15 +5462,15 @@ msgstr ""
 "も��れ�分�り�ら�場���<a href=\"%1$s\">別��語を試�</a> ��代�り"
 "� <a href=\"%2$s\">音声���</a> ��も����。"
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "����人間���？"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "�れ�何��ょ�？"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "��レビューを通知�る際�エラー�発生�����"
 
@@ -6006,7 +5478,7 @@ msgstr "��レビューを通知�る際�エラー�発生�����
 msgid "review_flag_reason_bug_support"
 msgstr "場����グ報告���サ�ートリクエスト"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "��レビューを報告 (�由を�択������)"
 
@@ -6022,8 +5494,8 @@ msgstr "��他 (具体的�書������)"
 msgid "review_flag_reason_spam"
 msgstr "スパム�る����他レビュー�無関係�内容"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "�り��������。��レビュー�エディタ�通知�れ���。"
 
@@ -6038,7 +5510,7 @@ msgstr ""
 "��エディタ�通知������。"
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>レビューを書�際�以下���を念頭�置������。</p><ul><li>アドオン�"
@@ -6055,125 +5527,101 @@ msgstr ""
 "���。"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s �レビュー"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "注目�アドオン"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "最近公開�れ�アドオン"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "人気�アドオン"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "最近更新�れ�アドオン"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "検索"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "コレクション�検索�果"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "コレクション�検索�果"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "�在�検索機能�利用����ん。��後��試�����。"
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "���"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "����コレクション"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "アドオンを検索"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "コレクションを検索"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "アドオンを検索"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "クリック��検索語を入力"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "カテゴリ"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "����検索エンジン"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "検索エンジンをブラウズ"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s 個�アドオン"
+msgstr[1] "%s 個�アドオン"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "該当�るアドオン��り��ん。"
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "アドオン�検索"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "検索�果�フィード"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "%s �検索�果"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�者用ツール"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "開発者用ツール"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "エディタ用ツール"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "よ���"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "よ��� %s �ん"
@@ -6182,7 +5630,7 @@ msgstr "よ��� %s �ん"
 msgid "sidebar_pitch_dictionary"
 msgstr "スペル�ェック辞書"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "�����アドオン"
 
@@ -6190,7 +5638,7 @@ msgstr "�����アドオン"
 msgid "sidebar_pitch_looking_for"
 msgstr "探���るも��"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "最近公開�れ�アドオン"
 
@@ -6198,7 +5646,7 @@ msgstr "最近公開�れ�アドオン"
 msgid "sidebar_pitch_search"
 msgstr "検索プラグイン"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "フィードを購読"
 
@@ -6206,23 +5654,24 @@ msgstr "フィードを購読"
 msgid "sidebar_pitch_theme"
 msgstr "テーマ"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "最近更新�れ�アドオン"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "��評価�れ����ん"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "5 �星��� %s ��評価を������"
@@ -6259,13 +5708,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%b %eæ—¥ (%a)"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s 作�"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s 公開"
@@ -6278,179 +5727,179 @@ msgstr "閉�る"
 msgid "statistics_help_link"
 msgstr "ヘルプ"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "����別�アドオンを�択������"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "����統計情報�公開�れ��るアドオンを�択������"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "統計情報を表示�る�������アドオンを����択������"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "統計情報を表示�る���アドオンを�択������"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "統計情報�公開�れ��るアドオンを�択"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "統計ダッシュボード"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "統計を表示"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "��表を CSV 形��表示"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "��"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "��座標を削除"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "グループ化: 1 日"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "グループ化: 1 �月"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "グループ化: 1 週間"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "一定期間�比較: 週��"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "範囲内� %s 件見��り���"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "座標を追加"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "��グラフ�別�座標を追加"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "�計数を隠�"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "�計数を表示"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "��グラフ上��計数を表示�る"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "データを表示 (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "��データ�カンマ区切りファイルをダウンロード"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s �イベントを隠�"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s �イベントを表示"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "座標上�アドオン�リリース日を表示"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox �イベントを隠�"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox �イベントを表示"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "座標上� Firefox �リリース日を表示"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "グラフを縮�"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "グラフを拡大"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "グラフ�サイズを変更"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "1 日�アクティブユーザ数"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "アプリケーション"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "カスタム"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "ダウンロード"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "OS"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "アドオン�状態"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "概�"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "アドオン��ージョン"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "アプリケーション"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "アドオン�状態"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "�明"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "アドオン��ージョン"
 
@@ -6487,7 +5936,7 @@ msgstr "設定�更新�れ���。"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "統計ダッシュボード"
 
@@ -6515,105 +5964,109 @@ msgstr "縮�"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "1 �月分縮�"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s �統計: 1 日�概�"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "概�データ�フィード"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%Yå¹´ %b %eæ—¥ (%a)"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "%1$s �統計"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "�期設定���ダッシュボード�表示�れ��る情報�アクセス��る������"
 "� Mozilla ����。������情報を一般�公開�る��も����。���れ"
 "��誰�も��アドオン�統計情報を見る�������。"
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "ダッシュボード��アクセス権��設定"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "�公開"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "���� Mozilla �����アドオン�統計を表示����"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "公開"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "誰�も��アドオン�統計を表示����"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "設定を変更"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "��情報�機密扱��������。"
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "��ダッシュボード��在 <b>�公開��</b>。"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "��ダッシュボード��在 <b>公開�れ����</b>。"
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "ロック�れ����"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "ダッシュボード�戻る"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "設定を�存"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s �統計ダッシュボード設定"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "ロック解除�れ����"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "アプリ"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "状態"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "�明"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "1 日�平�ダウンロード数"
 
@@ -6625,7 +6078,7 @@ msgstr "ダウンロード"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "最新�数字"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "�去 7 日間�ダウンロード数"
 
@@ -6643,7 +6096,7 @@ msgstr "%1$s 以�"
 msgid "statistics_summary_nodata"
 msgstr "��データ��り��ん"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "1 日�平�アクティブユーザ"
 
@@ -6669,68 +6122,54 @@ msgstr "1 日�平�アクティブユーザ"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s �在"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "今週�日別平�ユーザ数"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "先週�ら�増減: %s"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s �統計"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "����テーマ"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "テーマをブラウズ"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "メールアドレス�変更"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "パスワード�変更"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "パスワード���メールアドレスを変更"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "確�コードを��信����。"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "����ユーザアカウント %1$s �正常�削除�れ���。後日��ログイン�必�"
 "��������<a href=\"%2$s\">ユーザ登録ページ</a> �ら�登録�����"
 "�。"
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Mozilla Add-ons コミュニティ���������る�を残念�����。"
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "パスワードを�度入力"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "今��ユーザアカウントを削除"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "���� <a href=\"%1$s\">アドオン�作者</a> ���登録�れ��る場��アカウ"
@@ -6739,80 +6178,80 @@ msgstr ""
 "��れ�����アカウント�削除��能��り��。"
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "他�質���る場���%1$s ������������。"
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "アカウントを削除�る���「了解�������ェックを入れ�����。"
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "��ステップを進�る���パスワードを正��入力������。"
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "アカウント�削除中�予期��エラー�発生����。%1$s ���題�起����を"
 "�報告����れ��アカウントを削除���������。��便を�����申"
 "�訳�り��ん。"
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "アカウント�削除を確�"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "ユーザアカウント %1$s を削除"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "�よ��ら�"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "今後 Mozilla Add-ons �ログイン�る�������ん。"
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "「削除�をクリック�る������アカウント� <strong>永久�削除</strong>�"
 "れ��。�れ���り�"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "����投稿��レビューや評価�削除�れ��ん�������関連付��失�れ"
 "��。"
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "����何�手助���る具体的��題��る場���今���アカウントを削除�"
 "����%1$s ������������。�題を解決��るよ����る�り�サ"
 "�ートを行���。"
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "��ステップ��り消�����を了解����。"
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "ユーザを削除"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "メールアドレス�変更を��付�る���%1$s ���確��メールを�信����。"
 "変更を完了�る���メール本文�記載�れ��るリンクをクリック������。"
 "�れ����今�使��メールアドレス�ログイン�能��。"
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "ユーザアカウントを削除"
 
@@ -6839,7 +6278,9 @@ msgstr ""
 "-- %2$s Add-ons スタッフ一�"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "%2$s Add-ons �登録�れ��る����メールアドレスを変更�るリクエスト�行�"
@@ -6880,107 +6321,90 @@ msgstr ""
 "�利用�り��������。\n"
 "-- %2$s Add-ons スタッフ"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "%s Add-ons �パスワード変更"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "エラー�"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "%1$s Add-ons 登録メールアドレス変更�確�"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "�功�"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "メールアドレス�変更�完了����。今後ログイン�る際� %1$s �アドレスを使"
 "用��������。"
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "自分����"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"も�よ���れ��コミュニティ����自己紹介������� ���入力��文"
-"章�����ユーザ情報ページ�公開�れ��。改行������状態�表示�れ�"
-"���HTML �使用����ん。"
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "新��パスワードを�入力"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "自分�作���コレクションをユーザプロファイル�表示�る"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "自分��気�入り�コレクションをユーザプロファイル�表示�る"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "%s �プロフィールを編集"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "メールアドレス"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "� (例: Taro)"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "メールアドレスを公開���"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Web サイト URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "姓 (例: Yamada)"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "ログイン"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "新��パスワード"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "ニック�ーム"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "�在�パスワード"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "他�アクション"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "パスワード"
 
@@ -6988,64 +6412,64 @@ msgstr "パスワード"
 msgid "user_form_registration"
 msgstr "ユーザ登録"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "��コンピュータ�ログイン情報を�存�る"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "サンドボックスを表示"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "�存"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "ログイン"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "登録"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons ��ユーザ登録日"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "ユーザアカウントを作�"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "アドオン�互�性 (強��勧����)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "今後開催予定�イベント�コンテスト"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "今���������設定�能�通知��り��ん。"
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Mozilla ��時々�リリース予定やアドオン関連イベント�����メールを��り"
 "���。����興味��るトピックを以下�ら�������。"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla ����サイト�登録�れ�アドオン�関�る具体的�事柄�������"
 "��個別�連絡を�る権利を留����。"
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "変更�れ�内容�エラー��り��。確��上��度�信������。"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "プロフィール�更新�れ���。"
 
@@ -7058,16 +6482,16 @@ msgstr "%s �パスワード変更"
 msgid "user_pwreset_header"
 msgstr "パスワード�変更"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "パスワードを忘れ�場�"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "登録�れ��るメールアドレス�パスワード変更����リンクを�信����。"
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "パスワード�変更�完了����。"
 
@@ -7079,7 +6503,7 @@ msgstr "パスワードを変更"
 msgid "user_pwreset_submit_sendlink"
 msgstr "パスワード変更����リンクをメール��信"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7094,7 +6518,7 @@ msgstr ""
 "クリック������。"
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7106,22 +6530,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "確�メールを��信"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "�り��������。ユーザアカウント�登録�完了����。"
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>一般�公開�れ��るアドオンをダウンロード�インストール�る����れ��"
-"AMO ��ユーザ登録�<strong>必��り��ん</strong>。</p><p>登録�必����"
-"以下�場�����。</p><ul><li>アドオン�レビューを投稿���場�</li><li>ア"
-"ドオン�開発者��自分�アドオンをアップロード�� AMO �掲載���場�</"
-"li></ul><p>ユーザ登録�行�れる��入力�れ�アドレス���確�����メール"
-"��られ��。���書�れ�手順�従��アカウント�確�を行������。</"
-"p><p>�希望�ら�Mozilla � <a href='%1$s'>法的通知</a> � <a href='%2$s'>プ"
-"ライ�シー�リシー</a> を�覧������。"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7132,28 +6544,20 @@ msgstr ""
 "��。必��応���上�書�れ�メールアドレス� %1$s ����。"
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "�登録�り��������。%1$s �よ����"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "addons.mozilla.org (AMO) �よ����"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "��姓�も���ニック�ーム�入力�必���。"
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "コレクション"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "通知"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "ユーザプロフィール"
 
@@ -7161,63 +6565,50 @@ msgstr "ユーザプロフィール"
 msgid "user_verified_okay"
 msgstr "�証�完了����。"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "ユーザアカウントを削除"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "ユーザアカウント�編集"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "自分����"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s �作���アドオン"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "��"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "ユーザプロフィール"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "%s �作���コレクション"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "メールアドレス"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "�気�入り�コレクション"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "ホームページ"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "ニック�ーム"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s �プロフィール"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "%s �レビュー��アドオン"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "ログイン"
 
@@ -7248,104 +6639,3 @@ msgstr "パスワード�変更"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "ユーザ登録"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "%1$s %2$s �ソースコードライセンス"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "最近追加�れ�アドオンを���見る"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "人気�アドオンを���見る"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "評価�高�アドオンを���見る"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "次�アドオン"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "��アドオン"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "�����ージョン履歴"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "最近公開�れ�アドオン:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "人気�アドオン"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "�����アドオン"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "最近更新�れ�アドオン:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "���見る"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "����"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "評価順"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "最終更新順"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "人気順"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "読�込�中"
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "詳細を表示"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "ユーザ�よるレビュー�必���。(外部サイト�レビュー�も�)"
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "新�"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "æ›´æ–°"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "公開�ら�期間"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "アドオン�種類"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "アプリケーション"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "プラットフォーム"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "申請�種類"
-
-#~ msgid "forum_save"
-#~ msgstr "�存"
-
-#~ msgid "home"
-#~ msgstr "ホーム"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "プラグイン"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "�在 %2$s ページ中 %1$s ページ目を表示�����"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s 個�アドオン"
-#~ msgstr[1] "%s 個�アドオン"
diff --git a/site/app/locale/ko/LC_MESSAGES/messages.po b/site/app/locale/ko/LC_MESSAGES/messages.po
index 3a1025c..0e01e45 100644
--- a/site/app/locale/ko/LC_MESSAGES/messages.po
+++ b/site/app/locale/ko/LC_MESSAGES/messages.po
@@ -16,172 +16,163 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "설치 취소"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "%s 다운로드"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "�� � 다운로드"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "�� � 설치"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "공개"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "샌드박스"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "최근 변경� %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "버전 %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "다운로드"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "� 다운로드 수"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "주간 다운로드 수"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" 부가 기능"
 msgstr[1] "%1$s \"%2$s\"부가 기능"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "페�지 당"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "분류 방�"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "테스트용"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "추천"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s� %2$s� 사용할 수 없습니다."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "%1$s �아가기."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "�가 화면으로 �아가기..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "별�:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "�가:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "�가 완료"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "%s �가 추가"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "제목/요약:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "삭제"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "답변"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "현재 �가를 삭제하시겠습니까?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "아니오"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "예"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "�가 삭제"
 
@@ -190,7 +181,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "�가 항목� 삭제하였습니다."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s �가 수정"
@@ -205,19 +196,19 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "주� 사항: 보내 주신 �가를 실제 사�트� 보�기 전� 편집�� �한 �가가 진"
 "행 �니다."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "개발� 답변:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -236,32 +227,47 @@ msgstr "%s� 대한 �가"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "답변�: %1$s 날짜: %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "개발� 답변:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "�가 결과가 성공�으로 저장�었습니다. �사합니다!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "검토�: %1$s,  검토�: %2$s"
 
 # %1 is the (localized) date, y is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "- %2$s/ %1$s (별�: %3$d)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "�세 URL"
@@ -270,29 +276,28 @@ msgstr "�세 URL"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "확�"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "개발� 프로필 보기"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s를 보기"
@@ -301,115 +306,63 @@ msgstr "%s를 보기"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "�가 추가"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "고급 사항"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "분류"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "세부 리뷰"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "나�"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "�가 편집"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "� 부가 기능� 개� 정보 정책� 가지고 있습니다."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "매우 나�"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "다른 연결 방법"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "홈페�지"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�가"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "기술 지�"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "보통"
 
@@ -417,26 +370,22 @@ msgstr "보통"
 msgid "addons_display_long_description"
 msgstr "�세 설명"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "좋�"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "스�린샷 �보기"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -446,14 +395,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -465,7 +414,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -476,7 +425,7 @@ msgstr ""
 "하거나 향후 변경 내역� 받거나 할 수 없�� 양지해 주십시오."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -486,15 +435,16 @@ msgstr ""
 "�� 개발��게 전달 �지 않기 때문� 개발�가 �접 여러분�게 연� 하거나 향"
 "후 변경 내역� 받거나 할 수 없�� 양지해 주십시오."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "�가 하기"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "매우 좋�"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "리뷰를 �는 란� 버그 리�트를 올리지 마십시오. 여러분� �메� 주소를 개발�"
@@ -503,47 +453,52 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">리뷰 가�드��</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "부가 기능� 대한 지�� 얻으시려면 <a href=\"%1$s\">고� 지�</a> 항목� 살"
 "펴 보십시오."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "저장"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "전체 %1$s 분류 부가 기능 보기"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "전체 �가 보기 (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "모든 버전 보기"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "모든 버전 정보 기�"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "소스 보기"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "통계 보기"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "여러분� �견� 어떠세요?"
 
@@ -551,226 +506,108 @@ msgstr "여러분� �견� 어떠세요?"
 msgid "addons_display_workswith"
 msgstr "공� 작업:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr " / "
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "추천 부가 기능"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "부가 기능� %1$s를 확장하여 좀 � 멋진 나만� 웹 브�우징� �와 �니다.다양"
 "한 부가 기능� 통해 %1$s를 나만� 것으로 바꾸어 보세요!"
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "최신 버전: "
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "기타 프로그램"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Firefox 부가 기능"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "�기 부가 기능:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "추천 부가 기능:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "최근 업��트:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "모� 보기"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "새로 올�온 부가 기능 보기"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "전체 �기 부가 기능 보기"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "전체 추천 부가 기능 보기"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "최근� 업��트한 부가 기능 보기"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -778,12 +615,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>��를 선�한 후 오른쪽 버튼� 눌러 \"새 �름으로 �� 저장...\"� 선"
@@ -791,53 +628,50 @@ msgstr ""
 "기능� �릭하여 jar 파�� 엽니다.</li><li>설치 버튼� 누르고 다운로드한 파�"
 "� 선�한후 \"확�\"� 누르면 �니다.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Thunderbird 설치 방법"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "테스트 중� 부가 기능 보기"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "전송"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr " / "
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "리눅스용"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "맥 OS X용"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "윈�우용"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
 "현재 페�지는 가장 많� 사용�는 플러그�만 모아�었습니다.Mozilla 기반 웹 브"
 "�우저�서 구� 가능한 플러그�� 대한 정보는%1$s를 방문하십시오."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "찾으시는 플러그�� 없습니까?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "플러그�� 브�우저가 특별한 기능� 수행하는� �움� �니다.�미지를 보여 주"
@@ -845,24 +679,24 @@ msgstr ""
 "서 확장 기능과 조금 다릅니다."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Mozilla Firefox용 플러그�"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "플러그�"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "문서 정보"
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -870,41 +704,36 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 미리 보기"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "수 천여개� 부가 기능 중�는 당신�게 �합한 부가 기능� 있습니다. 가장 �기"
 "있는 부가 기능들 중� 골�서 사용해 보십시오!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "추천 부가 기능"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "추천 부가 기능"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "부가 정보"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 개발� 센터"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "죄송합니다. � 검색 플러그�� 설치하시려면 Firefox와 같�Mozilla 기반 웹 브"
@@ -919,44 +748,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "%2$s�서 %1$s 방법 �히기"
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/ko/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "개�화"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "%1$s�서 검색 엔진 찾기"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "검색 엔진"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "Firefox 검색 엔진 작업� 위해 수고해 주신 Mycroft��사 드립니다."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1001,19 +829,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1024,38 +852,26 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "�세 정보 보기"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "구 버전 주�"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "현재 버전들� 테스트 � 참조용으로 제공�니다.최신 부가 기능� 사용하고 있습"
 "니다."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "버전별 변경 사항"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 버전 기�"
@@ -1090,124 +906,112 @@ msgstr "그룹 관리�"
 msgid "admin_group_saved"
 msgstr "그룹� 저장함"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "고급 검색"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "모든 시간"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "모든 형�"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "모든 버전"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "애플리케�션"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "검색어만 찾기"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "최근 업��트"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "�름"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "최신"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3개월간"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6개월간"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "하루전"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "한달간"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "한주간"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "�년간"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "페�지당"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "플랫�"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "�기�"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "별�"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "분류 방�"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr " - "
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "고급 검색 모드 바꾸기"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "형�"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "버전"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "버전 확� 무시"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Firefox �전 버전� 위한 부가 기능"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1215,343 +1019,41 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">�전 버전</a> 사용 가능"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "부가 기능� 사용하려면 <a href=\"http://getfirefox.com\">Firefox 업그레�드</"
 "a>를 하세요."
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "부가 기능 �름순"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "최신 부가 기능순"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "�기 부가 기능순"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "부가 기능 별� 순"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "최근 업��트순"
 
@@ -1560,863 +1062,48 @@ msgid "categories_current_title"
 msgstr "현재 분류"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "분류"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "분류 선�"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "모든 추천 부가 기능 보기"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "높� �수 순"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "최근 업��트 순"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "�기 순"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "모� 보기- %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2424,71 +1111,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2497,26 +1184,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2524,107 +1211,107 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "기여� 정보를 � 보시려면 %s� 참고하세요."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "위키 페�지"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla 커뮤니티�서는 수년 간 addons.mozilla.org 프로�트� 기여한 분들�"
 "게  �사를 드립니다."
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "개발�"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "편집�"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "번역�"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "기타 기여�"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "�전 개발�"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "소프트웨어 � �미지"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "�부 아�콘 정보 <a href=\"http://www.famfamfam.com/lab/icons/silk/"
@@ -2632,7 +1319,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 ��"
 "센스</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2645,20 +1332,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%x"
 
@@ -2694,25 +1378,25 @@ msgstr "�용 통계"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2721,6 +1405,17 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(�� �지)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"현재 부가 기능 버전� Firefox %1$s와 호환�지 않습니다. Mozilla�서는 새 "
+"Firefox 버전� 출시하고� 하며 부가 기능� 호환 가능한 새 버전�서 테스트 하"
+"십시오. �세한 사항� <a href=\"%2$s\">관련 정보</a>�서 얻� 수 있습니다. "
+"본 주� 사항� 현재 버전� addons.mozilla.org� 전송하기 전� 제공 합니다."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "새 창 열기"
@@ -2757,76 +1452,141 @@ msgstr "단계 5: 완료"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "제출 �움�"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "부가 기능 정지 �태"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "부가 기능 편집"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "부가 기능 �용 �태"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "부가 기능 설명"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "부가 기능 홈페�지"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "부가 기능 �름"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "정보 미리 보기"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "개� 정보 보호 정책"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "부가 기능 요약"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "�메� 주소"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "홈페�지 주소"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "버전 정보"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "부가 기능 추천하기"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "부가 기능 추천 완료"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2862,7 +1622,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2872,6 +1632,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2883,13 +1648,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2899,7 +1664,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2909,12 +1674,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2923,14 +1688,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3009,13 +1774,125 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"제출한 부가 기능� 수정 하시려면 %1$s 페�지로 거거나 개발� 제어�으로 �어"
+"가려면%2$s 를 �릭하세요."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "여기"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "부가 기능 편집"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"현재 � 버전� Mozilla 부가 기능 편집� � 테스터로 부터 �가를 받기 위해 "
+"Sandbox� 위치하고 있습니다. 그 다� 단계로 들어서면 �메�� 받으시게 �니"
+"다."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Sandbox �가 체계� 대해서는 %s를 살펴 보세요."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "여기"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"� 버전� 기존 사용�를 위해 Sandbox� 위치해 있습니다. 웹 사�트� 공개하시"
+"려면 %s를 눌러 �가 과정� 거치시기 바�니다."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "공개 추천"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "부가 기능 제출� 완료하였습니다."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "본 부가 기능� �미 신뢰�어 ��으로 웹 사�트� 공개 합니다."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "부가 기능 제출"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "부가 기능 정보 변경 완료"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "부가 기능� 대한 관심� 높히려면 %s를 하시면 �움� �니다."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "미리보기 업로드"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "개발� 없� [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "제거"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "취소"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "현재 제출하신 내용� 취소하시겠습니까?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "다�"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "부가 기능 형� 변경:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "개발� 정보가 업��트 �었습니다."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3092,37 +1969,178 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "미리 보기 추가"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "개발�"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "복수 개발�"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "없�"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "세부 분류"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "세부 분류"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "설명"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "사용 안함"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "�세 정보"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "개발� 정보"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "미리 보기"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "버전"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "홈페�지"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "없�"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "정보 없�"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "미리 보기가 없습니다."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "업��트"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "기술 지� �메� 주소"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "기술 지�용 �메� 주소가 없습니다."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "기술 지� 홈페�지"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "기술 지�용 홈페�지가 없습니다."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "신뢰함"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "버전 %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "버전 정보가 없습니다."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "취소 � �아가기"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "��, 사용안함"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "본 부가 기능� 사용하지 않� �태로 바꾸시겠습니까?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"현재 부가 기능� 사용 안함으로 변경 하면 모든 목� � 검색� 나타나지 않습니"
+"다. 본 웹 사�트�서 다운로드 할 수 없으며 업��트 확� 작업� 진행�지 않습"
+"니다. 향후 다시 사용함� 설정하��� 실제로 삭제 가능성� 있습니다."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "%s 사용 안함"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "��, 사용함"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "본 부가 기능� 사용 �태로 바꾸시겠습니까?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"부가 기능� 사용함으로 변경하면 검색 결과 � 목�� 표시�니다. 웹 사�트 � "
+"버전 업��트를 통해 바로 다운로드 가능 합니다."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "%s 사용 함"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3176,62 +2194,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "개발� 추가"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "개발� �메� 주소"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "제거"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3244,30 +2274,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3346,22 +2376,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3370,12 +2400,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3383,12 +2413,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3397,24 +2427,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3422,7 +2452,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3447,42 +2477,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "본 부가 기능 형��는 분류 항목� 없습니다."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "개발�"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "아�콘 추가"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "아�콘 변경"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "온��으로 소스를 볼 수 있는 사용�"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "분류"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "기본 언어"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "� 부가 기능� 외부 프로그램� 필요합니다."
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "현 아�콘 삭제"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "새 아�콘 파�"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "아�콘"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "부가 언어 정보"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "출시 전"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "사�트 기반 부가 기능"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "기본 언어"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "부가 정보 (예, 지역명)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3490,12 +2585,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3503,60 +2598,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3565,32 +2660,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3598,22 +2693,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3621,12 +2716,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3634,39 +2729,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "업��트"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">언어별 코드</"
+"a>, 예) 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3756,14 +2861,70 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "업��트 대기 (1개)"
 msgstr[1] "업��트 대기 갯수 (%s개)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "체�� 파�� 삭제합니다."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "파�"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "지� �용 프로그램"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "파�� 없습니다."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "�가� 노트"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "업��트"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "� 부가 기능� 접근할 수 없습니다."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"요약� 최대 250� �� 사용할 수 없습니다.\n"
+"(ë‚´ìš©: %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"부가 기능 �름� �미 존재 합니다. 다� 사항� 확�해 보시기 바�니다. <br /"
+"><li>GUID 확�: 대부분 GUID와 부합하지 않는 �러가 나타납니다. </li><li>��"
+"터베�스� 중복 항목� 없습니다. 그러면  그 항목� 업��트 하거나 삭제해야 "
+"만 합니다.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3777,10 +2938,9 @@ msgstr "참고 �료는 %s를 보십시오."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "현재 페�지"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "현재 부가 기능� 변경 사항� �어 주시기 바�니다."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3799,6 +2959,10 @@ msgstr ""
 "� 파� 확장�는(%s)는 부가 기능� 사용할 수 없습니다. 아래 중 하나를 사용하"
 "세요: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "GUID 값� 호출�지 않�"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "5개 �� 분류를 선�할 수 없습니다."
@@ -3833,7 +2997,14 @@ msgstr ""
 "� 파� 확장�(%s)는 아�콘� 사용할 수 없습니다. 아래 중 하나를 사용하세요: "
 "%s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "� 부가 기능� 현재 버전 (%s)� �미 존재 합니다."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf가 업습니다."
 
@@ -3841,7 +3012,7 @@ msgstr "install.rdf가 업습니다."
 msgid "devcp_error_install_manifest"
 msgstr "부가 기능 내 install.rdf가 없습니다:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "부가 기능 형�� 선�해 주십시오."
 
@@ -3911,6 +3082,18 @@ msgstr "부가 기능� install.rdf�서 ID를 찾� 수 없습니다."
 msgid "devcp_error_no_platform"
 msgstr "플랫�� 선�하지 않�"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "후부 추천� 위해 필요 항목� 채워 주셔야 합니다."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "아� 출시하지 않� 부가 기능� 추천할 수 없습니다."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Sandbox�서 현재 부가 기능 공개를 추천할 수 있습니다."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "하나 ��� 분류를 선�하세요."
@@ -3928,6 +3111,16 @@ msgstr ""
 "� 파� 확장� (%s)는 미리 보기� 사용할 수 없습니다. 아래 중 하나를 선�하세"
 "ìš”: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "��터 저장 중 오류가 발�했습니다."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "� 부가 기능� 업��트할 권한� 없습니다."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3940,98 +3133,291 @@ msgstr ""
 "부가 기능� 외부 updateURL� 사용해서는 안�니다. install.rdf�서 지운 후 다"
 "시 시�해 주세요."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "파�� 업로드 해 주십시오."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "다른 플랫� 파� 추가"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "개발� 추가"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "제거"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "새 부가 기능� 대한 분류 형�� 다� 단계�서 입력할 수 있습니다."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "� 부가 기능� 대한 사용 가능한 분류가 없습니다."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "부가 기능� 대한 설명� 입력하세요."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "부가 기능 �름� 입력하세요."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "부가 기능� 대한 형�� 선�하세요."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "부가 기능� 대한 요약 정보를 입력하세요."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "부가 기능 파�"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "부가 기능 파� 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "부가 기능 파� 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "부가 기능 형�"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "사용�가 소스 코드를 온���서 열람 가능"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "개발� �메� 주소"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "개발�"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "분류"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "기본 언어"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "설명"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "�반 사용� 약관 (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "� 부가 기능� 외부 프로그램� 필요함"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "파�"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "홈페�지"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "아�콘 파�"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "�름"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "지� 플랫�"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "미출시 �태"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "개� 정보 보호 정책"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "웹 사�트 기반 부가 기능"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "요약"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "기술 지� �메� 주소"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "기술 지� 홈페�지"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "지� �용 프로그램"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "버전"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "버전 노트"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "없�"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "�가� 노트"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "부가 기능� 신뢰�었으므로 현재 버전 위치를 정하십시오:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "공개"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "개발� 약관"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "단계 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "파� 업로드"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "단계 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "부가 기능 �세 정보"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "단계 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "버전 �세 정보"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "단계 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "지역화"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "단계 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "완료"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "나� 부가 기능"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "번역 항목"
@@ -4048,12 +3434,12 @@ msgstr ""
 "� 나타납니다."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "관리� 제어�"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "편집� 제어�"
 
@@ -4062,28 +3448,28 @@ msgid "devcp_myaddons_link"
 msgstr "나� 부가 기능"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "첫화면으로 �아가기"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "통계 대시보드"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "부가 기능 제출"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "개발� �구"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4095,27 +3481,39 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "�세 정보로 �아가기"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s 추천"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "부가 기능 형� �� ��: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4129,6 +3527,21 @@ msgstr ""
 "현재 미리 보기 기본 설정� 제거하면 다른 미리 보기 그림� ���으로 기본 설"
 "정 �니다."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"현재 부가 기능� 기본 언어 설정(%1$s [%2$s])� 현재 선�한 사용� 언어 설정 "
+"(%3$s [%4$s])과 다릅니다. %1$s�서 아래 항목� 모� 채워야 합니다."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4136,14 +3549,14 @@ msgstr ""
 "현재 그림� 미리 보기 기본 설정으로 하면 �래 미리 보기 그림� ���으로  사"
 "용 정지 �니다."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4172,46 +3585,46 @@ msgstr "미리 보기 편집"
 msgid "devcp_preview_updated_successfully"
 msgstr "미리 보기를 수정하였습니다."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4219,7 +3632,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4236,7 +3649,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "미리 보기 추가"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4245,7 +3658,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "미리 보기 편집"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4258,27 +3671,27 @@ msgstr "미리 보기 파�"
 msgid "devcp_previews_label_makedefault"
 msgstr "현재 그림� 기본 미리 보기로 설정"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4302,18 +3715,26 @@ msgstr "미리 보기 편집"
 msgid "devcp_previews_submit_upload"
 msgstr "미리 보기 업로드"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "형�� 맞지 않습니까?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "� 파�� 삭제하시겠습니까?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "계� 하기 전� 아래 개발� 약관 사항� �어보시기 바�니다."
 
@@ -4324,7 +3745,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4336,6 +3757,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "현재 부가 기능 정보 검토 건너 뛰기"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4439,17 +3864,64 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"현재 부가 기능 등� 기능� 잠시 정지�었습니다. 다�� 시�하시기 바�니다."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "��함"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "�� 안함"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "� 부가 기능� 관리�� �해 사용 정지 �었습니다."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "사용 정지�"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "신뢰�"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "최신 버전:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "등�한 부가 기능� 없습니다. 먼저 %s� 하세요."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "부가 기능 등�"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "테마� 대해 %s를 확� 하세요."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "미리 보기 업로드"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4457,44 +3929,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4504,7 +3976,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4512,64 +3984,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4578,7 +4050,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4590,33 +4062,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4629,29 +4096,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4662,12 +4129,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4691,23 +4158,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4716,7 +4178,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4725,14 +4187,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4742,7 +4204,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4750,7 +4212,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4758,22 +4220,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4792,29 +4248,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "아래 %s를 확�하세요."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "참고 정보"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "버전 업��트를 완료 하였습니다."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4883,34 +4342,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4918,49 +4377,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4970,59 +4424,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5031,26 +4478,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5093,7 +4540,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "부가 기능� 사용할 수 없습니다."
 
@@ -5144,7 +4591,7 @@ msgstr "í•„í„°"
 msgid "editorcp_logs_filter_by"
 msgstr "í•„í„°(type/action)"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "�벤트 로그"
 
@@ -5206,7 +4653,7 @@ msgstr "�가 보기 (%s ~ %s) "
 msgid "editorcp_reviewlog_none_found"
 msgstr "기간 내 제출� �가 항목� 없습니다."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "�가 로그"
 
@@ -5230,24 +4677,24 @@ msgstr "최근 편집� 활� 내역"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "� �가 수"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "부가 기능 �가"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "아래 항목� 모� 채워 주시기 바�니다:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "�가할 파�� 하나 �� 골� 주십시오."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "�신� 부가 기능�는 �가할 수 없습니다."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "외부 프로그램"
 
@@ -5259,39 +4706,39 @@ msgstr "�세 기능 추가"
 msgid "editors_featured_add_feature_submit"
 msgstr "추가"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "�세 기능 추가를 할 수 없습니다."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "�세 기능 추가를 완료했습니다."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "�세 기능� 편집할 수 없습니다."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "�세 기능� 편집하였습니다."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "하나 ��� 언어팩� 유효하지 않습니다."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�세 기능를 지울 수 없습니다."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "�세 기능� 삭제하였습니다."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "부가 기능 �세 정보"
 
@@ -5303,168 +4750,105 @@ msgstr "전송"
 msgid "editors_featured_remove_feature"
 msgstr "�세 기능� 삭제"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "필터 대기"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "유용한 ��"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "편집 가�드"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "부가 기능 정책"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "� 필터들� 세션� 유지�는 �안 사용할 수 있습니다."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "�가할 부가 기능 갯수: %1 개"
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1�"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1시간"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1분"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "편집� 제어�"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s 만 지�"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "출시 전"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s 호환성"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "제거"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "í•„í„°"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "현재 �가 작업� 정지 �었습니다. 다시 확� 바�니다."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "�가 하기"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "공개 하기"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�위 �가 요청"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Sandbox 유지"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "�가 �견"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5472,99 +4856,99 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "부가 기능� 최신 버전� 웹 사�트와 공개하�� 합니다. 향후 새 버전� 다시 "
 "Sandbox�서 편집�� �가를 거치게 �니다."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "부가 기능� Sandbox� 계� 유지 합니다."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "부가 기능� 공개 웹 사�트� 공개하�� 합니다."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "공개� 부가 기능� Sandbox로 옮�니다."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "� 부가 기능�서 보안, 저작권 �슈 등과 같� 염려가 있는 경우 관리��게 �"
 "위 �가를 요청할 수 있습니다. 아래 항목� �견� 입력하시면 개발�가 아닌 관"
 "리��게 전달 �니다."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "공개 버전 비�"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "내용 보기"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "개발�:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "분류:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "호환성:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "설명"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "개발� �견"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "파�:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "항목 기�"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "후보 등� 메시지"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "미리 보기"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "개� 정보 보호 정책"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s �가하기"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "�가� 주� 사항"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "요약 정보"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "버전 노트"
 
@@ -5594,7 +4978,7 @@ msgstr "승�/공개 추천"
 msgid "editors_review_history_nominated_denied"
 msgstr "승� 거부 하기"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�전 �가 사항� 없습니다."
 
@@ -5622,97 +5006,84 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "�용 프로그램:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "내부 �답 선�:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "설명:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "운� 체제:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "위로"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "미리 보기가 없습니다."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "�가 처리함"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "�작 과정"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "�작"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "설명"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "날짜"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "�가�"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "버전/파�"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "�가 작업� 진행 합니다."
 
@@ -5738,7 +5109,7 @@ msgstr "처리"
 msgid "editors_reviews_in_reply_to"
 msgstr "�답 주소:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "�가 내용� 잘 처리�었습니다."
 
@@ -5750,82 +5121,87 @@ msgstr "현재 관리해야할 �가 항목� 없습니다."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "제출 과정 �가"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "사�트 기반"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "신규"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "업��트"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "테스트 완료 �용 프로그램"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "테스트 완료 운� 체제"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "기타 정보"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "부가 기능"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "형�"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "부가 기능 형�"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "나�"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "�용 프로그램"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "언어를 제한 할까요?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "플랫�"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "제출 형�"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s�"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s시간"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s분"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "� 항목� 채워야 합니다."
 
@@ -5833,19 +5209,17 @@ msgstr "� 항목� 채워야 합니다."
 msgid "error_access_denied_message"
 msgstr "� 페�지를 보시려면 권한� 필요 합니다."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5854,14 +5228,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "검색 결과가 없습니다!"
 
@@ -5873,100 +5244,92 @@ msgstr "여기서 부가 기능� 볼 수 없습니다."
 msgid "error_addon_selfreview"
 msgstr "�기가 만든 부가 기능� 리뷰를 올릴 수 없습니다."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "분류 내� 부가 기능� 없습니다!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "�메� 주소가 유효하지 않습니다."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "� 항목� 채워야 합니다."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "파� 없�!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "파� 오류: %s는 존재하지 않습니다."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "� 양�� 오류가 있습니다. 수정한 후 다시 제출하십시오."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "맞지 않습니다. 다시 해보세요!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr "�메� 주소가 유효하지 않습니다."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "미지정 �수: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "오류 공지"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "미리 보기 없�!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "별�� 선�하셔야 합니다."
 
@@ -5974,46 +5337,37 @@ msgstr "별�� 선�하셔야 합니다."
 msgid "error_user_already_confirmed"
 msgstr "� 계정� �미 확�하였습니다."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "유효하지 않는 확� 코드!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "암호가 �치하지 않습니다."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "�메� 주소가 �미 다른 사용�� �해 등��어 있습니다."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "메� 주소 변경� 만료�었습니다. 사용� 프로필�서 메� 주소 변경� 다시 하시"
 "고 바로 보내 드리는 확� 메�� ��를 다시 한번 눌러 주세요. "
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "누군가가 �미 닉네임� 사용하고 있습니다."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "사용�가 존재하지 않습니다!"
 
@@ -6021,43 +5375,40 @@ msgstr "사용�가 존재하지 않습니다!"
 msgid "error_user_unconfirmed"
 msgstr "당신� 계정� 확�해 주세요."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "잘못� 사용� �름�나 암호입니다!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "버전� 찾� 수 없습니다."
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "잘못� 암호입니다!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "�세히 보기"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s �세히 보기"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "�가 %1$s개"
 msgstr[1] "�가 %1$s개"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "�세히 보기"
 
@@ -6101,149 +5452,141 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "모든 권한� 소유합니다."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "저작권"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "ì •ë³´"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla는 편�를 위해 �러한 프로그램들� 대한 ��를 제공하고 있지만, �러"
 "한 프로그램들과 관련� 정보� 대하여 어떠한 책임� 지지 않습니다. 프로그램� "
 "대한 질문�나 �견 등� 해당 프로그램 공급��게 전달하셔야 합니다."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "��"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "법� 공지"
 
 # This is the lang code -- should be the same as the dir for this locale.
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "다른 언어:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "개�정보 보호정책"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "저장"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "사전"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "사전"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "확장 기능"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "확장 기능"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "언어팩(부가 기능)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "언어팩(부가기능)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "언어팩(프로그램)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "언어팩(프로그램)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "플러그�"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "플러그�"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "검색 엔진"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "검색 엔진"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "테마"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "테마"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "%1$s 홈페�지로 �아가기"
@@ -6252,95 +5595,37 @@ msgstr "%1$s 홈페�지로 �아가기"
 msgid "header_main_firefox_header"
 msgstr "Firefox 부가 기능"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "부가 기능"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey 부가 기능"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird 부가 기능"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird 부가 기능"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "부가 기능"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "로그�"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "로그아웃"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "내 계정"
 
@@ -6348,24 +5633,12 @@ msgstr "내 계정"
 msgid "header_navlink_register"
 msgstr "등�"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "�미지 %s 미리 보기"
@@ -6373,47 +5646,36 @@ msgstr "�미지 %s 미리 보기"
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "부가 기능 설치 위해 <a href=\"%1$s\">로그�</a>하기"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "%s %s� 추가"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s를 %2$s� 추가"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s 다운로드"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "검색 결과가 없습니다!"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "언어팩 � 맞춤법 사전 목�"
 
@@ -6425,8 +5687,8 @@ msgstr "맞춤법 사전 다운로드"
 msgid "langtools_download_langpack"
 msgstr "언어팩 다운로드"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "맞춤법 사전 � 언어팩"
 
@@ -6438,80 +5700,36 @@ msgstr "맞춤법 사전 설치"
 msgid "langtools_install_langpack"
 msgstr "언어팩 설치"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "맞춤법 사전"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "언어팩"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "언어별"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "첫화면으로 가려면 여기를 누르세요."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "날짜"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "다운로드 횟수"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "부가 기능명"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "�가"
@@ -6541,21 +5759,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "언어팩 � 맞춤법 사전 목�"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "플러그�"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "테마"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "다른 프로그램� 위한 부가 기능 찾기"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "others"
 
@@ -6564,35 +5789,14 @@ msgstr "others"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6629,23 +5833,23 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 #, fuzzy
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "유효 애플리케�션 버전"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Mozilla 부가 기능 사�트� 제출� 부가 기능� 아래 �용 프로그램 중 하나를 지"
 "�하는 install.rdf 파�� �함해야 합니다. 아래 버전만 사용 가능 합니다."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6654,15 +5858,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "여기"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "버전"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "앞 페�지로"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox 정보 페�지"
 
@@ -6670,6 +5877,13 @@ msgstr "Sandbox 정보 페�지"
 msgid "pagination_next_page"
 msgstr "다�"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "%2$s 중 %1$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "�전"
@@ -6710,15 +5924,15 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "스팸 차단용 기능"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "기능 소개"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "리뷰 올리기 실패!"
 
@@ -6727,7 +5941,7 @@ msgstr "리뷰 올리기 실패!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6747,8 +5961,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "�사합니다. 리뷰가 편집��게 전달�었습니다."
 
@@ -6763,7 +5977,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>주� 사항</p><ul><li>부가 기능� 쓸 친구�게 조언 하듯� �어주십시오. 어"
@@ -6778,131 +5992,101 @@ msgstr ""
 "기 바�니다. </p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s� 대한 �가"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "주요 부가 기능"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "새 부가 기능"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "최근 업��트"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "현재 검색 기능� 사용할 수 없습니다. 다시 한번 시�해 주세요."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "전체 부가 기능"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "부가 기능 검색"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "부가 기능 검색"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "검색어 입력해주세요!"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "�함"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "전체 검색 사�트"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "검색 사�트 보기"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "검색 결과: %s"
+msgstr[1] "검색 결과:  %s"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "검색 결과가 없�."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "부가 기능 검색"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "검색 결과 RSS 피드"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "검색 결과: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "관리 �구"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "개발 �구"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "관리 �구"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "환�합니다"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "환�합니다, %s"
@@ -6911,7 +6095,7 @@ msgstr "환�합니다, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "맞춤법 사전"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "추천 항목"
 
@@ -6919,7 +6103,7 @@ msgstr "추천 항목"
 msgid "sidebar_pitch_looking_for"
 msgstr "찾기:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "최신 항목"
 
@@ -6927,7 +6111,7 @@ msgstr "최신 항목"
 msgid "sidebar_pitch_search"
 msgstr "검색 플러그�"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "구�하기"
 
@@ -6935,24 +6119,25 @@ msgstr "구�하기"
 msgid "sidebar_pitch_theme"
 msgstr "테마"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "최근 업��트 항목"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "아� �가 없�"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "5� 중 %s로 �가"
@@ -6989,13 +6174,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "Y F j"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s 만듬"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s 출시"
@@ -7008,185 +6193,185 @@ msgstr "닫기"
 msgid "statistics_help_link"
 msgstr "�움�"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "다른 부가 기능 선�"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "통계가 제공�는 부가 기능 선�"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "통계 조회할 내 부가 기능 선�"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "통계 조회할 부가 기능 선�"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "통계가 공개� 부가 기능 선�"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "통계 대시보드"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "통계 보기"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "없�"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "현재 통계 삭제"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "조건 내 %s 조회"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "조건 추가"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "현재 그래프� 다른 조건 추가"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "� 횟수 숨기기"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "� 횟수 보�기"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "��터 보기 (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "쉼표 분리� ��터 형�으로 보기"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s �벤트 숨기기"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s �벤트 보�기"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "범위 내 출시� 표시"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox �벤트 숨기기"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox �벤트 보�기"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "범위 내 Firefox 출시� 표시"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "그래프 닫기"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "그래프 확장"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "그래프 �기 변경"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�� 사용� 수"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "프로그램"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "기타"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "다운로드 횟수"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "운� 체제"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "부가 기능 �태"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "요약 정보"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "버전"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "프로그램"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "운� 체제"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "부가 기능 �태"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "알 수 없�"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "부가 기능 버전"
 
@@ -7219,7 +6404,7 @@ msgstr "설정� 업��트 �었습니다!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "통계 대시보드"
 
@@ -7247,104 +6432,108 @@ msgstr "간략히 보기"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "한달로 보기"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "�간 통계 요약: %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS 요약 정보"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "Y년  F j�"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "통계 : %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "기본�으로 개발�와 관리�만� 대시 보드� 접�할 수 있으며 다른 사용�가 부"
 "가 기능 정보를 � 보�� 하려면 아래 설정� 변경하십시오."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "대시보드 접� 허가"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "비공개"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "개발� � 관리�만 볼 수 있�"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "공개"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "모든 사용�가 통계를 볼수 있�"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "설정 변경"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "아래 정보는 신중하게 입력해 주십시오."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "현재 대시보드는 <b>비공개 중</b>입니다."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "현재 대시보드는 <b>공개 중</b>입니다."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "처리 중단�"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "�아가기"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "설정 저장"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s 통계 설정"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "처리 중"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "프로그램"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "운�체제"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "�름"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "알 수없�"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "버전"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�균 �� 다운로드 수"
 
@@ -7356,7 +6545,7 @@ msgstr "다운로드 통계"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "어제 조회수"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "최근 주간 다운로드 수"
 
@@ -7374,7 +6563,7 @@ msgstr "조회 시작�: %1$s"
 msgid "statistics_summary_nodata"
 msgstr "��터가 없�"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "�균 �� 사용� 통계"
 
@@ -7400,52 +6589,35 @@ msgstr "�� 사용� 통계"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "날짜: %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 통계"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "테마 전체 보기"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "테마 검색"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "메� 주소 변경"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "암호 바꾸기"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "확� 코드를 보냈습니다!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7453,24 +6625,24 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7481,62 +6653,62 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7545,7 +6717,7 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7553,26 +6725,26 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "메� 변경 확�� 위해 %1$s로 확� 메�� 보냈습니다. 변경 사항� 완료 �려면 "
 "새로 변경한 메� 주소로 로그�하여 �착한 메�� 확� ��를 �릭해 주셔야 합"
 "니다."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7603,7 +6775,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "%2$s 부가 기능 관리 메� 변경\n"
@@ -7644,112 +6818,91 @@ msgstr ""
 "�사합니다,\n"
 "-- %2$s 부가 기능 관리�"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "%1$s 부가 기능 사�트 암호 초기화"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "오류!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "%1$s 부가 기능 수정� 메� 주소를 확�하세요."
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "성공하였습니다!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr "메� 주소가 변경�었습니다. 앞으로 로그� 시 %1$s를 �용해 주세요."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "암호 확�"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "%s 사용� 프로필 편집"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "메� 주소"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "�름"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "�메� 주소 �추기"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "웹사�트 주소"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "성"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "사용� 로그�"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "새 암호"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "닉네임"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "예전 암호"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "암호"
 
@@ -7757,69 +6910,69 @@ msgstr "암호"
 msgid "user_form_registration"
 msgstr "새 사용� 등�"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "컴퓨터� 저장"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Sandbox를 표시할까요?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "저장"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "로그�"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "등�"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s 부가 기능 사용�"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "새 사용� 계정 만들기"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "변경 내용 중 오류가 있습니다. 오류를 정정해 주세요."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "프로필� 변경하였습니다."
 
@@ -7832,15 +6985,15 @@ msgstr "%s를 위한 암호 초기화"
 msgid "user_pwreset_header"
 msgstr "암호 초기화"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "암호를 잊으셨습니까?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "당신� �메� 주소로 암호 초기화 ��를 보냈습니다."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "암호를 성공�으로 초기화 하였습니다."
 
@@ -7852,7 +7005,7 @@ msgstr "암호 변경 �용"
 msgid "user_pwreset_submit_sendlink"
 msgstr "암호 초기화 �� 보내기"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s 부가 기능"
@@ -7866,7 +7019,7 @@ msgstr ""
 "가 기능 사�트� 로그� 하기 전� 계정 활성화를 해야 합니다."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7877,24 +7030,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "확� 메시지 재전송"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "축하합니다! 계정 등�� 완료 �었습니다."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7902,32 +7041,22 @@ msgid "user_register_resend_confirmation_link"
 msgstr "만약 확� 메�� 받지 못하셨다면 편지가 \"스팸 편지함\"� 있는 지"
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "등�� �사하오며 %1$s� 오신것� 환�합니다."
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -7936,69 +7065,53 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "확� 완료!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "사용� 정보 변경"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "부가 기능/ %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "�름"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "개발� 프로필"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "�메� 주소"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "웹사�트 주소"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "닉네임"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s 사용� 정보"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "사용� 로그�"
 
@@ -8032,707 +7145,5 @@ msgstr "사용� 암호 초기화"
 msgid "users_register_pagetitle"
 msgstr "새 사용� 등�"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "최신 버전 호환성: "
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "모든 버전 정보 기�"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "최신 버전: "
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "�기 부가 기능:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "추천 부가 기능:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "최근 업��트:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "모� 보기"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "모든 추천 부가 기능 보기"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "높� �수 순"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "최근 업��트 순"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "�기 순"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "현재 부가 기능 버전� Firefox %1$s와 호환�지 않습니다. Mozilla�서는 새 "
-#~ "Firefox 버전� 출시하고� 하며 부가 기능� 호환 가능한 새 버전�서 테스트 "
-#~ "하십시오. �세한 사항� <a href=\"%2$s\">관련 정보</a>�서 얻� 수 있습니"
-#~ "다. 본 주� 사항� 현재 버전� addons.mozilla.org� 전송하기 전� 제공 합"
-#~ "니다."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "부가 기능 정지 �태"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "부가 기능 편집"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "부가 기능 �용 �태"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "부가 기능 설명"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "부가 기능 홈페�지"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "부가 기능 �름"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "개� 정보 보호 정책"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "부가 기능 요약"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "�메� 주소"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "홈페�지 주소"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "버전 정보"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "부가 기능 추천하기"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "부가 기능 추천 완료"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "제출한 부가 기능� 수정 하시려면 %1$s 페�지로 거거나 개발� 제어�으로 �"
-#~ "어가려면%2$s 를 �릭하세요."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "여기"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "부가 기능 편집"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "현재 � 버전� Mozilla 부가 기능 편집� � 테스터로 부터 �가를 받기 위해 "
-#~ "Sandbox� 위치하고 있습니다. 그 다� 단계로 들어서면 �메�� 받으시게 �"
-#~ "니다."
-
-# %1 is the link to the sandbox information page
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Sandbox �가 체계� 대해서는 %s를 살펴 보세요."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "여기"
-
-# %1 is the "nominate" link
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "� 버전� 기존 사용�를 위해 Sandbox� 위치해 있습니다. 웹 사�트� 공개하"
-#~ "시려면 %s를 눌러 �가 과정� 거치시기 바�니다."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "공개 추천"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "부가 기능 제출� 완료하였습니다."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr "본 부가 기능� �미 신뢰�어 ��으로 웹 사�트� 공개 합니다."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "부가 기능 제출"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "부가 기능 정보 변경 완료"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "부가 기능� 대한 관심� 높히려면 %s를 하시면 �움� �니다."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "미리보기 업로드"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "개발� 없� [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "제거"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "취소"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "현재 제출하신 내용� 취소하시겠습니까?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "다�"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "부가 기능 형� 변경:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "개발� 정보가 업��트 �었습니다."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "미리 보기 추가"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "개발�"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "복수 개발�"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "없�"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "세부 분류"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "세부 분류"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "설명"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "사용 안함"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "�세 정보"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "개발� 정보"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "미리 보기"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "버전"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "홈페�지"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "없�"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "정보 없�"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "미리 보기가 없습니다."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "업��트"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "기술 지� �메� 주소"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "기술 지�용 �메� 주소가 없습니다."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "기술 지� 홈페�지"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "기술 지�용 홈페�지가 없습니다."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "신뢰함"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "버전 정보가 없습니다."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "취소 � �아가기"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "��, 사용안함"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "본 부가 기능� 사용하지 않� �태로 바꾸시겠습니까?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "현재 부가 기능� 사용 안함으로 변경 하면 모든 목� � 검색� 나타나지 않습"
-#~ "니다. 본 웹 사�트�서 다운로드 할 수 없으며 업��트 확� 작업� 진행�"
-#~ "지 않습니다. 향후 다시 사용함� 설정하��� 실제로 삭제 가능성� 있습니"
-#~ "다."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "%s 사용 안함"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "��, 사용함"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "본 부가 기능� 사용 �태로 바꾸시겠습니까?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "부가 기능� 사용함으로 변경하면 검색 결과 � 목�� 표시�니다. 웹 사�트 "
-#~ "� 버전 업��트를 통해 바로 다운로드 가능 합니다."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "%s 사용 함"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "개발� 추가"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "개발� �메� 주소"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "제거"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "본 부가 기능 형��는 분류 항목� 없습니다."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "개발�"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "아�콘 추가"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "아�콘 변경"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "온��으로 소스를 볼 수 있는 사용�"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "분류"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "기본 언어"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "현 아�콘 삭제"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "새 아�콘 파�"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "아�콘"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "부가 정보 (예, 지역명)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "업��트"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">언어별 코드</"
-#~ "a>, 예) 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "체�� 파�� 삭제합니다."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "파�"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "지� �용 프로그램"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "파�� 없습니다."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "�가� 노트"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "업��트"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "요약� 최대 250� �� 사용할 수 없습니다.\n"
-#~ "(ë‚´ìš©: %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "부가 기능 �름� �미 존재 합니다. 다� 사항� 확�해 보시기 바�니다. "
-#~ "<br /><li>GUID 확�: 대부분 GUID와 부합하지 않는 �러가 나타납니다. </"
-#~ "li><li>��터베�스� 중복 항목� 없습니다. 그러면  그 항목� 업��트 하"
-#~ "거나 삭제해야 만 합니다.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "현재 부가 기능� 변경 사항� �어 주시기 바�니다."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "GUID 값� 호출�지 않�"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "� 부가 기능� 현재 버전 (%s)� �미 존재 합니다."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "후부 추천� 위해 필요 항목� 채워 주셔야 합니다."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "아� 출시하지 않� 부가 기능� 추천할 수 없습니다."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Sandbox�서 현재 부가 기능 공개를 추천할 수 있습니다."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "��터 저장 중 오류가 발�했습니다."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "� 부가 기능� 업��트할 권한� 없습니다."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "다른 플랫� 파� 추가"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "개발� 추가"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "제거"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "새 부가 기능� 대한 분류 형�� 다� 단계�서 입력할 수 있습니다."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "� 부가 기능� 대한 사용 가능한 분류가 없습니다."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "부가 기능� 대한 설명� 입력하세요."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "부가 기능 �름� 입력하세요."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "부가 기능� 대한 형�� 선�하세요."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "부가 기능� 대한 요약 정보를 입력하세요."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "부가 기능 파�"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "부가 기능 파� 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "부가 기능 파� 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "부가 기능 형�"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "사용�가 소스 코드를 온���서 열람 가능"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "개발� �메� 주소"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "개발�"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "분류"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "기본 언어"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "설명"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "�반 사용� 약관 (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "� 부가 기능� 외부 프로그램� 필요함"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "파�"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "홈페�지"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "아�콘 파�"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "�름"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "지� 플랫�"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "미출시 �태"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "개� 정보 보호 정책"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "웹 사�트 기반 부가 기능"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "요약"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "기술 지� �메� 주소"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "기술 지� 홈페�지"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "지� �용 프로그램"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "버전"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "버전 노트"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "없�"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "�가� 노트"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr "부가 기능� 신뢰�었으므로 현재 버전 위치를 정하십시오:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "공개"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "개발� 약관"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "단계 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "파� 업로드"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "단계 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "부가 기능 �세 정보"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "단계 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "버전 �세 정보"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "단계 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "지역화"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "단계 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "완료"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "나� 부가 기능"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "�세 정보로 �아가기"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "부가 기능 형� �� ��: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "현재 부가 기능� 기본 언어 설정(%1$s [%2$s])� 현재 선�한 사용� 언어 설"
-#~ "정 (%3$s [%4$s])과 다릅니다. %1$s�서 아래 항목� 모� 채워야 합니다."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "형�� 맞지 않습니까?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "� 파�� 삭제하시겠습니까?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "현재 부가 기능 정보 검토 건너 뛰기"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "현재 부가 기능 등� 기능� 잠시 정지�었습니다. 다�� 시�하시기 바�니"
-#~ "다."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "��함"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "�� 안함"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "� 부가 기능� 관리�� �해 사용 정지 �었습니다."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "사용 정지�"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "신뢰�"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "등�한 부가 기능� 없습니다. 먼저 %s� 하세요."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "부가 기능 등�"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "테마� 대해 %s를 확� 하세요."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "미리 보기 업로드"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Edit Version"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "버전 업��트를 완료 하였습니다."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "신규"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "업��트"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "부가 기능 형�"
-
-#~ msgid "editors_th_age"
-#~ msgstr "나�"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "�용 프로그램"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "플랫�"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "제출 형�"
-
-#~ msgid "error_notice"
-#~ msgstr "오류 공지"
-
-#~ msgid "forum_save"
-#~ msgstr "저장"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "플러그�"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "앞 페�지로"
-
-# %1 is page number, %2 is total page count
-#~ msgid "pagination_page_number_title"
-#~ msgstr "%2$s 중 %1$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "검색 결과: %s"
-#~ msgstr[1] "검색 결과:  %s"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS 요약 정보"
diff --git a/site/app/locale/merge-enus2all.sh b/site/app/locale/merge-enus2all.sh
index 82ad166..183ea55 100755
--- a/site/app/locale/merge-enus2all.sh
+++ b/site/app/locale/merge-enus2all.sh
@@ -2,7 +2,7 @@
 tempfoo=`basename $0`
 TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1
 
-for i in `find . -type f -name "messages.po" | grep -v en_US`; do
+for i in `find . -type f -name "*.po" | grep -v en_US`; do
     msgattrib --set-fuzzy en_US/LC_MESSAGES/messages.po | msgmerge -Ns "$i" - > $TMPFILE
     cp "$TMPFILE" "$i"
 done
diff --git a/site/app/locale/merge-po.sh b/site/app/locale/merge-po.sh
index ea1c579..1b6d445 100755
--- a/site/app/locale/merge-po.sh
+++ b/site/app/locale/merge-po.sh
@@ -15,7 +15,7 @@ TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1
 # check if file and dir are there
 if [[ ($# -ne 2) || (! -f "$1") || (! -d "$2") ]]; then usage; fi
 
-for lang in `find $2 -type f -name "messages.po"`; do
+for lang in `find $2 -type f -name "*.po"`; do
     sed 's/#\. /# developer_comment /' "$lang" | msgmerge --no-fuzzy-matching - $1 > $TMPFILE
     sed 's/# developer_comment /#. /' "$TMPFILE" > "$lang"
 done
diff --git a/site/app/locale/mn/LC_MESSAGES/messages.po b/site/app/locale/mn/LC_MESSAGES/messages.po
index d9d4ef2..02d4f7d 100644
--- a/site/app/locale/mn/LC_MESSAGES/messages.po
+++ b/site/app/locale/mn/LC_MESSAGES/messages.po
@@ -17,169 +17,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Суулгацыг цуцал"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "%s-г одоо татаж ав"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Зөвшөөрөөд татаж ав"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Зөвшөөрөөд �уулга"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "�ийтийн"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Түр хайрцаг"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "%s шин�чл�гд��н "
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Хувилбар %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "удаа татагд�ан"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "удаа нийтд�� татагд�ан"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "удаа долоо хоногт татагд�ан"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" н�м�гд�л"
 msgstr[1] "%1$s \"%2$s\" н�м�гдлүүд"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "-г н�г хууд�анд"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Эр�мб�л�лт:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "туршилтын"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "�анал болгогд�он"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s-н %2$s-д тохир�он хувилбар байхгүй."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "%1$s-н хууд�анд буцна..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Үн�лг�� дүгн�лт хууд�анд буцна..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Үн�л�мж:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Үн�лг�� дүгн�лт:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Үн�лг�� дүгн�лт�� илг��х"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "%s-д дүгн�лт өгөх"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Гарчиг/Товч м�д��л�л:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "У�тга"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Хариулах"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Та �н� үн�лг�� дүгн�лт�� у�тгахдаа итг�лт�й байна уу?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Үгүй"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Тийм"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Үн�лг�� дүгн�лтийг у�тга"
 
@@ -188,7 +179,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Дүгн�лт амжилттай у�тгагдлаа."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s-н үн�лг�� дүгн�лтийг за�варла"
@@ -202,18 +193,18 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "�нхаар: Таны үн�лг�� дүгн�лт нийтийн хууд�анд харуулагдахаа�аа өмнө "
 "зохиогчоор нь х�нагдах болно."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Хөгжүүл�гчид нь хариулах:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -230,31 +221,46 @@ msgid "addon_review_pagetitle"
 msgstr "%s-д өг�өн үн�лг�� дүгн�лт"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s-р %2$s руу хариулах"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Хөгжүүл�гчийн хариулт:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Таны үн�лг�� амжилттай хадгалагдлаа. Ба�рлалаа!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "%2$s-ны өдөр %1$s-р"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "%2$s-нд %1$s (үн�лг�� %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -262,146 +268,93 @@ msgstr "Permanent link to this version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Илг��х"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s н�м�гдлүүд"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Үн�лг�� дүгн�лт н�м"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "��м�лт м�д��л�л"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Төрөл анги"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "д�лг�р�нгүй харуулалт"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Таалагд�ангүй"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Тайлбараа за�варлах"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr ""
 "Эн� н�м�гд�лд хувь хүнт�й холбоотой м�д��ллийг хамгаалах журам заагд�ан "
 "байна."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Үз�н �даж байна"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Зохиогчийн тайлбар"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "В�б хууд�анд нь очих"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Үн�лг�� дүгн�лтүүд"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Д�мжл�г"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Таалагдаж байна"
 
@@ -409,23 +362,19 @@ msgstr "Таалагдаж байна"
 msgid "addons_display_long_description"
 msgstr "Урт тайлбар"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Дурлахаар байна"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "��м�лт зурагнууд"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -435,14 +384,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -456,7 +405,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -470,7 +419,7 @@ msgstr ""
 "болно."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -482,15 +431,16 @@ msgstr ""
 "хөгжүүл�гч рүү хамт илг��д�ггүй учраа� хөгжүүл�гч��� танд уг алдаа дутагдал "
 "нь дараагийн хувилбарт за�агд�ан ���хийг м�д��л�х боломжгүй байх болно."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Дүгн�лт өгөх"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Үн�х��р таалагдаж байна"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Үн�лг�� дүгн�лт өгөх х���гт алдааны м�д��л�л илг��хгүй байхыг хү�ье. Бид "
@@ -498,46 +448,51 @@ msgstr ""
 "барьж уг алдааг за�ахад тань ту�алж чадахгүй байх болов уу."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "<a href=\"%1$s\">Д�мжл�г ту�ламжийн</a> х���гт уг н�м�гд�лд тохир�он "
 "ту�ламжийг хаанаа� авч болохыг харна уу."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Хадгал"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Бүх %1$s төрлийн н�м�гдлүүдийг харах"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Бүх үн�лг��г харах (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Бүх хувилбарыг нь харах"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Хувилбарын бүр�н түүх"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Эх бичл�гийг нь харах"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Судалгааны үр дүнг харах"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Та юу г�ж бодож байна?"
 
@@ -545,226 +500,108 @@ msgstr "Та юу г�ж бодож байна?"
 msgid "addons_display_workswith"
 msgstr "�жиллах хувилбар:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "зохиогч"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Бидний �анал болголт"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "��м�гдлүүд нь %1$s-г өргөтгөж н�мд�г бөгөөд танд хү��л зорилгодоо тохируулж "
 "өөрчлөхөд тань ту�лана. Тухтай �айхан зорчиж %1$s-г өөрийн болгоорой."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Шин�х�н:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Бу�ад програмууд"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s н�м�гдлүүд"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Өргөн тарх�ан нь:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Бидний �анал болголт:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Са�хан шин�чл�гд��н:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Бүгдийг нь харах"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Шин��р үү�г�гд��н н�м�гдлүүдийг харах"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Бүх өргөн тарх�ан н�м�гдлүүдийг харах"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Бүх �анал болго�он өргөтгөлүүдийг харах"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Са�хан шин�чл�гд��н бүх н�м�гдлүүдийг харах"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -772,12 +609,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Доорх холбоо� д��р хулганы баруун товчийг дарж \"Холбогд�он файлд "
@@ -786,42 +623,39 @@ msgstr ""
 "li><li>Суулга товч д��р дараад татаж ав�ан файлынхаа байршлаа� файлаа "
 "�онгоод \"OK\" д��р дарна.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Thunderbird д��р х�рх�н �уулгах в�"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "туршилтын н�м�гдлүүдийг харуулах"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Харах"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Зохиогч"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Линук� машинд"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X машинд"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windows машинд"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -829,11 +663,11 @@ msgstr ""
 "харуул�ан болно. Бу�ад Мозилла хөтлөгчдөд зориул�ан плагинуудыг харахыг "
 "хү�в�л %1$s хууд�анд зорчино уу."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Таны хайж буй плагин �нд байхгүй байна уу?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Плагинууд нь таны хөтлөгч д��р дуут дүр�т�й файл үз�х ��в�л онцгой зургийн "
@@ -842,24 +676,24 @@ msgstr ""
 "�лгардаг."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s-д зориул�ан ердийн плагинууд"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Плагинууд"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Заавар бичиг баримт: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -867,42 +701,37 @@ msgstr ""
 "м�д�х шаардлагатай:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s-н үзүүлб�р"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Маш олон н�м�гдлүүд боломжтой байгаа бөгөөд хүн болгонд тохир�он зарим "
 "н�м�гдлүүд байдаг. Танд ту�лах зорилгоор байнга х�р�гл�гдд�г болон өргөн "
 "тарх�ан н�м�гдлүүдийг �нд жаг�аав. Таалан �оёрхоно уу!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Санал болгогд�он н�м�гдлүүд"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Санал болгогд�он н�м�гдлүүд"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "��м�лт �х �урвалж"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Мозилаг хөгжүүл�гчдийн төв"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Уулчаарай, хайгч плагиныг �уулгахын тулд Мозила үнд��т�й (жиш�� нь Firefox) "
@@ -917,42 +746,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Х�рх�н %2$s д��р %1$s-н тухай �урах."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "өөрийн болгох"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "%1$s д��р буй бу�ад хайгчдыг �онирхоно уу."
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Хайлт хийгчид"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Firefox-н хайлт хийгчд�д зориулж ажилла�ан Mycroft тө�лийн хамт олонд онцгой "
 "талархал д�вшүүлж байна."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -997,19 +827,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1020,39 +850,27 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Хуучин хувилбараа� болгоомжил"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Эдг��р хувилбар нь шалгах юмуу лавлагаа зориулалтаар харуулагд�ан болно.  Та "
 "үрг�лж шин� хувилбарыг нь илүүд тооцох х�р�гт�й."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Өөрчлөлтийн бүртг�л агуул�ан хувилбарын түүх"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s хувилбарын түүх"
@@ -1087,125 +905,113 @@ msgstr "Бүл�г зохицуулагч"
 msgid "admin_group_saved"
 msgstr "Бүл�г хадгалагдав"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "��м�лт"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "бүх хугацаанд"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "бүх төрөлд"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "бүх хувилбарт"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Програм"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Хайх үгт�й тохир�он"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Сүүлд шин�чл�гд��н"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "��р"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Хамгийн �үүлийн"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Өнгөр�өн 3 �ард"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Өнгөр�өн 6 �ард"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Өнгөр�өн өдөр"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Өнгөр�өн �ар"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Өнгөр�өн долоо хоног"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Өнгөр�өн жил"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "��г хууд�анд"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Си�темийн төрөл"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Олонд тарх�анаар нь"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Үн�лг��г��р нь"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Эр�мб�л�лт"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "-� �хл��д"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Төрөл"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "хувилбар"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Хувилбар шалгахыг алга�"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Эн� н�м�гд�л нь Firefox-н хуучин хувилбарт зориулагд�ан"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1213,343 +1019,41 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">хуучин хувилбард</a> ажиллаж магадгүй"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Firefox-г шин�чл��д</a> �н� н�м�гдлийг "
 "ашиглана уу"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "��р��р нь �р�мб�лж харах"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Шин�х�н н�м�гдлүүд"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Өргөн тарх�ан н�м�гдлүүд"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Үн�лг��г��р нь �р�мб�лж харах"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Са�хан шин�чл�гд��н н�м�гдлүүд"
 
@@ -1558,862 +1062,47 @@ msgid "categories_current_title"
 msgstr "Сонгогд�он төрөл"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Төрөл анги"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Төрөл �онгох"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "%1$s төрлөө� бүгдийг нь харуул"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Бүх �анал болгогд�он н�м�длүүдийг харах"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Их үн�л�гд��н нь �х�нд"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Хамгийн �үүлд шин�чл�гд��н нь �х�нд"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Хамгийн өргөн тарх�ан нь �х�нд"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "%1$s төрлөө� бүгдийг нь харуул"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2421,71 +1110,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2494,26 +1183,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2521,107 +1210,107 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Хамтрах талаарх м�д��ллийг %s хууда�наа� харна уу."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki хууда�"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla addons.mozilla.org тө�өлд олон жил хаматрч ту�ал�ан хүмүү�д гүн "
 "талархлаа ил�рхийлж байна:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Хөгжүүл�гчид"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "За�варлагчид"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Орчуулагчид"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Бу�ад хамтран ту�лагчид"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Хуучин хөгжүүл�гчид"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Програм болон зурагнууд"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "<a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon "
@@ -2629,7 +1318,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "г���н зохиогчийн �рх дор ашиглагдав</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2640,20 +1329,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Y оны %B %e "
 
@@ -2688,25 +1374,25 @@ msgstr "Судалгааны �амбар"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2715,6 +1401,20 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(автоматаар тань)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Эн� н�м�гдлийн одоогийн хувилбар нь Firefox %1$s г���н хувилбартай нь "
+"тохир�он г�ж м�д�гд�хгүй байна. Firefox-н шин� хувилбар удахгүй гарах г�ж "
+"байна г�ж г�ж Мозилла тооцов. ��м�гдл�� шин� хувилбар д��р туршаад "
+"тохиромжийнх тухай м�д��ллийг нь шин�чилн� үү. Та �н� талаарх д�лг�р�нгүй "
+"м�д��ллийг <a href=\"%2$s\">�нд���</a> авах боломжтой. Эн� нь зөвхөн "
+"�ануулга болохоор та �н� хувилбараа илг��х үйлдл�� үрг�лжлүүл�н гүйц�тг�ж "
+"болох юм."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Шин� цонхонд н��гд�н�"
@@ -2751,76 +1451,141 @@ msgstr "5-р алхам: �мжилттай дуу�лаа"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Илг��х ту�ламж"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "��м�гдл�л хорих амжилттай боллоо"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "��м�гдлийг за�варла"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "��м�гдл�л зөвшөөрөх амжилттай боллоо"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "��м�гдлийн тодорхойлолт"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "��м�гдлийн в�б хууда�"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "��м�гдлийн н�р"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Үзүүлб�рийн гарчиг"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Хувь хүнд холбоотой м�д��л�л хамгаалах журам "
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "��м�гдлийн ерөнхий тайлбар"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Лавлах захианы ха�г"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Лавлах в�б хууда�"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Хувилбарын т�мд�гл�г��"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "��р д�вшигд��н н�м�гдлүүд"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "��м�гдлийн н�р д�вшүүл�лт амжилттай боллоо!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2856,7 +1621,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2866,6 +1631,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2877,13 +1647,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2893,7 +1663,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2903,12 +1673,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2917,14 +1687,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3003,13 +1773,122 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"%1$s хууд�анд зорчиж илг��мжд�� өөрчлөлт хийх ��в�л %2$s д��р дарж "
+"хөгжүүл�гчийн үнд��н �амбарт буцна уу."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "�нд дарж"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "��м�гдлийг за�варла"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Эн� хувилбар нь Мозилагийн н�м�гд�л за�варлагдаа� үн�лг�� дүгн�лт хийлг�х��р "
+"түр хайрцганд байрла�ан байгаа. Үн�л�лт хийгд��ний дараа танд захиагаар "
+"м�д�гд�х болно."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Түр хайрцагт буй зүйл�ийн дүгн�х зарчмыг %s хууда�наа� харна уу."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "�н�"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Эн� хувилбар нь дадлага туршлагатай х�р�гл�гчд��р х�р�глүүл�хийн тулд түр "
+"хайрцганд байрлуулагд�ан. �ийтийн хууд�анд харуулахын тулд та өөрийнхөө "
+"н�м�гдл�� %s х�р�гт�й бөгөөд үн�лж дүгн�х �вцыг давж гарах х�р�гт�й."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "н�р д�вшүүл�х"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Таны н�м�гд�л илг��лт амжилттай гүйц�тг�гдл��."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Таны н�м�гд�л итг�гд��н төрөлд багтдаг учраа� �н� хувилбар нь автоматаар "
+"нийтийн хууд�анд орно."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "��м�гдлийг илг��"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "��м�гд�л амжилттай шин�чл�гдл��"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Та магадгүй %s хийж н�м�гдлийнх�� �онирхлыг их��г�ж болох юм."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "үзүүлб�р илг��лт"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Зохиогч олд�онгүй [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "У�тга"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Цуцал"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Та илг��лт�� цуцлах г�ж буйдаа итг�лт�й байна уу?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Дараах"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "��м�гдлийн төрөл өөрчлөх:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Хөгжүүл�гчийн тайлбар шин�чл�гд��н."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3086,37 +1965,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Үзүүлб�р н�м�х"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Зохиогч"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Зохиогч"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Байхгүй"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Төрлүүд"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Төрөл"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Тодорхойлолт"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Хоригд�он"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "�арийн м�д��л�л"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Хөгжүүл�гчийн товч тайлбар"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Үзүүлб�рүүд"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Хувилбарууд"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "В�б хууда�"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Байхгүй"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Гарчиггүй"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "үзүүлб�р олд�онгүй."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Шин�чил"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Лавлах захианы ха�г"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Хөгжүүл�гч��� �мар ч захианы ха�г өгөгдөөгүй байна."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Лавлах в�б хууда�"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Хөгжүүл�гч��� �мар ч в�б хууда�ны ха�г өгөгдөөгүй байна."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Итг�гд��н"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Хувилбар %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Хувилбар олд�онгүй."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Цуцлаад буцъ�"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Тийм, үүнийг хорь"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Та �н� н�м�гдлийг хорих г�ж буйдаа итг�лт�й байна уу?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Эн� н�м�гдлийг хорь�оноор хайх болон харуулах жаг�аалтнаа� нуудаг. Мөн �н� "
+"нь в�б хууда�наа� татаж авагдахгүй бөгөөд х�р�гл�гч��� шин�чл�гд�хгүй. Уг "
+"н�м�гд�л нь бараг у�тгагдах бөгөөд х�р�в та хү�в�л �н� хууд�анд буцаж ир��д "
+"хорих үйлдлийг цуцалж болно."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "%s-г хорих"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Тийм, үүнийг зөвшөөр"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Та �н� н�м�гдлийг зөвшөөрөх г�ж буйдаа итг�лт�й байна уу?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Эн� н�м�гдлийг зөвшөөр�өнөөр уг н�м�гд�л нь хайх болон харуулах жаг�аалтанд "
+"�рг��д харуулагдах болно. Мөн в�б хууда�наа� татаж авагдах болон "
+"х�р�гл�гч��� шин�чл�гд�х боломжтой байх болно."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "%s-г зөвшөөр"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3170,62 +2192,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Зохиогч н�м�х"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Зохиогчийн захианы ха�г"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "У�тга"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3238,30 +2272,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3340,22 +2374,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3364,12 +2398,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3377,12 +2411,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3391,24 +2425,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3416,7 +2450,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3441,42 +2475,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Эн� н�м�гдлийн төрөлд таар�ан төрөл олд�онгүй."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Зохиогчид"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Т�мд�г зураг н�м"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Т�мд�г зургийг өөрчил"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Интерн�т��р х�р�гл�гчд�д �х бичл�гийг нь харуулахыг зөвшөөр"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Төрлүүд"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "�нхдагч нутагшил"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Эн� н�м�гд�л нь н�м�лт програм шаарддаг"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Зөвхөн одоогийн т�мд�г зургийг арилга"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Шин� т�мд�г зураг файл"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Т�мд�г зураг"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Х�р�гл�х х�лний н�м�лт м�д��л�л"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Эн� нь өмнөх хувилбар"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Эн� нь ту�гай хууд�анд зориул�ан н�м�гд�л"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Х�р�гл�х х�л"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "н�м�лт бичил м�д��л�л (х�р�гл�х х�л г�х м�т)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3484,12 +2583,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3497,60 +2596,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3559,32 +2658,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3592,22 +2691,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3615,12 +2714,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3628,39 +2727,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Шин�чил"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">х�р�гл�х х�лний "
+"н�р</a>, жиш�� нь 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3747,14 +2856,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Шин�чл�лийн хү��лт хүл��ж байна (%s)"
 msgstr[1] "Шин�чл�лийн хү��лт хүл��ж байн (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Чагтал�ан файлууд у�тгагдах болно."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Файлууд"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Зориул�ан програм"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Файл байхгүй."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Үн�л�л дүгн�лт хийгчд�д зориул�ан т�мд�гл�г��"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Шин�чил"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Танд �н� н�м�гд�лд хандах �рх байхгүй байна."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Ерөнхий тайлбарын д��д х�мж�� нь 250 т�мд�гт.\n"
+"(Та %s т�мд�гт бич��н)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Таны н�м�гдлийн н�р өгөгдлийн бааз дотор өмнө оруулагд�ан байна. Та: <br /"
+"><li>Таны GUIDs дугаар тохирч буй ���хийг шалгана уу. Эн� алдааны байнга "
+"гардаг шалтгаан нь  үл тохироогүй GUIDs-� бол�он байдаг.</li><li>Та "
+"өгөгдлийн баазын оруулгах давхарлах х�р�ггүй. Х�р�в давхарла�ан байгаа бол "
+"т�р оруулгаа шин�чл�х ��в�л у�тгаад дахин оролдох х�р�гт�й.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3768,10 +2932,9 @@ msgstr "%s хууда�наа� лавлаж харна уу."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "�н� хууда�"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Эн� н�м�гд�лд ор�он шин�чл�лийн өөрчлөлтийг тодорхойлно уу."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3790,6 +2953,10 @@ msgstr ""
 "Ийм файлын өргөтгөл (%s) нь �онгогд�он н�м�гдлийн төрөлд зөвшөөрөгдөөгүй. Та "
 "дараах төрлөө� н�гийг нь �онгоно уу: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Бүх файлын GUIDs тохир�онгүй"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Таваа� илүүгүй төрөл �онгоно уу."
@@ -3824,7 +2991,16 @@ msgstr ""
 "Ийм файл өргөтгөл (%s) нь т�мд�гт зургийн төрөлд таарахгүй байна. Та дараах "
 "төрлөө� н�гийг нь �онгоно уу: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Эн� н�м�гд�л болон үйлдлийн �и�темд тохир�он ижил хувилбар (%s) өмнө нь "
+"байна."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf файл байхгүй байна."
 
@@ -3832,7 +3008,7 @@ msgstr "install.rdf файл байхгүй байна."
 msgid "devcp_error_install_manifest"
 msgstr "Дараах алдаанууд install.rdf файлд олдов:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "��м�гдлийн зөв төрлийг �онгоно уу."
 
@@ -3905,6 +3081,18 @@ msgstr ""
 msgid "devcp_error_no_platform"
 msgstr "Үйлдлийн �и�тем �онгогдоогүй байна"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Та н�р д�вшүүл�х�д шаардагдах м�д��ллүүдийг оруулах ё�той."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Та н�м�гдлийн урьдчил�ан хувилбарыг н�р д�вшүүлж болохгүй."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Та зөвхөн түр хайрцганд байгаа н�м�гдлийг л н�р д�вшүүлж болно."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Ядаж н�г төрөл �онгоно уу."
@@ -3922,6 +3110,16 @@ msgstr ""
 "Ийм файлын өргөтгөл (%s) нь харуулагдах боломжгүй байна. Дараах төрлөө� "
 "н�гийг �онгоно уу: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Таны өгөгдлийг хадгалах үед алдаа гарлаа."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Танд �н� н�м�гдлийг шин�чл�х �рх байхгүй байна."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3934,98 +3132,293 @@ msgstr ""
 "��м�гдлүүд нь гаднын шин�чл�х ха�г ашиглаж болохгүй. Та түүнийг install.rdf "
 "файлаа� у�тгаад дахин оролдоно уу."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Файлаа илг��н� үү."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Өөр үйлдлийн �и�темийн файл н�м�х"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Зохиогч н�м�х"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "У�тга"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Таны шин� н�м�гдлийн төрөл дараагийн алхамд боломжтой болдог."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Эн� н�м�гдлийн төрөлд тохир�он төрөл байхгүй байна."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "��м�гдлийнх�� тодорхойлолтыг оруулна уу."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "��м�гдлийнх�� н�рийг оруулна уу."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Илг��ж байгаа н�м�гдлийнх�� төрлийг �онгоно уу."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "��м�гдлийнх�� ерөнхий тайлбарыг оруулна уу."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "��м�гд�л файл"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "��м�гд�л файл 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "��м�гд�л файл 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "��м�гдлийн төрөл"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Х�р�гл�гчдийн интерн�т��р �х бичл�гийг нь харахыг зөвшөөр"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Зохиогчийн захианы ха�г"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Зохиогчид"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Төрлүүд"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "�нхдагч нутагшил"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Тодорхойлолт"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Х�р�гл�гчийн лицензийн зөвшөөрөл (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Эн� н�м�гд�л өөр гадны програм шаарддаг юм байна"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Файлууд"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "В�б хууда�"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Т�мд�г зураг файл"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "��р"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Д�мжд�г үйлдлийн �и�темүүд"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Эн� нь урьдчил�ан хувилбар байна"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Хувь хүнд холбоотой м�д��ллийг хамгаалах журам"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Эн� нь ту�гай хууд�анд зориул�ан н�м�гд�л байна"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "��гтг���н м�д��л�л"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Лавлах захианы ха�г"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Лавлах в�б ха�г"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Зориул�ан програм"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Хувилбар"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Хувилбарын т�мд�гл�л"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Байхгүй"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Үн�лг�� дүгн�гчд�д зориул�ан т�мд�гл�л"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Таны н�м�гд�л итг�гд��н жаг�аалтад багтдаг учраа� хаана �н� хувилбар очихыг "
+"�онгоно уу:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "�ийтийн"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Түр хайрцаг"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Хөгжүүл�гчийн зөвшилцөл"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1-р алхам"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Файлаа илг��х"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2-р алхам"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "��м�гдлийн нарийн м�д��л�л б�лд�х"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3-р алхам"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Хувилбарын нарийн м�д��ллийг б�лд�х"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4-Р алхам"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "�утагшуулах"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5-р алхам"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "�мжилттай дуу�лаа"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Миний н�м�гдлүүд"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Орчуулагд�ан талбарууд"
@@ -4040,12 +3433,12 @@ msgstr ""
 "Х�р�в орчуулагдаагүй байвал анхдагч х�л рүү (%s) автоматаар шилжин�."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Зохицуулагчийн х�нах �амбар"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "За�варлагчийн х�нах �амбар"
 
@@ -4054,28 +3447,28 @@ msgid "devcp_myaddons_link"
 msgstr "Миний н�м�гдлүүд"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Эхл�л хууд�анд буцах"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Судалгааны �амбар"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "��м�гд�л илг��х"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Зохиогчид зориул�ан багажнууд"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4087,26 +3480,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "��м�гдлийн нарийн м�д��л�л рүү буцах"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s-г н�р д�вшүүл"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "�втоматаар танигд�ан н�м�гдлийн төрөл: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4120,6 +3524,18 @@ msgstr ""
 "Эн� анхдагч үзүүлб�рийг у�тга�наар өөр үзүүлб�рийг автоматаар анхдагч болгож "
 "�онгодог."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Эн� н�м�гдлийн анхдагч нутагшил нь (%1$s [%2$s]) таны одоогийн �онго�он "
+"нутагшлаа� (%3$s [%4$s]) өөр байна. Доорх талбарууд %1$s нутагшлаар "
+"харуулагдах болно."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4127,14 +3543,14 @@ msgstr ""
 "Эн� үзүүлб�рийг анхдагч болго�ноор одоогийн байгаа анхдагч үзүүлб�рийг "
 "анхдагч төлөв байдлыг арилгадаг."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4163,46 +3579,46 @@ msgstr "Үзүүлб�рийг за�варлах"
 msgid "devcp_preview_updated_successfully"
 msgstr "Үзүүлб�р амжилттай шин�чл�гдл��."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4210,7 +3626,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4228,7 +3644,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Үзүүлб�р н�м"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4237,7 +3653,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Үзүүлб�рийг за�варла"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4250,27 +3666,27 @@ msgstr "Файлыг харуул"
 msgid "devcp_previews_label_makedefault"
 msgstr "Үүнийг анхдагч үзүүлб�р болго"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4294,18 +3710,26 @@ msgstr "Үзүүлб�рийг за�варла"
 msgid "devcp_previews_submit_upload"
 msgstr "Үзүүлб�р илг��х"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Буруу юу?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Та �н� файлыг у�тгах г�ж буйдаа итг�лт�й байна уу?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Гүйц�тг�х����� өмнө дараах хөгжүүл�гчийн зөвшилцлийг уншиж дүгн�лт хийн� үү."
@@ -4317,7 +3741,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4329,6 +3753,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Миний одоогийн н�м�гдлийн м�д��ллийг шин�чл�х үйлдлийг алга�"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4432,17 +3860,63 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"��м�гд�л илг��х үйлд�л одоогоор хоригд�он. Х���г хугацааны дараа �рг�ж "
+"шалгана уу."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Би зөвшөөрнө"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Би татгалзана"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Эн� н�м�гд�л админи�тратороор хоригд�он байна."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Хоригд�он"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Итг�гд��н"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Сүүлийн хувилбар:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Танд �мар ч н�м�гд�л байхгүй байна. Та %s дарж н�м�гд�л илг��н� үү."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "�нд"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Та өөрийнхөө ма�гт тохируулж %s шалгах х�р�гт�й."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "үзүүлб�р н�мж"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4450,44 +3924,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4497,7 +3971,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4505,64 +3979,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4571,7 +4045,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4583,33 +4057,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4622,29 +4091,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4655,12 +4124,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4684,23 +4153,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4709,7 +4173,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4718,14 +4182,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4735,7 +4199,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4743,7 +4207,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4751,22 +4215,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4785,29 +4243,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Эн� %s н�м�лт зааврыг харна уу."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "хууда�наа�"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Хувилбарыг за�варла"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Хувилбар амжилттай шин�чл�гдл��."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4876,34 +4337,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4911,49 +4372,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4963,59 +4419,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5024,26 +4473,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5086,7 +4535,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Эн� н�м�гд�л хоригд�он"
 
@@ -5137,7 +4586,7 @@ msgstr "Шүүлт"
 msgid "editorcp_logs_filter_by"
 msgstr "Төрөл/Үйлдл��р нь шүүх"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Үйл �вдлын бүртг�л бичл�г"
 
@@ -5199,7 +4648,7 @@ msgstr "%s-� %s хүрт�лх оруулгыг харуул"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Эн� хугацаанд �мар ч үн�лг�� олд�онгүй."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Х�нан шалгалтын бүртг�л"
 
@@ -5223,24 +4672,24 @@ msgstr "За�варлагчийн �үүлийн үеийн төлөв"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "�ийт үн�лг��"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "��м�гдлийг үн�лж дүгн�х"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Дараах талбаруудыг бөглөнө үү:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Ядаж н�г файлыг үн�лж дүгн�х��р �онгоно уу."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Өөр�дөө үн�лж дүгн�х хориотой."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Гадаад програм"
 
@@ -5252,39 +4701,39 @@ msgstr "Шин� чадвар н�м�х"
 msgid "editors_featured_add_feature_submit"
 msgstr "��м"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Чадвар н�м�х�д алдаа гарав."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Чадварыг амжилттай н�м�в."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Чадварыг за�варлахад алдаа гарав."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Чадварыг амжилттай за�варлав."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "��г юмуу ��в�л олон орон нутгийн тохиргоо буруу байна."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Чадварыг у�тгахад алдаа гарав."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Чадварыг амжилттай у�тгав."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Чадвараар хангагд�ан н�м�гдлүүд"
 
@@ -5296,166 +4745,103 @@ msgstr "Очих"
 msgid "editors_featured_remove_feature"
 msgstr "Чадварыг у�тга"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Шүүлтүүрийн дараалал"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Х�р�гт�й холбоо�ууд"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "За�варлагчийн заавар"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "��м�гдлийн журам"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Эдг��р шүүлтүүрүүд нь �н� х���гт�� ��в�л арилгатал байрлах болно."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Дүгн�лт хийгд�х��р %s доторх н�м�гдлүүд байхгүй байна."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 өдрийн"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 цагийн"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 минутын"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "За�варлагч х�нах �амбар"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "зөвхөн %s "
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Урьдчил�ан хувилбар"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s-тай тохиромжтой"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Ц�в�рх�н"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Шүүлтүүр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Одоогоор бүх үн�лж дүгн�х дараалал хоригд�он. Дараа дахин шалгана уу."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Үн�лж дүгн�х �вц"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�ийтийн хууда� руу оруулах"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Супер дүгн�гчийн хү��лт"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Түр хайрцагт үлд��х"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Тайлбарт үн�лг�� дүгн�лт хийх"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5463,30 +4849,30 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Эн� нь н�м�гд�л болон түүний хамгийн �үүлийн хувилбар ба файлуудыг олон "
 "нийтийн хууд�анд т�мд�гл�д�г. Дараагийн хувилбарууд нь зав�арлагчаар "
 "х�нагдах хүрт�л түр хайрцагт байрлах болно."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Эн� нь н�м�гдлийг түр хайрцагт үлд��н�."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Эн� нь нийтийн түр байрлуулах хайрцагт буй н�м�гдлийн хувилбарыг нийтийн "
 "хууд�анд харуулагдах �рх өгдөг."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Эн� нь нийтийн түр байрлуулах хайрцагт буй н�м�гдлийн хувилбарыг түр "
 "хайрцагт үлд��д�г."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Х�р�в та �н� н�м�гдлийн нууцлал юмуу ��в�л зохиогчийн �рхт�й холбоотой "
@@ -5494,74 +4880,74 @@ msgstr ""
 "дараах талбарт бич��р�й. Т�р нь зохиогч уруу биш админи�тратор луу илг��гд�х "
 "болно."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Бүрдлийг харах"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Зохиогч:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Төрлүүд:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Зохицох �и�темүүд:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Тодорхойлолт"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Хөгжүүл�гчийн тайлбар"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Файлууд:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Түүх"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "��р д�вшүүл�лтийн тодорхойлолт"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Үзүүлб�р"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Хувь хүнд холбогдох м�д��ллийг хамгааалах журам"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "%s үн�лг�� дүгн�лт хийх"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Үн�л�гчд�д зориул�ан т�мд�гл�л"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "��гтг���н м�д��л�л"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Хувилбарын т�мд�гл�л"
 
@@ -5591,7 +4977,7 @@ msgstr "��р д�вшүүл�лт зөвшөөрөгд�өн/�ийтийн х
 msgid "editors_review_history_nominated_denied"
 msgstr "��р д�вшүүл�лт цуцлагд�ан/Түр хайрцагт"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Ямар ч өмнөх үн�лг��ний оруулга олд�онгүй."
 
@@ -5619,96 +5005,83 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Програмууд:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "��в�л урьдчилан хадгал�ан хариулт �онгох:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Тайлбар:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Үйлдлийн �и�темүүд:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Д��д х���г рүү"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Үзүүлб�р олд�онгүй."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Үн�лг�� дүгн�лтийн дараалал"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Үйлдлийн �вц"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Үйлд�л"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Тайлбар"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Огноо"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Х�наж дүгн���н"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Хувилбар/Файл"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Х�нах дүгн�лт амжилттай гүйц�тг�гдл��."
 
@@ -5734,7 +5107,7 @@ msgstr "Үйлд�л"
 msgid "editors_reviews_in_reply_to"
 msgstr "Хариу:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Х�налт дүгн�лтүүд амжилттай гүйц�тг�гдл��!"
 
@@ -5746,82 +5119,87 @@ msgstr "Х�наж дүгн�х ажил байхгүй байна."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Х�наж дүгн�лт хийх"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Ту�гай хууд�анд зориул�ан"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Шин�"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Шин�чл�гд��н"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Шалгагд�ан програмууд"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Шалга�ан үйлдлийн �и�темүүд"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "��м�лт м�д��л�л"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "��м�гд�л"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Төрөл"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "��м�гдлийн төрөл"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "�а�"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Програмууд"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Орон нутагт нь х�згаарлах уу?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Үйлдлийн �и�тем"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Илг��х төрөл"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s өдөр"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s цаг"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s минут"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Хандах �рхгүй"
 
@@ -5829,19 +5207,17 @@ msgstr "Хандах �рхгүй"
 msgid "error_access_denied_message"
 msgstr "Танд �н� хууд�ыг үз�х �рх байхгүй байна."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5850,14 +5226,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "��м�гд�л олд�онгүй!"
 
@@ -5870,55 +5243,59 @@ msgstr "Эн� н�м�гд�л �нд харуулагдах боломжгүй
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Эн� төрөлд �мар ч н�м�гд�л алга!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Эн� хүчинт�й захианы ха�г биш байна."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Эн� талбар хоо�он байх ё�гүй."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Файл олд�онгүй!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Файлын алдаа: %s г�ж байхгүй байна."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Эн� хү�н�гт�нд алдаа байна. Т�дг��рийг за�аад дахин илг��н� үү."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Эн� ха�г буруу х�лб�ршилт�й байна. Зөв ха�г http://example.com/my_page г���н "
@@ -5926,47 +5303,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Байхгүй байгаа аргументууд: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Т�мд�гл�г��"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Үзүүлб�р олд�онгүй!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Та дүгн�лт өгөхийг �онгох ё�той."
 
@@ -5974,47 +5339,38 @@ msgstr "Та дүгн�лт өгөхийг �онгох ё�той."
 msgid "error_user_already_confirmed"
 msgstr "Эн� х�р�гл�гчийн �рх өмнө нь батлагд�ан байна."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Бүртг�лийн буруу батлах код байна!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "�ууц үгнүүд ижил биш байна."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Эн� захианы ха�г нь өөр х�р�гл�гч��р өмнө нь бүртг�гд��н байна."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Захианы ха�гаа �олих хугацаа тань х�т�р��н байна. Х�р�гл�гчийн буланд очиж "
 "өөрийнхөө захианы ха�гаа өөрчлөөд, батлах захиа ир�нгүүт түүн дотор буй "
 "холбоо� д��р дарж баталгаажуулна уу."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Эн� н�р нь өөр хүн��р авагд�ан байна."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Х�р�гл�гч олд�онгүй!"
 
@@ -6024,42 +5380,39 @@ msgstr ""
 "Захиагаар хүл��ж ав�ан батлах кодоор х�р�гл�гчийн �рх�� �хл��д батлуулах "
 "ё�той."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Х�р�гл�гчийн н�р ��в�л нууц үг буруу байна!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Хувилбар олд�онгүй!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Буруу нууц үг оруул�ан байна!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "��м�лт м�д��л�л"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s-н талаар н�мж м�д�х"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "үн�лг��"
 msgstr[1] "үн�лг��нүүд"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Д�лг�р�нгүй харах"
 
@@ -6103,43 +5456,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Бүх �рх хуулиар хамгаалагд�ан."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Зохиогчийн �рх"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Зохиогчид"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Мозила нь �дг��р холбоо�ыг танд ту�ламж болгох зориулалтаар үзүүлж байгаа "
@@ -6147,98 +5499,91 @@ msgstr ""
 "м�д��лл��р хангаагүй болно. Програмтай холбоотой а�уулт, гомдол хү��л байвал "
 "програм зохиогчид уруу нь илг��х х�р�гт�й."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Оч"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Хуулийн анхааруулга"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Бу�ад х�л д��р:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Хувь хүнд холбогдолтой м�д��ллийг хамгаалах журам"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Хадгал"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Үгийн �ан"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Үгийн �ангууд"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Өргөтгөл"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Өргөтгөлүүд"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Х�лний багц (��м�гдлийн)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Х�лний багцнууд (��м�гдлийн)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Х�лний багц (Програмын)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Х�лний багцнууд (Програмын)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Плагин"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Плагинууд"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "В�бд хайгч"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "В�бд хайгчид"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Харуулах ма�г"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Харуулах ма�гууд"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "%1$s н�м�гдлийн хууда� руу буцах"
@@ -6247,95 +5592,37 @@ msgstr "%1$s н�м�гдлийн хууда� руу буцах"
 msgid "header_main_firefox_header"
 msgstr "Firefox н�м�гдлүүд"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "��м�гдлүүд"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey н�м�гдлүүд"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird н�м�гдлүүд"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird н�м�гдлүүд"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "��м�гдлүүд"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "��втр�х"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Гарах"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Миний бүртг�л"
 
@@ -6343,72 +5630,49 @@ msgstr "Миний бүртг�л"
 msgid "header_navlink_register"
 msgstr "Бүртгүүл�х"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s-н үзүүлб�р зураг"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "Та �н� н�м�гдлийг �уулгахын тулд <a href=\"%1$s\">н�втр�х</a> үйлд�л хийх "
 "х�р�гт�й"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "%s %s руу н�м"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s-г %2$s руу н�м"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s-г татаж ав"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Эн� н�м�гд�л боломжгүй байна."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Х�лний багц болон үгийн �ангийн жаг�аалт."
 
@@ -6420,8 +5684,8 @@ msgstr "Үгийн �ан татаж авах"
 msgid "langtools_download_langpack"
 msgstr "Х�лний багц татаж авах"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Үгийн �ан болон х�лний багц"
 
@@ -6433,80 +5697,36 @@ msgstr "Үгийн �анг �уулга"
 msgid "langtools_install_langpack"
 msgstr "Х�лний багцыг �уулга"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Үгийн �ан"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Х�лний багц"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Х�л"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Энд дарж �хл�л хууда� руу буцна уу."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Огноо"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Татаж авалт"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "��м�гдлийн н�р"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Үн�лг��"
@@ -6532,21 +5752,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Үгийн �ан болон х�лний багцнууд"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Плагинууд"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Харуулах ма�гууд"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "бу�ад"
 
@@ -6555,35 +5782,14 @@ msgstr "бу�ад"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6620,15 +5826,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Програмын хүчинт�й хувилбар"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Мозилагийн н�м�гд�л рүү илг��гд�ж буй н�м�гдлүүд нь дараах програмуудын �даж "
@@ -6636,7 +5842,7 @@ msgstr ""
 "жаг�аалт  т�дг��р програмд тохиромжтой байна."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6645,15 +5851,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "�нд"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Хувилбарууд"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Өмнөх хууд�анд буцах"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Түр хайрцгийн м�д��ллийн хууда�"
 
@@ -6661,6 +5870,12 @@ msgstr "Түр хайрцгийн м�д��ллийн хууда�"
 msgid "pagination_next_page"
 msgstr "дараах"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "�ийт %2$s хууда�ны %1$s дугаарх нь"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "өмнөх"
@@ -6700,17 +5915,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Эн� үн�лг��ний т�мд�гл�лд алдаа гарлаа!"
 
@@ -6719,7 +5934,7 @@ msgstr "Эн� үн�лг��ний т�мд�гл�лд алдаа гарлаа
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6739,8 +5954,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Танд ба�рлалаа, �н� үн�лг�� нь за�варлагчаар зөвшөөрөгдөхөөр т�мд�гл�гд�в."
@@ -6756,7 +5971,7 @@ msgstr ""
 "за�варлагчаар х�нуулахаар т�мд�гл�н� үү."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -6774,133 +5989,103 @@ msgstr ""
 "a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s-н үн�лг�� дүгн�лт"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Онцгой шинж чанартай н�м�гдлүүд"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Шин� н�м�гдлүүд"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Шин�чл�гд��н н�м�гдлүүд"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Хайлт хийх одоогоор боломжгүй. Дараа дахин оролдоно уу."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "бүх н�м�гдлүүд"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "н�м�гд�л хайх"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "хайх талбар"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Бүх хайлт хийгчд�д"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Хайлт хийгчдийг харуул"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s тохирол"
+msgstr[1] "%s тохирол"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Ямар ч үр дүн олд�онгүй."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "��м�гд�л хайх"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Хайлтын үр дүнгийн товч м�д��"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Хайлтын үр дүн: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Зохицуулагчын х�р�г��л"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Хөгжүүл�гчийн х�р�г��л"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "За�варлагчийн х�р�г��л"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Тавтай морилно уу"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Тавтай морилно уу, %s-д"
@@ -6909,7 +6094,7 @@ msgstr "Тавтай морилно уу, %s-д"
 msgid "sidebar_pitch_dictionary"
 msgstr "Үгийн �ан"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Д�мжл�гт�й н�м�гдлүүд"
 
@@ -6917,7 +6102,7 @@ msgstr "Д�мжл�гт�й н�м�гдлүүд"
 msgid "sidebar_pitch_looking_for"
 msgstr "Миний хайж буй зүйл бол:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Шин� н�м�гдлүүд"
 
@@ -6925,7 +6110,7 @@ msgstr "Шин� н�м�гдлүүд"
 msgid "sidebar_pitch_search"
 msgstr "Өргөтгөл хайх"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Бүртгүүл�х "
 
@@ -6933,23 +6118,24 @@ msgstr "Бүртгүүл�х "
 msgid "sidebar_pitch_theme"
 msgstr "Харуулах ма�г"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Шин�чл�гд��н н�м�гдлүүд"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KБ"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Одоогоор үн�лг�� аваагүй"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Таваа� %s од ав�ан"
@@ -6986,13 +6172,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "M. j, l д�х өдөр"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s үү�г�гд��н"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s гарга�ан"
@@ -7005,185 +6191,185 @@ msgstr "Хаах"
 msgid "statistics_help_link"
 msgstr "Ту�ламж"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "��в�л өөр н�м�гд�л �онгох"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "��в�л нийтийн �удалгаатай н�м�гд�л �онгох"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Судалгааг нь харахыг хү���н н�м�гдл�� �онгоно уу"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Судалгааг нь харахыг хү���н н�м�гдл�� �онгоно уу"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "�ийтийн �удалгаатай н�м�гд�л �онгох"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Судалгааны �амбар"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Судалгааг харах"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "байхгүй"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Эн� харуулалтыг у�тга"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s �удалгаа олдов"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Харуулалт н�м�х"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Эн� графикт өөр харуулалт н�м�х"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "�ийт тоог нуу"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "�ийт тоог харуул"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Өгөгдлийг харах (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Эн� өгөгдлийг та�лалаар ту�гаарлагд�ан х�лб�р��р авах"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "%s үйл �вцыг нуух"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "%s үйл �вцыг харуул"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Харуулалт д��р н�м�гдлийн гар�ан огноог дар"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefox үйл �вцыг нуу"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefox үйл �вцыг харуул"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Харуулалт д��р Firefox гар�ан огнооог нуу"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Графикийг хураа"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Графикийг д�лг�"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Графикийн х�мж��г өөрчил"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Өдөржин х�р�гл�д�г ид�вхит�й х�р�гл�гчид"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Програмууд"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Бу�ад төрлийн"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Татаж авалт"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Үйлдлийн �и�тем"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "��м�гдлийн төлөв байдал"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Дүгн�лт"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "��м�гдлийн хувилбар"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Програм"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Үйлдлийн �и�тем"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "��м�гдлийн төлөв байдал"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Үл м�д�гд�х"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "��м�гдлийн хувилбар"
 
@@ -7221,7 +6407,7 @@ msgstr "Таны тохиргоо шин�чл�гд��н!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Судалгааны �амбар"
 
@@ -7249,106 +6435,110 @@ msgstr "Бага�гаж харуул"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "��г �арын харуулалтаар бага�гаж харуул"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s-н �удалгааны н�г өдрийн үзүүл�лт"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Дүгн���н өгөгдлийн RSS м�д��л�лт"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "Y, F, j, l"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "%1$s-н �удалгааны үзүүл�лт"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "�нхдагч тохиргоогоор бол зөвхөн та болон Мозиллагийн хүмүү� таны �удалгааны "
 "�амбарт хандах боломжтой. Та �н� �удалгааг олон нийт�д харуулахаар тохируулж "
 "ба� болно."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Самбарт хандах тохируулга"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Хувийн"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr ""
 "Зөвхөн та болон Мозиллагийн хүмүү� �н� н�м�гдлийн �удалгааны үр дүнг харна"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "�ийтийн"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Эн� н�м�гдлийн �удалгааны үр дүнг хүн болгон харна"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Тохиргоог өөрчил"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Эн� м�д��ллийг хувийн чухал г�ж тооцож хандана уу."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Эн� �амбар одоогоор <b>хувийн</b> г���н тохируулгатай."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Эн� �амбар одоогоор <b>нийтийн</b> г���н тохируулгатай."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Түгжигд��н"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Самбарт буцаж очих"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Тохиргоог хадгал"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s-н �удалгааны �амбарын тохиргоо"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Түгжигд��гүй"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Програм"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "ҮС"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Суд"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "ҮМ"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Хув"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Өдрийн дундаж татаж авалт"
 
@@ -7360,7 +6550,7 @@ msgstr "Татаж авалт"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Сүүлийн өдрийн тоо"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Сүүлийн 7 хоногийн татаж авалт"
 
@@ -7378,7 +6568,7 @@ msgstr "%1$s-� хойшхи"
 msgid "statistics_summary_nodata"
 msgstr "Өгөгдөл байхгүй"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Өдрийн ид�вхит�й х�р�гл�гчдийн дундаж"
 
@@ -7404,51 +6594,34 @@ msgstr "Өдрийн ид�вхит�й х�р�гл�гчид"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s-нд"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s �удалгаа"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Бүх харуулах ма�г"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Харуулах ма�гуудыг харуул"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Захианы ха�гаа өөрчлөх"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "�ууц үг�� �олих"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Баталгаажуулах код дахин илг��гд��н!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7456,23 +6629,23 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7482,60 +6655,60 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7543,7 +6716,7 @@ msgstr ""
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7551,25 +6724,25 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Таны шин� захианы ха�гийг баталгаажуулах захиа %1$s ха�г руу илг��гд�в. "
 "Өөрчлөлтөө батлахын тулд ир��н захиан дотор буй холбоо� д��р дарах "
 "шаардлагатай. Т�р болтол та одоогийн захианы ха�гаараа н�вт�р��н байж болно."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7597,7 +6770,9 @@ msgstr ""
 "-- %2$s н�м�гдлүүд"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Та %2$s н�м�гд�л д��рх захианы ха�гаа өөрчлөх хү��лт тавь�ан байна.\n"
@@ -7638,112 +6813,91 @@ msgstr ""
 "Ба�рлалаа,\n"
 "-- %2$s н�м�гдлүүд"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "%s н�м�гдлийн нууц үг�� өөрчлөх"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "�лдаа!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Та %1$s н�м�гд�л д��рх захианы ха�гийн өөрчлөлтөө батлана уу"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "�мжилттай!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Таны захианы ха�г амжилттай өөрчлөгдлөө. Одооноо� �хл�н та %1$s ха�гийг "
 "ашиглаж н�втр�х үйлд�л хийг��р�й."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "�ууц үгийг дахин оруул"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "%s-н х�р�гл�гчийн м�д��ллийг за�варла"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Захианы ха�г"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Овог н�р"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Захианы ха�гийг нуу"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "В�б хууда�ны ха�г"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "��р"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Х�р�гл�гчийн н�втр�лт"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Шин� нууц үг"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Гоц н�р"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Хуучин нууц үг"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "�ууц үг"
 
@@ -7751,71 +6905,71 @@ msgstr "�ууц үг"
 msgid "user_form_registration"
 msgstr "Шин� х�р�гл�гчийн бүртг�л"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Түр хайрцгийг харуулах уу?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Хадгал"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "��втр�х"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Бүртгүүл�х"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s н�м�гдлийн х�р�гл�гчийн бүртг�л"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Шин� х�р�гл�гчийн бүртг�л үү�г�х"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Таны хий��н өөрчлөлтөнд алдаа байв. Т�д нарыг за�аад дахин илг��н� үү.."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "М�д��л�л шин�чл�гд��н."
 
@@ -7828,15 +6982,15 @@ msgstr "%s-н нууц үгийг өөрчлөх"
 msgid "user_pwreset_header"
 msgstr "�ууц үг өөрчлөх"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "�ууц үг�� март�ан уу?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "�ууц үг�� өөрчлөх холбоо� ха�г таны захиа руу илг��гдл��."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "�ууц үг амжилттай өөрчлөгдлөө."
 
@@ -7848,7 +7002,7 @@ msgstr "�ууц үгийн өөрчлөлтийг илг��"
 msgid "user_pwreset_submit_sendlink"
 msgstr "�ууц үг өөрчлөх холбоо� илг��х"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s н�м�гд�л"
@@ -7862,7 +7016,7 @@ msgstr ""
 "$s н�м�гд�л рүү н�втр�х����� өмнө т�р холбоо� д��р дарах ё�той."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7874,24 +7028,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "баталгаажуул�ан захиаг дахин илг��ж"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Ба�р хүрг�е! Таны х�р�гл�гчийн бүртг�л амжилттай бүртг�гдл��."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7903,32 +7043,22 @@ msgstr ""
 "болно."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Бүртгүүл��нд тань ба�рлалаа. %1$s-д тавтай морилно уу!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -7937,68 +7067,52 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "�мжилттай баталгааж�ан!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Х�р�гл�гчийн бүртг�л за�вар"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s-н зохио�он н�м�гдлүүд"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "��р"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Х�р�гл�гчийн м�д��л�л"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Захианы ха�г"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "В�б хууда�"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Гоц н�р"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s х�р�гл�гчийн м�д��л�л"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Х�р�гл�гчийн н�втр�лт"
 
@@ -8030,703 +7144,5 @@ msgstr "�ууц үг шин��р оруулах"
 msgid "users_register_pagetitle"
 msgstr "Шин� х�р�гл�гчийн бүртг�л"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Хамгийн �үүлийн тохирох хувилбар"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Хувилбарын бүр�н түүх"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Шин�х�н:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Өргөн тарх�ан нь:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Бидний �анал болголт:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Са�хан шин�чл�гд��н:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Бүгдийг нь харах"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Бүх �анал болгогд�он н�м�длүүдийг харах"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Их үн�л�гд��н нь �х�нд"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Хамгийн �үүлд шин�чл�гд��н нь �х�нд"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Хамгийн өргөн тарх�ан нь �х�нд"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Эн� н�м�гдлийн одоогийн хувилбар нь Firefox %1$s г���н хувилбартай нь "
-#~ "тохир�он г�ж м�д�гд�хгүй байна. Firefox-н шин� хувилбар удахгүй гарах г�ж "
-#~ "байна г�ж г�ж Мозилла тооцов. ��м�гдл�� шин� хувилбар д��р туршаад "
-#~ "тохиромжийнх тухай м�д��ллийг нь шин�чилн� үү. Та �н� талаарх д�лг�р�нгүй "
-#~ "м�д��ллийг <a href=\"%2$s\">�нд���</a> авах боломжтой. Эн� нь зөвхөн "
-#~ "�ануулга болохоор та �н� хувилбараа илг��х үйлдл�� үрг�лжлүүл�н гүйц�тг�ж "
-#~ "болох юм."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "��м�гдл�л хорих амжилттай боллоо"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "��м�гдлийг за�варла"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "��м�гдл�л зөвшөөрөх амжилттай боллоо"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "��м�гдлийн тодорхойлолт"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "��м�гдлийн в�б хууда�"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "��м�гдлийн н�р"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Хувь хүнд холбоотой м�д��л�л хамгаалах журам "
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "��м�гдлийн ерөнхий тайлбар"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Лавлах захианы ха�г"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Лавлах в�б хууда�"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Хувилбарын т�мд�гл�г��"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "��р д�вшигд��н н�м�гдлүүд"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "��м�гдлийн н�р д�вшүүл�лт амжилттай боллоо!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "%1$s хууд�анд зорчиж илг��мжд�� өөрчлөлт хийх ��в�л %2$s д��р дарж "
-#~ "хөгжүүл�гчийн үнд��н �амбарт буцна уу."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "�нд дарж"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "��м�гдлийг за�варла"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Эн� хувилбар нь Мозилагийн н�м�гд�л за�варлагдаа� үн�лг�� дүгн�лт "
-#~ "хийлг�х��р түр хайрцганд байрла�ан байгаа. Үн�л�лт хийгд��ний дараа танд "
-#~ "захиагаар м�д�гд�х болно."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Түр хайрцагт буй зүйл�ийн дүгн�х зарчмыг %s хууда�наа� харна уу."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "�н�"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Эн� хувилбар нь дадлага туршлагатай х�р�гл�гчд��р х�р�глүүл�хийн тулд түр "
-#~ "хайрцганд байрлуулагд�ан. �ийтийн хууд�анд харуулахын тулд та өөрийнхөө "
-#~ "н�м�гдл�� %s х�р�гт�й бөгөөд үн�лж дүгн�х �вцыг давж гарах х�р�гт�й."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "н�р д�вшүүл�х"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Таны н�м�гд�л илг��лт амжилттай гүйц�тг�гдл��."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Таны н�м�гд�л итг�гд��н төрөлд багтдаг учраа� �н� хувилбар нь автоматаар "
-#~ "нийтийн хууд�анд орно."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "��м�гдлийг илг��"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "��м�гд�л амжилттай шин�чл�гдл��"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Та магадгүй %s хийж н�м�гдлийнх�� �онирхлыг их��г�ж болох юм."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "үзүүлб�р илг��лт"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Зохиогч олд�онгүй [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "У�тга"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Цуцал"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Та илг��лт�� цуцлах г�ж буйдаа итг�лт�й байна уу?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Дараах"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "��м�гдлийн төрөл өөрчлөх:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Хөгжүүл�гчийн тайлбар шин�чл�гд��н."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Үзүүлб�р н�м�х"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Зохиогч"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Зохиогч"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Байхгүй"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Төрлүүд"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Төрөл"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Тодорхойлолт"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Хоригд�он"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "�арийн м�д��л�л"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Хөгжүүл�гчийн товч тайлбар"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Үзүүлб�рүүд"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Хувилбарууд"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "В�б хууда�"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Байхгүй"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Гарчиггүй"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "үзүүлб�р олд�онгүй."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Шин�чил"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Лавлах захианы ха�г"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Хөгжүүл�гч��� �мар ч захианы ха�г өгөгдөөгүй байна."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Лавлах в�б хууда�"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Хөгжүүл�гч��� �мар ч в�б хууда�ны ха�г өгөгдөөгүй байна."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Итг�гд��н"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Хувилбар олд�онгүй."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Цуцлаад буцъ�"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Тийм, үүнийг хорь"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Та �н� н�м�гдлийг хорих г�ж буйдаа итг�лт�й байна уу?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Эн� н�м�гдлийг хорь�оноор хайх болон харуулах жаг�аалтнаа� нуудаг. Мөн "
-#~ "�н� нь в�б хууда�наа� татаж авагдахгүй бөгөөд х�р�гл�гч��� "
-#~ "шин�чл�гд�хгүй. Уг н�м�гд�л нь бараг у�тгагдах бөгөөд х�р�в та хү�в�л �н� "
-#~ "хууд�анд буцаж ир��д хорих үйлдлийг цуцалж болно."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "%s-г хорих"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Тийм, үүнийг зөвшөөр"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Та �н� н�м�гдлийг зөвшөөрөх г�ж буйдаа итг�лт�й байна уу?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Эн� н�м�гдлийг зөвшөөр�өнөөр уг н�м�гд�л нь хайх болон харуулах "
-#~ "жаг�аалтанд �рг��д харуулагдах болно. Мөн в�б хууда�наа� татаж авагдах "
-#~ "болон х�р�гл�гч��� шин�чл�гд�х боломжтой байх болно."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "%s-г зөвшөөр"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Зохиогч н�м�х"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Зохиогчийн захианы ха�г"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "У�тга"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Эн� н�м�гдлийн төрөлд таар�ан төрөл олд�онгүй."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Зохиогчид"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Т�мд�г зураг н�м"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Т�мд�г зургийг өөрчил"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Интерн�т��р х�р�гл�гчд�д �х бичл�гийг нь харуулахыг зөвшөөр"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Төрлүүд"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "�нхдагч нутагшил"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Зөвхөн одоогийн т�мд�г зургийг арилга"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Шин� т�мд�г зураг файл"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Т�мд�г зураг"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "н�м�лт бичил м�д��л�л (х�р�гл�х х�л г�х м�т)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Шин�чил"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">х�р�гл�х "
-#~ "х�лний н�р</a>, жиш�� нь 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Чагтал�ан файлууд у�тгагдах болно."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Файлууд"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Зориул�ан програм"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Файл байхгүй."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Үн�л�л дүгн�лт хийгчд�д зориул�ан т�мд�гл�г��"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Шин�чил"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Ерөнхий тайлбарын д��д х�мж�� нь 250 т�мд�гт.\n"
-#~ "(Та %s т�мд�гт бич��н)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Таны н�м�гдлийн н�р өгөгдлийн бааз дотор өмнө оруулагд�ан байна. Та: <br /"
-#~ "><li>Таны GUIDs дугаар тохирч буй ���хийг шалгана уу. Эн� алдааны байнга "
-#~ "гардаг шалтгаан нь  үл тохироогүй GUIDs-� бол�он байдаг.</li><li>Та "
-#~ "өгөгдлийн баазын оруулгах давхарлах х�р�ггүй. Х�р�в давхарла�ан байгаа "
-#~ "бол т�р оруулгаа шин�чл�х ��в�л у�тгаад дахин оролдох х�р�гт�й.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Эн� н�м�гд�лд ор�он шин�чл�лийн өөрчлөлтийг тодорхойлно уу."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Бүх файлын GUIDs тохир�онгүй"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Эн� н�м�гд�л болон үйлдлийн �и�темд тохир�он ижил хувилбар (%s) өмнө нь "
-#~ "байна."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Та н�р д�вшүүл�х�д шаардагдах м�д��ллүүдийг оруулах ё�той."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Та н�м�гдлийн урьдчил�ан хувилбарыг н�р д�вшүүлж болохгүй."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Та зөвхөн түр хайрцганд байгаа н�м�гдлийг л н�р д�вшүүлж болно."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Таны өгөгдлийг хадгалах үед алдаа гарлаа."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Танд �н� н�м�гдлийг шин�чл�х �рх байхгүй байна."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Өөр үйлдлийн �и�темийн файл н�м�х"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Зохиогч н�м�х"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "У�тга"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "Таны шин� н�м�гдлийн төрөл дараагийн алхамд боломжтой болдог."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Эн� н�м�гдлийн төрөлд тохир�он төрөл байхгүй байна."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "��м�гдлийнх�� тодорхойлолтыг оруулна уу."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "��м�гдлийнх�� н�рийг оруулна уу."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Илг��ж байгаа н�м�гдлийнх�� төрлийг �онгоно уу."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "��м�гдлийнх�� ерөнхий тайлбарыг оруулна уу."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "��м�гд�л файл"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "��м�гд�л файл 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "��м�гд�л файл 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "��м�гдлийн төрөл"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Х�р�гл�гчдийн интерн�т��р �х бичл�гийг нь харахыг зөвшөөр"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Зохиогчийн захианы ха�г"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Зохиогчид"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Төрлүүд"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "�нхдагч нутагшил"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Тодорхойлолт"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Х�р�гл�гчийн лицензийн зөвшөөрөл (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Эн� н�м�гд�л өөр гадны програм шаарддаг юм байна"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Файлууд"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "В�б хууда�"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Т�мд�г зураг файл"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "��р"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Д�мжд�г үйлдлийн �и�темүүд"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Эн� нь урьдчил�ан хувилбар байна"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Хувь хүнд холбоотой м�д��ллийг хамгаалах журам"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Эн� нь ту�гай хууд�анд зориул�ан н�м�гд�л байна"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "��гтг���н м�д��л�л"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Лавлах захианы ха�г"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Лавлах в�б ха�г"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Зориул�ан програм"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Хувилбар"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Хувилбарын т�мд�гл�л"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Байхгүй"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Үн�лг�� дүгн�гчд�д зориул�ан т�мд�гл�л"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Таны н�м�гд�л итг�гд��н жаг�аалтад багтдаг учраа� хаана �н� хувилбар "
-#~ "очихыг �онгоно уу:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "�ийтийн"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Түр хайрцаг"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Хөгжүүл�гчийн зөвшилцөл"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "1-р алхам"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Файлаа илг��х"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "2-р алхам"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "��м�гдлийн нарийн м�д��л�л б�лд�х"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "3-р алхам"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Хувилбарын нарийн м�д��ллийг б�лд�х"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "4-Р алхам"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "�утагшуулах"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "5-р алхам"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "�мжилттай дуу�лаа"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Миний н�м�гдлүүд"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "��м�гдлийн нарийн м�д��л�л рүү буцах"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "�втоматаар танигд�ан н�м�гдлийн төрөл: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Эн� н�м�гдлийн анхдагч нутагшил нь (%1$s [%2$s]) таны одоогийн �онго�он "
-#~ "нутагшлаа� (%3$s [%4$s]) өөр байна. Доорх талбарууд %1$s нутагшлаар "
-#~ "харуулагдах болно."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Буруу юу?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Та �н� файлыг у�тгах г�ж буйдаа итг�лт�й байна уу?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Миний одоогийн н�м�гдлийн м�д��ллийг шин�чл�х үйлдлийг алга�"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "��м�гд�л илг��х үйлд�л одоогоор хоригд�он. Х���г хугацааны дараа �рг�ж "
-#~ "шалгана уу."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Би зөвшөөрнө"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Би татгалзана"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Эн� н�м�гд�л админи�тратороор хоригд�он байна."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Хоригд�он"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Итг�гд��н"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Танд �мар ч н�м�гд�л байхгүй байна. Та %s дарж н�м�гд�л илг��н� үү."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "�нд"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Та өөрийнхөө ма�гт тохируулж %s шалгах х�р�гт�й."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "үзүүлб�р н�мж"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Хувилбарыг за�варла"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Хувилбар амжилттай шин�чл�гдл��."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Шин�"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Шин�чл�гд��н"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "��м�гдлийн төрөл"
-
-#~ msgid "editors_th_age"
-#~ msgstr "�а�"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Програмууд"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Үйлдлийн �и�тем"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Илг��х төрөл"
-
-#~ msgid "error_notice"
-#~ msgstr "Т�мд�гл�г��"
-
-#~ msgid "forum_save"
-#~ msgstr "Хадгал"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Плагинууд"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Өмнөх хууд�анд буцах"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "�ийт %2$s хууда�ны %1$s дугаарх нь"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s тохирол"
-#~ msgstr[1] "%s тохирол"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Дүгн���н өгөгдлийн RSS м�д��л�лт"
diff --git a/site/app/locale/nl/LC_MESSAGES/messages.po b/site/app/locale/nl/LC_MESSAGES/messages.po
index b4a2020..4ece3b6 100644
--- a/site/app/locale/nl/LC_MESSAGES/messages.po
+++ b/site/app/locale/nl/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-04 19:53+0100\n"
+"PO-Revision-Date: 2009-03-09 19:29+0100\n"
 "Last-Translator: Mark Heijl <markh@babelzilla.org>\n"
 "Language-Team: DUTCH <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,169 +17,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Installatie afbreken"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Nu downloaden %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Accepteren en downloaden"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accepteren en installeren"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Publiek"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Bijgewerkt op %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versie %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "downloads in totaal"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "downloads per week"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s add-on"
 msgstr[1] "%1$s add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per pagina"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sorteren op:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimenteel"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "aanbevolen"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is niet beschikbaar voor %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Terug naar %1$s…"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Terug naar de beoordelingen…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Waardering:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Beoordeling:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Uw beoordeling indienen"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Beoordeling toevoegen voor %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titel/Samenvatting:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Verwijderen"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Beantwoorden"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Weet u zeker dat u deze beoordeling wilt verwijderen?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nee"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ja"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Beoordeling verwijderen"
 
@@ -188,7 +179,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Beoordeling succesvol verwijderd."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Beoordeling voor %s bewerken"
@@ -202,18 +193,18 @@ msgstr ""
 "karakters was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Opmerking: voordat uw beoordeling op de publieke site verschijnt zal deze "
 "worden gescreend door een editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Antwoord van de ontwikkelaar op:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -230,161 +221,131 @@ msgid "addon_review_pagetitle"
 msgstr "Beoordelingen voor %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Antwoord van %1$s op %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Antwoord ontwikkelaar:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Uw beoordeling is succesvol opgeslagen. Bedankt!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "door %1$s op %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "door %1$s op %2$s (waardering %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Volgende add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Vorige add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Permanente koppeling naar deze versie"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "De meest recente versie die compatibel is met %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Indienen"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Profiel van de schrijver bekijken"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Door alle thema’s bladeren :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s doorbladeren"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Door alle thema’s in de categorie %1$s bladeren :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Wat is dit?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Beoordeling toevoegen"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Geavanceerde details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorieën"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Aan een collectie toevoegen:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nieuwe collectie…"
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Selecteer een collectie…"
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publiceren"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s is toegevoegd aan de %2$s-collectie."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Wat is dit?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "en nog %1$s collectie"
-msgstr[1] "en nog %1$s collecties"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "gedetailleerde beoordeling"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Niet geweldig"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Uw beoordeling bewerken"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Deze add-on kent een privacybeleid."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Verschrikkelijk"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Verwante collecties"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Opmerkingen van de ontwikkelaar"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Startpagina"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Broncodelicentie"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Beoordelingen"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Ondersteuning"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Niet slecht"
 
@@ -392,22 +353,19 @@ msgstr "Niet slecht"
 msgid "addons_display_long_description"
 msgstr "Uitgebreide beschrijving"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Geweldig"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Meer afbeeldingen"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Deze add-on is nog niet in een collectie opgenomen."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Andere add-ons door %1$s"
@@ -416,21 +374,21 @@ msgstr[1] "Andere add-ons door deze schrijvers"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "De ontwikkelaar biedt ondersteuning voor deze add-on op %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -438,20 +396,21 @@ msgstr ""
 "mailbericht sturen aan %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "De ontwikkelaar biedt ondersteuning voor deze add-on op %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Waarderen"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Fantastisch"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Meld a.u.b. geen fouten in beoordelingen. We stellen uw e-mailadres niet "
@@ -459,45 +418,50 @@ msgstr ""
 "u opnemen om te helpen bij het oplossen van uw probleem."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Beoordelingsrichtlijnen</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Kijk in de <a href=\"%1$s\">ondersteuningssectie</a> voor het verkrijgen van "
 "ondersteuning voor deze add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Opslaan"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Alle %1$s add-ons bekijken"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Alle beoordelingen bekijken (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Alle versies bekijken"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Volledige versiegeschiedenis"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Bron bekijken"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Statistieken bekijken"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Wat vindt u er van?"
 
@@ -505,208 +469,108 @@ msgstr "Wat vindt u er van?"
 msgid "addons_display_workswith"
 msgstr "Werkt met:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Zojuist toegevoegd"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populair"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Aanbevolen"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Abonneren"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Door add-ons bladeren"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Bijgewerkt"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "door"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Populaire collecties"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Collecties"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Alle collecties bekijken"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collecties zijn een manier om add-ons te categoriseren, mengen, matchen en "
-"husselen. Abonneer u op collecties die door andere gebruikers zijn "
-"aangemaakt of maak uw eigen collectie."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> abonnee"
-msgstr[1] "<strong>%1$s</strong> abonnees"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Wij bevelen aan:"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Add-ons breiden %1$s uit, waardoor u uw surfervaring kunt personaliseren. "
 "Neem eens een kijkje en kleed zelf %1$s aan."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Leuke add-ons? Vind er meer in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Meer dan 5000 gratis extra’s</strong> waarmee u Firefox kunt "
-"aanpassen en uitbreiden naar uw wensen."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Wat zijn add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Eenvoudig te installeren</strong> en bij te houden."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introductie"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Werkbalken, thema’s en zoekmachines die <strong>u helpen om uw dagelijkse "
-"taken uit te voeren.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Nieuwste:"
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NIEUW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Overige toepassingen"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on gedownload</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons gedownload</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Populairst:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in gebruik</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in gebruik</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Wij bevelen aan:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Onlangs bijgewerkt:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Alles bekijken"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Alle nieuwe add-ons bekijken"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Alle populaire add-ons bekijken"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Alle aanbevolen add-ons bekijken"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Alle onlangs bijgewerkte add-ons bekijken"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Klik op onderstaande koppeling om het bestand op te slaan.</"
@@ -714,11 +578,11 @@ msgstr ""
 "knop Installeren, zoek/selecteer het gedownloade bestand en klik op “OK�.</"
 "li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Hoe te installeren in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Klik met de rechtermuisknop op de koppeling en kies “Koppeling "
@@ -727,42 +591,39 @@ msgstr ""
 "op de knop Installeren, en zoek/selecteer het gedownloade bestand en klik op "
 "“OK�.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Hoe te installeren in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Experimentele add-ons weergeven"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "OK"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Door"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "voor Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "voor Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "voor Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -770,11 +631,11 @@ msgstr ""
 "ins. Bezoek voor meer informatie over overige voor browsers in de Mozilla-"
 "familie beschikbare plug-ins %1$s."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Op zoek naar een plug-in die niet in deze lijst staat?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plug-ins helpen uw browser om specifieke functies uit te voeren, zoals het "
@@ -783,24 +644,24 @@ msgstr ""
 "wijzigen of er iets aan toevoegen."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Veelgebruikte plug-ins voor %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plug-ins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Ondersteunende documentatie: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -808,41 +669,37 @@ msgstr ""
 "License Agreement) voordat u kunt doorgaan met installeren:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Voorbeeldweergaven voor %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Onlangs toegevoegd"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Met zo veel geweldige add-ons beschikbaar is er altijd wel iets voor "
 "iedereen. Om u op gang te helpen hebt u hier een lijst met een paar van de "
 "populairste. Veel plezier!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Aanbevolen add-ons"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Aanbevolen add-ons"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Aanvullende hulpbronnen"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Ontwikkelingscentrum"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Sorry, u hebt een op Mozilla gebaseerde browser (zoals Firefox) nodig om een "
@@ -857,64 +714,71 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Leer hoe u uw %1$s kunt maken op het %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "eigen zoekmachine"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Blader door meer zoekmachines op %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Zoekmachines"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Een speciaal woord van dank aan het Mycroft Project voor hun werk aan "
 "Firefox-zoekmachines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Dit delen"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Aan Delicious toevoegen"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Dit Diggen!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Posten op Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Delen op FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Posten op MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -928,17 +792,17 @@ msgstr "Onvolledige versie"
 msgid "addons_status_nominated"
 msgstr "In de sandbox; genomineerd voor publiek"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "In de sandbox; wacht op beoordeling"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Publiek"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "In de sandbox"
@@ -947,36 +811,26 @@ msgstr "In de sandbox"
 msgid "addons_status_unknown"
 msgstr "Onbekend"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Meer over deze add-on"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Topdownloads"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Best beoordeeld"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Pas op met oudere versies"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Deze versies worden als referentie en voor testdoeleinden weergegeven. U "
 "dient altijd de meest recente versie van een add-on te gebruiken."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Versiegeschiedenis met overzicht van wijzigingen"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versiegeschiedenis"
@@ -1011,428 +865,153 @@ msgstr "Groepenbeheer"
 msgid "admin_group_saved"
 msgstr "De groep is opgeslagen"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Geavanceerd"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Elke datum"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Elk"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Elke"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Toepassing"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Sleutelwoordovereenkomst"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Laatst bijgewerkt"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Naam"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Nieuwste"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Afgelopen 3 maanden"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Afgelopen 6 maanden"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Afgelopen etmaal"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Afgelopen maand"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Afgelopen week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Afgelopen jaar"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Per pagina"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Populariteit"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Waardering"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sorteren op"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "tot"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Geavanceerd zoeken in-/uitklappen"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versie"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Volgende"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Vorige"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Versiecontrole negeren"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Deze add-on is geschikt voor oudere versies van Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "U kunt een <a href=\"%1$s\">oudere versie proberen</a> of <a href=\"#\" "
 "onclick=\"%2$s\">deze controle negeren</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Een <a href=\"%1$s\">oudere versie</a> werkt wellicht"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Deze add-on vereist het nog niet vrijgegeven <a href=\"%1$s\">Firefox %2$s</"
 "a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Werk Firefox bij</a> om deze add-on te "
 "gebruiken"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s heeft de status van %2$s naar %3$s gewijzigd"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s heeft een onbekende beheeractie %2$s uitgevoerd op ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s heeft functie %2$s verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s heeft toepassing %2$s aangemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s heeft toepassing %2$s bewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s heeft versie %2$s voor %3$s gemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s heeft versie %2$s voor %3$s verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s heeft instelling ‘%2$s’ van ‘%3$s’ in ‘%4$s’ gewijzigd"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s heeft onbekende editoractie %2$s uitgevoerd op ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s heeft add-on %2$s verwijderd uit de lijst met aanbevolen add-ons"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s heeft add-on %2$s toegevoegd aan de lijst met aanbevolen add-ons"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s heeft een functie gewijzigd voor de %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr ""
-"%1$s heeft de locales gewijzigd voor add-on %2$s op de lijst met aanbevolen "
-"add-ons"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s heeft de hash voor bestand %2$s opnieuw berekend"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s heeft %2$s toegevoegd aan groep %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s heeft zichzelf verbonden met %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s heeft groep %2$s aangemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s heeft groep %2$s (ID %3$s) verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s heeft groep %2$s bewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s heeft %2$s verwijderd uit groep %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s heeft een onbekende actie %2$s uitgevoerd op %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s heeft geprobeerd de afgesloten groep %2$s te wijzigen"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr ""
-"%1$s heeft geprobeerd vertalingen in %2$s te wijzigen zonder toestemming"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s heeft besturingssysteem %2$s aangemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s heeft besturingssysteem %2$s (ID %3$s) verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s heeft besturingssysteem %2$s bewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr ""
-"%1$s heeft zich niet opnieuw kunnen aanmelden om toegang te krijgen tot %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s heeft antwoord %2$s aangemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s heeft antwoord %2$s (ID %3$s) verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s heeft antwoord %2$s bewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s heeft beoordeling %2$s goedgekeurd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s heeft beoordeling %2$s verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s heeft een onbekende beveiligingsactie %2$s uitgevoerd op ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s heeft label %2$s aangemaakt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s heeft categorie %2$s (ID %3$s) verwijderd"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s heeft categorie %2$s bewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s heeft de toepassingsvertalingen voor %2$s bijgewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s heeft de blogpostvertalingen voor %2$s bijgewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s heeft de besturingssysteemvertalingen voor %2$s bijgewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s heeft de categorievertalingen voor %2$s bijgewerkt"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s heeft de gebruikersinformatie van %2$s bewerkt"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Add-ons op naam"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Nieuwste add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Populaire add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Add-ons op waardering"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Onlangs bijgewerkte add-ons"
 
@@ -1441,783 +1020,106 @@ msgid "categories_current_title"
 msgstr "Huidige categorie"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorieën"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Kies een categorie"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Alle %1$s bekijken"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "De beschrijving dient minder dan %1$s karakters te bevatten."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s collectie"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Alle aanbevolen add-ons bekijken"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Fout bij verwijderen add-on!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Hoogste waardering eerst"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Fout bij opslaan add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Laatst bijgewerkt eerst"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Fout bij opslaan opmerking!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Populairste eerst"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "De naam dient minder dan %1$s karakters te bevatten."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Alle %1$s bekijken"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Collectie niet gevonden!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Als u al weet welke add-ons u aan uw collectie wilt toevoegen kunt u "
-"hieronder gewoon hun namen intypen. Als u liever wacht en dit later doet "
-"kunt u nu gewoon op %1$s klikken."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Kies uw eerste add-ons"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Maak een collectie"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Geselecteerde add-ons"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"U kunt eenvoudig uw eigen add-oncollectie maken door hieronder een paar "
-"velden in te vullen."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Collectie aanmaken"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Collecties"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Meer hierover"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Aan favorieten toevoegen"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Uit favorieten verwijderen"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>U kunt hieronder uw nieuwe collectie bekijken. als u een nickname voor de "
-"collectie wilt instellen, een pictogram wilt uploaden of aanvullende instellingen wilt wijzigen, bezoek dan de pagina <a "
-"href='%1$s'>Collecties beheren</a>.</p><p>Uw collectie is toegankelijk "
-"op deze locatie: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Uw collectie is nu klaar!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Over deze collectie"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s add-on in deze collectie"
-msgstr[1] "%1$s add-ons in deze collectie"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Gemaakt door:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Bijgewerkt:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Toevoegen aan Favorieten…"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Favoriet verwijderen…"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Meld u aan</a> om deze collectie aan uw favorieten toe te voegen."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Collectie beheren"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Datum toegevoegd"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Naam"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Populariteit"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download deze week"
-msgstr[1] "%1$s downloads deze week"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Geselecteerde add-ons worden verwijderd bij opslaan"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"Type hieronder de namen van nieuwe add-ons om ze te publiceren naar deze "
-"collectie."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"Voer hieronder een kommagescheiden lijst van add-on-ID’s in om ze te "
-"publiceren naar deze collectie."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "U kunt een add-on ook publiceren vanaf de normale add-onpagina."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Toegevoegd op %1$s door %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Opmerking publicist toevoegen"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Opmerking publicist verwijderen"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Opmerking publicist bewerken"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Noot: Opmerking wordt weergegeven als geschreven door oorspronkelijke "
-"publicist op de oorspronkelijke publicatiedatum"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Opmerking opslaan"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Verwijderen"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Aan collectie toevoegen"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Beschikbaarheid controleren"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Ja, ik wil deze collectie verwijderen."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-"Vink het veld aan en klik op \"%1$s\" om deze collectie te verwijderen."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Na klikken op \"%1$s\" hieronder wordt uw collectie verwijderd. Als u uw "
-"collectie niet wilt verwijderen dient u het bevestigingsveld in het tabblad "
-"\"%2$s\" uit te vinken en door te gaan met bewerken van uw collectie. Als u "
-"deze pagina verlaat zonder op te slaan wordt uw collectie eveneens niet "
-"verwijderd."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Uw collectie staat op het punt te worden verwijderd!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "U dient een beschrijving van uw collectie op te geven."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Er is een fout opgetreden bij het uploaden van uw pictogram."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "U dient uw collectie een naam te geven."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Als u een nickname kiest dient deze uniek te zijn."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Add-onnaam:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Gekoppelde toepassing"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Selecteer de toepassing die uw collectie ondersteunt."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collectietype"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Collectie verwijderen"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Verwijderen van uw collectie wist deze definitief."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Collectiebeschrijving"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Beschrijf uw collectie en het soort add-ons dat deze bevat kort"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Pictogram"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"U kunt een JPG-, GIF- of PNG-pictogram uploaden dat wordt omgevormd tot "
-"32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Wie kan uw collectie bekijken?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"Standaard verschijnen collecties in de publieke collectiemap en zijn ze door "
-"iedereen te bekijken. Als u bekijken van uw collectie wilt beperken tot "
-"personen door ze een speciale koppeling te geven dient u die optie hieronder "
-"aan te geven."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Alleen personen die ik uitnodig kunnen mijn collectie bekijken"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Iedereen kan mijn collectie in de map bekijken"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Wie kan mijn collectie beheren?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Deze gebruikers kunnen add-ons naar uw collectie publiceren, alle add-ons en "
-"instellingen beheren en andere gebruikers toestemming verlenen hiertoe."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Collectienaam"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Geef uw collectie een beschrijvende naam, zoals “De favoriete reisadd-ons "
-"van Dave�"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Collectienickname"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-"Optioneel kunt u uw collectie een unieke nickname voor snelle toegang geven:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Wie kan add-ons naar uw collectie publiceren?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Deze gebruikers kunnen add-ons naar uw collectie publiceren en door hen "
-"gepubliceerde add-ons verwijderen."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Voer het e-mailadres van een Firefox Add-onsaccount in:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Geselecteerde accounts worden verwijderd bij opslaan"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Voer een kommagescheiden lijst van e-mailadressen van Firefox Add-"
-"onsaccounts in"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Alleen ik"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Ikzelf en deze gebruikers:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Toevoegen"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "%1$s beheren"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Collectie-inhoud beheren"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Huidige add-ons:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Geavanceerde instellingen"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Collectiepermissies beheren"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Annuleren"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Pictogram verwijderen"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Pictogram vervangen"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr ""
-"Het pictogram wordt verwijderd wanneer hieronder op “%1$s� wordt geklikt"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Nickname beschikbaar"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Uw nickname bevat ongeldige karakters en is gecorrigeerd. Probeer het a.u.b. "
-"opnieuw."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname in gebruik"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Uw collectie is toegankelijk op deze lokatie:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Uw collectie is succesvol opgeslagen!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Collectie bijwerken"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Collectie verwijderen"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Geavanceerd"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Naam &amp; details"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissies"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Houd uw kinderen en uw agenda in de gaten."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Familie"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Probeer Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Een collectie aanmaken"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Start"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>U hebt nog geen favoriete collecties.</strong></p> "
-"<p>Collecties die u markeert als favorieten kunnen snel worden benaderd vanaf deze pagina "
-"en verschijnen in de <a href='%1$s'>Add-on Collector</a> als u die hebt "
-"geïnstalleerd.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>U hebt nog geen collecties aangemaakt. Collecties zijn makkelijk aan te maken "
-"en te vullen met uw favoriete add-ons. <a href='%1$s'>Probeer het eens</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Collecties"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "gemaakt door %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Wat zijn collecties?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sorteren op"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Keuze van de editor"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Mijn favorieten"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Mijn collecties"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populair"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Populairst aller tijden"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Populairst deze maand"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Nieuwste"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Populairst deze week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Er is een nieuwe manier om favoriete add-ons te zoeken en beheren. "
-"Becommentarieer, deel en synchroniseer collecties, helemaal vanuit uw browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"Collecties zijn groepen verwante add-ons, verzameld om eenvoudig te delen."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Toegevoegd op %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Onderzoek alles online."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referentie"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Beheer uw sociale netwerk."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Sociaal"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Sluiten"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"Er is een fout opgetreden bij het toevoegen van een collectie aan uw Favorieten. "
-"Is deze collectie al een favoriet?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Dit bericht niet meer weergeven."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s is toegevoegd aan uw favoriete collecties."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"U kunt deze collectie nu snel vinden via het tabblad <a href=\"%1$s\">%2$s</a> "
-"in de map. Probeer onze <a href=\"%3$s\">Add-on Collector</a> extensie voor "
-"Firefox voor een nog eenvoudiger manier om uw favoriete collecties bij te houden."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "De collectie is verwijderd."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Plan zakenreizen en onvergetelijke vakanties."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Reizen"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Autopublicatie"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Keuze van de editor"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normaal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"Er is een fout opgetreden bij verwijderen van een favoriete collectie. Was deze "
-"collectie geen favoriet?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s is verwijderd uit uw favoriete collecties."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Bouw de perfecte website."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Webontwikkeling"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Wat zijn collecties?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Lees de veelgestelde vragen"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Er is een nieuwe manier om favoriete add-ons te zoeken en beheren. "
-"Becommentarieer, deel en synchroniseer collecties, helemaal vanuit uw "
-"browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Add-on Collector startpagina"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Download Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Add-oncompatibiliteitscentrum"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Wees voorbereid op de release van %1$s met de onderstaande hulpmiddelen en "
 "informatie die beschikbaar zijn voor de %2$s Add-onsgemeenschap."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Gegevens worden geladen…"
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Terug naar hoofdscherm"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Add-on compatibiliteitsrapport"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informatie voor ontwikkelaars van add-ons"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "De maxVersion aanpassen zonder uploaden"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Status van Mijn Add-ons controleren"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Indien uw add-ons gehost worden op Mozilla Add-ons, <a href=\"%1$s\">log dan "
 "a.u.b. in</a> om de status van uw add-ons voor %2$s te analyseren."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Ontwikkelaarscentrum-logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "U hebt geen add-ons die gehost worden op Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Resultaten add-onstatuscontrole"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Status van gehoste add-ons wordt opgehaald…"
 
@@ -2225,120 +1127,120 @@ msgstr "Status van gehoste add-ons wordt opgehaald…"
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s gebruikers van %2$s (%3$s&#37; van het totaal)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "De onderstaande add-ons omvatten 95% van het bij Mozilla bekende add-"
 "ongebruik en zijn gerangschikt naar gebruiksomvang."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Gedetailleerd rapport bekijken"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Van de %1$s add-ons die 95&#37; van het bij Mozilla bekende add-ongebruik "
 "omvatten wordt momenteel <b>%2$s&#37;</b> beschouwd als compatibel met de "
 "laatste builds van %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alfaversies"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons die compatibel zijn met een alfaversie van %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Betaversies"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
 "Add-ons die compatibel zijn met een betaversie of releasekandidaat van %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Laatste versie"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons die geschikt zijn voor de laatste builds van %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Overige versies"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons die niet compatibel zijn met enige versie van %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Add-oncompatibiliteitsrapport"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informatie voor add-ongebruikers"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Compatibiliteitsrapport bekijken"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Kijk voor informatie over het leveren van bijdragen op onze %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki-pagina"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla wil de volgende personen bedanken voor hun bijdragen aan het addons."
 "mozilla.org project gedurende de afgelopen jaren:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Ontwikkelaars"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Vertalers"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Overige bijdragen"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Vroegere ontwikkelaars"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software en afbeeldingen"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Sommige gebruikte pictogrammen zijn afkomstig van de <a href=\"http://www."
@@ -2346,7 +1248,7 @@ msgstr ""
 "onder een <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative "
 "Commons Attribution 2.5 licentie</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
 "Sommige pagina’s gebruiken elementen van <a href=\"http://www.simile-widgets."
@@ -2356,20 +1258,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2404,25 +1303,25 @@ msgstr "Statistieken"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr ""
 "Bestand %1$s heeft een ongeldige extensie (%2$s). Toegestane extensies: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr ""
 "Bestand %s kan niet worden opgeslagen in de database. Probeer het a.u.b. "
 "opnieuw."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Voorbeeldweergave %1$s is succesvol vervangen door bestand %2$s."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr ""
 "Bestand %s is succesvol ge-upload. U kunt hieronder een tekst toevoegen."
@@ -2431,6 +1330,19 @@ msgstr ""
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(automatisch detecteren)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Deze versie van uw add-on geeft geen compatibiliteit met Firefox %1$s aan. "
+"Mozilla verwacht de volgende versie van Firefox binnenkort te lanceren, dus "
+"test a.u.b. uw add-on in de nieuwe versie en werk de "
+"compatibiliteitsinformatie bij. U kunt <a href=\"%2$s\">hier</a> meer "
+"hierover vinden. Dit is slechts een waarschuwing; u kunt gewoon doorgaan met "
+"het indienen van deze versie bij addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Opent in een nieuw venster"
@@ -2467,64 +1379,129 @@ msgstr "Stap 5: Succes"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Hulp bij indienen"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on succesvol uitgeschakeld"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Add-on bewerken"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on succesvol ingeschakeld"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-onbeschrijving"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-onstartpagina"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-onnaam"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Titel van voorbeeldweergave"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacybeleid"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-onsamenvatting"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "E-mailadres voor ondersteuning"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL voor ondersteuning"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Versieopmerkingen"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Add-on voordragen"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on succesvol voorgedragen!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Actief maken"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Maak uw add-on actief om deze in publieke lijsten weer te laten geven en de "
 "updatecontroledienst in te schakelen."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Add-on afronden"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Rond uw add-on af en ga naar de sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Inactief maken"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Maak uw add-on inactief om deze op alle publieke lijsten te verbergen en de "
 "updatecontroledienst uit te schakelen."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Naar de sandbox verplaatsen"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Plaats uw add-on terug in de sandbox. Dit kunt u terugdraaien."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Voor publicatie nomineren"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nomineer uw add-on voor publicatie"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Publiek maken"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Maak uw add-on weer publiek."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
 "Uw add-on is <span class=\"inactive-0\">actief</span>. Dit betekent dat uw "
@@ -2556,7 +1533,7 @@ msgstr "Add-onbeschrijving vereist"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-onnaam vereist"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is niet gemarkeerd als voorrelease."
 
@@ -2564,6 +1541,12 @@ msgstr "Add-on is niet gemarkeerd als voorrelease."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "Ten minste één voorbeeldweergave is vereist voor extensies en thema’s."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr ""
+"Diverse gebruikersbeoordelingen van de add-on (dit mogen externe "
+"beoordelingen zijn)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Add-onsamenvatting vereist"
@@ -2573,12 +1556,12 @@ msgstr "Add-onsamenvatting vereist"
 msgid "devcp_addon_status_header"
 msgstr "Add-onstatus: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Beschikbare acties"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Actiefstatus: <span class=\"inactive-0\">Actief</span>"
 
@@ -2586,7 +1569,7 @@ msgstr "Actiefstatus: <span class=\"inactive-0\">Actief</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on-afrondingscriteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Actiefstatus: <span class=\"inactive-1\">Inactief</span>"
 
@@ -2594,11 +1577,11 @@ msgstr "Actiefstatus: <span class=\"inactive-1\">Inactief</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Criteria voor publicatienominatie"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Vertrouwensstatus: <span class=\"status-4\">Vertrouwd</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
 "Uw add-on is <span class=\"inactive-1\">inactief</span>. Dit betekent dat uw "
@@ -2606,13 +1589,13 @@ msgstr ""
 "Updates worden <b>niet</b> voor uw add-on verstrekt middels de "
 "updatecontroledienst."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "U dient aan bovenstaande criteria te voldoen voordat u uw add-on kunt "
 "nomineren voor <span class=\"status-4\">publicatie</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 "U kunt nu uw add-on nomineren voor <span class=\"status-4\">publicatie</"
@@ -2682,12 +1665,121 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "Status van %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Uw add-on is <span class=\"status-4\">vertrouwd</span>. Dit betekent dat u "
 "updates voor uw add-on kunt indienen zonder editorbeoordeling."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Bezoek de pagina van %1$s om wijzigingen in uw inzending aan te brengen, of %"
+"2$s om terug te keren naar het Ontwikkelaarsvenster."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "klik hier"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Add-on bewerken"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Deze versie is in de sandbox geplaatst in afwachting van beoordeling door "
+"sandbox testers en een Mozilla Add-onseditor. U krijgt bericht per e-mail "
+"wanneer er ontwikkelingen zijn."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "U kunt %s meer lezen over het Sandbox-beoordelingssysteem."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "hier"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Deze versie is in de sandbox geplaatst voor gebruik door ervaren gebruikers. "
+"Om de versie op de publieke site toegankelijk te maken moet u uw add-on %s "
+"en ondergaat deze een beoordelingsproces."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "voordragen"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "De inzending van uw add-on is succesvol afgerond."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Omdat uw add-on wordt vertrouwd is deze versie automatisch goedgekeurd voor "
+"het publieke domein."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Add-on inzenden"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on succesvol bijgewerkt"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "U kunt %s om de interesse in uw add-on te vergroten."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "een voorbeeldweergave uploaden"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Geen schrijver gevonden [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Verwijderen"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Afbreken"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Weet u zeker dat u uw inzending wilt afbreken?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Volgende"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Add-ontype wijzigen:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Opmerkingen van ontwikkelaar bijgewerkt."
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "Actief"
@@ -2752,35 +1844,179 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Een nieuwe versie uploaden"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr ""
 "Voorbeeldweergave %s kan niet worden verwijderd uit de database. Probeer het "
 "a.u.b. opnieuw."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Voorbeeldweergave %s is succesvol verwijderd."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "U hebt geen rechten om versies of bestanden te verwijderen."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s ‘%2$s’ bestand"
-msgstr[1] "%1$s ‘%2$s’ bestanden"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Voorbeeldweergave toevoegen"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Schrijver"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Schrijvers"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Geen"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorieën"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categorie"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Beschrijving"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Uitgeschakeld"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Opmerkingen van de ontwikkelaar"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Voorbeeldweergaven"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versies"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Startpagina"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Geen"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Geen titel"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Geen voorbeeldweergaven gevonden."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Bijwerken"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "E-mailadres voor ondersteuning"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "De ontwikkelaar heeft geen e-mailadres voor ondersteuning opgegeven."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL voor ondersteuning"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "De ontwikkelaar heeft geen URL voor ondersteuning opgegeven."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Vertrouwd"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versie %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Geen versies gevonden."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Annuleren en teruggaan"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Ja, uitschakelen"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Weet u zeker dat u deze add-on wilt uitschakelen?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Door deze add-on uit te schakelen is deze niet zichtbaar in zoekopdrachten "
+"en lijsten. Ook is deze niet te downloaden van de website of via "
+"clientupdatecontroles. De add-on wordt in principe verwijderd, hoewel u hier "
+"terug kunt keren en de add-on opnieuw in kunt schakelen naar believen."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "%s uitschakelen"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Ja, inschakelen"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Weet u zeker dat u deze add-on wilt inschakelen?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Door deze add-on in te schakelen wordt deze weer zichtbaar in zoekopdrachten "
+"en lijsten. Ook kan deze worden gedownload van de website en via "
+"clientupdatecontroles."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "%s inschakelen"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Antwoord toevoegen"
@@ -2827,52 +2063,64 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "geschreven door %1$s op %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Schrijver toevoegen"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "E-mailadres van de schrijver"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Verwijderen"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Nieuwe schrijver toevoegen"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Schrijver toevoegen"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "E-mailadres schrijversaccount:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "E-mailadres account controleren…"
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Klik hieronder op de knop Schrijvers bijwerken om op te slaan."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Huidige schrijvers"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Add-onschrijvers beheren"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "In schrijverslijst op publieke pagina’s openemen"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Ontwikkelaar</strong> - Kan alle aspecten van de add-onlijst "
 "beheren, behalve toevoegen en verwijderen van andere schrijvers."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Eigenaar</strong> - Kan alle aspecten van de add-onlijst beheren, "
 "inclusief toevoegen en verwijderen van andere schrijvers."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 "<strong>Kijker</strong> - Kan add-on-ontwikkelaarslijst en statistieken "
@@ -2883,26 +2131,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Selecteer een rol voor de schrijver:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Schrijver"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "In lijst"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Rol"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Schrijvers bijwerken"
 
@@ -2970,19 +2218,19 @@ msgid "devcp_edit_dd_manage_properties"
 msgstr ""
 "Wijzig de naam, de startpagina, het pictogram en andere labels van uw add-on."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Beschrijvingen bijwerken"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Corrigeer a.u.b. de hierboven in rood aangeduide fouten."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Add-onbeschrijvingen bewerken"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 "Alle informatie die mogelijk van belang is voor eindgebruikers en die niet "
@@ -2991,22 +2239,22 @@ msgstr ""
 "over rapporteren van fouten, voorziene releasedatum of een nieuwe versie, "
 "etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Opmerkingen van de ontwikkelaar"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 "De beschrijving van uw add-on is een langere uitleg van functies, werking en "
 "andere relevante informatie. Deze wordt weergegeven onder de samenvatting op "
 "de weergavepagina van de add-on."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-onbeschrijving"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 "Indien uw add-on een  gebruiksrechtovereenkomst (End-User License Agreement "
@@ -3015,28 +2263,28 @@ msgstr ""
 "kunnen installer. Merk a.u.b. op dat een EULA niet hetzelfde is als een "
 "codelicentie zoals GPL of MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Gebruiksrechtovereenkomst"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "Indien uw add-on een privacybeleid kent kunt u hier de tekst invoeren. De "
 "pagina van uw add-on zal een koppeling naar het beleid tonen."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacybeleid"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 "De samenvatting is een korte uitleg van de basisfunctionaliteit van uw add-"
 "on die wordt weergegeven in zoek- en bladerlijsten en bovenaan de pagina van "
 "uw add-on. <strong>De lengte is maximaal 250 karakters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-onsamenvatting"
 
@@ -3056,39 +2304,101 @@ msgstr "Add-onbeschrijvingen beheren"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Add-oneigenschappen beheren"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Geen categorieën beschikbaar voor dit add-ontype."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Onvolledige overdracht"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Geen bestand geüpload"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Overschrijdt maximale uploadgrootte"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Schrijvers"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Pictogram toevoegen"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Pictogram wijzigen"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Gebruikers toestaan om de bronbestanden online te bekijken"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorieën"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Standaardlocale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Deze add-on vereist externe software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Alleen het bestaande pictogram wissen"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nieuw pictogrambestand"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Pictogram"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Aanvullende locale-informatie"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Dit is een pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Dit is een site-specifieke add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Doellocale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "korte aanvullende informatie (zoals een lokale dialectnaam)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Eigenschappen bijwerken"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Wijzig dit alleen als u alle gevolgen begrijpt."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Huidig pictogram"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 "De standaardlocale van een add-on is de hoofdlocale waarin vertalingen "
@@ -3096,61 +2406,61 @@ msgstr ""
 "niet beschikbaar zijn in de voorkeurstaal van de gebruiker wordt "
 "teruggevallen op deze standaardlocale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "Deze labels worden gebruikt om add-ons te filteren en in te delen."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 "De GUID van uw add-on wordt opgegeven in install.rdf en geeft een unieke "
 "identificatie. U kunt uw GUID niet wijzigen als deze eenmaal op Mozilla Add-"
 "ons in opgenomen."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Add-oneigenschappen bewerken"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-ontype"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Beheerinstellingen"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Standaardlocale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-onlabels"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on-GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-onpictogram"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Overige instellingen"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Vertrouwde add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Bron online bekijken"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 "Het add-onpictogram is een kleine afbeelding die naast de naam van uw add-on "
@@ -3159,94 +2469,104 @@ msgstr ""
 "automatisch omgezet naar 32 x 32 pixels. Gebruik a.u.b. één van de volgende "
 "afbeeldingstypes: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Deze add-on bevat binaire componenten"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Niet vertrouwd"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Vertrouwd"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Nieuw pictogram"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Pictogram verwijderen"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 "Voer indien uw add-on een andere startpagina heefthier het adres in. Andere "
 "vertalingen toevoegen is niet nodig tenzij uw website is gelokaliseerd naar "
 "andere talen."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-onstartpagina"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr ""
 "De naam van uw add-on wordt overal weergegeven waar uw add-on op een lijst "
 "staat."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-onnaam"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 "Indien u een e-mailadres voor ondersteuningsvragen hebt, kunt u dat hier "
 "invoeren. Toevoegen van andere vertalingen is niet nodig tenzij u "
 "verschillende e-mailadressen hebt voor verschillende talen."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "E-mailadres voor ondersteuning"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 "Indien uw add-on een ondersteunende website of forum heeft kunt u het adres "
 "hier invoeren. Toevoegen van andere vertalingen is niet nodig tenzij uw "
 "website is vertaald in andere talen."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Ondersteuningswebsite"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr ""
 "Vertrouwde add-ons kunnen publiek worden gemaakt zonder beoordeling door een "
 "editor."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Pictogram wordt verwijderd bij opslaan. <a %s>Annuleren?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "De bron van uw add-onbestanden kan online worden bekeken door elke ingelogde "
 "gebruiker als u dat wenst."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Online bron bekijken toestaan"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Online bron bekijken niet toestaan"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Bijwerken"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">eenvoudige "
+"localenaam</a>, zoals ‘en-US’"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Schrijvers"
@@ -3322,14 +2642,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Wachtende update (%s)"
 msgstr[1] "Wachtende updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Aangevinkte bestanden worden verwijderd."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Bestanden"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Doeltoepassingen"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Geen bestanden."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Opmerkingen voor de beoordelaar"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Bijwerken"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "U hebt geen toegang tot die add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"De maximale omvang van een samenvatting is 250 karakters.\n"
+"(U hebt er %s ingevoerd)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"De naam voor uw add-on bestaat al in de database. Zorg er a.u.b. voor dat: "
+"<br /><li>Uw GUIDs kloppen. De meest voorkomende oorzaak voor deze fout is "
+"niet-kloppende GUIDs.</li><li>U geen dubbele invoer in de database hebt. Als "
+"dat wel zo is, dient u die invoer bij te werken of te verwijderen en het "
+"opnieuw te proberen.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3343,9 +2718,11 @@ msgstr "Lees a.u.b. %s als naslag."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "deze pagina"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Uw add-on dient ten minste één eigenaar te hebben."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Beschrijf a.u.b. de wijzigingen die zijn doorgevoerd in deze update van de "
+"add-on."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3363,6 +2740,10 @@ msgstr ""
 "Die bestandsextensie (%s) is niet toegestaan voor het geselecteerde add-"
 "ontype. Gebruik a.u.b. één van de volgende: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Niet alle bestands-GUIDs kloppen"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Selecteer a.u.b. niet meer dan vijf categorieën."
@@ -3397,7 +2778,15 @@ msgstr ""
 "Die bestandsextensie (%s) is niet toegestaan voor een pictogram. Gebruik a.u."
 "b. één van de volgende: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Er bestaat al een identieke versie (%s) voor deze add-on en dit platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf ontbreekt."
 
@@ -3405,7 +2794,7 @@ msgstr "install.rdf ontbreekt."
 msgid "devcp_error_install_manifest"
 msgstr "De volgende fouten zijn aangetroffen in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Selecteer a.u.b. een geldig add-ontype."
 
@@ -3475,6 +2864,20 @@ msgstr "Er is geen ID voor deze add-on in install.rdf aangetroffen."
 msgid "devcp_error_no_platform"
 msgstr "Geen platform geselecteerd"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "U dient voor uw voordracht de gevraagde gegevens in te vullen."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "U kunt geen pre-release add-on voordragen."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"U kunt alleen maar add-ons nomineren die zich momenteel in de sandbox "
+"bevinden."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Selecteer a.u.b. ten minste één categorie."
@@ -3492,6 +2895,16 @@ msgstr ""
 "Die bestandsextensie (%s) is niet toegestaan voor een voorbeeldweergave. "
 "Gebruik a.u.b. één van de volgende: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Er is een fout opgetreden bij het opslaan van uw gegevens."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "U hebt geen rechten om deze add-on bij te werken."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3504,82 +2917,294 @@ msgstr ""
 "Add-ons kunnen geen externe update-URL gebruiken. Verwijder deze a.u.b. uit "
 "install.rdf en probeer het opnieuw."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Upload a.u.b. een bestand."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Ander platformbestand toevoegen"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Schrijver toevoegen"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Verwijderen"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categorieën voor uw nieuwe add-ontype zullen in de volgende stap worden "
+"getoond."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Er zijn geen categorieën beschikbaar voor dit add-ontype."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Voer a.u.b. een beschrijving in van uw add-on."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Voer a.u.b. de naam in van uw add-on."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Voer a.u.b. het type in van de add-on die u indient."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Voer a.u.b. een samenvatting in van uw add-on."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Add-onbestand"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-onbestand 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-onbestand 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Add-ontype"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Gebruikers toestaan om de bronbestanden online te bekijken"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "E-mailadres van de schrijver"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Schrijvers"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorieën"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Standaardlocale"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Beschrijving"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "End User License Agreement (EULA – Gebruiksrechtovereenkomst)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Deze add-on vereist externe software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Bestanden"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Startpagina"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Pictogrambestand"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Naam"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Ondersteunde platforms"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Dit is een pre-release"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Privacybeleid"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Dit is een site-specifieke add-on"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Samenvatting"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-mailadres voor ondersteuning"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL voor ondersteuning"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Doeltoepassingen"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versie"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Versieopmerkingen"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Geen"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Opmerkingen voor de beoordelaar"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Omdat uw add-on vertrouwd wordt, kunt u kiezen waar deze versie geplaatst "
+"wordt:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publiek"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Ontwikkelaarsovereenkomst"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Stap 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Bestand uploaden"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Stap 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-ondetails"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Stap 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Versiedetails"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Stap 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localisatie"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Stap 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Succes"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mijn add-ons"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr ""
-"Voer a.u.b. het accounte-mailadres in van de schrijver die u wilt toevoegen."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Omlaag"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Omhoog"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Toepassingscompatibiliteit verwijderen"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Als schrijver vermelden in publieke lijsten"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Selecteer a.u.b. een licentie."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Voer a.u.b. tekst in voor uw licentie."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Ontwikkelaar"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Eigenaar"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Lezer"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Schrijver verwijderen"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Weet u <strong>zeker</strong> dat u deze schrijver wilt verwijderen?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "U dient een te uploaden bestand te selecteren."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Aangepaste licentie voor add-on %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3597,12 +3222,12 @@ msgstr ""
 "standaardlocale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Controlevenster"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Controlevenster"
 
@@ -3611,28 +3236,28 @@ msgid "devcp_myaddons_link"
 msgstr "Mijn add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Terug naar hoofdvenster"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistieken"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Add-on indienen"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Ontwikkelaarshulpmiddelen"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 "Een add-on met dit ID (%1$s) bestaat al in de database. Als dit uw add-on is "
@@ -3642,26 +3267,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Annuleren en terugkeren"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Terug naar add-ondetails"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "%s voordragen"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatisch gedetecteerd add-ontype: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>Opslaan van één of meer van uw wijzigingen is mislukt.</span><br /"
 ">Kijk a.u.b. naar onderstaande fouten. De rest van uw wijzigingen is "
 "succesvol opgeslagen."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3675,6 +3311,18 @@ msgstr ""
 "Door dit als standaard voorbeeldweergave te verwijderen zal een andere "
 "voorbeeldweergave automatisch de standaard worden."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"De standaardlocale van deze add-on (%1$s [%2$s]) verschilt van uw momenteel "
+"geselecteerde locale (%3$s [%4$s]). Onderstaande velden moeten worden "
+"ingevuld in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3682,13 +3330,13 @@ msgstr ""
 "Door dit de standaardvoorbeeldweergave te maken zal de standaardstatus van "
 "de huidige standaardvoorbeeldweergave vervallen."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "U hebt niet-opgeslagen wijzigingen."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3717,47 +3365,47 @@ msgstr "Voorbeeldweergave bewerken"
 msgid "devcp_preview_updated_successfully"
 msgstr "Voorbeeldweergave succesvol bijgewerkt."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Andere voorbeeldweergave toevoegen"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Voorbeeldweergave verwijderen"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Voorbeeldweergave vervangen"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Voorbeeldweergaven bijwerken"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Nieuwe voorbeeldweergave toevoegen"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 "Selecteer hieronder een te uploaden afbeelding. Afbeeldingen die groter zijn "
 "dan de maximumgrootte van 700 pixels breed bij 525 pixels hoog worden "
 "verkleind. Toegestane bestandstypen: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Klik hieronder op Voorbeeldweergaven bijwerken om te uploaden."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 "Klik hieronder op de knop Voorbeeldweergaven bijwerken om deze afbeelding op "
 "te slaan. (<a %s>Annuleren?</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 "Deze voorbeeldweergave wordt verwijderd wanneer hieronder op "
@@ -3774,7 +3422,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Voorbeeldweergave toevoegen"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Tekst bij voorbeeldweergave"
 
@@ -3782,7 +3430,7 @@ msgstr "Tekst bij voorbeeldweergave"
 msgid "devcp_previews_header_edit"
 msgstr "Voorbeeldweergave bewerken"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Standaardvoorbeeldweergave"
 
@@ -3794,23 +3442,23 @@ msgstr "Voorbeeldweergavebestand"
 msgid "devcp_previews_label_makedefault"
 msgstr "Van deze afbeelding de standaardvoorbeeldweergave maken"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Nieuwe afbeelding:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Voorbeeldweergave uploaden: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "Opslaan van één of meer van uw nieuwe voorbeeldweergaven is mislukt."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Uw voorbeeldweergaven zijn succesvol bijgewerkt."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 "De voorbeeldweergaven voor uw add-on worden hieronder weergegeven. U kunt "
@@ -3834,16 +3482,24 @@ msgstr "Voorbeeldweergave bewerken"
 msgid "devcp_previews_submit_upload"
 msgstr "Voorbeeldweergave uploaden"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniatuur"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "%s voorbeeldweergaven beheren"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Onjuist?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Weet u zeker dat u dit bestand wilt verwijderen?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Lees en accepteer a.u.b. de volgende Ontwikkelaarsovereenkomst voordat u "
@@ -3856,7 +3512,7 @@ msgstr ""
 ">Neem contact op met de eigenaar van de add-on als u wijzigingen dient aan "
 "te brengen."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 "Merk a.u.b. op dat sommige wijzigingen mogelijk pas na enkele uren op alle "
@@ -3866,6 +3522,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Het bijwerken van mijn huidige add-oninformatie overslaan"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3888,635 +3548,762 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> downloads per week"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"Het als actief markeren van deze add-on zorgt ervoor dat deze in publieke "
-"gebieden passend bij de status wordt weergegeven, inclusief zoek- en "
-"bladerlijsten. Hij kan worden gedownload van de website en kan worden "
-"gesignaleerd in updatecontroles aan de clientzijde, afhankelijk van de "
-"status. U kunt hier terugkeren en de add-on naar uw goeddunken weer "
-"uitschakelen."
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Weet u zeker dat u deze add-on als actief wilt markeren?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Weet u dit zeker?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
-"Het als inactief markeren van deze add-on zorgt ervoor dat deze in geen "
-"enkel publiek gebied wordt weergegeven, inclusief zoek- en bladerlijsten. "
-"Hij kan niet worden gedownload van de website en wordt niet gesignaleerd in "
-"updatecontroles aan de clientzijde. U kunt hier terugkeren en de add-on naar "
-"uw goeddunken weer inschakelen."
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Weet u zeker dat u deze add-on als inactief wilt markeren?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "Nee, annuleren"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
 msgstr ""
-"Door publiceren van deze add-on kan deze worden gedownload door iedereen en "
-"zullen updates worden aangeboden aan bestaande gebruikers."
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Weet u zeker dat u deze add-on wilt publiceren?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Door deze add-on terug te plaatsen in de sandbox dienen gebruikers in te "
-"loggen voordat ze kunnen downloaden en updates worden niet langer aangeboden "
-"aan bestaande gebruikers. Omdat uw add-on momenteel publiek is kunt u hier "
-"elk moment terugkeren om deze opnieuw te publiceren."
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Weet u zeker dat u deze add-on naar de sandbox wilt verplaatsen?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Ja, dat weet ik zeker"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
-"<span>Een nominatiebericht is vereist.</span><br />Vul a.u.b. het tekstveld "
-"met de gewenste informatie en probeer het opnieuw."
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Add-onnominatie"
+msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Indienen van add-ons is momenteel niet mogelijk. Probeer het later nog eens."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Ik accepteer dit"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Ik accepteer dit niet"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Deze add-on uitgeschakeld door een beheerder."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Uitgeschakeld"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Vertrouwd"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Laatste versie:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "U hebt geen add-ons. Klik %s om er een in te dienen."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "hier"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Zorg er a.u.b. voor een %s voor uw thema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "voorbeeldweergave te uploaden"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "%s bewerken"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Hulp (op dezelfde pagina)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Hulp"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Gebruikte karakters: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Weet u zeker dat u deze vertaling wilt verwijderen?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Wat betekenen deze tabbladen met %s?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Wat als ik geen vertalingen heb?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Hulp verbergen"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"Als een gebruiker de site doorbladert en er is geen vertaling beschikbaar in "
-"de eigen taal wordt teruggevallen op de standaardlocale van uw add-on, zoals "
-"opgegeven in het gedeelte Add-oneigenschappen bewerken. Voer als u geen "
-"vertalingen heeft gewoon in wat u kan in de standaardlocale, wat de taal zou "
-"moeten zijn die u spreekt."
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"Dit is een <i>vertaalveld</i>. Hiermee kunt u een specifiek veld localiseren "
-"naar elke andere taal waarvoor u een vertaling heeft. U kunt vertalingen "
-"toevoegen, bewerken en verwijderen met de localetabbladen."
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Vertaling toevoegen"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Vertaling verwijderen"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Localeaan alles toevoegen"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Locale toevoegen"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Verwijderen"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Selecteer de locale van de toe te voegen vertaling:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
-"De GUID van de add-on in dit bestand (%1$s) komt niet overeen met de "
-"bestaande GUID voor deze add-on (%2$s)."
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "U hebt onvoldoende rechten om deze add-on bij te werken."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "De opgegeven versie (%1$s) hoort niet bij deze add-on (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"Het geüploade versienummer (%1$s) bestaat al voor deze add-on. Als u "
-"probeert een ander bestand toe te voegen aan deze versie, <a href=\"%2$s"
-"\">klik dan hier</a>."
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
-"Het geüploade versienummer (%1$s) komt niet overeen met het bestaande "
-"versienummer (%2$s)."
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Van start"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Bestand uploaden…"
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Instemmen en doorgaan"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Mijn add-on bewerken"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Ik rond mijn add-on later af."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Versieopmerkingen toevoegen"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
-"<p>Uw add-onlijst is succesvol aangemaakt. De basisinformatie die is "
-"opgehaald uit het geüploade bestand is opgeslagen, maar er is nog meer aan "
-"uw lijstvermelding dat kan worden aangepast.</p><p>Uw add-on is momenteel "
-"gemarkeerd als <strong>Incompleet</strong>. Om uw add-on af te ronden dient "
-"u te zorgen voor een accurate naam, een samenvatting en een beschrijving, "
-"naast ten minste één geselecteerde categorie. U kunt de informatie van uw "
-"add-on bewerken via onderstaande koppeling en de status van uw add-on op elk "
-"moment controleren op de <a %s>statuspagina</a>."
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Corrigeer a.u.b. dit probleem en upload uw bestand opnieuw."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
-"Uw nieuwe bestand is toegevoegd aan versie %1$s en is momenteel gemarkeerd "
-"als %2$s."
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "Add-on aangemaakt!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Oeps! Er lijkt een probleem te zijn met dit bestand…"
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Bestand toegevoegd!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Hoe werkt dit allemaal?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Versie %s aangemaakt"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Uw bestand uploaden"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
-"<p>Bedankt voor uw belangstelling in indienen van uw add-on bij Mozilla Add-"
-"ons. Hosten van uw add-on bij Mozilla Add-ons is de eenvoudigste manier om "
-"voor distributie van uw add-on te zorgen. Dit is wat u krijgt:</"
-"p><ul><li>Elke add-on krijgt een publieke pagina met door u opgegeven "
-"informatie, zoals een korte samenvatting van de functionaliteit van de add-"
-"on, een optionele langere beschrijving, en voorbeeldweergaven van uw add-on."
-"</li><li>Uw add-on verschijnt in zoek- en bladerlijsten op de gehele site en "
-"zelfs in de Add-onbeheerder van Firefox 3.</li><li>Wij zorgen voor het "
-"hosten van al uw downloads en zorgen voor automatische updates voor "
-"gebruikers wanneer u een nieuwe versie uploadt.</li><li>U krijgt toegang tot "
-"een statistiekendashboard met gedetailleerde informatie over uw "
-"gebruikersgroep.</li></ul><p>Add-ons die op de site worden gehost moeten "
-"worden beoordeeld door een Mozilla Add-onseditor voordat ze alle "
-"bovenstaande functies ter beschikking krijgen. Als u klaar bent om het "
-"proces te starten en uw add-onpakket bij de hand heeft klik dan hieronder op "
-"Van start!</p>"
-
-#: views/developers/uploader.thtml:125
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Ondersteunde besturingssystemen:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Add-onbestand: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Overig"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
-"Het nieuwe bestand wordt beschikbaar voor het publiek zodra een editor het "
-"heeft kunnen beoordelen. Momenteel wachten %1$s andere add-ons hierop. Wilt "
-"u een snellere beoordeling? Overweeg dan <a %2$s>ook een editor te worden</"
-"a>."
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
-"De nieuwe versie wordt beschikbaar voor het publiek zodra een editor het "
-"heeft kunnen beoordelen. Momenteel wachten %1$s andere add-ons hierop. Wilt "
-"u een snellere beoordeling? Overweeg dan <a %2$s>ook een editor te worden</"
-"a>."
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "Uw nieuwe versie is aangemaakt en is momenteel gemarkeerd als %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
-"Bekijk uw nieuwe bestand op de <a %1$s>Versies en Bestandenpagina</a>, "
-"bekijk de <a %2$s>huidige status</a> van uw add-on, of <b>voeg "
-"versieopmerkingen toe</b> door op onderstaande knop te klikken (sterk "
-"aanbevolen)."
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
-"Bekijk uw nieuwe versie op de <a %1$s>Versies en Bestandenpagina</a>, bekijk "
-"yde <a %2$s>huidige status</a> van uw add-on, of <b>voeg versieopmerkingen "
-"toe</b> door op onderstaande knop te klikken (sterk aanbevolen)."
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
-"Upload uw add-onbestand via onderstaand formulier. Indien u meerdere "
-"platform-specifieke bestanden wilt uploaden, kies dan een enkel bestand en "
-"upload vervolgens de overige via de Versies en Bestandenbeheerder."
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Alles"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Specifiek:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Kies a.u.b.…"
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Bestand toevoegen aan %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Nieuwe add-on indienen"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "%s bijwerken"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Lees a.u.b. %s als naslag."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "deze pagina"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Geen account gevonden voor dat e-mailadres."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"De XML is ongeldig of vereiste velden zijn niet ingevuld. Lees a.u.b. <a "
-"href=\"https://developer.mozilla.org/en/"
-"Creating_OpenSearch_plugins_for_Firefox\">de documentatie</a>, controleer uw "
-"add-on, en probeer het opnieuw."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Versie bewerken"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versie succesvol bijgewerkt."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Versie verwijderen"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Lege versie verwijderen"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Verwijderen?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Nieuwe versie toevoegen"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Versie verwijderen"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Dit verwijdert ook:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s bestand"
-msgstr[1] "%s bestanden"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Versie %s verwijderen?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s beoordeling"
-msgstr[1] "%s beoordelingen"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Weet u zeker dat u versie %s permanent wilt verwijderen?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Annuleren"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Bestand verwijderen"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Nieuwe toepassing toevoegen"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Toepassing verwijderen"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Nieuw bestand toevoegen"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"Door hier aanpassen van toepassinginformatie kunnen gebruikers uw add-on "
-"installeren, zelfs als install.rdf in het pakket aangeeft dat de add-on niet "
-"compatibel is <a %s>Lijst van ondersteunde toepassingen</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
-"Weet u <b>zeker</b> dat u compatibiliteit met deze toepassing wilt "
-"verwijderen?"
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Weet uu <b>zeker</b> dat u dit bestand permanent wilt verwijderen?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Goedkeuringsinformatie"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Compatibele toepassingen"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Bestandsinformatie"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licentie"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Versie %s beheren"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Goedkeuringsopmerkingen"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Bestand verwijderen"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Bestand %1$s (%2$s) aangemaakt op %3$s en gewijzigd in %4$s op %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Selecteer a.u.b. de toepasselijke licentie voor uw add-on. Deze licentie "
-"specificeert de rechten die u verleent op uw broncode."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Geen bestanden gevonden."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Optionele informatie voor de editor die deze versie beoordeelt."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Toepassingscompatibiliteit verwijderen"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Selecteer a.u.b. een toepassing"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Bestand"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Grootte"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"Informatie over wijzigingen in deze uitgave, nieuwe functies, bekende fouten "
-"en overige nuttige informatie specifiek voor deze uitgave/versie. Deze "
-"informatie is ook beschikbaar voor gebruikers die de add-on bijwerken in de "
-"Firefox 3 Add-onbeheerder."
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Versieopmerkingen"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>U hebt nog niet-opgeslagen wijzigingen.</strong> Compatibiliteit "
-"wordt niet verwijderd totdat u hieronder op Versie bijwerken klikt."
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>U hebt nog niet-opgeslagen wijzigingen.</strong> Bestanden worden "
-"niet verwijderd totdat u hieronder op Versie bijwerken klikt."
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Versies bijwerken"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Versies en Bestanden beheren"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Geen versies."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Versie %s succesvol verwijderd."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
 msgstr ""
-"Deze versie heeft geen geassocieerde bestanden en kan worden verwijderd. "
-"Wilt u deze versie verwijderen?"
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Aangemaakt"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
 msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Versie"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Deze add-on is uitgeschakeld"
 
@@ -4560,7 +4347,7 @@ msgstr "Filteren"
 msgid "editorcp_logs_filter_by"
 msgstr "Filteren op type/actie"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Gebeurtenissenlogboek"
 
@@ -4622,7 +4409,7 @@ msgstr "Ingaven tussen %s en %s bekijken"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Geen beoordelingen gevonden in deze periode."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Logboek van beoordelingen"
 
@@ -4646,24 +4433,24 @@ msgstr "Recente editor-activiteit"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totaal aantal beoordelingen"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Add-on beoordelen"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vul a.u.b. de volgende velden in:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Selecteer a.u.b. ten minste één te beoordelen bestand."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Zelfbeoordelingen zijn niet toegestaan."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externe software"
 
@@ -4675,39 +4462,39 @@ msgstr "Aanbeveling toevoegen"
 msgid "editors_featured_add_feature_submit"
 msgstr "Toevoegen"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Toevoegen van aanbeveling mislukt."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Toevoegen van aanbeveling geslaagd."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Bewerken van aanbeveling mislukt."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Bewerken van aanbeveling geslaagd."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Eén of meer locales zijn ongeldig."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Verwijderen van aanbeveling mislukt."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Verwijderen van aanbeveling gelukt."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Aanbevolen add-ons"
 
@@ -4719,189 +4506,136 @@ msgstr "OK"
 msgid "editors_featured_remove_feature"
 msgstr "Aanbeveling verwijderen"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filterrij"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Nuttige koppelingen"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Handboek voor de editor"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Add-onbeleid"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Deze filters zullen gedurende deze sessie toegepast blijven, tenzij ze "
 "worden gewist."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Er zijn momenteel geen add-ons uit %s te beoordelen."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "het laatste etmaal"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "het laatste uur"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "de laatste minuut"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor controlevenster"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Alleen %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s compatibiliteit"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on of e-mailadres schrijver"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-ontypes"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Toepassing"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. versie"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Leeftijd van indiening (dagen)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] ""
-"Resultaten van uw gefilterde zoekopdracht: <strong>%1$s</strong> add-on"
-msgstr[1] ""
-"Resultaten van uw gefilterde zoekopdracht: <strong>%1$s</strong> add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Wissen"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filteren"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Alle beoordelingsrijen zijn momenteel uitgeschakeld. Probeer het later nog "
 "eens."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Onderdeel bewerken"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Onderdeelgeschiedenis"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Onderdeelstartpagina"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Itemoverzicht"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Voorbeeldweergaven"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Actie beoordelen"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Meer informatie aanvragen"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Naar publieke site doorzetten"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Super-beoordeling aanvragen"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "In sandbox houden"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Opmerkingen beoordelen"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 "Gebruik dit formulier om meer informatie aan de schrijver te vragen. Deze "
 "ontvangt een e-mailbericht en kan hier antwoorden. U krijgt een e-"
 "mailbericht wanneer de schrijver antwoordt."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Dit zal de add-on en de meest recente versie en bestanden als publiek "
 "markeren. Toekomstige versies zullen in de sandbox worden geplaatst totdat "
 "ze zijn beoordeeld door een editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Dit zal de add-on in de sandbox houden."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Dit zorgt ervoor dat een versie in de sandbox van een publieke add-on op de "
 "publieke site verschijnt."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Dit zorgt ervoor dat een versie in de sandbox van een publieke add-on in de "
 "sandbox blijft."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Als u twijfels hebt bij de beveiliging van een add-on, vraagtekens over "
@@ -4909,73 +4643,73 @@ msgstr ""
 "bekeken, vul dan uw opmerkingen in onderstaand veld in. Deze worden gestuurd "
 "naar de beheerders, niet naar de schrijver."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Vergelijken met publieke versie"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Inhoud bekijken"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Schrijvers:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorieën:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibiliteit:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beschrijving"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Opmerkingen van de ontwikkelaar"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Bestanden:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Geschiedenis"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Voordrachtsbericht"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Voorbeeldweergave"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Privacybeleid"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Beoordeling %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Opmerkingen voor de beoordelaar"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Samenvatting"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Versieopmerkingen"
 
@@ -5003,7 +4737,7 @@ msgstr "Voordracht goedgekeurd/Publiek"
 msgid "editors_review_history_nominated_denied"
 msgstr "Voordracht afgewezen/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Er zijn geen voorgaande beoordelingsingaven gevonden."
 
@@ -5030,90 +4764,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Antwoord weergeven/verbergen"
 msgstr[1] "Antwoorden (%1$s) weergeven/verbergen"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Toepassingen:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "of selecteer een voorgedefinieerd antwoord:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Opmerkingen:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Besturingssystemen:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Bovenzijde"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Noot: beoordeel slechts meerdere bestanden indien u ELK bestand dat u "
-"selecteert hebt getest."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "volgende &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Geen voorbeeldweergaven gevonden."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; vorige"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Wachtrij van beoordelingen"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong>nr. %1$s</strong> van %2$s in wachtrij"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> van %2$s in de wachtrij (gefilterd)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Actie afhandelen"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Actie"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Opmerkingen"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Beoordelaar"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versie/Bestand"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Geef mij de volgende keer dat deze add-on wordt bijgewerkt bericht. "
 "(Daaropvolgende updates zullen geen e-mailbericht aanmaken)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Beoordeling succesvol afgehandeld."
 
@@ -5137,7 +4860,7 @@ msgstr "Actie"
 msgid "editors_reviews_in_reply_to"
 msgstr "In antwoord op:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Beoordelingen succesvol afgehandeld!"
 
@@ -5149,79 +4872,87 @@ msgstr "Er zijn momenteel geen te screenen beoordelingen."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Beoordelingen afhandelen"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site-specifiek"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nieuw"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Bijgewerkt"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Geteste toepassing"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Geteste besturingssystemen"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Aanvullende informatie"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Add-ontypes"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Leeftijd"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Toepassingen"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Beperken tot locales?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tijd in de wachtrij"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Oplopend gesorteerd"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Aflopend gesorteerd"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Aanvraagtypes"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dagen"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s uur"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuten"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Toegang geweigerd"
 
@@ -5229,18 +4960,17 @@ msgstr "Toegang geweigerd"
 msgid "error_access_denied_message"
 msgstr "u hebt geen rechten om deze pagina te bekijken."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Add-on bestaat al!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5249,14 +4979,11 @@ msgstr "Add-on bestaat al!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Add-on niet gevonden!"
 
@@ -5268,7 +4995,7 @@ msgstr "Deze add-on kan hier niet worden bekeken."
 msgid "error_addon_selfreview"
 msgstr "U kunt uw eigen add-on niet beoordelen."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Geen add-ons in deze categorie!"
 
@@ -5276,47 +5003,52 @@ msgstr "Geen add-ons in deze categorie!"
 msgid "error_collection_feed_notfound"
 msgstr "Add-onfeed niet gevonden"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Dit is geen geldig e-mailadres."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Dit veld mag niet leeg zijn."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Bestand niet gevonden!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Bestandsfout: %s bestaat niet."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr ""
 "Er staan fouten in dit formulier. Corrigeer ze a.u.b. en dien het formulier "
 "opnieuw in."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Ongeldige captcha, probeer het a.u.b. opnieuw!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Deze URL heeft een ongeldige opmaak. Geldige URL’s lijken op http://"
@@ -5324,46 +5056,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Ontbrekend argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Geen bestanden"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Opmerking"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Voorbeeldweergave niet gevonden!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "U dient een waardering te selecteren."
 
@@ -5371,46 +5091,38 @@ msgstr "U dient een waardering te selecteren."
 msgid "error_user_already_confirmed"
 msgstr "Deze gebruikersaccount is al bevestigd."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Ongeldige bevestigingscode!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "De wachtwoorden komen niet overeen."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Dit e-mailadres is al in gebruik door een andere gebruiker."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "De wijziging van het e-mailadres is verlopen. Wijzig a.u.b. uw e-mailadres "
 "opnieuw in uw gebruikersprofiel en klik op de koppeling in het "
 "bevestigingsbericht zodra u dat ontvangt."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Gebruikers kunnen slechts één rol tegelijk hebben. Verwijder a.u.b. de "
-"gebruiker uit reeds bestaande rollen voordat u verder gaat."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Deze nickname is al in gebruik."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Gebruiker niet gevonden!"
 
@@ -5420,42 +5132,39 @@ msgstr ""
 "Bevestig a.u.b. eerst uw gebruikersaccount met de code die u per e-mail hebt "
 "ontvangen."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Foutieve gebruikersnaam of wachtwoord!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versie niet gevonden!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Foutief wachtwoord ingegeven!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Meer hierover"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Meer over %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s beoordeling"
 msgstr[1] "%1$s beoordelingen"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Meer bekijken van"
 
@@ -5494,39 +5203,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Over"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Veelgestelde vragen"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alle rechten voorbehouden."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Dankbetuiging"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla verstrekt koppelingen naar deze toepassingen als service, en staat "
@@ -5534,96 +5246,91 @@ msgstr ""
 "klachten of claims met betrekking tot de toepassingen dienen gericht te "
 "worden aan de desbetreffende softwareverstrekker."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Indienen"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Juridische opmerkingen"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Overige talen:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Privacybeleid"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Opslaan"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Woordenboek"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Woordenboeken"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensie"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensies"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Taalpakket (Add-on)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Taalpakketten (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Taalpakket (Toepassing)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Taalpakketten (Toepassing)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plug-in"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plug-ins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Zoekmachine"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Zoekmachines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Thema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Thema's"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Alle locales"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Terug naar de %1$s Add-ons startpagina"
@@ -5632,86 +5339,37 @@ msgstr "Terug naar de %1$s Add-ons startpagina"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>voor</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>voor</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>voor</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>voor</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Naar menu Overige toepassingen"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Naar menu Categorieën"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Naar hoofdinhoud"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Naar zoekformulier"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Inloggen"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Uitloggen"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Mijn account"
 
@@ -5719,70 +5377,49 @@ msgstr "Mijn account"
 msgid "header_navlink_register"
 msgstr "Registreren"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Registreer</a> of <a href=\"%2$s\">meld u aan</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Hulpmiddelen"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Voorbeeldweergave van %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Log in</a> om deze add-on te installeren. <a href=\"%2$s"
 "\">Waarom</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Laat mij deze experimentele add-on installeren. <a href=\"%1$s\">Wat is dit?"
-"</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Aan %1$s %2$s toevoegen"
+msgstr "Aan %s %s toevoegen"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "%1$s toevoegen aan %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "%1$s downloaden"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Deze add-on is niet beschikbaar."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lijst van taalpakketten en woordenboeken."
 
@@ -5794,8 +5431,8 @@ msgstr "Woordenboek downloaden"
 msgid "langtools_download_langpack"
 msgstr "Taalpakket downloaden"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Woordenboeken & Taalpakketten"
 
@@ -5807,72 +5444,36 @@ msgstr "Woordenboek installeren"
 msgid "langtools_install_langpack"
 msgstr "Taalpakket installeren"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Woordenboek"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Taalpakket"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Taal"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Aangepaste licentie"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD-licentie"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, versie 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, versie 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, versie 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, versie 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11-licentie"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, versie 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klik hier om terug te keren naar de beginpagina."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Datum"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Aantal downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Add-onnaam"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Beoordeling"
@@ -5897,20 +5498,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Woordenboeken & Taalpakketten"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plug-ins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Thema’s"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Add-ons voor andere toepassingen zoeken"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "overige"
 
@@ -5918,29 +5526,12 @@ msgstr "overige"
 msgid "page_title_appversions"
 msgstr "Toepassingsversies"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Veelgestelde vragen over Add-on Collector"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Add-on Collectorfuncties"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Welkom bij de Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Dankzegging"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Veelgestelde vragen voor ontwikkelaars"
+msgid "page_title_experimental_addons"
+msgstr "Experimentele add-ons"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5970,15 +5561,15 @@ msgstr "Sandbox-beoordelingssysteem"
 msgid "page_title_submissionhelp"
 msgstr "Hulp bij indienen"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Geldige toepassingsversies"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Add-ons die worden ingediend bij Mozilla Add-ons dienen een install.rdf "
@@ -5987,7 +5578,7 @@ msgstr ""
 "toepassingen."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5996,15 +5587,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "hier"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versies"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Terug naar de vorige pagina"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox-informatiepagina"
 
@@ -6012,6 +5606,12 @@ msgstr "Sandbox-informatiepagina"
 msgid "pagination_next_page"
 msgstr "volgende"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Dit is pagina %1$s van %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "voorgaande"
@@ -6046,15 +5646,15 @@ msgstr ""
 "Indien dit moeilijk te lezen is kunt u <a href=\"%1$s\">andere woorden "
 "proberen</a> of <a href=\"%2$s\">naar iets luisteren</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Bent u menselijk?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Wat is dit?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Fout bij aanduiden van deze beoordeling!"
 
@@ -6062,7 +5662,7 @@ msgstr "Fout bij aanduiden van deze beoordeling!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaatst foutrapport of ondersteuningsverzoek"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Deze beoordeling rapporteren (selecteer een reden)"
 
@@ -6078,8 +5678,8 @@ msgstr "Overig (specificeren)"
 msgid "review_flag_reason_spam"
 msgstr "Spam of andere tekst niet zijnde beoordeling"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Bedankt; deze beoordeling is aangeduid voor goedkeuring door een editor."
@@ -6095,7 +5695,7 @@ msgstr ""
 "te duiden voor beoordeling door een editor."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Houd de volgende tips in gedachten:</p><ul><li>Schrijf alsof u een vriend "
@@ -6114,135 +5714,111 @@ msgstr ""
 "door gebruikers.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
-msgstr "Beoordelingen voor %1$s"
+msgstr "Beoordelingen voor %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Aanbevolen add-ons"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Nieuwste add-ons"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Populaire add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Bijgewerkte add-ons"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Zoeken"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Collectie-zoekresultaten"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Collectie-zoekresultaten"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr ""
 "De zoekfunctie is momenteel uitgeschakeld. Probeer het later a.u.b. nog eens."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "alle add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "alle collecties"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "zoeken naar add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "zoeken naar collecties"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Naar add-ons zoeken"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klik hier om zoekwoorden in te geven"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "binnen"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Alle zoekmachines"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Door zoekmachines bladeren"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s add-on gevonden"
+msgstr[1] "%s add-ons gevonden"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Geen resultaten gevonden."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Add-ons zoeken"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed met zoekresultaten"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Zoekresultaten voor: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Hulpmiddelen voor beheerders"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ontwikkelaarshulpmiddelen"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editorhulpmiddelen"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Welkom"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
-msgstr "Welkom %s"
+msgstr "Welkom, %s"
 
 #: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Woordenboek"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Aanbevolen add-ons"
 
@@ -6250,7 +5826,7 @@ msgstr "Aanbevolen add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "Ik zoek een:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Nieuwste add-ons"
 
@@ -6258,7 +5834,7 @@ msgstr "Nieuwste add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Zoekplug-in"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Abonneren op"
 
@@ -6266,26 +5842,27 @@ msgstr "Abonneren op"
 msgid "sidebar_pitch_theme"
 msgstr "Thema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Bijgewerkte add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Nog niet gewaardeerd"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
-msgstr "Scoort %1$s van de 5 sterren"
+msgstr "Scoort %s van de 5 sterren"
 
 #: views/statistics/addon.thtml:59
 msgid "statistics_addon_dashboard_link"
@@ -6319,13 +5896,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s aangemaakt"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s vrijgegeven"
@@ -6338,179 +5915,179 @@ msgstr "Sluiten"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "of selecteer een andere add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "of selecteer een add-on met publieke statistieken"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Selecteer één van uw add-ons om de statistieken te bekijken"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Selecteer een add-on om de statistieken te bekijken"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Selecteer een add-on met publieke statistieken"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistieken"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Statistieken bekijken"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Deze tabel in CSV-opmaak bekijken"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "geen"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Deze graaf verwijderen"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Groeperen op: Dag"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Groeperen op: Maand"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Groeperen op: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Vergelijken op: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s gevonden in het bereik"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Graaf toevoegen"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Nog een graaf aan deze grafiek toevoegen"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Totaalaantal verbergen"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Totaalaantal weergeven"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Geef het totaalaantal weer in deze grafiek"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Gegevens bekijken (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Een bestand met kommagescheiden waarden van deze gegevens ophalen"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Gebeurtenissen van %s verbergen"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "gebeurtenissen van %s weergeven"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Releasedata van add-on op de grafen weergeven"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Firefoxgebeurtenissen verbergen"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Firefoxgebeurtenissen weergeven"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Releasedata van Firefox op de grafen weergeven"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Grafiek inklappen"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Grafiek uitklappen"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Grafiekgrootte aanpassen"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Actieve dagelijkse gebruikers"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Toepassing"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Aangepast"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Besturingssysteem"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-onstatus"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Samenvatting"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-onversie"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Toepassing"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Besturingssysteem"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Add-onstatus"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Onbekend"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Add-onversie"
 
@@ -6549,7 +6126,7 @@ msgstr "Uw instellingen zijn bijgewerkt!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistieken"
 
@@ -6577,105 +6154,109 @@ msgstr "Uitzoomen"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Eén maand uitzoomen"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Dagsamenvatting van de statistieken voor %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS-feed van samengevatte gegevens"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistieken voor %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Standaard hebben alleen u en Mozilla toegang tot de informatie in deze "
 "sectie. U kunt dit voor het publiek openstellen zodat iedereen de gegevens "
 "van uw add-on kan zien."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Toegang"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Persoonlijk"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Alleen u en Mozilla kunnen de statistieken van deze add-on zien"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Publiek"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Iedereen kan de statistieken van deze add-on zien"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Instellingen wijzigen"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Deze informatie als vertrouwelijk behandelen."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Deze sectie is momenteel <b>persoonlijk</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Deze sectie is momenteel <b>publiek</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Afgesloten"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Terug naar Statistieken"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Instellingen opslaan"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Instellingen van Statistieken voor %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Onafgesloten"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Toep"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "BS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Onb"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Gemiddelde dagelijkse downloads"
 
@@ -6687,7 +6268,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Aantal op laatste dag"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in de laatste 7 dagen"
 
@@ -6705,7 +6286,7 @@ msgstr "Sinds %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Nog geen gegevens"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Gemiddeld aantal dagelijkse actieve gebruikers"
 
@@ -6731,68 +6312,54 @@ msgstr "Actieve dagelijkse gebruikers"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Op %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Gemiddeld aantal gebruikers deze week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s ten opzichte van vorige week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s statistieken"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Alle thema’s"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Door thema’s bladeren"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "E-mailadres wijzigen"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Wachtwoord wijzigen"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Wachtwoord of e-mailadres wijzigen"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "De bevestigingscode is opnieuw verstuurd!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Uw gebruikersaccount %1$s is succesvol verwijderd. Als u ooit terug wilt "
 "komen kunt u zich opnieuw inschrijven op de <a href=\"%2$s\"> "
 "gebruikersregistratiepagina</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "De Mozilla Add-onsgemeenschap vindt het jammer dat u vertrekt."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Wachtwoord bevestigen"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Mijn gebruikersaccount nu verwijderen"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "U kunt uw account niet verwijderen als u staat geregistreerd als een <a href="
@@ -6802,76 +6369,76 @@ msgstr ""
 "verwijderen."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Als u aanvullende vragen heeft kunt u contact opnemen met %1$s voor hulp."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "U dient het veld “Ik begrijp…� aan te vinken voordat we uw account kunnen "
 "verwijderen."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Voer a.u.b. uw wachtwoord correct in om deze stap te zetten."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "Er is een onbekende fout opgetreden bij het verwijderen van uw account. Neem "
 "hierover a.u.b. contact op met %1$s en wij zullen uw account voor uw "
 "verwijderen. Excuses voor het ongemak."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Verwijdering gebruikersaccount bevestigen"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Gebruikersaccount %1$s verwijderen"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Vaarwel!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "U kunt vanaf nu niet meer op Mozilla Add-ons inloggen."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Door op “Verwijderen� te klikken wordt uw account <strong>permanent "
 "verwijderd</strong>. Dat betekent:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Uw beoordelingen en waarderingen worden niet verwijderd, maar ze zullen niet "
 "langer aan uw account verbonden zijn."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Als u een specifiek probleem hebt waarmee we u kunnen helpen, verwijder dan "
 "niet nu uw account, maar neem contact met ons op via %1$s en we zullen ons "
 "best doen u te helpen het op te lossen."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Ik begrijp dat deze stap niet ongedaan kan worden gemaakt."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Verwijderde gebruiker"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Er is een e-mailbericht verstuurd naar %1$s om uw nieuwe e-mailadres te "
@@ -6879,7 +6446,7 @@ msgstr ""
 "koppeling in dit e-mailbericht. Tot dat moment kunt u inloggen met uw "
 "huidige e-mailadres."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Gebruikersaccount verwijderen"
 
@@ -6899,14 +6466,16 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"Wanneer u uw account succesvol hebt geactiveerd kunt u dit e-mailbericht "
+"Wanneer u uw account succesvol hebt geactiveerd, kunt u dit e-mailbericht "
 "weggooien.\n"
 "\n"
 "Bedankt voor uw aanmelding bij %2$s Add-ons\n"
 "– %2$s Add-ons Team"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "U hebt verzocht om wijziging van uw e-mailadres op %2$s Add-ons.\n"
@@ -6933,7 +6502,7 @@ msgstr "Bedankt voor uw aanmelding bij %s Add-ons"
 #, php-format
 msgid "user_email_pwreset"
 msgstr ""
-"%2$s add-ons wachtwoordreset\n"
+"%2$s add-ons wachtwoord Reset\n"
 "\n"
 "Er is een verzoek ontvangen om het wachtwoord voor deze account op AMO te "
 "resetten. Klik op de volgende koppeling om het wachtwoord te wijzigen, of "
@@ -6946,107 +6515,90 @@ msgstr ""
 "Bedankt,\n"
 "– %2$s Add-ons Team"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Uw %s Add-ons-wachtwoord resetten"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Fout!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Bevestig a.u.b. de wijziging van uw e-mailadres bij %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "U e-mailadres is met succes gewijzigd. Gebruik vanaf nu a.u.b. %1$s om in te "
 "loggen."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Over mij"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Stel uzelf voor aan de gemeenschap indien u dat wilt! Deze tekst verschijnt "
-"openbaar op de uw gebruikersinformatiepagina. Regelonderbrekingen worden "
-"behouden, maar HTML is niet toegestaan."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Wachtwoord bevestigen"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "De collecties die ik heb gemaakt in mijn gebruikersprofiel weergeven"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Mijn favoriete collecties in mijn gebruikersprofiel weergeven"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Gebruikersprofiel voor %s bewerken"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-mailadres"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Voornaam"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "E-mailadres verbergen"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Website-URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Achternaam"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Inloggen"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nieuw wachtwoord"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nickname"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Oud wachtwoord"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Overige acties"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Wachtwoord"
 
@@ -7054,67 +6606,67 @@ msgstr "Wachtwoord"
 msgid "user_form_registration"
 msgstr "Nieuwe gebruikersregistratie"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Mij op deze computer onthouden"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Sandbox weergeven?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Opslaan"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Inloggen"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registreren"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons-gebruiker sinds"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Nieuwe gebruikersaccount aanmaken"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Add-oncompatibiliteit (sterk aanbevolen)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Verwachte evenementen en wedstrijden"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Er zijn momenteel geen in te stellen notificaties beschikbaar."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Af en toe kan Mozilla u een e-mailbericht sturen over verwachte releases en "
 "add-onevenementen. Selecteer a.u.b. hieronder de onderwerpen waarin u bent "
 "geïnteresseerd:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla behoudt zich het recht voor om individueel contact met u op te nemen "
 "over specifieke zorgen over uw add-ons die gehost worden."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Er zijn fouten opgetreden in de door u aangebrachte wijzigingen. Corrigeer "
 "ze a.u.b. en dien het formulier opnieuw in."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profiel bijgewerkt."
 
@@ -7127,16 +6679,16 @@ msgstr "wachtwoord gereset voor %s"
 msgid "user_pwreset_header"
 msgstr "Wachtwoordreset"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Wachtwoord vergeten?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "De koppeling om uw wachtwoord te resetten is naar uw e-mailadres verzonden."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Wachtwoord succesvol gereset."
 
@@ -7148,7 +6700,7 @@ msgstr "Wijziging wachtwoord indienen"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Koppeling voor wachtwoordreset toezenden"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7163,7 +6715,7 @@ msgstr ""
 "$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7175,23 +6727,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "bevestigingsbericht opnieuw verzenden"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Gefeliciteerd! Uw gebruikersaccount is succesvol aangemaakt."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registratie op AMO is <strong>niet vereist</strong> als u gewoon publieke "
-"add-ons wilt downloaden en installeren.</p><p>U hoeft zich alleen te "
-"registreren als:</p><ul><li>U beoordelingen voor add-ons wilt indienen</"
-"li><li>U een add-onontwikkelaar bent en uw add-on wilt uploaden voor hosting "
-"op AMO</li></ul><p>Na succesvolle registratie ontvangt u per e-mail een "
-"bevestiging op het door u opgegeven adres. Volg a.u.b. de instructies daarin "
-"om uw account te bevestigen.</p><p>Indien gewenst kunt u onze <a href='%1$s' "
-"title='Legal Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy "
-"Policy'>Privacy Policy</a> (in het Engels) lezen.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7202,28 +6741,20 @@ msgstr ""
 "nodig is, kunnen wij u het %1$s naar uw e-mailadres zoals hierboven vermeld."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Bedankt voor uw registratie en welkom bij %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Welkom bij addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Een voornaam, achternaam of gebruikersnaam is vereist."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Collecties"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notificaties"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Gebruikersprofiel"
 
@@ -7231,63 +6762,50 @@ msgstr "Gebruikersprofiel"
 msgid "user_verified_okay"
 msgstr "Succesvol geverifieerd!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Gebruikersaccount verwijderen"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Bewerken gebruikersaccount"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Over mij"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons door %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Naam"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Gebruikersprofiel"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Collecties van %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-mailadres"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Favoriete collecties"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Startpagina"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Gebruikersinformatie voor %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
-msgstr "Beoordelingen door %1$s"
+msgstr "Beoordelingen door %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Inloggen"
 
@@ -7319,20 +6837,5 @@ msgstr "Resetten gebruikerswachtwoord"
 msgid "users_register_pagetitle"
 msgstr "Nieuwe gebruikersregistratie"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Broncodelicentie voor %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Alle onlangs toegevoegde bekijken"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Alle topdownloads bekijken"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Alle best beoordeelde bekijken"
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "De meest recente versie die compatibel is met"
diff --git a/site/app/locale/nl/pages/statistics_help.thtml b/site/app/locale/nl/pages/statistics_help.thtml
index d64cad2..2f3a864 100644
--- a/site/app/locale/nl/pages/statistics_help.thtml
+++ b/site/app/locale/nl/pages/statistics_help.thtml
@@ -4,4 +4,4 @@
 <p>Het aantal downloads wordt dagelijks bijgewerkt en bevat alleen eerste downloads van de add-on, geen updates.</p>
 
 <h4>Updatepings</h4>
-<p>Add-ons die worden gedownload van deze site controleren dagelijks op updates, en het totale aantal van deze updatepings staat bekend als Actieve dagelijkse gebruikers. Actieve dagelijkse gebruikers (ADG) kan worden opgesplitst naar add-onversie, besturingssysteem, add-onstatus en toepassing.</p>
\ No newline at end of file
+<p>Add-ons die worden gedownload van deze site controleren dagelijks op updates, en het totale aantal van deze updatepings staat bekend als Actieve dagelijkse gebruikers. Actieve dagelijkse gebruikers (ADG) kan worden opgesplitst naar add-onversie, besturingssysteem, add-onstatus en toepassing. Deze gegevens worden momenteel verzameld voor één dag per week, te weten de woensdag.</p>
\ No newline at end of file
diff --git a/site/app/locale/pl/LC_MESSAGES/messages.po b/site/app/locale/pl/LC_MESSAGES/messages.po
index b13f6c3..3875d6d 100644
--- a/site/app/locale/pl/LC_MESSAGES/messages.po
+++ b/site/app/locale/pl/LC_MESSAGES/messages.po
@@ -1,211 +1,183 @@
-# Language pl-PL translations for addons.mozilla.org package.
-# Copyright (C) 2009 THE addons.mozilla.org'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the addons.mozilla.org package.
-# Automatically generated, 2009.
+# translation of messages.po to Polish
+# Remora Preliminary Language File
+# Copyright (C) 2006 Mozilla Corporation
+# This file is distributed under the same license as the REMORA package.
 #
+# Wil Clouser <clouserw@mozilla.com>, 2006.
 # Zbigniew Braniecki <zbraniecki+amo@aviary.pl>, 2007.
 # Hubert Gajewski <hubert@hubertgajewski.com>, 2007.
 # Marek Stępień <mstepien@aviary.pl>, 2007.
-# Wojciech Szczęsny <wszczesny@aviary.pl>, 2008-2009.
-# Leszek Życzkowski <lzyczkowski@aviary.pl>, 2008-2009.
+# Wojciech Szczęsny <wszczesny@aviary.pl>, 2008.
+# Leszek Życzkowski <lzyczkowski@aviary.pl>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: addons\n"
+"Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-05 23:56+0100\n"
-"Last-Translator: Wojciech Szczęsny <witia@aviary.pl>\n"
+"PO-Revision-Date: 2009-02-21 15:22+0100\n"
+"Last-Translator: Wojciech Szczęsny <wszczesny@aviary.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;X-Generator: KBabel 1.11.4\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Anuluj proces instalacji"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Pobierz dodatek %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Akceptuj i pobierz"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Akceptuj i instaluj"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
-msgstr "Upubliczniony"
+msgstr "Publiczny"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Piaskownica"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Zaktualizowano %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Wersja %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "pobrań"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "wszystkich pobrań"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "pobrań tygodniowo"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
-msgstr[0] "%1$s dodatek"
-msgstr[1] "%1$s dodatki"
-msgstr[2] "%1$s dodatków"
+msgstr[0] "%1$s dodatek z kategorii \"%2$s\""
+msgstr[1] "%1$s dodatki z kategorii \"%2$s\""
+msgstr[2] "%1$s dodatków z kategorii \"%2$s\""
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "na stronie"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sortuj wg:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "eksperymentalny"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "polecany"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "Dodatek %1$s nie jest dostępny dla systemu %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
-msgstr "Wróć do %1$s…"
+msgstr "Wróć do %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
-msgstr "Wróć do recenzji…"
+msgstr "Wróć do recenzji..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Ocena:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Recenzja:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Wyślij recenzję"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Dodaj recenzjÄ™ dla: %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Tytuł/podsumowanie:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Usuń"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Odpowiedz"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Czy na pewno chcesz usunąć tę recenzję?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nie"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Tak"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Usuń recenzję"
 
@@ -214,7 +186,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Recenzja została usunięta."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Edytuj recenzjÄ™ dla: %s"
@@ -222,25 +194,29 @@ msgstr "Edytuj recenzjÄ™ dla: %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Problem z oznaczaniem recenzji etykietą. Długość informacji dla oznaczonej etykietą recenzji powinna zawierać się pomiędzy 10 a 100 znakami. Wprowadzono %1$s znaków."
+msgstr ""
+"Problem z oznaczaniem recenzji flagą. Długość informacji dla oznaczonej "
+"flagą recenzji powinna zawierać się pomiędzy 10 a 100 znakami. Wprowadzono %1"
+"$s znaków."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "Uwaga: przed publikacjÄ… recenzja zostanie sprawdzona przez moderatora."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Odpowiedź programisty na:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "Zobacz poprzedniÄ… recenzjÄ™ tego dodatku wystawionÄ… przez %2$s."
 msgstr[1] "Zobacz %1$s poprzednie recenzje tego dodatku wystawione przez %2$s."
-msgstr[2] "Zobacz %1$s poprzednich recenzji tego dodatku wystawionych przez %2$s."
+msgstr[2] ""
+"Zobacz %1$s poprzednich recenzji tego dodatku wystawionych przez %2$s."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -252,170 +228,132 @@ msgid "addon_review_pagetitle"
 msgstr "Recenzje dla: %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Odpowiedź użytkownika %1$s wysłana %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Odpowiedź programisty:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Recenzja została zapisana. Dziękujemy!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
-msgstr "dodana przez %1$s – %2$s"
+msgstr "dodana przez %1$s - %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "przez użytkownika %1$s, dnia %2$s (oceniony na %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Następny dodatek"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Poprzedni dodatek"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Stały odnośnik do tej wersji"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "Najnowsza wersja kompatybilna z programem %1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Przejdź"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Zobacz profil autora"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
-msgstr "Przeglądaj wszystkie motywy :: %1$s – dodatki"
+msgstr "PrzeglÄ…daj wszystkie motywy :: %1$s - dodatki"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "PrzeglÄ…dasz %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Przeglądaj motywy z kategorii %1$s :: %2$s – dodatki"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Co to jest?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Dodaj recenzjÄ™"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Informacje dodatkowe"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategorie"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Dodaj do kolekcji:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nowa kolekcja…"
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Wybierz kolekcję…"
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Dodaj"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "Dodatek %1$s został dodany do kolekcji %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Co to jest?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "i %1$s kolekcja więcej"
-msgstr[1] "i %1$s kolekcje więcej"
-msgstr[2] "i %1$s kolekcji więcej"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "Szczegółowa recenzja"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nie podoba mi siÄ™"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Edytuj recenzjÄ™"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "To rozszerzenie posiada politykę prywatności."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Nie cierpiÄ™ go"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Pokrewne kolekcje"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentarze autora"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Strona domowa"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licencja kodu źródłowego"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzje"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Wsparcie techniczne"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Podoba mi siÄ™"
 
@@ -423,601 +361,492 @@ msgstr "Podoba mi siÄ™"
 msgid "addons_display_long_description"
 msgstr "Szczegółowy opis"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Uwielbiam go"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Obrazki"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Tego dodatku nie ma jeszcze w żadnej kolekcji."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Inne dodatki autorstwa %1$s"
 msgstr[1] "Inne dodatki tych autorów"
-msgstr[2] "Inne dodatki tych autorów"
+msgstr[2] ""
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
-msgstr "Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora pod adresem %s"
+msgstr ""
+"Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora pod e-"
+"mailem %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora na stronie %s lub przez wysłanie e-maila na adres %s"
+msgstr ""
+"Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora na "
+"stronie %s lub przez wysłanie e-maila na adres %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
-msgstr "Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora pod adresem %s "
+msgstr ""
+"Wsparcie techniczne dla tego rozszerzenia jest świadczone przez autora na "
+"stronie %s "
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Oceń dodatek"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Bardzo mi siÄ™ podoba"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Prosimy nie zgłaszać błędów w recenzjach. Twój adres e-mail nie jest dostępny dla twórcy dodatku, a może on potrzebować kontaktu z Tobą, by rozwiązać problem."
+msgstr ""
+"Prosimy nie zgłaszać błędów w recenzjach. Twój adres e-mail nie jest "
+"dostępny dla twórcy dodatku, a może on potrzebować kontaktu z Tobą, by "
+"rozwiązać problem."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
-msgstr "<a href=\"%s\">Wskazówki dla recenzentów</a>"
+msgstr "<a href=\"%s\">Wytyczne dla recenzentów</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Sprawdź w sekcji <a href=\"%1$s\">wsparcie techniczne</a>, gdzie można otrzymać pomoc dla rozszerzenia."
+msgstr ""
+"Sprawdź w sekcji <a href=\"%1$s\">wsparcie techniczne</a>, gdzie można "
+"otrzymać pomoc dla rozszerzenia."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Zapisz"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Wszystkie dodatki %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Zobacz wszystkie recenzje (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
-msgstr "Zobacz wszystkie wersje"
+msgstr "Wyświetl wszystkie wersje"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Pełna historia wersji"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Podgląd źródła"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Wyświetl statystyki"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
-msgstr "Co sÄ…dzisz o tym dodatku?"
+msgstr "Jakie jest Twoje zdanie?"
 
 #: views/elements/app_compatibility.thtml:49
 msgid "addons_display_workswith"
 msgstr "Działa z:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Najnowsze"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Popularne"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Polecane"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Subskrybuj"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Przejrzyj dodatki"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Uaktualnione"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "Autor: "
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Popularne kolekcje"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Kolekcje"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> dodatek"
-msgstr[1] "<strong>%1$s</strong> dodatki"
-msgstr[2] "<strong>%1$s</strong> dodatków"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Wszystkie kolekcje"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Kolekcje są miejscem, gdzie można klasyfikować, miksować i dobierać dodatki.  Subskrybuj kolekcje utworzone przez innych użytkowników lub utwórz własną."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subskrybent"
-msgstr[1] "<strong>%1$s</strong> subskrybentów"
-msgstr[2] "<strong>%1$s</strong> subskrybentów"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Polecamy"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Dodatki rozszerzają możliwości programu %1$s, pozwalają dostosować go do swoich potrzeb. Rozejrzyj się wokół i rozbuduj program %1$s według własnego uznania."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Lubisz te dodatki? Poszukaj podobnych w kolekcji %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Ponad 5000 dodatków</strong>, które dostosowują Firefoksa do potrzeb użytkownika."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Co to sÄ… dodatki?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>�atwe do zainstalowania</strong>, powiadamiają użytkownika, gdy jest dostępna ich aktualizacja."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Wstęp"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Paski narzędzi, motywy i wyszukiwarki, które <strong>pomagają wykonać proste zadania.</strong>"
+msgstr ""
+"Dodatki rozszerzają możliwości programu %1$s, pozwalają dostosować go do "
+"swoich potrzeb. Rozejrzyj się wokół i rozbuduj program %1$s według własnego "
+"uznania."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "Nowość!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Najnowsze:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Inne programy"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
-msgstr "Dodatki dla programu %1$s "
+msgstr "%1$s - Dodatki"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<span>Dodatki pobrane:</span> <strong>%1$s</strong> "
-msgstr[1] "<span>Dodatki pobrane:</span> <strong>%1$s</strong> "
-msgstr[2] "<span>Dodatki pobrane:</span> <strong>%1$s</strong> "
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<span>Dodatki używane:</span> <strong>%1$s</strong>"
-msgstr[1] "<span>Dodatki używane:</span> <strong>%1$s</strong>"
-msgstr[2] "<span>Dodatki używane:</span> <strong>%1$s</strong>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Najpopularniejsze:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Polecamy:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Ostatnio zaktualizowane:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Wszystkie"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
-msgstr "Wyświetl wszystkie"
+msgstr "Wyświetl wszystkie ostatnio stworzone dodatki"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
-msgstr "Wyświetl wszystkie"
+msgstr "Wyświetl wszystkie najpopularniejsze dodatki"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
-msgstr "Wyświetl wszystkie"
+msgstr "Wyświetl wszystkie polecane dodatki"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
-msgstr "Wyświetl wszystkie"
+msgstr "Wyświetl wszystkie ostatnio zaktualizowane dodatki"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Kliknij poniższy odnośnik, by pobrać i zapisać plik.</li><li>W programie Mozilla Sunbird otwórz Dodatki z menu Narzędzia</li><li>Naciśnij przycisk „Zainstaluj�, znajdź i wybierz pobrany plik, i naciśnij przycisk „OK�.</li></ol>"
+msgstr ""
+"<ol><li>Kliknij poniższy odnośnik, by pobrać i zapisać plik.</li><li>W "
+"programie Mozilla Sunbird, otwórz Dodatki z menu Narzędzia</li><li>Naciśnij "
+"przycisk \"Zainstaluj\", znajdź i wybierz plik, który pobrałeś, i naciśnij "
+"przycisk \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Instalacja w programie Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Kliknij prawym przyciskiem myszy poniższy odnośnik i wybierz „Zapisz element docelowy jako…�, by pobrać i zapisać ten plik na swoim twardym dysku.</li><li>W programie Mozilla Thunderbird otwórz Dodatki z menu Narzędzia.</li><li>Naciśnij przycisk „Zainstaluj� i zlokalizuj/wybierz pobrany wcześniej plik, a następnie naciśnij przycisk „OK�.</li></ol>"
+msgstr ""
+"<ol><li>Kliknij prawym przyciskiem myszy na poniższy odnośnik i wybierz "
+"\"Zapisz element docelowy jako...\", by pobrać i zapisać ten plik na swoim "
+"twardym dysku.</li><li>W programie Mozilla Thunderbird otwórz Dodatki z menu "
+"Narzędzia.</li><li>Kliknij przycisk Zainstaluj i zlokalizuj/wybierz pobrany "
+"wcześniej plik, a następnie kliknij \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Instalacja w Thunderbirdzie"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "wyświetlaj dodatki eksperymentalne"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Przejdź"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Wydawca:"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "dla Linuksa"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "dla Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "dla Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Na tej stronie znajdują się jedynie najczęściej używane i najpopularniejsze wtyczki. Aby uzyskać więcej informacji o wtyczkach dostępnych dla przeglądarek opartych na Mozilli, odwiedź %1$s"
+msgstr ""
+"Na tej stronie znajdują się jedynie najczęściej używane i najpopularniejsze "
+"wtyczki. Aby uzyskać więcej informacji o wtyczkach dostępnych dla "
+"przeglądarek opartych na Mozilli, odwiedź %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Szukasz wtyczki tutaj niewymienionej?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Wtyczki pomagają przeglądarce wykonywać pewne specyficzne funkcje, jak wyświetlanie specjalnych formatów graficznych lub odtwarzanie plików multimedialnych. Wtyczki nieco różnią się od rozszerzeń, które modyfikują lub dodają coś do istniejącej funkcjonalności."
+msgstr ""
+"Wtyczki pomagają przeglądarce wykonywać pewne specyficzne funkcje, jak "
+"wyświetlanie specjalnych formatów graficznych lub odtwarzanie plików "
+"multimedialnych. Wtyczki nieco różnią się od rozszerzeń, które modyfikują "
+"lub dodają coś do istniejącej funkcjonalności."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Często używane wtyczki dla programu %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Wtyczki"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentacja: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "Przed kontynuowaniem instalacji %s wymaga zaakceptowania warunków poniższej licencji użytkownika (EULA)"
+msgstr ""
+"Przed kontynuowaniem instalacji %s wymaga zaakceptowania warunków poniższej "
+"licencji użytkownika (EULA)"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
-msgstr "Obrazki dla: %s"
-
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Najnowsze"
+msgstr "PodglÄ…d dla: %s"
 
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Wśród tylu wspaniałych dodatków znajdzie się coś dla każdego. Zacznij od wymienionych tutaj kilku najpopularniejszych. Dobrej zabawy!"
+msgstr ""
+"Wśród tylu wspaniałych dodatków znajdzie się coś dla każdego. Zacznij od "
+"wymienionych tutaj kilku najpopularniejszych. Dobrej zabawy!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Polecane dodatki"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Polecane dodatki"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Dodatkowe zasoby"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Przepraszamy. Aby zainstalować wtyczkę wyszukiwarki, potrzebna jest przeglądarka oparta o Mozillę (tak jak np. Firefox)."
+msgstr ""
+"Przepraszamy. Aby zainstalować wtyczkę wyszukiwarki, potrzebna jest "
+"przeglÄ…darka oparta o MozillÄ™ (tak jak np. Firefox)."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "Do instalacji wtyczek wymagany jest JavaScript, a wygląda na to, że jego obsługa jest wyłączona. Przed próbą instalacji jednej z poniższych wtyczek należy włączyć obsługę języka JavaScript."
+msgstr ""
+"Do instalacji wtyczek wymagany jest JavaScript, a wygląda na to, że jego "
+"obsługa jest wyłączona. Przed próbą instalacji jednej z poniższych wtyczek "
+"należy włączyć obsługę języka JavaScript."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Dowiedz siÄ™, jak %1$s na stronie %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/pl/docs/Tworzenie_wtyczek_OpenSearch_dla_Firefoksa"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "stworzyć własną"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Więcej wyszukiwarek znajdziesz na stronie %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Wyszukiwarki"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Specjalne podziękowania dla projektu Mycroft za ich pracę nad wyszukiwarkami do Firefoksa."
+msgstr ""
+"Specjalne podziękowania dla projektu Mycroft za ich pracę nad wyszukiwarkami "
+"do Firefoksa."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Udostępnij"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Dodaj do Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Opublikuj na Digg!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Opublikuj na Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Udostępnij na FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Opublikuj na MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
-msgstr "wyłączony"
+msgstr "Wyłączony"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
-msgstr "wersja niekompletna"
+msgstr "Wersja niekompletna"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
-msgstr "w piaskownicy – nominowany do upublicznienia"
+msgstr "W piaskownicy; Nominowany do publikacji"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
-msgstr "w piaskownicy – w trakcie recenzowania"
+msgstr "W piaskownicy; W trakcie recenzowania"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
-msgstr "upubliczniony"
+msgstr "Publiczny"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
-msgstr "w piaskownicy"
+msgstr "W piaskownicy"
 
 #: controllers/components/amo.php:203
 msgid "addons_status_unknown"
-msgstr "nieznany"
+msgstr "Nieznany"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Dowiedz się więcej o tym dodatku"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Najczęściej pobierane"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Najwyżej oceniane"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Zachowaj ostrożność, gdy używasz starych wersji"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Wersje te są wyświetlane w celach informacyjnych i testowych. Używaj zawsze najnowszych wersji danego dodatku."
+msgstr ""
+"Wersje te są wyświetlane w celach informacyjnych i testowych. Należy zawsze "
+"używać najnowszych wersji danego dodatku."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Historia wersji z informacjami o zmianach"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
-msgstr "%1$s – historia wersji"
+msgstr "%1$s - historia wersji"
 
 #: controllers/groups_controller.php:71
 msgid "admin_group_add_pagetitle"
@@ -1037,8 +866,7 @@ msgstr "Grupa o id %s została usunięta"
 msgid "admin_group_edit_pagetitle"
 msgstr "Edytuj grupÄ™"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Błędne id dla grupy"
 
@@ -1046,1366 +874,422 @@ msgstr "Błędne id dla grupy"
 msgid "admin_group_pagetitle"
 msgstr "Administracja grupÄ…"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Grupa została zapisana"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Zaawansowane"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Kiedykolwiek"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Każdy"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Każda"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Program"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "SÅ‚owa kluczowego"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
-msgstr "Uaktualniono"
+msgstr "Zaktualizowany"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nazwy"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Daty dodania"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "W ostatnich 3 miesiÄ…cach"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "W ostatnich 6 miesiÄ…cach"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Dzisiaj"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "W ostatnim miesiÄ…cu"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "W ostatnim tygodniu"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "W ostatnim roku"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Na stronie"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "System"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Liczby pobrań"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Oceny"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sortuj wg"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "do"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Pokaż/Ukryj panel wyszukiwania zaawansowanego"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Typ"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "wersja"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Następna"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Poprzednia"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Pomijaj sprawdzanie wersji"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "To jest dodatek dla starszych wersji Firefoksa"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Możesz <a href=\"%1$s\">wypróbować starszą wersję</a> lub <a href=\"#\" onclick=\"%2$s\">zignorować sprawdzanie</a>"
+msgstr ""
+"Możesz  <a href=\"%1$s\">wypróbować starszą wersję</a> lub <a href=\"#\" "
+"onclick=\"%2$s\">zignorować sprawdzanie</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">Starsza wersja</a> może zadziałać"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Ten dodatek wymaga niewydanej jeszcze wersji programu <a href=\"%1$s\">Firefox %2$s</a>"
+msgstr ""
+"msgstr \"Ten dodatek wymaga niewydanej jeszcze wersji <a href=\"%1$s"
+"\">Firefox %2$s</a>\""
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Zaktualizuj Firefoksa</a>, aby używać tego dodatku"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s zmienił status %2$s na %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s przypisał nieznaną czynność administracyjną %2$s do ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s usunÄ…Å‚ element %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s dodał program %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s edytował program %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s utworzył wersję %2$s dla %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s usunÄ…Å‚ wersjÄ™ %2$s dla %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s zmienił ustawienie „%2$s� z „%3$s� na „%4$s�"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s przypisał nieznaną czynność edytora %2$s do ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s usunÄ…Å‚ dodatek %2$s z listy polecanych"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s dodał dodatek %2$s do listy polecanych"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s zmienił właściwość dla lokalizacji %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s zmienił na liście polecanych lokalizację dla dodatku %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s skalkulował ponownie sumę kontrolną dla pliku %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s dodał %2$s do grupy %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s skojarzył siebie z %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s utworzył grupę %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s usunÄ…Å‚ grupÄ™ %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s edytował grupę %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s usunÄ…Å‚ %2$s z grupy %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s przypisał nieznaną czynność %2$s do %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s próbował zmodyfikować zablokowaną grupę %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s próbował bez uprawnień zmodyfikować tłumaczenie w %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s dodał system %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s usunÄ…Å‚ system %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s edytował system %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s nie uzyskał dostępu do %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s utworzył odpowiedź %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s usunął odpowiedź %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s edytował odpowiedź %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s zaakceptował recenzję %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s usunÄ…Å‚ recenzjÄ™ %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s przypisał nieznaną czynność z zakresu bezpieczeństwa %2$s do ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s utworzył etykietę %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s usunÄ…Å‚ kategoriÄ™ %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s edytował kategorię %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s zaktualizował tłumaczenie dla %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s zaktualizował tłumaczenie posta na blogu dla %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s zaktualizował tłumaczenie platformy dla %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s zaktualizował tłumaczenie kategorii dla %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s edytował informacje o %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Zaktualizuj Firefoksa</a>, aby używać tego "
+"dodatku"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Dodatki wg nazwy"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Najnowsze dodatki"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Popularne dodatki"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Dodatki wg oceny"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Ostatnio zaktualizowane dodatki"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Bieżąca kategoria"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategorie"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Wybierz kategoriÄ™"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Wszystkie z kategorii: %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Opis nie powinien zawierać więcej znaków niż %1$s."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Wyświetl wszystkie polecane dodatki"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Kolekcja %s"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Najpierw najwyżej oceniane"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Wystąpił błąd podczas usuwania dodatku!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Najpierw ostatnio zaktualizowane"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Wystąpił błąd podczas zapisywania dodatku!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Najpierw najpopularniejsze"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Wystąpił błąd podczas zapisywania komentarza!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Nazwa nie powinna zawierać więcej znaków niż %1$s."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Wszystkie z kategorii: %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Nie znaleziono kolekcji!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Jeśli wiesz już, które dodatki chcesz umieścić w kolekcji, wprowadź ich nazwy poniżej. Jeśli chcesz to zrobić później, naciśnij przycisk %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Wybierz pierwszy dodatek"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Tworzenie kolekcji"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Wybrane dodatki"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Kolekcję dodatków można bardzo łatwo utworzyć wypełniając kilka znajdujących się poniżej pól."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Utwórz kolekcję"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Kolekcje"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Dowiedz się więcej"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Dodaj do ulubionych"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Usuń z ulubionych"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Poniżej możesz zobaczyć nowo utworzoną kolekcję. Jeśli chcesz określić nick kolekcji, wysłać ikonę lub zmienić dodatkowe ustawienia – przejdź na stronę <a href='%1$s'>Zarządzaj kolekcją</a>.</p><p>Twoja kolekcja jest dostępna pod następującym adresem: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Twoja kolekcja została utworzona!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Informacje o kolekcji"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "W kolekcji znajduje siÄ™ %1$s dodatek"
-msgstr[1] "W kolekcji znajdujÄ… siÄ™ %1$s dodatki"
-msgstr[2] "W kolekcji znajduje się %1$s dodatków"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Utworzona przez:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Zaktualizowana:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Dodawanie do ulubionych&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Usuwanie z ulubionych&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Zaloguj się</a>, aby dodać tę kolekcje do swoich ulubionych."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "ZarzÄ…dzaj kolekcjÄ…"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "daty dodania"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "nazwy"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "popularności"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s pobranie w tym tygodniu"
-msgstr[1] "%1$s pobrania w tym tygodniu"
-msgstr[2] "%1$s pobrań w tym tygodniu"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Zaznaczone dodatki zostaną usunięte po zapisaniu"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Aby dodać nowe dodatki do tej kolekcji, wprowadź ich nazwy poniżej."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Aby dodać nowe dodatki do tej kolekcji, wprowadź ich ID poniżej, oddzielając je przecinkami."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Możesz również dodać dodatek do kolekcji bezpośrednio z jego strony."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Dodano %1$s przez %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Dodaj komentarz"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Usuń komentarz"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edytuj komentarz"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Informacja: Komentarz będzie wyświetlany w tak jakiej formie, w jakiej został napisany w momencie dodania"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Zapisz komentarz"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Usuń"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Dodaj do kolekcji"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Sprawdź dostępność"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Tak, chcę usunąć tę kolekcję."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Zaznacz pole wyboru i naciśnij przycisk „%1$s�, aby usunąć tę kolekcję."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Po naciśnięciu przycisku „%1$s�, kolekcja zostanie usunięta. Jeśli nie chcesz usunąć kolekcji, usuń zaznaczenie z pola potwierdzenia na karcie „%2$s� i kontynuuj edytowanie kolekcji. Jeśli opuścisz tę stronę bez zapisania, kolekcja nie zostanie usunięta."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Kolekcja zostanie usunięta!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Musisz dołączyć opis kolekcji"
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Wystąpił błąd podczas wysyłania ikony"
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Musisz podać nazwę kolekcji"
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Jeśli został wybrany nick, musi być on unikatowy."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Nazwa dodatku:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "PowiÄ…zany program"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Wybierz program, z którym współpracuje Twoja kolekcja."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Typ kolekcji"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Usuwanie kolekcji"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Usunięcie kolekcji spowoduje jej trwałe skasowanie."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Opis kolekcji"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Opisz krótko kolekcję i typ znajdujących się w niej dodatków"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Ikona"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Możesz wysłać ikonę w formacie JPG, GIF lub PNG. Zostanie ona przeskalowana do rozmiaru 32x32 px."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Kto może przeglądać tę kolekcję?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Domyślnie kolekcja jest wyświetlana w Katalogu kolekcji i jest dostępna dla wszystkich. Jeśli chcesz ograniczyć przeglądanie kolekcji tylko do osób, które otrzymały specjalny odnośnik, zaznacz drugą opcję."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Tylko zaproszone przeze mnie osoby"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Wszyscy"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Kto może zarządzać tą kolekcją?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Te osoby mogą dodawać dodatki do tej kolekcji, zarządzać wszystkimi dodatkami i ustawieniami oraz udzielać innym użytkownikom zezwoleń."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Nazwa kolekcji"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Nadaj kolekcji opisową nazwę np.: „Ulubione dodatki webmasterskie Leszka�"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Nick kolekcji"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Opcjonalnie, aby mieć szybki dostęp do kolekcji, możesz dodać do niej unikatowy nick:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Kto może dodawać dodatki do tej kolekcji?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Poniższe osoby mogą dodawać dodatki do kolekcji i usuwać te, które dodali."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Wprowadź adres e-mail konta użytkownika na witrynie Dodatki dla Firefoksa"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Zaznaczone konta zostaną usunięte po zapisaniu"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Wprowadź, oddzielane przecinkiem, adresy e-mail kont na witrynie Dodatki dla Firefoksa"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Tylko ja"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Ja i następujący użytkownicy:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Dodaj"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "ZarzÄ…dzanie kolekcjÄ… %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Zarządzanie zawartością kolekcji"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Dodatki w kolekcji:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Ustawienia zaawansowane"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Zarządzanie udzielaniem uprawnień kolekcji"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Anuluj"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Usuń ikonę"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Zmień ikonę"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Ikona zostanie usunięta po naciśnięciu przycisku „%1$s�"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Dostępne nicki"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Twój nick zawierał nieprawidłowe znaki i został poprawiony. Spróbuj ponownie."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Nick został zaakceptowany"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Twoja kolekcja może być dostępna pod tym adresem:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Kolekcja została zapisana!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Aktualizuj kolekcjÄ™"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Usuń kolekcję"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Dodatki"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Zaawansowane"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Nazwa i szczegóły"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Uprawnienia"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Miej na oku swoje dzieci i kalendarz"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Rodzina"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Wypróbuj Kolekcjonera dodatków"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Utwórz kolekcję"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Wykonaj"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Nie masz jeszcze żadnych ulubionych kolekcji.</strong></p> <p>Kolekcje oznaczone jako ulubione mogą być szybko dostępne z tej strony i będą wyświetlane w <a href='%1$s'>Kolekcjonerze dodatków</a>, jeśli masz go zainstalowanego.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Nie masz jeszcze utworzonej żadnej kolekcji. Kolekcje można łatwo tworzyć i uzupełniać ulubionymi dodatkami. <a href='%1$s'>Wypróbuj je</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Kolekcje"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Kolekcjoner dodatków"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "autor: %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Co to sÄ… kolekcje?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sortuj wg"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Kolekcje AMO"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Moje ulubione"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Moje kolekcje"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popularne"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Najpopularniejsze"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Najpopularniejsze w tym miesiÄ…cu"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Najnowsze"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Najpopularniejsze w tym tygodniu"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "To jest nowy sposób szukania i zarządzania ulubionymi dodatkami. Komentuj, udostępniaj i synchronizuj kolekcje – wszystko z poziomu Twojej przeglądarki"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Kolekcje są grupami podobnych dodatków zgromadzonych razem, aby ułatwić ich udostępnianie."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Dodano %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Eksploruj Internet"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Podręczne"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Zarządzaj swoimi sieciami społecznościowymi"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Społeczności"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Zamknij"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Podczas próby dodania ulubionej kolekcji wystąpił błąd. Czy ta kolekcja nie jest już w Twoich ulubionych?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Nie wyświetlaj tej wiadomości ponownie."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "Kolekcja %1$s została dodana do zbioru Twoich ulubionych kolekcji."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Teraz możesz szybko znaleźć tę kolekcję na karcie <a href=\"%1$s\">%2$s</a>. Aby jeszcze łatwiej śledzić swoje ulubione kolekcje, wypróbuj rozszerzenie dla Firefoksa o nazwie <a href=\"%3$s\">Kolekcjoner dodatków</a>."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Kolekcja została usunięta"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Zaplanuj podróż służbową i niezapomniane wakacje"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Podróże"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Autokolekcja"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Kolekcja AMO"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normalna"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Podczas próby usunięcia ulubionej kolekcji wystąpił błąd. To nie była ulubiona kolekcja?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "Kolekcja %1$s została usunięta ze zbioru Twoich ulubionych kolekcji."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Zbuduj doskonałą stronę internetową"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Webmaster"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Co to sÄ… kolekcje?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Przeczytaj FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "To jest nowy sposób szukania dodatków i zarządzania ulubionymi dodatkami. Komentuj, udostępniaj i synchronizuj kolekcje – wszystko z poziomu Twojej przeglądarki."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Strona domowa Kolekcjonera dodatków"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Pobierz Kolekcjonera dodatków:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo Kolekcjonera dodatków"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centrum kompatybilności dodatków"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Przygotuj się na wydanie wersji %1$s korzystając z dostępnych poniżej dla społeczności „%2$s – dodatki� narzędzi oraz informacji."
+msgstr ""
+"Przygotuj się na wydanie wersji %1$s korzystając z dostępnych poniżej dla "
+"społeczności \"%2$s - Dodatki\" narzędzi oraz informacji."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
-msgstr "Wczytywanie danych…"
+msgstr "Wczytywanie danych..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Strona główna"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Informacje o kompatybilności dodatków"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informacje dla twórców dodatków"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Zmień maxVersion bez ponownego wysyłania dodatku"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Sprawdź status swoich dodatków"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Jeśli masz dodatki utrzymywane na witrynie Mozilla Add-ons, <a href=\"%1$s\">zaloguj się</a>, by sprawdzić zgodność swoich dodatków z programem %2$s."
+msgstr ""
+"Jeśli masz dodatki utrzymywane na witrynie Mozilla Add-ons, <a href=\"%1$s"
+"\">zaloguj się</a>, by sprawdzić zgodność swoich dodatków z programem %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Nie masz dodatków utrzymywanych na witrynie Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Wyniki sprawdzania statusu dodatków"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
-msgstr "Pobieranie informacji o statusie dodatków…"
+msgstr "Pobieranie informacji o statusie dodatków..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s użytkowników %2$s (%3$s&#37; wszystkich)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Poniższe dodatki stanowią 95% znanego Mozilli poziomu użycia dodatków i są wyświetlone w kolejności zależnej od tego poziomu."
+msgstr ""
+"Poniższe dodatki stanowią 95% znanego Mozilli poziomu użycia dodatków i są "
+"wyświetlone w kolejności zależnej od tego poziomu."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Zobacz szczegółowe informacje"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Z %1$s dodatków, które stanowią 95&#37; znanego Mozilli poziomu użycia dodatków, <b>%2$s&#37;</b> uważa się za kompatybilne z najnowszymi wersjami %3$s."
+msgstr ""
+"Z %1$s dodatków, które stanowią 95&#37; znanego Mozilli poziomu użycia "
+"dodatków, <b>%2$s&#37;</b> uważa się za kompatybilne z najnowszymi wersjami %"
+"3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Wersje alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Dodatki kompatybilne z wersjÄ… alfa programu %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Wersje beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Dodatki kompatybilne z wersjÄ… beta lub wydaniem kandydackim programu %1$s"
+msgstr ""
+"Dodatki kompatybilne z wersjÄ… beta lub wydaniem kandydackim programu %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Najnowsza wersja"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Dodatki kompatybilne z najnowszÄ… wersjÄ… programu %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Inne wersje"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Dodatki niekompatybilne z żadną wersją programu %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Informacje o kompatybilności dodatków"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informacje dla użytkowników dodatków"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Informacje o kompatybilności dodatków"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Informacje na temat współpracy można znaleźć na %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "stronie wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla chciałaby podziękować następującym osobom za ich wkład w projekt addons.mozilla.org:"
+msgstr ""
+"Mozilla chciałaby podziękować następującym osobom za ich wkład w projekt "
+"addons.mozilla.org:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Programiści"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
-msgstr "Edytorzy"
+msgstr "Redaktorzy"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Lokalizatorzy"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Pozostali współtwórcy"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Poprzedni programiści"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Oprogramowanie i grafika"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Niektóre użyte ikony pochodzą z zestawu <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon</a>, udostępnianego na licencji <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 License</a>."
+msgstr ""
+"Niektóre użyte ikony pochodzą z zestawu <a href=\"http://www.famfamfam.com/"
+"lab/icons/silk/\">famfamfam Silk Icon</a>, udostępnianego na licencji <a "
+"href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
+"Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
-msgstr "Część stron używa elementów widgetu <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a> wydanego na licencji <a href=\"http://simile.mit.edu/license.html\">BSD</a>."
+msgstr ""
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %b %Y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e %b %Y, %H:%M"
@@ -2433,36 +1317,53 @@ msgstr "Panel statystyk"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "Plik %1$s ma nieprawidłowe rozszerzenie (%2$s). Dozwolone rozszerzenia: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "Plik %s nie został zapisany w bazie danych. Proszę spróbować ponownie."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Obrazek o numerze %1$s został zamieniony plikiem %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Plik %s został wysłany. Poniżej możesz dodać opis."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(wykryj automatycznie)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Ta wersja Twojego dodatku nie zawiera informacji o zgodności z Firefoksem %1"
+"$s. Mozilla zamierza wkrótce wydać nową wersję Firefoksa, dlatego prosimy o "
+"przetestowanie dodatku z tÄ… nowÄ… wersjÄ… i zaktualizowanie informacji o "
+"zgodności. Więcej na ten temat można przeczytać <a href=\"%2$s\">tutaj</a>. "
+"Ten komunikat to tylko powiadomienie - w dalszym ciągu możesz przesłać tę "
+"wersjÄ™ do addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Otwiera w nowym oknie"
 
 #: views/elements/developers/additem.thtml:41
 msgid "devcp_additem_sidebar_title"
-msgstr "Wyślij dodatek"
+msgstr "Prześlij dodatek"
 
 #: views/elements/developers/additem.thtml:53
 msgid "devcp_additem_step0_newlink"
@@ -2470,7 +1371,7 @@ msgstr "Umowa programisty"
 
 #: views/elements/developers/additem.thtml:46
 msgid "devcp_additem_step1_link"
-msgstr "Krok 1: Wysyłanie pliku"
+msgstr "Krok 1: Podesłanie pliku"
 
 #: views/elements/developers/additem.thtml:47
 msgid "devcp_additem_step2_link"
@@ -2492,716 +1393,1379 @@ msgstr "Krok 5: Koniec"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Pomoc w wysłaniu"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Dodatek został wyłączony"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edytuj dodatek"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Dodatek został włączony"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Opis dodatku"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Strona domowa dodatku"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nazwa dodatku"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Opis obrazka podglÄ…du"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Uaktywnij"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Polityka prywatności"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Podsumowanie dodatku"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Adres e-mail wsparcia technicznego"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Adres URL wsparcia technicznego"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Informacje o wersji"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominuj dodatek"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Dodatek został nominowany!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Ta operacja spowoduje, że dodatek stanie się aktywny. Będzie wyświetlany w ogólnodostępnych wykazach i dostępny dla usługi sprawdzania aktualizacji."
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Zakończ"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Kończy proces dodawania dodatku i przenosi go do piaskownicy"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Dezaktywuj"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Ta operacja spowoduje dezaktywację dodatku. Nie będzie on wyświetlany w ogólnodostępnych wykazach i nie będzie dostępny dla usługi sprawdzania aktualizacji."
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "PrzenieÅ› do piaskownicy"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Ta operacja spowoduje przeniesienie dodatku do piaskownicy. Operację tę można odwrócić."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Nominuj"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Ta operacja spowoduje nominowanie dodatku do upublicznienia"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Upublicznij"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Ta operacja spowoduje ponowne upublicznienie dodatku."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
-msgstr "Dodatek jest <span class=\"inactive-0\">aktywny</span>. Oznacza to, że Twój dodatek jest wyświetlany we wszystkich dostępnych wykazach – odpowiednio do swojego statusu."
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Aby ukończyć dodatek i przenieść go do <span class=\"status-1\">piaskownicy</span>, muszą być spełnione powyższe kryteria."
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Teraz możesz zakończyć swój dodatek i przenieść go do <span class=\"status-1\">piaskownicy</span> naciskając przycisk „Zakończ�."
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Musi być określona co najmniej jedna kategoria"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Dodatek musi mieć opis"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Dodatek musi mieć nazwę"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Dodatek nie może być oznaczony jako wydanie wstępne."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Wymagany jest co najmniej jeden obrazek podglądu dla rozszerzeń i motywów."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Dodatek musi mieć podsumowanie"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Status dodatku: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Dostępne czynności"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Status aktywności: <span class=\"inactive-0\">Aktywny</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Kryteria kompletacji dodatku"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Status aktywności: <span class=\"inactive-1\">Nieaktywny</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Kryteria nominacji do upublicznienia"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Status zaufania: <span class=\"status-4\">Zaufany</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "Dodatek jest <span class=\"inactive-1\">nieaktywny</span>. Oznacza to, że Twój dodatek nie jest wyświetlany w żadnym wykazie – niezależnie od swojego statusu. Aktualizacje <b>nie</b> są udostępniane przez usługę aktualizacji."
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Przed nominacją dodatku do <span class=\"status-4\">upublicznienia</span> muszą być spełnione powyższe kryteria."
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Teraz naciskając przycisk „Nominuj� możesz nominować dodatek do <span class=\"status-4\">upublicznienia</span>."
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Upubliczniony"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Piaskownica"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Dodatek został <span class=\"status-5\">wyłączony</span> przez administratora i nie może być używany. Jeśli masz jakieś pytania, wyślij e-mail na adres %s."
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Dodatek jest <span class=\"status-0\">niekompletny</span>. Oznacza to, że Twój dodatek nie jest wyświetlany w żadnej części witryny ani nie jest dostępny dla usługi aktualizacji. Możesz powrócić do tej strony, aby zakończyć kompletację dodatku i wysłać go do <span class=\"status-1\">piaskownicy</span> po spełnieniu poniższych kryteriów kompletacji dodatku."
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Dodatek jest nominowany do <span class=\"status-4\">upublicznienia</span> i oczekuje na recenzję edytora. Liczba innych dodatków oczekujących w kolejce do recenzji: %s."
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "Dodatek ciągle oczekuje na recenzję. Nie powinno się to zdarzyć. Wyślij wiadomość do %s zawierającą ID dodatku i stan tego błędu."
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "Dodatek jest <span class=\"status-4\">upubliczniony</span>, co oznacza, że będzie on widoczny we wszystkich wykazach i wynikach wyszukiwania i może być pobierany bez żadnych ograniczeń. Aktualizacje dodatku są dostępne przez usługę sprawdzania aktualizacji."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Dodatek jest w <span class=\"status-1\">piaskownicy</span>, co oznacza, że będzie on widoczny we wszystkich wykazach i wynikach wyszukiwania, ale, aby go pobrać, użytkownicy muszą się zalogować. Aktualizacje dodatku <b>nie</b> są dostępne przez usługę sprawdzania aktualizacji."
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Status %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "Dodatek ma status <span class=\"status-4\">zaufanego</span> dodatku. Oznacza to, że możesz wysyłać aktualizacje tego dodatku bez recenzowania przez edytora."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Odwiedź stronę %1$s, aby dokonać zmian w twoim zgłoszeniu, lub powróć do "
+"panelu kontrolnego programisty."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "naciśnij tutaj"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edytuj dodatek"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Ta wersja została umieszczona w piaskownicy, gdzie oczekuje na recenzje od "
+"testerów piaskownicy i edytorów dodatków Mozilli. O podjętej decyzji "
+"zostaniesz o niej poinformowany(-a) e-mailem."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Możesz dowiedzieć się więcej o systemie recenzji piaskownicy %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "tutaj"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Ta wersja została umieszczona w piaskownicy do użytku tylko przez "
+"doświadczonych użytkowników. Aby została opublikowana, musisz %s swój "
+"dodatek i przejść proces recenzji."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominować"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Dodatek został zgłoszony."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Ponieważ dodatek jest zaufany, ta wersja została automatycznie zatwierdzona "
+"do publicznego dostępu."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Wyślij dodatek"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Dodatek został wysłany"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Aby zwiększyć zainteresowanie swoim dodatkiem, możesz także %s."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "dołączyć jego podgląd"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nie znaleziono autora [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Usuń"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Anuluj"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Czy na pewno anulować zgłoszenie?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Dalej"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Zmień typ dodatku:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Komentarze autora zostały zaktualizowane."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Aktywny"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "Kategoria: %1$s, Status: %2$s i %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Zmień status"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Dodatek został wyłączony przez administratora i nie może być używany. Jeśli masz jakieś pytania, wyślij e-mail na adres %s."
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Status dodatku: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Panel programisty"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Witamy w Panelu programisty"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Nieaktywny"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Ostatnio edytowany %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "Aktualnie nie masz żadnego dodatku przechowywanego na witrynie Mozilla Add-ons. Aby dowiedzieć się, jak ta technologia działa i wysłać swój pierwszy dodatek, kliknij „Zaczynamy!�."
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Zaczynamy!"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Wersje i pliki"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Wyślij nową wersję"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "Nie można usunąć z bazy danych obrazka podglądu %s. Proszę spróbować ponownie."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "Obrazek o numerze %s został usunięty."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "Nie masz uprawnień do usuwania wersji lub plików."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s plik o statusie %2$s"
-msgstr[1] "%1$s pliki o statusie %2$s"
-msgstr[2] "%1$s plików o statusie %2$s"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Dodaj obrazek podglÄ…du"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autorzy"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Brak"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategorie"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Opis"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Wyłączony"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Szczegóły"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Komentarze autora"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "PodglÄ…dy"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Wersje"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Strona domowa"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Brak"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Bez podpisu"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nie znaleziono podglądów."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Aktualizuj"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Adres e-mail wsparcia technicznego"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Twórca nie podał adresu e-mail wsparcia technicznego."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Adres URL wsparcia technicznego"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Twórca nie podał adresu URL wsparcia technicznego."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Zaufany"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Wersja %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nie znaleziono wersji."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Anuluj i powróć"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Tak, zablokuj go"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Czy na pewno zablokować ten dodatek?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Zablokowanie tego dodatku spowoduje, że zniknie on z wyników wyszukiwania i "
+"listingów. Nie będzie można go pobrać z tej witryny i nie będzie oferowany w "
+"procesie aktualizacji. Będzie to wyglądało, jakby został usunięty, choć "
+"zawsze będzie go można w tym miejscu przywrócić."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Zablokuj %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Tak, odblokuj go"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Czy na pewno odblokować ten dodatek?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Odblokowanie tego dodatku spowoduje, że będzie on się pojawiał w wynikach "
+"wyszukiwania i listingach. Będzie go można pobrać z tej witryny, jak również "
+"poprzez proces aktualizacji."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Odblokuj %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Dodaj odpowiedź"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Odpowiedzi"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
-msgstr "W trakcie zapisywania Twojej odpowiedzi wystąpił błąd. W sprawie tego problemu proszę skontaktować się z %1$s."
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
-msgstr "Edytor dodatku poprosił o dodatkowe informacje dotyczące wersji %2$s dodatku %1$s."
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "Podaj więcej informacji dla recenzji dodatku %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Wyślij odpowiedź"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
-msgstr "Odpowiedź została zapisana. Uczestnicy dyskusji zostaną powiadomieni za pomocą wiadomości e-mail."
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "napisana przez %1$s w dniu %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Dodaj autora"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Adres e-mail autora"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Usuń"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Dodaj kolejnego autora"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Dodaj"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Adres e-mail autora:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Sprawdzanie konta e-mail…"
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Aby je zapisać, naciśnij przycisk „Aktualizuj�."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Obecni autorzy"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "ZarzÄ…dzanie autorami dodatku"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Wyświetlaj jako autora na ogólnodostępnych stronach"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Programista</strong> - Może zarządzać wszystkimi parametrami dodatku z wyjątkiem dodawania i usuwania innych autorów."
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Właściciel</strong> - Może zarządzać wszystkimi parametrami dodatku, włącznie z dodawaniem i usuwaniem innych autorów."
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Obserwator</strong> - Może oglądać strony programisty i statystyki, ale nie może wykonywać żadnych zmian."
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Wybierz funkcjÄ™ dla autora:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Wyświetlanie"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Funkcja"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Aktualizuj"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Aktualizuj"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Dodatek nie pasuje do żadnej dostępnej kategorii."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "Kategorie programu %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "ZarzÄ…dzanie kategoriami dodatku"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Aby zobaczyć opis kategorii, umieść kursor myszy nad jej nazwą."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Kategoria %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "Dla tego typu dodatku i programu nie są dostępne żadne kategorie."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Umieść dodatek w tej kategorii, tylko jeśli nie można skojarzyć go z żadną inną dostępną kategorią."
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Zaznacz maksymalnie trzy kategorie, do jakich można zaliczyć dodatek współpracujący z programem %s"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Dodaj lub usuń użytkowników, którzy mogą zarządzać tym dodatkiem."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Wybierz właściwe kategorie dla każdego programu, z jakim współpracuje dodatek."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "Dodaj i modyfikuj podsumowanie dodatku, opis, licencję użytkownika i politykę prywatności."
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Zmień nazwę dodatku, stronę domową, ikonę i inne etykiety."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Aktualizuj"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Napraw błędy wyszczególnione poniżej czerwonym kolorem."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Edytowanie opisów dodatku"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Różne informacje, jakie użytkownicy chcą znać, nie są właściwe do zamieszczania w podsumowaniu czy opisie – można podać je tutaj. Komentarzy zazwyczaj używa się do załączenia wykazu znanych błędów, informacji jak zgłaszać błędy, podania przypuszczalnej daty wydania nowej wersji itp."
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Komentarze autora"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "Opis dodatku jest obszerniejszym opisem funkcji, zastosowania i innych istotnych danych. Jest on wyświetlany na stronie dodatku poniżej podsumowania."
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Opis dodatku"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Jeśli dodatek ma Licencję użytkownika (EULA), wprowadź jej treść tutaj. Przed zainstalowaniem dodatku użytkownicy będą musieli zaakceptować postanowienia licencji. Zwróć uwagę na to, że EULA nie jest tym samym, co licencje stosowane dla kodu np. GPL lub MPL."
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Licencja użytkownika"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Jeśli dodatek ma politykę prywatności, wprowadź jej treść tutaj. Na stronie dodatku będzie wyświetlany odnośnik do niej."
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Polityka prywatności"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Podsumowanie jest krótkim opisem podstawowych funkcji dodatku. Jest ono wyświetlane w wykazach przeglądania i wyników szukania dodatków, a także na górze strony dodatku. Długość podsumowania limitowana jest do <strong>250 znaków</strong>."
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Podsumowanie dodatku"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "ZarzÄ…dzanie autorami dodatku"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "ZarzÄ…dzanie kategoriami dodatku"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "ZarzÄ…dzanie opisami dodatku"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Zarządzanie właściwościami dodatku"
+msgstr "Manage Add-on Properties"
+
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Brak kategorii dla tego typu dodatku"
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autorzy"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Dodaj ikonÄ™"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Zmień ikonę"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Pozwól użytkownikom przeglądać pliki źródłowe"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategorie"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Domyślna lokalizacja"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
-msgstr "Dodatek wymaga zewnętrznego oprogramowania"
+msgstr "Ten dodatek zawiera zewnętrzne oprogramowanie"
+
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Usuń tylko aktualną ikonę"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Nowy plik ikony"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikona"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Dodatkowe informacje o lokalizacji"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
-msgstr "To jest wydanie wstępne"
+msgstr "To jest wydanie przedpremierowe"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
-msgstr "Dodatek właściwy konkretnej stronie"
+msgstr "To jest dodatek specyficzny dla konkretnej strony"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Docelowa lokalizacja"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "krótkie informacje dodatkowe (np. lokalna nazwa dialektu)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Aktualizuj"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Zmień, tylko jeśli zdajesz sobie sprawę ze wszystkich konsekwencji tej zmiany."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Aktualna ikona"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "Domyślne ustawienie regionalne dodatku to podstawowy język, którego tłumaczenie musi być obecne. Jeśli w wybranym przez użytkownika języku tłumaczenie opisów dodatku jest niedostępne, opisy zostaną wyświetlone w domyślnej lokalizacji."
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "Te etykiety są używane do filtrowania i klasyfikowania dodatków."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "Identyfikator GUID dodatku jest określony w jego pliku install.rdf i jest unikatowym identyfikatorem tego dodatku. Po opublikowaniu dodatku na witrynie Mozilla Add-ons nie można zmieniać tego identyfikatora."
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Edycja właściwości dodatku"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Typ dodatku"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Ustawienia administratora"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Domyślny język"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Etykiety dodatku"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "Identyfikator GUID dodatku"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Ikona dodatku"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Inne ustawienia"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "To jest zaufany dodatek?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Przeglądanie źródeł w trybie online"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "Ikona dodatku to mały obrazek wyświetlany obok nazwy dodatku w wykazach przeglądania i wyników szukania, wyświetlanych stronach i w oknie dialogowym instalacji dodatku. Obrazek zostanie automatycznie przeskalowany do wymiarów 32 x 32 piksele. Użyj jednego z następujących typów obrazków: %s."
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Dodatek zawiera komponenty binarne"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Niezaufany"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "Zaufany"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Nowa ikona"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Usuń ikonę"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Jeśli dodatek ma inną stronę domową niż na Mozilla Add-ons, wprowadź jej adres tutaj. Dodając tłumaczenia dodatku, nie ma konieczności lokalizowania witryny na inne języki."
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Strona domowa dodatku"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Nazwa dodatku jest wyświetlana we wszystkich wykazach, w których znajduje się dodatek."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Nazwa dodatku"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Jeśli masz adres e-mail, na który użytkownicy mogą kierować zapytania i prośby o pomoc, wprowadź go tutaj. Dodając tłumaczenia, nie ma konieczności posiadania adresów e-mail dla różnych języków."
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "Adres e-mail wsparcia"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Jeśli dodatek ma witrynę lub forum pomocy, wprowadź ich adresy tutaj. Dodając tłumaczenia, nie ma konieczności, aby witryna była zlokalizowana na inne języki."
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Witryna wsparcia"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "Zaufane dodatki mogą być upubliczniane bez recenzji edytora."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Ikona zostanie usunięta podczas aktualizacji. <a %s>Anuluj</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "Jeśli sobie tego życzysz, źródło plików Twojego dodatku może być oglądane w trybie online przez każdego zalogowanego użytkownika."
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Zezwalaj na przeglądanie źródła w trybie online"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Nie zezwalaj na przeglądanie źródła w trybie online"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Aktualizuj"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">prosty kod "
+"języka</a>, taki jak \"pl\" lub \"en-US\""
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Autorzy"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Kategorie"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Zmień status"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Opisy"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Edytuj dodatek"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Nowa wersja"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Właściwości"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Obrazki"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Panel statystyk"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Wersje i pliki"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Strona dodatku"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3213,7 +2777,7 @@ msgstr "Polecane dodatki"
 #, php-format
 msgid "devcp_editorsqueue_moderatedreviews"
 msgid_plural "devcp_editorsqueue_moderatedreviews"
-msgstr[0] "Recenzje moderowane (%s)"
+msgstr[0] "Recenzja moderowana (%s)"
 msgstr[1] "Recenzje moderowane (%s)"
 msgstr[2] "Recenzje moderowane (%s)"
 
@@ -3223,7 +2787,7 @@ msgstr[2] "Recenzje moderowane (%s)"
 #, php-format
 msgid "devcp_editorsqueue_nominated"
 msgid_plural "devcp_editorsqueue_nominated"
-msgstr[0] "Dodatki nominowane (%s)"
+msgstr[0] "Dodatek nominowany (%s)"
 msgstr[1] "Dodatki nominowane (%s)"
 msgstr[2] "Dodatki nominowane (%s)"
 
@@ -3233,18 +2797,73 @@ msgstr[2] "Dodatki nominowane (%s)"
 #, php-format
 msgid "devcp_editorsqueue_pendingupdates"
 msgid_plural "devcp_editorsqueue_pendingupdates"
-msgstr[0] "OczekujÄ…ce aktualizacje (%s)"
-msgstr[1] "OczekujÄ…ce aktualizacje (%s)"
-msgstr[2] "OczekujÄ…ce aktualizacje (%s)"
+msgstr[0] "Aktualizacja w toku (%s)"
+msgstr[1] "Aktualizacje w toku (%s)"
+msgstr[2] "Aktualizacje w toku (%s)"
+
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Zaznaczone pliki zostaną usunięte."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Pliki"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplikacje docelowe"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Brak plików."
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Informacje dla recenzenta"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Aktualizuj"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nie masz dostępu do tego dodatku."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Długość podsumowania jest ograniczona do 250 znaków.\n"
+"(Wprowadzono %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Nazwa Twojego dodatku już występuje w bazie danych. Prosimy upewnić się, że:"
+"<br /> <li>Wprowadzone kody GUID się zgadzają. Najczęstszym powodem tego "
+"błędu są niepasujące kody GUID.</li> <li>Nie masz zduplikowanych wpisów w "
+"bazie danych. Jeśli masz, należy zaktualizować tamten wpis lub skasować go i "
+"spróbować ponownie.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3258,21 +2877,30 @@ msgstr "Więcej informacji można znaleźć na %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "tej stronie"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Dodatek musi mieć przynajmniej jednego właściciela."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Opisz zmiany wprowadzone w tej aktualizacji dodatku."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "Ta wersja dodatku już istnieje. Aby dokonać zamiany, musisz najpierw usunąć plik %1$s."
+msgstr ""
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "To rozszerzenie pliku (%1$s) nie jest dozwolone dla wybranego typu dodatku. Prosimy skorzystać z jednego z tych: %2$s"
+msgstr ""
+"To rozszerzenie pliku (%s) nie jest dozwolone dla wybranego typu dodatku. "
+"Prosimy skorzystać z jednego z tych: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Niektóre kody GUID plików nie pasują"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3280,7 +2908,7 @@ msgstr "Wybierz nie więcej niż pięć kategorii."
 
 #: controllers/components/developers.php:526
 msgid "devcp_error_guid_application"
-msgstr "Identyfikator tego dodatku (ID) jest już używany przez inny dodatek."
+msgstr "Identyfikator tego dodatku (ID) jest już używany przez inną aplikację."
 
 #: controllers/components/developers.php:337
 #: controllers/components/developers.php:389
@@ -3304,9 +2932,19 @@ msgstr "Nie wysłano żadnego pliku"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "To rozszerzenie pliku (%1$s) nie jest dozwolone dla ikony. Prosimy skorzystać z jednego z tych: %2$s"
+msgstr ""
+"To rozszerzenie pliku (%s) nie jest dozwolone dla ikony. Prosimy skorzystać "
+"z jednego z tych: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Identyczna wersja (%s) dla tego dodatku i platformy została już dodana."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Brak pliku install.rdf."
 
@@ -3314,9 +2952,9 @@ msgstr "Brak pliku install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "W pliku install.rdf zostały znalezione następujące błędy:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Proszę wybrać poprawny typ dodatku."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3324,7 +2962,7 @@ msgstr ""
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "%1$s nie jest prawidłową wersją dla %2$s"
+msgstr "%s nie jest prawidłową wersją dla %s"
 
 #. %s is a string
 #: controllers/components/developers.php:521
@@ -3337,15 +2975,21 @@ msgstr "Identyfikator (ID) dla tego dodatku jest nieprawidłowy: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%1$s nie jest prawidłową wersją dla programu %2$s: wersja minimalna nie może zawierać *"
+msgstr ""
+"%s nie jest prawidłową wersją dla programu %s: wersja minimalna nie może "
+"zawierać *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "Wersja tego dodatku jest nieprawidłowa: zobacz <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">specyfikację</a> (w języku angielskim)"
+msgstr ""
+"Wersja tego dodatku jest nieprawidłowa: zobacz <a href=\"http://developer."
+"mozilla.org/en/docs/Toolkit_version_format\">specyfikację</a> (w języku "
+"angielskim)"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "Wersja tego dodatku jest nieprawidłowa: wersje nie mogą zawierać spacji."
+msgstr ""
+"Wersja tego dodatku jest nieprawidłowa: wersje nie mogą zawierać spacji."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
@@ -3370,7 +3014,8 @@ msgstr "Podczas przenoszenia pliku %s wystąpił błąd."
 
 #: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
-msgstr "Należy określić przynajmniej jeden poprawny program docelowy Mozilli."
+msgstr ""
+"Należy określić przynajmniej jedną poprawną aplikację docelową Mozilli."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
@@ -3378,7 +3023,20 @@ msgstr "W pliku install.rdf nie znaleziono identyfikatora (ID) tego dodatku."
 
 #: controllers/components/developers.php:287
 msgid "devcp_error_no_platform"
-msgstr "Nie wybrano systemu"
+msgstr "Nie wybrano platformy"
+
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Nominacja wymaga dostarczenia żądanych informacji."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nie można nominować przedpremierowego wydania dodatku."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr ""
+"Można jedynie nominować dodatki, które aktualnie znajdują się w piaskownicy."
 
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
@@ -3393,91 +3051,320 @@ msgstr "Dodatek musi mieć określonego przynajmniej jednego autora."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Nie można wybrać tego rozszerzenia pliku (%1$s) dla pliku obrazka. Wybierz jedno z poniższych: %2$s"
+msgstr ""
+"Nie można wybrać tego rozszerzenia pliku (%s) dla pliku podglądu. Wybierz "
+"jedno z poniższych: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Podczas próby zapisania danych wystąpił błąd."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Nie posiadasz uprawnień, by aktualizować ten dodatek."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Dodatki nie mogą używać elementu updateKey. Należy usunąć go z install.rdf i spróbować ponownie."
+msgstr ""
+"Dodatki nie mogą używać elementu updateKey. Należy usunąć go z install.rdf i "
+"spróbować ponownie."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Dodatki nie mogą używać zewnętrznych adresów aktualizacji. Usuń go z pliku install.rdf i spróbuj ponownie."
+msgstr ""
+"Dodatki nie mogą używać zewnętrznych adresów aktualizacji. Usuń go z pliku "
+"install.rdf i spróbuj ponownie."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
-msgstr "Proszę wysłać plik."
+msgstr "Wyślij plik."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Dodaj plik dla innej platformy"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Dodaj autora"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Usuń"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Kategorie dla twojego nowego typu dodatku zostaną wyświetlone w następnym "
+"kroku."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Brak kategorii dla tego typu dodatku."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Proszę wprowadzić opis dodatku."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Proszę wprowadzić nazwę dodatku."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Proszę wybrać typ wysyłanego dodatku."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Proszę wprowadzić podsumowanie dodatku."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Plik dodatku"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Drugi plik dodatku"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Trzeci plik dodatku"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Typ dodatku"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Pozwól innym oglądać kod źródłowy plików w trybie online."
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Adres e-mail autora"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autorzy"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategorie"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Domyślna lokalizacja"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Opis"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Licencja użytkownika (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Ten dodatek wymaga zewnętrznego oprogramowania"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Pliki"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Strona domowa"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Plik ikony"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nazwa"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Wspierane platformy"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "To jest wydanie przedpremierowe"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Polityka prywatności"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "To jest dodatek specyficzny dla konkretnej strony"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Podsumowanie"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Adres e-mail wsparcia technicznego"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Adres URL wsparcia technicznego"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Docelowe aplikacje"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Wersja"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Informacje o wersji"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Brak"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Informacje dla recenzenta"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Ponieważ twój dodatek jest zaufany, należy określić, gdzie powinna znaleźć "
+"siÄ™ ta wersja:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publiczna"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Piaskownica"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Umowa programisty"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Krok 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Wyślij plik"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Krok 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Szczegóły dot. dodatku"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Krok 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Szczegóły dot. wersji"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Krok 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalizacja"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Krok 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Zakończone powodzeniem"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Moje dodatki"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Anuluj"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Wprowadź konto e-mail autora, którego chcesz dodać."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Przenieś w dół"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Przenieś w górę"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Usuń kompatybilność z programem"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Wyświetlaj jako autora na ogólnodostępnych wykazach"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Wybierz licencjÄ™."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Wprowadź tekst swojej licencji."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Programista"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Właściciel"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Obserwator"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Usuń autora"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Czy <strong>na pewno</strong> chcesz usunąć tego autora?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Musisz wybrać plik do wysłania."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Licencja autora dodatku %1$s %2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3487,89 +3374,132 @@ msgstr "Pola lokalizowane"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Niektóre pola na tej stronie są lokalizowane, by wyświetlały się w ojczystym języku użytkowników końcowych. Wybierz poniżej lokalizację, by edytować szczegóły swojego dodatku w danym języku. Jeśli tłumaczenie dla danej lokalizacji nie jest dostępne, zostanie przywrócony wybór domyślnej lokalizacji (%s)."
+msgstr ""
+"Niektóre pola na tej stronie są lokalizowane, by wyświetlały się w ojczystym "
+"języku użytkowników końcowych. Wybierz poniżej lokalizację, by edytować "
+"szczegóły swojego dodatku w danym języku. Jeśli tłumaczenie dla danej "
+"lokalizacji nie jest dostępne, zostanie przywrócony wybór domyślnej "
+"lokalizacji (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Panel kontrolny administratora"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
-msgstr "Panel kontrolny edytora"
+msgstr "Panel kontrolny redaktora"
 
 #: views/elements/developers/myaddons.thtml:52
 msgid "devcp_myaddons_link"
 msgstr "Moje dodatki"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
-msgstr "Strona główna"
+msgstr "Wróć do strony głównej"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Panel statystyk"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Wyślij dodatek"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Narzędzia programisty"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "Identyfikator tego dodatku (%1$s) już występuje w bazie danych. Jeśli jest to Twój dodatek, możesz <a href=\"%2$s\">wysłać nową wersję</a>."
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Wróć do poprzedniej strony"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Wróć do szczegółów dot. dodatku"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominuj %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Typ dodatku został wykryty automatycznie: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>Część zmian nie została zapisana.</span><br />Sprawdź poniżej błędy, jakie wystąpiły. Pozostałe zmiany zostały zapisane."
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Zmiany zostały zapisane.</span><br />Niektóre zmiany mogą być widoczne we wszystkich częściach witryny dopiero po kilku godzinach."
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Usunięcie tego obrazka podglądu, ustawionego jako domyślny, spowoduje, że inny obrazek zostanie automatycznie ustawiony jako domyślny obrazek podglądu."
+msgstr ""
+"Usunięcie tego podglądu, ustawionego jako domyślny, spowoduje, że inny "
+"podgląd zostanie automatycznie ustawiony jako domyślny podgląd."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Domyślna lokalizacja tego dodatku (%1$s [%2$s]) jest inna niż obecnie "
+"wybrana lokalizacja (%3$s [%4$s]). Pola poniżej powinny być uzupełnione w "
+"języku domyślnej lokalizacji (%1$s)."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "Ustawienie tego obrazka jako domyślnego obrazka podglądu spowoduje, że obecny domyślny obrazek podglądu straci swój status."
+msgstr ""
+"Ustawienie tego podglądu jako domyślnego spowoduje, że obecny podgląd "
+"domyślny straci swój status."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "SÄ… niezapisane zmiany. "
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3579,154 +3509,202 @@ msgstr "Panel kontrolny programisty"
 #: controllers/previews_controller.php:103
 #: controllers/previews_controller.php:104
 msgid "devcp_preview_add_pagetitle"
-msgstr "Dodawanie obrazka podglÄ…du"
+msgstr "Dodawanie podglÄ…du"
 
 #: controllers/previews_controller.php:135
 msgid "devcp_preview_added_successfully"
-msgstr "Obrazek podglądu został dodany."
+msgstr "Podgląd został dodany."
 
 #: controllers/previews_controller.php:323
 msgid "devcp_preview_deleted_successfully"
-msgstr "Obrazek podglądu został usunięty."
+msgstr "Podgląd został usunięty."
 
 #: controllers/previews_controller.php:194
 #: controllers/previews_controller.php:195
 msgid "devcp_preview_edit_pagetitle"
-msgstr "Edycja obrazka podglÄ…du"
+msgstr "Edycja podglÄ…du"
 
 #: controllers/previews_controller.php:237
 msgid "devcp_preview_updated_successfully"
-msgstr "Obrazek podglądu został zaktualizowany."
+msgstr "Podgląd został uaktualniony."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Dodaj kolejny obrazek"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Usuń"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Zamień"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Aktualizuj"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Dodaj obrazek"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Wybierz obrazek do wysłania. Obrazki o rozmiarze większym niż 700 x 525 pikseli zostaną przeskalowane. Dozwolone typy plików: %s"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Aby wysłać obrazek, naciśnij przycisk „Aktualizuj�."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Aby zapisać ten obrazek, naciśnij na dole przycisk „Aktualizuj�. (<a %s>Anulować?</a>)"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "Ten obrazek zostanie usunięty po naciśnięciu na dole przycisku „Aktualizuj�. (<a %s>Anulować?</a>)"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Użyj poniższego formularza, by wysłać obrazek podglądu swojego dodatku w formacie PNG, JPG lub GIF. Obrazki, mające rozmiary większe niż: 700 x 525 pikseli zostaną automatycznie przeskalowane."
+msgstr ""
+"Użyj poniższego formularza, by wysłać plik zrzutu ekranu swojego dodatku w "
+"formacie PNG, JPG lub GIF. Obrazki, mające rozmiary większe niż: szerokość "
+"700 pikseli i wysokość 525 pikseli zostaną automatycznie przeskalowane."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
-msgstr "Dodaj obrazek"
+msgstr "Dodaj podglÄ…d"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Opis obrazka"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
-msgstr "Edytuj obrazek"
+msgstr "Edytuj podglÄ…d"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Domyślny obrazek"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
-msgstr "Plik obrazka"
+msgstr "PodglÄ…d pliku"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
-msgstr "Ustaw ten obrazek jako domyślny obrazek podglądu"
+msgstr "Ustaw ten obrazek podglądu jako domyślny"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Nowy obrazek:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Wyślij obrazek: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "Nie można zapisać części nowych obrazków podglądu."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Obrazki zostały zaktualizowane."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "Obrazki podglądu dla tego dodatku są wyświetlone poniżej. Możesz dokonać zmian w opisach lub zmienić obrazki. Domyślny obrazek podglądu to obrazek prezentujący dodatek wyświetlany w wykazach przeglądania i wyników szukania dodatków."
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
-msgstr "Usuń obrazek"
+msgstr "Usuń podgląd"
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete_confirm"
-msgstr "Czy na pewno usunąć ten obrazek?"
+msgstr "Czy na pewno usunąć ten podgląd?"
 
 #: views/previews/edit.thtml:54
 msgid "devcp_previews_submit_edit"
-msgstr "Edytuj obrazek"
+msgstr "Edytuj podglÄ…d"
 
 #: views/previews/add.thtml:63
 msgid "devcp_previews_submit_upload"
 msgstr "Wyślij"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Miniaturka"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Menedżer obrazków podglądu dodatku %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Niepoprawne?"
 
-#: views/developers/uploader.thtml:74
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Czy na pewno chcesz usunąć ten plik?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Najpierw musisz zapoznać się i zaakceptować następującą Umowę programisty."
+msgstr ""
+"Najpierw należy sprawdzić i zaakceptować następującą Umowę programisty."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Nie masz odpowiednich uprawnień do wykonania zmian na tej stronie.</span><br />Jeśli chcesz dokonać zmian, skontaktuj się z właścicielem dodatku."
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "Niektóre zmiany mogą być widoczne we wszystkich częściach witryny dopiero po kilku godzinach."
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Panel programisty"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Pomiń aktualizację informacji o dodatku"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3750,583 +3728,812 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "Tygodniowa liczba pobrań <em>%s</em>"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "Oznaczenie tego dodatku jako aktywny spowoduje wyświetlenie go w ogólnodostępnej części witryny w miejscu odpowiednim dla jego statusu włącznie z wykazami przeglądania i wyników wyszukiwania. Będzie można go pobierać i będzie dostępny dla aplikacji sprawdzającej aktualizacje. Z tego miejsca będzie można ponownie go wyłączyć."
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Czy na pewno chcesz oznaczyć ten dodatek jako aktywny?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Czy na pewno chcesz to zrobić?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "Oznaczenie tego dodatku jako nieaktywny spowoduje, że nie będzie on wyświetlany w ogólnodostępnej części witryny włącznie z wykazami przeglądania i wyników wyszukiwania. Nie będzie można go pobierać i mie będzie dostępny dla aplikacji sprawdzającej aktualizacje. Z tego miejsca będzie można ponownie go włączyć."
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Czy na pewno chcesz oznaczyć ten dodatek jako nieaktywny?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "Nie, anuluj"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "Upublicznienie tego dodatku spowoduje, że każdy będzie mógł go pobrać i użytkownikom będą oferowane jego aktualizacje."
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Czy na pewno chcesz upublicznić ten dodatek?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Przeniesienie tego dodatku do piaskownicy spowoduje, że użytkownicy chcący go pobrać, będą najpierw musieli się zalogować i nie będą oferowane jego aktualizacje. Ponieważ obecnie Twój dodatek ma status „Upubliczniony�, w każdej chwili będzie można go ponownie upublicznić."
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Czy na pewno chcesz przenieść ten dodatek do piaskownicy?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Tak, chcÄ™"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Informacje o nominacji są wymagane.</span><br />Wprowadź do pola tekstowego żądane informacje i spróbuj ponownie."
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Nominowanie dodatku"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Dodawanie dodatków jest obecnie zablokowane. Spróbuj ponownie później."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Zgadzam siÄ™"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Nie zgadzam siÄ™"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Ten dodatek został wyłączony przez administratora."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Wyłączony"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Zaufany"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Najnowsza wersja:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nie masz jeszcze żadnych dodatków. Kliknij %s, aby jakiś wysłać."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "tutaj"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Należy upewnić się, czy %s swojego motywu."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "wysyła się podgląd"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Edycja %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Pomoc (wyświetlana na stronie)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Pomoc"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Użyte znaki: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Czy na pewno chcesz usunąć to tłumaczenie?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Co to są karty „%s�?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "A co, jeśli nie mam żadnego tłumaczenia?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Ukryj pomoc"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "Jeśli użytkownik przegląda witrynę, a tłumaczenie w jego języku jest niedostępne, opisy dodatku zostaną wyświetlone w domyślnym języku dodatku, określonym na stronie edycji właściwości dodatku. Jeśli nie masz żadnego tłumaczenia, do pola domyślnego języka wprowadź identyfikator języka jakim się posługujesz."
-
-#: views/elements/translationbox.thtml:144
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
+
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "Są to karty polskiego ustawienia regionalnego znajdujące się w <i>Panelu tłumaczeń</i>. W panelu tym można zlokalizować określone pola w innych językach, dla których masz tłumaczenie. Możesz dodawać, edytować i usuwać tłumaczenia używając kart ustawień regionalnych."
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Dodaj tłumaczenie"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Usuń tłumaczenie"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Dodaj do wszystkich"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Dodaj"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Anuluj"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Usuń"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Wybierz identyfikator języka tłumaczenia:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "Identyfikator dodatku GUID użyty w tym pliku (%1$s) nie zgadza się z istniejącym GUID dla tego dodatku (%2$s)."
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "Nie masz odpowiednich uprawnień do aktualizacji tego dodatku."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "Podana wersja (%1$s) nie jest wersjÄ… tego dodatku (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Wersja dodatku o takim numerze (%1$s) już istnieje. Jeśli próbujesz dodać inny plik tej wersji, <a href=\"%2$s\">kliknij tutaj</a>."
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "Wysłany numer wersji (%1$s) nie zgadza się z istniejącym numerem wersji (%2$s)."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Zaczynamy!"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Wysyłanie pliku…"
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Dalej"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Edytuj dodatek"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Skompletuję dodatek później."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Dodaj informacje o wydaniu"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>Strona Twojego dodatku została utworzona. Podstawowe informacje zostały uzyskane z wysłanego na nasz serwer pliku, ale można na stronie dodatku umieścić wiele innych informacji.</p><p>Dodatek jest obecnie oznaczony jako <strong>niekompletny</strong>. Aby ukończyć proces umieszczania dodatku, musisz upewnić się, że ma on właściwą nazwę, podsumowanie i opis, a także oznaczoną co najmniej jedną kategorię. Możesz edytować informacje o swoim dodatku, używając odnośnika znajdującego się poniżej, a na <a %s>stronie statusu</a>, w dowolnym czasie, sprawdzić jego aktualny status."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Usuń ten problem i wyślij plik ponownie."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "Nowy plik wersji %1$s został dodany i jest obecnie oznaczony jako %2$s."
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "Dodatek został utworzony!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Uups! Wygląda na to, że wystąpił problem z tym plikiem…"
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Plik został dodany!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Jak to wszystko funkcjonuje?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Wersja %s została utworzona"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Wyślij plik"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Dziękujemy za zainteresowanie i umieszczenie swojego dodatku na witrynie Mozilla Add-ons. Przechowywanie dodatków na witrynie Mozilla Add-ons jest najłatwiejszą formą dystrybucji dodatków. Co możesz od nas otrzymać:</p><ul><li>Każdy dodatek będzie miał swoją ogólnodostępną stronę z informacjami dostarczonymi przez Ciebie, takimi jak: zwięzły opis funkcji dodatku, opcjonalny dłuższy opis i prezentację podglądu obrazków dodatku.</li><li>Dodatek będzie wyświetlany na stronach przeglądania i wyników szukania witryny, a także w menedżerze dodatków Firefoksa 3.</li><li>Będziemy także opiekowali się obsługą wszystkich pobrań dodatku i dostarczali użytkownikom automatyczne aktualizacje po opublikowaniu przez Ciebie nowej wersji.</li><li>Będziesz mieć dostęp do panelu statystyk zawierającego szczegółowe informacje o bazie swoich użytkowników.</li></ul><p>Zanim wszystkie wymienione powyżej funkcje będą dostępne, dodatki utrzymywane na witrynie muszą przejść proces recenzji wykonywany przez edytorów Mozilla Add-ons. Jeśli jesteś gotowy do rozpoczęcia i masz przygotowany do wysłania pakiet swojego rozszerzenia, wystarczy nacisnąć przycisk: Zaczynamy!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Obsługiwane systemy:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Plik dodatku: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Inna"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "Nowy plik będzie możliwy do upublicznienia tak szybko, jak tylko edytor będzie w stanie dokonać jego recenzji. Aktualnie w kolejce do wykonania recenzji oczekuje %1$s innych dodatków. Chcesz, aby został szybciej zrecenzowany? Zastanów się, czy nie zostać <a %2$s>edytorem</a>."
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "Nowa wersja będzie możliwa do upublicznienia tak szybko, jak tylko edytor będzie w stanie dokonać jej recenzji. Aktualnie w kolejce do wykonania recenzji oczekuje %1$s innych dodatków. Chcesz, aby została zrecenzowana szybciej? Zastanów się, czy nie zostać <a %2$s>edytorem</a>."
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "Nowa wersja została utworzona i jest obecnie oznaczona jako %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "Zobacz swój nowy plik na stronie <a %1$s>Wersje i pliki</a>, sprawdź <a %2$s>obecny status</a> swojego dodatku lub <b>dodaj informacje o wydaniu</b> naciskając poniższy przycisk (zalecane)."
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "Obejrzyj dane nowej wersji na stronie <a %1$s>Wersje i pliki</a>, sprawdź <a %2$s>obecny status</a> swojego dodatku lub <b>dodaj informacje o wydaniu</b> naciskając poniższy przycisk (zalecane)."
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Wyślij plik dodatku, używając poniższego formularza. Jeśli masz do wysłania kilka, właściwych dla danego systemu operacyjnego plików wybierz jeden plik i następnie wyślij pozostałe pliki, używając menedżera wersji i plików."
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Wszystkie"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Określone:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Wybierz…"
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Dodawanie pliku do %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Wysyłanie nowego dodatku"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Aktualizacja %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Więcej informacji można znaleźć na %s."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "tej stronie"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Nie znaleziono konta skojarzonego z tym adresem e-mail."
+msgstr "No account found for that email address."
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edycja wersji"
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Kod XML ma nieprawidłową strukturę lub nie wypełniono wymaganych pól. Proszę zapoznać się z <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">dokumentacją</a>, zweryfikować dodatek i spróbować ponownie."
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Wersja została zaktualizowana."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Anuluj"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Usuń wersję"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Usuń pustą wersję"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Czy na pewno usunąć?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Dodaj nowÄ… wersjÄ™"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Anuluj"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Usuń"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Usunięcie tej wersji spowoduje również usunięcie:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s plik"
-msgstr[1] "%s pliki"
-msgstr[2] "%s plików"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Usunąć wersję %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s recenzja"
-msgstr[1] "%s recenzje"
-msgstr[2] "%s recenzji"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Czy na pewno chcesz trwale usunąć wersję %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Anuluj"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Usuń plik"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Dodaj program"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Usuń"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Wyślij nowy plik"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Ustawione tutaj informacje dotyczące programu i wersji, pozwolą użytkownikom zainstalować Twój dodatek, nawet jeśli dane zawarte w pliku install.rdf wskazują, że jest on niekompatybilny. <a %s>Wykaz obsługiwanych programów i wersji</a>."
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "Czy <b>na pewno</b> chcesz usunąć kompatybilność z tym programem?"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Czy <b>na pewno</b> chcesz trwale usunąć ten plik?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Informacje rejestracyjne"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Kompatybilne programy"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Informacja o pliku"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licencja"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "ZarzÄ…dzanie wersjÄ… %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Uwagi dla edytora"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Usuń plik"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Numer pliku: %1$s; System: (%2$s); Utworzono: %3$s; Status określono na %4$s %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Proszę wybrać odpowiednią licencję dla swojego dodatku. Ta licencja określa prawa do kodu źródłowego, które przekazujesz."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Nie znaleziono plików."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Opcjonalna informacja dla edytora recenzujÄ…cego tÄ™ wersjÄ™."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Usuń program"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Wybierz program"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Plik"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "System"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Rozmiar"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Informacje o zmianach w tym wydaniu, nowe funkcje, znane błędy i inne użyteczne informacje właściwe dla tego wydania/wersji. Informacje te będą również dostępne dla użytkowników aktualizujących dodatek z poziomu menedżera dodatków Firefoksa 3."
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Informacje o wydaniu"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Są niezapisane zmiany.</strong> Kompatybilność nie zostanie usunięta do czasu naciśnięcia na dole strony przycisku „Aktualizuj�."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Są niezapisane zmiany.</strong> Pliki nie zostaną usunięte do czasu naciśnięcia na dole strony przycisku „Aktualizuj�."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Aktualizuj"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "ZarzÄ…dzanie wersjami i plikami"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Nie ma żadnej wersji"
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Wersja %s została usunięta."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "Ta wersja nie ma skojarzonych plików i może zostać usunięta. Czy chcesz usunąć tę wersję?"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Data utworzenia"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
 msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Wersja"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Ten dodatek został wyłączony"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "Ten dodatek nie został jeszcze nominowany."
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Ten plik nie oczekuje na recenzjÄ™."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
 #: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "Nie określono czynności. Wybierz ją."
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "Podaj nazwy testowanych programów."
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
 #: controllers/components/editors.php:84
 #: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "Napisz komentarze recenzji."
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "Wybierz co najmniej jeden plik do zrecenzowania."
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "Podaj nazwy testowanych systemów operacyjnych."
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
-msgstr "Filtruj"
+msgstr "Filtr"
 
 #: views/editors/logs.thtml:44
 msgid "editorcp_logs_filter_by"
-msgstr "Filtruj wg typu/czynności"
+msgstr "Filtr wg typu/akcji"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Dziennik zdarzeń"
 
@@ -4340,23 +4547,23 @@ msgstr "Wróć do strony głównej"
 
 #: views/elements/developers/editorsmenu.thtml:61
 msgid "editorcp_menu_reviewlog_link"
-msgstr "PrzeglÄ…daj zdarzenia"
+msgstr "PrzeglÄ…daj zdarzenie"
 
 #: views/elements/developers/editorsmenu.thtml:55
 msgid "editorcp_menu_summary_link"
-msgstr "Przegląd edytorów"
+msgstr "Podsumowanie redaktora"
 
 #: views/elements/developers/editorsmenu.thtml:52
 msgid "editorcp_menu_title"
-msgstr "Narzędzia edytora"
+msgstr "Narzędzia redaktora"
 
 #: views/editors/reviewlog.thtml:49
 msgid "editorcp_reviewlog_button_filter"
-msgstr "Filtruj"
+msgstr "Filtr"
 
 #: views/editors/reviewlog.thtml:58
 msgid "editorcp_reviewlog_column_action"
-msgstr "Czynność"
+msgstr "Akcja"
 
 #: views/editors/reviewlog.thtml:56
 msgid "editorcp_reviewlog_column_addon"
@@ -4368,7 +4575,7 @@ msgstr "Data"
 
 #: views/editors/reviewlog.thtml:57
 msgid "editorcp_reviewlog_column_editor"
-msgstr "Edytor"
+msgstr "Redaktor"
 
 #: views/editors/reviewlog.thtml:94
 msgid "editorcp_reviewlog_comments_hide"
@@ -4382,15 +4589,15 @@ msgstr "Wyświetl komentarze"
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "Wyświetl wpisy między %1$s i %2$s"
+msgstr "Wyświetl wpisy między %s i %s"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "Brak recenzji dla tego okresu."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
-msgstr "Dziennik recenzji"
+msgstr "PrzeglÄ…daj zdarzenie"
 
 #: views/editors/summary.thtml:61
 msgid "editorcp_summary_monthreviews_heading"
@@ -4398,352 +4605,309 @@ msgstr "Oceny miesięczne"
 
 #: views/editors/summary.thtml:77
 msgid "editorcp_summary_neweditors_heading"
-msgstr "Nowi edytorzy"
+msgstr "Nowi redaktorzy"
 
 #: views/editors/summary.thtml:42
 msgid "editorcp_summary_page_heading"
-msgstr "Podsumowanie edytora"
+msgstr "Podsumowanie redaktora"
 
 #: views/editors/summary.thtml:94
 msgid "editorcp_summary_recentactivity_heading"
-msgstr "Ostatnie czynności edytorów"
+msgstr "Aktywność redaktora"
 
 #: views/editors/summary.thtml:45
 msgid "editorcp_summary_totalreviews_heading"
-msgstr "Liczba recenzji"
+msgstr "Recenzji razem"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzja dodatku"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Uzupełnij następujące pola:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Wybierz przynajmniej jeden plik do recenzji."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Recenzowanie własnych dodatków jest zabronione."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Zewnętrzne oprogramowanie"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
-msgstr "Dodaj element"
+msgstr "Dodaj cechÄ™"
 
 #: views/editors/featured.thtml:126
 msgid "editors_featured_add_feature_submit"
 msgstr "Dodaj"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
-msgstr "Nie udało się dodać elementu."
+msgstr "Nie udało się dodać cechy."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
-msgstr "Element został dodany."
+msgstr "Dodano cechÄ™."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
-msgstr "Nie udało się edytować elementu."
+msgstr "Nie udało się edytować cechy."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
-msgstr "Edycja elementu zakończona powodzeniem."
+msgstr "Edycja cechy zakończona powodzeniem."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Przynajmniej jedna lokalizacja jest nieprawidłowa"
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
-msgstr "Nie udało się usunąć elementu."
+msgstr "Nie udało się usunąć cechy."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
-msgstr "Element został usunięty."
+msgstr "Usunięto cechę."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Polecane dodatki"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
-msgstr "Wykonaj"
+msgstr "Przejdź"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
-msgstr "Usuń element"
+msgstr "Usuń cechę"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
-msgstr "Filtrowanie kolejki"
+msgstr "Filtr kolejki"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Pomocne odnośniki"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
-msgstr "Poradnik edytora"
+msgstr "Przewodnik redaktora"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
-msgstr "Polityka dodatków"
+msgstr "Polityka dodatku"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Te filtry pozostanÄ… aktywne na czas trwania sesji lub do wyczyszczenia."
+msgstr ""
+"Te filtry pozostanÄ… aktywne na czas trwania sesji lub do wyczyszczenia."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
-msgstr "Aktualnie nie ma dodatków tego typu do recenzji."
+msgstr "Aktualnie żadne %s nie są dostępne do recenzji."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dzień"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 godzina"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuta"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
-msgstr "Panel kontrolny edytora"
+msgstr "Panel kontrolny redaktora"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Tylko %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
-msgstr "Wydanie wstępne"
+msgstr "Wydanie przedpremierowe"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
-msgstr "Kompatybilny z %s"
-
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Dodatek lub adres e-mail autora"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Typ dodatku"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Program"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Maksymalna wersja"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Systemy"
+msgstr "Kompatybilność %s"
 
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Czas oczekiwania (dni)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Wynik wyszukiwania: <strong>%1$s</strong> dodatek"
-msgstr[1] "Wynik wyszukiwania: <strong>%1$s</strong> dodatki"
-msgstr[2] "Wynik wyszukiwania: <strong>%1$s</strong> dodatków"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Wyczyść"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
-msgstr "Filtruj"
+msgstr "Filtr"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Wszystkie kolejki recenzji są aktualnie wyłączone. Spróbuj ponownie później"
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Edytuj dodatek"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Historia dodatku"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Strona dodatku"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "PrzeglÄ…d dodatku"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Obrazki"
+msgstr ""
+"Wszystkie kolejki recenzji są aktualnie wyłączone. Spróbuj ponownie później"
 
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
-msgstr "Czynność recenzji"
+msgstr "Akcja recenzji"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "PoproÅ› o dodatkowe informacje"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publikuj"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "PoproÅ› o Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Pozostaw w piaskownicy"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komentarze do recenzji"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
-msgstr "Użyj tego formularza do wysłania prośby do autora o dodatkowe informacje. Autor za pomocą wiadomości e-mail zostanie powiadomiony i będzie mógł udzielić odpowiedzi. Gdy nadejdzie odpowiedź, otrzymasz powiadomienie."
+msgstr ""
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "To działanie spowoduje, że dodatek i jego ostatnia wersja zostaną oznaczone jako ogólnodostępne. Nowe wersje będą trafiały do piaskownicy i czekały na recenzję edytora."
+msgstr ""
+"To oznaczy dodatek i jego ostatnią wersję jako publiczne. Przyszłe wersje "
+"trafiÄ… do piaskownicy, do momentu zrecenzowania przez edytora."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
-msgstr "To działanie spowoduje, że dodatek pozostanie w piaskownicy."
+msgstr "To pozostawi dodatek w piaskownicy."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "To działanie spowoduje zatwierdzenie nowej wersji upublicznionego dodatku znajdującej się w piaskownicy i zezwoli na jej wyświetlenie na stronie ogólnodostępnej."
+msgstr ""
+"To zatwierdzi wersjÄ™ z piaskownicy publicznego dodatku i zezwoli na jej "
+"wyświetlenie na stronie publicznej."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "To działanie spowoduje, że wersja upublicznionego dodatku znajdująca się w piaskownicy nadal w niej pozostanie."
+msgstr ""
+"To spowoduje, że wersja z piaskownicy publicznego dodatku pozostanie w "
+"piaskownicy."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Jeśli masz jakieś zastrzeżenia do bezpieczeństwa tego dodatku, kwestii licencyjnych lub innych, na które powinien spojrzeć administrator, wpisz swoje uwagi do pola poniżej. Zostaną one przekazane tylko administratorowi."
+msgstr ""
+"Jeśli masz jakieś zastrzeżenia do bezpieczeństwa tego dodatku, kwestii "
+"licencyjnych lub innych, na które powinien spojrzeć administrator, wpisz "
+"swoje uwagi do pola poniżej. Zostaną one przekazane administratorowi, a nie "
+"autorowi."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
-msgstr "Porównaj z wersją upublicznioną"
+msgstr "Porównaj z wersją publiczną"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Wyświetl zawartość"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autorzy:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategorie:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
-msgstr "Kompatybilność:"
+msgstr "Kompatybilność"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Opis"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentarze autora"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Pliki:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
-msgstr "Historia dodatku"
+msgstr "Historia elementu"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
-msgstr "Informacje o nominacji"
+msgstr "Wiadomość o nominacji"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
-msgstr "Obrazki"
+msgstr "PodglÄ…dy"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Polityka prywatności"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
-msgstr "Recenzja %s"
+msgstr "Recenzja: %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
-msgstr "Informacje dla edytora"
+msgstr "Uwagi dla recenzenta"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Podsumowanie"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Informacje o wersji"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Odpowiedź"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Prośba o dodatkowe informacje"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -4753,14 +4917,14 @@ msgstr "ZarzÄ…dzanie recenzjÄ…"
 #: views/elements/developers/editors_review_history_item.thtml:56
 #: views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
-msgstr "Nominacja zatwierdzona/Upubliczniony"
+msgstr "Nominacja zatwierdzona/Publiczna"
 
 #: views/elements/developers/editors_review_history_item.thtml:59
 #: views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
-msgstr "Odmowa nominacji/Piaskownica"
+msgstr "Nominacja zablokowana/Piaskownica"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Brak wcześniejszych recenzji."
 
@@ -4772,105 +4936,98 @@ msgstr "ZarzÄ…dzanie recenzjÄ…"
 #: views/elements/developers/editors_review_history_item.thtml:67
 #: views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
-msgstr "Zatwierdzony/Upubliczniony"
+msgstr "Zatwierdzone/Publiczne"
 
 #: views/elements/developers/editors_review_history_item.thtml:70
 #: views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
-msgstr "Odmowa/Piaskownica"
+msgstr "Zablokowane/Piaskownica"
 
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Wyświetl/ukryj odpowiedź (%1$s)"
-msgstr[1] "Wyświetl/ukryj odpowiedzi (%1$s)"
-msgstr[2] "Wyświetl/ukryj odpowiedzi (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
-msgstr "Programy:"
+msgstr "Aplikacje:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
-msgstr "lub wybierz gotową odpowiedź:"
+msgstr "lub wybierz odpowiedź:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentarze:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Systemy operacyjne:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Do góry"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Informacja: Recenzuj więcej plików, tylko jeśli masz testować wszystkie zaznaczone pliki."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
-msgstr "następny &raquo;"
+msgstr "następna &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
-msgstr "Nie znaleziono obrazków."
+msgstr "Nie znaleziono podglądów."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
-msgstr "&laquo; poprzedni"
+msgstr "&laquo; poprzednia"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Kolejka recenzji"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> z %2$s w kolejce "
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "Dodatki w kolejce: <strong># %1$s</strong> z %2$s"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
-msgstr "Wykonaj"
+msgstr "Wykonaj akcjÄ™"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
-msgstr "Czynność"
+msgstr "Akcja"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentarze"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
-msgstr "Edytor"
+msgstr "Recenzent"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Wersja/plik"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
-msgstr "Powiadom mnie, gdy ten dodatek zostanie zaktualizowany. (Kolejne aktualizacje nie będą generowały wiadomości e-mail)"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
-msgstr "Proces recenzji został pomyślnie zakończony."
+msgstr "Recenzja została wysłana."
 
 #: views/editors/reviews_queue.thtml:106
 msgid "editors_reviews_action_delete_review"
@@ -4878,7 +5035,7 @@ msgstr "Usuń recenzję"
 
 #: views/editors/reviews_queue.thtml:104
 msgid "editors_reviews_action_keep"
-msgstr "Usuń etykiety, zachowaj recenzję"
+msgstr "Usuń flagi, zachowaj recenzję"
 
 #: views/editors/reviews_queue.thtml:102
 msgid "editors_reviews_action_skip"
@@ -4886,13 +5043,13 @@ msgstr "Pomiń"
 
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
-msgstr "Czynność"
+msgstr "Akcja"
 
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "W odpowiedzi na:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenzje zostały wysłane!"
 
@@ -4904,127 +5061,122 @@ msgstr "Brak recenzji do moderacji."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Wyślij recenzje"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
-msgstr "Przeznaczony dla danej strony"
+msgstr "Specyficzne dla danej strony"
+
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nowy"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Aktualizuj"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
-msgstr "Testowany program"
+msgstr "Testowana aplikacja"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testowane systemy operacyjne"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
-msgstr "Informacje dodatkowe"
+msgstr "Dodatkowe informacje"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Dodatek"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Typ"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Typy dodatku"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Wiek"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplikacje"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
-msgstr "Ogranicz do lokalizacji"
+msgstr "Ograniczyć do lokalizacji?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Czas oczekiwania"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platformy"
 
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Sortuj rosnÄ…co"
-
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Sortuj malejÄ…co"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Typy wysyłania"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dni"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s godzin"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
-msgstr "%s min"
+msgstr "%s minut(y)"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Brak dostępu"
 
 #: views/errors/error401.thtml:52
 msgid "error_access_denied_message"
-msgstr "Nie masz uprawnień do przeglądania tej strony."
-
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Ten dodatek już istnieje!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+msgstr "Brak uprawnień do przeglądania tej strony."
+
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
-msgstr "Nie znaleziono dodatku!"
+msgstr "Nie znaleziono dodatku."
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Ten dodatek nie może zostać pokazany tutaj."
 
@@ -5032,116 +5184,93 @@ msgstr "Ten dodatek nie może zostać pokazany tutaj."
 msgid "error_addon_selfreview"
 msgstr "Nie możesz recenzować własnego dodatku."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
-msgstr "W tej kategorii nie ma żadnych dodatków!"
+msgstr "W tej kategorii nie ma żadnych dodatków."
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
 msgstr "Nie znaleziono kanału RSS dodatku"
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Podany e-mail jest niepoprawny."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "To pole nie może być puste."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
-msgstr "Nie znaleziono pliku!"
+msgstr "Nie znaleziono pliku."
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "BÅ‚Ä…d pliku: %s nie istnieje."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Znaleziono błędy w formularzu. Popraw je i wyślij ponownie."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Nieprawidłowy kod captcha, proszę spróbować ponownie!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "Ten adres URL ma nieprawidłowy format. Poprawny adres URL wygląda jak: http://example.com/moja_strona."
+msgstr ""
+"Ten adres URL ma nieprawidłowy format. Poprawny adres URL wygląda jak: "
+"http://example.com/moja_strona."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "BrakujÄ…cy argument: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Brak plików"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Uwaga"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
-msgstr "Nie znaleziono podglÄ…du!"
+msgstr "Nie znaleziono podglÄ…du."
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Musisz wybrać ocenę."
 
@@ -5149,86 +5278,73 @@ msgstr "Musisz wybrać ocenę."
 msgid "error_user_already_confirmed"
 msgstr "To konto użytkownika zostało już potwierdzone."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
-msgstr "Kod potwierdzający jest nieprawidłowy!"
+msgstr "Kod potwierdzający jest nieprawidłowy."
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Podane hasła nie pasują do siebie."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Ten adres e-mail jest już używany przez innego użytkownika."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Prośba o zmianę e-maila straciła ważność. Proszę ponownie zmienić adres e-mail w profilu użytkownika i kliknąć odnośnik w e-mailu potwierdzającym zaraz po otrzymaniu listu."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Użytkownicy mogą mieć tylko jedną funkcję. Zanim przejdziesz dalej, usuń użytkownika z wszystkich funkcji."
+msgstr ""
+"Prośba o zmianę e-maila straciła ważność. Proszę ponownie zmienić adres e-"
+"mail w profilu użytkownika i kliknąć odnośnik w e-mailu potwierdzającym "
+"zaraz po otrzymaniu listu."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
-msgstr "Ten nick jest już używany."
-
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+msgstr "Ten pseudonim jest już używany."
+
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
-msgstr "Nie znaleziono użytkownika!"
+msgstr "Nie znaleziono użytkownika."
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Należy potwierdzić założenie swojego konta, używając kodu otrzymanego e-mailem."
+msgstr ""
+"Należy potwierdzić założenie swojego konta, używając kodu otrzymanego e-"
+"mailem."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło!"
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
-msgstr "Nie znaleziono wersji!"
+msgstr "Nie znaleziono wersji."
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
-msgstr "Wprowadzono złe hasło!"
+msgstr "Wprowadzono złe hasło."
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Dowiedz się więcej"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Więcej o dodatku %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5236,268 +5352,217 @@ msgstr[0] "%1$s recenzja"
 msgstr[1] "%1$s recenzje"
 msgstr[2] "%1$s recenzji"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Więcej z kategorii "
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "Wróć do dodatku"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Pokaż wszystkie"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "Wróć do recenzji"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Przeglądanie pliku :: %2$s – dodatki"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Informacje o AMO"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Często zadawane pytania"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Wszelkie prawa zastrzeżone."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Copyright"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Twórcy"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla umieszcza odnośniki do tych programów grzecznościowo. Prosimy nie kierować do nas uwag i zażaleń dotyczących ich działania. Wszelkie pytania, reklamacje i roszczenia dotyczące tych aplikacji należy kierować do ich twórców."
+msgstr ""
+"Mozilla umieszcza odnośniki do tych programów grzecznościowo. Prosimy nie "
+"kierować do nas uwag i zażaleń dotyczących ich działania. Wszelkie pytania, "
+"reklamacje i roszczenia dotyczące tych aplikacji należy kierować do ich "
+"twórców."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Idź"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Informacje prawne"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Inne języki:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Polityka prywatności"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Zapisz"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "SÅ‚ownik"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "SÅ‚owniki"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Rozszerzenie"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Rozszerzenia"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pakiet językowy (dodatek)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pakiety językowe (dodatek)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
-msgstr "Pakiet językowy (program)"
+msgstr "Pakiet językowy (aplikacja)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
-msgstr "Pakiety językowe (program)"
+msgstr "Pakiety językowe (aplikacja)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Wtyczka"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Wtyczki"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Wyszukiwarka"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Wyszukiwarki"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Motyw"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Motywy"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Wszystkie lokalizacje"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
-msgstr "Wróć do głównej strony %1$s – dodatki"
+msgstr "Wróć do głównej strony %1$s - Add-ons"
 
 #: views/elements/header.thtml:87
 msgid "header_main_firefox_header"
-msgstr "Dodatki dla Firefoksa"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Dodatki <em>dla</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefoksa</strong>"
+msgstr "Firefox - dodatki"
 
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Dodatki"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Dodatki <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
-msgstr "Seamonkey – dodatki"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Dodatki <em>dla</em> <img alt=\"Seamonkey\" src=\"%1$s\" /> <strong>Seamonkey</strong>"
+msgstr "Seamonkey - dodatki"
 
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
-msgstr "Sunbird – dodatki"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Dodatki <em>dla</em> <img alt=\"Sunbird\" src=\"%1$s\" /> <strong>Sunbirda</strong>"
+msgstr "Sunbird - dodatki"
 
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
-msgstr "Thunderbird – dodatki"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Dodatki <em>dla</em> <img alt=\"Thunderbird\" src=\"%1$s\" /> <strong>Thunderbirda</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Przejdź do menu innych programów"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Przejdź do menu kategorii"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Przejdź do głównej zawartości"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Przejdź do formularza wyszukiwania"
+msgstr "Thunderbird - dodatki"
 
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Dodatki"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Zaloguj siÄ™"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Wyloguj siÄ™"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Moje konto"
 
@@ -5505,75 +5570,47 @@ msgstr "Moje konto"
 msgid "header_navlink_register"
 msgstr "Zarejestruj siÄ™"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Zarejestruj siÄ™</a> lub <a href=\"%2$s\">Zaloguj siÄ™</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Narzędzia"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
-msgstr "Obrazek podglÄ…du dodatku %s"
+msgstr "PodglÄ…d dodatku %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">Zaloguj się</a>, aby zainstalować ten dodatek. <a href=\"%2$s\">Dlaczego</a>?"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Instaluj ten eksperymentalny dodatek. <a href=\"%1$s\">Co to jest?</a>"
+msgstr "<a href=\"%1$s\">Zaloguj się</a>, aby zainstalować ten dodatek"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Dodaj do programu %1$s %2$s"
+msgstr "Dodaj do programu %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Dodaj dodatek %1$s do programu %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Pobierz dodatek %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Ten dodatek nie jest dostępny."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista pakietów językowych i słowników."
 
@@ -5585,9 +5622,8 @@ msgstr "Pobierz słownik"
 msgid "langtools_download_langpack"
 msgstr "Pobierz pakiet językowy"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Słowniki i pakiety językowe"
 
@@ -5599,74 +5635,36 @@ msgstr "Zainstaluj słownik"
 msgid "langtools_install_langpack"
 msgstr "Zainstaluj pakiet językowy"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "SÅ‚ownik"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pakiet językowy"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Język"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "WÅ‚asna licencja"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licencja BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Licencja GNU General Public Licence, wersja 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Licencja GNU General Public Licence, wersja 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Licencja GNU Lesser General Public License, wersja 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Licencja GNU Lesser General Public License, wersja 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licencja MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Licencja Mozilla Public License, wersja 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Kliknij tutaj, by wrócić na stronę główną."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Daty"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Pobrań"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nazwy"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Oceny"
@@ -5691,51 +5689,40 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Słowniki i pakiety językowe"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Wtyczki"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Motywy"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Znajdź dodatki dla innych programów"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "inni"
 
 #: controllers/pages_controller.php:90
 msgid "page_title_appversions"
-msgstr "Wersje programu"
-
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Kolekcjoner dodatków"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Kolekcjoner dodatków – FAQ"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Funkcje Kolekcjonera dodatków"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Zapraszamy do Kolekcjonera dodatków"
+msgstr "Wersje aplikacji"
 
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Podziękowania"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ programisty"
+msgid "page_title_experimental_addons"
+msgstr "Dodatek eksperymentalny"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5743,7 +5730,7 @@ msgstr "Często zadawane pytania"
 
 #: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
-msgstr "Dostosuj swojego Firefoksa – FAQ"
+msgstr "Dostosuj swojego Firefoksa - FAQ"
 
 #: controllers/pages_controller.php:101
 msgid "page_title_policy"
@@ -5763,44 +5750,57 @@ msgstr "System recenzji piaskownicy"
 
 #: controllers/pages_controller.php:109
 msgid "page_title_submissionhelp"
-msgstr "Wysyłanie dodatków – pomoc"
+msgstr "Wysyłanie dodatków - pomoc"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
-msgstr "Poprawne wersje programu"
+msgstr "Poprawne wersje aplikacji"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Dodatki wysłane do Mozilla Add-ons muszą zawierać plik install.rdf, w którym musi być zadeklarowane wsparcie dla przynajmniej jednego z poniższych programów. Tylko wersje wymienione poniżej są dozwolone."
+msgstr ""
+"Dodatki wysłane do Mozilla Add-ons muszą zawierać plik install.rdf, w którym "
+"musi być zadeklarowane wsparcie dla przynajmniej jednej z poniższych "
+"aplikacji. Tylko wersje wymienione poniżej są dozwolone."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Nawet jeśli program, w którym ma pracować dany dodatek, nie wymaga pliku install.rdf, należy utworzyć go wg opisu na %s i dołączyć do dodatku."
+msgstr ""
+"Nawet jeśli aplikacja, w której ma pracować dany dodatek, nie wymaga install."
+"rdf, należy utworzyć go wg opisu na %s i dołączyć do dodatku."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "tej stronie"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Wersje"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Wróć do poprzedniej strony"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Strona informacyjna piaskownicy"
 
 #: views/elements/pagination.thtml:53
 msgid "pagination_next_page"
-msgstr "następna"
+msgstr "następne"
+
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "To jest strona %1$s z %2$s"
 
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
@@ -5808,7 +5808,9 @@ msgstr "poprzednia"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Wprowadź <strong>oba słowa</strong> poniżej, <strong>oddzielając je spacją</strong>."
+msgstr ""
+"Wprowadź <strong>oba słowa</strong> poniżej, <strong>oddzielając je spacją</"
+"strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5822,32 +5824,35 @@ msgstr "Wpisz to, co słyszysz."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Jeśli jest to trudne do zrozumienia, <a href=\"%1$s\">posłuchaj</a> czegoś innego lub <a href=\"%2$s\">wróć do formy tekstowej</a>."
+msgstr ""
+"Jeśli jest to trudne do zrozumienia, <a href=\"%1$s\">posłuchaj</a> czegoś "
+"innego lub <a href=\"%2$s\">wróć do formy tekstowej</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Jeśli tekst jest nieczytelny, spróbuj <a href=\"%1$s\">innych słów</a> lub zamiast tego <a href=\"%2$s\">posłuchaj</a> nagrania dźwiękowego."
+msgstr ""
+"Jeśli tekst jest nieczytelny, spróbuj <a href=\"%1$s\">innych słów</a> lub "
+"zamiast tego <a href=\"%2$s\">posłuchaj</a> nagrania dźwiękowego."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Czy jesteś człowiekiem?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Co to jest?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
-msgstr "Podczas oznaczania recenzji etykietą wystąpił błąd!"
+msgstr "Podczas oznaczania recenzji flagą wystąpił błąd!"
 
 #: models/reviews_moderation_flag.php:69
 msgid "review_flag_reason_bug_support"
 msgstr "Niewłaściwie umieszczona prośba o pomoc lub raport o błędzie"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Zgłoś tę recenzję (wybierz powód)"
 
@@ -5861,13 +5866,14 @@ msgstr "Inny (proszę określić)"
 
 #: models/reviews_moderation_flag.php:65
 msgid "review_flag_reason_spam"
-msgstr "Spam lub niecenzuralna treść"
+msgstr "Spam lub inna nierecenzowana zawartość"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
-msgstr "Dziękujemy. Recenzja została oznaczona etykietą w celu zatwierdzenia jej przez edytora."
+msgstr ""
+"Dziękujemy. Recenzja została oznaczona flagą w celu zatwierdzenia jej przez "
+"redaktora."
 
 #: views/reviews/display.thtml:41
 msgid "review_flag_this"
@@ -5875,155 +5881,135 @@ msgstr "Zgłoś tę recenzję"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Jeśli ta recenzja jest niewłaściwa lub stanowi spam, kliknij tutaj, by zgłosić ją do oceny przez edytora."
+msgstr ""
+"Jeśli ta recenzja jest niewłaściwa lub stanowi spam, kliknij tutaj, by "
+"zgłosić ją do oceny przez redaktora."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Pamiętaj o poniższych wskazówkach:</p><ul><li>Pisz tak, jakbyś mówił przyjacielowi o swoich doświadczeniach z dodatkiem. Podawaj charakterystyczne i przydatne szczegóły, takie jak opcje, które ci się podobają lub których nie lubisz, czy łatwo się ich używa, a także, czy mają jakieś wady. Unikaj ogólnikowych określeń w rodzaju „Świetny�, czy „Zły�, chyba że masz dla nich właściwe uzasadnienie.</li><li>Nie zgłaszaj błędów w recenzjach. Twórcy dodatków nie mają dostępu do twojego adresu e-mail, a mogą potrzebować kontaktu z tobą, by uzyskać dodatkowe informacje pomocne w rozwiązaniu twojego problemu. Sprawdź w sekcji <a href=\"%1$s\">wsparcie techniczne</a>, gdzie można otrzymać pomoc związaną z tym dodatkiem.</li><li>Staraj się, by recenzja była jasna, unikaj używania niewłaściwego języka i nie dodawaj żadnych prywatnych informacji.</li></ul><p>Przeczytaj <a href=\"%2$s\">wskazówki dla recenzentów</a>, by dowiedzieć się więcej, jak pisać recenzje dodatków.</p>"
+msgstr ""
+"<p>Pamiętaj o poniższych wskazówkach:</p><ul><li>Pisz tak, jakbyś mówił "
+"przyjacielowi o swoich doświadczeniach z dodatkiem. Podawaj "
+"charakterystyczne i przydatne szczegóły, takie jak opcje, które ci się "
+"podobają lub których nie lubisz, czy łatwo się ich używa, a także, czy mają "
+"jakieś wady. Unikaj ogólnikowych określeń w rodzaju \"Świetny\" czy \"Zły\", "
+"chyba że masz dla nich właściwe uzasadnienie.</li><li>Nie zgłaszaj błędów w "
+"recenzjach. Twórcy dodatków nie mają dostępu do twojego adresu e-mail, a "
+"mogą potrzebować kontaktu z tobą, by uzyskać dodatkowe informacje pomocne w "
+"rozwiązaniu twojego problemu. Sprawdź w sekcji <a href=\"%1$s\">wsparcie "
+"techniczne</a>, gdzie można otrzymać pomoc związaną z tym dodatkiem.</"
+"li><li>Staraj się, by recenzja była jasna, unikaj używania niewłaściwego "
+"języka i nie dodawaj żadnych prywatnych informacji.</li></ul><p>Przeczytaj "
+"<a href=\"%2$s\">wytyczne dla recenzentów</a>, by dowiedzieć się więcej, jak "
+"pisać recenzje dodatków.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Recenzje dla: %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Polecane dodatki"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Najnowsze dodatki"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Popularne dodatki"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Zaktualizowane dodatki"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Szukaj"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Wyniki szukania kolekcji"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Wyniki szukania kolekcji"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Wyszukiwanie jest obecnie zablokowane. Prosimy spróbować później."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "wszystkich dodatków"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "wszystkich kolekcji"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "szukaj dodatków"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "szukaj kolekcji"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Szukaj dodatków"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Kliknij, by wprowadzić słowa do wyszukania"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "wśród"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Wszystkie wyszukiwarki"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "PrzeglÄ…daj wyszukiwarki"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s pasujÄ…cy dodatek"
+msgstr[1] "%s pasujÄ…ce dodatki"
+msgstr[2] "%s pasujących dodatków"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Nie znaleziono."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Szukaj dodatków"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Wyniki szukania kanałów"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Wyniki wyszukiwania dla: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Narzędzia administratora"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Narzędzia programisty"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
-msgstr "Narzędzia edytora"
+msgstr "Narzędzia redaktora"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Witamy"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Witaj, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "słownika"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Polecane"
 
@@ -6031,7 +6017,7 @@ msgstr "Polecane"
 msgid "sidebar_pitch_looking_for"
 msgstr "PoszukujÄ™:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Najnowsze"
 
@@ -6039,34 +6025,31 @@ msgstr "Najnowsze"
 msgid "sidebar_pitch_search"
 msgstr "wtyczki wyszukiwarki"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subskrybuj kanał"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "motywu"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Ostatnio zaktualizowane"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Nieoceniony"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6082,39 +6065,35 @@ msgstr "Narzędzia programisty"
 
 #: views/statistics/addon.thtml:53
 msgid "statistics_addon_switch"
-msgstr "Zmień dodatek"
+msgstr "Przełącz dodatek"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%d.%m."
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%d.%m.%Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %d.%m."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "Dodatek %1$s został utworzony"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "Dodatek %1$s został wydany"
@@ -6127,186 +6106,188 @@ msgstr "Zamknij"
 msgid "statistics_help_link"
 msgstr "Pomoc"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "albo wybierz inny dodatek"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
-msgstr "albo wybierz dodatek z upublicznionymi statystykami"
+msgstr "albo wybierz dodatek z publicznymi statystykami"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Wybierz jeden z dodatków, by wyświetlić jego statystyki"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Wybierz dodatek, by wyświetlić jego statystyki"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
-msgstr "Wybierz dodatek z upublicznionymi statystykami"
+msgstr "Wybierz dodatek z publicznymi statystykami"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Panel statystyk"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Wyświetl statystyki"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Pokaż tę tabelę w formacie CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "brak"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Usuń ten wykres"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grupuj wg: dni"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grupuj wg: miesięcy"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grupuj wg: tygodni"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Porównaj wg: tygodni"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "Odnaleziono w zakresie: %s"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Dodaj wykres"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Dodaje kolejny wykres do tego grafu"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ukryj sumaryczny wykres"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Wyświetl sumaryczny wykres"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Nanosi na graf sumaryczny wykres"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Wyświetl dane (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Wyświetla plik z tymi danymi w formacie CSV"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ukryj wydania %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Wyświetl wydania %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Pokazuje/ukrywa na wykresach daty wydań dodatku"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ukryj wydania Firefoksa"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Wyświetl wydania Firefoksa"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Pokazuje/ukrywa na wykresach daty wydań Firefoksa"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Pomniejsz graf"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Powiększ graf"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Zmienia rozmiar grafu"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Program"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "WÅ‚asne"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Liczba pobrań"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "System operacyjny"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Status dodatku"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Podsumowanie"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Wersja dodatku"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Program"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "System operacyjny"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Status dodatku"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Nieznany"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Wersja dodatku"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Nie ma jeszcze odpowiedniej ilości danych, aby wyświetlić ten graf. Prosimy spróbować ponownie później."
+msgstr ""
+"Nie ma jeszcze odpowiedniej ilości danych, aby wyświetlić ten graf. Prosimy "
+"spróbować ponownie później."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
@@ -6314,15 +6295,21 @@ msgstr "Brak danych dla tego dodatku. Prosimy spróbować ponownie za kilka dni.
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Statystyki dodatków są obecnie aktualizowane. Najnowsze dane mogą być niekompletne podczas procesu ich aktualizacji. Prosimy spróbować ponownie za kilka minut."
+msgstr ""
+"Statystyki dodatków są obecnie aktualizowane. Najnowsze dane mogą być "
+"niekompletne podczas procesu ich aktualizacji. Prosimy spróbować ponownie za "
+"kilka minut."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "Panel statystyk jest obecnie wyłączony. Prosimy spróbować ponownie później."
+msgstr ""
+"Panel statystyk jest obecnie zablokowany. Prosimy spróbować ponownie później."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
-msgstr "Do wyświetlenia wykresów w panelu statystyk konieczne jest włączenie obsługi JavaScriptu."
+msgstr ""
+"Do wyświetlenia wykresów w panelu statystyk konieczne jest włączenie obsługi "
+"JavaScriptu."
 
 #: views/statistics/addon.thtml:44
 msgid "statistics_notice_settings_updated"
@@ -6331,7 +6318,7 @@ msgstr "Twoje ustawienia zostały zaktualizowane!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Panel statystyk"
 
@@ -6359,103 +6346,108 @@ msgstr "Pomniejsz"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Pomniejsz o jeden miesiÄ…c"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Dzienne podsumowanie statystyk dla dodatku %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Kanał RSS z danymi podsumowania"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %d.%m.%Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statystyki dla %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Domyślnie tylko Ty i Mozilla macie dostęp do informacji w tym panelu. Można otworzyć ten panel dla wszystkich, zmieniając jego status na „Upubliczniony�."
+msgstr ""
+"Domyślnie tylko Ty i Mozilla macie dostęp do informacji w tym panelu. Można "
+"otworzyć ten panel dla wszystkich, zmieniając jego status na \"publiczny\"."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Dostęp do panelu"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Prywatny"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Tylko Ty i Mozilla możecie przeglądać statystyki tego dodatku"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
-msgstr "Ogólnodostępny"
+msgstr "Publiczny"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Każdy może przeglądać statystyki tego dodatku"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Zmień ustawienia"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Informacje te należy traktować jako poufne."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Panel jest obecnie <b>prywatny</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
-msgstr "Panel jest obecnie <b>ogólnodostępny</b>."
+msgstr "Panel jest obecnie <b>publiczny</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zablokowany"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Powrót do panelu"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Zapisz ustawienia"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Ustawienia panelu statystyk dla %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Odblokowany"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Prg"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "nn."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Wer"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Średnia dzienna liczba pobrań"
 
@@ -6463,192 +6455,183 @@ msgstr "Średnia dzienna liczba pobrań"
 msgid "statistics_summary_downloads_heading"
 msgstr "Pobrania"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Suma z ostatniego dnia"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Pobrania w ciÄ…gu ostatnich 7 dni"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Całkowita liczba pobrań"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Od %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Brak danych jak dotÄ…d"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Średnia dzienna liczba aktywnych użytkowników"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Zmiana od poprzedniego wyniku"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
-msgstr "%1$s – %2$s"
+msgstr "%1$s - %2$s"
 
 #: views/statistics/rss/summary.thtml:45
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktywni dzienni użytkownicy"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Dnia %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Średnia dzienna liczba użytkowników w tym tygodniu"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s od ostatniego tygodnia"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
-msgstr "%1$s – statystyki"
+msgstr "%1$s - statystyki"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Wszystkie motywy"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "PrzeglÄ…daj motywy"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Zmień adres e-mail"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Zmień hasło"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Zmień hasło lub adres e-mail"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
-msgstr "Kod potwierdzający został wysłany ponownie!"
+msgstr "Kod potwierdzający został wysłany ponownie."
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Twoje konto %1$s zostało usunięte. Jeśli kiedykolwiek zapragniesz powrócić do nas, zarejestruj się ponownie na <a href=\"%2$s\">stronie rejestracji użytkownika</a>."
+msgstr ""
+"Twoje konto %1$s zostało usunięte. Jeśli kiedykolwiek zapragniesz powrócić "
+"do nas, zarejestruj siÄ™ ponownie na <a href=\"%2$s\">stronie rejestracji "
+"użytkownika</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Społeczność Mozilla Add-ons smuci się, że nas opuszczasz."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Potwierdź hasło"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Usuń moje konto"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Nie możesz usunąć swojego konta, jeśli jesteś <a href=\"%1$s\">twórcą jakiegoś dodatku</a>. Aby usunąć swoje konto, poproś inną osobę z listy autorów tego dodatku, by usunęła Cię z tej listy, następnie wróć tutaj, aby usunąć swoje konto."
+msgstr ""
+"Nie możesz usunąć swojego konta, jeśli jesteś <a href=\"%1$s\">twórcą "
+"jakiegoś dodatku</a>. Aby usunąć swoje konto, poproś inną osobę z listy "
+"autorów tego dodatku, by usunęła Cię z tej listy, następnie wróć tutaj, aby "
+"usunąć swoje konto."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Jeśli masz dodatkowe pytania, skontaktuj się z %1$s, by uzyskać pomoc."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Przed usunięciem konta należy zaznaczyć pole „Zdaję sobie sprawę…�."
+msgstr ""
+"Przed usunięciem konta, należy zaznaczyć pole \"Zdaję sobie sprawę...\"."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Proszę wprowadzić poprawnie hasło, aby wykonać ten krok."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr "W celu usunięcia błędu, proszę skontaktować się z %1$s."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Potwierdź usunięcie konta"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Usuwanie konta %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Do widzenia!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
-msgstr "Nie będziesz mieć możliwości zalogowania się na Mozilla Add-ons."
+msgstr "Nie będziesz mógł więcej zalogować się na Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Po naciśnięciu przycisku „Usuń moje konto� Twoje konto zostanie <strong>trwale usunięte</strong>. Oznacza to, że:"
+msgstr ""
+"Po kliknięciu \"Usuń moje konto\" Twoje konto zostanie <strong>trwale "
+"usunięte</strong>. Oznacza to, że:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Twoje recenzje i oceny nie zostaną usunięte, ale nie będą dłużej z Tobą powiązane."
+msgstr ""
+"Twoje recenzje i oceny nie zostaną usunięte, ale nie będą dłużej z Tobą "
+"powiÄ…zane."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Jeśli masz szczególny problem, możemy Ci pomóc. Prosimy – nie usuwaj teraz swojego konta, ale skontaktuj się z nami poprzez %1$s, a zrobimy wszystko, aby pomóc Ci w jego rozwiązaniu."
+msgstr ""
+"Jeśli masz szczególny problem, możemy Ci pomóc. Prosimy - nie usuwaj teraz "
+"swojego konta, ale skontaktuj siÄ™ z nami poprzez %1$s, a zrobimy wszystko, "
+"aby pomóc Ci w jego rozwiązaniu."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Zdaję sobie sprawę, że ten krok nie może być cofnięty."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Konto użytkownika zostało usunięte"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "List z potwierdzeniem nowego adresu e-mail został wysłany na %1$s. Aby zmiana zaczęła obowiązywać, należy kliknąć odnośnik przesłany w tym e-mailu. Póki to nie nastąpi, można logować się przy użyciu dotychczasowego adresu e-mail."
+msgstr ""
+"List z potwierdzeniem nowego adresu e-mail został wysłany na %1$s. Aby "
+"zmiana zaczęła obowiązywać, należy kliknąć w odnośnik przesłany w tym e-"
+"mailu. Póki to nie nastąpi, można logować się przy użyciu dotychczasowego "
+"adresu e-mail."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Usuwanie konta użytkownika"
 
@@ -6659,37 +6642,44 @@ msgstr "Usuwanie konta użytkownika"
 #, php-format
 msgid "user_email_confirm_account_nopass"
 msgstr ""
-"Witaj w %2$s – dodatki.\n"
+"Witaj w %2$s Dodatki.\n"
 "\n"
-"Zanim zaczniesz używać swojego nowego konta, musisz je aktywować. Aktywacja potwierdza, że adres e-mail podany przez Ciebie podczas rejestracji jest poprawny i stanowi Twoją własność.\n"
-"Aby aktywować swoje konto, kliknij odnośnik poniżej lub skopiuj i wklej cały adres do paska adresu swojej przeglądarki:\n"
+"Zanim zaczniesz używać swojego nowego konta, musisz je aktywować. Aktywacja "
+"potwierdza, że adres e-mail podany przez Ciebie podczas rejestracji jest "
+"poprawny i stanowi Twoją własność.\n"
+"Aby aktywować swoje konto, kliknij na odnośnik poniżej lub skopiuj i wklej "
+"cały adres do paska adresu swojej przeglądarki:\n"
 "\n"
 "%1$s\n"
 "\n"
 "Po aktywacji konta można usunąć tę wiadomość.\n"
 "\n"
-"Dziękujemy za przyłączenie się do %2$s – dodatki\n"
-"— Zespół %2$s – dodatki"
+"Dziękujemy za przyłączenie się do %2$s Add-ons\n"
+"-- Zespół %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
-"Poprosiłeś o zmianę adresu e-mail na %2$s – dodatki.\n"
+"Poprosiłeś o zmianę adresu e-mail na %2$s Add-ons.\n"
 "\n"
-"Aby potwierdzić nowy adres, proszę kliknąć poniższy odnośnik lub skopiować i wkleić cały adres do paska adresu przeglądarki:\n"
+"Aby potwierdzić nowy adres, proszę kliknąć w poniższy odnośnik lub skopiować "
+"i wkleić cały adres do paska adresu przeglądarki:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Nowy adres należy potwierdzić w ciągu 48 godzin. Jeśli jednak nie chcesz zmieniać adresu, wystarczy po prostu zignorować ten e-mail.\n"
+"Nowy adres należy potwierdzić w ciągu 48 godzin. Jeśli jednak nie chcesz "
+"zmieniać adresu, wystarczy po prostu zignorować ten e-mail.\n"
 "\n"
 "Dziękujemy!\n"
-"— Zespół %2$s – dodatki"
+"-- Zespół %2$s Add-ons"
 
 #: controllers/users_controller.php:168
 #, php-format
 msgid "user_email_confirm_subject"
-msgstr "Dziękujemy za dołączenie do %s – dodatki"
+msgstr "Dziękujemy za dołączenie do %s Add-ons"
 
 #. This is the password reset email
 #. %1 is the pw reset URL, %2 is the application
@@ -6697,126 +6687,104 @@ msgstr "Dziękujemy za dołączenie do %s – dodatki"
 #, php-format
 msgid "user_email_pwreset"
 msgstr ""
-"%2$s – dodatki — Resetowanie hasła\n"
+"%2$s Add-ons - Resetowanie hasła\n"
 "\n"
-"Otrzymaliśmy prośbę o zresetowanie hasła dla tego konta na addons.mozilla.org. Aby zmienić hasło, kliknij odnośnik poniżej lub skopiuj i wklej cały adres do paska adresu swojej przeglądarki:\n"
+"Otrzymaliśmy prośbę o zresetowanie hasła dla tego konta na addons.mozilla."
+"org. Aby zmienić hasło, kliknij na odnośnik poniżej lub skopiuj i wklej cały "
+"adres do paska adresu swojej przeglÄ…darki:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Jeśli z Twojej strony nie było prośby o zresetowanie hasła, nie ma potrzeby podejmowania jakiegokolwiek działania.\n"
+"Jeśli z Twojej strony nie było prośby o zresetowanie hasła,  nie ma potrzeby "
+"podejmowania jakiegokolwiek działania.\n"
 "\n"
 "Dziękujemy,\n"
-"— Zespoł %2$s – dodatki"
+"-- Zespoł %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
-msgstr "Zresetuj swoje hasło do %s – dodatki"
+msgstr "Zresetuj swoje hasło do %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "BÅ‚Ä…d!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
-msgstr "Proszę potwierdzić zmianę adresu e-mail w %1$s – dodatki"
+msgstr "Proszę potwierdzić zmianę adresu e-mail w %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
-msgstr "Zmiana została dokonana!"
+msgstr "Zmiana została dokonana."
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Twój adres e-mail został zmieniony. Od teraz do logowania proszę używać %1$s."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "O mnie"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Przedstaw się społeczności – jeśli chcesz! Ten tekst będzie wyświetlany na Twojej ogólnodostępnej stronie. �amanie wierszy zostanie zachowane, ale kod HTML jest niedozwolony."
+msgstr ""
+"Twój adres e-mail został zmieniony. Od teraz proszę używać %1$s do logowania "
+"siÄ™."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Potwierdź hasło"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Wyświetlaj w profilu utworzone przeze mnie kolekcje"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Wyświetlaj w profilu moje ulubione kolekcje"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
-msgstr "Edytowanie profilu użytkownika: %s"
+msgstr "Edytuj profil użytkownika: %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Adres e-mail"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "ImiÄ™"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ukryj adres e-mail"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Strona internetowa"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Nazwisko"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Nazwa użytkownika"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nowe hasło"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
-msgstr "Nick"
+msgstr "Pseudonim"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Stare hasło"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Inne możliwości"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Hasło"
 
@@ -6824,60 +6792,67 @@ msgstr "Hasło"
 msgid "user_form_registration"
 msgstr "Rejestracja nowego użytkownika"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Zapamiętaj mnie na tym komputerze"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
-msgstr "Pokazać „Piaskownicę�?"
+msgstr "Pokazać \"Piaskownicę\"?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Zapisz"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Zaloguj siÄ™"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Zarejestruj siÄ™"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
-msgstr "Użytkownik %s – dodatki od:"
+msgstr "Użytkownik %s Add-ons od"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Utwórz nowe konto"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kompatybilność dodatku (zalecane)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Najbliższe wydarzenia i konkursy"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
-msgstr "Obecnie nie ma żadnych powiadomień odpowiadających Twojej konfiguracji."
+msgstr ""
+"Obecnie nie ma żadnych powiadomień odpowiadających Twojej konfiguracji."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Od czasu do czasu Mozilla może wysyłać do Ciebie e-mail z informacjami o nadchodzących wydaniach i wydarzeniach związanych z dodatkami. Wybierz interesujące Cię zagadnienia:"
+msgstr ""
+"Od czasu do czasu Mozilla może wysyłać do Ciebie e-mail z informacjami o "
+"nadchodzÄ…cych wydaniach i wydarzeniach zwiÄ…zanych z dodatkami. Wybierz "
+"interesujÄ…ce CiÄ™ zagadnienia:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla zastrzega sobie prawo do bezpośredniego kontaktu z Tobą w szczegółowych sprawach dotyczących Twoich dodatków."
+msgstr ""
+"Mozilla zastrzega sobie prawo do bezpośredniego kontaktu z Tobą w "
+"szczegółowych sprawach dotyczących Twoich dodatków."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Wprowadzone zmiany zawierają błędy. Należy je poprawić i wysłać ponownie."
+msgstr ""
+"Wprowadzone zmiany zawierają błędy. Należy je poprawić i wysłać ponownie."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil został zaktualizowany."
 
@@ -6890,15 +6865,15 @@ msgstr "Resetowanie hasła dla konta: %s"
 msgid "user_pwreset_header"
 msgstr "Resetowanie hasła"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Nie pamiętasz hasła?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Dane potrzebne do zresetowania hasła zostały wysłany e-mailem."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Hasło zostało zresetowane."
 
@@ -6910,133 +6885,112 @@ msgstr "Zmień hasło"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Zresetuj moje hasło"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
-msgstr "%s – dodatki"
+msgstr "%s - Dodatki"
 
 #. %1 is the user's email address, %2 is the current app
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Odnośnik aktywujący konto został wysłany e-mailem na adres %1$s. Należy kliknąć go przed pierwszym logowaniem do %2$s – dodatki."
+msgstr ""
+"Odnośnik aktywujący konto został wysłany e-mailem na adres %1$s. Należy w "
+"niego kliknąć przed pierwszym logowaniem do %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Na Twój adres e-mail %1$s została wysłana wiadomość zawierająca dane do aktywacji konta. Aby móc się zalogować, należy dokonać jego aktywacji klikając odnośnik znajdujący się w wiadomości."
+msgstr ""
+"Na Twój adres e-mail %1$s została wysłana wiadomość zawierająca dane do "
+"aktywacji konta. Aby móc się zalogować, należy dokonać jego aktywacji "
+"klikając na odnośnik znajdujący się w wiadomości."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "ponowne przesłanie kodu potwierdzającego"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Gratulujemy! Twoje konto zostało utworzone."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>Rejestracja na witrynie AMO <strong>nie jest wymagana</strong>, jeśli chcesz tylko pobierać i instalować dodatki znajdujące się w ogólnodostępnej części witryny.</p><p>Musisz zarejestrować się jeśli:</p><ul><li>Chcesz recenzować dodatki</li><li>Jesteś autorem dodatku i chcesz umieścić go na witrynie AMO</li></ul><p>Po zarejestrowaniu, na podany podczas rejestracji adres e-mail otrzymasz wiadomość z danymi do potwierdzenia konta. Aby potwierdzić swoje konto, postępuj zgodnie z zawartymi w tej wiadomości instrukcjami.</p><p>Jeśli chcesz możesz zapoznać się z naszymi <a href='%1$s' title='Informacje prawne'>informacjami prawnymi</a> oraz <a href='%2$s' title='Polityka prywatności'>polityką prywatności</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Jeśli w Twojej skrzynce odbiorczej nie ma wiadomości z danymi do potwierdzenia konta, upewnij się, czy nie została ona oznaczona jako niechciana lub „spam�. W razie potrzeby możesz poprosić o %1$s na podany wyżej adres."
+msgstr ""
+"Jeśli w Twojej skrzynce odbiorczej nie ma wiadomości z danymi do "
+"potwierdzenia konta, upewnij się, czy nie została ona oznaczona jako "
+"niechciana (\"spam\"). W razie potrzeby możesz poprosić o %1$s na podany "
+"wyżej adres."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Dziękujemy za zarejestrowanie się i witamy w serwisie %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Witaj na addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Wymagane jest imiÄ™, nazwisko lub pseudonim."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Kolekcje"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Powiadomienia"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil użytkownika"
 
 #: controllers/users_controller.php:209
 msgid "user_verified_okay"
-msgstr "Konto zostało pomyślnie zweryfikowane!"
+msgstr "Konto zostało pomyślnie zweryfikowane."
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Usuwanie konta użytkownika"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Edytowanie konta użytkownika"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "O mnie"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
-msgstr "Dodatki autorstwa: %1$s"
+msgstr "Dodatki użytkownika: %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "ImiÄ™ i nazwisko"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil autora"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Kolekcje utworzone przez %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Adres e-mail"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Ulubione kolekcje"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Strona domowa"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
-msgstr "Nick"
+msgstr "Pseudonim"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Informacje o użytkowniku %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
-msgstr "Recenzje autorstwa: %s"
+msgstr "Autor recenzji: %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Nazwa użytkownika"
 
@@ -7045,40 +6999,28 @@ msgstr "Nazwa użytkownika"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Dodatek, którego szukasz, jest aktualnie w piaskownicy. Jeśli posiadasz już konto w Mozilla Add-ons, zaloguj się, lub <a href=\"%1$s\">dowiedz się więcej o piaskownicy.</a>"
+msgstr ""
+"Dodatek, którego szukasz, jest aktualnie w piaskownicy. Jeśli posiadasz już "
+"konto w Mozilla Add-ons, zaloguj siÄ™, lub <a href=\"%1$s\">dowiedz siÄ™ "
+"więcej o piaskownicy.</a>"
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "Strona, której szukasz, jest częścią piaskownicy. Jeśli posiadasz już konto w Mozilla Add-ons, zaloguj się, lub <a href=\"%1$s\">dowiedz się więcej o piaskownicy.</a>"
+msgstr ""
+"Strona, której szukasz, jest częścią piaskownicy. Jeśli posiadasz już konto "
+"w Mozilla Add-ons, zaloguj się, lub <a href=\"%1$s\">dowiedz się więcej o "
+"piaskownicy.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Resetowanie hasła użytkownika"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Rejestracja nowego użytkownika"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licencja kodu źródłowego dla %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Pokaż wszystkie ostatnio dodane"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Pokaż wszystkie najczęściej pobierane"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Pokaż wszystkie najwyżej oceniane"
-
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Najnowsza wersja kompatybilna z"
diff --git a/site/app/locale/pl/pages/error404.thtml b/site/app/locale/pl/pages/error404.thtml
index 9855a3b..c9aa6dc 100644
--- a/site/app/locale/pl/pages/error404.thtml
+++ b/site/app/locale/pl/pages/error404.thtml
@@ -1,16 +1,19 @@
 <h1>Przepraszamy, ale nie możemy znaleźć szukanego elementu.</h1>
 
-<p>Żądana strona lub plik nie zostały znalezione na tej witrynie. Możliwe, że został kliknęty nieaktualny odnośnik lub adres został niepoprawnie wprowadzony.</p>
+<p>Żądana strona lub plik nie został znaleziony na tej witrynie.
+Możliwe, że kliknięto nieaktualny odnośnik lub niepoprawnie
+wprowadzono adres.</p>
 
 <ul>
-<li>Jeśli adres strony był wprowadzany, proszę dokładnie sprawdzić pisownię.</li>
-<li>Jeśli informacja ta została wyświetlona po kliknięciu odnośnika na jakiejś stronie, prosimy o wysłanie wiadomości do <a href="mailto:webmaster@mozilla.com" title="Page Not Found on Mozilla.com">webmaster@mozilla.com</a> zawierającej informacje, na jakiej stronie nastąpiło kliknięcie i jakie informacje były szukane, a my zrobimy wszystko, by to naprawić.</li>
+<li>Jeśli adres strony był wpisywany, należy dokładnie sprawdzić pisownię.</li>
+<li>Jeśli trafiono tutaj klikając gdzieś w odnośnik, prosimy o wysłanie wiadomości do <a href="mailto:webmaster@mozilla.com" title="Page Not Found on Mozilla.com">webmaster@mozilla.com</a> zawierającej
+informacje, z którego miejsca tutaj trafiono i jakich informacji szukano, a my zrobimy wszystko, by to naprawić.</li>
 </ul>
 
-<p>Można również przejść do którejś z popularnych stron na naszej witrynie.</p>
+<p>Można też przejść do którejś z popularnych stron na naszej witrynie.</p>
 
 <ul>
-<li>Interesuje cię <a href="%1$s">spis polecanych dodatków</a>?</li>
-<li>Chcesz <a href="%2$s">poszukać dodatków</a>? Przejdź do <a href="%2$s">strony wyszukiwania</a> lub użyj pola wyszukiwania znajdującego się powyżej.</li>
+<li>Interesuje cię <a href="%1$s">spis popularnych dodatków</a>?</li>
+<li>Chcesz <a href="%2$s">poszukać dodatków</a>? Przejdź do <a href="%2$s">strony wyszukiwania</a> lub użyj pola wyszukiwania znajdującego się poniżej.</li>
 <li>Jeśli chcesz zacząć od początku, przejdź do <a href="%3$s">strony głównej dodatków</a>.</li>
 </ul>
diff --git a/site/app/locale/pl/pages/nomination.thtml b/site/app/locale/pl/pages/nomination.thtml
index 5a3d64d..296df35 100644
--- a/site/app/locale/pl/pages/nomination.thtml
+++ b/site/app/locale/pl/pages/nomination.thtml
@@ -1,10 +1,9 @@
-<p>Dodatek, który aktualnie znajduje się w piaskownicy, może być nominowany do upublicznienia i dostępny dla wszystkich użytkowników po poddaniu go ocenie przez edytora. Aby osiągnąć pożądany efekt - publikację dodatku, proszę zapoznać się z poniższymi uwagami:</p>
+<p>Dodatek, który aktualnie znajduje się w piaskownicy, może być nominowany do upublicznienia i dostępny dla wszystkich użytkowników po poddaniu go ocenie przez redaktora. Prosimy zapoznać się z poniższymi wytycznymi, aby uzyskać jak najlepsze wyniki:</p>
 <ul>
-  <li>Obrazki poglądowe są wymagane dla motywów i wysoce rekomendowane dla wszystkich innych typów dodatków.</li>
-  <li>Dodatek powinien spędzić wystarczającą ilość czasu w piaskownicy, by zgromadzić opinie i oceny użytkowników. <b>Opinie te są konieczne, aby dodatek mógł być upubliczniony.</b></li>
-  <li>Dodatki dostępne publicznie muszą mieć wyższy poziom jakości niż przebywające w piaskownicy i powinny uatrakcyjniać korzystanie z Internetu.</li>
-  <li>Wszystkie kryteria nominacji są dostępne w naszej <a href="%s">Polityce dodatków.</a></li>
+    <li>Obrazki podglądu są wymagane dla motywów i wysoce rekomendowane dla wszystkich innych typów dodatków.</li>
+    <li>Dodatek powinien spędzić wystarczającą ilość czasu w piaskownicy, by zgromadzić opinie i oceny użytkowników. <b>Opinie te są konieczne, aby dodatek mógł być upubliczniony.</b></li>
+    <li>Dodatki dostępne publicznie muszą mieć wyższy poziom jakości niż znajdujące się w piaskownicy, a także powinny uatrakcyjniać internet.</li>
+    <li>Wszystkie kryteria nominacji są dostępne w naszych <a href="%s">Zasadach dodatków</a>.</li>
 </ul>
-<p>Jeśli dodatek spełnia powyższe kryteria, można go nominować, naciskając przycisk znajdujący się poniżej. Informacja o statusie nominacji zostanie wysłana e-mailem.</p>
-
-<p>Aby nominować dodatek, proszę opisać, jak był testowany (opis powinien zawierać zapewnienie, że jest on wolny od błędów) i w jaki sposób rozszerza możliwości korzystania z Internetu. Można także dołączyć odnośnik do zewnętrznych opinii o dodatku.</p>
+<p>Jeśli dodatek spełnia powyższe kryteria, można go nominować, naciskając poniższy przycisk. Informacja o statusie nominacji zostanie wysłana pocztą elektroniczną.</p>
+<p>Aby nominować dodatek, należy opisać, jak został przetestowany (w tym zapewnić, że jest wolny od błędów i ostrzeżeń) oraz w jaki sposób rozszerza możliwości przeglądania internetu. Można także dołączyć odnośniki do zewnętrznych recenzji dodatku.</p>
diff --git a/site/app/locale/pl/pages/sandbox.thtml b/site/app/locale/pl/pages/sandbox.thtml
index cc5aedb..4076e5d 100644
--- a/site/app/locale/pl/pages/sandbox.thtml
+++ b/site/app/locale/pl/pages/sandbox.thtml
@@ -1,13 +1,13 @@
-<h1>Piaskownica &ndash; system ocen</h1>
-<h2>Czym jest piaskownica?</h2>
-<p>Piaskownica jest strefą dla zaawansowanych użytkowników, miejscem do testowania i oceny dodatków przed ich upublicznieniem. Aby uzyskać dostęp do piaskownicy, należy założyć na witrynie AMO konto i się zalogować. Należy zachować ostrożność instalując dodatki z piaskownicy. Nie zostały one przetestowane przez edytorów i mogą uszkodzić komputer instalującego.</p>
-
-<h2>Jaka jest droga dodatku do upublicznienia?</h2>
-<!-- To localize the flowchart image, see http://wiki.mozilla.org/Update:Remora_Sandbox_Flowchart -->
-<div style="text-align: center;">%s</div>
-<ol>
-  <li><b>Wysłanie dodatku na AMO.</b> Za pomocą narzędzi programisty należy wysłać dodatek na witrynę AMO. Dodatek ten natychmiast pojawi się w piaskownicy, na stronie Mozilla Add-ons, gdzie doświadczeni użytkownicy wykonają testy i wystawią swoją recenzję.</li>
-  <li><b>Nominowanie dodatku do upublicznienia.</b> W narzędziach programisty znajduje się odnośnik do nominowania dodatku. Po nominowaniu dodatku pojawi się on w kolejce do oceny.</li>
-  <li><b>Ocena przez edytora.</b> Edytor Mozilla Add-ons zainstaluje dodatek i sprawdzi jego działanie. Edytor zapozna się również z recenzjami wystawionymi przez testerów piaskownicy.</li>
-  <li><b>Upublicznienie lub zatrzymanie w piaskownicy.</b> Edytor upublicznia dodatek lub pozostawia go w piaskownicy. Jeśli zostanie zatrzymany w piaskownicy, można nominować go ponownie po wprowadzeniu zmian zasugerowanych przez edytora w komentarzach. Jeśli zostanie upubliczniony, to nowe wersje dodatku będą pojawiać się w piaskownicy do momentu ich ocenienia przez edytora i upublicznienia. Raz upublicznionego dodatku nie ma potrzeby nominować ponownie - nowe wersje automatycznie znajdą się w kolejce oczekujących na ocenę.</li>
-</ol>
+<h1>Piaskownica &ndash; system ocen</h1>
+<h2>Czym jest piaskownica?</h2>
+<p>Piaskownica jest strefą dla zaawansowanych użytkowników, miejscem do testowania i oceny dodatków przed ich  upublicznieniem. By uzyskać dostęp do piaskownicy, trzeba włączyć to w ustawieniach swojego konta. Instalując dodatki z piaskownicy należy zachować ostrożność. Nie zostały one przetestowane przez redaktorów i mogą uszkodzić komputer instalującego.</p>
+
+<h2>Jaka jest droga dodatku do upublicznienia?</h2>
+<!-- To localize the flowchart image, see http://wiki.mozilla.org/Update:Remora_Sandbox_Flowchart -->
+<div style="text-align: center;">%s</div>
+<ol>
+    <li><b>Wysłanie dodatku z poziomu narzędzi programisty.</b> Dodatek ten natychmiast pojawi się w "Piaskownicy" na stronie Mozilla Add-ons, gdzie doświadczeni użytkownicy przetestują go i wystawią swoją ocenę. Aby widzieć piaskownicę, należy włączyć odpowiednią opcję w ustawieniach swojego konta.</li>
+    <li><b>Nominowanie dodatku do upublicznienia.</b> W narzędziach programisty znajduje się odnośnik do nominowania dodatku. Po nominowaniu dodatku pojawi się on w kolejce do oceny.</li>
+    <li><b>Ocena przez redaktora.</b> Redaktor Mozilla Add-ons zainstaluje dodatek i sprawdzi, czy działa. Redaktor zapozna się również z ocenami wystawionymi przez testerów piaskownicy.</li>
+    <li><b>Upublicznienie dodatku lub zatrzymanie w piaskownicy.</b> Redaktor upublicznia dodatek lub pozostawia go w piaskownicy. Jeśli zostanie zatrzymany w piaskownicy, można nominować go ponownie po wprowadzeniu zmian zasugerowanych przez redaktora w komentarzach. Jeśli zostanie upubliczniony, to nowe wersje dodatku będą pojawiać się w piaskownicy do momentu ich ocenienia przez redaktora i upublicznienia. Raz upublicznionego dodatku nie ma potrzeby nominować ponownie - nowe wersje automatycznie znajdą się w kolejce oczekujących na ocenę.</li>
+</ol>
\ No newline at end of file
diff --git a/site/app/locale/pt_BR/LC_MESSAGES/messages.po b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
index a9c748b..4cf8f76 100644
--- a/site/app/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
@@ -18,169 +18,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancelar Instalação"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Baixar agora %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Aceitar e Baixar"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Aceitar e Instalar"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Público"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Atualizado em %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versão %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "total de downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "downloads semanais"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
-msgstr[0] "%1$s Complemento"
-msgstr[1] "%1$s Complementos"
+msgstr[0] "%1$s complemento"
+msgstr[1] "%1$s complementos"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "por página"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s não está disponível para %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Voltar à %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Voltar às revisões..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Nota:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Revisão:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Enviar sua revisão"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Adicionar revisão para %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Título/Sumário:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Remover"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Responder"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Você tem certeza de que quer remover esta revisão?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Não"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Sim"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Remover Revisão"
 
@@ -189,32 +180,33 @@ msgid "addon_review_deleted_successfully"
 msgstr "Revisão removida com sucesso."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editar revisão para %s"
 
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
+#, fuzzy
 msgid "addon_review_flag_error_other_length"
 msgstr ""
 "Problema no reportar da revisão: Estas notas são limitadas de 10 a 100 "
 "caracteres; Sua contagem de caracteres foi de %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Observação: Antes que sua revisão apareça publicamente, ela será avaliada "
 "por um editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Resposta do desenvolvedor para:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
-#, php-format
+#: views/reviews/display.thtml:135
+#, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "Veja %1$s revisão anterior enviada por %2$s para este Complemento."
@@ -231,169 +223,136 @@ msgid "addon_review_pagetitle"
 msgstr "Revisões para %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Resposta por %1$s em %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Resposta do desenvolvedor:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Sua revisão foi salva com sucesso. Obrigado!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, fuzzy, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "por %1$s em %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "por %1$s em %2$s (deu nota %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Próximo Complemento"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Complemento Anterior"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "A versão mais recente compatível com"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "A versão mais recente compatível com %1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ir"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Ver o perfil do autor"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
+#, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Navegar em todos os Temas :: %1$s Complementos "
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Navegar por %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
+#, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Navegar em Temas %1$s :: Complementos %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "O que é isto?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Adicionar uma revisão"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalhes avançados"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorias"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "revisão detalhada"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Não gosto"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editar sua revisão"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
-msgstr "Este Complemento tem uma política de privacidade."
+msgstr "Este complemento tem uma política de privacidade."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Odeio"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentário do(s) desenvolvedor(es)"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Página na Web"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Revisões"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suporte"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gosto"
 
@@ -401,43 +360,40 @@ msgstr "Gosto"
 msgid "addons_display_long_description"
 msgstr "Descrição longa"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Adoro"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mais imagens"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
+#, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
-msgstr[0] "Outros Complementos de %1$s"
-msgstr[1] "Outros Complementos destes autores"
+msgstr[0] "Outros complementos de %1$s"
+msgstr[1] "Outros complementos destes autores"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
-"Suporte para este Complemento está disponível em %s. Se você tem um bug, "
+"Suporte para este complemento está disponível em %s. Se você tem um bug, "
 "relate-o, pode ser melhor enviá-lo para o desenvolvedor para que ele possa "
 "acompanhar com você. Revisões não são o melhor lugar para se colocar relatos "
 "de bugs, e o desenvolvedor pode pedir vários detalhes para que consiga "
@@ -448,11 +404,11 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
-"Suporte para este Complemento está disponível em %s ou %s. Se você tem um "
+"Suporte para este complemento está disponível em %s ou %s. Se você tem um "
 "bug, relate-o, pode ser melhor enviá-lo para o desenvolvedor para que ele "
 "possa acompanhar com você. Revisões não são o melhor lugar para se colocar "
 "relatos de bugs, e o desenvolvedor pode pedir vários detalhes para que "
@@ -462,11 +418,11 @@ msgstr ""
 "arrumado em uma versão que será lançada."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
-"Suporte para este Complemento está disponível em %s. Se você tem um bug, "
+"Suporte para este complemento está disponível em %s. Se você tem um bug, "
 "relate-o, pode ser melhor enviá-lo para o desenvolvedor para que ele possa "
 "acompanhar com você. Revisões não são o melhor lugar para se colocar relatos "
 "de bugs, e o desenvolvedor pode pedir vários detalhes para que consiga "
@@ -475,61 +431,67 @@ msgstr ""
 "contato com você para pedir mais detalhes ou avisá-lo se o bug já foi "
 "arrumado em uma versão que será lançada."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Avalie"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Gosto muito"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Por favor, não envie avisos de bugs nas revisões. Nós não tornamos seu "
-"endereço de e-mail disponível para os desenvolvedores dos Complementos e "
+"endereço de e-mail disponível para os desenvolvedores dos complementos e "
 "eles podem precisar entrar em contato para ajudar a resolver o problema."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Guia para revisões</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Veja a <a href=\"%1$s\">seção de suporte</a> para descobrir onde conseguir "
-"ajuda para este Complemento."
+"ajuda para este complemento."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Salvar"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
-msgstr "Ver todos os Complementos em %1$s"
+msgstr "Ver todos os complementos em %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ver todas as discussões (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Ver todas as versões"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Histórico completo de versões"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ver o código-fonte"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver as estatísticas"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "O que você acha?"
 
@@ -537,226 +499,109 @@ msgstr "O que você acha?"
 msgid "addons_display_workswith"
 msgstr "Funciona em:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "por"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Recomendamos"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
-"O Mozilla Add-ons oferece Complementos que ampliam o %1$s, personalizando a "
+"O Mozilla Add-ons oferece complementos que ampliam o %1$s, personalizando a "
 "maneira de como você navega. Dê uma olhada e torne seu %1$s único."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Mais novos:"
 
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Outras aplicações"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Complementos para o %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Mais populares:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Nós recomendamos:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Atualizados recentemente:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Ver todos"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
-msgstr "Ver todos os Complementos criados recentemente"
+msgstr "Ver todos os complementos criados recentemente"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
-msgstr "Ver todos os Complementos populares"
+msgstr "Ver todos os complementos populares"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
-msgstr "Ver todos os Complementos recomendados"
+msgstr "Ver todos os complementos recomendados"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
-msgstr "Ver todos os Complementos atualizados recentemente"
+msgstr "Ver todos os complementos atualizados recentemente"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
+#, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Clique no link abaixo para salvar o arquivo.</li><li>No Mozilla "
@@ -764,55 +609,53 @@ msgstr ""
 "botão de Instalação, localize/selecione o arquivo que você fez download "
 "depois clique \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
+#, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "Como instalar no Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Clique com o botão direito no link abaixo e clique em \"Salvar link "
 "como...\" para salvar o arquivo em seu computador.</li><li>No Mozilla "
-"Thunderbird, procure por Complementos no menu Ferramentas.</li><li>Clique no "
+"Thunderbird, procure por complementos no menu Ferramentas.</li><li>Clique no "
 "botão instalar ..., selecione o arquivo que você baixou e clique \"abrir\".</"
 "li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Como instalar no Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
-msgstr "mostrar Complementos experimentais"
+msgstr "mostrar complementos experimentais"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Ir"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "por"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "para Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "para Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "para Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -820,37 +663,37 @@ msgstr ""
 "mais informações sobre outros plugins disponíveis para navegadores baseados "
 "no Mozilla, visite %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Procurando por um plugin não listado aqui?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins ajudam seu navegador a realizar tarefas específicas, como ver "
 "formatos especiais de imagens ou tocar arquivos multimídia. Plugins são um "
-"pouco diferente de Complementos, que incrementam ou modificam "
+"pouco diferente de complementos, que incrementam ou modificam "
 "funcionalidades já existentes."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins para %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentação de suporte: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -858,41 +701,37 @@ msgstr ""
 "que a instalação possa prosseguir:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Visualização para %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Adicionados Recentemente"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
-"Com tantos Complementos disponíveis, há alguma coisa para cada um. Para "
-"começar a conhecê-los, segue abaixo uma lista dos Complementos mais "
+"Com tantos complementos disponíveis, há alguma coisa para cada um. Para "
+"começar a conhecê-los, segue abaixo uma lista dos complementos mais "
 "populares. Divirta-se!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Complementos recomendados"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Complementos recomendados"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos adicionais"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centro do Desenvolvedor Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Desculpe-nos, mas você precisa de um navegador baseado no Mozilla (como o "
@@ -907,126 +746,130 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Aprenda como %1$s no %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "criar o seu"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Navegue por mais mecanismos de pesquisa em %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Mecanismos de pesquisa"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Agradecimentos especiais ao projeto Mycroft pelo seu trabalho nos mecanismos "
 "de pesquisa do Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Compartilhar este"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Adicionar ao Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Enviar ao Digg!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Compartilhar no Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Compartilhar no FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Compartilhar no MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
+#, fuzzy
 msgid "addons_status_disabled"
 msgstr "Desabilitado"
 
 #: controllers/components/amo.php:191 controllers/components/amo.php:224
+#, fuzzy
 msgid "addons_status_incomplete"
 msgstr "Versão Incompleta"
 
 #: controllers/components/amo.php:197 controllers/components/amo.php:227
+#, fuzzy
 msgid "addons_status_nominated"
 msgstr "Na Sandbox; Nominado para Publicação"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
+#, fuzzy
 msgid "addons_status_pending"
 msgstr "Na Sandbox; Com revisão pendente"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
+#, fuzzy
 msgid "addons_status_public"
 msgstr "Público"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
+#, fuzzy
 msgid "addons_status_sandbox"
 msgstr "Na Sandbox"
 
 #: controllers/components/amo.php:203
+#, fuzzy
 msgid "addons_status_unknown"
 msgstr "Desconhecido"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
-msgstr "Saiba mais sobre este Complemento"
-
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Mais Baixados"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Mais Votados"
+msgstr "Saiba mais sobre este complemento"
 
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Tome cuidado com versões antigas"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Estas versões são exibidas para referência e teste. Você deve sempre usar as "
-"versões mais novas para um Complemento."
+"versões mais novas para um complemento."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Histórico de versões com changelogs."
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Histórico de versões do %1$s"
@@ -1061,426 +904,154 @@ msgstr "Admin do grupo"
 msgid "admin_group_saved"
 msgstr "O grupo foi salvo"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Busca avançada"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Qualquer data"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Todos"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Todas"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplicação"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Coincidência por palavra"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Última atualização"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nome"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Mais novos"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Últimos 3 meses"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Últimos 6 meses"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Dia anterior"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Último mês"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Semana passada"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Último ano"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Por página"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Plataforma"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularidade"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Avaliação"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordenar por"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "até"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Mostrar o modo de busca avançada"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tipo"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versão"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorar verificação de versão"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
-msgstr "Este Complemento é para versões mais antigas do Firefox"
+msgstr "Este complemento é para versões mais antigas do Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
+#, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
-"Voçê pode <a href=\"%1$s\">tentar uma versão anterior</a> ou <a href=\"#\" "
-"onclick=\"%2$s\">ignorar esta checagem</a>"
+"You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
+"\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Uma <a href=\"%1$s\">versão mais antiga</a> pode funcionar"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
+#, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
-"Este Complemento depende do <a href=\"%1$s\">Firefox %2$s</a> que ainda não "
-"foi lançado"
+"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Atualize o Firefox</a> para utilizar este "
-"Complemento"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s mudou o status de %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s definiu ação de admin %2$s para ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removeu recurso %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s criou aplicação %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s editou aplicação %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s criou versão %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s removeu versão %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s mudou configuração '%2$s' de '%3$s' para '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s definiu ação de editor desconhecida %2$s para ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removeu Complemento %2$s da lista de recomendados"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s adicionou o Complemento %2$s para a lista de recomendados"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s mudou um recurso para o locale %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s mudou locales do Complemento %2$s na lista de recomendados"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculou a hash para arquivo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s adicionou %2$s ao grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s se associou ao grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s criou grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s apagou grupo %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s editou grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s removeu %2$s do grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s definiu ação desconhecida %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s tentou modificar grupo bloqueado %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s tentou modificar traduções em %2$s sem permissão"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s criou plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s apagou plataforma %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s editou plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+"complemento"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Complementos por nome"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Complementos mais novos"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Complementos populares"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Complementos por avaliação"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Complementos atualizados recentemente"
 
@@ -1489,1041 +1060,255 @@ msgid "categories_current_title"
 msgstr "Categoria atual"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorias"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Escolha a categoria"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Ver todos em %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Ver todos os complementos recomendados"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Melhor avaliados primeiro"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Atualizados mais recentemente primeiro"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Mais populares primeiro"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Ver todos em %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:122
+#: controllers/collections_controller.php:84
 #, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
 msgid "collection_not_found"
 msgstr "Coleção não encontrada!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
-#, php-format
+#, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Adicionado %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
+#, fuzzy
 msgid "compatibility_dashboard_center_header"
 msgstr "Central de Compatibilidade de Complementos"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
+#, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Prepare-se para o lançamento do %1$s com ferramentas e informações "
 "disponíveis para a comunidade de Complementos do %2$s."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
+#, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Carregando dados..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
+#, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Voltar para principal"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
+#, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Relatório de compatibilidade dos Complementos "
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
+#, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Informações para Desenvolvedores de Complementos"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
+#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajuste maxVersion sem fazer upload"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
+#, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Checar status de meus Complementos"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
+#, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Se você tem Complementos mantidos no Mozilla Add-ons, <a href=\"%1$s\">por "
 "favor faça login</a> para analisar o status de seus Complementos para o %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
+#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logotipo do Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
+#, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "Você não possui Complementos mantidos no Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
+#, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Resultados da Checagem de Status dos Complementos"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
+#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Buscando status dos Complementos armazenados ..."
+msgstr "Buscando status dos complementos armazenados ..."
 
 #. %1$s is a number
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
+#, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s usuários (%3$s&#37; do total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
+#, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "Os Complementos abaixo representam 95% da utilização de Complementos que o "
 "Mozilla tem conhecimento e estão ordenados por uso."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
+#, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "Ver relatório detalhado"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
+#, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
 "Dos Complementos do  %1$s que representam 95&#37; da utilização de "
 "Complementos que Mozilla tem conhecimento, <b>%2$s&#37;</b> são atualmente "
 "considerados compatíveis com as últimas versões do %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Versões Alpha"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Complementos compatíveis com uma versão alpha do %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Versões Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Complementos compatíveis com uma versão beta ou candidata do %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Última versão"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Complementos atualizados com a última versão do %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Outras versões"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Complementos não compatíveis com quaisquer versões do %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
+#, fuzzy
 msgid "compatibility_report_title"
 msgstr "Relatório de Compatibilidade de Complementos"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
+#, fuzzy
 msgid "compatibility_user_info"
 msgstr "Informações para Usuários de Complementos"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
+#, fuzzy
 msgid "compatibility_view_report"
 msgstr "Ver Relatório de Compatibilidade"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Para saber como contribuir, veja o nosso %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "A Mozilla gostaria de agradecer as seguintes pessoas pela sua contribuição "
 "para o projeto addons.mozilla.org através dos anos:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Desenvolvedores"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editores"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Tradutores"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Outros colaboradores"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Desenvolvedores anteriores"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software e Imagens"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Alguns ícones usados são do <a href=\"http://www.famfamfam.com/lab/icons/"
@@ -2531,7 +1316,8 @@ msgstr ""
 "<a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
 "Attribution 2.5 </a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
 "Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
@@ -2541,20 +1327,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e de %B de %Y"
 
@@ -2574,7 +1357,7 @@ msgstr "Informações detalhadas"
 #: views/elements/developers/actionbar.thtml:50
 #: views/developers/dashboard.thtml:64
 msgid "devcp_actionbar_link_edit"
-msgstr "Editar o Complemento"
+msgstr "Editar o complemento"
 
 #: views/elements/developers/actionbar.thtml:51
 msgid "devcp_actionbar_link_newversion"
@@ -2589,22 +1372,26 @@ msgstr "Painel de estatística"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
 
@@ -2612,13 +1399,26 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(autodetectar)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Esta versão de seu complemento não se diz compatível com o Firefox %1$s. "
+"Mozilla espera que a próxima versão do Firefox seja lançada em breve, então "
+"por favor teste seu complemento na nova versão a atualize as informações de "
+"compatibilidade. Você pode encontrar mais informações sobre isso <a href=\"%2"
+"$s\">aqui</a>. Isto é apenas um lembrete e você pode continuar a enviar esta "
+"versão para o Add-ons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Abrir em nova janela"
 
 #: views/elements/developers/additem.thtml:41
 msgid "devcp_additem_sidebar_title"
-msgstr "Enviar Complemento"
+msgstr "Enviar complemento"
 
 #: views/elements/developers/additem.thtml:53
 msgid "devcp_additem_step0_newlink"
@@ -2630,7 +1430,7 @@ msgstr "Passo 1: Enviar"
 
 #: views/elements/developers/additem.thtml:47
 msgid "devcp_additem_step2_link"
-msgstr "Passo 2: Detalhes do Complemento"
+msgstr "Passo 2: Detalhes do complemento"
 
 #: views/elements/developers/additem.thtml:48
 msgid "devcp_additem_step3_link"
@@ -2648,249 +1448,465 @@ msgstr "Passo 5: Sucesso"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda para enviar"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Complemento desativado com sucesso"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Editar complemento"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Complemento ativado com sucesso"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descrição do complemento"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Página do complemento"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nome do complemento"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Rótulo para visualização"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Deixar Ativo"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Política de privacidade"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Sumário do complemento"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Email para suporte"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL para suporte"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Notas da versão"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Indicar complemento"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Complemento indicado com sucesso!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Deixar seu Complemento ativo para que apareça em listagens públicas e "
-"permita o serviço de checagem de atualizações."
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Completar Complemento"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Completar seu Complemento e colocá-lo no Sandbox"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Deixar Inativo"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Deixar seu Complemento inativo para que fique escondido de todas as "
-"listagens públicas e desabilitar o serviço de checagem de atualizações."
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Deixar no Sandbox"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Colocar o seu Complemento novamente no Sandbox. Isto é reversível."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Nomear para o público"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Nomear seu Complemento para se tornar público"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Deixar Público"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Tornar seu Complemento Público novamente."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"Seu Complemento está <span class=\"inactive-0\">Ativo</span>. Isto significa "
-"que seu Complemento está aparecendo em todas as listagens públicas que são "
-"apropriadas para o status acima."
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Por favor preencha os critérios acima antes de completar seu Complemento e "
-"colocá-lo no <span class=\"status-1\">Sandbox</span>."
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Agora você poderá completar seu Complemento e colocá-lo no <span class="
-"\"status-1\">Sandbox</span> clicando no botão abaixo."
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Pelo menos uma categoria selecionada"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Descrição do Complemento é obrigatória"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Nome do Complemento é obrigatório"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Complemento não encontra-se marcado como pré-lançamento."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr ""
-"Pelo menos uma ou mais imagens de Screenshot são obrigatórias para extensões "
-"e temas."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Sumário do Complemento é obrigatório"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Status do Complemento: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Ações permitidas"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Status de disponibilidade: <span class=\"inactive-0\">Ativo</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Critério de Completude do Complemento"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Status de disponibilidade: <span class=\"inactive-1\">Inativo</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Critério para Nomeação Pública"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Status de Reconhecimento: <span class=\"status-4\">Reconhecido</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"Seu Complemento está <span class=\"inactive-1\">Inativo</span>. O que "
-"significa que seu Complemento não irá aparecer nas listagens, independente "
-"do status acima. Atualizações <b>não</b> serão fornecidas ao seu Complemento "
-"através do serviço de checagem de atualizações."
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"Por favor preencha os critérios acima antes de nomear seu Complemento para "
-"se tornar <span class=\"status-4\">Público</span>."
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Agora você pode nomear seu Complemento como <span class=\"status-4"
-"\">Público</span> ao clicar no botão abaixo."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Público"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
 msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"Seu Complemento encontra-se <span class=\"status-5\">Desabilitado</span> por "
-"um administrador e não pode ser utilizado. Se você tem dúvidas por favor "
-"envie email para %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
 msgstr ""
-"Seu Complemento está <span class=\"status-0\">Incompleto</span>. Isto "
-"significa que seu Complemento não está aparecendo em quaisquer áreas do site "
-"ou no serviço de checagem de atualizações. Você poderá voltar a esta página "
-"para completar seu Complemento depois que ele se enquadrar nos requisitos "
-"abaixo para que o mesmo possa ficar completo e ser transferido para o <span "
-"class=\"status-1\">Sandbox</span>."
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
-"Seu Complemento está nomeado para se tornar <span class=\"status-4"
-"\">Público</span> e encontra-se esperando uma revisão de editores. Existem "
-"atualimente %s outros Complementos na fila."
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
 msgstr ""
-"Seu Complemento encontra-se pendende. Isto não deve acontecer. Por favor "
-"envie e-mail para %s colocando o ID do seu Complemento e esta mensagem de "
-"erro."
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
 msgstr ""
-"Seu Complemento está <span class=\"status-4\">Público</span>, o que "
-"significa que irá aparecer em todas as listagens e buscas, e poderá ser "
-"baixado sem restrições. Atualizações estarão em funcionamento para seu "
-"Complemento através do serviço de checagem de atualizações."
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
 msgstr ""
-"Seu Complemento está no <span class=\"status-1\">Sandbox</span>, o que "
-"significa que será apresentado em listagens e buscas, mas usuários deverão "
-"aceitá-lo como experimental  antes da instalação. Atualizações <b>não</b> "
-"são oferecidas para o seu Complemento através do serviço de checagem de "
-"atualizações."
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Status do %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
-"Seu Complemento é <span class=\"status-4\">Reconhecido</span>. Isto "
-"significa que você pode enviar atualizações para seu Complemento, sem que "
-"sejam necessárias revisões por editores."
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visite a página %1$s para alterar a sua submissão, ou %2$s para retornar ao "
+"painel de controle do desenvolvedor."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "clique aqui"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Editar complemento"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Esta versão foi colocada na sandbox enquanto espera por revisão pelos "
+"testadores da sandbox e por um editor de complementos da Mozilla. Você será "
+"notificado por email quando alguma ação for tomada."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Você pode ler mais sobre o sistema de revisões da sandbox clicando %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "aqui"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Esta versão foi colocada na sandbox para o uso de usuários experientes. Para "
+"que ela seja exibida no site público, você precisa %s seu complemento para "
+"que seja submetida a um processo de revisão."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "indicar"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "O envio de seu complemento foi finalizado com sucesso."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Devido ao fato de que seu complemento é confiável, esta versão já foi "
+"automaticamente aprovada para a área pública do site."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Enviar complemento"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Complemento atualizado com sucesso"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Você pode %s para tentar aumentar o interesse em seu complemento."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "escrever uma revisão"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Autor não encontrado [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Remover"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancelar"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Você tem certeza de que quer cancelar sua submissão?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Próximo"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Mudar tipo do complemento:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Os comentários dos desenvolvedores foram atualizados."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Ativo"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
 msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
 msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
 "Your add-on was disabled by an administrator and cannot be used.  If you "
@@ -2898,581 +1914,911 @@ msgstr ""
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
 msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
 msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
 msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
 msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
 msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
 msgstr ""
 "You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
 "the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
 msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
 msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Adicionar visualização"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autores"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Nenhum"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorias"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descrição"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Desativado"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detalhes"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Comentários dos desenvolvedores"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Visualizações"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versões"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Página inicial"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Nenhum"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Sem rótulo"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nenhuma visualização encontrada."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Atualizar"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Email para suporte"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "O desenvolvedor não forneceu um email para suporte."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL para suporte"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "O desenvolvedor não forneceu uma URL para suporte."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Confiável"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versão %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nenhuma versão encontrada."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancelar e voltar"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Sim, desativar"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Tem certeza que deseja desativar este complemento?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Desativar este complemento irá ocultá-lo de buscas e listagens. Não será "
+"possível fazer download dele pelo site e não serão enviados avisos nas "
+"verificações de atualização dos clientes. O complemento será deletado "
+"efetivamente. No entanto você poderá voltar aqui e reativá-lo quando desejar."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Desativar %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Sim, ativar"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Tem certeza que deseja ativar este complemento?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Ao ativar este complemento fará com quem ele apareça novamente nas buscas e "
+"listagens. Usuários poderão fazer download dele tanto pelo site quanto pelas "
+"verificações de atualização dos clientes."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Ativar %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Adicionar Resposta"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Respostas"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
 msgstr ""
-"Erro ao salvar sua resposta. Entre em contato com %1$s sobre este problema."
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
 msgstr ""
-"Um Editor do Mozilla Add-ons pediu maiores informações de você referente a "
-"versão %2$s do seu Complemento %1$s."
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "Fornecer maiores informações para a revisão de Complemento de %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Enviar Resposta"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
 msgstr ""
-"Sua resposta foi arquivada com sucesso. Os outros participantes da discussão "
-"serão notificados via e-mail."
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "escrito por %1$s em %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Adicionar autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Endereço de email do autor: "
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Remover"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Adicionar novo autor"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Adicionar Autor"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Conta de Email de Autor:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Checando conta de email..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Para salvar clique no botão Atualizar Autores abaixo."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Autores Existentes"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Gerenciar Autores de Complementos"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Listar como autor em páginas públicas"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
-"<strong>Desenvolvedor</strong> - Pode gerenciar todos os aspectos da "
-"listagem de Complementos, exceto adicionar ou remover autores."
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
-"<strong>Proprietário</strong> - Pode gerenciar todos os aspectos da listagem "
-"de Complementos, includindo adicionar ou remover autores."
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
-"<strong>Visualizador</strong> - Podem olhar listagem de Complementos e "
-"estatísticas, mas não podem fazer mudanças."
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Selecione um papel para o autor:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Listado"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Papel"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Atualizar autores"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Atualizar Categorias"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Meu Complemento não se enquadra em nenhuma das categorias."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "%s Categorias"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Gerenciar Categorias de Complementos"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Visite as categorias para ver a descrição."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Categoria %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr ""
-"Nenhuma das categorias estão disponíveis para este tipo de Complemento e "
-"aplicação."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
 msgstr ""
-"Coloque o seu Complemento nesta categoria somente se ele não se enquadrar "
-"nas outras categorias disponíveis."
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Selecione até três categorias do %s para seu Complemento"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Adicionar ou remover usuários que podem gerenciar este Complemento."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
 msgstr ""
-"Selecionar as categorias relevantes para cada uma das aplicações que o seu "
-"Complemento suporta."
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
 msgstr ""
-"Adicionar ou modificar traduções para seu Complemento referentes ao sumário, "
-"descrições, acordo de utilização para usuários e política de privacidade."
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr ""
-"Mudar dados do Complemento como nome, página home, ícone, e outros atributos."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Atualizar Descrições"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Por favor corrija os erros indicado em vermelho acima."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Editar Descrições do Complemento"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
-"Quaisquer informações que usuários podem estar interessados em saber que não "
-"necessariamente se aplicam ao sumário ou descrição do Complemento. Casos "
-"comuns incluem listagem de bugs conhecidos, informações sobre como relatar "
-"bugs, datas das próximas versões, etc."
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Comentários do Desenvolvedor"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
-"A descrição do seu Complemento trata-se de uma descrição longa dos recursos, "
-"funcionalidade, e outras informações relevantes. Esta informação será "
-"apresentada abaixo do sumário na página de apresentação do Complemento."
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Descrição do Complemento"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
-"Se o seu Complemento tem um acordo de utilização para usuários, por favor "
-"entre com o texto abaixo. Se colocado o texto baixo, usuários serão "
-"obrigados a aceitar antes de instalar seu Complemento. Por favor entenda que "
-"um acordo de utilização não é a mesma coisa que licença de código como GPL "
-"ou MPL."
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Acordo de Utilização de Software"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Política de Privacidade"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
-"O sumário é uma descrição breve do seu Complemento sobre a funcionalidade "
-"básica e que será apresentada nos resultados da busca e nas listagens, assim "
-"como no topo da página de apresentação do seu Complemento <strong>Limite de "
-"250 caracteres.</strong>"
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Sumário do Complemento"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Gerenciar Autores do Complemento"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Gerenciar Categorias do Complemento"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Gerenciar Descrições do Complemento"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Gerenciar Propriedades do Complemento"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Nenhuma categoria disponível para o tipo deste complemento."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autores"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Adicionar ícone"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Alterar ícone"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permitir que usuários vejam os códigos-fonte online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorias"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Idioma padrão"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
-msgstr "Este Complemento necessita de software externo"
+msgstr "Este complemento necessita de software externo"
+
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Apenas limpar o ícone existente"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Novo arquivo de ícone"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "ícone"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Mais informações sobre o idioma"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Esta é uma pré-distribuição"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
-msgstr "Este é um Complemento específico para um site"
+msgstr "Este é um complemento específico para um site"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Idioma alvo"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "Informação adicional breve (tal como nome de dialeto local)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Atualizar propriedades"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Somente mudar se você entende as possíveis consequências."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "�cone registrado"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
-"A tradução padrão de um Complemento é a tradução principal base para outras "
-"traduções presentes. Se traduções para o seu Complemento não encontram-se "
-"disponíveis em certos tipos de idiomas dos usuários, a tradução padrão será "
-"apresentada."
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr ""
-"Estas propriedades são utilizadas para filtrar e classificar Complementos."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
-"O GUID do seu Complemento é especificado no install.rdf o indentifica "
-"unicamente. Você não podem mudar o GUID uma vez que for listado no Mozilla "
-"Add-ons."
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Editar Propriedades do Complemento"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Tipo de Complemento"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Configurações do Adminstrador"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Tradução padrão"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Propriedades do Complemento"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID do Complemento"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "�cone do Complemento"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Outras configurações"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Complemento certificado?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Ver código fonte online"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
-"O ícone do Complemento trata-se de uma imagem pequena que é apresentada "
-"próxima ao nome do seu Complemento nas páginas de resultado e navegação, "
-"páginas de apresentação, e também na tela de instalação do Complemento. A "
-"imagem será automaticamente redimensionada para 32 x 32 pixels. Por favor "
-"escolha um dos tipos de imagem abaixo: %s"
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Este Complemento contém componentes binários"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Não Certificado"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "Certificado"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Novo �cone"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Remover �cone"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
-"Se o seu Complemento tem outra página home, entre com o endereço aqui. "
-"Adicionar outras traduções não é necessário ao menos que o seu site exista "
-"em em vários idiomas."
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Página home do Complemento"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr ""
-"O nome do seu Complemento será apresentado em todos os locais onde seu "
-"Complemento é listado."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Nome do Complemento"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
-"Se você tem um endereço de email para pedidos de suporte, entre com ele "
-"aqui. O cadastrode outras traduções não é necessário ao menos que você tem "
-"múltiplos endereços de email referentes a múltiplos idiomas."
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "Endereço de Email para Suporte"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
-"Se o seu Complemento tem um site de suporte ou forum, entre o endereço aqui. "
-"Cadastrar outras traduções não é necessário ao menos que seu site encontra-"
-"se traduzido em outros idiomas."
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Website de Suporte"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr ""
-"Complementos certificados podem se tornar públicos sem revisão por Editores."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "�cone será removido ao salvar. <a %s>Cancelar?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
-"O código fonte do seu Complemento pode ser visualizado online por qualquer "
-"usuário logado se você desejar."
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Permitir visualização online do código fonte"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Não permitir a visualização online do código fonte"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Atualizar"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr "<a href=\"http://wiki.mozilla.org/L10n:pt-BR\">pt-BR</a>"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Autores"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Categorias"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Mudar Status"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Descrições"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Editar Complemento"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Nova versão"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Propriedades"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Screenshots de Demonstração"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Quadro de Estatísticas"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Versões e Arquivos"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Ver listagem"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3505,13 +2851,67 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Atualizações pendentes (%s)"
 msgstr[1] "Atualizações pendentes (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Os arquivos selecionados serão deletados."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Arquivos"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplicações alvo"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Sem arquivos."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notas para o revisor"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Atualizar"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
-msgstr "Você não tem acesso a este Complemento."
+msgstr "Você não tem acesso a este complemento."
+
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Sumários podem conter no máximo 250 caracteres.\n"
+"(Você digitou %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"O nome do seu complemento já existe na base de dados. Assegure-se de que: "
+"<br /><li>seus GUIDs conferem. As causas mais comuns deste erro são GUIDs "
+"diferentes.</li><li>Você não possui entradas duplicadas na base de dados. Se "
+"tiver, você deve atualizar ou deletar esta entrada e tentar novamente.</li>"
 
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
@@ -3526,16 +2926,18 @@ msgstr "Por favor, veja %s para referência."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "esta página"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Seu Complemento precisa ter o menos um proprietário."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr ""
+"Por favor, descreva as mudanças realizadas na atualização deste complemento."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
 msgstr ""
-"Uma versão deste Complemento já existe. Para trocar você deverá remover o "
-"arquivo %1$s primeiramente."
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
@@ -3543,16 +2945,20 @@ msgstr ""
 #, php-format
 msgid "devcp_error_file_extension"
 msgstr ""
-"Esta extensão de arquivo (%s) não é permitida para o tipo de Complemento "
+"Esta extensão de arquivo (%s) não é permitida para o tipo de complemento "
 "selecionada. Por favor, selecione um dos seguintes: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "As GUIDs não são as mesmas em todos os arquivos"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Por favor, escolha no máximo cinco categorias."
 
 #: controllers/components/developers.php:526
 msgid "devcp_error_guid_application"
-msgstr "A ID deste Complemento já foi usada por outra aplicação."
+msgstr "A ID deste complemento já foi usada por outra aplicação."
 
 #: controllers/components/developers.php:337
 #: controllers/components/developers.php:389
@@ -3580,7 +2986,14 @@ msgstr ""
 "Esta extensão de arquivo (%s) não é permitida para um ícone. Por favor, "
 "selecione um dos seguintes: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Uma versão idêntica (%s) já existe para este complemento e plataforma."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Arquivo install.rdf ausente."
 
@@ -3588,9 +3001,9 @@ msgstr "Arquivo install.rdf ausente."
 msgid "devcp_error_install_manifest"
 msgstr "Os seguintes erros foram encontrados em install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr "Por favor, selecione um tipo válido de Complemento."
+msgstr "Por favor, selecione um tipo válido de complemento."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3604,7 +3017,7 @@ msgstr "%s não é uma versão válida para %s"
 #: controllers/components/developers.php:521
 #, php-format
 msgid "devcp_error_invalid_guid"
-msgstr "A ID deste Complemento não é válida: %s"
+msgstr "A ID deste complemento não é válida: %s"
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3616,13 +3029,13 @@ msgstr "%s não é uma versão válida para %s: versões mínimas não podem con
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
 msgstr ""
-"A versão deste Complemento é inválida: Por favor, veja as <a href=\"http://"
+"A versão deste complemento é inválida: Por favor, veja as <a href=\"http://"
 "developer.mozilla.org/en/docs/Toolkit_version_format\">especificações</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
 msgstr ""
-"A versão deste Complemento é inválida: versões não podem conter espaços."
+"A versão deste complemento é inválida: versões não podem conter espaços."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
@@ -3651,19 +3064,31 @@ msgstr "Você precisa selecionar pelo menos uma aplicação Mozilla."
 
 #: controllers/components/developers.php:516
 msgid "devcp_error_no_guid"
-msgstr "Nenhuma ID foi encontrada para este Complemento em install.rdf."
+msgstr "Nenhuma ID foi encontrada para este complemento em install.rdf."
 
 #: controllers/components/developers.php:287
 msgid "devcp_error_no_platform"
 msgstr "Nenhuma plataforma selecionada"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Você precisa fornecer os detalhes necessários para indicação."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Você não pode indicar uma pré-distribuição de um complemento."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Você só pode indicar complementos que estejam na SandBox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Por favor, escolha ao menos uma categoria."
 
 #: controllers/components/developers.php:92
 msgid "devcp_error_one_user"
-msgstr "Deve haver pelo menos um autor para este Complemento."
+msgstr "Deve haver pelo menos um autor para este complemento."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
@@ -3674,6 +3099,16 @@ msgstr ""
 "Esta extensão de arquivo (%s) não é permitida para uma pré-distribuição. Por "
 "favor, use uma das seguintes: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Ocorreu um erro enquanto tentávamos salvar seus dados."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Você não tem permissão para atualizar este complemento."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3686,82 +3121,293 @@ msgstr ""
 "Complementos não podem usar um endereço de atualização externo. Por favor, "
 "remova isto do install.rdf e tente novamente."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor, envie um arquivo."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Adicionar outro arquivo de plataforma"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Adicionar autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Remover"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"No próximo passo você poderá escolher categorias para seu novo complemento."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Não existem categorias disponíveis para este tipo de complemento."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Por favor, insira uma descrição para seu complemento."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Por favor, insira o nome do seu complemento."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Por favor, selecione o tipo do complemento que está enviando."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Por favor, insira um sumário do seu complemento."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Arquivo do complemento"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Arquivo 2 do complemento"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Arquivo 3 do complemento"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tipo do complemento"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permitir que usuários vejam os códigos-fonte online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Email do autor"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "autores"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorias"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Idioma padrão"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descrição"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Termo de aceitação do usuário (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Este complemento requer um software externo"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Arquivos"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Página inicial"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Arquivo de ícone"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nome"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plataformas suportadas"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Esta é uma pré-distribuição"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Políticas de privacidade"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Este é um complemento para um site específico"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Sumário"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Email para suporte"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL para suporte"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplicações alvo"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versão"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Notas da versão"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Nenhum"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notas para os revisores"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Por seu complemento ser confiável, descreva para onde esta versão deve "
+"seguir:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Público"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Acordo do desenvolvedor"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Passo 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Carregar um arquivo"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Passo 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detalhes do complemento"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Passo 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detalhes da versão"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Passo 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localização"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Passo 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Sucesso"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Meus complementos"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Enviar Arquivo"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr ""
-"Por favor entre com o endereço de email do autor que você desenha adicionar."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Mover para baixo"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Mover para cima"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Remover Compatibilidade de Aplicação"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Listar como autor em listagens públicas"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Desenvolvedor"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Proprietário"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Visualizador"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Remover autor"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Você está <strong>certo</strong> que deseja remover este autor?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Você tem que selecionar um arquivo para enviar."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3774,81 +3420,94 @@ msgid "devcp_localebox_intro"
 msgstr ""
 "Alguns campos desta página estão traduzidos para aparecer no idioma nativo "
 "do usuário final. Selecione sua localização abaixo para editar os detalhes "
-"de seu Complemento neste idioma. Se não existir tradução para um determinado "
+"de seu complemento neste idioma. Se não existir tradução para um determinado "
 "idioma, ele será mostrado com o idioma padrão selecionado (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Painel de controle do administrador"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Painel de controle do editor"
 
 #: views/elements/developers/myaddons.thtml:52
 msgid "devcp_myaddons_link"
-msgstr "Meus Complementos"
+msgstr "Meus complementos"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Voltar para página principal"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Painel de estatísticas"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
-msgstr "Enviar um Complemento"
+msgstr "Enviar um complemento"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Ferramentas do desenvolvedor"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
-"Este ID (%1$s) de Complemento já existe no banco de dados. Se este é o seu "
-"Complemento, você poderá <a href=\"%2$s\">enviar uma nova versão</a>."
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Cancelar e voltar"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Voltar para os detalhes do complemento"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Indicar %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Tipo do complemento detectado automaticamente: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
-"<span>Uma ou mais mudanças feitas não podem ser gravadas.</span><br />Por "
-"favor verifique pelos erros abaixo. As outras mudanças foram gravadas com "
-"sucesso."
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
 msgstr ""
-"<span>Suas mudanças foram arquivadas.</span><br />Por favor entenda que "
-"algumas mudanças podem levar algumas horas para aparecer em todas as áreas "
-"do site."
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
@@ -3856,6 +3515,18 @@ msgstr ""
 "Remover esta visualização padrão fará com que outra visualização se torne "
 "automaticamente a visualização padrão."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"A localidade padrão deste complemento (%1$s [%2$s]) é diferente da sua "
+"localidade atual (%3$s [%4$s]). Os campos abaixo devem ser preenchidos em %1"
+"$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3863,13 +3534,14 @@ msgstr ""
 "Tornar esta visualização padrão irá remover o status da visualização padrão "
 "atual."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Você tem mudanças não gravadas."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3898,74 +3570,84 @@ msgstr "Editar visualização"
 msgid "devcp_preview_updated_successfully"
 msgstr "Visualização atualizada com sucesso."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Adicionar outro Screenshot"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Remover screenshot"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Alterar Screenshot"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Atualizar Screenshots"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Adicionar um novo Screenshot"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
-"Selecione uma imagem para enviar abaixo. Imagens que são maiores do que o "
-"tamanho de 700 pixels de largura por 525 pixels de altura serão "
-"redimensionadas. Tipos de arquivos permitidos: %s"
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Clicar abaixo em Atualizar Screenshots para enviar."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
-"Clicar o botão de Atualizar Screenshots abaixo para gravar esta imagem. (<a %"
-"s>Cancelar?</a>)"
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
-"Este Screenshot será removido quando o botão Atualizar Screenshots for "
-"clicado abaixo. (<a %s>Cancelar?</a>)"
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
 msgstr ""
 "Use o formulário abaixo para carregar um screenshot PNG, JPG ou GIF para seu "
-"Complemento. Imagens maiores que 700 pixels de largura e 525 pixels de "
+"complemento. Imagens maiores que 700 pixels de largura e 525 pixels de "
 "altura serão redimensionadas automaticamente."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Adicionar visualização"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Sub-títulos do Screenshot"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Editar visualização"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Screenshot Padrão"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
@@ -3975,29 +3657,33 @@ msgstr "Arquivo de visualização"
 msgid "devcp_previews_label_makedefault"
 msgstr "Tornar esta a imagem de visualização padrão"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Nova imagem:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Enviar Screenshot: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "Um ou mais Screenshots não foram gravados."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Seus Screenshots foram gravados com sucesso."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
-"Os Screenshots de Demonstração do seu Complemento estão mostrados abaixo. "
-"Você poderá fazer mudanças para os sub-títulos ou imagens abaixo. O "
-"Screenshot padrão é o screenshot que será apresentado próximo ao deu "
-"Complemento nos resultados da busca e nas listagens."
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -4015,37 +3701,53 @@ msgstr "Editar visualização"
 msgid "devcp_previews_submit_upload"
 msgstr "Carregar visualização"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorreto?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Tem certeza de que deseja excluír este arquivo?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Por favor, revise e aceite os seguintes termos do desenvolvedor antes de "
 "prosseguir."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
-"<span>Você não tem privilégios suficientes para fazer mudanças nesta página."
-"</span><br />Entre em contato com o Proprietário do Complemento caso precise "
-"fazer mudanças."
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
-"Por favor entenda que algumas mudanças podem levar algumas horas para "
-"aparecer em todas as áreas do site."
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Quadro"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Pular a atualização das informações do complemento"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -4069,23 +3771,27 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> downloads semanais"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"Ao marcar este Complemento como ativo ele será apresentado em todas as áreas "
-"públicas, incluindo resultados de busca e listagens de navegação. Ele estará "
-"disponível para para downloads a partir do site e poderá ser automaticamente "
-"transferido nas checagens de atualização dependendo do estado. Você poderá "
-"voltar aqui e desabilitar novamente quando lhe for conveniente."
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Você tem certeza que quer marcar este Complemento como Ativo?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Você tem certeza?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
 "Marking this add-on inactive will prevent it from showing up in any public "
@@ -4094,24 +3800,29 @@ msgstr ""
 "be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
 msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
 msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
 msgstr ""
 "Making this add-on public will make it available for anyone to download and "
 "will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
 msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
 "Moving this add-on back to the sandbox will require users to login before "
@@ -4120,173 +3831,247 @@ msgstr ""
 "to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
 msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
 msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
 "<span>A nomination message is required.</span><br />Please fill in the text "
 "box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Submissões de complementos estão desabilitadas no momento. Por favor, tente "
+"novamente mais tarde."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Eu aceito"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Não aceito"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Este complemento foi desativado por um administrador."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Desabilitado"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Confiável"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última versão:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Você não possui nenhum complemento. Clique %s para enviar um."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "aqui"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Assegure-se de %s para seu tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "carregar uma visualização"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Editar %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Ajuda (não sairá da página)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Ajuda"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Caracteres utilizados: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Você está certo que desejar remover esta tradução?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "O que são estas abas %s ?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "E se eu não tenho outras traduções?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Esconder ajuda"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"Se um usuário navegar o site e uma tradução não está disponível no idioma "
-"dele,o sistema irá apresentar o idioma padrão, que encontra-se especificado "
-"na área de Edição de Propriedades do Complemento. Se você não tem outras "
-"traduções, simplesmente coloque o que você conseguir na tradução padrão, que "
-"deverá ser o idioma que você fala."
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"Este é um <i>Campo de Tradução</i>. Ele permite que você possa traduzir um "
-"campo específico para outros idiomas no qual você tem traduções. Vocé poderá "
-"adicionar, editar, e remover traduções utilizando as abas de tradução."
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Adicionar Tradução"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Remover Tradução"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Adicionar Idiomas para Todos"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Adicionar Idiomas"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Remover isto"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Selecionar o idioma para a tradução a ser adicionada:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
-"O GUID do Complemento utilizado neste arquivo (%1$s) não bate com o GUID "
-"existente para este Complemento (%2$s)."
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "Você não tem privilégios suficientes para atualizar este Complemento."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "A versão especificada (%1$s) não pertence ao Complemento (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"O número da versão enviada (%1$s) já existe para este Complemento. Se você "
-"está tentando adicionar outro arquivo nesta versão, <a href=\"%2$s\">clique "
-"aqui</a>."
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
-"A versão enviada de número (%1$s) não bate com a versão existente de número "
-"(%2$s)."
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Iniciar"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Enviando arquivo..."
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Editar meu Complemento"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Vou completar meu Complemento depois."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Adicionar notas de versão"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
 "<p>Your add-on listing has been successfully created. The basic information "
@@ -4298,42 +4083,51 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
 "<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
@@ -4351,20 +4145,19 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 "The new file will be available to the public as soon as an editor is able to "
@@ -4372,7 +4165,8 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 "The new version will be available to the public as soon as an editor is able "
@@ -4380,13 +4174,15 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 "View your new file in the <a %1$s>Versions and Files page</a>, check out "
@@ -4395,335 +4191,384 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 "View your new version in the <a %1$s>Versions and Files page</a>, check out "
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
 "Upload your add-on file using the form below. If you have multiple, platform-"
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Adicionar arquivo ao %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Enviar novo Complemento"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Atualizar %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Por favor, veja %s para referência."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "esta página"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Conta não encontrada para o endereço de email informado."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Editar versão"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versão atualizada com sucesso."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Remover Versão"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Remover Versão Nula"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Remover?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Adicionar Nova Versão"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Remover Versão"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Também serão removidos:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s arquivo"
-msgstr[1] "%s arquivos"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Remover Versão %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s revisão"
-msgstr[1] "%s revisões"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Você tem certeza que quer permanentemente remover a versão %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Cancelar"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Remover Arquivo"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Adicionar nova aplicação"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Remover Aplicação"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Adicionar Novo Arquivo"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"Ajustando informações da aplicação irá permitir que usuários instalem seu "
-"Complementomesmo que o install.rdf do pacote indique que o Complemento é "
-"incompatível.<a %s>Veja lista de aplicações suportadas</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
-"Você tem <b>certeza</b> que quer remover a compatibilidade para esta "
-"aplicação?"
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Você tem <b>certeza</b> que quer remover este arquivo permanentemente?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Informações da Aprovação"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Aplicações compatíveis"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Informações de Arquivo"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Gerenciar Versão %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Notas da Aprovação"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Remover Arquivo"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Arquivo %1$s (%2$s) criado em %3$s e alterado para %4$s em %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Arquivos não encontrados."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Informações opcionais para o Editor que irá revisar esta versão."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Remover Compatibilidade de Aplicação"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Por favor selecione uma aplicação"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Arquivo"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Plataforma"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Tamanho"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Estado"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"Informações sobre mudanças neste lançamento, novos recursos, bugs "
-"conhecidos, e outras informações úteis relacionadas com esta versão/"
-"lançamento. Estas informações estarão disponíveis para usuários que "
-"atualizarem os Complementos utilizando a tela de gerenciamento de "
-"Complementos do Firefox 3."
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Notas da Versão"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>Você tem mudanças não arquivadas.</strong> A compatibilidade não "
-"será removida até que você clique em Atualizar Versão abaixo."
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>Você tem mudanças não arquivadas.</strong> Arquivos não serão "
-"removidos até que você clique em Atualizar Versão abaixo."
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Atualizar Versões"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Gerenciar Versões e Arquivos"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Sem versões."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Versão %s removida com sucesso."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
 msgstr ""
-"Esta versão não tem arquivos associados com ela e pode ser removida. Você "
-"deseja remover esta versão?"
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Criado"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
 msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Versão"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
-msgstr "Este Complemento está desativado"
+msgstr "Este complemento está desativado"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "Este Complemento não foi nomeado."
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Este arquivo não está com revisão pendente."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
 #: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "Por favor selecione uma ação de revisão."
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "Por favor entre com as aplicações que você testou."
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
 #: controllers/components/editors.php:84
 #: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "Por favor entre com os comentários da revisão."
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "Por favor selecione ao menos um arquivo para revisar."
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "Por favor entre com o sistema operacional que você testou."
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
@@ -4733,7 +4578,7 @@ msgstr "Filtrar"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/ação"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Log de eventos"
 
@@ -4795,7 +4640,7 @@ msgstr "Ver as entradas entre %s e %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Não foram encontradas revisões para este período."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Log da revisão"
 
@@ -4819,24 +4664,24 @@ msgstr "Atividades recentes dos editores"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total de revisões"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
-msgstr "Revisar Complemento"
+msgstr "Revisar complemento"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor, preencha os seguintes campos:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Por favor, selecione pelo menos um arquivo para revisar."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
-msgstr "Não é permitido revisar seus próprios Complementos."
+msgstr "Não é permitido revisar seus próprios complementos."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Software externo"
 
@@ -4848,39 +4693,39 @@ msgstr "Adicionar característica"
 msgid "editors_featured_add_feature_submit"
 msgstr "Adicionar"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Falha ao adicionar característica."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Característica adicionada com sucesso."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Falha ao editar a característica."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Característica editada com sucesso."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Um ou mais idiomas são invalidos."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Falha ao remover a característica."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Característica removida com sucesso."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Complementos em destaque"
 
@@ -4892,278 +4737,224 @@ msgstr "Ir"
 msgid "editors_featured_remove_feature"
 msgstr "Remover característica"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Fila de filtros"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Endereços úteis"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guia do editor"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Políticas de Uso dos Complemento"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Estes filtros irão permanecer para esta sessão ou até que sejam removidos."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
-msgstr "Não existem Complementos %s para revisar."
+msgstr "Não existem complementos %s para revisar."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 Dia"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Painel de controle do editor"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "apenas %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-distribuição"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilidade de %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Limpar"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtrar"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Todas as filas de revisão estão desabilitadas. Verifique novamente mais "
 "tarde."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ação de revisão"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Publicar"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Requisitar super-revisão"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Manter na sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentários da revisão"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
-"Utilize este formulário para pedir mais informações para o autor(es). Eles "
-"irão receber um email e assim poderão responder aqui. Você será notificado "
-"por email quando for respondido."
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
-"Isto irá tornar o Complemento, sua versão e arquivos mais recentes, "
+"Isto irá tornar o complemento, sua versão e arquivos mais recentes, "
 "públicos. Versões futuras irão para a sandbox até que sejam revistas por um "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
-msgstr "Isto irá manter o Complemento na sandbox."
+msgstr "Isto irá manter o complemento na sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
-"Isto irá aprovar a versão sandbox de um Complemento para que ele apareça na "
+"Isto irá aprovar a versão sandbox de um complemento para que ele apareça na "
 "parte pública."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
-"Isto irá fazer com que a versão sandbox de um Complemento público permaneça "
+"Isto irá fazer com que a versão sandbox de um complemento público permaneça "
 "na sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Se você possui dúvidas sobre a segurança, questões de copyright ou outras "
-"dúvidas sobre este Complemento que um administrador deveria observar, entre "
+"dúvidas sobre este complemento que um administrador deveria observar, entre "
 "com seus comentários na área abaixo. Eles serão enviados para "
 "administradores, não para o autor."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Comparar com a versão pública"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Visualizar conteúdo"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autores:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorias:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidade:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrição"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentários do desenvolvedor"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
-msgstr "EULA ( Termo de Utilização )"
+msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Arquivos:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Histórico do item"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensagem de indicação"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Visualizações"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Políticas de privacidade"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Revisão %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para o revisor"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sumário"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notas da versão"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Resposta"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Pedido de Informações"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -5180,7 +4971,7 @@ msgstr "Indicação aprovada/publicada"
 msgid "editors_review_history_nominated_denied"
 msgstr "Indicação negada/sandboxed"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Não foram encontradas entradas de revisões anteriores."
 
@@ -5202,106 +4993,101 @@ msgstr "negado/sandbox"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Mostrar/Esconder Respostas (%1$s)"
-msgstr[1] "Mostrar/Esconder Respostas (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "aplicações:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou selecione uma resposta prévia:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "comentários:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas operacionais:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Topo"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
+#, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Não foram encontradas visualizações."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
+#, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Fila de revisões"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
+#, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> de %2$s na fila"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ações para o processo"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ação"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentários"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "versão/arquivo"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
-"Me notifique a próxima vez que este Complemento for atualizado. (Para as "
-"atualizações seguintes não será notificado)"
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Revisão processada com sucesso."
 
 #: views/editors/reviews_queue.thtml:106
+#, fuzzy
 msgid "editors_reviews_action_delete_review"
-msgstr "Remover revisão"
+msgstr "Delete review"
 
 #: views/editors/reviews_queue.thtml:104
+#, fuzzy
 msgid "editors_reviews_action_keep"
-msgstr "Remover atributos; manter revisão"
+msgstr "Remove flags; keep review"
 
 #: views/editors/reviews_queue.thtml:102
 msgid "editors_reviews_action_skip"
@@ -5315,7 +5101,7 @@ msgstr "Ação"
 msgid "editors_reviews_in_reply_to"
 msgstr "Em resposta a:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Revisões processadas com sucesso!"
 
@@ -5327,81 +5113,87 @@ msgstr "Não existem revisões para serem avaliadas."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Revisões para o processo"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sites específicos"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Novo"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Atualizado"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicação testada"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas operacionais testados"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informações adicionais"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Complemento"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tipo"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipos de complementos"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Idade"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplicações"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restringir idiomas?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tempo na Fila"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plataformas"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipos de submissão"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dias"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutos"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Acesso negado"
 
@@ -5409,19 +5201,17 @@ msgstr "Acesso negado"
 msgid "error_access_denied_message"
 msgstr "Você não tem autorização para ver esta página."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5430,72 +5220,74 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Complemento não encontrado!"
 
 #: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
-msgstr "Este Complemento não pode ser visualizado aqui."
+msgstr "Este complemento não pode ser visualizado aqui."
 
 #: controllers/reviews_controller.php:246
 msgid "error_addon_selfreview"
-msgstr "Você não pode revisar seu próprio Complemento."
+msgstr "Você não pode revisar seu próprio complemento."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
-msgstr "Não existem Complementos nesta categoria!"
+msgstr "Não existem complementos nesta categoria!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Este não é um endereço de email válido."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Este campo não pode ser vazio."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Arquivo não encontrado!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erro de arquivo: %s não existe."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Existem erros neste formulário. Favor corrigi-los e reenviar."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "As letras não conferem. Tente novamente!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Este endereço tem um formato inválido. Endereços válidos são do tipo http://"
@@ -5503,46 +5295,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argumento não existente: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
+#, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "Sem arquivos"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Aviso"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Visualização não encontrada!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Você precisa selecionar uma nota."
 
@@ -5550,46 +5331,37 @@ msgstr "Você precisa selecionar uma nota."
 msgid "error_user_already_confirmed"
 msgstr "Esta conta de usuário já está confirmada."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Código de confirmação inválido!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "As senhas não conferem."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Este email já foi utilizado por outro usuário."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "A troca de e-mail expirou. Por favor troque seu e-email novamente em seu "
 "cadastro e clique no link do e-email de confirmação assim que recebê-lo "
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Este apelido já foi utilizado."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Usuário não encontrado!"
 
@@ -5598,113 +5370,118 @@ msgid "error_user_unconfirmed"
 msgstr ""
 "Por favor, confirme sua conta de usuário com o código enviado via email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Usuário ou senha incorretos!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versão não encontrada!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Senha digitada inválida!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Saiba mais"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Saiba mais sobre %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "revisões"
 msgstr[1] "revisões"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Ver mais de"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "Voltar para Complemento"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Expandir tudo"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "Voltar para Revisão"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Navegador de Arquivos :: Complementos %2$s"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Sobre"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Perguntas mais Frequentes"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Todos os direitos reservados."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Créditos"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla oferece links para estas aplicações como um serviço de cortesia, e "
@@ -5712,195 +5489,130 @@ msgstr ""
 "relacionadas a estas. Perguntas ou reclamações com relação a estas "
 "aplicações devem ser direcionadas aos devidos autores dos programas."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Enviar"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Termos legais"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Outros idiomas:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Política de privacidade"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "salvar"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Dicionário"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicionários"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensão"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensões"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pacote de idioma (Complemento)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacotes de idiomas (Complemento)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Pacote de idioma (Aplicação)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacotes de idiomas (Aplicação)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Mecanismo de pesquisa"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Mecanismos de pesquisa"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Temas"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
-msgstr "Voltar para a página de início de Complementos para %1$s"
+msgstr "Voltar para a página de início de complementos para %1$s"
 
 #: views/elements/header.thtml:87
 msgid "header_main_firefox_header"
 msgstr "Complementos para o Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Complementos"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Complementos para o Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Complementos para o Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Complementos para o Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Complementos"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Acessar"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Sair"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Minha conta"
 
@@ -5908,70 +5620,47 @@ msgstr "Minha conta"
 msgid "header_navlink_register"
 msgstr "Registrar"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Imagem de visualização de %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">Iniciar sessão</a> para instalar este Complemento"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Permita-me instalar este Complemento experimental. <a href=\"%1$s\">Saiba "
-"mais</a>"
+msgstr "<a href=\"%1$s\">Iniciar sessão</a> para instalar este complemento"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Adicionar a %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Adicionar %1$s a %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Baixar %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
-msgstr "Este Complemento não está disponível."
+msgstr "Este complemento não está disponível."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista de pacotes de idiomas e dicionários."
 
@@ -5983,8 +5672,8 @@ msgstr "Baixar dicionário"
 msgid "langtools_download_langpack"
 msgstr "Baixar pacote de idioma"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicionários e pacotes de idiomas"
 
@@ -5996,77 +5685,42 @@ msgstr "Instalar dicionário"
 msgid "langtools_install_langpack"
 msgstr "Instalar pacote de idiomas"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dicionário"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pacote de idioma"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Idioma"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Clique aqui para voltar à página inicial."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Data"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
-msgstr "Nome do Complemento"
+msgstr "Nome do complemento"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Pontuação"
 
 #: config/bootstrap.php:278
+#, fuzzy
 msgid "main_prettyname_fennec"
 msgstr "Fennec"
 
@@ -6086,92 +5740,88 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dicionários e pacotes de idiomas"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temas"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
-msgstr "Encontre Complementos para outras aplicações"
+msgstr "Encontre complementos para outras aplicações"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "outros"
 
 #: controllers/pages_controller.php:90
+#, fuzzy
 msgid "page_title_appversions"
 msgstr "Versões da Aplicação"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
+#, fuzzy
 msgid "page_title_credits"
 msgstr "Créditos"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+#, fuzzy
+msgid "page_title_experimental_addons"
+msgstr "Complementos Experimentais"
 
 #: controllers/pages_controller.php:111
+#, fuzzy
 msgid "page_title_faq"
 msgstr "Perguntas Frequentes"
 
 #: controllers/pages_controller.php:94
+#, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "FAQ do Fashion Your Firefox"
 
 #: controllers/pages_controller.php:101
+#, fuzzy
 msgid "page_title_policy"
 msgstr "Política de Uso dos Complementos"
 
 #: controllers/pages_controller.php:103
+#, fuzzy
 msgid "page_title_privacy"
 msgstr "Política de Privacidade Mozilla"
 
 #: controllers/pages_controller.php:105
+#, fuzzy
 msgid "page_title_review_guide"
 msgstr "Regras gerais para Revisores"
 
 #: controllers/pages_controller.php:107
+#, fuzzy
 msgid "page_title_sandbox"
 msgstr "Sistema de Revisão da Sandbox"
 
 #: controllers/pages_controller.php:109
+#, fuzzy
 msgid "page_title_submissionhelp"
 msgstr "Ajuda com Envio"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versões de aplicação válidas"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Complementos enviados ao Mozilla Add-ons precisam incluir o arquivo install."
@@ -6179,7 +5829,7 @@ msgstr ""
 "são suportadas para estas aplicações."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6188,15 +5838,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "aqui"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versões"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Voltar para a página anterior"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Página de informação da sandbox"
 
@@ -6204,6 +5857,12 @@ msgstr "Página de informação da sandbox"
 msgid "pagination_next_page"
 msgstr "próximo"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Esta é a página %1$s de %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "anterior"
@@ -6219,59 +5878,67 @@ msgid "recaptcha_enter_here"
 msgstr "Insira sua resposta aqui:"
 
 #: views/elements/recaptcha.thtml:74
+#, fuzzy
 msgid "recaptcha_enter_whatyouhear"
-msgstr "Por favor digite o que você ouve."
+msgstr "Please type what you hear."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
+#, fuzzy
 msgid "recaptcha_hardtohear_text"
 msgstr ""
-"Se isto for difícil de entender, você poderá <a href=\"%1$s\">ouvir outra "
-"coisa</a> ou <a href=\"%2$s\">colocar texto novamente</a>."
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
+#, fuzzy
 msgid "recaptcha_hardtoread_text"
 msgstr ""
-"Se isto for difícil de se ler, você poderá <a href=\"%1$s\">tentar palavras "
-"diferentes</a> ou <a href=\"%2$s\">ouvir algo</a>."
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Você é humano?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "O que é isso?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Erro ao marcar esta revisão!"
 
 #: models/reviews_moderation_flag.php:69
+#, fuzzy
 msgid "review_flag_reason_bug_support"
 msgstr "Pedido de suporte ou relato de Bug inválivo"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
+#, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Relatar esta revisão (selecione uma razão)"
 
 #: models/reviews_moderation_flag.php:67
+#, fuzzy
 msgid "review_flag_reason_language"
 msgstr "Linguajar inapropriado"
 
 #: models/reviews_moderation_flag.php:71
+#, fuzzy
 msgid "review_flag_reason_other"
 msgstr "Outros ( especificar )"
 
 #: models/reviews_moderation_flag.php:65
+#, fuzzy
 msgid "review_flag_reason_spam"
 msgstr "Spam ou conteúdo que não é uma revisão"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Obrigado; esta revisão foi marcada para aprovação de um editor."
 
@@ -6286,61 +5953,42 @@ msgstr ""
 "para revisão de um editor."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Mantenhas essas dicas em mente::</p><ul><li>Escreva como se tivesse "
-"falando para um amigo sobre sua experiência com o Complemento.  Dê detalhes "
+"falando para um amigo sobre sua experiência com o complemento.  Dê detalhes "
 "específicos e úteis, tais como quais características você gostou ou não, "
 "quão fácil é utilizá-lo, e quaisquer desvantagens que ele possua.  Evite "
 "usar termos genéricos como dizer \"Ótimo\" ou \"Ruim\" a menos que você "
 "possa dar as razões pelas quais você acha isso.</li><li>Por favor, não "
 "reporte bugs nas revisões. Nós não deixamos seu endereço de e-mail "
-"disponível para os desenvolvedores do Complemento e eles podem precisar "
+"disponível para os desenvolvedores do complemento e eles podem precisar "
 "entrar em contato com você para que ajude a resolver seu problema. Veja a <a "
 "href=\"%1$s\">seção de suporte</a> para encontrar onde obter ajuda para este "
-"Complemento.</li><li>Por favor, deixe suas revisões claras, evite o uso de "
+"complemento.</li><li>Por favor, deixe suas revisões claras, evite o uso de "
 "linguagem imprópria e não escreva nenhuma informação pessoal. </li></"
 "ul><p>Leia as <a href=\"%2$s\">Dicas de revisão</a> para maiores detalhes "
-"sobre revisões de Complementos.</p>"
+"sobre revisões de complementos.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Revisões para %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Complementos selecionados"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Complementos mais novos"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
-msgstr "Atualizar Complementos"
-
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
+msgstr "Atualizar complementos"
 
 #: controllers/search_controller.php:99
 msgid "search_disabled"
@@ -6348,89 +5996,79 @@ msgstr ""
 "A busca está temporariamente fora do ar. Por favor, tente novamente mais "
 "tarde."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
-msgstr "todos os Complementos"
+msgstr "todos os complementos"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
-msgstr "buscar por Complementos"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
+msgstr "buscar por complementos"
 
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
-msgstr "Pesquisar por Complementos"
+msgstr "Pesquisar por complementos"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Clique para inserir os termos da pesquisa"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "dentro de"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Todos os mecanismos de pesquisa"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Ver mecanismos de pesquisa"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s complemento encontrado"
+msgstr[1] "%s complementos encontrados"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Nenhum resultado encontrado."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
-msgstr "Procure por Complementos"
+msgstr "Procure por complementos"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed dos resultados de procura"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Resultados da procura: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ferramentas administrativas"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ferramentas do desenvolvedor"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ferramentas de edição"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Bem vindo"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Bem vindo, %s"
@@ -6439,7 +6077,7 @@ msgstr "Bem vindo, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dicionário"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Complementos em destaque"
 
@@ -6447,7 +6085,7 @@ msgstr "Complementos em destaque"
 msgid "sidebar_pitch_looking_for"
 msgstr "Estou procurando por:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Complementos mais recentes"
 
@@ -6455,7 +6093,7 @@ msgstr "Complementos mais recentes"
 msgid "sidebar_pitch_search"
 msgstr "Mecanismo de pesquisa"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Inscrever-se em"
 
@@ -6463,26 +6101,27 @@ msgstr "Inscrever-se em"
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Complementos atualizados"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Sem pontuação"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
-msgstr "Pontuação: %s de 5 estrelas"
+msgstr "Puntuação: %s de 5 estrelas"
 
 #: views/statistics/addon.thtml:59
 msgid "statistics_addon_dashboard_link"
@@ -6494,7 +6133,7 @@ msgstr "Ferramentas do desenvolvedor"
 
 #: views/statistics/addon.thtml:53
 msgid "statistics_addon_switch"
-msgstr "Trocar Complemento"
+msgstr "Trocar complemento"
 
 #. This is a date format.
 #. http://php.net/strftime
@@ -6516,13 +6155,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e de %b"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s criado"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s publicado"
@@ -6535,181 +6174,187 @@ msgstr "Fechar"
 msgid "statistics_help_link"
 msgstr "Ajuda"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
-msgstr "ou, selecione outro Complemento"
+msgstr "ou, selecione outro complemento"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
-msgstr "ou, selecione um Complemento com estatísticas públicas"
+msgstr "ou, selecione um complemento com estatísticas públicas"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
-msgstr "Selecione um de seus Complementos para ver suas estatísticas"
+msgstr "Selecione um de seus complementos para ver suas estatísticas"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
-msgstr "Selecione um Complemento para ver suas estatísticas"
+msgstr "Selecione um complemento para ver suas estatísticas"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
-msgstr "Selecione um Complemento com estatísticas públicas"
+msgstr "Selecione um complemento com estatísticas públicas"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Painel de estatísticas"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Ver estatísticas"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
+#, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "Visualizar esta tabela em formato CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "nenhum"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remover este parâmetro"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
+#, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupar por: Dia"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
+#, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupar por: Mês"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
+#, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s encontrado"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adicionar parâmetro"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Adicionar outro parâmetro a este gráfico"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ocultar a contagem total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostrar a contagem total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
+#, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Colocar a contagem total neste gráfico"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver dados (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Obter um arquivo 'Comma Separated Values' destes dados"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s eventos"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostrar %s eventos"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
-msgstr "Sobrepor as datas de publicação dos Complementos nos gráficos"
+msgstr "Sobrepor as datas de publicação dos complementos nos gráficos"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar eventos do Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostrar eventos do Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Sobreper datas de publicação do Firefox nos gráficos"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Encolher gráfico"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir gráfico"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar o gráfico"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Usuários ativos diariamente"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicação"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizado"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema operacional"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
-msgstr "Estado do Complemento"
+msgstr "Estado do complemento"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumário"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
-msgstr "Versão do Complemento"
+msgstr "Versão do complemento"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplicação"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema operacional"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
-msgstr "Estado do Complemento"
+msgstr "Estado do complemento"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Desconhecido"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
-msgstr "Versão do Complemento"
+msgstr "Versão do complemento"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
@@ -6720,13 +6365,13 @@ msgstr ""
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
 msgstr ""
-"Nós não temos nenhum dado para seu Complemento ainda. Por favor, verifique "
+"Nós não temos nenhum dado para seu complemento ainda. Por favor, verifique "
 "novamente dentro de alguns dias."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
 msgstr ""
-"Estatísticas do Complemento estão em processo de atualização. Dados recentes "
+"Estatísticas do complemento estão em processo de atualização. Dados recentes "
 "podem estar incompletos enquatno nossos scripts trabalham para atualizar a "
 "informação. Por favor, verifique novamente dentro de alguns minutos."
 
@@ -6748,7 +6393,7 @@ msgstr "Suas configurações foram atualizadas!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Painel de estatísticas"
 
@@ -6776,105 +6421,109 @@ msgstr "Afastar"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Afastar um mês"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Resumo diários das estatísticas de %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed do resumo dos dados"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e de %B de %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Estatísticas para %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Por padrão, apenas você e a Mozilla podem ter acesso às informações em seu "
 "painel. Você pode abrí-lo ao público para que todos possam ver os dados de "
-"seu Complemento."
+"seu complemento."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Acesso ao painel"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privado"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
-msgstr "Somente você e a Mozilla podem ver as estatísticas deste Complementos"
+msgstr "Somente você e a Mozilla podem ver as estatísticas deste complementos"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Público"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Todos podem ver as estatísticas deste compelento"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Alterar as configurações"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor, trate essas informações como confidenciais."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este painel é atualmente <b>privado</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Este painel é atualmente <b>público</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Voltar ao painel"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Salvar configurações"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Configurações do painel de estatísticas de  %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Est."
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Desc."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Média de downloads diários"
 
@@ -6886,7 +6535,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Contagem do último dia"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads nos últimos 7 dias"
 
@@ -6904,7 +6553,7 @@ msgstr "Desde %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Sem dados até o momento"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Média de usuários ativos por dia"
 
@@ -6930,148 +6579,151 @@ msgstr "Usuários ativos por dia"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Em %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Estatísticas para %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Todos os temas"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Ver temas"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Trocar endereço de e-mail"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Mudar senha"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "O código de confirmação foi enviado!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
+#, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
 "Sua conta de usuário %1$s foi deletada com sucesso. Se você tiver interesse "
 "em voltar, você poderá registrar-se novamente na <a href=\"%2$s\">Página de "
 "registro</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
+#, fuzzy
 msgid "user_del_community_sad"
 msgstr "A comunidade de Mozilla Add-ons ficará triste em saber que vai."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
+#, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirme senha"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
+#, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete minha conta de usuário agora"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
+#, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
 "Você não pode deletar sua conta se estiver listado como um <a href=\"%1$s"
-"\">autor de Complementos</a>. Para deletar sua conta, por favor coloque "
+"\">autor de complementos</a>. Para deletar sua conta, por favor coloque "
 "outra pessoa no grupo de desenvolvimento e tire seu nome da lista de autores "
 "para seus Complementos. Somente depois disso, você poderá deletar sua conta "
 "aqui."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
+#, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Se você tem outras perguntas, por favor entre em contato com %1$s para obter "
 "assistência."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
+#, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "Você precisa marcar a caixa \"Eu Concordo...\" antes de deletar sua conta."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
+#, fuzzy
 msgid "user_del_error_password"
 msgstr "Por favor entre com sua senha corretamente para completar este passo."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
+#, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "Um erro desconhecido ocorreu na tentativa de deletar sua conta. Por favor "
 "entre em contato %1$s com o problema e nós vamos deletar para você. Pedimos "
 "desculpas pelo transtorno."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
+#, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirme Deletar de Conta"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
+#, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Deletar conta de usuário %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
+#, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Despedida!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
+#, fuzzy
 msgid "user_del_nologin"
 msgstr "Você não poderá acessar o Mozilla Add-ons novamente."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
+#, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Ao clicar \"deletar\" sua conta será <strong>permanentemente removida</"
 "strong>. Ou seja:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
+#, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Suas revisões ou notas não serão apagadas, mas elas não serão mais "
 "associadas com seu usuário."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
+#, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Se você tem um problema específico que podemos lhe ajudar, por favor não "
 "delete sua conta agora, mas entre em contato conosco em %1$s e faremos o "
 "melhor para ajudá-lo a resolver o problema."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
+#, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "Eu entendo que este passo não tem volta."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
+#, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Usuário deletado"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Foi enviado um e-mail para %1$s para confirmar seu novo endereço de e-mail. "
@@ -7079,7 +6731,8 @@ msgstr ""
 "e-mail. Até lá, você pode continuar acessando com seu endereço de e-mail "
 "atual."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
+#, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Apagar conta de usuário"
 
@@ -7105,7 +6758,9 @@ msgstr ""
 "-- Pessoal do %2$s Add-ons"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Você requisitou uma troca de endereço de e-mail no %2$s Add-ons.\n"
@@ -7145,109 +6800,91 @@ msgstr ""
 "Valeu,\n"
 "-- Pessoal do %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Resetar sua senha do %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Erro!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Por favor, confirme a troca de endereço de e-mail no %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Successo!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Seu endereço de e-mail foi alterado com sucesso. De agora em diante, por "
 "favor, use %1$s para fazer log-in no site"
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirme a senha"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Editar perfil de usuário para %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Endereço de email"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Nome"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Não mostrar endereço de email"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Endereço URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Sobrenome"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Login de usuário"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nova senha"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Apelido"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Senha antiga"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
+#, fuzzy
 msgid "user_form_otheractions"
 msgstr "Outras ações"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Senha"
 
@@ -7255,69 +6892,71 @@ msgstr "Senha"
 msgid "user_form_registration"
 msgstr "Novo registro de usuário"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Lembrar de mim neste computador"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Mostrar sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Salvar"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Login"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registrar"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
-msgstr "%s Complementos - usuário desde"
+msgstr "%s Add-ons - usuário desde"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Criar uma nova conta de usuário"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
+#, fuzzy
 msgid "user_notifications_item_compat"
-msgstr "Compatibilidade do Complemento (fortemente recomendado)"
+msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
+#, fuzzy
 msgid "user_notifications_item_events"
-msgstr "Concursos e eventos"
+msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
+#, fuzzy
 msgid "user_notifications_none_available"
-msgstr ""
-"No momento não exitem notificações disponíveis para que você precise "
-"configurar."
+msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
+#, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
-"De tempos em tempos, Mozilla poderá lhe enviar emails sobre os lançamentos "
-"futuros e eventos relacionados com Complementos. Por favor selecione os "
-"tópicos que você tem interesse abaixo:"
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
+#, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
-"Mozilla reserva o direito de entrar em contato com você individualmente com "
-"possíveis questões sobre os Complementos armazenados."
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Existem erros nas mudanças que você fez. Por favor, corrigir e enviar "
 "novamente."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Perfil atualizado."
 
@@ -7330,15 +6969,15 @@ msgstr "Resetar senha para %s"
 msgid "user_pwreset_header"
 msgstr "Resetar senha"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Esqueceu sua senha?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "O endereço para resetar a senha foi enviado para seu email."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Senha resetada com sucesso."
 
@@ -7350,10 +6989,10 @@ msgstr "Enviar mudança de senha"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Enviar endereço para resetar senha"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
-msgstr "%s Complementos"
+msgstr "%s Add-ons"
 
 #. %1 is the user's email address, %2 is the current app
 #: views/users/activatefirst.thtml:49
@@ -7364,7 +7003,7 @@ msgstr ""
 "deverá clicar no endereço antes de acessar o %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7376,24 +7015,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "envie novamente o email de confirmação"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Parabéns! Sua conta foi criada com sucesso."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registro no AMO <strong>não é obrigatório</strong> se você simplesmente "
-"quer baixar e instalar Complementos públicos.</p><p>Você só precisa se "
-"registrar caso:</p><ul><li>Você quiser enviar revisões para Complementos</"
-"li><li>Você é um desenvolvedor de Complementos e desejar enviar seus "
-"Complementos para serem mantidos no AMO</li></ul><p>Após o registro com "
-"sucesso, você receberá um email de confirmação para o endereço que você "
-"cadastrou. Por favor siga as instruções enviadas para confirmar sua conta.</"
-"p><p>Se você deseja, você poderá ler nossas <a href='%1$s' title='Notas de "
-"conteúdo legal Notices'>Notas de Conteúdo Legal</a> e <a href='%2$s' "
-"title='Política de Privacidade'>Política de Privacidade</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7404,29 +7029,23 @@ msgstr ""
 "podemos %1$s utilizando o email acima."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Obrigado por se registrar e bem-vindo ao %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Bem-vindo ao addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
+#, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "O primeiro nome, último nome, ou apelido deve ser adicionado."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
 msgid "user_tab_notifications"
 msgstr "Notificações"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
+#, fuzzy
 msgid "user_tab_profile"
 msgstr "Profile do Usuário"
 
@@ -7434,65 +7053,52 @@ msgstr "Profile do Usuário"
 msgid "user_verified_okay"
 msgstr "Verificado com sucesso!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
+#, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Apagar conta de usuário"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Editando conta de usuário"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Complementos de %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nome"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Perfil do usuário"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Endereço de email"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Página inicial"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Apelido"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Informação de usuário para %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
+#, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Revisões por %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Login do usuário"
 
@@ -7502,7 +7108,7 @@ msgstr "Login do usuário"
 #, php-format
 msgid "users_login_sandbox_display_warning"
 msgstr ""
-"O Complemento que você está procurando encontra-se na sandbox. Se você já "
+"O complemento que você está procurando encontra-se na sandbox. Se você já "
 "tem uma conta no Mozilla Add-ons, faça login, ou <a href=\"%1$s\">leia mais "
 "sobre a sandbox.</a>"
 
@@ -7524,693 +7130,5 @@ msgstr "Resetar senha de usuário"
 msgid "users_register_pagetitle"
 msgstr "Registro de novo usuário"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Próximo Complemento"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Complemento Anterior"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "A versão mais recente compatível com"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Histórico completo de versões"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Mais novos:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Mais populares:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Nós recomendamos:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Atualizados recentemente:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Ver todos"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Ver todos os Complementos recomendados"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Melhor avaliados primeiro"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Atualizados mais recentemente primeiro"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Mais populares primeiro"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Esta versão de seu Complemento não se diz compatível com o Firefox %1$s. "
-#~ "Mozilla espera que a próxima versão do Firefox seja lançada em breve, "
-#~ "então por favor teste seu Complemento na nova versão a atualize as "
-#~ "informações de compatibilidade. Você pode encontrar mais informações "
-#~ "sobre isso <a href=\"%2$s\">aqui</a>. Isto é apenas um lembrete e você "
-#~ "pode continuar a enviar esta versão para o Add-ons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Complemento desativado com sucesso"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Editar Complemento"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Complemento ativado com sucesso"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Descrição do Complemento"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Página do Complemento"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nome do Complemento"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Política de privacidade"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Sumário do Complemento"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Email para suporte"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL para suporte"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Notas da versão"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Indicar Complemento"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Complemento indicado com sucesso!"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Várias revisões por usuários do Complemento (servem revisões externas)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visite a página %1$s para alterar a sua submissão, ou %2$s para retornar "
-#~ "ao painel de controle do desenvolvedor."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "clique aqui"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Editar Complemento"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Esta versão foi colocada na sandbox enquanto espera por revisão pelos "
-#~ "testadores da sandbox e por um editor de Complementos da Mozilla. Você "
-#~ "será notificado por email quando alguma ação for tomada."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Você pode ler mais sobre o sistema de revisões da sandbox clicando %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "aqui"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Esta versão foi colocada na sandbox para o uso de usuários experientes. "
-#~ "Para que ela seja exibida no site público, você precisa %s seu "
-#~ "Complemento para que seja submetida a um processo de revisão."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "indicar"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "O envio de seu Complemento foi finalizado com sucesso."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Devido ao fato de que seu Complemento é confiável, esta versão já foi "
-#~ "automaticamente aprovada para a área pública do site."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Enviar Complemento"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Complemento atualizado com sucesso"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Você pode %s para tentar aumentar o interesse em seu Complemento."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "escrever uma revisão"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Autor não encontrado [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Remover"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Você tem certeza de que quer cancelar sua submissão?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Próximo"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Mudar tipo do Complemento:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Os comentários dos desenvolvedores foram atualizados."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Adicionar visualização"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Autor"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Autores"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Nenhum"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categorias"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Categoria"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Descrição"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Desativado"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detalhes"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Comentários dos desenvolvedores"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Visualizações"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versões"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Página inicial"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Nenhum"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Sem rótulo"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Nenhuma visualização encontrada."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Atualizar"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Email para suporte"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "O desenvolvedor não forneceu um email para suporte."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL para suporte"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "O desenvolvedor não forneceu uma URL para suporte."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Confiável"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Nenhuma versão encontrada."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancelar e voltar"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Sim, desativar"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Tem certeza que deseja desativar este Complemento?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Desativar este Complemento irá ocultá-lo de buscas e listagens. Não será "
-#~ "possível fazer download dele pelo site e não serão enviados avisos nas "
-#~ "verificações de atualização dos clientes. O Complemento será deletado "
-#~ "efetivamente. No entanto você poderá voltar aqui e reativá-lo quando "
-#~ "desejar."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Desativar %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Sim, ativar"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Tem certeza que deseja ativar este Complemento?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Ao ativar este Complemento fará com quem ele apareça novamente nas buscas "
-#~ "e listagens. Usuários poderão fazer download dele tanto pelo site quanto "
-#~ "pelas verificações de atualização dos clientes."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Ativar %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Adicionar autor"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Endereço de email do autor: "
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Remover"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Nenhuma categoria disponível para o tipo deste Complemento."
-
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Transferência incompleta"
-
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "Arquivo não enviado"
-
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Ultrapassou o máximo do tamanho de upload"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Autores"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Adicionar ícone"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Alterar ícone"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permitir que usuários vejam os códigos-fonte online"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categorias"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Idioma padrão"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Apenas limpar o ícone existente"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Novo arquivo de ícone"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "ícone"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "Informação adicional breve (tal como nome de dialeto local)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Atualizar"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr "<a href=\"http://wiki.mozilla.org/L10n:pt-BR\">pt-BR</a>"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Os arquivos selecionados serão deletados."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Arquivos"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Aplicações alvo"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Sem arquivos."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notas para o revisor"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Atualizar"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Sumários podem conter no máximo 250 caracteres.\n"
-#~ "(Você digitou %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "O nome do seu Complemento já existe na base de dados. Assegure-se de que: "
-#~ "<br /><li>seus GUIDs conferem. As causas mais comuns deste erro são GUIDs "
-#~ "diferentes.</li><li>Você não possui entradas duplicadas na base de dados. "
-#~ "Se tiver, você deve atualizar ou deletar esta entrada e tentar novamente."
-#~ "</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr ""
-#~ "Por favor, descreva as mudanças realizadas na atualização deste "
-#~ "Complemento."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "As GUIDs não são as mesmas em todos os arquivos"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Uma versão idêntica (%s) já existe para este Complemento e plataforma."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Você precisa fornecer os detalhes necessários para indicação."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Você não pode indicar uma pré-distribuição de um Complemento."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Você só pode indicar Complementos que estejam na SandBox."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Ocorreu um erro enquanto tentávamos salvar seus dados."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Você não tem permissão para atualizar este Complemento."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Adicionar outro arquivo de plataforma"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Adicionar autor"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Remover"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "No próximo passo você poderá escolher categorias para seu novo "
-#~ "Complemento."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Não existem categorias disponíveis para este tipo de Complemento."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Por favor, insira uma descrição para seu Complemento."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Por favor, insira o nome do seu Complemento."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Por favor, selecione o tipo do Complemento que está enviando."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Por favor, insira um sumário do seu Complemento."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Arquivo do Complemento"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Arquivo 2 do Complemento"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Arquivo 3 do Complemento"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tipo do Complemento"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permitir que usuários vejam os códigos-fonte online"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Email do autor"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "autores"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categorias"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Idioma padrão"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Descrição"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Termo de aceitação do usuário (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Este Complemento requer um software externo"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Arquivos"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Página inicial"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Arquivo de ícone"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nome"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plataformas suportadas"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Esta é uma pré-distribuição"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Políticas de privacidade"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Este é um Complemento para um site específico"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Sumário"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Email para suporte"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL para suporte"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Aplicações alvo"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versão"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Notas da versão"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Nenhum"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notas para os revisores"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Por seu Complemento ser confiável, descreva para onde esta versão deve "
-#~ "seguir:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Público"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Acordo do desenvolvedor"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Passo 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Carregar um arquivo"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Passo 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detalhes do Complemento"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Passo 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Detalhes da versão"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Passo 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localização"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Passo 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Sucesso"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Meus Complementos"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Voltar para os detalhes do Complemento"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Tipo do Complemento detectado automaticamente: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "A localidade padrão deste Complemento (%1$s [%2$s]) é diferente da sua "
-#~ "localidade atual (%3$s [%4$s]). Os campos abaixo devem ser preenchidos em "
-#~ "%1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorreto?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Tem certeza de que deseja excluír este arquivo?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Pular a atualização das informações do Complemento"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Submissões de Complementos estão desabilitadas no momento. Por favor, "
-#~ "tente novamente mais tarde."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Eu aceito"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Não aceito"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Este Complemento foi desativado por um administrador."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Desabilitado"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Confiável"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Você não possui nenhum Complemento. Clique %s para enviar um."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "aqui"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Assegure-se de %s para seu tema."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "carregar uma visualização"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Editar versão"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versão atualizada com sucesso."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Novo"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Atualizado"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Idade do Complemento"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tipos de Complementos"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Idade"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplicações"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plataformas"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Tipos de submissão"
-
-#~ msgid "error_notice"
-#~ msgstr "Aviso"
-
-#~ msgid "forum_save"
-#~ msgstr "salvar"
-
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Complementos Experimentais"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Voltar para a página anterior"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Esta é a página %1$s de %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s Complemento encontrado"
-#~ msgstr[1] "%s Complementos encontrados"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS feed do resumo dos dados"
diff --git a/site/app/locale/pt_PT/LC_MESSAGES/messages.po b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
index 967585a..4776bd9 100644
--- a/site/app/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Carlos Simão <lloco73@gmail.com>\n"
+"Last-Translator: carlos simão <lloco73@gmail.com>\n"
 "Language-Team: pt-PT <portuguese european>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -13,38 +13,35 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancelar Instalação"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69
+#: views/elements/install.thtml:185
+#: views/elements/install.thtml:199
+#: views/elements/install.thtml:222
+#: views/elements/install.thtml:234
+#: views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72
+#: views/addons/plugins.thtml:84
 #: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#: views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Transferir Agora %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78
+#: views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Aceitar e Transferir"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81
+#: views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Aceitar e Instalar"
 
@@ -52,7 +49,6 @@ msgstr "Aceitar e Instalar"
 #: views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55
 #: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Público"
 
@@ -61,142 +57,142 @@ msgstr "Público"
 #: views/elements/header.thtml:80
 #: views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138
+#: views/elements/feature.thtml:111
+#: views/addons/display.thtml:127
+#: views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Actualizado %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versão %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129
+#: views/elements/feature.thtml:103
+#: views/addons/display.thtml:139
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "transferências"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "Transferências totais"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129
+#: views/elements/feature.thtml:103
+#: views/addons/display.thtml:138
+#: views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "Transferências semanais"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118
+#: views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s extra "
 msgstr[1] "%1$s extras"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "por página"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Ordenar por:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
+#: views/elements/addon_listitem.thtml:68
 #: views/elements/feature.thtml:89
+#: views/addons/display.thtml:51
+#: views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "em teste"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71
+#: views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomendado"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s não está disponível para %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
+#: views/addons/policy.thtml:108
 #: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/versions.thtml:113
+#: views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128
+#: views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Voltar a %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58
+#: views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Voltar aos comentários..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Classificação:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Comentário:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Submeter o seu comentário"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Adicionar um comentário a %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Título/Sumário:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81
+#: views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Apagar"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Responder"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Tem a certeza que deseja eliminar este comentário?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Não"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Sim"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Eliminar comentário"
 
@@ -205,7 +201,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Comentário eliminado com sucesso."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editar comentário para %s"
@@ -216,16 +212,16 @@ msgid "addon_review_flag_error_other_length"
 msgstr "Problema ao indicar comentário: Notas para indicações de comentários estão limitadas de 10 e 100 caracteres: a sua palavra tinha %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "Nota: Antes do seu comentário ser apresentado, será moderado por um editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "O Desenvolvedor responde para:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -242,169 +238,143 @@ msgid "addon_review_pagetitle"
 msgstr "Avaliações para %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Respondido por %1$s em %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Resposta do Desenvolvedor:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "O seu comentário foi guardado com sucesso. Obrigado!"
 
-#: views/addons/display.thtml:354
+#: views/addons/display.thtml:309
+#: views/addons/display.thtml:312
 #: views/reviews/display.thtml:72
+#: views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "por %1$s em %2$"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77
+#: views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "por %1$s em %2$s (Classificação de %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139
+#: views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Extra seguinte"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129
+#: views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Extra anterior"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Ligação permanebte para esta versão"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "A versão mais recente compatível com o %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Ir"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Ver perfil do autor"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Navegar em todos os temas :: Extras do %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Explorar %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Navegar nos temas do %1$s :: Extras do %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "O que é isto?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Adicionar comentário"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Detalhes avançados"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorias"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Adicionar a uma colecção:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nova colecção..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Seleccione uma colecção..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publicar"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s foi adicionado à colecção de %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "O que é isto?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "e mais %1$s colecção"
-msgstr[1] "e mais %1$s colecções"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "comentário detalhado"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392
+#: views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Não gostei"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editar o seu comentário"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Este extra tem uma política de privacidade."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391
+#: views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Odiei"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Colecções relacionadas"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentários do desenvolvedor"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232
+#: views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Página Inicial"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licença do código fonte"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Comentários"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249
+#: views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suporte"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393
+#: views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gostei"
 
@@ -412,23 +382,20 @@ msgstr "Gostei"
 msgid "addons_display_long_description"
 msgstr "descrição Longa"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395
+#: views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Adorei"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mais Imagens"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Este extra ainda não está em nenhuma colecção."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Outros extras de %1$s"
@@ -438,83 +405,92 @@ msgstr[1] "Outros extras destes autores"
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
 #: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "O suporte para este extra e fornecido pelo desenvolvedor em %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "O Suporte para esta extensão é fornecido pelo desenvolvedor em %s ou enviandouma mensagem de correio electrónico para %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "O suporte para este extra e fornecido pelo desenvolvedor em %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Avalie"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394
+#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Gostei mesmo"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411
+#: views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr "Por favor não coloque relatos de erro nos comentários. Nós não disponibilizamos o seu endereço de correio ao desenvolvedor do extra e ele poderá ter que o contactar para resolver o problema."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Guia sobre comentários</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420
+#: views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr "Veja a <a href=\"%1$s\">secção de suporte</a> para saber onde obter ajuda sobre este extra."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Guardar"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Ver todos os Extras de %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Ver todas as avaliações (%1$s)"
 
 #: views/addons/display.thtml:219
+#: views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Ver todas a Versões"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Histórico Completo da Versão"
+
+#: views/addons/display.thtml:359
+#: views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Ver a fonte"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Ver estatísticas"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "O que acha?"
 
@@ -522,352 +498,248 @@ msgstr "O que acha?"
 msgid "addons_display_workswith"
 msgstr "Funciona com:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Adicionado recentemente"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Recomendado"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Subscrever"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Navegar nos extras"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Actualizado"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
+#: views/elements/addon_listitem.thtml:122
 #: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/addons/policy.thtml:62
+#: views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "por"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Colecções populares"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Colecções"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> extra"
-msgstr[1] "<strong>%1$s</strong>extras"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Ver todas as colecções"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "As colecções são uma maneira de ordenar, juntar e indexar extras.  Subsceva colecções criadas por outros utilizadores ou crie a sua."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscritor"
-msgstr[1] "<strong>%1$s</strong> subscritores"
-
 #: views/addons/searchengines.thtml:54
+#: views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
 #: views/addons/themes_landing.thtml:49
+#: views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Nós recomendamos"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211
+#: controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356
+#: controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630
+#: controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr "Os extras melhoram o %1$s, deixando-o personalizar a sua experiência de navegação.  Dê uma vista de olhos e faça o seu %1$s."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Gostou? Encontre mais extras em %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Mais de 5000 extras grátis</strong> que lhe permitem personalizar o Firefox para ir de encontro às suas necessidades."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "O que são extras?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Fácil de instalar</strong>, seja notificado quando forem disponibilizadas actualizações."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introdução"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Barras de ferramentas, temas e fornecedores de conteúdos que <strong>o ajudam a execuar as tarefas mais comuns.</strong>"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NOVO!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Mais Recentes:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Outras Aplicações"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
 #: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67
 #: controllers/users_controller.php:90
 #: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:319
+#: controllers/users_controller.php:403
+#: controllers/users_controller.php:683
+#: controllers/users_controller.php:698
 #: controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
+#: controllers/search_controller.php:178
 #: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
+#: controllers/addons_controller.php:256
+#: controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489
+#: controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776
+#: controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858
+#: controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61
+#: controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65
 #: controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89
 #: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Extras do %1$s "
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>extra transferido</span>"
-msgstr[1] "<strong>%1$s</strong> <span>extras transferidos</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Mais Populares:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>extra em uso</span>"
-msgstr[1] "<strong>%1$s</strong> <span>extras em uso</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Nós Recomendamos:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Actualizados recentemente:"
+
+#: views/addons/home.thtml:189
+#: views/addons/home.thtml:199
+#: views/addons/home.thtml:209
+#: views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Ver Todos"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Ver todos os extras recentes"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Ver todos os extras populares"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Ver todos os extras recomendados"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Ver todos os extras actualizados recentemente"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr "<ol><li>Clique na ligação abaixo para guardar o ficheiro.</li><li>No Mozilla Sunbird, abrir os extras a partir do menu ferramentas.</li><li>Clique no botão instalar e localize/seleccione o ficheiro que transferiu e clique \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Como instalar no Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr "<ol><li>Clique com o botão direito do rato na ligação abaixo e escolha \"Guardar ligação como...\" para transferir e guardar o ficheiro no seu disco rígido.</li><li>No Mozilla Thunderbird, abra Extras a partir do menu Ferramentas.</li><li>Clique no botão Instalar, localize/seleccione o ficheiro que transferiu e depois clique em \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Como instalar no Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "mostrar extras em teste"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Ir"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
+#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82
+#: views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106
 #: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Por"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "para Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113
+#: views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "para Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109
+#: views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "para Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr "Esta lista apresenta apenas alguns dos mais comuns e populares plugins. Para mais informação sobre os plugins disponíveis para os Navegadores baseados no Mozilla, visite %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Procura um plugin que não está aqui?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr "Os Plugins ajudam o seu navegador a efectuar funções específicas como, por exemplo, ver formatos de gráficos especiais ou tocar ficheiros multimédia. Os Plugins são ligeiramente diferentes das extensões, que modificam ou adicionam funcionalidades existentes."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugins Comuns para o %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720
+#: controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
+#: views/addons/plugins.thtml:62
+#: views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86
 #: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:116
+#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Documentação de Suporte: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "O %s necessita que aceite o seguinte Acordo de Licença para o Utilizador Final antes da instalação poder continuar:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Pré-visualizações para %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Adicionado recentemente"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50
+#: controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr "Com tantos extras disponíveis, existe algo para toda a gente. Para começar, aqui está uma lista dos mais populares. Aprecie-os!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Extras Recomendados"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Extras Recomendados"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147
+#: views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Recursos adicionais"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153
+#: views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
-msgstr "Centro de desenvolvimento da Mozilla"
+msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr "Desculpe, precisa de um navegador baseado no Mozilla (como o Firefox) para instalar um plugin de pesquisa."
 
@@ -877,40 +749,48 @@ msgstr "O JavaScript é necessário para instalar plugins, mas parece que o tem
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150
+#: views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Saiba como %1$s em %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152
+#: views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151
+#: views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "como fazer o seu"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148
+#: views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Navegar muitos mais motores de pesquisa em %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149
+#: views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857
+#: controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motores de Pesquisa"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154
+#: views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "Um obrigado especial ao Mycroft Projectpelo seu trabalho nos Motores de Pesquisa do Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Partilhar isto"
 
@@ -919,6 +799,7 @@ msgid "addons_share_label_delicious"
 msgstr "Adicionar ao Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
 msgstr "Digg this!"
 
@@ -949,19 +830,19 @@ msgstr "Versão incompleta"
 msgid "addons_status_nominated"
 msgstr "No Sandbox; Nomeação pública"
 
-#: views/pages/js_constants.js.thtml:80
+#: views/pages/js_constants.js.thtml:71
 #: controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "No Sandbox; A aguardar comentário"
 
-#: views/pages/js_constants.js.thtml:78
+#: views/pages/js_constants.js.thtml:69
 #: controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Público"
 
-#: views/pages/js_constants.js.thtml:79
+#: views/pages/js_constants.js.thtml:70
 #: controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
@@ -971,34 +852,26 @@ msgstr "No Sandbox"
 msgid "addons_status_unknown"
 msgstr "Desconhecido"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
+#: views/elements/fyf_promotion.thtml:50
 #: views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Saiba mais sobre este extra"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Top de trasnferências"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Top de avaliações"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Tenha Cuidado Com Versões Antigas"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr "Estas versões são apresentadas apenas como referência ou para testes. Deverá Sempre utilizar a última versão do extra."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50
+#: controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Histórico da Versão com Registo de alterações"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Histórico da Versão"
@@ -1035,443 +908,148 @@ msgstr "Admin do Grupo"
 msgid "admin_group_saved"
 msgstr "O Grupo foi guardado"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avançado"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Em todas as datas"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95
+#: views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Qualquer"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "qualquer"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplicação"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Correspondência da palavra chave"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Última actualização"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nome"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Mais recentes"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Últimos 3 meses"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Últimos 6 meses"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Ontem"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Mês passado"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Semana passada"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Ano passado"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Por Página"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platforma"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularidade"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Avaliação"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Ordenar por"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "até"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Mudar para modo de pesquisa avançada"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tipo"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "versão"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Seguinte"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Anterior"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorar a verificação da versão"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Este extra é para versões antigas do Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr "Pode <a href=\"%1$s\">experimentar uma versão antiga</a> ou <a href=\"#\" onclick=\"%2$s\">ignorar esta verificação</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Uma  <a href=\"%1$s\">versão antiga</a> poderá funcionar"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr "Esta versão necessita do ainida não lançado <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">Actualize o Firefox</a> para utilizar este extra"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s alterou o estado de %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s committed acção administrativa desconhecida %2$s para o ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removeu a função %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s criou a aplicação %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s editou a aplicação %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s criou a versão %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s eliminou a versão %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s alterou o config '%2$s' de'%3$s' para '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s committed acção de editor desconhecida %2$s para o ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removeu o extra %2$s da lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s adicionou o extra %2$s à lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s alterou uma funcionalidade para o idioma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s alterou idiomas para o extra %2$s na lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculou a hash para o ficheiro %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s adicionou %2$s ao grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s associou-se a  %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s criou o grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s eliminou o grupo %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s editou o grupo %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s removeu %2$s do grupo %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s committed acção desconhecida %2$s para %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s tentou modificar o grupo fechado %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s tentou modificartraduções em %2$s sem permissão"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s criou a plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s eliminou a plataforma %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s editou a plataforma %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s falhou a re-autenticação para aceder a %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s criou a resposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s eliminou a resposta %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s editou a resposta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s aprovou o comentário %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s eliminou o comentário %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s committed acção de segurança desconhecido %2$s para o ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s criou a etiqueta %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s eliminou a categoria %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s editou a categoria %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s actualizou a aplicação de transferências para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s actualizou as traduções do tópico do blog para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s actualizou as traduções da plataforma para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s actualizou a categoria de traduções para %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s editou a informação do utilizador %2$s"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Extras por nome"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Extras mais recentes"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Extras populares"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Extras por avaliação"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Extras actualizados recentemente"
 
@@ -1481,760 +1059,104 @@ msgid "categories_current_title"
 msgstr "Categoria Actual"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorias"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Escolha uma categoria"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Ver todos %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "A descrição tem de ter menos de %1$s caracteres."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s colecção"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Ver todos os extras recomendados"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Erro ao eliminar extra!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Avaliação mais Alta Primeiro"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Erro ao guardar extra!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Os mais Recentemente Actualizados Primeiro"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Erro ao guardar comentário!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Os mais Populares Primeiro"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "O nome tem de ter menos de %1$s caracteres."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135
+#: views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Ver todos %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Coleção não encontrada!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Se já souber que extras deseja adicionar à sua colecção, escreva os nomes em baixo. Se desejar fazê-lo mais tarde clique  %1$s agora."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Escolha os seus primeiros extras"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Criar uma colecção"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Extras seleccionados"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "É fácil criar a sua própria colecção de extras preenchendo os campos abaixo."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Criar colecção"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Colecções"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Sabaer mais"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Adicionar aos favoritos"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Remover do favoritos"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr "<p>You can view your new collection below. If you'd like to set a collection nickname, upload an icon, or change additional settings, please visit the <a href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "A sua colecção está agora pronta!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Sobre esta colecção"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s extra nesta colecção"
-msgstr[1] "%1$s extras nesta colecção"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Criado por:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Actualizado:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "A adicionar aos favoritoss&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "A remover facorito&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Inicie sesão</a> para adicionar esta colecção aos seus favoritos."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Gerir colecção"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Adicionado em"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Nome"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularidade"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s transferência esta semana"
-msgstr[1] "%1$s transferências esta semana"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Os extras seleccionados serão eliminados ao guardar"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Para publicar novos extras nesta colecção, comece por escrever os nomes deles abaixo."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Para publicar novos extras nesta colecção, escreva uma lista dos IDs dos extras separada por vírgulas."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Pode publicar um extra a partir da págin de listagem normal."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Adicionado %1$s por %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Adicionar comentário do editor"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Eliminar comentário do editor"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Editar comentário do editor"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Nota: O comentário irá aparecer tal como foi escrito pelo editor e com a data original de publicação"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Guardar comentário"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remover"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Adicionar à colecção"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Verificar disponibilidade"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Sim, quero eliminar esta colecção."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Seleccione a caixa, e depois clique em \"%1$s\" para eliminar esta colecção."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Depois de clicar \"%1$s\" em baixo, a sua colecção será eliminada. Se não quiser eliminar a sua colecção, desseleccione a caixa de confirmação no separador \"%2$s\" e continue a editar a sua colecção. Se sair sem guardar a sua colecção não será eliminada."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "A sua colecção está prestes a ser eliminada!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Tem de fornecer uma descrição para a sua colecção."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Hove um erro ao carregar o seu ícone."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Tem de dar um nome à sua colecção."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Se escolher uma alcunha , tem de ser única."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Nome do extra:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Aplicação associada"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Seleccione a aplicação que a sua colecção suporta."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Tipo de colecção"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Eliminar colecção"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Eliminar a sua colecção será apagada definitivamente."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Descrição da colecção"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Descreva sucintamente a sua colecção e o tipo de extras que contém"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "�cone"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Pode carregar um ícone JPG, GIF ou PNG que será redimensionado para 32x32 pixéis."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Quem pode ver a sua colecção?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "por pré-definição, as colecções aparecem na directoria de colecções pública e são descobertas por qualquer um. se quer restringir a sua colecção para poder apenas ser vista por pessoas a que deu uma ligação especial escolha a opção abaixo."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Apenas pessoas que convido podem ver a minha colecção"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Todos podem ver a minha colecção na directoria"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Quem pode gerir a minha colecção?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Estes utilizadores podem publicar extras na sua colecção, gerir todos os extras e definições e dar permissão a outros."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "O pacote do viajante"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Dê à sua colecção um nome que a descreva, tipo \"Extras de viagens favoritos do David\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Alcunha da colecção"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Em opção, dê à sua colecção uma alcunha para acesso rápido:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Quem é que pode publicar extras na sua colecção?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Os utilizadores podem publicar extras á sua colecção e remover extras que eles publicam:"
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Escreva o endereço de correio electrónico de uma conta dos extras do Firefox:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "As contas seleccionadas serão removidas ao guardar"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Escreva uma lista de correio electrónico separada por vírgulas de contas dos extras do Firefox"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Apenas eu"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Eu e estes utilizadores:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Adicionar"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Gerir %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Gerir conteúdo da colecção"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Extras actuais:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Definições avançadas"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Gerir permissões da colecção"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Cancelar"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Eliminar ícone"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Substituir ícone"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "O ícone será removido quando \"%1$s\" for clicado abaixo"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Alcunha disponível"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "A sua alcunha tinha caracteres inválidos e foi corrigida. Tente novamente."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Alcunha já utilizada"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "A sua colecção foi acedida neste local:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "A sua colecção foi guardada com sucesso!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Actualizar colecção"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Eliminar colecção"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Extras"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avançado"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Nome &amp; Detalhes"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissões"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Os extras podem vigiar os seus filhos e o seu calendário."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Organizador Familiar"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Check out do coleccionador de extras"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Criar uma colecção"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Ir"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>You don't have any favorite collections yet.</strong></p> <p>Collections you mark as favorites can be quickly accessed from this page, and will appear in the <a href='%1$s'>Add-on Collector</a> if you've installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Ainda não criou nenhuma colecção. As coecções são de fácil criação e são preenchidas com os seus extras favoritos.  <a href='%1$s'>Experimente</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Colecções"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Coleccionador de extras"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "criado por %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "O que são colecções?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Ordenar por"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Os meus favoritos"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "As minhas colecções"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Mais populares de sempre"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Mais populares este mês"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Mais recentes"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Mais populares esta semana"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Existe uma nova maneira de encontrar e gerir os extras favoritoss. Comente, partilhe e sincronize colecções tudo isto a partir do seu navegador."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "As colecções são grupos de extras relacionados que são agregados para uma partilha fácil."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Adicionado %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Os extras podem fazer uma melhor pesquisa quando ligados."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Balcão de referência"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Os extras podem ferir a sua rede social."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Circuito social"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Fechar"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Ocorreu um erro ao adicionar esta colecção aos favoritos. Esta colecção já é um favorito?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Não me mostrar esta mensagem de novo."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s foi adicionado às suas colecções favoritas."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Agora pode pesquisar rapidamente esta colecção a partir do separador <a href=\"%1$s\">%2$s</a> na directoria. Para aceder mais comodamente às suas colecções favoritas, experimente a nossa extensão <a href=\"%3$s\">Add-on Collector</a> para o Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "A colecção foi eliminada."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Os extras podem torná-lo num agente de viagens."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "O pacote do viajante"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Editor auto"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Ocorreu um erro ao tentar remover a sua colecção favorita. Esta colecção não era favorita?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s foi removido das suas colecções favoritas."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Os extras tornam mais fácil a construção do sítio web perfeito."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Caixa de ferramenta do desenvolvedor web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "O que são colecções?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Ler a FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Existe uma nova maneira de encontrar e gerir os extras favoritoss. Comente, partilhe e sincronize colecções tudo isto a partir do seu navegador."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Página inicial do coleccionador de extras"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Transferir o coleccionador de extras:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo do coleccionador de extras"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centro de compatibilidade dos extras"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr "Esteja preparado para o lançamento do %1$s com as ferramentas e informação disponível para a comunidade dos extras do %2$s abaixo."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "A carregar dados..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Voltar ao início"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104
+#: views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Relatório de compatibilidade do extra"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informação para desenvolvedores de extras"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajustar a maxVersion sem carregar"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Verificar estado dos meus extras"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr "Se tiver extras hospedados nos extras da Mozilla, <a href=\"%1$s\">inície sessão</a> para analisar o estado dos seus extras para %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo do Centro de Desenvolvimento Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Não tem extras hospedados nos extras da Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Resultados da verificação do estado dos extras"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "A obter dados sobre o estado dos extras hospedados..."
 
@@ -2242,147 +1164,144 @@ msgstr "A obter dados sobre o estado dos extras hospedados..."
 #. %2$s is an application name
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s utilizadores (%3$s&#37; no total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr "Os extras abaixo têm 95% de uso conhecido pela Mozilla e são ordenados pelo seu tamanho de utilização."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Ver relatório detalhado"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr " %1$s extras que tenham 95&#37; de uso do extra conhecido pela Mozilla, <b>%2$s&#37;</b> são considerados compatíveis com as últimas versões do %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versões Alpha "
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Extras compatíveis com uma versão alpha do %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versões Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Extras compatíveis com uma versão beta ou release candidate do %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Última versão"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Extras actualizados com a última versão do %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Outras versões"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Extras não compatíveis com nenhuma versão do %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Relatório de compatibilidade do extra"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148
+#: views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informação para os utilizadores dos extras"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Ver relatório de compatibilidade"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Para informação sobre como contribuir, veja a nossa %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "página wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr "A Mozilla gostaria de agradecer às seguintes pessoas pela sua contribuição no projecto addons.mozilla.org ao longo dos anos:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
-msgstr "Desenvolvedores"
+msgstr "Developers"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editores"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Tradutores"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Outros Colaboradores"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Antigos Desenvolvedores"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software e Imagens"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr "Alguns ícones utilizados são da <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, licenciados sobre <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr "Algumas páginas usam elementos do <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, liceciado sobre a <a href=\"http://simile.mit.edu/license.html\">Licença BSD</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
+#: views/elements/addon_listitem.thtml:140
+#: views/elements/feature.thtml:112
+#: views/users/info.thtml:70
 #: views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68
 #: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #: views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5
 #: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128
+#: views/addons/display.thtml:310
+#: views/addons/display.thtml:314
+#: views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77
+#: views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77
+#: views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49
+#: controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%B %e, %Y"
 
@@ -2418,22 +1337,22 @@ msgstr "Painel de Estatísticas"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "O ficheiro %1$s tem uma extensão inválida (%2$s). Extensões permitidas: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "O ficheiro %s não pode ser guardado na base de dados. Tente novamente."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "A pré-visualização %1$s foi substituída pelo ficheiro %2$s com sucesso."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr "O ficheiro %s foi carregado com sucesso. Abaixo pode adicionar uma captura."
 
@@ -2441,6 +1360,13 @@ msgstr "O ficheiro %s foi carregado com sucesso. Abaixo pode adicionar uma captu
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detectar)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr "Esta versão do seu extra não tem compatibilidade com o Firefox %1$s. A Mozilla está a contar com o lançamento da próxima versão do Firefox para breve, por isso teste o seu extra na nova versão e actualize a informação sobre a compatibilidade. Pode saber mais <a href=\"%2$s\">aqui</a>. Isto é apenas uma informação e pode continuar a submeter esta versão em addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Abre numa nova janela"
@@ -2451,7 +1377,7 @@ msgstr "Submeter Extra"
 
 #: views/elements/developers/additem.thtml:53
 msgid "devcp_additem_step0_newlink"
-msgstr "Acordo do Desenvolvedor"
+msgstr "Acordo do Developer"
 
 #: views/elements/developers/additem.thtml:46
 msgid "devcp_additem_step1_link"
@@ -2477,70 +1403,137 @@ msgstr "Passo 5: Sucesso"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajuda da Submissão"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Extra desactivado com sucesso"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Editar Extra"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Extra activado com sucesso"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descrição do Extra"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "ALUF"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Página inicial do Extra"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nome do Extra"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Captura da Pré-visualização"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Política de Privacidade"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Sumário do Extra"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Correio Electrónico de Suporte"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL de Suporte"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Notas da Versão"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nomear Extra"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Extra nomeado com sucesso!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Tornar activo"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr "Tornar o seu extra activo para ser mostrado nas listas públicas e activar o serviço de verificação de actualizações."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Completar extra"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Completar o seu extra e movê-lo para o Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Tornar inactivo"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr "Tornar o seu extra inactivo para ser ocultado das listas públicas e desactivar o serviço de verificação de actualizações."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Mover para oSandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Mover o seu extra de novo para o Sandbox. Isto é reversível."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nomear par público"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nomear o seu extra para se tornar público"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Tornar público"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Tornar extra público de novo."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr "O seu extra está <span class=\"inactive-0\">Activo</span>. Isto significa que o seu extra está a ser apresentado em todas as listagens disponíveis para o estado acima."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Preencha os critérios acima antes de terminar o seu extra e movê-lo para o <span class=\"status-1\">Sandbox</span>."
+msgstr "Please fulfill the criteria above before you can complete your add-on and move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Agora já pode terminar o seu extra e mov~e-lo para o <span class=\"status-1\">Sandbox</span>clicando no botão abaixo."
+msgstr "You may now complete your add-on and move it to the <span class=\"status-1\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2554,7 +1547,7 @@ msgstr "Necessária descrição do extra "
 msgid "devcp_addon_status_criteria_name"
 msgstr "Necessário nome do extra"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "O extra não está marcado como pré-lançamento."
 
@@ -2562,6 +1555,10 @@ msgstr "O extra não está marcado como pré-lançamento."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "É necessário pelo menos uma imagem de pré-visualização para extensões e temas."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Vários comentários de utilizadores do extra (poderão ser comentários externos)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Necessário sumário do extra"
@@ -2571,12 +1568,12 @@ msgstr "Necessário sumário do extra"
 msgid "devcp_addon_status_header"
 msgstr "Estado do extra: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Acções disponíveis"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Estado actual: <span class=\"inactive-0\">Activo</span>"
 
@@ -2584,7 +1581,7 @@ msgstr "Estado actual: <span class=\"inactive-0\">Activo</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Critério de finalização do extra"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Estado actual: <span class=\"inactive-1\">Inactivo</span>"
 
@@ -2592,21 +1589,24 @@ msgstr "Estado actual: <span class=\"inactive-1\">Inactivo</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Critério de nomeação pública"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Estado de confiança: <span class=\"status-4\">De confiança</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "O seu extra está <span class=\"inactive-1\">Inactivo</span>. Isto significa que o seu extra não está a ser mostrado em nenhuma listagem, apesar do estado indicado. As actualizações <b>não</b> estão a ser efectuadas através do serviço de verificação de actualizações."
+msgstr "Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your add-on will not show up in any listing, regardless of its status above. Updates are <b>not</b> being provided to your add-on through the update check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Preencha os critérios acima para nomear o seu extra e torná-lo <span class=\"status-4\">Público</span>."
+msgstr "Please fulfill the criteria above before nominating your add-on to become <span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Agora pode nomear o seu extra para <span class=\"status-4\">Público</span> clicando no botão abaixo."
+msgstr "You may now nominate your add-on for <span class=\"status-4\">Public</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2618,31 +1618,37 @@ msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "O seu extra foi <span class=\"status-5\">Disactivado</span> por um admministrador e não pode ser usado. Se tiver questões envie uma mensagem de correio paral %s."
+msgstr "Your add-on was <span class=\"status-5\">Disabled</span> by an administrator and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "O seu extra está <span class=\"status-0\">Incompleto</span>. Isto significa que o seu extra não está a ser mostrado em nenhum local do sítio ou através do serviço de actulizações. Pode vir para esta página para terminar o seu extra após ele corrsponder aos critérios mostrados abaixo para finalização e transferência para o  <span class=\"status-1\">Sandbox</span>."
+msgstr "Your add-on is currently <span class=\"status-0\">Incomplete</span>. This means your add-on is not showing up on any portion of the site or update check service. You may come to this page to complete your add-on after it meets the criteria below for completion and transfer to the <span class=\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "O seu extra está nomeado para se tornar <span class=\"status-4\">Público</span> e aguarda uma revisão de um editor. Existem actualmente %s outros extras em espera."
+msgstr "Your add-on is currently nominated to become <span class=\"status-4\">Public</span> and is awaiting editor review. There are currently %s other add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "O seu extra está em fila de espera. isto não deveria ter acontecido. Envie uma mensagem de correio para %s com o Id do extra e o seu estado de erro."
+msgstr "Your add-on is pending. This shouldn't have happened. Please e-mail %s with your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "O seu extra é <span class=\"status-4\">Público</span>, o que significa que será apresentado em todas as listagens e pesquisas e pode ser transferido sem restrições.  As actualizações são fornecidas através do serviço de actualizações."
+msgstr "Your add-on is <span class=\"status-4\">Public</span>, which means it will show up in all listings and searches and can be downloaded without restriction. Updates are being provided to your add-on through the update check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "O seu extra está no <span class=\"status-1\">Sandbox</span>, o que significa que está nas listagens e nas pesquisas mas os utilizadores têm de iniciar sessão para o transferir. As actualizações <b>não</b> não são fornecidas ao seu extra através do serviço de verificação de actualizações."
+msgstr "Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means it will show up in listings and searches, but users must log in to download it. Updates are <b>not</b> being provided to your add-on through the update check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2651,9 +1657,115 @@ msgstr "O seu extra está no <span class=\"status-1\">Sandbox</span>, o que sign
 msgid "devcp_addon_status_title"
 msgstr "Estado  do %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "O seu extra é de <span class=\"status-4\">Confiança</span>. Isto significa que pode submeter actualizações do seu extra sem revisão de um editor."
+msgstr "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr "Visite a página do  %1$s para fazer alterações à sua submissão, ou %2$s para voltar ao Painel de Controlo do Desenvolvedor."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "clique aqui"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Editar extra"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr "Esta versão foi colocada no sandbox enquanto aguarda avaliações dos sandbox testers e do editor de extras da Mozilla. Será notificado por correio "
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Pode ler mais sobre o Sistema de comentários do Sandbox em %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "aqui"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr "Esta versão foi colocada no sandbox para ser utilizada por utilizadores experientes. De maneira a poder ser apresentado no sítio público, tem de %s o seu extra e iniciar um processo de avaliação."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nomear"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "A submissão do seu extra foi efectuada com sucesso."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "Como o seu extra é de cofiança, esta versão foi automaticamente aprovada para a área pública."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submeter Extra"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Extra actualizado com sucesso"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Pode desejar que %s para aumentar o interesse no seu extra."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "carregar um comentário"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nenhum autor encontrado [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Eliminar"
+
+#: views/developers/add_step4.thtml:61
+#: views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129
+#: views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancelar"
+
+#: views/developers/add_step4.thtml:61
+#: views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129
+#: views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Tem a certeza que deseja cancelar a sua submissão?"
+
+#: views/developers/add_step4.thtml:60
+#: views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128
+#: views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Seguinte"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Mudar o tipo de extra:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Comentário actualizado do Developer."
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
@@ -2672,8 +1784,9 @@ msgstr "Alterar estado"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "O seu extra foi desactivado por um administrador e não pode ser usado. Se tiver questões envie uma mensagem de correio paral %s."
+msgstr "Your add-on was disabled by an administrator and cannot be used.  If you have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2698,8 +1811,9 @@ msgid "devcp_dashboard_last_edited"
 msgstr "Última edição em %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "De momento não tem nenhum extra alojado nos extras da Mozilla. Para saber como funciona o processo e submeter o seu primeiro extra, clique em Começar."
+msgstr "You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
 msgid "devcp_dashboard_start"
@@ -2714,33 +1828,170 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Carregar uma nova versão"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr "A pré-visualização %s não pode ser eliminada da base de dados. Tente novamente."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "A pré-visualização %s foi eliminada com sucesso."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "Não tem previlégios para eliminar versões e ficheiros."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s ficheiro"
 msgstr[1] "%1$s %2$s ficheiros"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Adicionar pré-visualização"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autores"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Nenhum"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorias"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categoria"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descrição"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Desactivado"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detalhes"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Comentários do Developer"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Pré-visualizações"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versões"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Página Inicial"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Nenhuma"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Nenhuma captura"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nenhuma pré-visualização encontrada."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Actualizar"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Correio Electrónico de Suporte"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Nenhum correio electrónico de suporte fornecido pelo desenvolvedor"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL de Suporte"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Nenhum url de suporte fornecido pelo desenvolvedor."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "De Confiança"
+
 #. %s is a version number.  Example:  3.0
+#: views/developers/details.thtml:84
 #: views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versão %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nenhuma versão encontrada."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancelar e retroceder"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Sim, desactive-o"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Tem a certeza que deseja desactivar este extra?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr "Desactivar este extra irá ocultá-lo das pesquisas e das listagens. Não poderá ser transferido do sítio web e não terá verificações de actualização através do cliente . O estra será eliminado efectivamente, embora possa voltar para aqui e ser novamente activado quando lhe convier."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Desactivar %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Sim, activar"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Tem a certeza que deseja activar este extra?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr "Activar este extra irá fazer com que mais uma vez ele apareça nas listas de pesquisas. Poderá ser transferido a partir do sítio web assim como das verificações de actualizações do cliente."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Activar %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Adicionar resposta"
@@ -2782,76 +2033,89 @@ msgstr "A sua resposta foi guardada com sucesso. Os outros participantes na serÃ
 msgid "devcp_discuss_writtenby"
 msgstr "escrito por %1$s em %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65
+#: views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Adicionar Autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Endereço de Correio Electrónico do Autor"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "eliminar"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Adicionar novo autor"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Adicionar autor"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "Conta de correio do autor:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "A verificar a conta de correio..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Clique no botão de actualização de autores em baixo para guardar."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Autores actuais"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Gerir autores dos extras"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "Listar como autor nas páginas de apresentação públicas"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr "<strong>Desenvolvedorr</strong> - Pode gerir todos os aspectos da listagem do extra, excluindo adicionar e remover outros autores."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr "<strong>Dono</strong> - Pode gerir todos os aspectos da listagem do extra, incluindo adicionar e remover outros autores."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr "<strong>Visitante</strong> - Pode ver a listagem e estatísticas do desenvolvedor, mas não pode efectuar nenhuma alteração."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
 msgid "devcp_edit_authors_option_empty"
-msgstr "------------------"
+msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Seleccione um papel para o autor:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Autor"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listado"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Papel"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Actualizar autores"
 
@@ -2887,8 +2151,9 @@ msgid "devcp_edit_categories_none_available"
 msgstr "Não existem categorias disponíveis para este tipo de extra e aplicação."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Coloque o seu extra nesta categoria se ele não se enquadrar em nenhuma das caregorias disponíveis."
+msgstr "Place your add-on into this category only if it does not fit into any other available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -2900,66 +2165,73 @@ msgid "devcp_edit_dd_manage_authors"
 msgstr "Adicionar ou remover utilizadores que podem gerir este extra."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Seleccione as categorias relevantes para cada aplicação que o seu extra suporta."
+msgstr "Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "Adicione e modifique traduções para o sumário do seu extra, descrição, licença de utilizador e política de privacidade."
+msgstr "Add and modify translations for your add-on's summary, description, end-user license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Altere o nome do seu extra, página inicial, ícone e outras etiquetas."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Actualizar descrições"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Corriga os erros acima indicados a vermelho."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Editar descrições dos extras"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Qualquer informação que os utilizadores queiram saber mas que não é necessária no sumário ou descrição do extra. Usos comuns são a listagem dos erros conhecidos, informação como reportar erros data antecipada de lançamento, etc."
+msgstr "Any information end users may want to know that isn't necessarily applicable to the add-on summary or description. Common uses include listing known major bugs, information on how to report bugs, anticipated release date of a new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Comentários do desenvolvedor"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "A descrição do seu extra é uma explicação sobre as funcionalidades, funções e outra informação importante. É apresentada no sumário da página do seu extra."
+msgstr "The description of your add-on is a longer explanation of features, functionality, and other relevant information. It is displayed under the summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Descrição do extra"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Se o seu extra tiver um Acordo de Licença de Utilizador Final (ALUF), escreva-o nesta caixa. Se for escrito, os utilizadores terão de aceitá-lo antes de instalar o extra. Tenha em atenção que o ALUF não é o mesmo que código de licença tipo GPL ou MPL."
+msgstr "If your add-on has an End-User License Agreement (EULA), please enter its text below. If set below, users will be required to agree to this before installing your add-on. Please note that a EULA is not the same as a code license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Acordo de licença de utilizador final"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Se o seu extra tiver uma política de privacidade, escreva o texto aqui. A página de apresentação do seu extra irá mostrar uma ligação para a política de privacidade."
+msgstr "If your add-on has a privacy policy, enter its text here. Your add-on's display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Política de privacidade"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "O sumário é uma pequena explicação das funcionalidades básicas do seu extra e é apresentado nas listagens de pesquisa e navegação, assim como no topo da página do seu extra. <strong>Limite de 250 caractéres.</strong>"
+msgstr "The summary is a short explanation of your add-on's basic functionality that is displayed in search and browse listings, as well as at the top of your add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Sumário do extra"
 
@@ -2979,170 +2251,248 @@ msgstr "Gerir descrições dos extras"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Gerir propriedades dos extras"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Nenhuma categoria disponível para este tipo de extra."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Transferência incompleta"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Nenhum ficheiro carregado"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Excede o tamanho máximo de carregamento"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autores"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Adicionar �cone"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Mudar �cone"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permitir que os utilizadores vejam online os ficheiros fonte"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorias"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Idioma Pré-definido"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Este extra necessita de software externo"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Limpar apenas o ícone existente"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Novo Ficheiro de �cone"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "�cone"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Info adicional do Idioma"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Isto é um pré-lançamento"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Isto é um extra de um sítio específico"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Idioma de destino"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "pequena info adicional (como por exemplo um nome num dialecto local)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Actualizar propriedades"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Altere apenas se compreender todas as consequencias."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "�cone actual"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "O idioma pré-definido de um extra é o idioma a partir dos quais as traduções deverão ser feitas. Se não tiverem disponíveis traduções do seu extra no idioma do utilizador, eles irão ver o idioma pré-definido."
+msgstr "An add-on's default locale is the main locale in which translations must be present. If translations for your add-on's descriptions are unavailable in a user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "Estas etiquetas são usadas para filtrar e classificar extras."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "O GUID do seu extra é especificado no install.rdf e identifica-o unicamente. Não pode alterar o seu GUID assim que for listado nos extras da Mozilla."
+msgstr "The GUID of your add-on is specified in its install.rdf and uniquely identifies it. You cannot change your GUID once it is listed on Mozilla Add-ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Editar propriedades do extra"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Tipo de extra"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Definições de admin"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Idioma por defeito"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Etiquetas do extra"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "GUID do extra"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "�cone do extra"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Outras definições"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Extra de confiança?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Ver fonte "
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "O ícone do extra é uma pequena imagem que é mostrada ao lado do nome do seu extra nos resultados de pesquisa e navegação,páginas de apresentação, e no diálogo de instalação do extra. A imagem será redimensionada automaticamente para 32 x 32 pixéis. Utilize um dos seguintes tipos de imagem: %s"
+msgstr "The add-on icon is a small image that is displayed next to your add-on's name in browse and search results, display pages, and in the add-on installation dialog. The image will automatically be resized to 32 x 32 pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Este extra contém componentes binários"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Não é de confiança"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "De confiança"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Novo ícone"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remover ícone"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Se o seu extra tiver outra página inicial, escreva o seu endereço aqui. Adicionar outras traduções não é necessário a menos que o seu sítio web esteja traduzido noutros idiomas."
+msgstr "If your add-on has another homepage, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Página inicial do extra"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "O nome do seu extra é apresentado em todos os lados onde estiver listado."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Nome do extra"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Se tiver um endereço de correio electrónico para pedidos de suportel, escreva o seu endereço aqui. Adicionar outras traduções não é necessário a menos que o seu sítio web esteja traduzido noutros idiomas."
+msgstr "If you have an email address for support inquiries, enter it here. Adding other translations is not necessary unless you have different email addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Endereço de correio de suporte"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Se o seu extra tiver uma página de suporte ou um fórum, escreva o seu endereço aqui. Adicionar outras traduções não é necessário a menos que o seu sítio web esteja traduzido noutros idiomas."
+msgstr "If your add-on has a support website or forum, enter its address here. Adding other translations is not necessary unless your website is localized into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Sítio web de suporte"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr "Extras de confiança poderõ tornar-se públicos sem uma revisão do Editor."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "O ícone será eliminado ao guardar. <a %s>Cancelar?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "O ficheiros fonte do seu extra podem ser vistos se assim o quiser, por qualquer utilizador que esteja ligado."
+msgstr "The source of your add-on files can be viewed online by any logged in user if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Permitir visualização da fonte quando ligado"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Não permitir visualização da fonte quando ligado"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Actualizar"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nome do idioma simples</a>, tal como 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Autores"
@@ -3218,14 +2568,64 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Actualizações Pendentes (%s)"
 msgstr[1] "Actualizações Pendentes (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Os ficheiros seleccionados serão eliminados."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Ficheiros"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Destino das Aplicações"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Nenhuns Ficheiros."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notas para o Avaliador"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Actualizar"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Não tem acesso a esse extra."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Os sumários estão limitados a um máximo de 250 caracteres.\n"
+"(Você escreveu %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr "O nome para o seu extra já existe na base de dados. Verifique por favor que o: <br /><li>Seu GUIDs é igual. A causa mais comum para este erro é GUIDs diferentes.</li><li>Não tem de duplicar a entrada na base de dados. Se o fizer, deverá actualizar a entrada ou eliminaá-la e tentar novamente.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3239,9 +2639,9 @@ msgstr "Para referência veja %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "esta página"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "O seu extra tem de ter pelo menos um dono."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Descreva as alterações feitas a esta actualização do extra."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3255,6 +2655,10 @@ msgstr "Já existe uma versão deste extra. Para o substituir , tem de eliminar
 msgid "devcp_error_file_extension"
 msgstr "A extensão do ficheiro (%s) não é permitida para o tipo de extra seleccionado. Por favor utilize um dos seguintes: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nem todos os ficheiros de GUIDs são iguais"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Por favor seleccione até 5 categorias."
@@ -3287,7 +2691,14 @@ msgstr "Nenhum ficheiro carregado"
 msgid "devcp_error_icon_extension"
 msgstr "A extensão do ficheiro (%s) não é permitida para um ícone. Utilize um dos seguintes: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Já existe uma versão idêntica (%s) para este extra e plataforma."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Não está presente nenhum install.rdf."
 
@@ -3295,7 +2706,7 @@ msgstr "Não está presente nenhum install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Os seguintes erros foram encontrados no install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Por favor seleccione um tipo válido de extra."
 
@@ -3361,6 +2772,18 @@ msgstr "Não foi encontrado nenhum ID para este extra no install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Nenhuma plataforma seleccionada"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Tem de fornecer os seguintes detalhes para nomeação."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Não pode nomear um extra de pré-lançamento."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Apenas pode nomear extras que estejam no sandbox."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Seleccione pelo menos uma categoria."
@@ -3376,6 +2799,16 @@ msgstr "Tem de haver pelo menos um autor para este extra."
 msgid "devcp_error_preview_extension"
 msgstr "Essa extensão de ficheiro (%s) não é permitida para pré-visualização. Utilize um dos seguintes: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Ocorreu um erro ao tentar guardar os seus dados."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Não tem autorização para actualizar este extra."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr "Os extras não podem utilizar uma chave de actualização. Por favor remova-a de install.rdf e tente novamente."
@@ -3384,82 +2817,283 @@ msgstr "Os extras não podem utilizar uma chave de actualização. Por favor rem
 msgid "devcp_error_updateurl"
 msgstr "Os extras não podem utilizar um URL de actualização externo. Por favor remova-o do install.rdf e tente novamente."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Por favor carregue um ficheiro."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Adicione Outro Ficheiro de Plataforma"
+
+#: views/developers/add_step2.thtml:93
+#: views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Adicionar Autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Eliminar"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Categorias para o seu novo extra estarão disponíveis no passo seguinte."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Nenhuma categoria disponível para este tipo de extra."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Escreva uma descrição do seu extra."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Escreva o nome do seu extra."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Seleccione o tipo de extra que está a submeter."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Escreva um sumário para o seu extra."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Ficheiro do Extra"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Ficheiro do Extra 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Ficheiro do Extra 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tipo do Extra"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permitir que os utilizadores vejam os ficheiros fonte online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Endereço de Correio Electrónico do Autor"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autores"
+
+#: views/developers/add_step2.thtml:103
+#: views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorias"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Idioma Pré-definido"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descrição"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Licença de Utilizador Final (ALUF)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Este Extra necessiata de software externo"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Ficheiros"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Página Inicial"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Ficheiro do �cone"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nome"
+
+#: views/developers/add_step1.thtml:75
+#: views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plataformas Suportadas"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Isto é um pré-lançamento"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Política de Privacidade"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Isto é um extra específico de um sítio"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Sumário"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Correio Electrónico de Suporte"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL de Suporte"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplicações de Destino"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versão"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Notas da Versão"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Nenhuma"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notas para o Avaliador"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "Porque o seu extra é de confiança, escolha para onde esta versão deve ir:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Público"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Acordo do Desenvolvedor"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Passo 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Carregar Ficheiro"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Passo 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detalhes do Extra"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Passo 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detalhes da Versão"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Passo 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Tradução"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Passo 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Sucesso"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Os meus Extras"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "Carregar ficheiro"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Cancelar"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Escreva a conta de correio electrónico do autor que deseja adicionar."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "Mover para baixo"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "Mover para cima"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Remover compatibilidade da aplicação"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "Listar como autor nas listagens públicas"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Seleccione uma licença."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Escreva o texto para a sua licença"
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Desenvolvedor"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Dono"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Visualizador"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Remover Autor"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "Tem a <strong>certeza</strong> que deseja remover este extra?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "Tem de seleccionar um ficheiro para carregar."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Licença personalizada para o extra %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Campos Traduzidos"
@@ -3471,12 +3105,12 @@ msgid "devcp_localebox_intro"
 msgstr "Alguns dos campos desta página estão traduzidos para aparecer no idioma do utilizador final. Seleccione um idioma para editar os detalhes do seu extra no idioma pretendido. Se não estiver disponível uma tradução, irá ser remetida para o idioma pré-definido (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Painel de Controlo do Admin"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Painel de Controlo do Editor"
 
@@ -3485,72 +3119,96 @@ msgid "devcp_myaddons_link"
 msgstr "Os meus Extras"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Voltar ao Início"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Painel de Estatísticas"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submeter Extra"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Ferramentas do Developer"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "O ID deste extra (%1$s) já existe na base de dados. Se o extra for seu, pode <a href=\"%2$s\">carregar uma nova versão</a>."
+msgstr "This add-on ID (%1$s) already exists in the database. If this is your add-on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 msgid "devcp_nominate_cancel"
 msgstr "Cancelar e voltar"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Voltar aos detalhes do extra"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nomear %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Tipo de extra detectado automaticamente: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>Uma ou mais das suas alterações não pode ser guardada.</span><br />Veja os erros abaixo. O resto das suas alterações foi guardado com sucesso."
+msgstr "<span>One or more of your changes couldn't be saved.</span><br />Please look for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>As suas alterações foram guardadas.</span><br />Tenha em atenção que algumas alterações poderão demorar várias horas a aparecer em determinadas áreas do sítio web."
+msgstr "<span>Your changes have been saved.</span><br />Please note that some changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
 msgstr "Remover esta como pré-visualização por defeito irá fazer com que outra pré-visualização se torne automaticamente na pré-visualização por defeito."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58
+#: views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr "O idioma por defeito deste extra (%1$s [%2$s]) é diferente do idioma actualmente seleccionado (%3$s [%4$s]). Os campos abaixo deverão ser completados em %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
 msgstr "Tornar esta a pré-visualização por defeito irá alterar o estado da pré-visualização actual."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Tem alterações não guardadas."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3579,45 +3237,48 @@ msgstr "Editar Pré-visualização"
 msgid "devcp_preview_updated_successfully"
 msgstr "Pré-visualização actualizada com sucesso."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Adicionar outra pré-visualização"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Eliminar pré-visualização"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Substituir pré-visualização"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Actualizar pré-visualizações"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Adicionar nova pré-visualização"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Seleccione a imagem a carregar abaixo. Imagens maiores que 700 pixéis de largura e 525 de altura serão redimensionados. Os ficheiros permitidos são: %s"
+msgstr "Select an image to upload below. Images larger than the maximum size of 700 pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Clique em actualizar pré-visualizações abaixo para carregar."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Clique no botão de actualização de pré-visualizações abaixo para guardar esta imagem. (<a %s>Cancelar?</a>)"
+msgstr "Click the Update Previews button below to save this image. (<a %s>Cancel?</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "Esta pré-visualização será eliminada quando actualizar pré-visualizações for clicado. (<a %s>Cancelar?</a>)"
+msgstr "This preview will be deleted when Update Previews is clicked below. (<a %s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
@@ -3627,7 +3288,7 @@ msgstr "Utilize o formulário abaixo para carregar screeshots em PNG, JPG, ou GI
 msgid "devcp_previews_header_add"
 msgstr "Adicionar Pré-visualização"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Pré-visualizar captura"
 
@@ -3635,7 +3296,7 @@ msgstr "Pré-visualizar captura"
 msgid "devcp_previews_header_edit"
 msgstr "Editar Pré-visualização"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Pré-visualização pré-definida"
 
@@ -3648,25 +3309,26 @@ msgstr "Pré-visualizar Ficheiro"
 msgid "devcp_previews_label_makedefault"
 msgstr "Tornar esta imagem a pré-definida"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Nova imagem:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Carregar pré-visualização: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "Uma ou mais das suas novas pré-visualizações não pode ser guardada."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "As suas pré-visualizações foram actualizadas com sucesso."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "As miniaturas das pré-visualizações do seu extra são mostradas abaixo.A pré-visualização por defeito é a que é apresentada ao lado do seu extra nas listagens de pesquisa e navegação."
+msgstr "The preview screenshots for your add-on are shown below. You can make changes to captions or images below. The Default Preview is the preview that is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3684,31 +3346,46 @@ msgstr "Editar Pré-visualização"
 msgid "devcp_previews_submit_upload"
 msgstr "Carregar Pré-visualização"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniatura"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "%s gestor de pré-visualizações"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrecto?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Tem a certeza que deseja eliminar este ficheiro?"
+
+#: views/developers/uploader.thtml:71
+#: views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "Por favor reveja e aceite o seguinte Acordo do Desenvolvedor antes de continuar."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Não tem previlégios suficientes para fazer alterações nesta página.</span><br />Contacte o dono do extra se necessitar de fazer alterações."
+msgstr "<span>You do not have sufficient privileges to make changes on this page.</span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "Tenha em atenção que algumas alterações poderão durar algumas horas para aparecer em algumas áreas do sítios web."
+msgstr "Please note that some changes may take several hours to appear in all areas of the website."
 
 #: views/elements/developers/sidebar.thtml:52
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Quadro"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Saltar a actualização da informação actual do meu extra"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3731,8 +3408,9 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Transferências Semanais"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "Macar este extra como activo irá fazer com que seja apresentado nas áres públicas apropriadas para o seu estado, incluindo listagens de pesquisa e navegação. Será transferível do sítio web e terá verificações de estado das actualizações, dependendo do seu estado. Poderá voltar aqui e desactivá-lo de novo."
+msgstr "Marking this add-on active will cause it to show up in public areas appropriate for its status, including search and browse listings. It will be downloadable from the website and could be returned in client update checks, depending on its status. You will be able to return here and disable it again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active_sure"
@@ -3743,8 +3421,9 @@ msgid "devcp_status_confirm_header_sure"
 msgstr "Tem a certeza?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "Tornar este extra inactivo irá prevenir que seja apresentado em áreas públicas, incluindo listagens de pesquisa e navegação. Não irá ser transferível do sítio web e não será indicado nas verificações de actualização do cliente. Poderá voltar aqui e reactivá-lo novamente."
+msgstr "Marking this add-on inactive will prevent it from showing up in any public areas, including search and browse listings. It will not be downloadable from the website and will not be returned in client update checks. You will be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive_sure"
@@ -3755,16 +3434,18 @@ msgid "devcp_status_confirm_no"
 msgstr "Não, cancelar"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "Tornar este extra público irá torná-lo disponível para todos transferirem e começarão a ser fornecidas actualizações aos seus utilizadores."
+msgstr "Making this add-on public will make it available for anyone to download and will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public_sure"
 msgstr "Tem a certeza que deseja tornar este extra público?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Mover este extra de novo para o sandbox irá necessitar que o utilizador inicie sessão antes de transferir e as actualizações não serão oferecidas aos utilizadores actuais. Como o seu extra é público, pode voltar aqui e torná-lo novamente público."
+msgstr "Moving this add-on back to the sandbox will require users to login before downloading and updates will no longer be offered to existing users. Because your add-on is currently public, you will be able to return here at any time to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox_sure"
@@ -3775,169 +3456,220 @@ msgid "devcp_status_confirm_yes"
 msgstr "Sim, tenho a certeza"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>É necessária uma mensagem de nomeação.</span><br />Preencha a caixa de texto com a informação pedida e volte a tentar."
+msgstr "<span>A nomination message is required.</span><br />Please fill in the text box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
 msgid "devcp_status_nominate_header"
 msgstr "Nomeação do extra"
 
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "As submissões de Extras estão desactivadas de momento. Por favor volte a mais tarde."
+
+#: views/developers/uploader.thtml:76
+#: views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Eu Aceito"
+
+#: views/developers/uploader.thtml:75
+#: views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Eu Recuso"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Este extra foi desactivado por um administrador."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Desactivado"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "De Confiança"
+
 #: views/developers/dashboard.thtml:85
+#: views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Última Versão:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Não tem nenhum extra. Clique %s para submeter um."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "aqui"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "tenha a certeza de %s para o seu tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "carregar uma pré-visualização"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Editar %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Ajuda (não sai da página)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Ajuda"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Caracteres usados: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Tem a certeza que deseja eliminar esta tradução?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "O que são estes %s separadores?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "E se eu não tiver nenhuma tradução?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Ocultar ajuda"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "Se um utilizador ao navegar no sítio não tiver uma tradução no seu idioma disponível, irá ser redireccionado para o idioma pré-definido do seu extra, especificado na área Editar propriedades do extra. Se não tiver nenhuma tradução, escreva o que puder no seu idioma pré-definido , que deverá ser o idioma em que fala."
+msgstr "If a user browses the site and a translation isn't available in their own language, it will fall back to your add-on's Default Locale, specified in the Edit Add-on Properties area. If you don't have any translations, just enter what you can into your Default Locale, which should be a language you speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "Isto é uma <i>Caixa de tradução</i>.Permite-lhe traduzir um campo específico para outros idiomas para os quais tenha uma tradução. Pode adicionar, editar e remover traduções usando os separadores de idioma."
+msgstr "This is a <i>Translation Box</i>. It allows you to localize a specific field into any other languages for which you might have a translation. You can add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Adicionar tradução"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remover tradução"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Adicionar idioma a todos"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Adicionar idioma"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancelar"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Eliminar"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Seleccione o idioma da tradução a adicionar:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "O GUID do extra usado neste ficheiro (%1$s) não é igual ao GUID existente para este extra (%2$s)."
+msgstr "The add-on GUID used in this file (%1$s) does not match the existing GUID for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "Não tem previlégios suficientes para actualizar este extra."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "A versão especificada (%1$s) não pertence a este extra (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "O número da versão carregada (%1$s) já existe para este extra. Se está a tentar adicionar outro ficheiro a esta versão, <a href=\"%2$s\">clique aqui</a>."
+msgstr "The version number uploaded (%1$s) already exists for this add-on. If you are trying to add another file to this version, <a href=\"%2$s\">click here</a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "O número da versão carregada (%1$s) não é igual à versão existente (%2$s)."
+msgstr "The uploaded version number (%1$s) does not match the existing version number (%2$s)."
 
 #: views/developers/uploader.thtml:68
 msgid "devcp_uploader_a_start"
 msgstr "Começar"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "A carregar ficheiro..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr " "
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Editar o meu extra"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Termino o meu extra mais tarde."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Adicionar notas de lançamento"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>A lista do seu extra foi carregada com sucesso. A informação básica obtida do ficheiro que carregou foi guardada, mas existe muito mais na sua listagem que pode ser personalizado.</p><p>O seu extra actualmente está marcado como <strong>Imcompleto</strong>. Para poder completar o seu extra, tem de ter a certeza que tem um nome correcto, sumário e descrição assim como, pelo menos, uma categoria seleccionada. Pode editar a informação do seu extra usando a ligação abaixo e verificar o estado do seu extra a qualquer momento na <a %s>página de estado</a>."
+msgstr "<p>Your add-on listing has been successfully created. The basic information obtained from your uploaded file has been stored, but there's a lot more to your listing that can be customized.</p><p>Your add-on is currently marked as <strong>Incomplete</strong>. In order to complete your add-on, you'll need to make sure it has an accurate name, summary, and description, as well as at least one selected category. You can edit your add-on's information using the link below and check the status of your add-on at any time on the <a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Corrija este problema e carregue o seu ficheiro de novo."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "O seu novo ficheiro foi adicionado à versão %1$s e está marcado como %2$s."
+msgstr "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Extra criado!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Oops! parece que existe um problema com este ficheiro..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "Ficheiro adicionado!"
 
@@ -3946,74 +3678,72 @@ msgid "devcp_uploader_header_how"
 msgstr "Como é que tudo isto funciona?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Versão %s criada"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Carregar o seu ficheiro"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Obrigado pelo interesse em submeter o seu extra nos Extras da Mozilla. Hospedar o seu extra nos Extras da Mozilla é a maneira mais fácil para distribuir o seu extra. Eis o que obtém:</p><ul><li>Cada extra tem uma página de apresentação pública que mostra a informação que forneceu, tal como, um breve sumário da funcionalidade do extra, uma descrição mais longa como opção e uma pre-visualização de imagens do extra.</li><li>O seu extra irá aparecer nas listagem de pesquisa e navegação por todo o sítio e até no gestor de extras do Firefox 3.</li><li>Nós cuidamos da hospedagem de todas as suas transferências e fornecemos actualizações automáticas aos utilizadores quando carregar uma nova versão.</li><li>Irá ter acesso a um quadro de estatísticas com informação detalhada sobre a base de utilizadores.</li></ul><p>Extras hospedados no sítio têm de ser revistos por Editor dos Extras da Mozilla antes de todas as suas funcionalidades serem listadas acima. Se estiver pronto para iniciar o processo e tiver o pacote do seu extra pronto para ser carregado clique em Iniciar!</p>"
+msgstr "<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. Hosting your add-on on Mozilla Add-ons is the easiest way to handle distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on will have a public display page with information you provide, such as a brief summary of the add-on's functionality, an optional longer description, and a showcase of preview screenshots of your add-on.</li><li>Your add-on will appear in search and browse listings across the site, and even in the Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your downloads and providing automatic updates to users when you upload a new version.</li><li>You'll have access to a statistics dashboard with detailed information about your user base.</li></ul><p>Add-ons hosted on the site must be reviewed by a Mozilla Add-ons Editor before they will have all of the features listed above. If you're ready to start the process and have your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Plataformas suportadas:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Ficheiro do extra: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Outro"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "O novo ficheiro será tornado público assim que um editor o puder rever. Actualmente existem %1$s outros extras em espera. Deseja ser revisto mais rapidamente? Considere <a %2$s>tornar-se um editor</a>."
+msgstr "The new file will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "A nova versão será tornada públiao assim que um editor o puder rever. Actualmente existem %1$s outros extras em espera. Deseja ser revisto mais rapidamente? Considere <a %2$s>tornar-se um editor</a>."
+msgstr "The new version will be available to the public as soon as an editor is able to review it. There are currently %1$s other add-ons in the queue. Want to be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "A sua nova versão foi criada e está marcada como %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "Veja o seu novo ficheiro na <a %1$s>página de versões e ficheiros</a>, verifique o <a %2$s>estado actual</a> do seu extra, ou <b>adicione notas de lançamento</b> clicando no botão abixo (altamente recomendado)."
+msgstr "View your new file in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "Veja a sua nova versão na <a %1$s>página de versões e ficheiros</a>, verifique o <a %2$s>estado actual</a> do seu extra, ou <b>adicione notas de lançamento</b>clicando no botão abaixo (altamente recomendado)."
+msgstr "View your new version in the <a %1$s>Versions and Files page</a>, check out your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Carregue o seu ficheiro do extra usando o formulário abaixo. Se tiver múltiplos ficheiros específicos para determinadas plataformas para carregar, escolha um único ficheiro e depois carregue os restantes usando o gestor de ficheiros e versões."
+msgstr "Upload your add-on file using the form below. If you have multiple, platform-specific files to upload, choose a single file and then upload the others using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Todas"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Específico:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Por favor, escolha..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4029,24 +3759,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Actualizar %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Para referência veja %s."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "esta página"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Nenhuma conta encontrada para este endereço de correio."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Ou o XMLé inválido ou os campos necessários estão em falta.  Por favor <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">leia a documentação</a>, verifique o seu extra e tente novamente."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Editar Versão"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versão actualizada com sucesso."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4103,66 +3840,63 @@ msgstr[1] "%s comentários"
 msgid "devcp_versions_delete_sure"
 msgstr "Tem a certeza que deseja eliminar permanentemente a versão %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancelar"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Eliminar ficheiro"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Adicionar nova aplicação"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remover aplicação"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Adicionar novo ficheiro"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Ajustar aqui a informação da aplicação permite a todos os utilizadores instalar o seu extra mesmo que o install.rdf indique que o extra é imcompatível. <a %s>Lista de aplicações suportadas</a>"
+msgstr "Adjusting application information here will allow users to install your add-on even if the install.rdf in the package indicates that the add-on is incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr "Tem a <b>certeza</b> que deseja remover a compatibilidade com esta aplicação?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Tem a <b>certeza</b> que deseja eliminar permanentemente este ficheiro?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Informação sobre a aprovação"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Aplicações compatíveis"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Informação do ficheiro"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licença"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "gerir versão %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Notas de aprovação"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Eliminar ficheiro"
 
@@ -4171,63 +3905,59 @@ msgstr "Eliminar ficheiro"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "Ficheiro %1$s (%2$s) criado em %3$s e alterado para %4$s a %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Seleccione a licença apropriada para o seu extra. Esta licença especifíca os direitos que dá ao seu código fonte."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Não foram encontrados ficheiros."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "Informação opcional para o Editor que revê esta versão."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remover compatibilidade da aplicação"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "seleccione uma aplicação"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Ficheiro"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Plataforma"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Tamanho"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Estado"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr "Informação sobre alterações nesta versão, novas funcionalidades, problemas conhecidos e outra informação útil específica a esta versão. Esta informação estará disponível para os utilizadores que actualizem o extra na interface de gestão de extras do Firefox 3."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Notas de lançamento"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr "<strong>Tem alterações não guardadas.</strong> A compatibilidade não será eliminada até que clique em actualizar versão."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr "<strong>Tem alterações não guardadas.</strong> Os ficheiros não serão eliminados até que clique em actualizar versão."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Actualizar versões"
 
@@ -4260,7 +3990,7 @@ msgstr "Estado"
 msgid "devcp_versions_th_version"
 msgstr "Versão"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Este extra está desactivado"
 
@@ -4305,7 +4035,7 @@ msgid "editorcp_logs_filter_by"
 msgstr "Filtrar por tipo/acção"
 
 #: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Registo de Eventos"
 
@@ -4368,6 +4098,7 @@ msgid "editorcp_reviewlog_none_found"
 msgstr "Nenhum comentário encontrado para este período."
 
 #: views/editors/reviewlog.thtml:42
+#: controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Registo do comentário"
 
@@ -4391,24 +4122,24 @@ msgstr "Actividade Recente do Editor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total de comentários"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Avaliar Extra"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Por favor complete os seguintes campos:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Seleccione pelo menos um ficheiro para rever."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Comentários próprios não são permitidos."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Software Externo"
 
@@ -4422,43 +4153,43 @@ msgid "editors_featured_add_feature_submit"
 msgstr "Adicionar"
 
 #: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Adicionar funcionalidade falhou."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Funcionalidade adicionada com sucesso."
 
 #: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "A edição da funcionalidade falhou."
 
 #: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Edição da funcionalidade feita com sucesso."
 
 #: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Uma ou mais traduções são inválidas."
 
 #: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "A eliminação da funcionalidade falhou."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Eliminação da funcionalidade feita com sucesso."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Funcionalidades do Extra"
 
@@ -4472,245 +4203,194 @@ msgstr "Ir"
 msgid "editors_featured_remove_feature"
 msgstr "Eliminar funcionalidade"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtro de Espera"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Ligações de Interesse"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Guia dos Editores"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Política dos Extras"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Estes filtros irão manter-se durante esta sessão ou até serem limpos."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108
+#: views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "De momento não existem nenhuns %s extras para rever."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dia"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hora"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minuto"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61
+#: controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Painel de controlo do Editor"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "apenas %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pré-lançamento"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibilidade"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Extra ou correio electrónico do autor"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tipos de extra"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplicação"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Versão máx."
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Plataformas"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Idade da submissão (dias)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Resultados da sua pesquisa com filtros: <strong>%1$s</strong> extra"
-msgstr[1] "Resultados da sua pesquisa com filtros: <strong>%1$s</strong> extras"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Limpar"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtro"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Todas os comentários em espera estão actualmente desactivados. Volte a tentar mais tarde."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Editar item"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Histórico do item"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Página inicial do item"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Visualizar item"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Pré-visualizações"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acção do comentário"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Pedir mais informação"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Tornar Público"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Pedir Super-comentário"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Manter no Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentários da avaliação"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr "Utilize este formulário para pedir mais informação ao autor. Ele receberá uma mensagem de correio electrónico e poderá responder aqui.Quando responderem será notificado por correio electrónico."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr "Isto irá marcar o extra e a sua versão e ficheiros mais recentes como pública. Versões futuras irão para o sandbox até serem revistas por um editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Isto irá manter o extra no sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "Isto irá aprovar uma versão que está no sandbox de uma versão de um extra público a aparecer no lado público."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "Isto irá causar que uma versão que está no sandbox de uma versão pública de um extra seja mantida no sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr "Se tiver dúvidas sobre a segurança deste extra, problemas de copyright, ou outras dúvidas que um administrador deverá ver, escreva os seus comentários na área abaixo. Serão enviadas aos administradores, mas não ao autor."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Comparar com a versão pública"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Ver Conteúdo"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autores:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorias:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilidade:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descrição"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentários do Developer"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ALUF"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Ficheiros:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Histórico do Item"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mensagem de Nomeação"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Pré-visualizações"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Política de Privacidade"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Avaliar %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notas para o avaliador"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sumário"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Notas da Versão"
 
@@ -4738,7 +4418,7 @@ msgstr "Nomeação Aprovada/Pública"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomeação Negada/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Não foi encontrada nenhum comentário anterior."
 
@@ -4765,87 +4445,78 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Mostrar/Ocultar respostas (%1$s)"
 msgstr[1] "Mostrar/Ocultar respostas (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicações:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ou seleccione uma resposta:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentários:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sistemas Operativos:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281
+#: views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Topo"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Nota: Reveja  mais do que um ficheiro apenas se testou TODOS os ficheiros que seleccionou."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "segu &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nenhuma pré-visualização encontrada."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; ante"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Comentário em espera"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> de %2$s em espera"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> de %2$s em espera (filtrado)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Acção do Processo"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acção"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentários"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Data"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Revisor"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versão/Ficheiro"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr "Notificar-me da próxima vez que o extra for actualizado. (As actualizações seguintes não irõ gerar uma mensagem de correio)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Comentário processado com sucesso."
 
@@ -4869,7 +4540,7 @@ msgstr "Acção"
 msgid "editors_reviews_in_reply_to"
 msgstr "Em resposta a:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Comentários processados com sucesso!"
 
@@ -4881,66 +4552,78 @@ msgstr "De momento não existem comentários para serem moderados."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Processo de comnetários"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Específico de um Sítio"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Novo"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Actualizado"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicação Testada"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistemas Operativos Testados"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informação Adicional"
 
 #: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Extra"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tipo"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipos de Extra"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Idade"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplicações"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restringir para os locales?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tempo de espera"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Ordem ascendente"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plataformas"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Ordem descendente"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipos de Submissão"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dias"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s horas"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutos"
@@ -4949,17 +4632,11 @@ msgstr "%s minutos"
 #: controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
 #: controllers/components/simple_acl.php:83
+#: controllers/components/amo.php:606
 #: controllers/components/amo.php:607
 #: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Acesso Negado"
 
@@ -4967,18 +4644,17 @@ msgstr "Acesso Negado"
 msgid "error_access_denied_message"
 msgstr "Não está autorizado a ver esta página."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "O extra já existe!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -4989,14 +4665,11 @@ msgstr "O extra já existe!"
 #: controllers/api_controller.php:123
 #: controllers/api_controller.php:759
 #: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Extra não encontrado!"
 
@@ -5009,30 +4682,31 @@ msgstr "Este extra não é visível aqui."
 msgid "error_addon_selfreview"
 msgstr "Não pode rever o seu próprio extra."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Nenhum Extra nesta categoria!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr " "
+msgstr ""
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60
+#: views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Não é um endereço de correio electrónico válido."
 
 #: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/register.thtml:65
+#: views/users/register.thtml:75
+#: views/users/register.thtml:81
+#: views/users/edit.thtml:108
+#: views/users/edit.thtml:114
+#: views/users/edit.thtml:174
+#: views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68
+#: views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Este campo não pode estar vazio."
 
@@ -5043,82 +4717,76 @@ msgstr "Este campo não pode estar vazio."
 #: controllers/files_controller.php:176
 #: controllers/files_controller.php:185
 #: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Ficheiro não encontrado!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Erro no ficheiro: %s não existe."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
+#: views/users/register.thtml:49
+#: views/users/edit.thtml:84
+#: views/reviews/add.thtml:84
+#: controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
 #: controllers/groups_controller.php:80
 #: controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Existem erros neste formulário. Corriga-os e volte a submete-los."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha inválido, tente novamente!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95
+#: views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112
+#: views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr "Este URL tem um formato inválido. URLs válidos são do tipo http://example.com/my_page."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
 #: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:254
+#: controllers/users_controller.php:542
+#: controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argumento em falta: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506
+#: controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Sem ficheiros"
 
+#: views/developers/add_step2.thtml:58
+#: views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Notícia"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Pré-visualização não encontrada!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397
+#: views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Tem de seleccionar uma avaliação"
 
@@ -5127,48 +4795,43 @@ msgid "error_user_already_confirmed"
 msgstr "Esta conta de utilizador já está confirmada."
 
 #: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:265
+#: controllers/users_controller.php:552
+#: controllers/users_controller.php:564
+#: controllers/users_controller.php:570
+#: controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Código de confirmação inválido!"
 
 #: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "As senhas não coincidem."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60
+#: views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Este endereço de correio já existe."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580
+#: controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr "A alteração do correio electrónico expirou. Por favor altere o seu endereço de correio electrónico de novo no seu perfil de utilizador e clique na ligação que aparece no correio electrónico de confirmaçãoque irá receber dentro de instantes."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Os utilizadores apenas podem ter um papel de cada vez. Remova o utilizador de todos os papéis existentes antes de continuar."
-
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86
+#: views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Esta alcunha já existe."
 
 #: views/users/pwreset.thtml:54
 #: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260
+#: controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Utilizador não encontrado!"
 
@@ -5176,44 +4839,42 @@ msgstr "Utilizador não encontrado!"
 msgid "error_user_unconfirmed"
 msgstr "Confirme primeiro a sua conta com o código que recebeu por correio electrónico."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Nome de utilizador ou senha errados!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versão não encontrada!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118
+#: views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Senha errada introduzida!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Saber mais"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Saber mais sobre %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
+#: views/elements/addon_listitem.thtml:125
 #: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/addons/display.thtml:98
+#: views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s comentário"
 msgstr[1] "%1$s comentários"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Ver mais de"
 
@@ -5253,144 +4914,126 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
 msgid "footer_a_about"
 msgstr "Sobre"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
 msgid "footer_abbr_faq"
 msgstr "Perguntas frequentes"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Todos os direitos reservados."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Copyright"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Créditos"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
 msgstr "A Mozilla está a fornecer, por cortesia, ligações para estas aplicações, e não faz nenhuma representação relativamente a essas aplicações ou qualquer informação aí indicada. Quaisquer questões, queixas ou outro sobre esta aplicação têm de ser direccionadas ao fabricante do software apropriado."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Ir"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Informações Legais"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Outros Idiomas:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Política de privacidade"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Guardar"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Dicionário"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicionários"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensão"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensões"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pacote de Idioma (Extra)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pacotes de Idioma (Extras)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Pacote de Idioma (Aplicação)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pacotes de Idioma (Aplicações)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor de Pesquisa"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Motores de Pesquisa"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Temas"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Todos os idiomas"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111
 #: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Voltar à página inicial dos extras do %1$s"
@@ -5399,105 +5042,51 @@ msgstr "Voltar à página inicial dos extras do %1$s"
 msgid "header_main_firefox_header"
 msgstr "Extras do Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Extras <em>fpara o</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Extras"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Extras <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Extras do Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Extras <em>para o</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Extras do Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Extras <em>para o</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Extras do Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Extras<em>para o</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Saltar para o menu de outras aplicações"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Saltar para o menu de categorias"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Saltar para o conteúdo principal"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Saltar para o formulário de pesquisa"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Extras"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
+#: views/elements/developers/myaddons.thtml:72
 #: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Entrar"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Sair"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
-msgstr "A Minha Conta"
+msgstr "Minha Conta"
 
 #: views/elements/header.thtml:158
 msgid "header_navlink_register"
 msgstr "Registar"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Registe-se</a> ou <a href=\"%2$s\">Inicie sessão</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Ferramentas"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
+#: views/elements/addon_listitem.thtml:80
 #: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5505,51 +5094,37 @@ msgstr "Pré-visualizar imagem do %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Entrar</a> para instalar este extra experimental. <a href=\"%2$s\">Porquê</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Deixem-me instalar este extra experimental. <a href=\"%1$s\">O que é isto?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Adicionar ao %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146
+#: views/elements/install.thtml:164
+#: views/elements/install.thtml:197
+#: views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Adicionar %1$s a %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Transferir %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Este extra não está disponível."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista de pacotes de idioma e dicionários"
 
@@ -5561,9 +5136,10 @@ msgstr "Transferir Dicionário"
 msgid "langtools_download_langpack"
 msgstr "Transferir Pacote de Idioma"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54
+#: views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697
+#: controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicionários & Pacotes de Idioma"
 
@@ -5575,74 +5151,39 @@ msgstr "Instalar Dicionário"
 msgid "langtools_install_langpack"
 msgstr "Instalar Pacote de Idioma"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dicionário"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pacote de Idioma"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Idioma"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Licença personalizada"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licença BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, versão 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, versão 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, versão 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, versão 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licença MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, versão 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54
+#: views/users/delete.thtml:53
+#: views/users/delete.thtml:130
+#: views/users/edit.thtml:72
+#: views/users/edit.thtml:73
+#: views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Clique aqui para voltar à página inicial."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Data"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Transferências"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nome"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Avaliação"
@@ -5667,21 +5208,30 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54
+#: controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dicionários e Pacotes de Idiomas"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711
+#: controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58
+#: controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Temas"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Procure extras para outras aplicações"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "outros"
 
@@ -5689,29 +5239,12 @@ msgstr "outros"
 msgid "page_title_appversions"
 msgstr "Versões da aplicação"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Coleccionador de extras"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Perguntas frequentes do coleccionador de extras"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Funcionalidades do coleccionador de extras"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Bem-vindo ao coleccionador de extras"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Créditos"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ do Desenvolvedor"
+msgid "page_title_experimental_addons"
+msgstr "Extras experimentais"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5741,36 +5274,39 @@ msgstr "Sistema avaliação Sandbox"
 msgid "page_title_submissionhelp"
 msgstr "Ajuda sobre submissões"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
+#: views/pages/appversions.thtml:78
 #: controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versões Válidas da Aplicação"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr "Extras submetidos nos Extras da Mozilla têm de ter um ficheiro install.rdf com pelo menos uma aplicação suportada. Apenas as versões listadas abaixo são permitidas para essas aplicações."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr "Se a sua aplicação suportada não necessitar de um ficheiro install.rdf file, tem de incluir pelo menos um com as propriedades necessárias especificadas %s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "aqui"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versões"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Voltar à pagina anterior"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Página de Informação do Sandbox"
 
@@ -5778,6 +5314,12 @@ msgstr "Página de Informação do Sandbox"
 msgid "pagination_next_page"
 msgstr "seguinte"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Esta é a página %1$s de %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "anterior"
@@ -5806,15 +5348,15 @@ msgstr "Se for difícil de ouvir, pode <a href=\"%1$s\">ouvir algo diferente</a>
 msgid "recaptcha_hardtoread_text"
 msgstr "Se for difícil de ler, pode <a href=\"%1$s\">pode tentar outras letras</a> ou em alternativa <a href=\"%2$s\">ouvir algo</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Você é humano?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "O que é isto?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Erro ao marcar este comentário"
 
@@ -5822,8 +5364,8 @@ msgstr "Erro ao marcar este comentário"
 msgid "review_flag_reason_bug_support"
 msgstr "Relatório de erro mal colocado ou pedido de ajuda"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107
+#: views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Reportar este comentário (seleccione uma razão)"
 
@@ -5839,9 +5381,9 @@ msgstr "Outro (por favor rspecífique)"
 msgid "review_flag_reason_spam"
 msgstr "Spam ou caso contrário conteúdo não revisto"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95
+#: views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Obrigado;este avaliação foi marcada para aprovação do editor."
 
@@ -5854,142 +5396,111 @@ msgid "review_flag_this_titletip"
 msgstr "Este comentário é inapropriado, inadequado ou é spam? Clique aqui para enviá-la ao editor para revisão."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr "<p>Tenha isto em mente:</p><ul><li>Escreva como se tivesse a dizer a um amigo a sua experiência com este extra.  Dê detalhes específicos e de ajuda,tais como que funcionalidades gostou ou desgostou, a facilidade de o utilizar, e qualquer desvantagem que tenha. Evite comentários genéricos tipo\"espetaculart\" ou \"Mau\" a não ser que dê razões para o poder dizer.</li><li>Por favor não coloque relatórios de erro nos comentários. Nós não fornecemos o seu endereço de correio ao desenvolvedor do extra e ele pode ter que o contactar para o ajudar a resolver o seu problema. Veja a <a href=\"%1$s\">secção de ajuda</a>para encontrar ajuda para este extra.</li><li>Mantenha os comentários limpos, evite usar linguagem imprópria e não coloque nenhuma informação pessoal.</li></ul><p>Veja o <a href=\"%2$s\">Guia sobre comentários</a> para mais detalhes sobre comentários feitos por utilizadores.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54
+#: views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Comentários para %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Extras"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Novos Extras"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Extras populares"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Extras actualizados"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Pesquisar"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Resultados da pesquisa de colecções"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Resultados da pesquisa de colecções"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "A procura de momento está desactivada. Volte a tentar mais tarde."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "todos os extras"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "todas as colecções"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170
+#: views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "Procurar extras"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "pesquisar colecções"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Pesquisar extras"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Clique para escrever os termos de pesquisa"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "em"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Todos os Motores de Pesquisa"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Explorar Motores de Pesquisa"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s extra corresponde"
+msgstr[1] "%s extras correspondem"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Nenhum resultado encontrado."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Procurar Extras"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Resultados da procura de fontes"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Procurar resultados para: %s"
 
 #: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ferramentas do Admin"
 
 #: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ferramentas do Desenvolvedor"
 
 #: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ferramentas do Editor"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Bem-Vindo"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Bem-Vindo, %s"
@@ -5999,7 +5510,7 @@ msgstr "Bem-Vindo, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dicionário"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Extras"
 
@@ -6007,7 +5518,7 @@ msgstr "Extras"
 msgid "sidebar_pitch_looking_for"
 msgstr "Estou a procurar um:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Extras recentes"
 
@@ -6015,7 +5526,7 @@ msgstr "Extras recentes"
 msgid "sidebar_pitch_search"
 msgstr "Plugin de Pesquisa"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscrever a"
 
@@ -6024,25 +5535,25 @@ msgstr "Subscrever a"
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Extras actualizados"
 
 #. %1$s is a number
 #: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94
+#: views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s&nbsp;KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ainda sem avaliação"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6084,13 +5595,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s criado"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s lançado"
@@ -6103,180 +5614,180 @@ msgstr "Fechar"
 msgid "statistics_help_link"
 msgstr "Ajuda"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "ou, seleccione outro extra"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "ou, seleccione um extra com estatísticas públicas"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Seleccione um dos seus extra para ver as suas estatísticas"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Seleccione um extra para ver as suas estatísticas"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Seleccione um extra com estatísticas públicas"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Quadro de Estatísticas"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Ver Estatísticas"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224
+#: controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Ver esta tabela no formato CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "nenhum"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remover esta parcela"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Agrupar por: Dia"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Agrupar por: Mês"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Agrupar por: Semana"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Comparar por: Semana"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s encontrados no intervalo"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adicionar parcela"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Adicionar outra parcela a este gráfico"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Esconder contador total"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Mostrar contador total"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Mostrar o contador total neste gráfico"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Ver Dados (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Obter ficheiro com valores separados por Vírgulas para estes dados"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ocultar %s Eventos"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Mostrar %s Eventos"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Sobrepor as datas de lançamento do extra nas parcelas"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ocultar Eventos do Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Mostrar os Eventos do Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Sobrepor as datas de lançamento do Firefox nas parcelas"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Colapsar Gráfico"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandir Gráfico"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionar Gráfico"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilizadores Activos Diários"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicação"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizar"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Transferências"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistema Operativo"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Estado do Extra"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumário"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versão do Extra"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplicação"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistema Operativo"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Estado do Extra"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Desconhecido"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versão do Extra"
 
@@ -6307,7 +5818,7 @@ msgstr "As suas definições foram actualizadas!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Estatísticas"
 
@@ -6335,103 +5846,107 @@ msgstr "Diminuir"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Diminuir um mês"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sumário de estatísticas Diário para %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Fonte RSS para os dados do sumário"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Estatísticas para %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr "Por defeito,apenas você e a Mozilla podem aceder à informação do seu dashboard. Pode abrir isto ao público para que todos possam ver os dados relativos ao seu extra."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Acesso ao Dashboard"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privado"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Apenas você e a Mozilla podem ver as estatísticas deste extra"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Público"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Todos podem ver as estatísticas deste extra"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Mudar definições"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Por favor trate esta informação como confidencial."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Este painel actualmente é <b>privado</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Estepainel actualmente é <b>público</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Bloqueado"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Voltar ao Painel"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Guardar Definições"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Definições do Painel de estatisticas para %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Desbloqueado"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Ap"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Es"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Desc"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
 #: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Média de Transferências Diárias"
 
@@ -6445,7 +5960,7 @@ msgid "statistics_summary_downloads_lastcount"
 msgstr "Última contagem do Dia"
 
 #: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Transferências nos últimos 7 dias"
 
@@ -6467,8 +5982,8 @@ msgstr "Desde %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Ainda sem dados"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70
+#: views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Média de Utilizadores Activos Diáriamente"
 
@@ -6498,133 +6013,120 @@ msgstr "Utilizadores Activos Diáriamente"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Em %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Média de utilizadores diários esta semana"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s da última semana"
-
 #: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Estatisticas"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Todos os Temas"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Explorar Temas"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99
+#: views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Alterar endereço de correio"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98
+#: views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Alterar senha"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Alterar senha ou correio electrónico"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "O código de confirmação foi reenviado!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr "A sua conta de utilizador %1$s foi eliminada com sucesso. Se desejar voltar mais tarde, pode voltar a registar-se na <a href=\"%2$s\">página de registo de utilizador</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "A comunidade dos Extras da Mozilla está triste por vê-lo partir."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirmar Senha"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Eliminar agora a minha conta de utilizador"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr "Não pode eliminar a sua conta se estiver incrito como <a href=\"%1$s\">autor de qualquer extra</a>. Para eliminar a sua conta, arranje outra pessoa no seu grupo de desenvolvimento para o eliminar da lista de autores dos seus extras. Depois já aqui poderá eliminar a sua conta."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Se tiver perguntas, por favor contacte %1$s para assistência."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "Tem de seleccionar a caixa \"Eu compreendo...\" antes de eliminar a sua conta."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Introduza a sua senha correctamente para efectuar este passo."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr "Ocorreu um erro desconhecido ao eliminar a sua conta. por favor contacte %1$s com o problema e nós eliminaremos a sua conta. pedimos desculpa pela incoveniência."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmar eliminação da conta"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Eliminar a conta de utilizador %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Adeus!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Não poderá entrar mais nos Extras da Mozilla."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr "Ao clicar \"eliminar\" a sua conta irá ser <strong>permanentemente eliminada</strong>. isto significa:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr "Os seus comentários e avaliações não serão eliminadas, mas não serão associadas a si."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr "Se tiver um problema específico nós podemos ajudar, por favor não elimine agora a sua conta, contacte-nos em %1$s e faremos o nosso melhor para ajudá-loa resolver."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Eu compreendo que este passo não pode ser anulado."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Eliminar utilizador"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58
+#: views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr "Uma mensagem de correio electrónico foi enviada para %1$s para confirmar o seu novo endereço. Para que a alteração seja realizada, tem que clicar na ligação fornecida nesta mensagem. Até lá pode continuar a entrar com o seu correio electrónico actual."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Eliminar conta de utilizador"
 
@@ -6648,7 +6150,9 @@ msgstr ""
 "-- A equipa dos Extras do %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Pediu uma alteração no endereço de correio electrónico dos Extras do %2$s.\n"
@@ -6684,115 +6188,101 @@ msgstr ""
 "Obrigado,\n"
 "-- A equipa dos Extras do %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Re-inicie a sua senha dos Extras %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Erro!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513
+#: controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Por favor confirme a alteração do seu endereço de correio electrónico em Extras do %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Successo!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr "O seu endereço de correio electrónico foi alterado com sucesso. A partir de agora, utilize %1$s para entrar."
 
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Sobre mim"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Apresente-se à comunidade, se desejar! Este texto irá aparecer publicamente na sua info.Quebras de linha serão mantidas, mas HTML não é permitido."
-
 #: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirmar senha"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Mostrar as colecções que criei no meu perfil de utilizador"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Mostrar as minhas colecções favoritas no meu perfil de utilizador"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Editar perfil do utilizador %s"
 
 #: views/users/pwreset.thtml:52
 #: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/register.thtml:58
+#: views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Endereço de Correio "
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73
+#: views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Primeiro nome"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89
+#: views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ocultar endereço de correio"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93
+#: views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL do Sítio Web"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79
+#: views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "último nome"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Login do Utilizador"
 
 #: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nova senha"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84
+#: views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Alcunha"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Senha antiga"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100
+#: views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Outras acções"
 
 #: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Senha"
 
@@ -6800,60 +6290,60 @@ msgstr "Senha"
 msgid "user_form_registration"
 msgstr "Novo Registo de Utilizador"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Lembrar-me neste computador"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Mostrar sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Guardar"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Entrar"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registar"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s utilizador dos Extras desde"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Criar uma nova conta de utilizador"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilidade do extra (fortemente recomendado)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Próximos eventos e concursos"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "De momento não existem notificações disponíveis para configurar."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr "De vez em quando a Mozilla poderá enviar-lhe uma mensagem de correio sobre os próximos lançamentos e eventos de extras. Seleccione os tópicos que lhe interessam abaixo:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr "A Mozilla reserva o direito de o cntactar individualmente sobre preocupações específicas sobre os extras hospedados."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "Houve erros nas alterações que efectuou. Corrija-os e volte a submeter."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Perfil actualizado."
 
@@ -6866,15 +6356,15 @@ msgstr "Reiniciar para %s"
 msgid "user_pwreset_header"
 msgstr "Reiniciar Senha"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Esqueceu a sua senha?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "A ligação para reiniciar a sua senha foi enviada para o seu endereço de correio electrónico."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Senha reiniciada com sucesso."
 
@@ -6886,7 +6376,7 @@ msgstr "Submeter alteração de senha"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Enviar ligação para reiniciar senha"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Extras"
@@ -6898,7 +6388,7 @@ msgid "user_register_click_confirm_link"
 msgstr "Foi enviada para a sua conta de correio %1$s uma ligação para activar a sua conta de utilizador. Tem de a ver antes de poder entrar nos Extras do %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr "Foi enviada uma mensagem de correio electrónico a %1$s para confirmar a sua conta. Antes de poder entrar, tem de activar a sua conta clicando na ligação fornecida nesta mensagem de correio electrónico."
@@ -6907,14 +6397,10 @@ msgstr "Foi enviada uma mensagem de correio electrónico a %1$s para confirmar a
 msgid "user_register_confirmation_link_text"
 msgstr "re-enviar a mensagem de confirmação"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Parabéns! A sua conta de utilizador foi criada com sucesso."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>O registo no AMO não <strong>é necessário</strong> se apenas quiser transferir e instalar extras públicos.</p><p>Apenas necessita de se registar se:</p><ul><li>Deseja submeter comentários para os extras</li><li>For um desenvolvedor de extras e desejar carregar o extra para o AMO</li></ul><p>Após registar-se com sucesso, ser-lhe-á enviado uma mensagem de correio de confirmação para o endereço que forneceu. Siga as instruções lá contidas para confirmar a sua conta.</p><p>Se quiser pode ler as nossas <a href='%1$s' title=Legal Notices'>Notícias Legais</a> e a <a href='%2$s' title='Privacy Policy'>Política de Privacidade</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -6922,32 +6408,23 @@ msgid "user_register_resend_confirmation_link"
 msgstr "Se não recebeu o correio electrónico de confirmação, verifique se o seu serviço de correio não o marcou como \"lixo electrónico\" ou \"spam\". Se necessitar, pode-nos pedir para %1$s para o endereço de correio electrónico acima mencionado."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Obrigado por se registar e bem-vindo a %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Bem vindo a addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76
+#: views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "É necessário o primeiro nome, último nome ou uma alcunha."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Colecções"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97
+#: views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notificações"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96
+#: views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Perfil do utilizador"
 
@@ -6955,64 +6432,51 @@ msgstr "Perfil do utilizador"
 msgid "user_verified_okay"
 msgstr "Verificado com Sucesso!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Eliminar conta de utilizador"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Editar Conta do Utilizador"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Sobre mim"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Extras por %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nome"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Perfil de Utilizador"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Colecções por %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Endereço de Correio Electrónico"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Colecções preferidas"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Página Inicial"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Alcunha"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Info do utilizador para %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Comentário de %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319
+#: controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Início de sessão do utilizador"
 
@@ -7040,482 +6504,6 @@ msgstr "Reiniciar Senha do Utilizador"
 msgid "users_register_pagetitle"
 msgstr "Registo de Novo Utilizador"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licença do código fonte para %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Ver todas as adições recentes"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Ver o top de transferências"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Ver o top de avaliações"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Extra seguinte"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Extra anterior"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "A versão mais recente compatível com"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Histórico Completo da Versão"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Mais Recentes:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Mais Populares:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Nós Recomendamos:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Actualizados recentemente:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "Ver Todos"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Ver todos os extras recomendados"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Avaliação mais Alta Primeiro"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Os mais Recentemente Actualizados Primeiro"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Os mais Populares Primeiro"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "A carregar"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Mostrar mais info"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Esta versão do seu extra não tem compatibilidade com o Firefox %1$s. A "
-#~ "Mozilla está a contar com o lançamento da próxima versão do Firefox para "
-#~ "breve, por isso teste o seu extra na nova versão e actualize a informação "
-#~ "sobre a compatibilidade. Pode saber mais <a href=\"%2$s\">aqui</a>. Isto "
-#~ "é apenas uma informação e pode continuar a submeter esta versão em addons."
-#~ "mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Extra desactivado com sucesso"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Editar Extra"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Extra activado com sucesso"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Descrição do Extra"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "ALUF"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Página inicial do Extra"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Nome do Extra"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Política de Privacidade"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Sumário do Extra"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Correio Electrónico de Suporte"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL de Suporte"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Notas da Versão"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nomear Extra"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Extra nomeado com sucesso!"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Vários comentários de utilizadores do extra (poderão ser comentários "
-#~ "externos)."
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visite a página do  %1$s para fazer alterações à sua submissão, ou %2$s "
-#~ "para voltar ao Painel de Controlo do Desenvolvedor."
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "clique aqui"
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Editar extra"
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Esta versão foi colocada no sandbox enquanto aguarda avaliações dos "
-#~ "sandbox testers e do editor de extras da Mozilla. Será notificado por "
-#~ "correio "
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Pode ler mais sobre o Sistema de comentários do Sandbox em %s."
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "aqui"
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Esta versão foi colocada no sandbox para ser utilizada por utilizadores "
-#~ "experientes. De maneira a poder ser apresentado no sítio público, tem de %"
-#~ "s o seu extra e iniciar um processo de avaliação."
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nomear"
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "A submissão do seu extra foi efectuada com sucesso."
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Como o seu extra é de cofiança, esta versão foi automaticamente aprovada "
-#~ "para a área pública."
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Submeter Extra"
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Extra actualizado com sucesso"
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Pode desejar que %s para aumentar o interesse no seu extra."
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "carregar um comentário"
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Nenhum autor encontrado [%s]"
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Eliminar"
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancelar"
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Tem a certeza que deseja cancelar a sua submissão?"
-#~ msgid "devcp_button_next"
-#~ msgstr "Seguinte"
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Mudar o tipo de extra:"
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Comentário actualizado do Developer."
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Adicionar pré-visualização"
-#~ msgid "devcp_details_author"
-#~ msgstr "Autor"
-#~ msgid "devcp_details_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Nenhum"
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categorias"
-#~ msgid "devcp_details_category"
-#~ msgstr "Categoria"
-#~ msgid "devcp_details_description"
-#~ msgstr "Descrição"
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Desactivado"
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detalhes"
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Comentários do Developer"
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Pré-visualizações"
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versões"
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Página Inicial"
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Nenhuma"
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Nenhuma captura"
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Nenhuma pré-visualização encontrada."
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Correio Electrónico de Suporte"
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Nenhum correio electrónico de suporte fornecido pelo desenvolvedor"
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL de Suporte"
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Nenhum url de suporte fornecido pelo desenvolvedor."
-#~ msgid "devcp_details_trusted"
-#~ msgstr "De Confiança"
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Nenhuma versão encontrada."
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancelar e retroceder"
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Sim, desactive-o"
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Tem a certeza que deseja desactivar este extra?"
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Desactivar este extra irá ocultá-lo das pesquisas e das listagens. Não "
-#~ "poderá ser transferido do sítio web e não terá verificações de "
-#~ "actualização através do cliente . O estra será eliminado efectivamente, "
-#~ "embora possa voltar para aqui e ser novamente activado quando lhe convier."
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Desactivar %s"
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Sim, activar"
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Tem a certeza que deseja activar este extra?"
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Activar este extra irá fazer com que mais uma vez ele apareça nas listas "
-#~ "de pesquisas. Poderá ser transferido a partir do sítio web assim como das "
-#~ "verificações de actualizações do cliente."
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Activar %s"
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Adicionar Autor"
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Endereço de Correio Electrónico do Autor"
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "eliminar"
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Nenhuma categoria disponível para este tipo de extra."
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Transferência incompleta"
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "Nenhum ficheiro carregado"
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Excede o tamanho máximo de carregamento"
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Adicionar �cone"
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Mudar �cone"
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Permitir que os utilizadores vejam online os ficheiros fonte"
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categorias"
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Idioma Pré-definido"
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Limpar apenas o ícone existente"
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Novo Ficheiro de �cone"
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "�cone"
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr ""
-#~ "pequena info adicional (como por exemplo um nome num dialecto local)"
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nome do "
-#~ "idioma simples</a>, tal como 'en-US'"
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Os ficheiros seleccionados serão eliminados."
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Ficheiros"
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Destino das Aplicações"
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Nenhuns Ficheiros."
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notas para o Avaliador"
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Actualizar"
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Os sumários estão limitados a um máximo de 250 caracteres.\n"
-#~ "(Você escreveu %s)"
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "O nome para o seu extra já existe na base de dados. Verifique por favor "
-#~ "que o: <br /><li>Seu GUIDs é igual. A causa mais comum para este erro é "
-#~ "GUIDs diferentes.</li><li>Não tem de duplicar a entrada na base de dados. "
-#~ "Se o fizer, deverá actualizar a entrada ou eliminaá-la e tentar novamente."
-#~ "</li>"
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Descreva as alterações feitas a esta actualização do extra."
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Nem todos os ficheiros de GUIDs são iguais"
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "Já existe uma versão idêntica (%s) para este extra e plataforma."
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Tem de fornecer os seguintes detalhes para nomeação."
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Não pode nomear um extra de pré-lançamento."
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Apenas pode nomear extras que estejam no sandbox."
-#~ msgid "devcp_error_saving"
-#~ msgstr "Ocorreu um erro ao tentar guardar os seus dados."
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Não tem autorização para actualizar este extra."
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Adicione Outro Ficheiro de Plataforma"
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Adicionar Autor"
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Eliminar"
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Categorias para o seu novo extra estarão disponíveis no passo seguinte."
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Nenhuma categoria disponível para este tipo de extra."
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Escreva uma descrição do seu extra."
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Escreva o nome do seu extra."
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Seleccione o tipo de extra que está a submeter."
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Escreva um sumário para o seu extra."
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Ficheiro do Extra"
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Ficheiro do Extra 2"
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Ficheiro do Extra 3"
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tipo do Extra"
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Permitir que os utilizadores vejam os ficheiros fonte online"
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Endereço de Correio Electrónico do Autor"
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Autores"
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categorias"
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Idioma Pré-definido"
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Descrição"
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Licença de Utilizador Final (ALUF)"
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Este Extra necessiata de software externo"
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Ficheiros"
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Página Inicial"
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Ficheiro do �cone"
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Nome"
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plataformas Suportadas"
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Isto é um pré-lançamento"
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Política de Privacidade"
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Isto é um extra específico de um sítio"
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Sumário"
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Correio Electrónico de Suporte"
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL de Suporte"
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Aplicações de Destino"
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Versão"
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Notas da Versão"
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Nenhuma"
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notas para o Avaliador"
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Porque o seu extra é de confiança, escolha para onde esta versão deve ir:"
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Público"
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Acordo do Desenvolvedor"
-#~ msgid "devcp_header_step1"
-#~ msgstr "Passo 1"
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Carregar Ficheiro"
-#~ msgid "devcp_header_step2"
-#~ msgstr "Passo 2"
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detalhes do Extra"
-#~ msgid "devcp_header_step3"
-#~ msgstr "Passo 3"
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Detalhes da Versão"
-#~ msgid "devcp_header_step4"
-#~ msgstr "Passo 4"
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Tradução"
-#~ msgid "devcp_header_step5"
-#~ msgstr "Passo 5"
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Sucesso"
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Os meus Extras"
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Voltar aos detalhes do extra"
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Tipo de extra detectado automaticamente: %s."
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "O idioma por defeito deste extra (%1$s [%2$s]) é diferente do idioma "
-#~ "actualmente seleccionado (%3$s [%4$s]). Os campos abaixo deverão ser "
-#~ "completados em %1$s."
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorrecto?"
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Tem a certeza que deseja eliminar este ficheiro?"
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Saltar a actualização da informação actual do meu extra"
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "As submissões de Extras estão desactivadas de momento. Por favor volte a "
-#~ "mais tarde."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Eu Aceito"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Eu Recuso"
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Este extra foi desactivado por um administrador."
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Desactivado"
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "De Confiança"
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Não tem nenhum extra. Clique %s para submeter um."
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "aqui"
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "tenha a certeza de %s para o seu tema."
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "carregar uma pré-visualização"
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Editar Versão"
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versão actualizada com sucesso."
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Novo"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Actualizado"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Idade do extra"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tipos de Extra"
-#~ msgid "editors_th_age"
-#~ msgstr "Idade"
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplicações"
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plataformas"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Tipos de Submissão"
-#~ msgid "error_notice"
-#~ msgstr "Notícia"
-#~ msgid "forum_save"
-#~ msgstr "Guardar"
-#~ msgid "home"
-#~ msgstr "início"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Extras experimentais"
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Voltar à pagina anterior"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Esta é a página %1$s de %2$s"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s extra corresponde"
-#~ msgstr[1] "%s extras correspondem"
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "Fonte RSS para os dados do sumário"
 
diff --git a/site/app/locale/ro/LC_MESSAGES/messages.po b/site/app/locale/ro/LC_MESSAGES/messages.po
index d34cb75..c056f08 100644
--- a/site/app/locale/ro/LC_MESSAGES/messages.po
+++ b/site/app/locale/ro/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: addons.mozilla.org\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-10 05:12-0700\n"
+"PO-Revision-Date: 2009-03-17 12:24+0200\n"
 "Last-Translator: alexxed <alexxed@gmail.com>\n"
 "Language-Team: Romanian <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,79 +13,71 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Anulează instalarea"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Descarcă acum %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Acceptă și descarcă"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accept, instalează"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Cutia cu nisip"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Actualizat în %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Versiunea %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "descărcări"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "descărcări în total"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "descărcări pe săptămână"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -93,90 +85,89 @@ msgstr[0] "%1$s supliment"
 msgstr[1] "%1$s suplimente"
 msgstr[2] "%1$s de suplimente"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per pagină"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sortează după:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "recomandat"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s nu este disponibil pentru %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "ÃŽnapoi la %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "ÃŽnapoi la recenzii..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Notă de apreciere:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Recenzie:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Trimite recenzia"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Adăugare recenzie pentru %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titlu/Sumar:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Șterge"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Răspunde"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Sigur doriți să ștergeți această recenzie?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nu"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Da"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Ștergere recenzie"
 
@@ -185,7 +176,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Recenzia a fost ștearsă cu succes."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Editare recenzie pentru %s"
@@ -199,18 +190,18 @@ msgstr ""
 "este %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
-"Notați vă rugăm: Înainte ca recenzia dumneavoastră să apară pe saitul public, "
-"ea va fi moderată de un editor."
+"Notați vă rugăm: Înainte ca recenzia dumneavoastră să apară pe saitul "
+"public, ea va fi moderată de un editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Răspunsul dezvoltatorului către:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -231,162 +222,131 @@ msgid "addon_review_pagetitle"
 msgstr "Recenzii pentru %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s a răspuns în %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Răspunsul dezvoltatorului: "
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Recenzia dumneavoastră a fost salvată cu succes. Mulțumim!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "de %1$s în %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "de %1$s în %2$s (notat cu %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Suplimentul următor"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Suplimentul precedent"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Legătură permanentă la această versiune"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
-msgstr "Cea mai recentă versiune compatibilă cu %1$s %2$s"
+msgstr ""
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Du-te"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Vezi profilul autorului"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Răsfoiți toate temele :: Suplimente %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Uitați-vă la %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Răsfoiți %1$s teme :: Suplimente %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Ce e asta?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Scrieți o recenzie"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Mai multe detalii"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Categorii"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Adaugă la o colecție:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Colecție nouă..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Selectați o colecție..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publică"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s a fost adăugat la colecția %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Ce e asta?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "și încă %1$s colecție"
-msgstr[1] "și încă %1$s colecții"
-msgstr[2] "și încă %1$s de colecții"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "recenzie detaliată"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nu-mi place"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Editați-vă recenzia"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Acest supliment are o politică de confidențialitate."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Groaznic"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Colecții asemănătoare"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Comentariile dezvoltatorului"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Pagina suplimentului"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr ""
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzii"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Suport"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "ÃŽmi place"
 
@@ -394,22 +354,19 @@ msgstr "ÃŽmi place"
 msgid "addons_display_long_description"
 msgstr "Descriere lungă"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Nu pot trăi fără"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Mai multe imagini"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Acest supliment nu este încă în nicio colecție."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Alte suplimente create de %1$s"
@@ -419,14 +376,14 @@ msgstr[2] "Alte suplimente de acești autori"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -441,7 +398,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -450,12 +407,12 @@ msgstr ""
 "pentru ca să poată fi tratat imediat. Recenziile nu sunt locul potrivit "
 "pentru rapoarte detaliate de defecte și dezvoltatorul v-ar putea cere date "
 "suplimentare pentru a remedia defectul. Pentru că noi nu furnizăm adresa "
-"dumneavoastră de email dezvoltatorului când scrieți o recenzie, nu veți putea "
-"fi contactat(ă) pentru a vi se cere mai multe detalii sau pentru a fi anunțat"
-"(ă) că defectul a fost reparat într-o versiune mai nouă."
+"dumneavoastră de email dezvoltatorului când scrieți o recenzie, nu veți "
+"putea fi contactat(ă) pentru a vi se cere mai multe detalii sau pentru a fi "
+"anunțat(ă) că defectul a fost reparat într-o versiune mai nouă."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -468,60 +425,66 @@ msgstr ""
 "pentru a vi se cere mai multe detalii sau pentru a fi anunțat(ă) că defectul "
 "a fost reparat într-o versiune mai nouă."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Apreciere"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "ÃŽmi place foarte mult"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Vă rugăm să nu postați defecte în recenzii. Dezvoltatorii nu văd adresa "
 "dumneavoastră de email și nu vă pot contacta pentru a vă cere detalii."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Scurt ghid pentru recenzii</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Vedeți <a href=\"%1$s\">secțiunea de suport</a> pentru a afla de unde puteți "
 "obține asistență pentru acest supliment."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Salvează"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Toată categoria %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Toate recenziile (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Vezi toate versiunile"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Istoria completă a versiunilor"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Arată sursa"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Arată statisticile"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Ce părere aveți?"
 
@@ -529,85 +492,24 @@ msgstr "Ce părere aveți?"
 msgid "addons_display_workswith"
 msgstr "Funcționează cu:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr ""
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populare"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Recomandat"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Abonare"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Răsfoiți suplimente"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Actualizat"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "de"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Colecții populare"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Colecții"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> supliment"
-msgstr[1] "<strong>%1$s</strong> suplimente"
-msgstr[2] "<strong>%1$s</strong> de suplimente"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Vezi toate colecțiile"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Colecțiile sunt un mod de a categorisi, amesteca și potrivi suplimente. "
-"Abonați-vă la colecțiile create de alți utilizatori sau creați propria "
-"colecție."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> abonat"
-msgstr[1] "<strong>%1$s</strong> abonați"
-msgstr[2] "<strong>%1$s</strong> de abonați"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Vă recomandăm"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871 controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -615,120 +517,84 @@ msgstr ""
 "dumneavoastră pe web.  Uitați-vă pe aici și alegeți ceva pentru a face un %1"
 "$s al dumneavoastră."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Ca acestea? Găsiți suplimente asemănătoare în colecția %1$s."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Cea mai nouă:"
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Ce sunt suplimentele?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introducere"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr ""
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Alte aplicații"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
-#: controllers/reviews_controller.php:425 controllers/search_controller.php:185
-#: controllers/search_controller.php:297 controllers/search_controller.php:301
-#: controllers/addons_controller.php:147 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370 controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874 controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543 controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132 controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71 controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Suplimente %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>supliment descărcat</span>"
-msgstr[1] "<strong>%1$s</strong> <span>suplimente descărcate</span>"
-msgstr[2] "<strong>%1$s</strong> <span>de suplimente descărcate</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>supliment folosit</span>"
-msgstr[1] "<strong>%1$s</strong> <span>suplimente folosite</span>"
-msgstr[2] "<strong>%1$s</strong> <span>de suplimente folosite</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Cele mai populare:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Vă recomandăm:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Actualizate recent:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Vedeți-le pe toate"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Vezi toate suplimentele nou create"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Toate suplimentele populare"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Toate suplimentele recomandate"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Vezi toate suplimentele actualizate recent"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Clic pe legătura de mai jos pentru a salva fișierul.</li><li>În "
@@ -736,56 +602,53 @@ msgstr ""
 "li><li>Clic pe butonul Instalare, localizați/selectați fișierul descărcat și "
 "apoi apăsați „OK�.</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Cum se instalează în Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Clic dreapta pe legătura de mai jos și alegeți „Salvează legătura "
 "ca...� (Save link as...) pentru a descărca și salva fișierul pe discul "
-"dumneavoastră.</li><li>În Mozilla Thunderbird, selectați Suplimente (Add-ons) "
-"din meniul Unelte (Tools).</li><li>Clicați pe butonul Instalează și "
+"dumneavoastră.</li><li>În Mozilla Thunderbird, selectați Suplimente (Add-"
+"ons) din meniul Unelte (Tools).</li><li>Clicați pe butonul Instalează și "
 "localizați/selectați fișierul pe care l-ați descărcat după care apăsați „OK�."
 "</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Cum se instalează în Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "arată suplimentele experimentale"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Du-te"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "De"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "pentru Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "pentru Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "pentru Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -793,11 +656,11 @@ msgstr ""
 "Pentru mai multe informații despre alte plugin-uri disponibile pentru "
 "navigatoare bazate pe Mozilla, vizitați %1$s (în engleză)"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Nu găsiți un plugin în această listă?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugin-urile ajută navigatorul dumneavoastră să efectueze funcții specifice "
@@ -806,24 +669,24 @@ msgstr ""
 "adaugă la o funcționalitate existentă deja."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Plugin-uri des folosite pentru %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugin-uri"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Suport prin documentație: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -831,41 +694,37 @@ msgstr ""
 "ca instalarea să poată continua:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Avanpremiere pentru %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr ""
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Între atâtea suplimente grozave disponibile, există ceva pentru oricine. Ca "
 "să începeți imediat, v-am pregătit o listă cu câteva dintre cele mai "
 "populare. Bucurați-vă de ele!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Suplimente recomandate"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Suplimente recomandate"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Resurse adiționale"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Centrul dezvoltatorilor Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Ne pare rău, aveți nevoie de un navigator bazat pe Mozilla (cum ar fi "
@@ -880,42 +739,43 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Învățați să %1$s la %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating__OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "faceți voi unul"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Puteți găsi mai multe motoare de căutare la %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motoare de căutare"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Mulțumiri speciale proiectului Mycroft pentru munca lor la motoarele de "
 "căutare Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Împărtășește"
 
@@ -951,17 +811,17 @@ msgstr "Versiune incompletă"
 msgid "addons_status_nominated"
 msgstr "În cutia cu nisip; Nominalizare publică"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "În cutia cu nisip; Așteaptă recenzia"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "ÃŽn cutia cu nisip"
@@ -970,36 +830,26 @@ msgstr "ÃŽn cutia cu nisip"
 msgid "addons_status_unknown"
 msgstr "Necunoscut"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Află mai multe despre acest supliment"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr ""
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr ""
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Fiți precaut(ă) cu vechile versiuni"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Aceste versiuni sunt afișate pentru referință și pentru a fi testate. Ar "
 "trebui să folosiți întotdeauna ultima versiune a unui supliment."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Istoria versiunilor și a modificărilor"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Istoricul versiunilor %1$s"
@@ -1034,424 +884,153 @@ msgstr "Administrare grup"
 msgid "admin_group_saved"
 msgstr "Grupul a fost salvat"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avansat"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Oricând"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Oricare"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Oricare"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplicație"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Potrivire cuvinte cheie"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Ultima actualizare"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Nume"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
-msgstr "Cele mai noi"
+msgstr "Cel mai nou"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Ultimele 3 luni"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Ultimele 6 luni"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Ieri"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Luna trecută"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Săptămâna trecută"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Anul trecut"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Pe pagină"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platformă"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitate"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Evaluare"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sortează după"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "până la"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Comută la căutarea avansată"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Tip"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "de la versiunea"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "ÃŽnainte"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "ÃŽnapoi"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignoră verificarea versiunii"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Numai pentru versiuni vechi de Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Puteți <a href=\"%1$s\">încerca o versiune mai veche</a> sau <a href=\"#\" "
 "onclick=\"%2$s\">puteți ignora această verificare</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "S-ar putea să meargă <a href=\"%1$s\">o versiune mai veche</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Acest supliment are nevoie <a href=\"%1$s\">Firefox %2$s</a> care nu e încă "
 "lansat"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Actualizați Firefox</a> pentru a folosi "
 "acest supliment"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr ""
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr ""
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Suplimente după nume"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Cele mai noi suplimente"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Suplimente populare"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Suplimente după evaluare"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Suplimente actualizate recent"
 
@@ -1460,728 +1039,105 @@ msgid "categories_current_title"
 msgstr "Categoria curentă"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Categorii"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Alegeți o categorie"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Toate de tipul %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Descrierea ar trebui să aibă mai puțin de %1$s caractere."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Colecția %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Toate suplimentele recomandate"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Eroare la ștergerea suplimentului!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Întâi cele mai bine cotate"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Eroare la salvarea suplimentului!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Întâi ultimele actualizate"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Eroare la salvarea comentariului!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Întâi cele mai populare"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Numele ar trebui să aibă mai puțin de %1$s caractere."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Toate de tipul %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Colecție negăsită!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Alegeți primele suplimente"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Creați o colecție"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Suplimente selectate"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr ""
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Colecții"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Află mai multe"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Adaugă la favorite"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Elimină din favorite"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr ""
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr ""
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s supliment în această colecție"
-msgstr[1] "%1$s suplimente în această colecție"
-msgstr[2] "%1$s de suplimente în această colecție"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr ""
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr ""
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr ""
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr ""
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr ""
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr ""
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr ""
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Nume"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularitate"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s descărcare în această săptămână"
-msgstr[1] "%1$s descărcări în această săptămână"
-msgstr[2] "%1$s de descărcări în această săptămână"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Suplimentele selectate vor fi eliminate după salvare"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr ""
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr ""
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr ""
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr ""
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr ""
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr ""
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Elimină"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr ""
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr ""
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr ""
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr ""
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr ""
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr ""
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr ""
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr ""
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr ""
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr ""
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr ""
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr ""
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr ""
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr ""
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr ""
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr ""
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Iconiță"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr ""
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr ""
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr ""
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr ""
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr ""
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr ""
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr ""
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr ""
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr ""
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Doar eu"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Eu și utilizatorii:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Adaugă"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Gestionează %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Gestionează conținutul colecției"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Suplimentele curente:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Setări avansate"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Gestionează permisiunile asupra colecției"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Renunță"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Șterge iconița"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Înlocuiește iconița"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Iconița va fi eliminată după ce faceți clic pe „%1$s� de mai jos"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Pseudonim disponibil"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr ""
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr ""
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr ""
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr ""
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr ""
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Suplimente"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avansat"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr ""
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permisiuni"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr ""
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Familie"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Descoperiți colectorul de suplimente"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Creați o colecție"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Du-te"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Colecții"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Colectorul de suplimente"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr ""
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Ce sunt colecțiile?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sortează după"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Alese de editori"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Favoritele mele"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Colecțiile mele"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populare"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Cele mai populare per total"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Cele mai populare de luna asta"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Cele mai noi"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Cele mai populare în săptămâna asta"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"Colecțiile sunt grupuri de extensii asemănătoare asamblate pentru a fi date "
-"ușor mai departe."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Adăugat %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr ""
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referință"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr ""
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr ""
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "ÃŽnchide"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr ""
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr ""
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr ""
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr ""
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Călătorie"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr ""
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr ""
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr ""
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr ""
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Dezvoltare web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Ce sunt colecțiile?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr ""
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr ""
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr ""
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr ""
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centrul de compatibilitate a suplimentelor"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Se încarcă datele..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Înapoi la pagina principală"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Raport de compatibilitate al suplimentului"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informații pentru dezvoltatorii de suplimente"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Ajustare parametru maxVersion fără încărcare"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Verifică starea suplimentelor mele"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Dacă aveți suplimente găzduite pe Mozilla Add-ons, <a href=\"%1$s\">vă rugăm "
 "să vă autentificați</a> pentru a analiza starea suplimentelor dumneavoastră "
 "pentru %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Sigla Mozilla Developer Center"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Nu aveți nici un supliment găzduit de Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Rezultatele verificării stării suplimentelor"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Se obține starea suplimentelor găzduite..."
 
@@ -2189,121 +1145,121 @@ msgstr "Se obține starea suplimentelor găzduite..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s utilizează %2$s (%3$s&#37; din total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
-"Suplimentele de mai jos au o rată de utilizare cunoscută de Mozilla ca 95% și "
-"sunt ordonate după utilizarea lor."
+"Suplimentele de mai jos au o rată de utilizare cunoscută de Mozilla ca 95% "
+"și sunt ordonate după utilizarea lor."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Arată raportul detaliat"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
-"Din cele %1$s suplimente care însumează o frecvență de utilizare cunoscută de "
-"Mozilla ca fiind de 95&#37;, <b>%2$s&#37;</b> sunt în prezent considerate "
+"Din cele %1$s suplimente care însumează o frecvență de utilizare cunoscută "
+"de Mozilla ca fiind de 95&#37;, <b>%2$s&#37;</b> sunt în prezent considerate "
 "compatibile cu ultimele versiuni de %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versiuni alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Suplimente compatibile cu o versiune alfa de %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versiuni beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr ""
-"Suplimente compatibile cu o versiune beta sau cu un candidat pentru lansarea %"
-"1$s"
+"Suplimente compatibile cu o versiune beta sau cu un candidat pentru lansarea "
+"%1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Ultima versiune"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Suplimente compatibile cu cele mai recente compilări de %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Alte versiuni"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Suplimente incompatibile cu orice versiune de %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Raport de compatibilitate al suplimentului"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informații pentru utilizatorii de suplimente"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Arată raportul de compatibilitate"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Pentru informații despre contribuție, vedeți %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "pagina de wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
-"Mozilla ar dori să mulțumească următoarelor persoane pentru contribuțiile lor "
-"la proiectul addons.mozilla.org de-a lungul anilor:"
+"Mozilla ar dori să mulțumească următoarelor persoane pentru contribuțiile "
+"lor la proiectul addons.mozilla.org de-a lungul anilor:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Dezvoltatori"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editori"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Traducători"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Alți colaboratori"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Foști dezvoltatori"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software și imagini"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Unele iconițe folosite provin din <a href=\"http://www.famfamfam.com/lab/"
@@ -2311,30 +1267,24 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
 msgstr ""
-"Unele pagini folosesc componente <a href=\"http://www.simile-widgets.org/"
-"timeplot/\">Timeplot</a>, aflate sub <a href=\"http://simile.mit.edu/license."
-"html\">Licență BSD</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2369,31 +1319,42 @@ msgstr "Tabolul de bord al statisticilor"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "Fișierul %1$s are o extensie nevalidă (%2$s). Extensii permise: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr ""
-"Fișierul %s nu poate fi salvat în baza de date. Vă rugăm să încercați din nou."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
-msgstr "Previzualizarea %1$s a fost înlocuită cu succes de fișierul %2$s ."
+msgstr ""
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr ""
-"Fișierul %s a fost încărcat cu succes. Puteți adăuga o explicație dedesubt."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(detectare automată)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Această versiune de supliment nu specifică compatibilitatea cu Firefox %1$s. "
+"Mozilla va lansa următoarea versiune de Firefox în curând, așa că vă rugăm "
+"să testați suplimentul în cea mai nouă versiune de Firefox și să actualizați "
+"informațiile despre compatibilitate. Puteți afla mai multe despre acest "
+"lucru <a href=\"%2$s\">aici</a>. Acest mesaj este informativ. Puteți "
+"continua să trimiteți această versiune de supliment către addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Se deschide într-o fereastră nouă"
@@ -2430,96 +1391,149 @@ msgstr "Pasul 5: Succes"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ajutor pentru trimiterea suplimentelor"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Supliment dezactivat cu succes"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Editare supliment"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Supliment activat cu succes"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Descriere supliment"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Pagina de start a suplimentului"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Nume supliment"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Titlu avanpremieră"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Activați"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Politică de confidențialitate"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Descriere sumară pentru supliment"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Email pentru suport"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL pentru suport"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Note asupra versiunii"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominalizare supliment"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Supliment nominalizat cu succes!"
 
 #: views/developers/addon_status.thtml:178
+msgid "devcp_addon_status_action_activate"
+msgstr ""
+
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Activați suplimentul dvs. pentru a fi afișat în listele publice și pentru a "
-"permite verificarea actualizărilor."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr ""
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr ""
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Dezactivați"
+msgstr ""
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Dezactivați suplimentul dvs. pentru a nu mai fi afișat în listele publice și "
-"pentru a întrerupe verificările de actualizare."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
-msgstr "Mută în cutia cu nisip"
+msgstr ""
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr ""
-"Mutați suplimentul înapoi în cutia cu nisip. Procedura este reversibilă."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
-msgstr "Nominalizare pentru public"
+msgstr ""
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Nominalizați suplimentul pentru a deveni public"
+msgstr ""
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
-msgstr "Faceți-l public"
+msgstr ""
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
-msgstr "Faceți suplimentul public din nou."
+msgstr ""
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
 msgstr ""
-"Suplimentul este <span class=\"inactive-0\">activ</span>. Aceasta înseamnă că "
-"suplimentul va fi afișat în toate listele corespunzătoare stării sale de mai "
-"sus."
 
 #: views/developers/addon_status.thtml:111
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Vă rugăm să îndepliniți criteriile de mai sus înainte de a finaliza "
-"suplimentul și a-l muta în <span class=\"status-1\">cutia cu nisip</span>."
 
 #: views/developers/addon_status.thtml:108
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Acum puteți să vă finalizați suplimentul și să îl mutați în <span class="
-"\"status-1\">cutia cu nisip</span> apăsând butonul de mai jos."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
-msgstr "S-a selectat cel puțin o categorie"
+msgstr ""
 
 #: views/developers/addon_status.thtml:101
 msgid "devcp_addon_status_criteria_description"
-msgstr "Descrierea suplimentului este obligatorie"
+msgstr ""
 
 #: views/developers/addon_status.thtml:99
 msgid "devcp_addon_status_criteria_name"
-msgstr "Numele suplimentului este obligatoriu"
+msgstr ""
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr ""
 
@@ -2527,6 +1541,10 @@ msgstr ""
 msgid "devcp_addon_status_criteria_preview"
 msgstr ""
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr ""
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr ""
@@ -2536,44 +1554,40 @@ msgstr ""
 msgid "devcp_addon_status_header"
 msgstr ""
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
-msgstr "Acțiuni disponibile"
+msgstr ""
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr ""
 
 #: views/developers/addon_status.thtml:97
 msgid "devcp_addon_status_header_criteria"
-msgstr "Criteriile de completare a suplimentului"
+msgstr ""
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
-msgstr "Stare: <span class=\"inactiv-1\">inactiv</span>"
+msgstr ""
 
 #: views/developers/addon_status.thtml:117
 msgid "devcp_addon_status_header_nomination"
-msgstr "Criteriile de nominalizare publică"
+msgstr ""
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
-msgstr "Stare de încredere: <span class=\"stare-4\">de încredere</span>"
+msgstr ""
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"Suplimentul este <span class=\"inactiv-1\">inactiv</span>. Asta înseamnă că "
-"suplimentul nu va apărea în nicio listă, indiferent de starea sa dinainte. "
-"Actualizările <b>nu</b> sunt furnizate suplimentului prin serviciul de "
-"verificare al actualizărilor."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
 
@@ -2620,10 +1634,122 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr ""
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
 msgstr ""
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Vizitați pagina %1$s pentru a face schimbări trimiterii dumneavoastră, sau %2"
+"$s pentru a reveni la panoul de control al dezvoltatorului."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "clic aici"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Editează supliment"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Această versiune a fost plasată în cutia cu nisip în timp ce așteaptă "
+"recenzia unui testor și a unui editor Suplimente Mozilla. Veți fi înștiințat "
+"prin e-mail când a avut loc această acțiune."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Puteți citi mai mult despre Sistemul de recenzie prin cutia cu nisip %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "aici"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Această versiune a fost plasată în cutia cu nisip pentru a fi utilizată de "
+"utilizatorii cu experiență. Pentru a fi afișată pe saitul public, trebuie să "
+"%s suplimentul și să trecepți prin procesul de recenzie."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominalizați"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Trimiterea suplimentului s-a încheiat cu succes."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Pentur că suplimentul dumneavoastră este unul de încredere, această versiune "
+"a fost automat aprobată pentru zona publică."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Trimitere supliment"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Supliment actualizat cu succes"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr ""
+"Ați putea dori să %s pentru a crește interesul pentru suplimentul "
+"dumneavoastră."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "încărcați o avanpremieră"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nu a fost găsit niciun autor [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Elimină"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Anulează"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Sigur doriți să anulați această trimitere?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "ÃŽnainte"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Schimbă titlul suplimentului:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Comentariile dezvoltatorului au fost actualizate."
+
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
 msgstr "Activ"
@@ -2633,7 +1759,7 @@ msgstr "Activ"
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s actualmente %2$s și %3$s"
+msgstr ""
 
 #: views/developers/dashboard.thtml:67
 msgid "devcp_dashboard_change_status"
@@ -2683,34 +1809,177 @@ msgid "devcp_dashboard_versions_new"
 msgstr ""
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr ""
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr ""
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr ""
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s %2$s fișier"
-msgstr[1] "%1$s %2$s fișiere"
-msgstr[2] "%1$s %2$s de fișiere"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Adaugă avanpremieră"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autori"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Niciunul"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categorii"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Categorie"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Descriere"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Dezactivat"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detalii"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Comentariile dezvoltatorului"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Avanpremiere"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versiuni"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Pagina de start"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Niciuna"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Fără titlu"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nu s-a găsit nicio avanpremieră."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Actualizează"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Email pentru suport"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Dezvoltatorul nu oferă un email pentru suport."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL pentru suport"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Dezvoltatorul nu oferă o adresă web pentru suport."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "De încredere"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Versiunea %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nu s-a găsit nicio versiune."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Renunță și mergi înapoi"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Da, dezactivează-l"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Sigur doriți să dezactivați acest supliment?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Dezactivarea acestui supliment îl va elimina din rezultatele căutărilor și "
+"din liste. Nu va mai putea fi descărcat de pe sait și nu va răspunde la "
+"cererile de actualizare. Suplimentul va fi efectiv șters, dar totuși vă "
+"puteți întoarce aici pentru a-l reactiva."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Dezactivează %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Da, activează-l"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Sigur doriți să activați acest supliment?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Activarea acestui supliment îl va face să apară din nou în rezultatele "
+"căutărilor și în liste. Va putea fi descărcat de pe sait și prin cererile de "
+"actualizare."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Activează %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr ""
@@ -2751,48 +2020,60 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Adaugă un autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Adresa de email a autorului"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Elimină"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
-msgstr "Adaugă un autor nou"
+msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Adaugă un autor"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
 
@@ -2801,26 +2082,26 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr ""
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Autor"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr ""
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Rol"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr ""
 
@@ -2880,55 +2161,55 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Comentariile dezvoltatorului"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Descriere supliment"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Acord de licențiere cu utilizatorul"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Politică de confidențialitate"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Descriere sumară pentru supliment"
 
@@ -2948,170 +2229,242 @@ msgstr ""
 msgid "devcp_edit_dt_manage_properties"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Nu este disponibilă nicio categorie pentru acest tip de supliment."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Transfer incomplet"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Niciun fișier încărcat"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Depășește mărimea maximă admisă pentru încărcări"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autori"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Adaugă iconiță"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Schimbă iconița"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Permite utilizatorilor să vadă sursa fișierelor"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categorii"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Limba implicită"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Acest supliment necesită alte programe"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Doar șterge iconița existentă"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Fișier nou cu iconiță"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Iconiță"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Alte informații despre localizare"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Aceasta este o ediție preliminară"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Acesta este un supliment pentru un sait anume"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Localizarea țintă"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "informație adițională pe scurt (cum ar fi dialectul)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Tip de supliment"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Setări administrative"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Limba implicită"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Alte setări"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr ""
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Necreditat"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "De încredere"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Pagina de start a suplimentului"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Nume supliment"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr ""
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr ""
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr ""
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Actualizează"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">nume simplu de "
+"localizare</a>, cum ar fi „en-US�"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Autori"
@@ -3190,14 +2543,69 @@ msgstr[0] "O actualizare în așteptare"
 msgstr[1] "Actualizări în așteptare (%s)"
 msgstr[2] "Actualizări în așteptare (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Fișierele bifate vor fi șterse."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Fișiere"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Aplicații țintă"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Niciun fișier."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Note către recenzent"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Actualizează"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nu aveți acces la supliment."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Descriera sumară este limitată la un maxim de 250 de caractere.\n"
+"(Ați introdus %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Numele suplimentului dumneavoastră există deja în baza de date. Asigurați-vă "
+"că <br /><li>GUID-urile se potrivesc. Cauza cea mai comună a acestei erori "
+"este nepotrivirea GUID-urilor.</li><li>Nu aveți o intrare duplicat în baza "
+"de date. Dacă aveți, ar trebui să actualizați acea intrare sau să o ștergeți "
+"și să încercați din nou.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3211,9 +2619,10 @@ msgstr "Consultați %s pentru referință."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "această pagină"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
 msgstr ""
+"Vă rugăm să descrieți schimbările făcute în această actualizare de supliment."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3229,6 +2638,10 @@ msgstr ""
 "Extensia de fișier (%s) nu este permisă pentru tipul de supliment ales. Vă "
 "rugăm folosiți una din următoarele: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nu se potrivesc toate GUID-urile fișierelor"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Vă rugăm nu selectați mai mult de 5 categorii."
@@ -3263,7 +2676,16 @@ msgstr ""
 "Această extensie de fișier (%s) nu este admisă pentru o iconiță. Vă rugăm "
 "folosiți una din următoarele: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"O versiune identică (%s) există deja pentru acest supliment și această "
+"platformă."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Lipsește install.rdf."
 
@@ -3271,9 +2693,9 @@ msgstr "Lipsește install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Au fost găsite următoarele erori în install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Vă rugăm să selectați un tip valid de supliment."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3341,6 +2763,18 @@ msgstr "Nu s-a găsit niciun ID pentru acest supliment în install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Nicio platformă selectată"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Trebuie să furnizați detaliile cerute pentru nominalizare."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nu puteți nominaliza o ediție preliminară a suplimentului."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Puteți nominaliza doar suplimente care se află în cutia cu nisip."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Vă rugăm selectați cel puțin o categorie."
@@ -3358,6 +2792,16 @@ msgstr ""
 "Această extensie de fișier (%s) nu este permisă pentru o avanpremieră. Vă "
 "rugăm folosiți una din următoarele: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "A apărut o eroare în timpul salvării datelor dumneavoastră."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Nu aveți permisiunea să actualizați acest supliment."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3370,81 +2814,293 @@ msgstr ""
 "Suplimentele nu pot folosi o adresă externă pentru actualizare (updateURL). "
 "Vă rugăm ștergeți această declarație din install.rdf și încercați din nou."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Vă rugăm încărcați un fișier."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Adaugă un alt fișier pentru o altă platformă"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Adaugă un autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Elimină"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categoriile pentru noul tip de supliment vor fi afișate în pasul următor."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Nu sunt categorii pentru acest tip de supliment."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Vă rugăm introduceți o descriere a suplimentului."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Vă rugăm introduceți numele suplimentului."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Vă rugăm alegeți tipul suplimentului pe care îl trimiteți."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Vă rugăm introduceți descrierea sumară a suplimentului."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Fișier supliment"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Fișier supliment 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Fișier supliment 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tip de supliment"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Permite utilizatorilor să vadă sursa fișierelor"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Adresa de e-mail a autorului"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autori"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categorii"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Limba implicită"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Descriere"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Acordul de licență cu utilizatorul (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Acest supliment necesită alte programe"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Fișiere"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Pagina de start"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Fișier iconiță"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Nume"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Platforme suportate"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Aceasta este o ediție preliminară"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Politică de confidențialitate"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Acesta este un supliment pentru un sait anume"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Descriere sumară"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Email pentru suport"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Adresă web pentru suport"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Aplicații țintă"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Versiune"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Note versiune"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Niciuna"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Note către recenzent"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Pentru că acest supliment este de încredere, vă rugăm alegeți unde ar trebui "
+"să meargă această versiune:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Cutia cu nisip"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Acord cu dezvoltatorul"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Pasul 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Încărcare fișier"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Pasul 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detalii despre supliment"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Pasul 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Detalii despre versiune"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Pasul 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localizare"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Pasul 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Succes"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Suplimentele mele"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Renunță"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr ""
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Mută în jos"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Mută în sus"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr ""
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr ""
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr ""
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr ""
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr ""
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Proprietar"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Vizualizator"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr ""
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr ""
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr ""
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr ""
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3461,12 +3117,12 @@ msgstr ""
 "disponbilă, se va afișa descrierea în limba implicită (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Panoul de control al administratorului"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Panoul de control al editorului"
 
@@ -3475,28 +3131,28 @@ msgid "devcp_myaddons_link"
 msgstr "Suplimentele mele"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Înapoi la pagina principală"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistici - Tablou de bord"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Trimite supliment"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Unelte pentru dezvoltatori"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
 msgstr ""
 
@@ -3504,23 +3160,34 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr ""
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "ÃŽnapoi la detaliile suplimentului"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominalizează %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Tipul suplimentului a fost detectat automat: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
 msgstr ""
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
 msgstr ""
@@ -3531,6 +3198,17 @@ msgstr ""
 "Dacă această avanpremieră nu va mai fi cea implicită, atunci o altă "
 "avanpremieră va deveni automat cea implicită."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Limba implicită pentru acest supliment (%1$s [%2$s]) este diferită de limba "
+"pe care ați selectat-o (%3$s [%4$s]). Câmpurile ar trebui completate în %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3538,13 +3216,13 @@ msgstr ""
 "Dacă faceți această avanpremieră cea implicită, o altă avanpremieră își va "
 "pierde proprietatea de a fi implicită."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr ""
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3573,42 +3251,42 @@ msgstr "Editează avanpremieră"
 msgid "devcp_preview_updated_successfully"
 msgstr "Avanpremieră actualizată cu succes."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr ""
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Șterge avanpriemiera"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr ""
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr ""
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr ""
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
 msgstr ""
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr ""
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
 msgstr ""
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
 msgstr ""
 
@@ -3616,14 +3294,14 @@ msgstr ""
 msgid "devcp_previews_filetype_info"
 msgstr ""
 "Folosiți formularul de mai jos pentru a încărca o captură de ecran a "
-"suplimentului în format PNG, JPG sau GIF. Imaginile mai mari de 700 pixeli în "
-"lățime și 525 pixeli în înălțime vor fi automat redimensionate."
+"suplimentului în format PNG, JPG sau GIF. Imaginile mai mari de 700 pixeli "
+"în lățime și 525 pixeli în înălțime vor fi automat redimensionate."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Adaugă avanpremieră"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Titlu avanpremieră"
 
@@ -3631,7 +3309,7 @@ msgstr "Titlu avanpremieră"
 msgid "devcp_previews_header_edit"
 msgstr "Editează avanpremieră"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr ""
 
@@ -3643,23 +3321,23 @@ msgstr "Fișier avanpremieră"
 msgid "devcp_previews_label_makedefault"
 msgstr "Această imagine de avanpremieră este cea implicită"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr ""
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr ""
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr ""
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr ""
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
 msgstr ""
 
@@ -3679,16 +3357,24 @@ msgstr "Editează avanpremieră"
 msgid "devcp_previews_submit_upload"
 msgstr "Încarcă o avanpremieră"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniatură"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr ""
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorect?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Sigur doriți să ștergeți acest fișier?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Va rugăm revizuiți și acceptați termenii acordului cu dezvoltatorul înainte "
@@ -3698,7 +3384,7 @@ msgstr ""
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
 msgstr ""
 
@@ -3706,6 +3392,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Tablou de bord"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Sări peste actualizarea informațiilor suplimentului"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3779,112 +3469,158 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr ""
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Trimiterea de suplimente este dezactivată. Vă rugăm încercați din nou mai "
+"târziu."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Nu accept"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Acest supliment a fost dezactivat de un administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Dezactivat"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "De încredere"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Ultima versiune:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nu aveți niciun supliment. Clic %s pentru a trimite unul."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "aici"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Vă rugăm %s pentru această temă."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "să încărcați o imagine de avanpremieră"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr ""
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr ""
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Ajutor"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr ""
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr ""
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr ""
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr ""
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr ""
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
 msgstr ""
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
 msgstr ""
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr ""
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr ""
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr ""
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr ""
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Renunță"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr ""
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr ""
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr ""
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr ""
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
 
@@ -3892,49 +3628,45 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr ""
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr ""
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr ""
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr ""
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr ""
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr ""
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
 msgstr ""
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr ""
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
 msgstr ""
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr ""
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr ""
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr ""
 
@@ -3943,11 +3675,11 @@ msgid "devcp_uploader_header_how"
 msgstr ""
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr ""
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr ""
 
@@ -3955,62 +3687,53 @@ msgstr ""
 msgid "devcp_uploader_how"
 msgstr ""
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr ""
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr ""
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Alta"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
 msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
 msgstr ""
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
 msgstr ""
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Toate"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr ""
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr ""
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4026,24 +3749,31 @@ msgid "devcp_uploader_title_update"
 msgstr ""
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Vedeți %s pentru referință."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "această pagină"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr ""
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Modificare versiune"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versiune actualizată cu succes."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4081,9 +3811,9 @@ msgstr ""
 #: views/developers/versions_delete.thtml:53
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s fișier"
-msgstr[1] "%s fișiere"
-msgstr[2] "%s de fișiere"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
@@ -4093,75 +3823,71 @@ msgstr ""
 #: views/developers/versions_delete.thtml:52
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s recenzie"
-msgstr[1] "%s recenzii"
-msgstr[2] "%s de recenzii"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
 msgid "devcp_versions_delete_sure"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Renunță"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Șterge fișierul"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr ""
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licență"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Șterge fișierul"
 
@@ -4170,63 +3896,59 @@ msgstr "Șterge fișierul"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr ""
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
+msgid "devcp_versions_edit_li_file"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Fișier"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platformă"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Mărime"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Stare"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Note asupra ediției"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr ""
 
@@ -4259,7 +3981,7 @@ msgstr "Stare"
 msgid "devcp_versions_th_version"
 msgstr "Versiune"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Acest supliment este dezactivat"
 
@@ -4272,7 +3994,8 @@ msgid "editor_review_error_file_not_pending"
 msgstr ""
 
 #. Actions are, for example: approving or rejecting
-#: controllers/components/editors.php:79 controllers/components/editors.php:182
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
 msgid "editor_review_error_no_action"
 msgstr ""
 
@@ -4281,7 +4004,8 @@ msgid "editor_review_error_no_applications"
 msgstr ""
 
 #. Comments are required when an editor approves or rejects an add-on.
-#: controllers/components/editors.php:84 controllers/components/editors.php:187
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
 msgid "editor_review_error_no_comments"
 msgstr ""
 
@@ -4301,7 +4025,7 @@ msgstr "Filtrează"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrează după tip/acțiune"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Jurnal de evenimente"
 
@@ -4363,7 +4087,7 @@ msgstr "Vezi intrările de la %s la %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Nu sunt recenzii în această perioadă."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Jurnalul recenziilor"
 
@@ -4387,24 +4111,24 @@ msgstr "Activitatea recentă a editorilor"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total recenzii"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzie supliment"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vă rugăm completați următoarele câmpuri:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Vă rugăm selectați cel puțin un fișier pentru recenziat."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Nu sunt permise recenzii pentru suplimentele dumneavoastră."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Programe externe"
 
@@ -4416,39 +4140,39 @@ msgstr "Adaugă favorit"
 msgid "editors_featured_add_feature_submit"
 msgstr "Adaugă"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Eșec la adăugarea favoritului."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Favorit adăugat cu succes."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Eșec la editarea favoritului."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Favorit editat cu succes."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Una sau mai multe localizări sunt invalide."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Eșec la eliminarea favoritului."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Favorit eliminat cu succes."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Suplimente excepționale"
 
@@ -4460,257 +4184,205 @@ msgstr "Du-te"
 msgid "editors_featured_remove_feature"
 msgstr "Elimină favorit"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtre coadă"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Legături spre ajutor"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Ghidul editorului"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Politică suplimente"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Aceste filtre vor rămâne aici pentru această sesiune sau până sunt curățate."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Nu sunt suplimente %s de recenziat."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 zi"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 oră"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Panoul de control al editorului"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "numai %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Ediție preliminară"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Compatibilitate cu %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr ""
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tipuri de suplimente"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplicație"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr ""
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforme"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr ""
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Rezultatele căutării filtrate: <strong>%1$s</strong> supliment"
-msgstr[1] "Rezultatele căutării filtrate: <strong>%1$s</strong> suplimente"
-msgstr[2] "Rezultatele căutării filtrate: <strong>%1$s</strong> de suplimente"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Curăță"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtrează"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Cozile de recenzie sunt dezactivate. Vă rugăm încercați din nou mai târziu."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Editează elementul"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Istoricul elementului"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr ""
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr ""
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Previzualizări"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Acțiune de recenzent"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr ""
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Trimite spre public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Cere o supra-recenzie"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Reține în cutia cu nisip"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Comentarii recenzent"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
 msgstr ""
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
-"Aceasta va marca cea mai recentă versiune a suplimentului și fișierele lui ca "
-"publice. Versiunile viitoare vor sta în cutia cu nisip până când sunt "
+"Aceasta va marca cea mai recentă versiune a suplimentului și fișierele lui "
+"ca publice. Versiunile viitoare vor sta în cutia cu nisip până când sunt "
 "recenziate de un editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Aceasta va reține suplimentul în cutia cu nisip."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Aceasta va aproba apariția pe saitul public a unei versiuni de supliment "
 "public din cutia cu nisip."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Aceasta va face ca versiunea din cutia cu nisip a suplimentului public să "
 "rămână în cutia cu nisip."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Dacă vă preocupă securitatea acestui supliment, probleme legate de drepturi "
 "de autor sau alte probleme pe care un administrator ar trebui să se uite, "
-"introduceți comentariile dumneavoastră în zona de mai jos. Ele vor fi trimise "
-"administratorilor, nu autorului."
+"introduceți comentariile dumneavoastră în zona de mai jos. Ele vor fi "
+"trimise administratorilor, nu autorului."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Compară cu versiunea publică"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Vezi conținutul"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autori:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categorii:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibilitate:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Descriere"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Comentariile dezvoltatorului"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Fișiere:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Istoricul elementului"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mesaj de nominalizare"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Avanpremiere"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Politică de confidențialitate"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Recenzie %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Note către recenzent"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Descriere sumară"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Note versiune"
 
@@ -4738,7 +4410,7 @@ msgstr "Nominalizare acordată/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominalizare respinsă/Cutia cu nisip"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nu s-au găsit recenzii anterioare."
 
@@ -4762,90 +4434,81 @@ msgstr "Respins/Cutia cu nisip"
 #: views/elements/developers/editors_review_history_item.thtml:90
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Arată sau ascunde răspunsul (%1$s)"
-msgstr[1] "Arată sau ascunde răspunsurile (%1$s)"
-msgstr[2] "Arată sau ascunde răspunsurile (%1$s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplicații:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "sau alegeți un răspuns salvat:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comentarii:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sisteme de operare:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Sus"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "înainte &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nu s-a găsit nicio avanpremieră."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; înapoi"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Coada recenziilor"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> din %2$s care sunt în coadă"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr ""
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Procesează acțiunea"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Acțiune"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comentarii"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dată"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recenzent"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Versiune/Fișier"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
 msgstr ""
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Recenzie procesată cu succes."
 
@@ -4869,7 +4532,7 @@ msgstr "Acțiune"
 msgid "editors_reviews_in_reply_to"
 msgstr "Răspuns pentru:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenziile au fost procesate cu succes!"
 
@@ -4881,79 +4544,87 @@ msgstr "Nu sunt recenzii de făcut."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Procesează recenzii"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Sait specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nou"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Actualizat"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Aplicație testată"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sisteme de operare testate"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Informații adiționale"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Supliment"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Tip"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tipuri de suplimente"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Vechime"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplicații"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restricție la localizări?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr ""
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr ""
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforme"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr ""
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Tipuri de trimiteri"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s zile"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ore"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minute"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Acces interzis"
 
@@ -4961,32 +4632,30 @@ msgstr "Acces interzis"
 msgid "error_access_denied_message"
 msgstr "Nu sunteți autorizat(ă) să vedeți această pagină."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr ""
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
-#: controllers/reviews_controller.php:77 controllers/reviews_controller.php:240
+#: controllers/reviews_controller.php:77
+#: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197 controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Supliment negăsit"
 
@@ -4998,7 +4667,7 @@ msgstr "Suplimentul nu poate fi văzut aici."
 msgid "error_addon_selfreview"
 msgstr "Nu puteți recenzia propriul supliment."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Niciun supliment în această categorie!"
 
@@ -5006,91 +4675,86 @@ msgstr "Niciun supliment în această categorie!"
 msgid "error_collection_feed_notfound"
 msgstr "Nu s-a găsit fluxul suplimentelor."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Aceasta nu este o adresă vaildă de email."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Acest câmp nu poate fi lăsat necompletat."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Fișier negăsit!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Eroare în fișier: nu·există %s."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr ""
 "Sunt erori în acest formular. Vă rugăm corectați-le și trimiteți-l din nou."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha invalid, vă rugăm încercați din nou!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
-"Acest URL are un format invalid. URL-urile valide arată ca http://exemplu.com/"
-"paginamea."
+"Acest URL are un format invalid. URL-urile valide arată ca http://exemplu."
+"com/paginamea."
 
 #. %s is a string representing what's missing.  Example:  file_id
-#: controllers/downloads_controller.php:65 controllers/users_controller.php:185
-#: controllers/users_controller.php:264 controllers/users_controller.php:559
-#: controllers/users_controller.php:653 controllers/reviews_controller.php:71
+#: controllers/downloads_controller.php:65
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
+#: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
-#: controllers/reviews_controller.php:475 controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/reviews_controller.php:475
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Argument lipsă: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Nu există fișiere"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Avertisment"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Avanpremieră negăsită!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Trebuie să selectați o evaluare."
 
@@ -5098,81 +4762,73 @@ msgstr "Trebuie să selectați o evaluare."
 msgid "error_user_already_confirmed"
 msgstr "Acest cont de utilizator este deja confirmat."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Cod de confirmare invalid!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Parolele nu se potrivesc."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Această adresă de email este luată deja de un alt utilizators."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Cererea de schimbare a emailului a expirat. Vă rugăm să vă schimbați adresa "
 "de email din nou în profilul de utilizator și odată ce primiți mesajul de "
 "confirmare, urmați legătura din el pentru a activa noua adresa de email."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Porecla este deja luată."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Utilizator inexistent!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
 msgstr ""
-"Vă rugăm confirmați contul dumneavoastră cu codul pe care l-ați primit prin e-"
-"mail."
+"Vă rugăm confirmați contul dumneavoastră cu codul pe care l-ați primit prin "
+"e-mail."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Ați greșit utilizatorul sau parola!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Nu s-a găsit versiunea!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Ați introdus o parolă greșită!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Continuare"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Află mai multe despre %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5180,8 +4836,7 @@ msgstr[0] "%1$s recenzie"
 msgstr[1] "%1$s recenzii"
 msgstr[2] "%1$s de recenzii"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Mai multe din"
 
@@ -5210,7 +4865,7 @@ msgstr ""
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
 msgid "file_browser_title"
-msgstr "%1$s :: Răsfoire fișiere :: Suplimente %2$s"
+msgstr ""
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
@@ -5220,136 +4875,134 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr ""
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Despre"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "Întrebări frecvente"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Cele mai întâlnite întrebări"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Toate drepturile rezervate."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Drepturi de autor"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Merite"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla furnizează legături către aceste aplicații ca o favoare și nu "
 "reprezintă persoanele care furnizează aplicațiile sau alte informații legate "
-"de ele. Orice întrebări, plângeri sau revendicări legate de aplicații trebuie "
-"să fie îndreptate către furnizorul aplicației."
+"de ele. Orice întrebări, plângeri sau revendicări legate de aplicații "
+"trebuie să fie îndreptate către furnizorul aplicației."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Du-te"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Mențiuni legale"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Alte limbi:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Politică de confidențialitate"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Salvează"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Dicționar"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Dicționare"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Extensie"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Extensii"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Pachet de limbă (Supliment)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Pachete de limbă (Supliment)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Pachet de limbă (Aplicație)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Pachete de limbă (Aplicație)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Modul"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Module"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor de căutare"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Motoare de căutare"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Temă"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Teme"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr ""
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "ÃŽnapoi la Suplimente %1$s"
@@ -5358,86 +5011,37 @@ msgstr "ÃŽnapoi la Suplimente %1$s"
 msgid "header_main_firefox_header"
 msgstr "Suplimente Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Suplimente <em>pentru</em> <img alt=\"Firefox\" src=\"%1$s\" /> "
-"<strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Suplimente"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Suplimente <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Suplimente Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Suplimente <em>pentru</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Suplimente Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Suplimente <em>pentru</em> <img alt=\"sunbird\" src=\"%1$s\" /> "
-"<strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Suplimente Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Suplimente <em>pentru</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr ""
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr ""
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr ""
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr ""
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Suplimente"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Autentificare"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Ieșire"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Contul meu"
 
@@ -5445,67 +5049,47 @@ msgstr "Contul meu"
 msgid "header_navlink_register"
 msgstr "ÃŽnregistrare"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr ""
-"<a href=\"%1$s\">Înregistrați-vă</a> sau <a href=\"%2$s\">autentificați-vă</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Unelte"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Avanpremieră pentru %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Autentificați-vă</a> pentru a instala acest supliment"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Adaugă la %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Adaugă %1$s la %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Descarcă %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Acest supliment nu este disponibil."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista de pachete de limbi și dicționare."
 
@@ -5517,8 +5101,8 @@ msgstr "Descarcă dicționarul"
 msgid "langtools_download_langpack"
 msgstr "Descarcă pachetul de limbă"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dicționare și pachete de limbă"
 
@@ -5530,72 +5114,36 @@ msgstr "Instalează dicționarul"
 msgid "langtools_install_langpack"
 msgstr "Instalează pachetul de limbă"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Dicționar"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Pachet de limbă"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Limbă"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr ""
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr ""
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr ""
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr ""
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr ""
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr ""
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr ""
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr ""
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Clic aici pentru a merge la pagina principală."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dată"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Descărcări"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Nume supliment"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Evaluare"
@@ -5620,20 +5168,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Dicționare și pachete de limbă"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Plugin-uri"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Teme"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Găsește suplimente pentru alte aplicații"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "alții"
 
@@ -5641,33 +5196,17 @@ msgstr "alții"
 msgid "page_title_appversions"
 msgstr "Versiuni de aplicație"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Colectorul de suplimente"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr ""
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr ""
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr ""
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Merite"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr ""
+#, fuzzy
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "Cele mai întâlnite întrebări"
+msgstr ""
 
 #: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
@@ -5693,15 +5232,15 @@ msgstr "Sistemul de recenzie prin cutia cu nisip"
 msgid "page_title_submissionhelp"
 msgstr "Ajutor pentru trimiterea suplimentelor"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versiuni valide de aplicație"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Suplimentele trimise către Suplimente Mozilla trebuie să aibă un "
@@ -5709,7 +5248,7 @@ msgstr ""
 "Numai versiunile afișate mai jos sunt permise pentru aceste aplicații."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5718,15 +5257,19 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "aici"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versiuni"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Pagina cu informații despre cutia cu nisip"
 
@@ -5734,6 +5277,12 @@ msgstr "Pagina cu informații despre cutia cu nisip"
 msgid "pagination_next_page"
 msgstr "următoarea"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Pagina %1$s din %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "precedenta"
@@ -5768,15 +5317,15 @@ msgstr ""
 "Dacă este dificil de citit, puteți să <a href=\"%1$s\">încercați alte "
 "cuvinte</a> sau să <a href=\"%2$s\">ascultați ceva</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Sunteți om?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Ce e asta?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Eroare la marcarea acestei recenzii!"
 
@@ -5784,7 +5333,7 @@ msgstr "Eroare la marcarea acestei recenzii!"
 msgid "review_flag_reason_bug_support"
 msgstr "Raport de defect sau cerere de asistență amplasate greșit"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Raportează această recenzie (alegeți un motiv)"
 
@@ -5800,8 +5349,8 @@ msgstr "Altele (vă rugăm să specificați)"
 msgid "review_flag_reason_spam"
 msgstr "Spam sau alt conținut care nu e o recenzie"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr ""
 "Vă mulțumim; recenzia a fost marcată pentru aprobare de către un editor."
@@ -5817,14 +5366,14 @@ msgstr ""
 "marca pentru a fi recenziată de către un editor."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
 "about your experience with the add-on.  Give specifics and helpful details, "
 "such as what features you liked and/ordisliked, how easy to use it is, and "
-"any disadvantages it has.  Avoid genericlanguage such as calling it \"Great\" "
-"or \"Bad\" unless you can give reasons whyyou believe this is so.</"
+"any disadvantages it has.  Avoid genericlanguage such as calling it \"Great"
+"\" or \"Bad\" unless you can give reasons whyyou believe this is so.</"
 "li><li>Please do not post bug reports in reviews. We do not make your email "
 "address available to add-on developers and they may need to contact you to "
 "help resolveyour issue. See the <a href=\"%1$s\">support section</a> to find "
@@ -5834,127 +5383,104 @@ msgstr ""
 "a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Recenzii pentru %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Suplimente excepționale"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Cele mai noi suplimente"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Suplimente populare"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Suplimente actualizate"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Caută"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr ""
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr ""
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr ""
 "Căutarea este actualmente dezactivată. Vă rugăm să încercați din nou mai "
 "târziu."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "toate suplimentele"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "toate colecțiile"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "caută"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "caută colecții"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Caută suplimente"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Clic pentru a introduce termeni de căutare"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "în"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Toate motoarele de căutare"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Răsfoiți motoarele de căutare"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s supliment găsit"
+msgstr[1] "%s suplimente găsite"
+msgstr[2] "%s de suplimente găsite"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Niciun rezultat găsit."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Căutare suplimente"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Flux cu rezultatele căutării"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Rezultatele căutării după: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Unelte pentru admin"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Unelte pentru dezvoltatori"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Unelte pentru editori"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Bun venit"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Bun venit, %s"
@@ -5963,7 +5489,7 @@ msgstr "Bun venit, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Un dicționar"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Suplimente excepționale"
 
@@ -5971,7 +5497,7 @@ msgstr "Suplimente excepționale"
 msgid "sidebar_pitch_looking_for"
 msgstr "Căutați:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Cele mai noi suplimente"
 
@@ -5979,7 +5505,7 @@ msgstr "Cele mai noi suplimente"
 msgid "sidebar_pitch_search"
 msgstr "Un motor de căutare"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Abonează-mă la"
 
@@ -5987,23 +5513,24 @@ msgstr "Abonează-mă la"
 msgid "sidebar_pitch_theme"
 msgstr "O temă"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Suplimente actualizate"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KO"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Neevaluat încă"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Evaluat la %s stele din 5"
@@ -6040,13 +5567,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "S-a creat %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "S-a lansat %1$s"
@@ -6059,179 +5586,179 @@ msgstr "ÃŽnchide"
 msgid "statistics_help_link"
 msgstr "Ajutor"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "sau, selectați alt supliment"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "sau, selectați un supliment cu statistici publice"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Selectați un supliment pentru a-i vedea statisticile"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Alegeți un supliment pentru a-i vedea statisticile"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Alegeți un supliment cu statistici publice"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistici - Tablou de bord"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Afișează statisticile"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Vezi acest tabel în format CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "niciunul"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Șterge acest grafic"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grupare după: zi"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grupare după: lună"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grupare după: săptămână"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr ""
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s găsite în plajă"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Adaugă grafic"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Adaugă un alt grafic"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ascunde totalul"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Arată totalul"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Desenează totalul pe acest grafic"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Afișează datele (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Descarcă un fișier cu aceste date separate prin virgule (CSV)"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ascunde evenimentele %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Arată evenimentele %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Arată datele de lansare pe grafic"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ascunde evenimentele Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Arată evenimentele Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Arată datele de lansare ale Firefox pe grafic"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Pliază graficul"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandează graficul"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Redimensionează graficul"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Utilizatori activi zilnic"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplicație"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Personalizat"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Descărcări"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem de operare"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stare supliment"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sumar"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Versiune supliment"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplicație"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistem de operare"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Stare supliment"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Necunoscut"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Versiune supliment"
 
@@ -6255,8 +5782,8 @@ msgstr ""
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
 msgstr ""
-"Tabloul de bord pentru statistici este dezactivat acum. Vă rugăm să încercați "
-"mai târziu."
+"Tabloul de bord pentru statistici este dezactivat acum. Vă rugăm să "
+"încercați mai târziu."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
@@ -6269,7 +5796,7 @@ msgstr "Setările dumneavoastră au fost actualizate!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistici - Tablou de bord"
 
@@ -6297,105 +5824,109 @@ msgstr "Micșorează"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Micșorează cu o lună"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Sumar zilnic al statisticilor pentru %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Flux RSS al sumarului datelor"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistici pentru %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Implicit, doar dumneavoastră și Mozilla puteți accesa informațiile prezente "
 "în tabloul de bord. Puteți permite și publicului larg acest lucru pentru ca "
 "oricine să poată vedea statisticile suplimentului."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Acces la tabloul de bord"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privat"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Numai dumneavoastră și Mozilla puteți vedea statisticile suplimentului"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Oricine poate vedea statisticile acestui supliment"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Schimbă setările"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Vă rugăm să tratați această informație ca fiind confidențială."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Acest tablou de bord este acum <b>privat</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Acest tablou de bord este acum <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Blocat"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "ÃŽnapoi la tabloul de bord"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Salvează setările"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistici - Setările tabloului de bord pentru %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Deblocat"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Ap"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "SO"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Nec"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Descărcări în medie pe zi"
 
@@ -6407,7 +5938,7 @@ msgstr "Descărcări"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Numărătoarea din ultima zi"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Descărcări în ultimele 7 zile"
 
@@ -6425,7 +5956,7 @@ msgstr "Din %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Încă nu sunt date"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Media utilizatorilor activi zilnic"
 
@@ -6451,67 +5982,53 @@ msgstr "Utilizatori activi zilnic"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "ÃŽn %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr ""
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr ""
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistici pentru %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Toate temele"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Răsfoiți temele"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Schimbă adresa de email"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Schimbare parolă"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr ""
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Codul de confirmare a fost trimis din nou!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Contul dumneavoastră de utilizator %1$s a fost șters cu succes. Dacă doriți "
 "să reveniți ulterior, vizitați <a href=\"%2$s\">pagina de înregistrare</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Comunitatea Suplimente Mozilla e tristă că vă vede plecând."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Confirmați parola"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Șterge contul meu acum"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Nu puteți să vă ștergeți contul de utilizator dacă sunteți afișat ca <a href="
@@ -6521,74 +6038,75 @@ msgstr ""
 "putea să vă ștergeți contul."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr ""
 "Dacă aveți și alte întrebări, vă rugăm să contactați %1$s pentru asistență."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Trebuie să bifați căsuța „Înțeleg că...� înainte de a vă șterge contul."
+msgstr ""
+"Trebuie să bifați căsuța „Înțeleg că...� înainte de a vă șterge contul."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Vă rugăm să introduceți parola corect pentru a trece peste acest pas."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "A intervenit o eroare necunoscută în timpul ștergerii contului. Vă rugăm să "
 "contactați %1$s în legătură cu această problemă și vă vom șterge noi contul. "
 "Ne cerem scuze pentru dificultățile create."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirmați ștergerea contului"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Ștergere cont de utilizator %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "La revedere!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "De acum nu vă veți mai putea autentifica în Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "Prin clic pe „ștergere�, contul dumneavoastră va fi <strong>șters permanent</"
 "strong>. Asta înseamnă că:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Recenziile și evaluările nu vor fi șterse, dar nu vor mai fi asociate cu "
 "dumneavoastră."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Dacă aveți o problemă cu care vă putem ajuta, vă rugăm să nu vă ștergeți "
 "contul acum. Contactați-ne la %1$s și vom face tot posibilul să vă sprijinim "
 "în rezolvarea problemei."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Înțeleg că acest pas nu are cale de întoarcere."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Utilizator șters"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "S-a trimis un email la %1$s, pentru a confirma noua dumneavoastră adresă de "
@@ -6596,7 +6114,7 @@ msgstr ""
 "furnizată în email. Până atunci, puteți să vă autentificați cu adresa de "
 "email curentă."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Șterge contul de utilizator"
 
@@ -6624,10 +6142,13 @@ msgstr ""
 "-- Echipa Suplimente %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
-"Ați făcut o cerere de schimbare a adresei de email pentru „Suplimente %2$s�.\n"
+"Ați făcut o cerere de schimbare a adresei de email pentru „Suplimente %2"
+"$s�.\n"
 "\n"
 "Pentru a confirma noua adresă, vă rugăm să urmați legătura de mai jos cu un "
 "clic sau să o copiați și să o lipiți în bara de adrese a programului de "
@@ -6665,105 +6186,91 @@ msgstr ""
 "Vă mulțumim,\n"
 "-- Echipa Suplimente %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Resetați-vă parola dumneavoastră pe Suplimente %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Eroare!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr ""
 "Vă rugăm să confirmați schimbarea adresei de email pentru „Suplimente %1$s�"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Succes!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
-"Adresa dumneavoastră de email a fost schimbată cu succes. De acum înainte, vă "
-"rugăm să folosiți %1$s pentru a vă autentifica."
-
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr ""
+"Adresa dumneavoastră de email a fost schimbată cu succes. De acum înainte, "
+"vă rugăm să folosiți %1$s pentru a vă autentifica."
 
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Confirmare parolă"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr ""
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr ""
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Editare profil utilizator pentru %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
-msgstr "Adresă de email"
+msgstr "Adresă email"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Prenume"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ascunde adresa de email"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL sait web"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Nume"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Autentificare utilizator"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Parolă nouă"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Pseudonim"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Parolă veche"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Alte acțiuni"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Parolă"
 
@@ -6771,67 +6278,67 @@ msgstr "Parolă"
 msgid "user_form_registration"
 msgstr "ÃŽnregistrare utilizator nou"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Ține-mă minte pe acest calculator"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Arată cutia cu nisip?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Salvează"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Autentificare"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "ÃŽnregistrare"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Utilizator Suplimente %s din"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Creează un nou cont de utilizator"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Compatibilitate supliment (recomandat cu tărie)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Evenimente viitoare și concursuri"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Actualmente nu sunt notificări disponibile pentru a fi configurate."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
-"Din când în când, Mozilla vă poate trimite câte un email despre ediții noi și "
-"evenimente legate de suplimente. Vă rugăm să selectați subiectele de care "
+"Din când în când, Mozilla vă poate trimite câte un email despre ediții noi "
+"și evenimente legate de suplimente. Vă rugăm să selectați subiectele de care "
 "sunteți interesat mai jos:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla își rezervă dreptul de a vă contacta individual despre probleme "
 "specifice legate de suplimentele găzduite de dumneavoastră."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Sunt erori în schimbările pe care le-ați făcut. Vă rugăm corectați-le și "
 "trimiteți din nou. "
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil actualizat."
 
@@ -6844,17 +6351,17 @@ msgstr "Resetare parolă pentru %s"
 msgid "user_pwreset_header"
 msgstr "Resetare parolă"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Ați uitat parola?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "Legătura de resetare a parolei a fost trimisă pe adresa dumneavoastră de "
 "email."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Parolă resetată cu succes."
 
@@ -6866,7 +6373,7 @@ msgstr "Trimite schimbarea de parolă"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Trimite legătura de resetare a parolei"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Suplimente %s"
@@ -6877,30 +6384,26 @@ msgstr "Suplimente %s"
 msgid "user_register_click_confirm_link"
 msgstr ""
 "O legătură pentru a activa contul dumneavoastră a fost trimisă pe adresa "
-"dumneavoastră de e-mail %1$s. Trebuie să o urmați înainte de a vă autentifica "
-"în Suplimente %2$s."
+"dumneavoastră de e-mail %1$s. Trebuie să o urmați înainte de a vă "
+"autentifica în Suplimente %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
-"Un email a fost trimis pe adresa %1$s pentru a confirma contul dumneavoastră. "
-"Înainte să vă puteți autentifica, trebuie să confirmați contul dumneavoastră "
-"clicând pe legătura din acest email."
+"Un email a fost trimis pe adresa %1$s pentru a confirma contul "
+"dumneavoastră. Înainte să vă puteți autentifica, trebuie să confirmați "
+"contul dumneavoastră clicând pe legătura din acest email."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "retrimite mesajul de confirmare"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Felicitări! Contul dumneavoastră a fost creat cu succes."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -6912,28 +6415,20 @@ msgstr ""
 "email menționată mai sus."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Vă mulțumim pentru înregistrare și vă urăm bun venit în %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr ""
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "E necesar un prenume, nume sau un pseudonim."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Colecții"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Notificări"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil autor"
 
@@ -6941,63 +6436,50 @@ msgstr "Profil autor"
 msgid "user_verified_okay"
 msgstr "Verificat cu succes!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Ștergere cont de utilizator"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Editare cont utilizator"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Despre mine"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Suplimente create de %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Nume"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil autor"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr ""
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
-msgstr "Adresă de email"
-
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr ""
+msgstr "Adresă email"
 
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Pagina personală"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Pseudonim"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Info utilizator pentru %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Recenzii făcute de %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Autentificare utilizator"
 
@@ -7028,21 +6510,3 @@ msgstr "Resetare parolă utilizator"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "ÃŽnregistrare utilizator nou"
-
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr ""
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Vezi toate cele adăugate recent"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Vezi cele mai descărcate"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Vezi cele mai apreciate"
diff --git a/site/app/locale/ru/LC_MESSAGES/messages.po b/site/app/locale/ru/LC_MESSAGES/messages.po
index f8fd533..cac39ce 100644
--- a/site/app/locale/ru/LC_MESSAGES/messages.po
+++ b/site/app/locale/ru/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-05 00:59+0300\n"
+"PO-Revision-Date: 2009-01-30 18:45+0300\n"
 "Last-Translator: Alexander Slovesnik <unghost@mozilla-russia.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,80 +20,72 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Отменить у�тановку"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Загрузить %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Прин�ть и загрузить"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Прин�ть и у�тановить"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Публичные"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "«Пе�очница»"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Обновлено %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Вер�и� %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "загрузки"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "загрузок в�его"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "загрузок еженедельно"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -101,93 +93,92 @@ msgstr[0] "%1$s дополнение"
 msgstr[1] "%1$s дополнени�"
 msgstr[2] "%1$s дополнений"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "на �траницу"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Сортировать по:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "�к�периментальные"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "рекомендуемые"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s недо�тупен дл� платформы %2$s."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Вернуть�� к %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Вернуть�� к отзывам..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Рейтинг:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Отзыв:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Отправить ваш отзыв"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Добавление отзыва о %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Заголовок:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Удалить"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Ответить"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Вы дей�твительно хотите удалить �тот отзыв?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "�ет"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Да"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Удалить отзыв"
 
@@ -196,7 +187,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Отзыв у�пешно удалён."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Редактировать отзыв на %s"
@@ -210,17 +201,17 @@ msgstr ""
 "отзывов вмещает от 10 до 100 �имволов; вы ввели %1$s �имвола(ов)."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "Примечание: перед публикацией ваш отзыв будет проверен рецензентом."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Ответ разработчика на:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -240,32 +231,45 @@ msgstr "Отзывы о %s"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Ответ от %1$s о�тавлен %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Ответ разработчика:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Ваш отзыв у�пешно добавлен. Спа�ибо!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "от %1$s о�тавлен %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "Отзыв от %1$s о�тавлен %2$s (оценка %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Следующее дополнение"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Предыдущее дополнение"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "По�то�нна� ��ылка на �ту вер�ию"
@@ -274,27 +278,28 @@ msgstr "По�то�нна� ��ылка на �ту вер�ию"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "По�ледн�� вер�и�, �овме�тима� � %1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Перейти"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Про�мотреть профиль автора"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
+#, fuzzy
 msgid "addons_browse_all_themes_title"
-msgstr "Обзор в�ех тем :: Дополнени� %1$s"
+msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Обзор категории %s"
@@ -303,105 +308,63 @@ msgstr "Обзор категории %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
+#, fuzzy
 msgid "addons_browse_categories_header_theme"
-msgstr "Обзор тем в категории %1$s :: Дополнени� %2$s"
-
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Что �то?"
+msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Добавить отзыв"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Дополнительные детали"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Категории"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Добавить в подборку:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "�ова� подборка..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Выбрать подборку..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Опубликовать"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s было добавлено в подборку %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Что �то?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "и ещё %1$s подборка"
-msgstr[1] "и ещё %1$s подборки"
-msgstr[2] "и ещё %1$s подборок"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "подробный отзыв"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�е нравит��"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Редактировать ваш отзыв"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "У данного дополнени� е�ть �об�твенна� политика конфиденциально�ти."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "�енавижу"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Похожие подборки"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Комментарии разработчика"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Домашн�� �траница"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Лицензи� и�ходного кода"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Отзывы"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Поддержка"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "�равит��"
 
@@ -409,41 +372,39 @@ msgstr "�равит��"
 msgid "addons_display_long_description"
 msgstr "Подробное опи�ание"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Обожаю"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Другие изображени�"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Это дополнение не входит пока ни в одну подборку."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
+#, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Другие дополнени� �озданные %1$s"
-msgstr[1] "Другие дополнени� �озданные �тими авторами"
+msgstr[1] "Other add-ons by these authors"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -452,27 +413,28 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
 "Поддержка �того дополнени� о�уще�твл�ет�� разработчиком по адре�у %s или %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Поддержка �того дополнени� о�уще�твл�ет�� разработчиком по адре�у %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Оценить"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Очень нравит��"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Пожалуй�та не о�тавл�йте в отзывах �ообщени� об ошибках. Мы не �ообщаем ваш "
@@ -481,47 +443,52 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Советы по о�тавлению отзывов</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Дл� получени� �ведений о том, как получить помощь по работе � �тим "
 "дополнением, обратите�ь в <a href=\"%1$s\">раздел поддержки</a>."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Сохранить"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Про�мотреть в�е дополнени� в %1$s"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Про�мотреть в�е отзывы (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Отобразить в�е вер�ии"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Полна� и�тори� вер�ий"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Про�мотреть и�ходный тек�т"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Про�мотреть �тати�тику"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Что вы думаете?"
 
@@ -529,213 +496,108 @@ msgstr "Что вы думаете?"
 msgid "addons_display_workswith"
 msgstr "Совме�тимо�ть:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Только что добавлено"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Попул�рное"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Рекомендуемое"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Подпи�ать��"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Обзор дополнений"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Обновлённые"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "автор"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Попул�рные подборки"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Подборки"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> дополнение"
-msgstr[1] "<strong>%1$s</strong> дополнени�"
-msgstr[2] "<strong>%1$s</strong> дополнений"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Про�мотр в�ех подборок"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Подборки �вл�ют�� �по�обом категоризации, �мешивани� и �оздани� коллекций "
-"дополнений. Подпишите�ь на подборки, �озданные другими пользовател�ми, или "
-"�оздайте �вои �об�твенные."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> подпи�чик"
-msgstr[1] "<strong>%1$s</strong> подпи�чика"
-msgstr[2] "<strong>%1$s</strong> подпи�чиков"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Мы рекомендуем"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Дополнени� ра�шир�ют возможно�ти %1$s, шаг за шагом приближа� их к "
 "идеальным. Огл�ните�ь вокруг и �делайте %1$s таким, каким вы �того хотите."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Понравили�ь? � в %1$s можно найти ещё."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Более 5000 бе�платных дополнений</strong>, которые позвол�т вам "
-"на�троить Firefox под �вои нужды, безгранично ра�шир�� его функционально�ть."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "�овейшие:"
 
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Что такое дополнени�?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Легкие в у�тановке</strong>, они также уведомл�ют ва� в �лучае "
-"по�влени� обновлений."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Введение"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Панели ин�трументов, темы и плагины дл� пои�ковых движков <strong>помогут "
-"вам выполн�ть пов�едневные задачи.</strong>"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "�ОВИ�К�!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Другие приложени�"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Дополнени� %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>дополнение загружено</span>"
-msgstr[1] "<strong>%1$s</strong> <span>дополнени� загружено</span>"
-msgstr[2] "<strong>%1$s</strong> <span>дополнений загружено</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>дополнение и�пользует��</span>"
-msgstr[1] "<strong>%1$s</strong> <span>дополнени� и�пользует��</span>"
-msgstr[2] "<strong>%1$s</strong> <span>дополнений и�пользует��</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "�аиболее попул�рные:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Мы рекомендуем:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "�едавно обновлённые:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Про�мотреть в�е"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Про�мотреть в�е новые дополнени�"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Про�мотреть в�е попул�рные дополнени�"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Про�мотреть в�е рекомендуемые дополнени�"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Про�мотреть в�е недавно обновлённые дополнени�"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>�ажмите правой кнопкой мыши на ��ылке и выберите «Сохранить ��ылку "
@@ -744,11 +606,11 @@ msgstr ""
 "Дополнени�».</li><li>�ажмите кнопку «У�тановить…», найдите и выберите файл, "
 "который вы �качали и нажмите «OK».</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Как у�тановить дополнени� в Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>�ажмите правой кнопкой мыши на ��ылке и выберите «Сохранить ��ылку "
@@ -757,42 +619,39 @@ msgstr ""
 "Дополнени�».</li><li>�ажмите кнопку «У�тановить…», найдите и выберите файл, "
 "который вы �качали и нажмите «OK».</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Как у�тановить дополнени� в Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "показать �к�периментальные дополнени�"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Перейти"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "От"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "дл� Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "дл� Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "дл� Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -800,11 +659,11 @@ msgstr ""
 "плагины. Более подробную информацию о других плагинах дл� продуктов "
 "�емей�тва Mozilla можно найти на �айте %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "�ужен плагин, которого зде�ь нет?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Плагины помогают вашему браузеру выполн�ть �пецифичные функции, такие как "
@@ -813,24 +672,24 @@ msgstr ""
 "измен�ют или ра�шир�ют �уще�твующую функционально�ть."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Попул�рные плагины дл� %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Плагины"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Документаци�:"
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -839,42 +698,38 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Иллю�трации дл� %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "�едавно добавленные"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Среди громадного количе�тва до�тупных дополнений найдёт�� что-нибудь "
 "полезное дл� каждого. Дл� начала, мы �обрали зде�ь �пи�ок некоторых �амых "
 "попул�рных дополнений. Удачи!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Рекомендуемые дополнени�"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Рекомендуемые дополнени�"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Дополнительные ре�ур�ы"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Центр разработки Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Извините, дл� у�тановки пои�кового плагина вам нужен браузер из �емей�тва "
@@ -891,68 +746,75 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Вы можете прочитать о том как %1$s на �айте %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "�делать �вой �об�твенный пои�ковый плагин"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Вы можете найти другие пои�ковые плагины на �айте %1$s"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Пои�ковые плагины"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Мы выражаем о�обую благодарно�ть проекту Mycroft за их работу над пои�ковыми "
 "плагинами дл� Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Поделить�� �тим"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Добавить в Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "�а Digg!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "�апи�ать в Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Поделить�� на FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "�апи�ать в MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -966,17 +828,17 @@ msgstr "�еполна� вер�и�"
 msgid "addons_status_nominated"
 msgstr "В «пе�очнице»; �оминировано на общий до�туп"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "В «пе�очнице»; Ожидает рецензии"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "В общем до�тупе"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "В «пе�очнице»"
@@ -985,36 +847,26 @@ msgstr "В «пе�очнице»"
 msgid "addons_status_unknown"
 msgstr "Стату� неизве�тен"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Подробнее об �том дополнении"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Лидеры загрузок"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Лидеры рейтинга"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Будьте о�торожны �о �тарыми вер�и�ми"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Эти вер�ии отображают�� только дл� �ведени� и в цел�х те�тировани�. Вам "
 "�ледует в�егда и�пользовать по�леднюю вер�ию дополнени�."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "И�тори� вер�ий �о �пи�ком изменений"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "И�тори� вер�ий %1$s"
@@ -1049,425 +901,153 @@ msgstr "�дмини�тратор группы"
 msgid "admin_group_saved"
 msgstr "Группа �охранена"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Дополнительно"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "В любое врем�"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Любой"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "люба�"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Приложение"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Ключевым �ловам"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Были обновлены"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Имени"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "�овизне"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "В по�ледние 3 ме��ца"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "В по�ледние 6 ме��цев"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Вчера"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "В по�ледний ме��ц"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "В по�леднюю неделю"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "В по�ледний год"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Дополнений на �транице"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Платформа"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Попул�рно�ти"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Рейтингу"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Сортировать по"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "по"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Включить продвинутый режим пои�ка"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Тип"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "вер�и� �"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "След."
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Пред."
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Игнорировать проверку вер�ии"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Это ра�ширение работает �о �тарыми вер�и�ми Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Вы можете <a href=\"%1$s\">попробовать и�пользовать �тарую вер�ию</a> или <a "
 "href=\"#\" onclick=\"%2$s\">проигнорировать �ту проверку</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Возможно будет работать <a href=\"%1$s\">�тара� вер�и�</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr ""
 "Это ра�ширение работает в ещё не выпущенной вер�ии <a href=\"%1$s\">Firefox %"
 "2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "Дл� и�пользовани� �того дополнени� <a href=\"http://getfirefox.com"
 "\">Обновите Firefox</a>"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s изменил �тату� %2$s на %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s произвёл неизве�тное админи�тративное дей�твие %2$s � ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s удалил возможно�ть %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s �оздал приложение %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s отредактировал приложение %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s �оздал вер�ию %2$s дл� %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s удалил вер�ию %2$s дл� %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s изменил поле конфигурации '%2$s' � '%3$s' на '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s произвёл неизве�тное редактор�кое дей�твие %2$s � ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s удалил дополнение %2$s из �пи�ка избранных"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s добавил дополнение %2$s в �пи�ок избранных"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s изменил возможно�ть дл� локализации %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s изменил локализации дл� дополнени� %2$s в �пи�ке избранных"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s пере�читал х�ш дл� файла %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s добавил %2$s в группу %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s �в�зал �еб� � %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s �оздал группу %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s удалил группу %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s отредактировал группу %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s удалил %2$s из группы %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s произвёл неизве�тное дей�твие %2$s, ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s попытал�� изменить заблокированную группу %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s попытал�� изменить переводы в %2$s без разрешени�"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s �оздал платформу %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s удалил платформу %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s отредактировал платформу %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s не удало�ь произве�ти повторный вход дл� до�тупа к %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s �оздал ответ %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s удалил ответ %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s отредактировал ответ %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s одобрил отзыв %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s удалил отзыв %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr ""
-"%1$s произвёл неизве�тное дей�твие в �и�теме безопа�но�ти %2$s � ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s �оздал метку %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s удалил категорию %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s отредактировал категорию %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s обновил переводы приложени� дл� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s обновил переводы по�та в блоге дл� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s обновил переводы платформы дл� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s обновил переводы категории дл� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s отредактировал информацию пользовател� %2$s"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Сортировать дополнени� по имени"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "�овейшие дополнени�"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Попул�рные дополнени�"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Сортировать дополнени� по рейтингу"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "�едавно обновлённые дополнени�"
 
@@ -1476,790 +1056,107 @@ msgid "categories_current_title"
 msgstr "Текуща� категори�"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Категории"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Выбрать категорию"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Про�мотреть в�е рекомендуемые дополнени�"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "По рейтингу"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "По дате по�леднего обновлени�"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "По попул�рно�ти"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Про�мотреть в�ю категорию %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Опи�ание не может быть короче %1$s �имволов."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Подборка %s"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Ошибка удалени� дополнени�!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Ошибка �охранени�!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Ошибка �охранени� комментари�!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Им� должно быть короче %1$s �имволов."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Коллекци� не найдена!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Е�ли вы уже знаете, какие дополнени� вы хотите добавить к �воей подборке, "
-"про�то начните набирать их имена в ра�положенном ниже поле. Е�ли вы хотите "
-"подождать и �делать �то позже, щёлкните �ейча� по кнопке %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Выберите ваши первые дополнени�"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Создайте подборку"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Выбранные дополнени�"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"Вы можете легко �оздать �вою �об�твенную подборку, заполнив не�колько "
-"ра�положенных ниже полей."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Создать подборку"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Подборки"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Подробнее"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Добавить в избранное"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Удалить из избранного"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>Чтобы по�мотреть на вашу подборку, по�мотрите вниз. Е�ли вы хотите "
-"у�тановить дл� подборки п�евдоним, загрузить значок или изменить "
-"дополнительные на�тройки, по�етите �траницу <a href='%1$s'>Управление "
-"подборками</a>.</p><p>Ваша подборка может быть открыта по �ледующему "
-"адре�у: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Ваша подборка готова!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Об �той подборке"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s дополнение в �той подборке"
-msgstr[1] "%1$s дополнени� в �той подборке"
-msgstr[2] "%1$s дополнений в �той подборке"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Создано:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Обновлено:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Добавл�ю в Избранное&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Удал�ю из Избранного&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Зареги�трируйте�ь</a> чтобы добавить �ту подборку к "
-"�ебе в Избранное."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Управление подборкой"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Дата добавлени�"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Им�"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Попул�рно�ть"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s загрузка на �той неделе"
-msgstr[1] "%1$s загрузки на �той неделе"
-msgstr[2] "%1$s загрузок на �той неделе"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Выделенные дополнени� будут удалены при нажатии кнопки Сохранить"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"Чтобы добавить в �ту подборку новые дополнени�, начните набирать их имена в "
-"ра�положенное ниже поле."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"Чтобы добавить в �ту подборку новые дополнени�, введите в ра�положенное ниже "
-"поле �пи�ок их ID, разделённый зап�тыми."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Вы также можете опубликовать дополнение пр�мо � его обычной �траницы."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Добавлено %1$s пользователем %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Добавить комментарий опубликовавшего"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Удалить комментарий опубликовавшего"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Редактировать комментарий опубликовавшего"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Примечание: Комментарий по�вит�� таким, как будто его напи�ал первоначальный "
-"автор � датой первоначальной публикации"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Сохранить комментарий"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Удалить"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Добавить в подборку"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Проверить до�тупно�ть"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Да, � хочу удалить �ту подборку."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr ""
-"У�тановите флажок, затем щёлкните по \"%1$s\" чтобы удалить �ту подборку."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"При нажатии ра�положенной ниже кнопки \"%1$s\" ваша подборка будет удалёна. "
-"Е�ли вы не хотите �ейча� удал�ть вашу подборку, �нимите флажок в поле "
-"подтверждени� во вкладке \"%2$s\" и продолжите редактировать �вою подборку. "
-"Е�ли вы о�тавите �ту �траницу и не �охраните её, ваша подборка также не "
-"будет удалёна."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Ваша подборка �ейча� будет удалёна!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Вы должны дать опи�ание дл� вашей подборки."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "При загрузке вашего значка произошла ошибка."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Вы должны дать им� вашей подборке."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Е�ли вы выбираете ник, он должен быть уникальным."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Им� дополнени�:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Св�занное приложение"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Выберите приложение, которое поддерживает вашу подборку."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Тип подборки"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Удалить подборку"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "При удалении вашей подборки она будет безвозвратно утер�на."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Опи�ание подборки"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr ""
-"Дайте краткое опи�ание вашей подборки и вида наход�щих�� в нём дополнений"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Значок"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"Вы можете загрузить значок в форматах JPG, GIF или PNG, который будет "
-"приведён к размеру 32x32 пик�ел�."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Кто может про�матривать вашу подборку?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"По умолчанию, подборка по�вит�� в каталоге публичных подборок и будет "
-"до�тупна дл� публичного про�мотра. Е�ли вы хотите, чтобы вашу подборку "
-"про�матривали только те люди, которым была отправлена �пециальна� ��ылка, "
-"выберите ра�положенную ниже опцию."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Только те, кого � приглашу, могут про�матривать мою подборку"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Любой человек может про�матривать мою подборку в каталоге"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Кто может управл�ть моей подборкой?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Данные пользователи могут добавл�ть дополнени� в вашу подборку, управл�ть "
-"в�еми дополнени�ми и на�тройками, и давать разрешени� другим пользовател�м."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Им� подборки"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Дайте �воей подборке нагл�дное опи�ание, например \"Полезные дополнени� дл� "
-"поездки в командировку от Ва�и\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "П�евдоним подборки"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr ""
-"При желании, вы можете дать подборке уникальный п�евдоним дл� бы�трого "
-"до�тупа:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Кто может добавл�ть дополнени� в вашу подборку?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Данные пользователи могут добавл�ть дополнени� в вашу подборку и удал�ть "
-"дополнени� которые они добавили."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Введите адре� �л. почты учётной запи�и �айта дополнений Firefox:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Выбранные учётные запи�и будут удалены при нажатии кнопки Сохранить"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Введите разделённый зап�тыми �пи�ок адре�ов �л. почты учётных запи�ей �айта "
-"дополнений Firefox"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Только �"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Я и �ти пользователи:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Добавить"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Управл�ть %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Управл�ть �одержимым подборки"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Текущие дополнени�:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Дополнительные на�тройки"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Управление разрешени�ми подборки"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Отмена"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Удалить значок"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Заменить значок"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Значок будет удалён по�ле нажати� ра�положенной ниже кнопки \"%1$s\""
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "П�евдоним до�тупен"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Ваш п�евдоним �одержал недопу�тимые �имволы и был и�правлен. Пожалуй�та, "
-"попробуйте ещё раз."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "П�евдоним зан�т"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "К вашей подборке можно получить до�туп по �ледующему адре�у:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Ваша подборка была у�пешно �охранёна!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Обновить подборку"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Удалить подборку"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Дополнени�"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Дополнительно"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Им� и подробно�ти"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Разрешени�"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr ""
-"Дополнени�, которые могут при�матривать за вашими детьми и вашим ра�пи�анием."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Семейна� жизнь"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Взгл�ните в �обиратель дополнений"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Создать подборку"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Перейти"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>У ва� пока нет ни одной избранной подборки.</strong></p> <p>С �той "
-"�траницы можно бы�тро открыть избранные вами подборки. Они также по�в�т�� "
-"в <a href='%1$s'>Собирателе дополнений</a>, е�ли вы его у�тановили.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>Вы пока не �оздали ни одной подборки. Вы можете легко �оздать подборки и "
-"заполнить их �воими любимыми дополнени�ми.  <a href='%1$s'>Попробуйте</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Подборки"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Собиратель дополнений"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "�оздан %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Что такое подборки?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Сортировать по"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Выбор редакторов"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Мои любимые"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Мои подборки"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Попул�рные"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Самые попул�рные за в�ё врем�"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Самые попул�рные за �тот ме��ц"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "�овейшие"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Самые попул�рные за �ту неделю"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Это новый �по�об управлени� и пои�ка любимых дополнений. Вы можете "
-"поделить�� подборками, �инхронизировать их и о�тавл�ть к ним комментарии "
-"пр�мо из вашего браузера"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Подборки �то группы дополнений, которыми можно легко поделить��."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Добавлено %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Дополнени�, которые помогут вам в онлайновых и��ледовани�х."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Справочна�"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Дополнени� дл� управлени� вашими �оциальными �ет�ми."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Социальный круг"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Закрыть"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr ""
-"При попытке добавлени� подборки в избранные произошла ошибка. Может быть �та "
-"подборка уже в избранных?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Больше не показывать мне �то �ообщение."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s была добавлена в ваши избранные подборки."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"Вы можете бы�тро найти �ту подборку через вкладку <a href=\"%1$s\">%2$s</a> "
-"в каталоге. Дл� ещё более про�того управлени� вашими избранными подборками, "
-"попробуйте наше ра�ширение дл� Firefox <a href=\"%3$s\">Собиратель "
-"дополнений</a>."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Подборка была удалёна."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Дополнени�, которые помогут вам в ваших путеше�тви�х."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "�абор путеше�твенника"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "�вто-публикатор"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Выбор редакции"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "�ормальна�"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr ""
-"При попытке удалени� подборки из избранного произошла ошибка. Может быть �та "
-"подборка не была в избранном?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s была удалена из ваших избранных подборок."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Дополнени�, которые облегчат вам �оздание идеальных веб-�айтов."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "�абор ин�трументов веб-разработчика"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Что такое подборки?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Прочтите FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Это новый �по�об управлени� и пои�ка любимых дополнений. Вы можете "
-"поделить�� подборками, �инхронизировать их и о�тавл�ть к ним комментарии "
-"пр�мо из вашего браузера"
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Домашн�� �траница �обирател� дополнений"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Загрузите �обиратель дополнений:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Логотип �обирател� дополнений"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Центр �овме�тимо�ти дополнений"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Будьте готовы к выходу %1$s, и�пользу� ниже�ледующие ин�трументы и "
 "информацию, до�тупную дл� �ообще�тва разработчиков дополнений %2$s."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Загрузка данных..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Вернуть�� на главную"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Отчёт о �овме�тимо�ти дополнений"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Информаци� дл� разработчиков дополнений"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Изменить maxVersion без загрузки"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Проверить �тату� моих дополнений"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "Е�ли вы размещали дополнени� на �айте дополнений Mozilla, <a href=\"%1$s\"> "
 "пожалуй�та войдите</a> и проанализируйте �тату� ваших дополнений дл� %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Логотип Центра Разработки Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Вы не разме�тили ни одного дополнени� на �айте дополнений Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Результаты проверки �тату�а дополнений"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Получение �тату�а размещённых дополнений..."
 
@@ -2267,122 +1164,122 @@ msgstr "Получение Ñ�татуÑ�а размещённых дополнеÐ
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s пользователей (%3$s&#37; от общего кол-ва)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "По �ведени�м Mozilla, дол� пользователей перечи�ленных ниже дополнений "
 "�о�тавл�ет 95% от общего чи�ла пользователей дополнений. Данные дополнени� "
 "от�ортированы по количе�тву и�пользующих их пользователей."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Про�мотреть подробный отчёт"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "Из %1$s дополнений, и�пользуемых 95&#37; пользователей дополнений, <b>%2"
 "$s&#37;</b> �читают�� в данный момент �овме�тимыми � по�ледними �борками %3"
 "$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "�льфа-вер�ии"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Дополнени�, �овме�тимые � альфа-вер�ией %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Бета-вер�ии"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Дополнени�, �овме�тимые � бета-вер�ией или релиз-кандидатом %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "По�ледн�� вер�и�"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Дополнени�, �овме�тимые � по�ледними �борками %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Другие вер�ии"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Дополнени�, не �овме�тимые ни � какой вер�ией %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Отчёт о �овме�тимо�ти дополнений"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Информаци� дл� пользователей дополнений"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Про�мотр отчёта о �овме�тимо�ти"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr ""
 "Дл� получени� дополнительной информации отно�ительно �одей�тви�, пожалуй�та "
 "�м. нашу %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "�траничку Wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla хотела бы поблагодарить �ледующих людей за их �одей�твие проекту "
 "addons.mozilla.org в течение в�ех �тих лет:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Разработчики"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Редакторы"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Локализаторы"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Другие уча�тники"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Прошлые разработчики"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "ПО и изображени�"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "�екоторые и�пользованные значки вход�т в <a href=\"http://www.famfamfam.com/"
@@ -2390,32 +1287,30 @@ msgstr ""
 "у�лови�х <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative "
 "Commons Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
-"�екоторые �траницы и�пользуют �лементы <a href=\"http://www.simile-widgets."
-"org/timeplot/\">Timeplot</a>, лицензированного на у�лови�х <a href=\"http://"
-"simile.mit.edu/license.html\">BSD License</a>."
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 # date format string as used in PHP's strftime():
 # http://php.net/strftime
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2451,31 +1346,46 @@ msgstr "Панель �тати�тики"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr ""
-"Файл %1$s имеет неверное ра�ширение (%2$s). Допу�тимые ра�ширени�: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr ""
-"Файл %s не удало�ь �охранить в базу данных. Пожалуй�та, попробуйте �нова."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Предпро�мотр %1$s был у�пешно заменён файлом %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Файл %s был у�пешно загружен. Вы можете добавить к нему опи�ание."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "�втоматиче�кое определение"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Данна� вер�и� вашего дополнени� не отмечена как �овме�тима� � Firefox %1$s. "
+"Mozilla �обирает�� в �кором времени выпу�тить �ледующую вер�ию Firefox, "
+"по�тому пожалуй�та проте�тируйте ваше дополнение в новой вер�ии и обновите "
+"информацию о �овме�тимо�ти. Более подробна� информаци� до�тупна по <a href="
+"\"%2$s\">�тому адре�у</a>. Это в�его лишь уведомление и вы можете продолжать "
+"выкладывать �ту вер�ию на addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Открыть в новом окне"
@@ -2512,831 +1422,1388 @@ msgstr "Шаг 5: Завершение"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Помощь по публикации"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Дополнение у�пешно заблокировано"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Изменить дополнение"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Дополнение у�пешно разблокировано"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Опи�ание дополнени�"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "Лицензионное �оглашение (EULA)"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Домашн�� �траница дополнени�"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "�азвание дополнени�"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
-msgstr "Подпи�ь к �криншоту"
+msgstr "Подпи�ь к иллю�трации"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Сделать активным"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Политика конфиденциально�ти"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Кратка� информаци� о дополнении"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "�дре� �л. почты поддержки"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL поддержки"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Примечани� к вер�ии"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "�оминировать дополнение"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Дополнение у�пешно номинировано!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Делает ваше дополнение активным, чтобы отобразить его в публичных �пи�ках и "
-"включить �лужбу проверки обновлений."
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Закончить оформление"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Закончить оформление вашего дополнени� и переме�тить его в пе�очницу"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Сделать неактивным"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Делает ваше дополнение неактивным, чтобы убрать его из в�ех публичных "
-"�пи�ков и отключить �лужбу проверки обновлений."
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Переме�тить в пе�очницу"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Перемещает ваше дополнение назад в Пе�очницу. Это обратимое дей�твие."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "�оминировать на публичный до�туп"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "�оминирует ваше дополнение на публичный до�туп"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Сделать публичным"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Снова делает ваше дополнение публичным."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"Ваше дополнение �вл�ет�� <span class=\"inactive-0\">�ктивным</span>. Это "
-"значит, что ваше дополнение по�вл�ет�� во в�ех до�тупных перечн�х "
-"дополнений, подход�щих дл� указанного выше �тату�а."
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Дл� завершени� оформлени� вашего дополнени� и перемещени� его в <span class="
-"\"status-1\">Пе�очницу</span> выполните указанные выше у�лови�."
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Теперь вы можете завершить оформление вашего дополнени� и переме�тить его в "
-"<span class=\"status-1\">Пе�очницу</span>, нажав ра�положенную ниже кнопку."
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Выбрана по меньшей мере одна категори�"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Требует�� опи�ание дополнени�"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Требует�� им� дополнени�"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Дополнение не помечено как пререлиз."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Дл� ра�ширений и тем требует�� по меньшей мере один �криншот."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Требует�� опи�ание дополнени�"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Стату� дополнени�: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "До�тупные дей�тви�"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "�ктивный �тату�: <span class=\"inactive-0\">�ктивный</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Критерий оформлени� дополнени�"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "�ктивный �тату�: <span class=\"inactive-1\">�еактивный</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Критерий номинации на публичный до�туп"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Доверенный �тату�: <span class=\"status-4\">Доверенный</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"Ваше дополнение �вл�ет�� <span class=\"inactive-1\">�еактивным</span>. Это "
-"значит, что ваше дополнение не по�вит�� ни в одном из перечней дополнений, "
-"незави�имо от указанного выше �тату�а. Обновлени� дл� вашего дополнени� "
-"через �лужбу проверки обновлений предо�тавл�ть�� <b>не</b> будут."
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"Пожалуй�та, выполните вышеуказанные критерии перед номинированием вашего "
-"дополнени� на <span class=\"status-4\">Публичный до�туп</span>."
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Вы можете номинировать ваше дополнение на <span class=\"status-4\">Публичный "
-"до�туп</span> щёлкнув по ра�положенной ниже кнопке."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Публичное"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Пе�очница"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"Ваше дополнение было <span class=\"status-5\">Отключено</span> "
-"админи�тратором и не может быть и�пользовано. Е�ли у ва� возникли вопро�ы, "
-"вы можете �в�зать�� � ним по адре�у %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
 msgstr ""
-"Ваше дополнение �вл�ет�� <span class=\"status-0\">�езавершённым</span>. Это "
-"значит, что ваше дополнение не по�вл�ет�� ни на �айте, ни в �лужбе проверки "
-"обновлений. Вы можете вернуть�� к �той �транице, чтобы завершить оформление "
-"вашего дополнени�, по�ле того, как оно �танет �оответ�твовать указанным ниже "
-"у�лови�м, и перене�ти его в <span class=\"status-1\">Пе�очницу</span>."
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
-"В данное врем� ваше дополнение номинировано на <span class=\"status-4\"> "
-"Публичный до�туп</span> и ждёт рецензии от редактора. В очереди на номинацию "
-"в данный момент �тоит %s других дополнений."
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
 msgstr ""
-"Ваше дополнение находит�� в �о�то�нии ожидани�. Этого не должно �лучить��. "
-"Пожалуй�та, отправьте пи�ьмо по адре�у %s, указав ID вашего дополнени� и �ту "
-"ошибку."
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
 msgstr ""
-"Ваше дополнение �вл�ет�� <span class=\"status-4\">Публичным</span>. Это "
-"значит, что оно по�вит�� во в�ех перечн�х и результатах пои�ка и может быть "
-"загружено без ограничени�. Обновлени� дл� вашего дополнени� будут обе�печены "
-"через �лужбу проверки обновлений."
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
 msgstr ""
-"Ваше дополнение находит�� в <span class=\"status-1\">Пе�очнице</span>. Это "
-"значит, что оно по�вит�� в перечн�х и результатах пои�ка, но дл� его "
-"загрузки пользовател�м будет нужно зареги�трировать�� на �айте. Обновлени� "
-"дл� вашего дополнени� через �лужбу проверки обновлений предо�тавл�ть�� "
-"<b>не</b> будут."
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Стату� %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
-"Ваше дополнение �вл�ет�� <span class=\"status-4\">Доверенным</span>. Это "
-"значит, что дл� обновлени� вашего дополнени� нет необходимо�ти получать "
-"отзыв от редактора."
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"По�етите �траницу %1$s, чтобы �делать изменени� в вашей публикации или %2$s, "
+"чтобы вернуть�� в панель управлени� разработчика."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "щёлкните зде�ь"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Изменить дополнение"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Эта вер�и� была помещена в «пе�очницу», в ожидании проверки те�терами и "
+"редактором Mozilla Add-on. О предприн�тых дей�тви�х вы будете уведомлены по "
+"�лектронной почте."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Дополнительную информацию о �и�теме рецензировани� «пе�очница» вы можете "
+"получить %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "зде�ь"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Эта вер�и� была помещена в «пе�очницу» дл� и�пользовани� опытными "
+"пользовател�ми. Дл� того, чтобы показать её на общедо�тупном �айте, вы "
+"должны %s ваше дополнение и пройти через проце�� рецензировани�."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "номинировать"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Публикаци� вашего дополнени� была у�пешно завершена."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"По�кольку вашему дополнению довер�ют, �та вер�и� была автоматиче�ки одобрена "
+"дл� общедо�тупной ча�ти �айта."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Публикаци� дополнени�"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Дополнение у�пешно обновлено"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Вы можете увеличить интере� к вашему дополнению, %s."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "загрузив иллю�трации"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "�втор не найден [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Переме�тить/удалить"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Отменить"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Вы уверены, что хотите отменить публикацию?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Далее"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Изменить тип дополнени�:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Комментарии разработчика обновлены."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "�ктивное"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s в данный момент �вл�ет�� %2$s и %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Изменить �тату�"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
-"Ваше дополнение было отключено админи�тратором и не может быть и�пользовано. "
-"Е�ли у ва� возникли вопро�ы, вы можете �в�зать�� � ним по адре�у %s."
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Стату� дополнени�: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Панель управлени� разработчика"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Добро пожаловать в панель управлени� разработчика"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "�еактивное"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Дата по�ледней правки: %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
 msgstr ""
-"�а текущий момент вы не размещали никаких дополнений на �айте дополнений "
-"Mozilla. Чтобы узнать о проце��е размещени� дополнений и разме�тить �вое "
-"первое дополнение, нажмите «�ачать»."
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "�ачать"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Вер�ии и файлы"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Загрузить новую вер�ию"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr ""
-"Скриншот %s не получило�ь удалить из базы данных. Пожалуй�та, попробуйте "
-"�нова."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "Скриншот %s был у�пешно удалён."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "У ва� нет прав на удаление вер�ий или файлов."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s %2$s файл"
-msgstr[1] "%1$s %2$s файла"
-msgstr[2] "%1$s %2$s файлов"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Добавить иллю�трацию"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "�втор"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "�вторы"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "�ет"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Категори�"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Категории"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Опи�ание"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Заблокировано"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Сведени�"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Комментарии разработчика"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Иллю�трации"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Вер�ии"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Домашн�� �траница"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "�ет"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "�ет подпи�и"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Иллю�трации не найдены."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Обновить"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "�дре� �л. почты поддержки"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Разработчик не указал адре� �л. почты поддержки."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL поддержки"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Разработчик не указал url поддержки."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Довер�ть"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Вер�и� %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Вер�ии не найдены."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Отменить и вернуть�� назад"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Да, отключить его"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Вы уверены, что хотите отключить �то дополнение?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Отключение �того дополнени� приведёт к �крытию его из �пи�ка дополнений и "
+"результатов пои�ка. Его нельз� будет загрузить � веб-�айта и оно не будет "
+"предложено клиенту при проверке обновлени�. С точки зрени� пользователей "
+"дополнение будет удалено, хот� вы �можете в дальнейшем вернуть�� �юда и при "
+"желании �нова его включить."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Отключить %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Да, включить его"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Вы уверены, что хотите включить �то дополнение?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Включение �того дополнени� приведёт к тому, что оно �нова по�вит�� в �пи�ке "
+"дополнений и результатах пои�ка. Его можно будет загрузить � веб-�айта и оно "
+"будет предложено клиенту при проверке обновлений."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Включить %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Добавить ответ"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Ответы"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
 msgstr ""
-"При отправке вашего ответа произошла ошибка. Пожалуй�та, �в�жите�ь � %1$s и "
-"опишите проблему."
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
 msgstr ""
-"Редактор �айта дополнений Mozilla запро�ил у ва� дополнительную информацию о "
-"вер�ии %2$s вашего дополнени� %1$s."
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr ""
-"Вве�ти дополнительную информацию дл� получени� рецензии на дополнение %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Отправить ответ"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
 msgstr ""
-"Ваш ответ был у�пешно �охранён. Другие уча�тники ди�ку��ии будут уведомлены "
-"по �лектронной почте."
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "%1$s напи�ал %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Добавить автора"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "�дре�а �л. почты авторов"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Переме�тить/удалить"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Добавить нового автора"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Добавить автора"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "�дре� учётной запи�и автора:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Проверка адре�а учётной запи�и..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Дл� �охранени� щёлкните по ра�положенной ниже кнопке Обновить авторов."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Текущие авторы"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Управление авторами дополнени�"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Отобразить как автора на публичной �транице"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
-"<strong>Разработчик</strong> - может управл�ть в�еми а�пектами отображени� "
-"дополнени�, кроме добавлени� и удалени� других авторов."
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
-"<strong>Владелец</strong> - может управл�ть в�еми а�пектами отображени� "
-"дополнени�, в том чи�ле добавл�ть и удал�ть других авторов."
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
-"<strong>Зритель</strong> - может про�матривать �пи�ок разработчиков и "
-"�тати�тику дополнени�, но не может производить никаких изменений."
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Выберите роль дл� автора:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "�втор"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "В �пи�ке"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Роль"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Обновить авторов"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Обновить категории"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Моё дополнение не подходит под какие-либо категории."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "Категории %s"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Управление категори�ми дополнени�"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "�аведите кур�ор мыши на категорию, чтобы по�мотреть её опи�ание."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Категори� %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "Дл� �того типа дополнени� и приложени� недо�тупна ни одна категори�."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
 msgstr ""
-"Поме�тите ваше дополнение в �ту категорию только е�ли оно не подходит под "
-"любую другую категорию."
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Выберите дл� вашего дополнени� не более трёх категорий %s"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr ""
-"Добавл�йте или удал�йте пользователей, которые могут управл�ть �тим "
-"дополнением."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
 msgstr ""
-"Выберите подход�щие категории дл� каждого приложени�, которое поддерживает "
-"ваше дополнение."
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
 msgstr ""
-"Добавл�йте и измен�йте переводы дл� �водки, опи�ани�, лицензии и политики "
-"приватно�ти вашего дополнени�."
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr ""
-"Измените им�, домашнюю �траницу, значок и другие флаги вашего дополнени�."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Обновить опи�ани�"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Пожалуй�та и�правьте ошибки, отмеченные кра�ным."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Редактировать опи�ани� дополнени�"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
-"Люба� информаци�, которую возможно захот�т узнать конечные пользователи, но "
-"которой не ме�то в �водке или опи�ании дополнени�. Обычно и�пользует�� дл� "
-"�ведений о �ерьёзных ошибках, о том как �ообщать об ошибках, предполагаемой "
-"дате выпу�ка новой вер�ии и т.д.."
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Комментарии разработчика"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
-"Подробное опи�ание дополнени� - �то более полное объ��нение его функций, "
-"о�обенно�тей и друга� информаци�. Оно отображает�� под кратким опи�анием на "
-"�транице дополнени�."
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Опи�ание дополнени�"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
-"Е�ли у вашего дополнени� е�ть лицензионное �оглашение конечного "
-"пользовател�, пожалуй�та, введите его тек�т в поле ниже. В �лучае его "
-"наличи�пользователи должны будут �огла�ить�� � ним перед у�тановкой "
-"дополнени�. Учтите, что лицензионное �оглашение �то не то же �амое, что "
-"лицензи� на и�ходный код (например, GPL или MPL)."
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Лицензионное �оглашение конечного пользовател�"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
-"Е�ли у вашего дополнени� е�ть политика приватно�ти, введите �юда её тек�т."
-"С�ылка на неё будет отображена на �транице дополнени�."
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Политика приватно�ти"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
-"Сводка - �то краткое опи�ание базовых функций вашего дополнени�, котора� "
-"отображает�� при пои�ке и про�мотре перечней дополнений, а также в верхней "
-"ча�ти �траницы вашего дополнени�. <strong>Длина до 250 �имволов.</strong>"
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Сводка дополнени�"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Управление авторами дополнени�"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Управление категори�ми дополнени�"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Управление опи�ани�ми дополнени�"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Управление �вой�твами дополнени�"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Дл� дополнений �того типа нет до�тупных категорий."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "�вторы"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Добавить значок"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Изменить значок"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Позволить пользовател�м про�матривать и�ходные файлы онлайн."
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Категории"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Язык по умолчанию"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Это дополнение требует �тороннего программного обе�печени�"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Удалить �уще�твующий значок"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "�овый файл значка"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Значок"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Дополнительна� информаци� о локали"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Предварительный выпу�к"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Дополнение дл� определённого �айта"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Указанна� локаль"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "Кратка� дополнительна� информаци� (така� как им� ме�тного диалекта)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Обновить �вой�тва"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Измен�йте только в том �лучае, е�ли вы понимаете в�е по�лед�тви�."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Текущий значок"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
-"Локализацией дополнени� по умолчанию �вл�ет�� главна� локализацией, в "
-"которой должен при�ут�твовать перевод. Е�ли перевод опи�ани� вашего "
-"дополнени� не �уще�твует на �зыке, выбранном пользователем, отображает�� "
-"опи�ание на �зыке локализации по умолчанию."
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "Эти флаги и�пользуют�� дл� фильтрации и кла��ификации дополнений."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
-"GUID вашего дополнени� указан в его файле install.rdf и �лужит дл� его "
-"уникальной идентификации. Вы не �можете �менить �вой GUID по�ле того, как он "
-"добавлен на �айт дополнений Mozilla."
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Редактировать �вой�тва дополнени�"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Тип дополнени�"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "�а�тройки админи�тратора"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Локаль по умолчанию"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Флаги дополнени�"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID дополнени�"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Значок дополнени�"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Другие на�тройки"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Доверенное дополнение?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Про�мотреть и�ходник в онлайне"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
-"Значком дополнени� �вл�ет�� маленькое изображение, которое отображает�� "
-"р�дом � именем вашего дополнени� при обзоре дополнений, их пои�ке, "
-"отображении �траниц и в диалоговом окне у�тановки дополнени�. Изображение "
-"автоматиче�ки ма�штабирует�� до размера 32 x 32 пик�ел�. Пожалуй�та, "
-"и�пользуйте один из �ледующих форматов изображений: %s"
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Это дополнение �одержит бинарные компоненты"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "�е доверенное"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "Доверенное"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "�овый значок Icon"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Удалить значок"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
-"Е�ли ваше дополнение имеет другую домашнюю �траницу, введите зде�ь её адре�. "
-"Добавл�ть другие переводы не об�зательно, е�ли только ваш �айт не "
-"локализован на другие �зыки."
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Домашн�� �траница дополнени�"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Им� вашего дополнени� отображаемое везде, где видно ваше дополнение."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Им� дополнени�"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
-"Е�ли у ва� е�ть адре� �л. почты дл� поддержки пользователей, введите его "
-"зде�ь. Добавл�ть другие переводы не об�зательно, е�ли только у ва� нет "
-"разных адре�ов �л. почты дл� разных �зыков."
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "�дре� �л. почты поддержки"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
-"Е�ли у вашего дополнени� е�ть �айт или форум поддержки, введите его адре� "
-"зде�ь. Добавл�ть другие переводы не об�зательно, е�ли только ваш �айт не "
-"локализован на другие �зыки."
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Веб-�айт поддержки"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr ""
-"Доверенные дополнени� могут �тановить�� публичными без получени� отзыва "
-"редактора."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Значок будет удалён при �охранении. <a %s>Отменить?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
-"Е�ли вы хотите, вы можете разрешить про�мотр и�ходного тек�та файлов вашего "
-"дополнени� любым зареги�трированным пользователем."
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Разрешить онлайновый про�мотр и�ходного кода"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "�е разрешать онлайновый про�мотр и�ходного кода"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Обновить"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">про�тое им� "
+"локали</a>, например 'en-US'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "�вторы"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Категории"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Изменить �тату�"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Опи�ани�"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Редактировать дополнение"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "�ова� вер�и�"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Свой�тва"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Скриншоты предпро�мотра"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Панель �тати�тики"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Вер�ии и файлы"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Про�мотреть �пи�ок"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3375,14 +2842,70 @@ msgstr[0] "Ра��матриваемое обновление (%s)"
 msgstr[1] "Ра��матриваемых обновлений (%s)"
 msgstr[2] "Ра��матриваемых обновлений (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Отмеченные файлы будут удалены."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Файлы"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Приложение"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "�ет файлов."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Заметки рецензенту"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Обновить"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Вы не имеете до�тупа к �тому дополнению"
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"�ннотаци� ограничена мак�имум 250 �имволами.\n"
+"(Вы ввели %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Такое дополнение уже �уще�твует в базе данных. Удо�товерьте�ь, что:<br /"
+"><li>GUID указан верно. Сама� ра�про�транённа� причина дл� �той ошибки — "
+"неверный GUID.</li><li>В базе нет дублирующей запи�и. Е�ли така� запи�ь "
+"при�ут�твует, необходимо обновить её или удалить и попытать�� �нова.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3396,16 +2919,17 @@ msgstr "Дл� получени� �правочной информации по
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "�ту �траницу"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Ваше дополнение должно иметь по меньшей мере одного владельца."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Опишите изменени�, �деланные в �том обновлении."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
 msgstr ""
-"Вер�и� �того дополнени� уже �уще�твует. Чтобы его заменить, вначале вы "
-"должны удалить файл %1$s."
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
@@ -3416,6 +2940,10 @@ msgstr ""
 "Указанное ра�ширение файла (%s) недопу�тимо дл� данного типа дополнени�. "
 "Пожалуй�та, и�пользуйте одно из �ледующих: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "�е в�е GUIDы в файле подход�т"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Пожалуй�та, выберите не более п�ти категорий."
@@ -3450,7 +2978,15 @@ msgstr ""
 "Указанное ра�ширение файла (%s) недопу�тимо дл� значка. Пожалуй�та, "
 "и�пользуйте одно из �ледующих: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Дл� �того дополнени� и платформы уже �уще�твует идентична� вер�и� (%s)."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "От�ут�твует файл install.rdf."
 
@@ -3458,7 +2994,7 @@ msgstr "От�ут�твует файл install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "В install.rdf обнаружены �ледующие ошибки:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Выберите правильный тип дополнени�."
 
@@ -3531,6 +3067,18 @@ msgstr "Ð’ файле install.rdf не найдено ID длÑ� данного Ð
 msgid "devcp_error_no_platform"
 msgstr "Платформа не выбрана."
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Дл� номинации вы должны вве�ти требуемые данные."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "�евозможно номинировать предварительный выпу�к."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Вы можете номинировать только дополнени� наход�щие�� в «пе�очнице»."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Пожалуй�та, выберите хот� бы одну категорию."
@@ -3545,9 +3093,19 @@ msgstr "Должен быть хот� бы один автор дополнен
 #, php-format
 msgid "devcp_error_preview_extension"
 msgstr ""
-"Указанное ра�ширение файла (%s) недопу�тимо дл� �криншотов. Пожалуй�та, "
+"Указанное ра�ширение файла (%s) недопу�тимо дл� иллю�траций. Пожалуй�та, "
 "и�пользуйте одно из �ледующих: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "При попытке �охранени� ваших данных произошла ошибка."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Вы не имеете прав дл� обновлени� �того дополнени�."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3560,83 +3118,291 @@ msgstr ""
 "Дополнени� не могут и�пользовать внешнюю ��ылку дл� updateURL. Пожалуй�та, "
 "удалите данную ��ылку из файла install.rdf и повторите попытку �нова."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Пожалуй�та, загрузите файл."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Добавить файл дл� другой платформы"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Добавить автора"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Переме�тить/удалить"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Категории дл� нового типа дополнений будут до�тупны на �ледующем шаге."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Дл� �того типа дополнений нет до�тупных категорий."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Введите опи�ание вашего дополнени�."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Введите название вашего дополнени�."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Выберите тип дополнени�, которое вы публикуете."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Введите аннотацию дл� вашего дополнени�."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Файл дополнени�"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Второй файл дополнени�"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Третий файл дополнени�"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Тип дополнени�"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Разрешить пользовател�м про�матривать и�ходный код"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "�дре� �л. почты автора"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "�вторы"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Категории"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Язык по умолчанию"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Опи�ание"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Лицензионное �оглашение (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Дополнительное программное обе�печение"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Файлы дополнени�"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Домашн�� �траница"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Файл значка"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "�азвание"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Поддерживаемые платформы"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Предварительный выпу�к"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Политика конфиденциально�ти"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Дополнение дл� определённого �айта"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "�ннотаци�"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "�дре� �л. почты поддержки"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL поддержки"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Приложение"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Вер�и�"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Информаци� о вер�ии"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "�ет"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Заметки рецензенту"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"По�кольку вашему дополнению довер�ют, выберите, куда поме�тить �ту вер�ию:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "В общий до�туп"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "В «пе�очницу»"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Соглашение разработчика"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Шаг 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Загрузка на �ервер"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Шаг 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Информаци� о дополнении"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Шаг 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Информаци� о новой вер�ии"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Шаг 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Переводы на другие �зыки"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Шаг 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Завершение"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Мои дополнени�"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Загрузить файл"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Отмена"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr ""
-"Пожалуй�та, введите адре� �лектронной почты учётной запи�и автора, которого "
-"вы хотите добавить."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Вниз"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Вверх"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Удалить �овме�тимо�ть � приложением"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Показать как автора в публичных �пи�ках"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Пожалуй�та, выберите лицензию."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Пожалуй�та, введите тек�т вашей лицензии."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Разработчик"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Владелец"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "�аблюдатель"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Удалить автора"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Вы <strong>уверены</strong>, что хотите удалить �того автора?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Вы должны выбрать файл дл� загрузки."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Сво� лицензи� дл� дополнени� %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3654,12 +3420,12 @@ msgstr ""
 "будет недо�тупен, то будет и�пользовать�� �зык по умолчанию (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Панель управлени� админи�тратора"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Панель управлени� редактора"
 
@@ -3668,85 +3434,116 @@ msgid "devcp_myaddons_link"
 msgstr "Мои дополнени�"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Вернуть�� на главную"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Панель �тати�тики"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Публикаци� дополнени�"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Ин�трументы разработчика"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
-"Это дополнение ID (%1$s) уже �уще�твует в базе данных. Е�ли �то ваше "
-"дополнение, вы можете <a href=\"%2$s\">загрузить новую вер�ию</a>."
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Отменить и вернуть��"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Вернуть�� к �ведени�м о дополнении"
 
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "�оминировать %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "�втоматиче�ки определённый тип дополнени�: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
-"<span>Одно или не�колько из �деланных вами изменений не могут быть "
-"�охранены. </span><br />Пожалуй�та, взгл�ните на приведённые ниже ошибки. "
-"О�тальна� ча�ть �деланных вами изменений была у�пешно �охранена."
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
 msgstr ""
-"<span>Ваши изменени� были �охранены.</span><br />Пожалуй�та, обратите "
-"внимание, что дл� по�влени� некоторых изменений во в�ех ча�т�х веб-�айта "
-"может потребовать�� не�колько ча�ов."
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
 msgstr ""
-"Удаление �того, назначенного по умолчанию �криншота, приведёт к "
-"автоматиче�кому назначению �тату�а «по умолчанию» другому �криншоту."
+"Удаление �той, назначенной по умолчанию иллю�трации, приведёт к "
+"автоматиче�кому назначению �тату�а «по умолчанию» другой иллю�трации."
+
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Язык по умолчанию дл� �того дополнени� (%1$s [%2$s]) отличает�� от "
+"выбранного вами �зыка (%3$s [%4$s]). Пол� ра�положенные ниже должны быть "
+"заполнены на %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
 msgstr ""
-"�азначение �тому �криншоту �тату�а «по умолчанию» приведёт к удалению �того "
-"�тату�а у текущего назначенного по умолчанию �криншота."
+"�азначение �той иллю�трации �тату�а «по умолчанию» приведёт к удалению �того "
+"�тату�а у текущей назначенной по умолчанию иллю�трации."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "У ва� е�ть не�охранённые изменени�."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3756,7 +3553,7 @@ msgstr "Панель управлени� разработчика"
 #: controllers/previews_controller.php:103
 #: controllers/previews_controller.php:104
 msgid "devcp_preview_add_pagetitle"
-msgstr "Добавить �криншот"
+msgstr "Добавить иллю�трацию"
 
 #: controllers/previews_controller.php:135
 msgid "devcp_preview_added_successfully"
@@ -3769,57 +3566,65 @@ msgstr "Иллю�траци� у�пешно удалена."
 #: controllers/previews_controller.php:194
 #: controllers/previews_controller.php:195
 msgid "devcp_preview_edit_pagetitle"
-msgstr "Изменить �криншот"
+msgstr "Изменить иллю�трацию"
 
 #: controllers/previews_controller.php:237
 msgid "devcp_preview_updated_successfully"
 msgstr "Иллю�траци� у�пешно обновлена."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Добавить другой �криншот"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Удалить �криншот"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Заменить �криншот"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Обновить �криншоты"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Добавить новый �криншот"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
-"Выберите ниже изображение дл� загрузки. Изображени� превышающие по ширине "
-"700 пик�елей, а по вы�оте 525 пик�елей будут автоматиче�ки отма�штабированы."
-"Разрешённые типы файлов: %s"
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Дл� загрузки щёлкните по кнопке Обновить �криншоты."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
-"Дл� �охранени� �того изображени� щёлкните по кнопке Обновить �криншоты. (<a %"
-"s>Отмена?</a>)"
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
-"Этот �криншот будет удалён при нажатии кнопки Обновить �криншоты. (<a %"
-"s>Отмена?</a>)"
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
@@ -3830,98 +3635,121 @@ msgstr ""
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
-msgstr "Добавить �криншот"
+msgstr "Добавить иллю�трацию"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Подпи�ь под �криншотом"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
-msgstr "Изменить �криншот"
+msgstr "Изменить иллю�трацию"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Иллю�траци� по умолчанию"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
-msgstr "Файл �криншота"
+msgstr "Файл иллю�трации"
 
 #: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
-msgstr "Сделать �тот �криншот изображением по умолчанию"
+msgstr "Сделать �ту иллю�трацию изображением по умолчанию"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "�овое изображение:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Загрузить изображение: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "Один или не�колько из ваших новых �криншотов не могут быть �охранены."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Ваши �криншоты были у�пешно обновлены."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
-"Скриншоты вашего дополнени� показаны ниже. Вы можете изменить �ти �криншоты "
-"или подпи�и к ним. Скриншотом по умолчанию �вл�ет�� �криншот, отображающий�� "
-"р�дом � вашим дополнением при пои�ке или в �пи�ках дополнений."
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
-msgstr "Удалить �криншот"
+msgstr "Удалить иллю�трацию"
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete_confirm"
-msgstr "Вы уверены, что хотите удалить �тот �криншот?"
+msgstr "Вы уверены, что хотите удалить �ту иллю�трацию?"
 
 #: views/previews/edit.thtml:54
 msgid "devcp_previews_submit_edit"
-msgstr "Изменить �криншот"
+msgstr "Изменить иллю�трацию"
 
 #: views/previews/add.thtml:63
 msgid "devcp_previews_submit_upload"
-msgstr "Загрузить �криншот"
+msgstr "Загрузить иллю�трацию"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Превьюшка"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Менеджер �криншотов к %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "�е �оответ�твует?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Вы уверены, что хотите удалить �тот файл?"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Перед продолжением необходимо про�мотреть и прин�ть �ледующее �оглашение "
 "разработчика."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
-"<span>У ва� недо�таточно прав дл� вне�ени� изменений на �той �транице.</"
-"span><br />Е�ли вам нужно вне�ти изменени�, �в�жите�ь � владельцем "
-"дополнени�."
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
-"Пожалуй�та, обратите внимание, что дл� по�влени� некоторых изменений во в�ех "
-"ча�т�х веб-�айта может потребовать�� не�колько ча�ов."
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Панель"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Пропу�тить обновление текущей информации о дополнении"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3945,673 +3773,806 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> из еженедельного кол-ва загрузок"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"Е�ли вы отметите ваше дополнение как активное, то оно по�вит�� в публичной "
-"ча�ти �айта,  подход�щей дл� его �тату�а, включа� результаты пои�ка и "
-"перечни дополнений. Его можно будет загрузить � �айта и оно будет "
-"предлагать�� при проверке обновлений. В �лучае необходимо�ти вы �можете "
-"вернуть�� �юда и отключить ваше дополнение �нова ."
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Вы уверены, что хотите пометить �то дополнение как активное?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Вы уверены?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
-"Е�ли вы отметите ваше дополнение как неактивное, то оно не будет "
-"отображать�� в публичной ча�ти �айта, включа� результаты пои�ка и перечни "
-"дополнений. Его нельз� будет загрузить � �айта или при проверке обновлений. "
-"В �лучае необходимо�ти вы �можете вернуть�� �юда и включить ваше дополнение "
-"�нова."
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Вы уверены, что хотите пометить �то дополнение как неактивное?'"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "�ет, отменить"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
 msgstr ""
-"Е�ли вы �делаете �то дополнение публичным, любой пользователь �может "
-"загрузить �то дополнение и оно �танет предлагать�� в каче�тве обновлени� "
-"�уще�твующим пользовател�м."
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Вы уверены, что хотите �делать �то дополнение публичным?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Е�ли вы переме�тите �то дополнение назад в пе�очницу, то дл� того, чтобы "
-"загрузить дополнение, пользовател�м будет нужно зареги�трировать�� на �айте, "
-"и оно больше не будет предлагать�� в каче�тве обновлени� �уще�твующим "
-"пользовател�м. Так как ваше дополнение в данное врем� �вл�ет�� публичным, вы "
-"можете в любое врем� вернуть�� �юда и �нова �делать его публичным."
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Вы уверены, что хотите переме�тить �то дополнение в пе�очницу?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Да, � уверен"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
-"<span>Дл� номинации требует�� �ообщение.</span><br />Пожалуй�та, введите в "
-"тек�товое поле требуемую информацию и попробуйте �нова."
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "�оминаци� дополнени�"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"В на�то�щее врем� публикаци� дополнений заблокирована. Попробуйте вернуть�� "
+"и попробовать позднее."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Прин�ть"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Отклонить"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Это дополнение было заблокировано админи�тратором."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Заблокировано"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Довер�ть"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "По�ледн�� вер�и�:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "У ва� нет дополнений. Щёлкните %s дл� публикации."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "зде�ь"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Убедите�ь, что %s дл� вашей темы."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "загрузили иллю�трацию"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Редактировать %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Справка (без ухода �о �траницы)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Справка"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "И�пользовано �имволов: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Вы уверены, что хотите удалить �тот перевод?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Что �то за вкладки � %s?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Что, е�ли у мен� нет ни одного перевода?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Скрыть �правку"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"Е�ли пользователь открыл �траницу дополнени� и перевод �траницы дополнени� "
-"на его �зыке от�ут�твует, �траница будет отображена на �зыке вашей Локализации "
-"по умолчанию, указанной в обла�ти редактировани� �вой�тв дополнени�. Е�ли у ва� "
-"нет ни одного перевода, про�то укажите что можете в Локализации по умолчанию, "
-"котора� должна быть �зыком, на котором вы говорите."
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"Это <i>поле дл� перевода</i>. С его помощью вы можете локализовать на другие "
-"�зыки �пецифичное поле, дл� которого у ва� может быть перевод. Вы можете "
-"добавл�ть, редактировать и удал�ть переводы, и�пользу� вкладки локалей."
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Добавить перевод"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Удалить перевод"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Добавить локаль во в�е"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Добавить локаль"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Отмена"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Удалить её"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Выберите дл� добавлени� локаль перевода:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
-"GUID дополнени�, и�пользуемый в �том файле, (%1$s) не �оответ�твует "
-"�уще�твующему GUID дл� �того дополнени� (%2$s)."
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "У ва� недо�таточно привилегий дл� обновлени� �того дополнени�."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "Указана� вер�и� (%1$s) не принадлежит �тому дополнению (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"�омер загруженной вер�ии (%1$s) дл� �того дополнени� уже �уще�твует. Е�ли вы "
-"пытаете�ь добавить к �той вер�ии ещё один файл, <a href=\"%2$s\">щёлкните "
-"зде�ь</a>."
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
-"Загруженный номер вер�ии (%1$s) не �оответ�твует �уще�твующему номеру вер�ии "
-"(%2$s)."
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "начать"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Загрузка файла..."
-
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Согла�ить�� и продолжить"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Редактировать моё дополнение"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Я оформлю моё дополнение позже."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Добавить примечани� к выпу�ку"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
-"<p>Спи�ок ваших дополнений был у�пешно �оздан. Базова� информаци�, полученна� "
-"из вашего загруженного файла, была �охранена. Вы можете на�троить дл� вашего "
-"�пи�ка множе�тво дополнительных параметров.</p><p>Ваше дополнение помечено как "
-"<strong>�езавершенное</strong>. Чтобы закончить оформление вашего дополнени�, "
-"вам нужно убедить��, что указано корректное им�, �водка и опи�ание и что "
-"выбрана по меньшей мере одна категори�. Вы можете отредактировать информацию "
-"о вашем дополнении, и�пользу� указанную ниже ��ылку, и проверить �тату� вашего "
-"дополнени� в любое врем� на <a %s>�транице �тату�а</a>."
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Пожалуй�та, у�траните �ту проблему и �нова загрузите ваше файл."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
-"Ваш новый файл был добавлен в вер�ию %1$s и в данный момент помечен как %2$s."
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "Дополнение �оздано!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Ой! Кажет�� � �тим файлом е�ть проблема..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Файл добавлен!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Как в�ё �то работает?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Создана вер�и� %s"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Загрузить ваш файл"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
-"<p>Спа�ибо за то, что про�вили интере� к отправке вашего дополнени� на �айт "
-"дополнений Mozilla. Размещение вашего дополнени� на �айте дополнений Mozilla - "
-"�то �амый легкий �по�об ра�про�транени� вашего дополнени�. Вот что вы "
-"получите:</p><ul><li>Каждое дополнение имеет �вою �траницу, открытую дл� "
-"публичного до�тупа, � информацией, которую вам необходимо предо�тавить, такую "
-"как: кратка� �водка функций дополнени�, более длинное опи�ание (опционально) "
-"и набор �криншотов вашего дополнени�.</li><li>Ваше дополнение по�вит�� в "
-"пои�ке дополнений и перечн�х дополнений на �айте, и даже в менеджере "
-"дополнений Firefox 3.</li><li>Мы позаботим�� о хо�тинге загружаемых "
-"пользовател�ми файлов и обе�печим автоматиче�кие обновлени� дл� пользователей, "
-"когда вы загрузите новую вер�ию.</li><li>Вы получите до�туп к панели "
-"�тати�тики � подробной информацией о вашей пользователь�кой "
-"базе.</li></ul><p>Дополнени�, размещаемые на �том �айте, должны получить "
-"положительный отзыв от  редактора дополнений Mozilla перед тем, как они "
-"получат в�е перечи�ленные выше преимуще�тва. Е�ли вы готовы начать �то проце�� "
-"и ваше дополнение готово дл� загрузки, про�то щёлкните по ��ылке �ачать!</p>"
-
-#: views/developers/uploader.thtml:125
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Поддерживаемые платформы:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Файл дополнени�: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Другое"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
-"�овый файл �танет до�тупен в публичном до�тупе, как только его ра��мотрит "
-"редактор. В данный момент в очереди на ра��мотрение �тоит %1$s других "
-"дополнений. Хотите у�корить проце�� ра��мотрени�? Подумайте, не хотите ли вы "
-"<a %2$s>�тать редактором</a>."
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
-"�ова� вер�и� �танет до�тупна в публичном до�тупе, как только её ра��мотрит "
-"редактор. В данный момент в очереди на ра��мотрение �тоит %1$s других "
-"дополнений. Хотите у�корить проце�� ра��мотрени�? Подумайте, не хотите ли вы "
-"<a %2$s>�тать редактором</a>."
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "�ова� вер�и� у�пешно �оздана и в данный момент помечена как %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
-"Про�мотрите �вой новый файл на <a %1$s>�транице Вер�ии и Файлы</a>, "
-"проверьте <a %2$s>текущий �тату�</a> вашего дополнени�, или <b>добавьте "
-"примечани� к выпу�ку</b> щёлкнув ра�положенную ниже кнопку (на�то�тельно "
-"рекомендует��)."
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
-"Про�мотрите �вою новую вер�ию на <a %1$s>�транице Вер�ии и Файлы</a>, "
-"проверьте <a %2$s>текущий �тату�</a> вашего дополнени�, или <b>добавьте "
-"примечани� к выпу�ку</b> щёлкнув ра�положенную ниже кнопку (на�то�тельно "
-"рекомендует��)."
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
-"Загрузите файл вашего дополнени�, и�пользу� ра�положенную ниже форму. Е�ли у "
-"ва� имеет�� дл� загрузки не�колько файлов, �пецифичных дл� операционной "
-"�и�темы, выберите один файл и затем загрузите о�тальные, и�пользу� менеджер "
-"Вер�ий и Файлов."
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "В�е"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Специфичные:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Пожалуй�та, выберите..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Добавить файл в %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Загрузить новое дополнение"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Обновить %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Дл� получени� �правочной информации по�етите %s."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "�ту �траницу"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Дл� �того адре�а �л. почты учётной запи�и не найдено."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Либо от�ут�твуют требуемые пол�, либо имеет�� ошибка в XML.  Пожалуй�та <a "
-"href=\"https://developer.mozilla.org/en/"
-"Creating_OpenSearch_plugins_for_Firefox\">прочтите документацию</a>, "
-"проверьте ваше дополнение, и попробуйте �нова."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Изменить вер�ию"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Вер�и� обновлена у�пешно."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Отмена"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Удалить вер�ию"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Удалить пу�тую вер�ию"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Удалить?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Добавить новую вер�ию"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Отмена"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Удалить вер�ию"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Это также удалит:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s файл"
-msgstr[1] "%s файла"
-msgstr[2] "%s файлов"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Удалить вер�ию %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s отзыв"
-msgstr[1] "%s отзыва"
-msgstr[2] "%s отзывов"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Вы уверены, что хотите нав�егда удалить вер�ию %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Отмена"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Удалить файл"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Добавить новое приложение"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Удалить приложение"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Добавить новый файл"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"�а�тройка зде�ь информации о приложении позволит пользовател�м у�тановить "
-"ваше дополнение даже е�ли файл install.rdf в пакете указывает, что "
-"дополнение не�овме�тимо. <a %s>Спи�ок поддерживаемых приложений</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "Вы <b>уверены</b> что хотите удалить �овме�тимо�ть � �тим приложением?"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Вы <b>уверены</b> что хотите нав�егда удалить �тот файл?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Информаци� одобрени�"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Совме�тимые приложени�"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Информаци� о файле"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Лицензи�"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Управление вер�ией %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Примечани� одобрени�"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Удалить файл"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Файл %1$s (%2$s) �оздан %3$s и перене�ён в %4$s %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Пожалуй�та, выберите дл� вашего дополнени� подход�щую лицензию. Эта лицензи� "
-"указывает права на ваш и�ходный код, которые вы предо�тавл�ете."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Файлов не найдено."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr ""
-"Дополнительна� информаци� дл� редактора, который будет пи�ать отзыв на �ту "
-"вер�ию."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Удалить �овме�тимо�ть приложени�"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Пожалуй�та, выберите приложение"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Файл"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Платформа"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Размер"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Стату�"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"Информаци� об изменени�х в �том выпу�ке, новых возможно�т�х, изве�тных "
-"ошибках. и друга� полезна� информаци�, �пецифична� дл� �того выпу�ка/вер�ии. "
-"Эта информаци� будет также до�тупна дл� пользователей, обновл�ющих �то "
-"дополнение, в менеджере дополнений Firefox 3."
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Примечани� к выпу�ку"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>У ва� имеют�� не�охранённые изменени�.</strong> Совме�тимо�ть не "
-"будет удалена, пока вы не щёлкните по кнопке Обновить вер�ию."
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>У ва� имеют�� не�охранённые изменени�.</strong> Файлы не будут "
-"удалены, пока вы не щёлкните по кнопке Обновить вер�ию."
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Обновить вер�ии"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Управление вер�и�ми и файлами"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Вер�ий нет."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Вер�и� %s у�пешно удалена."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
 msgstr ""
-"Эта вер�и� не имеет �в�занных � нею файлоов и может быть удалена. Вы хотите "
-"удалить �ту вер�ию?"
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Создано"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "Стату�"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "Вер�и�"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Дополнение заблокировано"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "Это дополнение не было номинировано."
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Этот файл не ожидает получени� отзыва."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
 #: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "Пожалуй�та, выберите рецензию."
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "Пожалуй�та, выберите проте�тированные вами приложени�."
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
 #: controllers/components/editors.php:84
 #: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "Пожалуй�та, введите комментарии к рецензии."
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "Пожалуй�та, выберите по крайней мере один файл дл� рецензии."
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "Пожалуй�та, выберите проте�тированные вами операционные �и�темы."
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
@@ -4621,7 +4582,7 @@ msgstr "Фильтр"
 msgid "editorcp_logs_filter_by"
 msgstr "Фильтр по типу/дей�твию"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Журнал �обытий"
 
@@ -4683,7 +4644,7 @@ msgstr "Про�мотреть запи�и между %s и %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Отзывы за данный период не найдены."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Журнал рецензий"
 
@@ -4707,24 +4668,24 @@ msgstr "По�ледние дей�тви� редактора"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "В�его отзывов"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Рецензирование дополнени�"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Заполните �ледующие пол�:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Выберите по крайней мере один файл дл� рецензировани�."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Саморецензирование недопу�тимо."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Дополнительное программное обе�печение"
 
@@ -4736,39 +4697,39 @@ msgstr "Добавить избранное"
 msgid "editors_featured_add_feature_submit"
 msgstr "Добавить"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "�е удало�ь добавить избранное."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Избранное у�пешно добавлено."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "�е удало�ь отредактировать избранное."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Избранное у�пешно отредактировано."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Одна или не�колько локалей некорректны."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "�е удало�ь удалить избранное."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Избранное у�пешно удалено."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Избранные дополнени�"
 
@@ -4780,187 +4741,137 @@ msgstr "По�лать"
 msgid "editors_featured_remove_feature"
 msgstr "Удалить избранное"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Фильтр очереди"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Полезные ��ылки"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Политика ра�про�транени� и и�пользовани� дополнений"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Руковод�тво редактора"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr ""
 "Эти фильтры будут дей�твовать до конца �еан�а или пока не будут удалены."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "В на�то�щее врем� нет дополнений данного типа дл� рецензировани�."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 день"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 ча�"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 минута"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Панель управлени� рецензента"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Только дл� %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Предварительный выпу�к"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Совме�тимо � %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Дополнение или адре� �л. почты автора"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Типы дополнений"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Приложение"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Мак�. вер�и�"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Платформы"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Кол-во дней � момента пред�тавлени�"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Результаты пои�ка � фильтром: <strong>%1$s</strong> дополнение"
-msgstr[1] "Результаты пои�ка � фильтром: <strong>%1$s</strong> дополнени�"
-msgstr[2] "Результаты пои�ка � фильтром: <strong>%1$s</strong> дополнений"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Очи�тить"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Фильтр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "В на�то�щее врем� в�е очереди рецензий заблокированы. Попробуйте вернуть�� и "
 "проверить позднее."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Правка объекта"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "И�тори� объекта"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Домашн�� �траница объекта"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Обзор объекта"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Скриншоты"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Рецензировать"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "Запро�ить дополнительную информацию"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Поме�тить в общий до�туп"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Запро� �уперрецензии"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Вернуть в «пе�очницу»"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Про�мотреть комментарии"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
-"И�пользуйте �ту форму, чтобы запро�ить у авторов более подробную информацию. "
-"Они получат пи�ьмо по �лектронной почте и �могут тут ответить. Когда они "
-"ответ�т, ва� уведом�т по �лектронной почте."
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Отметить дополнение и его предыдущие вер�ии и файлы как общедо�тупные. "
 "Будущие вер�ии будут попадать в «пе�очницу», пока они не будут "
 "отрецензированы редактором."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "О�тавить дополнение в «пе�очнице»."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Одобрить данную вер�ию дополнени� из «пе�очницы» дл� размещени� в общем "
 "до�тупе."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "О�тавить данную вер�ию общедо�тупного дополнени� в «пе�очнице»."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Е�ли у ва� е�ть опа�ени� на�чет безопа�но�ти �того дополнени�, проблем � "
@@ -4968,85 +4879,87 @@ msgstr ""
 "введите ваши комментарии в поле ра�положенное ниже. Они будут ото�ланы "
 "админи�траторам, а не автору."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Сравнить � публичной вер�ией"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Про�мотр �одержимого"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "�вторы:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Категории:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Совме�тимо �:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Опи�ание"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Комментарии разработчика"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Лицензионное �оглашение конечного пользовател� (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Файлы:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "И�тори� �ообщений"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Сообщение о номинации"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Иллю�трации"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Политика конфиденциально�ти"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Рецензирование %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Заметки рецензенту"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "�ннотаци�"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Примечани� к вер�ии"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Ответ"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Запро� информации"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -5063,7 +4976,7 @@ msgstr "�оминаци� одобрена/В общий до�туп"
 msgid "editors_review_history_nominated_denied"
 msgstr "�оминаци� отклонена/В «пе�очницу»"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�е найдено ни одной предыдущей рецензии."
 
@@ -5085,96 +4998,87 @@ msgstr "Отклонить/В «пе�очницу»"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Показать/Скрыть ответы (%1$s)"
-msgstr[1] "Показать/Скрыть ответы (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Приложени�:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "или выберите ответ из �тандартных:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Комментарии:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Операционные �и�темы:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "�аверх"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Примечание: Рецензируйте более одного файла только в �лучае е�ли вы "
-"проте�тировали К�ЖДЫЙ выбранный вами файл."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "�лед. &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Рецензии не найдены."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; пред."
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Очередь рецензий"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s-й</strong> из %2$s в очереди"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$-й</strong> из %2$s в очереди (� фильтром)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ход дей�тви�"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Дей�твие"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Комментарии"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Дата"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Рецензент"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Вер�и�/Файл"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
-"По�лать мне уведомление при �ледующем обновлении �того дополнени�. "
-"(�е�колько обновлений подр�д приведут к по�ылке только одного пи�ьма)"
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Рецензи� у�пешно обработана."
 
@@ -5198,7 +5102,7 @@ msgstr "Дей�твие"
 msgid "editors_reviews_in_reply_to"
 msgstr "В ответ на:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Рецензии у�пешно обработаны!"
 
@@ -5210,79 +5114,87 @@ msgstr "В на�то�щее врем� нет рецензий дл� моде
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Обработать рецензии"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Дл� определённого �айта"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "�овое"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Обновлено"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Проверенные приложени�"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Проверенные операционные �и�темы"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Дополнительна� информаци�"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Дополнение"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Тип"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Типы дополнений"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Возра�т"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Приложени�"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Ограничить дл� локалей?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Врем� в очереди"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Сортировка по возра�танию"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Платформы"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Сортировка по убыванию"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Типы публикации"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s дн�(ей)"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s ча�а(ов)"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s минут(ы)"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "В до�тупе отказано"
 
@@ -5290,18 +5202,17 @@ msgstr "В до�тупе отказано"
 msgid "error_access_denied_message"
 msgstr "У ва� недо�таточно прав дл� про�мотра �той �траницы."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Дополнение уже �уще�твует!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5310,14 +5221,11 @@ msgstr "Дополнение уже �уще�твует!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Дополнение не найдено!"
 
@@ -5329,53 +5237,58 @@ msgstr "Дополнение нельз� про�мотреть через ин
 msgid "error_addon_selfreview"
 msgstr "Вы не можете дать отзыв на �воё �об�твенное дополнение."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "В �той категории дополнени� от�ут�твуют!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Лента ново�тей дополнени� не найдена."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Это неправильный адре� �лектронной почты."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Это поле не может быть пу�тым."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Файл не найден!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Ошибка: файл %s не �уще�твует."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "В �той форме имеют�� ошибки. И�правьте их и повторите попытку."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Введённый тек�т неверен, пожалуй�та попробуйте �нова!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Этот URL имеет неверный формат. Правильные URL имеют вид http://example.com/"
@@ -5383,46 +5296,34 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "От�ут�твует аргумент: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Файлы от�ут�твуют"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Предупреждение"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Иллю�траци� не найдена!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Вы должны выбрать рейтинг."
 
@@ -5430,47 +5331,39 @@ msgstr "Вы должны выбрать рейтинг."
 msgid "error_user_already_confirmed"
 msgstr "Реги�траци� учётной запи�и �того пользовател� уже была подтверждена."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "�еверный код подтверждени�!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Пароли не �овпадают."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr ""
 "Данный адре� �лектронной почты уже зареги�трирован другим пользователем."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Врем�, отведённое на �мену адре�а �лектронной почты, и�текло. Пожалуй�та "
 "�нова �мените �вой адре� �лектронной почты в профиле пользовател� и щёлкните "
 "по ��ылке в подтверждающем пи�ьме, как только вы его получите."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Пользователь может иметь только одну роль. Пожалуй�та, перед продолжением, "
-"уберите у пользовател� любые роли."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Такой ник уже �уще�твует."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Пользователь не найден!"
 
@@ -5480,35 +5373,33 @@ msgstr ""
 "Сначала требует�� выполнить активацию учётной запи�и при помощи кода, "
 "полученного по �лектронной почте."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "�еверный логин или пароль!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Вер�и� не найдена!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Введён неверный пароль!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Узнать больше"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Узнать больше о %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5516,79 +5407,86 @@ msgstr[0] "%1$s отзыв"
 msgstr[1] "%1$s отзыва"
 msgstr[2] "%1$s отзывов"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Про�мотреть другие из"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "�азад к дополнению"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Развернуть в�ё"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "�азад к рецензии"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Обозреватель файлов :: Дополнени� %2$s"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "О �айте"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "Блог"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Ча�то задаваемые вопро�ы"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "В�е права защищены."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Copyright"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Сведени� об авторах"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla любезно обе�печивает ��ылки на �ти приложени� и не предо�тавл�ет "
@@ -5596,103 +5494,98 @@ msgstr ""
 "ними. Любые вопро�ы, жалобы или требовани� отно�ительно приложений должны "
 "направл�ть�� �оответ�твующему производителю программного обе�печени�."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Перейти"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Правовое обе�печение"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Другие �зыки:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Политика конфиденциально�ти"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Сохранить"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Словарь"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Словари"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Ра�ширение"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Ра�ширени�"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Локализаци� (Дополнени�)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Локализации (Дополнений)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Локализаци� (Приложени�)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Локализации (Приложений)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Плагин"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Плагины"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Пои�ковый движок"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Пои�ковые движки"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Тема"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Темы"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "В�е локализации"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Возвратить�� на домашнюю �траницу дополнений %1$s"
@@ -5701,86 +5594,37 @@ msgstr "Возвратить�� на домашнюю �траницу допо
 msgid "header_main_firefox_header"
 msgstr "Дополнени� Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Дополнени� <em>дл�</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Дополнени�"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Дополнени� <img alt=\"Дополнени�\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Дополнени� SeaMonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Дополнени� <em>дл�</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Дополнени� Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Дополнени� <em>дл�</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Дополнени� Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Дополнени� <em>дл�</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Перейти к меню других приложений"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Перейти к меню категорий"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Перейти к главному �одержимому"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Перейти к форме пои�ка"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Дополнени�"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Войти"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Выйти"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Мо� учётна� запи�ь"
 
@@ -5788,23 +5632,12 @@ msgstr "Мо� учётна� запи�ь"
 msgid "header_navlink_register"
 msgstr "Реги�траци�"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr ""
-"<a href=\"%1$s\">Зареги�трируйте�ь</a> или <a href=\"%2$s\">Войдите</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Ин�трументы"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Предварительный про�мотр %s"
@@ -5813,49 +5646,38 @@ msgstr "Предварительный про�мотр %s"
 # %2 is the link to an explanatory page.
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr ""
 "<a href=\"%1$s\">Зареги�трируйте�ь</a>, чтобы у�тановить �то "
 "�к�периментальное дополнение. <a href=\"%2$s\">�о почему</a>?"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Дайте мне у�тановить �то �к�периментальное дополнение. <a href=\"%1$s\">Что "
-"�то?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Добавить в %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Добавить %1$s в %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Загрузить %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Дополнение недо�тупно."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Спи�ок локализаций и �ловарей"
 
@@ -5867,8 +5689,8 @@ msgstr "Загрузить �ловарь"
 msgid "langtools_download_langpack"
 msgstr "Загрузить локализацию"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Словари и локализации"
 
@@ -5880,72 +5702,36 @@ msgstr "У�тановить �ловарь"
 msgid "langtools_install_langpack"
 msgstr "У�тановить локализацию"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Словарь"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Локализаци�"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Язык"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Сво� лицензи�"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Лицензи� BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Лицензи� GNU General Public License, вер�и� 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Лицензи� GNU General Public License, вер�и� 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Лицензи� GNU Lesser General Public License, вер�и� 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Лицензи� GNU Lesser General Public License, вер�и� 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Лицензи� MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Лицензи� Mozilla Public License, вер�и� 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Дл� возврата на первую �траницу щёлкните зде�ь."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "дате"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "загрузкам"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "названию"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "рейтингу"
@@ -5970,21 +5756,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Словари и локализации"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Плагины"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Темы"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "�айти дополнени� дл� других приложений"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "другие"
 
@@ -5992,33 +5785,17 @@ msgstr "другие"
 msgid "page_title_appversions"
 msgstr "Вер�ии приложени�"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Собиратель дополнений"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ �обирател� дополнений"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Возможно�ти �обирател� дополнений"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Добро пожаловать в �обиратель дополнений"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Благодарно�ти"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ дл� разработчика"
+msgid "page_title_experimental_addons"
+msgstr "Эк�периментальные дополнени�"
 
 #: controllers/pages_controller.php:111
+#, fuzzy
 msgid "page_title_faq"
-msgstr "Ча�то задаваемые вопро�ы"
+msgstr "Frequently Asked Questions"
 
 #: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
@@ -6044,15 +5821,15 @@ msgstr "Си�тема рецензировани� «пе�очницы»"
 msgid "page_title_submissionhelp"
 msgstr "Помощь при отправке"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "До�тупные вер�ии приложений"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Дополнени�, отправл�емые на Mozilla Add-ons, должны �одержать файл install."
@@ -6060,7 +5837,7 @@ msgstr ""
 "приложений, перечи�ленных ниже. Допу�кают�� только перечи�ленные вер�ии."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6070,15 +5847,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "зде�ь"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Вер�ии"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Вернуть�� на предыдущую �траницу"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "�траницу информации «пе�очницы»"
 
@@ -6086,6 +5866,13 @@ msgstr "�траницу информации «пе�очницы»"
 msgid "pagination_next_page"
 msgstr "�ледующа�"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Страница %1$s из %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "предыдуща�"
@@ -6125,15 +5912,15 @@ msgstr ""
 "проче�ть другие �лова</a> или <a href=\"%2$s\">про�лушать что-либо</a> "
 "вме�то чтени�."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Вы человек?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Что �то?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Ошибка при пометке �того отзыва!"
 
@@ -6143,7 +5930,7 @@ msgstr ""
 "Отправленное не по назначению �ообщение об ошибке или про�ьба оказать "
 "поддержку"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Сообщите от �том отзыве (выберите причину)"
 
@@ -6159,8 +5946,8 @@ msgstr "Друга� (пожалуй�та укажите)"
 msgid "review_flag_reason_spam"
 msgstr "Спам или другое не�оответ�твующее �одержимое"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Спа�ибо; �тот отзыв помечен и будет ра��мотрен редактором."
 
@@ -6176,7 +5963,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>�е�колько �оветов, к которым �тоит при�лушать��:</p><ul><li>Пишите отзыв "
@@ -6197,125 +5984,102 @@ msgstr ""
 "о�тавлению отзывов</a>.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Отзывы о %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Попул�рные дополнени�"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "�овейшие дополнени�"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Попул�рные дополнени�"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Обновлённые дополнени�"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Пои�к"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Результаты пои�ка набора"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Результаты пои�ка набора"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "В данный момент пои�к отключен. Пожалуй�та, попробуйте позже."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "В�ех дополнений"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "в�е наборы"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "пои�к дополнений"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "пои�к наборов"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Пои�к дополнений"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Щёлкните, чтобы вве�ти запро� на пои�к"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "�реди"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "В�е пои�ковые плагины"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Обзор пои�ковых плагинов"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s подход�щее дополнение"
+msgstr[1] "%s подход�щих дополнени�"
+msgstr[2] "%s подход�щих дополнений"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Пои�к не дал результатов."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Пои�к дополнений"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Выдача результатов пои�ка"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Результаты пои�ка: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ин�трументы дл� админи�трировани�"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ин�трументы разработчика"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ин�трументы дл� редактировани�"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Добро пожаловать"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Добро пожаловать, %s"
@@ -6324,7 +6088,7 @@ msgstr "Добро пожаловать, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Словарь"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Избранные дополнени�"
 
@@ -6332,7 +6096,7 @@ msgstr "Избранные дополнени�"
 msgid "sidebar_pitch_looking_for"
 msgstr "Я ищу:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "�овейшие дополнени�"
 
@@ -6340,7 +6104,7 @@ msgstr "�овейшие дополнени�"
 msgid "sidebar_pitch_search"
 msgstr "Пои�ковый плагин"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Подпи�ать�� на"
 
@@ -6348,24 +6112,25 @@ msgstr "Подпи�ать�� на"
 msgid "sidebar_pitch_theme"
 msgstr "Тему"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Обновлённые дополнени�"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s КБ"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Пока не оценено"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Оценка %s из 5 звёзд"
@@ -6402,13 +6167,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %d.%m."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s �оздано"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s выпущено"
@@ -6421,179 +6186,184 @@ msgstr "Закрыть"
 msgid "statistics_help_link"
 msgstr "Справка"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "или выберите другое дополнение"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "или выберите дополнение � публичной �тати�тикой"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Выберите одно из ваших дополнений дл� про�мотра его �тати�тики"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Выберите дополнение дл� про�мотра его �тати�тики"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Выберите дополнение � публичной �тати�тикой"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Панель �тати�тики"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Про�мотреть �тати�тику"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
+#, fuzzy
 msgid "statistics_js_download_csv"
-msgstr "Про�мотреть �ту таблицу в формате CSV"
+msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "нет"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Удалить �ту диаграмму"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
+#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Группировать по: Дню"
+msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
+#, fuzzy
 msgid "statistics_js_groupby_selector_month"
-msgstr "Группировать по: Ме��цу"
+msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
+#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Группировать по: �еделе"
+msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Сравнить по: �еделе"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "В диапазоне найдено %s штук"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Добавить график"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Добавить ещё один график к �той диаграмме"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Скрыть общее кол-во"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Показать общее кол-во"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "�ане�ти общее кол-во на �ту диаграмму"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Про�мотр данных (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Получить файл � разделёнными зап�тыми данными (CSV)"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Скрыть %s �обытий"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Показать %s �обытий"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "�ане�ти даты релизов дополнени� на графики"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Скрыть �обыти� Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Показать �обыти� Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "�ане�ти даты релизов Firefox на графики"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Свернуть диаграмму"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Развернуть диаграмму"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Изменить размер диаграммы"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�ктивных ежедневных пользователей"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Приложение"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "�а�троить"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Загрузки"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Операционна� �и�тема"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Стату� дополнени�"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Сводка"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Вер�и� дополнени�"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Приложение"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Операционна� �и�тема"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Стату� дополнени�"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "�еизве�тно"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Вер�и� дополнени�"
 
@@ -6632,7 +6402,7 @@ msgstr "Ваши на�тройки были обновлены!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Панель �тати�тики"
 
@@ -6660,105 +6430,109 @@ msgstr "Показать"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Показать ещё один ме��ц"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Ежедневна� �водка �тати�тики дл� %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS-канал �водки данных"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %d.%m.%Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Стати�тика дл� %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "По умолчанию, только вы и Mozilla имеют до�туп к информации на вашей панели. "
 "Вы можете открыть её дл� публики, чтобы любой мог видеть данные по вашему "
 "дополнению."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "До�туп к панели"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Приватный"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Только вы и Mozilla могут про�матривать �тати�тику �того дополнени� "
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Публичный"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Любой может про�матривать �тати�тику �того дополнени�"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Изменить на�тройки"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Пожалуй�та обращайте�ь � �той информацией как � конфиденциальной."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Эта панель в данный момент <b>приватна�</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Эта панель в данный момент <b>публична�</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Заблокированы"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Возвратить�� на панель"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Сохранить на�тройки"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "�а�тройки панели �тати�тики дл� %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "�езаблокированы"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Прил."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "ОС"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Стат."
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "�еизв."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Вер."
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Среднее кол-во загрузок за день"
 
@@ -6770,7 +6544,7 @@ msgstr "Загрузки"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Загрузок за по�ледний день"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Загрузок за по�ледние 7 дней"
 
@@ -6788,7 +6562,7 @@ msgstr "С %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Данных ещё нет"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Среднее кол-во активных пользователей за день"
 
@@ -6814,70 +6588,56 @@ msgstr "�ктивных пользователей в день"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "�а %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Среднее кол-во активных ежедневных пользователей за �ту неделю"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s � прошлой недели"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Стати�тика %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "В�е темы"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Обзор тем"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Сменить адре� �лектронной почты"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Сменить пароль"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Сменить пароль или адре� �лектронной почты"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Код подтверждени� был отправлен повторно!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "Ваша учётна� запи�ь %1$s была у�пешно удалена. Е�ли вы захотите вернуть��, "
 "вы можете зареги�трировать�� �нова на <a href=\"%2$s\">�транице реги�трации</"
 "a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Мы опечалены тем, что вы уходите."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Подтвердите пароль"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Удалить мою учётную запи�ь"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "Вы не можете удалить �вою учётную запи�ь, е�ли вы указаны в каче�тве <a href="
@@ -6887,53 +6647,53 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Е�ли у ва� имеют�� дополнительные вопро�ы, обратите�ь в %1$s."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
 "Дл� удалени� учётной запи�и необходимо у�тановить флажок \"Я понимаю...\"."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Дл� выполнени� �того шага введите правильный пароль."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "При удалении вашей учётной запи�и произошла неизве�тна� ошибка. Дл� "
 "разрешени� �той проблемы �в�жите�ь � %1$s и мы удалим �ту учётную запи�ь. "
 "Прино�им �вои извинени� за причинённые неудоб�тва."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Подтверждение удалени� учётной запи�и"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Удаление учётной запи�и %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Прощайте!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Вы больше не �можете зареги�трировать�� на �айте Mozilla Addons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "При нажатии кнопки \"удалить\" ваша учётна� запи�ь будет <strong>нав�егда "
 "удалена</strong>. Это значит:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr ""
 "Ваши отзывы и рейтинги не будут удалены, но они больше не будут � вами "
@@ -6941,24 +6701,24 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "Е�ли у ва� имеет�� �пецифична� проблема, � которой мы можем помочь, "
 "пожалуй�та не удал�йте �вою учётную запи�ь. Св�жите�ь � нами по адре�у %1$s "
 "и мы приложим в�е у�или� по решению �той проблемы."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Я понимаю, что �тот шаг не может быть отменён."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Удалённый пользователь"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Дл� подтверждени� вашего нового адре�а �лектронной почты на адре� %1$s было "
@@ -6966,7 +6726,7 @@ msgstr ""
 "��ылке, указанной в �том пи�ьме. До �тих пор, вы можете входить, и�пользу� "
 "ваш текущий адре� �лектронной почты."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Удалить учётную запи�ь"
 
@@ -6997,7 +6757,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Вы запро�или �мену �воего адре�а �лектронной почты на %2$s Add-ons.\n"
@@ -7040,111 +6802,94 @@ msgstr ""
 "Спа�ибо,\n"
 "-- �дмини�траци� %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Сбро�ить пароль дл� входа на %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Ошибка!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr ""
 "Пожалуй�та, подтвердите изменение �воего адре�а �лектронной почты на %1$s "
 "Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "У�пех!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Ваш адре� �лектронной почты был у�пешно изменён. С �тих пор дл� входа "
 "пожалуй�та и�пользуйте адре� %1$s."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "О мне"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Е�ли хотите, пред�тавьте�ь �ообще�тву! Этот тек�т по�вит�� в публичном "
-"до�тупе на вашей �транице � информацией о пользователе. Перено�ы �трок будут "
-"�охранены, но и�пользование HTML не разрешено."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Подтвердить пароль"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Отобразить �озданные мной подборки в моем профиле"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Отобразить мои любимые подборки в моем профиле"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Редактировать профиль %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "�дре� �л. почты"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Им�"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Скрывать адре� �л. почты "
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL веб-�айта"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Фамили�"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Вход в �и�тему"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "�овый пароль"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "�ик"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Старый пароль"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Другие дей�тви�"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Пароль"
 
@@ -7152,67 +6897,67 @@ msgstr "Пароль"
 msgid "user_form_registration"
 msgstr "Реги�траци� нового пользовател�"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Запомнить мен� на �том компьютере"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Показать «пе�очницу»?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Сохранить"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Войти"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Реги�траци�"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Пользователь Mozilla Add-ons �"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Создать новую учётную запи�ь"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Совме�тимо�ть дополнений (на�то�тельно рекомендуем дл� подпи�ки)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Пред�то�щие �обыти� и конкур�ы"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "В данное врем� у ва� нет уведомлений, которые можно на�троить."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "Врем� от времени Mozilla может по�ылать вам пи�ьма � информацией о выход�щих "
 "в �кором времени вер�и�х приложений и �обыти�х, ка�ающих�� дополнений. "
 "Пожалуй�та, выберите темы, в которых вы заинтере�ованы:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla о�тавл�ет за �обой право �в�зать�� � вами лично, в �лучае, е�ли "
 "возникнут вопро�ы по размещенным вами дополнени�м."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "В изменени�х, которые вы �делали, имеют�� ошибки. И�правьте их и отправьте "
 "данные заново…"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Профиль обновлён."
 
@@ -7225,16 +6970,16 @@ msgstr "Сбро� парол� дл� %s"
 msgid "user_pwreset_header"
 msgstr "Сбро� парол�"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Забыли пароль?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "С�ылка дл� �бро�а парол� была отправлена на адре� вашей �лектронной почты."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Пароль у�пешно �брошен."
 
@@ -7246,7 +6991,7 @@ msgstr "Отправить изменённый пароль"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Отправить ��ылку дл� �бро�а парол�"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Дополнени� дл� %s"
@@ -7263,7 +7008,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7275,25 +7020,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "отправить �ообщение дл� подтверждени� заново"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Поздравл�ем! Ваша учётна� запи�ь у�пешно �оздана."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Реги�траци� на AMO <strong>не требует��</strong> е�ли вы хотите про�то "
-"загрузить и у�тановить публичные дополнени�.</p><p>Вам нужно "
-"зареги�трировать�� только е�ли:</p><ul><li>Вы хотите �о�тавл�ть рецензии на "
-"дополнени�</li><li>Вы �вл�ете�ь разработчиком дополнени� и хотите загрузить "
-"ваше дополнение дл� размещени� на AMO</li></ul><p>По завершении у�пешной "
-"реги�трации по указанному вами адре�у �лектронной почты вам будет отправлено "
-"пи�ьмо дл� подтверждени� реги�трации. Дл� подтверждени� реги�трации вашей "
-"учётной запи�и, пожалуй�та, �ледуйте ин�трукци�м в �том пи�ьме.</p><p>Е�ли "
-"желате, вы можете проче�ть наше <a href='%1$s' title='Правовое "
-"обе�печение'>Правовое обе�печение</a> и <a href='%2$s' title='Политика "
-"приватно�ти'>Политику приватно�ти</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -7306,28 +7036,20 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Спа�ибо за реги�трацию! Добро пожаловать на %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Добро пожаловать на addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Требует�� им�, фамили� или ник."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Подборки"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Уведомлени�"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Профиль пользовател�"
 
@@ -7335,64 +7057,51 @@ msgstr "Профиль пользовател�"
 msgid "user_verified_okay"
 msgstr "Проверка у�пешно завершена!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Удаление учётной запи�и"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Изменение на�троек учётной запи�и пользовател�"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "О мне"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Дополнени�, �озданные %1$s:"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Им�"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Профиль пользовател�"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Подборки от %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "�дре� �лектронной почты"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Любимые подборки"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Домашн�� �траница"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "�ик"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Информаци� о пользователе %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Отзывы от %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Вход пользовател� в �и�тему"
 
@@ -7428,712 +7137,5 @@ msgstr "Сбро� парол� пользовател�"
 msgid "users_register_pagetitle"
 msgstr "Реги�траци� нового пользовател�"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Лицензи� на и�ходный код дл� %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Про�мотреть по дате добавлени�"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Про�мотреть по кол-ву загрузок"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Про�мотреть по рейтингу"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Следующее дополнение"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Предыдущее дополнение"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Сама� по�ледн�� вер�и� �овме�тима �"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Полна� и�тори� вер�ий"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "�овейшие:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "�аиболее попул�рные:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Мы рекомендуем:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "�едавно обновлённые:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Про�мотреть в�е"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Про�мотреть в�е рекомендуемые дополнени�"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "По рейтингу"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "По дате по�леднего обновлени�"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "По попул�рно�ти"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Загружает��"
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Подробнее"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Данна� вер�и� вашего дополнени� не отмечена как �овме�тима� � Firefox %1"
-#~ "$s. Mozilla �обирает�� в �кором времени выпу�тить �ледующую вер�ию "
-#~ "Firefox, по�тому пожалуй�та проте�тируйте ваше дополнение в новой вер�ии "
-#~ "и обновите информацию о �овме�тимо�ти. Более подробна� информаци� "
-#~ "до�тупна по <a href=\"%2$s\">�тому адре�у</a>. Это в�его лишь уведомление "
-#~ "и вы можете продолжать выкладывать �ту вер�ию на addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Дополнение у�пешно заблокировано"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Изменить дополнение"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Дополнение у�пешно разблокировано"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Опи�ание дополнени�"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "Лицензионное �оглашение (EULA)"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Домашн�� �траница дополнени�"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "�азвание дополнени�"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Политика конфиденциально�ти"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Кратка� информаци� о дополнении"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "�дре� �л. почты поддержки"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL поддержки"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Примечани� к вер�ии"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "�оминировать дополнение"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Дополнение у�пешно номинировано!"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "�е�колько отзывов пользователей об �том дополнении (могут быть внешние "
-#~ "отзывы)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "По�етите �траницу %1$s, чтобы �делать изменени� в вашей публикации или %2"
-#~ "$s, чтобы вернуть�� в панель управлени� разработчика."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "щёлкните зде�ь"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Изменить дополнение"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Эта вер�и� была помещена в «пе�очницу», в ожидании проверки те�терами и "
-#~ "редактором Mozilla Add-on. О предприн�тых дей�тви�х вы будете уведомлены "
-#~ "по �лектронной почте."
-
-# %1 is the link to the sandbox information page
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr ""
-#~ "Дополнительную информацию о �и�теме рецензировани� «пе�очница» вы можете "
-#~ "получить %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "зде�ь"
-
-# %1 is the "nominate" link
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Эта вер�и� была помещена в «пе�очницу» дл� и�пользовани� опытными "
-#~ "пользовател�ми. Дл� того, чтобы показать её на общедо�тупном �айте, вы "
-#~ "должны %s ваше дополнение и пройти через проце�� рецензировани�."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "номинировать"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Публикаци� вашего дополнени� была у�пешно завершена."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "По�кольку вашему дополнению довер�ют, �та вер�и� была автоматиче�ки "
-#~ "одобрена дл� общедо�тупной ча�ти �айта."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Публикаци� дополнени�"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Дополнение у�пешно обновлено"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Вы можете увеличить интере� к вашему дополнению, %s."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "загрузив иллю�трации"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "�втор не найден [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Переме�тить/удалить"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Отменить"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Вы уверены, что хотите отменить публикацию?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Далее"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Изменить тип дополнени�:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Комментарии разработчика обновлены."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Добавить иллю�трацию"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "�втор"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "�вторы"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "�ет"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Категори�"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Категории"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Опи�ание"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Заблокировано"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Сведени�"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Комментарии разработчика"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Иллю�трации"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Вер�ии"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Домашн�� �траница"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "�ет"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "�ет подпи�и"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Иллю�трации не найдены."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Обновить"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "�дре� �л. почты поддержки"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Разработчик не указал адре� �л. почты поддержки."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL поддержки"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Разработчик не указал url поддержки."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Довер�ть"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Вер�ии не найдены."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Отменить и вернуть�� назад"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Да, отключить его"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Вы уверены, что хотите отключить �то дополнение?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Отключение �того дополнени� приведёт к �крытию его из �пи�ка дополнений и "
-#~ "результатов пои�ка. Его нельз� будет загрузить � веб-�айта и оно не будет "
-#~ "предложено клиенту при проверке обновлени�. С точки зрени� пользователей "
-#~ "дополнение будет удалено, хот� вы �можете в дальнейшем вернуть�� �юда и "
-#~ "при желании �нова его включить."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Отключить %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Да, включить его"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Вы уверены, что хотите включить �то дополнение?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Включение �того дополнени� приведёт к тому, что оно �нова по�вит�� в "
-#~ "�пи�ке дополнений и результатах пои�ка. Его можно будет загрузить � веб-"
-#~ "�айта и оно будет предложено клиенту при проверке обновлений."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Включить %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Добавить автора"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "�дре�а �л. почты авторов"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Переме�тить/удалить"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Дл� дополнений �того типа нет до�тупных категорий."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "�вторы"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Добавить значок"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Изменить значок"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Позволить пользовател�м про�матривать и�ходные файлы онлайн."
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Категории"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Язык по умолчанию"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Удалить �уще�твующий значок"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "�овый файл значка"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Значок"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "Кратка� дополнительна� информаци� (така� как им� ме�тного диалекта)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Обновить"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">про�тое им� "
-#~ "локали</a>, например 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Отмеченные файлы будут удалены."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Файлы"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Приложение"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "�ет файлов."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Заметки рецензенту"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Обновить"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "�ннотаци� ограничена мак�имум 250 �имволами.\n"
-#~ "(Вы ввели %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Такое дополнение уже �уще�твует в базе данных. Удо�товерьте�ь, что:<br /"
-#~ "><li>GUID указан верно. Сама� ра�про�транённа� причина дл� �той ошибки — "
-#~ "неверный GUID.</li><li>В базе нет дублирующей запи�и. Е�ли така� запи�ь "
-#~ "при�ут�твует, необходимо обновить её или удалить и попытать�� �нова.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Опишите изменени�, �деланные в �том обновлении."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "�е в�е GUIDы в файле подход�т"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "Дл� �того дополнени� и платформы уже �уще�твует идентична� вер�и� (%s)."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Дл� номинации вы должны вве�ти требуемые данные."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "�евозможно номинировать предварительный выпу�к."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Вы можете номинировать только дополнени� наход�щие�� в «пе�очнице»."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "При попытке �охранени� ваших данных произошла ошибка."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Вы не имеете прав дл� обновлени� �того дополнени�."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Добавить файл дл� другой платформы"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Добавить автора"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Переме�тить/удалить"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Категории дл� нового типа дополнений будут до�тупны на �ледующем шаге."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Дл� �того типа дополнений нет до�тупных категорий."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Введите опи�ание вашего дополнени�."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Введите название вашего дополнени�."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Выберите тип дополнени�, которое вы публикуете."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Введите аннотацию дл� вашего дополнени�."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Файл дополнени�"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Второй файл дополнени�"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Третий файл дополнени�"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Тип дополнени�"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Разрешить пользовател�м про�матривать и�ходный код"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "�дре� �л. почты автора"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "�вторы"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Категории"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Язык по умолчанию"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Опи�ание"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Лицензионное �оглашение (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Дополнительное программное обе�печение"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Файлы дополнени�"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Домашн�� �траница"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Файл значка"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "�азвание"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Поддерживаемые платформы"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Предварительный выпу�к"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Политика конфиденциально�ти"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Дополнение дл� определённого �айта"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "�ннотаци�"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "�дре� �л. почты поддержки"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL поддержки"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Приложение"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Вер�и�"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Информаци� о вер�ии"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "�ет"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Заметки рецензенту"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "По�кольку вашему дополнению довер�ют, выберите, куда поме�тить �ту вер�ию:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "В общий до�туп"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "В «пе�очницу»"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Соглашение разработчика"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Шаг 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Загрузка на �ервер"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Шаг 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Информаци� о дополнении"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Шаг 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Информаци� о новой вер�ии"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Шаг 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Переводы на другие �зыки"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Шаг 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Завершение"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Мои дополнени�"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Вернуть�� к �ведени�м о дополнении"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "�втоматиче�ки определённый тип дополнени�: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Язык по умолчанию дл� �того дополнени� (%1$s [%2$s]) отличает�� от "
-#~ "выбранного вами �зыка (%3$s [%4$s]). Пол� ра�положенные ниже должны быть "
-#~ "заполнены на %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "�е �оответ�твует?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Вы уверены, что хотите удалить �тот файл?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Пропу�тить обновление текущей информации о дополнении"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "В на�то�щее врем� публикаци� дополнений заблокирована. Попробуйте "
-#~ "вернуть�� и попробовать позднее."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Прин�ть"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Отклонить"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Это дополнение было заблокировано админи�тратором."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Заблокировано"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Довер�ть"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "У ва� нет дополнений. Щёлкните %s дл� публикации."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "зде�ь"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Убедите�ь, что %s дл� вашей темы."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "загрузили иллю�трацию"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Изменить вер�ию"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Вер�и� обновлена у�пешно."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "�овое"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Обновлено"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Типы дополнений"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Возра�т"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Приложени�"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Платформы"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Типы публикации"
-
-#~ msgid "error_notice"
-#~ msgstr "Предупреждение"
-
-#~ msgid "forum_save"
-#~ msgstr "Сохранить"
-
-#~ msgid "home"
-#~ msgstr "домой"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Плагины"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Эк�периментальные дополнени�"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Вернуть�� на предыдущую �траницу"
-
-# %1 is page number, %2 is total page count
-#, fuzzy
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Страница %1$s из %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s подход�щее дополнение"
-#~ msgstr[1] "%s подход�щих дополнени�"
-#~ msgstr[2] "%s подход�щих дополнений"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS-канал �водки данных"
diff --git a/site/app/locale/sk/LC_MESSAGES/messages.po b/site/app/locale/sk/LC_MESSAGES/messages.po
index 2cdd67e..e5dbbb8 100644
--- a/site/app/locale/sk/LC_MESSAGES/messages.po
+++ b/site/app/locale/sk/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-04 11:56+0100\n"
+"PO-Revision-Date: 2009-03-25 23:27+0100\n"
 "Last-Translator: wladow <info@wladow.sk>\n"
 "Language-Team: SLOVAK <l10n@mozilla.sk>\n"
 "MIME-Version: 1.0\n"
@@ -15,95 +15,72 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>=2 && n<=4 ? 1 : 2\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Zrušiť inštaláciu"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Prevziať %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Prijať a prevziať"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Prijať a nainštalovať"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "Verejné"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Aktualizované: %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Verzia %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "prevzatí"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "prevzatí spolu"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "prevzatí za týždeň"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
@@ -111,99 +88,92 @@ msgstr[0] "%1$s doplnok"
 msgstr[1] "%1$s doplnky"
 msgstr[2] "%1$s doplnkov"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "na stránku"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Zoradiť podľa:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimentálne"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "odporú�ané"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "Doplnok %1$s nie je pre platformu %2$s k dispozícii"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Späť na %1$s…"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Späť na recenzie…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Hodnotenie:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Recenzia:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Odoslať recenziu"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Pridať recenziu doplnku %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Názov/Súhrn:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Odstrániť"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Odpovedať"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Naozaj chcete odstrániť túto recenziu?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nie"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "�no"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Odstrániť recenziu"
 
@@ -212,7 +182,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Recenzia úspešne odstránená."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Upraviť recenziu doplnku %s"
@@ -221,20 +191,24 @@ msgstr "Upraviť recenziu doplnku %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Problém pri nahlásení recenzie: poznámky k nahláseným recenziám sú obmedzené na 10 až 100 znakov. Vaša poznámka obsahuje %1$s znakov."
+msgstr ""
+"Problém pri nahlásení recenzie: poznámky k nahláseným recenziám sú obmedzené "
+"na 10 až 100 znakov. Vaša poznámka obsahuje %1$s znakov."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Nezabudnite: pred publikovaním na verejnej stránke bude recenzia moderovaná editorom."
+msgstr ""
+"Nezabudnite: pred publikovaním na verejnej stránke bude recenzia moderovaná "
+"editorom."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Odpove� vývojára na:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -254,35 +228,45 @@ msgstr "Recenzie doplnku %s"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Odpove� od %1$s na %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Odpove� vývojára:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Recenzia úspešne uložená. Ďakujeme!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "%1$s dňa %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "%1$s dňa %2$s (hodnotenie: %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Ďalší doplnok"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Predchádzajúci doplnok"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Permanentný odkaz na túto verziu"
@@ -291,27 +275,26 @@ msgstr "Permanentný odkaz na túto verziu"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Posledná verzia kompatibilná s %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Prejsť"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Zobraziť profil autora"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Prehľadávať všetky témy :: Doplnky pre %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Prehľadávať %s"
@@ -320,110 +303,62 @@ msgstr "Prehľadávať %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Prehľadávať témy z kategórie %1$s :: Doplnky pre %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "ÄŒo je toto?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Pridať recenziu"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Ďalšie podrobnosti"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategórie"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Pridať do kolekcie:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Nová kolekcia..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Zvoľte kolekciu..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publikovať"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "Doplnok %1$s bol pridaný do kolekcie %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "ÄŒo je toto?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "a �alšia kolekcia"
-msgstr[1] "a �alšie %1$s kolekcie"
-msgstr[2] "a �alších %1$s kolekcií"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "podrobná recenzia"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Nepá�i sa"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Upraviť recenziu"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Doplnok obsahuje zásady ochrany súkromia"
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Neznášaný"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Príbuzné kolekcie"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komentáre vývojára"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Domovská stránka"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Licencia pre zdrojový kód"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recenzie"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Podpora"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pá�i sa"
 
@@ -431,26 +366,22 @@ msgstr "Pá�i sa"
 msgid "addons_display_long_description"
 msgstr "Dlhý popis"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Obľúbený"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Ďalšie obrázky"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Tento doplnok sa zatiaľ nenachádza v žiadnej kolekcii."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Ďalšie doplnky od %1$s"
@@ -460,87 +391,95 @@ msgstr[2] "Ďalšie doplnky od týchto autorov"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Podporu pre tento doplnok poskytuje autor na e-mailovej adrese %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Podporu pre tento doplnok poskytuje autor na adresách %$1s alebo %$2s."
+msgstr "Podporu pre tento doplnok poskytuje autor na adresách %s alebo %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Podporu pre tento doplnok poskytuje autor na adrese %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Hodnotenie"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Naozaj pekný"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Prosím, do recenzií nepíšte záznamy o chybách. Nesprístupňujeme vašu e-mailovú adresu autorom rozšírení a tí vás môžu chcieť kontaktovať, aby ste im pomohli opraviť chyby."
+msgstr ""
+"Prosím, do recenzií nepíšte záznamy o chybách. Nesprístupňujeme vašu e-"
+"mailovú adresu autorom rozšírení a tí vás môžu chcieť kontaktovať, aby ste "
+"im pomohli opraviť chyby."
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Pravidlá pre pridávanie recenzií</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Informácie o asistencii k tomuto doplnku nájdete v <a href=\"%1$s\">sekcii podpory</a>."
+msgstr ""
+"Informácie o asistencii k tomuto doplnku nájdete v <a href=\"%1$s\">sekcii "
+"podpory</a>."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Uložiť"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Zobraziť všetky doplnky z kategórie %1$s"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Zobraziť všetky recenzie (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Zobraziť všetky verzie"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Úplná história verzií"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Zobraziť zdroj"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Zobraziť štatistiku"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Čo si myslíte?"
 
@@ -548,407 +487,295 @@ msgstr "Čo si myslíte?"
 msgid "addons_display_workswith"
 msgstr "Ur�ené pre:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Nedávno pridané"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populárne"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Odporú�ané"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Odoberať"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Prehľadávanie doplnkov"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Aktualizované"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "Autor:"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Populárne kolekcie"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Kolekcie"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> doplnok"
-msgstr[1] "<strong>%1$s</strong> doplnky"
-msgstr[2] "<strong>%1$s</strong> doplnkov"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Zobraziť všetky kolekcie"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Kolekcie sú spôsob, ako môžete kategorizovať, triediť, miešať, zoskupovať a spájať doplnky.  Prihláste sa k odberu kolekcie vytvorenej niekým iným alebo si vytvorte svoju vlastnú."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> odberateľ"
-msgstr[1] "<strong>%1$s</strong> odberatelia"
-msgstr[2] "<strong>%1$s</strong> odberateľov"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Odporú�ame"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Doplnky rozširujú %1$s a umožňujú ho prispôsobiť. Poobzerajte sa tu a prispôsobte si %1$s podľa svojich potrieb."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Ako tieto? Ďalšie doplnky nájdete v kolekcii %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Viac ako 5000 doplnkov</strong>, pomocou ktorých si môžete prispôsobiť a rozšíriť Firefox podľa vašich predstáv."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Čo sú doplnky?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Jednoduchá inštalácia</strong> a aktualizácia."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Úvod"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Panely s nástrojmi, témy a poskytovatelia vyhľadávania, ktorí <strong>vám pomáhajú vykonávať bežné úlohy.</strong>"
+msgstr ""
+"Doplnky rozširujú %1$s a umožňujú ho prispôsobiť. Poobzerajte sa tu a "
+"prispôsobte si %1$s podľa svojich potrieb."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NOVÉ!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Najnovšie:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Ďalšie programy"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>prevzatý doplnok</span>"
-msgstr[1] "<strong>%1$s</strong> <span>prevzaté doplnky</span>"
-msgstr[2] "<strong>%1$s</strong> <span>prevzatých doplnkov</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>používaný doplnok</span>"
-msgstr[1] "<strong>%1$s</strong> <span>používané doplnky</span>"
-msgstr[2] "<strong>%1$s</strong> <span>používaných doplnkov</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Najobľúbenejšie:"
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Odporú�ame:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Naposledy aktualizované:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Zobraziť všetky"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Zobraziť všetky naposledy pridané doplnky"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Zobraziť všetky obľúbené doplnky"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Zobraziť všetky odporú�ané doplnky"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Zobraziť všetky naposledy aktualizované doplnky"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Prevezmite súbor a uložte ho na pevný disk.</li><li>V programe Mozilla Sunbird pomocou ponuky Nástroje otvorte Doplnky.</li><li>Kliknite na tla�idlo Nainštalovať, vyhľadajte/vyberte prevzatý súbor a kliknite na tla�idlo \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Kliknutím na dole uvedený odkaz uložte súbor.</li><li>V programe "
+"Mozilla Sunbird pomocou ponuky Nástroje otvorte Doplnky.</li><li>Kliknite na "
+"tla�idlo Nainštalovať, vyhľadajte/vyberte prevzatý súbor a kliknite na "
+"tla�idlo \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Ako nainštalovať do Sunbirdu"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Prevezmite súbor a uložte ho na pevný disk.</li><li>V programe Mozilla Thunderbird pomocou ponuky Nástroje otvorte Doplnky.</li><li>Kliknite na tla�idlo Nainštalovať, vyhľadajte/vyberte prevzatý súbor a kliknite na tla�idlo \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Kliknutím pravým tla�idlom myši na dole uvedený odkaz a príkazom "
+"\"Uložiť cieľ odkazu ako…\" prevezmite a uložte súbor na pevný disk.</"
+"li><li>V programe Mozilla Thunderbird pomocou ponuky Nástroje otvorte "
+"Doplnky.</li><li>Kliknite na tla�idlo Nainštalovať, vyhľadajte/vyberte "
+"prevzatý súbor a kliknite na tla�idlo \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Ako nainštalovať do Thunderbirdu"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "Zobraziť experimentálne doplnky"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Prejsť"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Od"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "pre Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "pre Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "pre Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Na tejto stránke sú uvedené len najpoužívanejšie a najobľúbenejšie zásuvné moduly. Ďalšie informácie o ostatných zásuvných moduloch, ktoré sú k dispozícii pre prehliada�e založené na Mozille, nájdete na stránke %1$s."
+msgstr ""
+"Na tejto stránke sú uvedené len najpoužívanejšie a najobľúbenejšie zásuvné "
+"moduly. Ďalšie informácie o ostatných zásuvných moduloch, ktoré sú k "
+"dispozícii pre prehliada�e založené na Mozille, nájdete na stránke %1$s."
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Hľadáte zásuvný modul, ktorý tu nie je uvedený?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Zásuvné moduly pomáhajú prehliada�u vykonávať špeciálne funkcie, napríklad zobrazovať špeciálne grafické formáty alebo prehrávať multimediálne súbory. Zásuvné moduly sa trochu líšia od rozšírení, ktoré upravujú existujúce funkcie alebo pridávajú nové."
+msgstr ""
+"Zásuvné moduly pomáhajú prehliada�u vykonávať špeciálne funkcie, napríklad "
+"zobrazovať špeciálne grafické formáty alebo prehrávať multimediálne súbory. "
+"Zásuvné moduly sa trochu líšia od rozšírení, ktoré upravujú existujúce "
+"funkcie alebo pridávajú nové."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Najpoužívanejšie zásuvné moduly pre %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Zásuvné moduly"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentácia podpory: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s vyžaduje, aby ste pred pokra�ovaním v inštalácii prijali podmienky nasledujúcej Licen�nej zmluvy koncového používateľa:"
+msgstr ""
+"%s vyžaduje, aby ste pred pokra�ovaním v inštalácii prijali podmienky "
+"nasledujúcej Licen�nej zmluvy koncového používateľa:"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
-msgstr "Ukážky pre %s"
-
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Naposledy pridané"
+msgstr "Ukážky %s"
 
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "K dispozícii sú tisíce doplnkov, pre každého sa tu nie�o nájde. Na úvod uvádzame niektoré obľúbené. Príjemnú zábavu!"
+msgstr ""
+"K dispozícii sú tisíce doplnkov, pre každého sa tu nie�o nájde. Na úvod "
+"uvádzame niektoré obľúbené. Príjemnú zábavu!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Odporú�ané doplnky"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Odporú�ané doplnky"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Ďalšie zdroje"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Vývojárske centrum Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Prepá�te, ak chcete nainštalovať vyhľadávací modul, musíte mať prehliada� založený na Mozille (napríklad Firefox)."
+msgstr ""
+"Prepá�te, ak chcete nainštalovať vyhľadávací modul, musíte mať prehliada� "
+"založený na Mozille (napríklad Firefox)."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "Na inštaláciu vyhľadávacích modulov je potrebný JavaScript, ale zdá sa, že ho máte zakázaný. Pred inštaláciou dole uvedených vyhľadávacích modulov povoľte JavaScript."
+msgstr ""
+"Na inštaláciu vyhľadávacích modulov je potrebný JavaScript, ale zdá sa, že "
+"ho máte zakázaný. Pred inštaláciou dole uvedených vyhľadávacích modulov "
+"povoľte JavaScript."
 
 # %1 is "make your own" link
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Nau�te sa %1$s, na stránke %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "vytvoriť svoj vlastný"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Ďalšie vyhľadávacie moduly nájdete na stránke %1$s."
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Vyhľadávacie moduly"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Zvláštne po�akovanie patrí projektu Mycroft za ich prácu na vyhľadávacích moduloch pre  Firefox."
+msgstr ""
+"Zvláštne po�akovanie patrí projektu Mycroft za ich prácu na vyhľadávacích "
+"moduloch pre  Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Zdieľať"
 
@@ -957,6 +784,7 @@ msgid "addons_share_label_delicious"
 msgstr "Pridať do Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
 msgstr "Digg this!"
 
@@ -972,35 +800,29 @@ msgstr "Zdieľať na FriendFeed"
 msgid "addons_share_label_myspace"
 msgstr "Odoslať na MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "zakázaný"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "nekompletná verzia"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "v sandboxe, nominovaný na uverejnenie"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "v sandboxe, �akajúci na kontrolu"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "uverejnený"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "v sandboxe"
@@ -1009,34 +831,26 @@ msgstr "v sandboxe"
 msgid "addons_status_unknown"
 msgstr "neznámy"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Viac informácií o tomto doplnku"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Naj�astejšie preberané"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Najlepšie hodnotené"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Opatrne pri starých verziách"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Tieto verzie sú zobrazené len ako odkazy na testovacie ú�ely. Vždy by ste mali používať najnovšiu verziu doplnku."
+msgstr ""
+"Tieto verzie sú zobrazené len ako odkazy na testovacie ú�ely. Vždy by ste "
+"mali používať najnovšiu verziu doplnku."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "História verzií s denníkmi zmien"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "História verzií %1$s"
@@ -1059,8 +873,7 @@ msgstr "Skupina s identifikáciou %s bola odstránená"
 msgid "admin_group_edit_pagetitle"
 msgstr "Upraviť skupinu"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Neplatná identifikácia skupiny"
 
@@ -1068,1361 +881,415 @@ msgstr "Neplatná identifikácia skupiny"
 msgid "admin_group_pagetitle"
 msgstr "Administrácia skupiny"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Skupina bola uložená"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Rozšírené"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Nezáleží"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Nezáleží"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Nezáleží"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Aplikácia"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Zhoda kľú�ových slov"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Aktualizované"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Meno"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Najnovšie"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "V posledných 3 mesiacoch"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "V posledných 6 mesiacoch"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Za posledných 24 hodín"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Za posledný mesiac"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Za posledných 7 dní"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Za posledný rok"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Doplnkov na stránku"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platforma"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularita"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Hodnotenie"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Usporiadať podľa"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "až"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Prepnúť rozšírený režim vyhľadávania"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Typ"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "verzia"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Ďalšia"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Predchádzajúca"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorovať kontrolu verzie"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Tento doplnok je ur�ený pre staršie verzie Firefoxu"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Môžete skúsiť <a href=\"%1$s\">staršiu verziu</a> alebo <a href=\"#\" onclick=\"%2$s\">ignorovať túto kontrolu</a>."
+msgstr ""
+"Môžete skúsiť <a href=\"%1$s\">staršiu verziu</a> alebo <a href=\"#\" "
+"onclick=\"%2$s\">ignorovať túto kontrolu</a>."
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">Staršia verzia</a> by mohla fungovať"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Tento doplnok vyžaduje zatiaľ neuvoľnený <a href=\"%1$s\">Firefox %2$s</a>"
+msgstr ""
+"Tento doplnok vyžaduje zatiaľ neuvoľnený <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "Aby ste mohli používať tento doplnok, musíte <a href=\"http://getfirefox.com\">aktualizovať Firefox</a>"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "Používateľ %1$s zmenil stav doplnku %2$s na %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "Používateľ %1$s vykonal neznámu akciu administrátora '%2$s' pre ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "Používateľ %1$s odstránil funkciu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "Používateľ %1$s vytvoril aplikáciu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "Používateľ %1$s upravil aplikáciu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "Používateľ %1$s vytvoril verziu %2$s pre %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "Používateľ %1$s odstránil verziu %2$s pre %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "Používateľ %1$s zmenil konfiguráciu '%2$s' z '%3$s' na '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "Používateľ %1$s vykonal neznámu akciu editora '%2$s' pre ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "Používateľ %1$s odstránil doplnok %2$s zo zoznamu odporú�aných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "Používateľ %1$s pridal doplnok %2$s do zoznamu odporú�aných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "Používateľ %1$s zmenil zoznam odporú�aných doplnkov pre lokalizáciu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "Používateľ %1$s zmenil lokalizácie pre doplnok %2$s na zozname odporú�aných"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "Používateľ %1$s obnovil hash pre súbor %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "Používateľ %1$s pridal používateľa %2$s do skupiny %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "Používateľ %1$s sa priradil do skupiny %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "Používateľ %1s vytvoril skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "Používateľ %1$s odstránil skupinu %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "Používateľ %1$s upravil skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "Používateľ %1$s odstránil používateľa %2$s zo skupiny %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "Používateľ %1$s vykonal neznámu akciu '%2$s' pre %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "Používateľ %1$s sa pokúsil upraviť uzamknutú skupinu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "Používateľ %1$s sa pokúsil bez povolenia upraviť preklady pre lokalizáciu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "Používateľ %1$s vytvoril platformu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "Používateľ %1$s odstránil platformu %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "Používateľ %1$s upravil platformu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "Používateľovi %1$s sa nepodarilo autentifikovať sa na prístup k %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "Používateľ %1$s vytvoril odpove� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "Používateľ %1$s odstránil odpove� %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "Používateľ %1$s upravil odpove� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "Používateľ %1$s odsúhlasil recenziu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "Používateľ %1$s odstránil recenziu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "Používateľ %1$s vykonal neznámu akciu zabezpe�enia '%2$s' pre ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "Používateľ %1$s vytvoril kategóriu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "Používateľ %1$s odstránil kategóriu %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "Používateľ %1$s upravil kategóriu %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "Používateľ %1$s aktualizoval preklady aplikácií (%2$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "Používateľ %1$s aktualizoval preklady príspevkov blogu (%2$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "Používateľ %1$s aktualizoval preklady platforiem (%2$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "Používateľ %1$s aktualizoval preklady kategórií (%2$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "Používateľ %1$s upravil informácie o používateľovi %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"Aby ste mohli používať tento doplnok, musíte <a href=\"http://getfirefox.com"
+"\">aktualizovať Firefox</a>"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Doplnky podľa názvu"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Najnovšie doplnky"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Populárne doplnky"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Doplnky podľa hodnotenia"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Naposledy aktualizované doplnky"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Aktuálna kategória"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategórie"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Výber kategórie"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Zobraziť všetky odporú�ané doplnky"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Najprv najvyššie hodnotené"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Najprv naposledy aktualizované"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Najprv najobľúbenejšie"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "Zobraziť všetky %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Popis by mal obsahovať maximálne %1$s znakov."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Kolekcia %s"
-
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Chyba pri odstraňovaní doplnku!"
-
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Chyba pri ukladaní doplnku!"
-
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Chyba pri ukladaní komentára!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Názov musí obsahovať menej ako %1$s znakov."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Kolekcia nebola nájdená!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Ak už viete, ktoré doplnky chcete pridať do vašej kolekcie, za�nite písať ich názvy. Ak chcete radšej po�kať a urobiť neskôr, kliknite na %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Vyberte si vaše prvé doplnky"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Vytvorenie kolekcie"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Ozna�ené doplnky"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Kolekciu vytvoríte jednoducho vyplnením niekoľkých polí�ok uvedených nižšie."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Vytvoriť kolekciu"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Kolekcie"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Ďalšie informácie"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Pridať medzi Obľúbené"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Odstrániť z Obľúbených"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Nižšie môžete zobraziť vašu kolekciu. Ak chcete nastaviť prezývku kolekcie, odoslať jej ikonu alebo zmeniť niektoré �alšie nastavenia, navštívte stránku <a href='%1$s'>správy kolekcií</a>.</p><p>Vaša kolekcia je dostupná na adrese: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Vaša kolekcia je pripravená!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "O tejto kolekcii"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s doplnok v tejto kolekcii"
-msgstr[1] "%1$s doplnky v tejto kolekcii"
-msgstr[2] "%1$s doplnkov v tejto kolekcii"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Autor:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Aktualizovaná:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Pridávanie medzi Obľúbené&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Odstraňovanie z Obľúbených&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "Ak chcete túto kolekciu pridať medzi Obľúbené, musíte sa <a href=\"%1$s\">prihlásiť</a>."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Správa kolekcie"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "dátumu pridania"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "názvu"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s prevzatie tento týždeň"
-msgstr[1] "%1$s prevzatia tento týždeň"
-msgstr[2] "%1$s prevzatí tento týždeň"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Ozna�ené doplnky budú odstránené v okamihu uloženia"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Ak chcete publikovať nové doplnky do tejto kolekcie, za�nite zadaním ich názvov sem."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Ak chcete publikovať nové doplnky do tejto kolekcie, zadajte �iarkou oddelený zoznam ich identifikátorov (ID)."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Doplnok môžete pridať do kolekcie aj na jeho stránke."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Pridané dňa %1$s používateľom %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Pridať komentár autora"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Odstrániť komentár autora"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Upraviť komentár autora"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Poznámka: komentár sa objaví ako ten napísaný pôvodným autorom s pôvodným dátumom pridania"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Uložiť komentár"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Odstrániť"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Pridať do kolekcie"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Skontrolovať dostupnosť"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "�no, chcem odstrániť túto kolekciu."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Skontrolujte polí�ko a kliknite na \"%1$s\", �ím odstránite túto kolekciu."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Po kliknutí na \"%1$s\" bude vaša kolekcia odstránená. Ak nechcete odstrániť vašu kolekciu, zrušte ozna�enie potvrdzovacieho polí�ka na karte \"%2$s\" a pokra�ujte v úpravách vašej kolekcie. Ak opustíte túto stránku bez uloženia zmien, vaša kolekcia nebude odstránená."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Vaša kolekcia bude odstránená!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Musíte zadať popis vašej kolekcie."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Pri odosielaní ikony sa vyskytol problém."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Musíte zadať názov kolekcie."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Prezývka musí byť unikátna."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Názov doplnku"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Priradená aplikácia"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Zvoľte aplikácie, ktoré vaša kolekcia podporuje."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Typ kolekcie"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Odstrániť kolekcie"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Odstránením kolekcie ju nenávratne vymažete."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Popis kolekcie"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Stru�ne popíšte vašu kolekciu a typ doplnkov v nej"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Ikona"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Môžete odoslať ikonu vo formáte JPG, GIF alebo PNG, táto bude upravená na veľkosť 32x32 bodov."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Kto môže zobraziť vašu kolekciu?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Predvolene sa kolekcie zobrazujú vo verejnom prie�inku Kolekcie, takže sú dostupné všetkým. Ak chcete obmedziť zobrazenie vašich doplnkov len pre ur�itých ľudí, zvoľte túto voľbu nižšie."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Len ľudia, ktorých pozvem"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Ktokoľvek"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Kto môže spravovať moju kolekciu?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Títo používatelia môžu publikovať doplnky do vašej kolekcie, spravovať všetky doplnky a nastavenia, a umožniť to aj �alším používateľom."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Názov kolekcie"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Zadajte popisný názov kolekcie, napr. \"Michalove obľúbené doplnky pre záložky\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Prezývka kolekcie"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Voliteľne môžete zadať unikátny názov kolekcie:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Kto môže publikovať doplnky do vašej kolekcie?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Títo používatelia môžu publikovať doplnky do vašej kolekcie a takisto ich odstrániť."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Zadajte e-mailovú adresu ú�tu na Firefox Add-ons:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Ozna�ené ú�ty budú odstránené pri uložení"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Zadajte �iarkami oddelený zoznam e-mailových adries ú�tov na Firefox Add-ons"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Len ja"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Ja a títo používatelia:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Pridať"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Spravovať kolekciu %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Spravovať obsah kolekcie"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Aktuálne doplnky:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Rozšírené nastavenia"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Správa oprávnení pre kolekciu"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Zrušiť"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Odstrániť ikonu"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Nahradiť ikonu"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Ikona bude odstránená pri kliknutí na \"%1$s\""
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Prezývka dostupná"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Vaša prezývka obsahovala neplatné znaky a bola opravená. Skúste to znova."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Prezývka už existuje"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Vaša kolekcia je dostupná na:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Vaša kolekcia bola úspešne uložená!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Aktualizovať kolekciu"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Odstrániť kolekciu"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Doplnky"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Rozšírené"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Názov a podrobnosti"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Oprávnenia"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Dozerajte na vaše deti a kalendár."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Rodina"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Pozrite si Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Vytvorenie kolekcie"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Prejsť"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Zatiaľ nemáte žiadne obľúbené kolekcie.</strong></p> <p>Ku kolekciám, ktoré ozna�íte ako Obľúbené, môžete pristupovať z tejto stránky a objavia sa aj v rozšírení <a href='%1$s'>Add-on Collector</a>, ak ho máte nainštalované.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Zatiaľ ste nevytvorili žiadne kolekcie. Kolekcie sú jednoduchým spôsobom ako vytvoriť a spravovať vaše obľúbené doplnky.  <a href='%1$s'>Vyskúšajte si to</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Kolekcie"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Rozšírenie Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "autor %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Čo sú kolekcie?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Usporiadať podľa"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Výber editorov"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Moje obľúbené"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Moje kolekcie"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populárne"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "najpopulárnejšie za celý �as"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "najpopulárnejšie tento mesiac"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "najnovšie"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "najpopulárnejšie za tento týždeň"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Existuje nový spôsob správy a vyhľadávania obľúbených doplnkov. Komentujte, zdieľajte a synchronizujte kolekcie, všetko priamo z vášho prehliada�a"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Kolekcie sú skupiny príbuzných doplnkov vytvorené pre jednoduché zdieľanie."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Pridané %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Skúmajte hoci�o online."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referencie"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Spravujte vašu sociálnu sieť."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Sociálne"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Zavrieť"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Pri pokuse o pridanie kolekcie medzi Obľúbené sa vyskytla chyba. Nenachádza sa už táto kolekcia medzi vašimi obľúbenými kolekciami?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Túto správu viac nezobrazovať."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "Kolekcia %1$s bola pridaná medzi vaše obľúbené kolekcie."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Túto kolekciu teraz rýchlo nájdete na karte <a href=\"%1$s\">%2$s</a> v prie�inku kolekcií. Na jednoduchšiu správu vašich obľúbených kolekcií odporú�ame rozšírenie pre Firefox s názvom <a href=\"%3$s\">Add-on Collector</a>."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Kolekcia bola odstránená."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Naplánujte si obchodné cesty a nezabudnuteľné dovolenky."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Cestovanie"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Automaticky publikované"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Výber editora"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normálne"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Pri pokuse o odstránenie obľúbenej kolekcie sa vyskytla chyba. Nachádzala sa táto kolekcia medzi Obľúbenými?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "Kolekcia %1$s bola odstránená z vašich obľúbených kolekcií."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Vytvorte perfektnú stránku."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Vývoj webu"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Čo sú kolekcie?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Často kladené otázky"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Existuje nový spôsob správy a vyhľadávania obľúbených doplnkov. Komentujte, zdieľajte a synchronizujte kolekcie, všetko priamo z vášho prehliada�a."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Domovská stránka rozšírenia Add-on Collector"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Prevziať Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo rozšírenia Add-on Collector"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Centrum kompatibility doplnku"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Bu�te pripravený na novú verziu aplikácie %1$s pomocou nástrojov a informácií, ktoré sú pre komunitu %2$s Add-ons dostupné nižšie."
+msgstr ""
+"Bu�te pripravený na novú verziu aplikácie %1$s pomocou nástrojov a "
+"informácií, ktoré sú pre komunitu %2$s Add-ons dostupné nižšie."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Na�ítavajú sa údaje…"
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Naspäť na hlavnú stránku"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
-msgstr "Správa o kompatibilite doplnkov"
+msgstr "Správa o kompatibilite doplnku"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Informácie pre vývojárov doplnkov"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Zvýšiť hodnotu maxVersion bez odoslania novej verzie"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Skontrolovať stav mojich doplnkov"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Ak máte na Mozilla Add-ons umiestnené svoje doplnky, <a href=\"%1$s\">prihláste sa</a> a pozrite si stav svojich doplnkov pre %2$s."
+msgstr ""
+"Ak máte na Mozilla Add-ons umiestnené svoje doplnky, <a href=\"%1$s"
+"\">prihláste sa</a> a pozrite si stav svojich doplnkov pre %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Logo Vývojárske centrum Mozilly"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Na Mozilla Add-ons nemáte umiestnené žiadne doplnky."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Výsledky kontroly stavu doplnku"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Zisťuje sa stav vašich doplnkov…"
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s používateľov v aplikácii %2$s (%3$s&#37; zo všetkých)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Doplnky uvedené nižšie tvoria podľa údajov Mozilly 95% všetkých používaných doplnkov, usporiadané sú podľa používanosti."
+msgstr ""
+"Doplnky uvedené nižšie tvoria podľa údajov Mozilly 95% všetkých používaných "
+"doplnkov, usporiadané sú podľa používanosti."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Zobraziť podrobnú správu"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Z %1$s doplnkov, ktoré podľa údajov Mozilly tvoria 95&#37; všetkých používaných doplnkov, je <b>%2$s&#37;</b> kompatibilných s najnovšími zostaveniami aplikácie %3$s."
+msgstr ""
+"Z %1$s doplnkov, ktoré podľa údajov Mozilly tvoria 95&#37; všetkých "
+"používaných doplnkov, je <b>%2$s&#37;</b> kompatibilných s najnovšími "
+"zostaveniami aplikácie %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Verzie alpha"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Doplnky kompatibilné s verziou alpha aplikácie %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Verzia beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "Doplnky kompatibilné s verziou beta/RC aplikácie %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Najnovšia verzia"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Doplnky kompatibilné s najnovšou verziou aplikácie %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Iné verzie"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Doplnok nie je kompatibilný zo žiadnou verziou aplikácie %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
-msgstr "Správa o kompatibilite doplnkov"
+msgstr "Správa o kompatibilite doplnku"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Informácie pre používateľov doplnkov"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Zobraziť správu o kompatibilite"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Informácie o prispievateľoch nájdete na našej %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "stránke Wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla �akuje nasledujúcim ľu�om za ich prácu na projekte addons.mozilla.org:"
+msgstr ""
+"Mozilla �akuje nasledujúcim ľu�om za ich prácu na projekte addons.mozilla."
+"org:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Vývojári"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Editori"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Lokalizátori"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Ostatní prispievatelia"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Najnovší vývojári"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Softvér a obrázky"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Niektoré použité ikony pochádzajú zo <a href=\"http://www.famfamfam.com/lab/icons/silk/\">sady ikon famfamfam Silk</a>, uvoľnené sú pod licenciou <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Niektoré použité ikony pochádzajú zo <a href=\"http://www.famfamfam.com/lab/"
+"icons/silk/\">sady ikon famfamfam Silk</a>, uvoľnené sú pod licenciou <a "
+"href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons "
+"Attribution 2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
-msgstr "Niektoré podstránky používajú prvky <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a> uvádzané pod licenciou <a href=\"http://simile.mit.edu/license.html\">BSD License</a>."
+msgstr ""
+"Niektoré podstránky používajú prvky <a href=\"http://www.simile-widgets.org/"
+"timeplot/\">Timeplot</a> uvádzané pod licenciou <a href=\"http://simile.mit."
+"edu/license.html\">BSD License</a>."
 
 # date format string as used in PHP's strftime():
 # http://php.net/strftime
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e. %B %Y"
 
@@ -2430,8 +1297,7 @@ msgstr "%e. %B %Y"
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e. %B %Y, %H:%M"
@@ -2459,22 +1325,22 @@ msgstr "Å tatistika"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "Súbor %1$s má neplatnú koncovku (%2$s). Povolené koncovky: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "Súbor %s nemohol byť uložený do databázy. Skúste to znova."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Ukážka %1$s bola úspešne nahradená súborom %2$s."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr "Súbor %s bol úspešne odoslaný. Môžete zadať jeho popis."
 
@@ -2482,6 +1348,18 @@ msgstr "Súbor %s bol úspešne odoslaný. Môžete zadať jeho popis."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(zistiť automaticky)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Táto verzia doplnku nie je kompatibilná s Firefoxom %s. Mozilla predpokladá, "
+"že nasledujúca verzia Firefoxu bude �oskoro vydaná. Otestujte preto svoj "
+"doplnok v novej verzii a aktualizujte údaj o kompatibilite. Ďalšie "
+"informácie nájdete na <a href=\"%s\">tejto stránke</a>. Toto je len "
+"oznámenie, môžete pokra�ovať v odosielaní tejto verzie na addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Otvára v novom okne"
@@ -2518,70 +1396,145 @@ msgstr "5. krok: Úspešné"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Pomocník k odoslaniu"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Doplnok úspešne zakázaný"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Upraviť doplnok"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Doplnok úspešne povolený"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Popis doplnku"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "Licen�ná zmluva"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Domovská stránka doplnku"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Názov doplnku"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Nadpis ukážky"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Zásady ochrany súkromia"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Súhrn doplnku"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "E-mail na podporu"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Adresa URL na podporu"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Poznámky k verziám"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominovať doplnok"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Doplnok úspešne nominovaný!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Aktivovať"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Nastavením doplnku ako aktívny ho sprístupníte vo všetkých verejne dostupných zoznamoch a povolíte poskytovanie aktualizácií."
+msgstr ""
+"Nastavením doplnku ako aktívny ho sprístupníte vo všetkých verejne "
+"dostupných zoznamoch a povolíte poskytovanie aktualizácií."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Dokon�iť doplnok"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Dokon�ite váš doplnok a presuňte ho do Sandboxu"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Nastaviť ako neaktívny"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Nastavením doplnku ako neaktívny ho skryjete zo všetkých verejne dostupných zoznamov a zastavíte poskytovanie aktualizácií."
+msgstr ""
+"Nastavením doplnku ako neaktívny ho skryjete zo všetkých verejne dostupných "
+"zoznamov a zastavíte poskytovanie aktualizácií."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Presunúť do Sandboxu"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Presunie váš doplnok späť do Sandboxu. Akciu je možné vrátiť späť."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominovať na verejný"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominovať doplnok na uverejnenie"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Uverejniť"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Nastaví váš doplnok ako verejný."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
-msgstr "Váš doplnok je <span class=\"inactive-0\">aktívny</span>. To znamená, že doplnok sa zobrazuje vo všetkých verejne dostupných zoznamoch."
+msgstr ""
+"Váš doplnok je <span class=\"inactive-0\">aktívny</span>. To znamená, že "
+"doplnok sa zobrazuje vo všetkých verejne dostupných zoznamoch."
 
 #: views/developers/addon_status.thtml:111
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Pred dokon�ením doplnku a jeho presunutím do <span class=\"status-1\">Sandboxu</span> musíte splniť vyššie uvedené kritériá."
+msgstr ""
+"Pred dokon�ením doplnku a jeho presunutím do <span class=\"status-1"
+"\">Sandboxu</span> musíte splniť vyššie uvedené kritériá."
 
 #: views/developers/addon_status.thtml:108
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Teraz môžete dokon�iť váš doplnok a presunúť ho do <span class=\"status-1\">Sandboxu</span> kliknutím na nižšie uvedené tla�idlo."
+msgstr ""
+"Teraz môžete dokon�iť váš doplnok a presunúť ho do <span class=\"status-1"
+"\">Sandboxu</span> kliknutím na nižšie uvedené tla�idlo."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2595,7 +1548,7 @@ msgstr "Vyžadovaný popis doplnku"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Vyžadovaný názov doplnku"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Doplnok nie je ozna�ený ako pred-vydanie."
 
@@ -2603,6 +1556,10 @@ msgstr "Doplnok nie je ozna�ený ako pred-vydanie."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "Pre rozšírenia a témy sa vyžaduje aspoň jeden obrázok s ukážkou."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Niekoľko recenzií doplnku (môžu byť externé recenzie)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Vyžadovaný súhrn doplnku"
@@ -2612,12 +1569,12 @@ msgstr "Vyžadovaný súhrn doplnku"
 msgid "devcp_addon_status_header"
 msgstr "Stav doplnku: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Dostupné akcie"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Stav aktivovania: <span class=\"inactive-0\">aktívny</span>"
 
@@ -2625,7 +1582,7 @@ msgstr "Stav aktivovania: <span class=\"inactive-0\">aktívny</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Kritéria pre dokon�enie doplnku"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Stav aktivovania: <span class=\"inactive-1\">neaktívny</span>"
 
@@ -2633,21 +1590,28 @@ msgstr "Stav aktivovania: <span class=\"inactive-1\">neaktívny</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Kritériá pre nomináciu doplnku na verejný"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Dôveryhodnosť: <span class=\"status-4\">dôveryhodný</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
-msgstr "Váš doplnok je <span class=\"inactive-1\">neaktívny</span>. To znamená, že sa neobjavuje v žiadnom dostupnom zozname a to nezávisle na svojom stave. Aktualizácie <b>nie sú</b> prostredníctvom aktualiza�nej služby poskytované."
+msgstr ""
+"Váš doplnok je <span class=\"inactive-1\">neaktívny</span>. To znamená, že "
+"sa neobjavuje v žiadnom dostupnom zozname a to nezávislo na svojom stave. "
+"Aktualizácie <b>nie sú</b> prostredníctvom aktualiza�nej služby poskytované."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Pred nominovaním doplnku na <span class=\"status-4\">verejný</span> musíte splniť vyššie uvedené kritériá."
+msgstr ""
+"Pred nominovaním doplnku na <span class=\"status-4\">verejný</span> musíte "
+"splniť vyššie uvedené kritériá."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Teraz môžete nominovať váš doplnok na <span class=\"status-4\">verejný</span> kliknutím na nižšie uvedené tla�idlo."
+msgstr ""
+"Teraz môžete nominovať váš doplnok na <span class=\"status-4\">verejný</"
+"span> kliknutím na nižšie uvedené tla�idlo."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2660,30 +1624,49 @@ msgstr "Sandbox"
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Váš doplnok bol správcom <span class=\"status-5\">zakázaný</span> a nemôže byť používaný. Ak máte otázky, kontaktujte nás na e-mailovej adrese %s."
+msgstr ""
+"Váš doplnok bol správcom <span class=\"status-5\">zakázaný</span> a nemôže "
+"byť používaný. Ak máte otázky, kontaktujte nás na e-mailovej adrese %s."
 
 #: views/developers/addon_status.thtml:67
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Váš doplnok je momentálne <span class=\"status-0\">nekompletný</span>. To znamená, že sa nezobrazuje v žiadnej �asti stránky a nie sú preň poskytované aktualizácie. Váš doplnok môžete dokon�iť na tejto stránke, ke� splní kritériá pre dokon�enie a presun do <span class=\"status-1\">Sandboxu</span>."
+msgstr ""
+"Váš doplnok je momentálne <span class=\"status-0\">nekompletný</span>. To "
+"znamená, že sa nezobrazuje v žiadnej �asti stránky a nie sú preň poskytované "
+"aktualizácie. Váš doplnok môžete dokon�iť na tejto stránke, ke� splní "
+"kritériá pre dokon�enie a presun do <span class=\"status-1\">Sandboxu</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Váš doplnok je nominovaný na <span class=\"status-4\">verejný</span> doplnok a �aká na kontrolu editorom. Vo fronte momentálne �aká niekoľko �alších doplnkov (celkom %s)."
+msgstr ""
+"Váš doplnok je nominovaný na <span class=\"status-4\">verejný</span> doplnok "
+"a �aká na kontrolu editorom. Vo fronte momentálne �aká niekoľko �alších "
+"doplnkov (celkom %s)."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 msgid "devcp_addon_status_switch_pending"
-msgstr "Váš doplnok je momentálne �akajúci. Toto by sa nemalo stať. Prosím, pošlite e-mailovú správu na adresu %s a uve�te ID doplnku a túto chybu."
+msgstr ""
+"Váš doplnok je momentálne �akajúci. Toto by sa nemalo stať. Prosím, pošlite "
+"e-mailovú správu na adresu %s a uve�te ID doplnku a túto chybu."
 
 #: views/developers/addon_status.thtml:85
 msgid "devcp_addon_status_switch_public"
-msgstr "Váš doplnok je <span class=\"status-4\">verejný</span>, �o znamená, že sa zobrazuje vo všetkých zoznamoch a výsledkoch vyhľadávania a používatelia ho môžu bez obmedzenia preberať. Cez aktualiza�ný mechanizmus sú poskytované aktualizácie doplnku."
+msgstr ""
+"Váš doplnok je <span class=\"status-4\">verejný</span>, �o znamená, že sa "
+"zobrazuje vo všetkých zoznamoch a výsledkoch vyhľadávania a používatelia ho "
+"môžu bez obmedzenia preberať. Cez aktualiza�ný mechanizmus sú poskytované "
+"aktualizácie doplnku."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Váš doplnok sa nachádza v <span class=\"status-1\">Sandboxe</span>, �o znamená, že sa zobrazuje vo všetkých zoznamoch a výsledkoch vyhľadávania, ale používatelia sa musia prihlásiť, ak ho chcú prevziať a nainštalovať. Cez aktualiza�ný mechanizmus <b>nie sú</b> poskytované aktualizácie doplnku."
+msgstr ""
+"Váš doplnok sa nachádza v <span class=\"status-1\">Sandboxe</span>, �o "
+"znamená, že sa zobrazuje vo všetkých zoznamoch a výsledkoch vyhľadávania, "
+"ale používatelia sa musia prihlásiť, ak ho chcú prevziať a nainštalovať. Cez "
+"aktualiza�ný mechanizmus <b>nie sú</b> poskytované aktualizácie doplnku."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2692,9 +1675,126 @@ msgstr "Váš doplnok sa nachádza v <span class=\"status-1\">Sandboxe</span>, Ä
 msgid "devcp_addon_status_title"
 msgstr "Stav doplnku %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
-msgstr "Váš doplnok je <span class=\"status-4\">dôveryhodný</span>. To znamená, že môžete odosielať nové verzie bez toho, aby ich musel skontrolovať editor."
+msgstr ""
+"Váš doplnok je <span class=\"status-4\">dôveryhodný</span>. To znamená, že "
+"môžete odosielať nové verzie bez toho, aby ich musel skontrolovať editor."
+
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Ak chcete urobiť zmeny, navštívte stránku %1$s, alebo sa %2$s vráťte do "
+"panela Nástroje vývojára."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "kliknutím sem"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Upraviť doplnok"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Táto verzia bola umiestnená do Sandboxu, kde po�ká na recenzie od testerov "
+"Sandboxu a editora Mozilla Add-ons. O vykonaní akcie budete informovaní e-"
+"mailom."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Informácie o systéme recenzií v Sandboxe nájdete na %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "tejto stránke"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Táto verzia bola umiestnená do Sandboxu, kde ju môžu vyskúšať skúsení "
+"používatelia. Ak chcete svoj doplnok publikovať na verejnej stránke, musíte "
+"ho %s. Potom prejde procesom recenzie."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominovať"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Odoslanie doplnku bolo úspešne dokon�ené."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Pretože ide o dôveryhodný doplnok, bol automaticky schválený do verejnej "
+"�asti."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Odoslať doplnok"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Doplnok úspešne aktualizovaný"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Záujem o svoj doplnok môžete zvýšiť %s doplnku."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "odoslaním ukážky"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nenašiel sa žiadny autor [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Odstrániť"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Zrušiť"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Naozaj chcete zrušiť odoslanie?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "ÄŽalej"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Zmeniť typ doplnku:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Komentáre vývojára aktualizované."
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
@@ -2714,7 +1814,9 @@ msgstr "Zmeniť stav"
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Váš doplnok bol správcom zakázaný a nemôže byť používaný. Ak máte otázky, pošlite e-mailovú správu na adresu %s."
+msgstr ""
+"Váš doplnok bol správcom zakázaný a nemôže byť používaný. Ak máte otázky, "
+"pošlite e-mailovú správu na adresu %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2740,7 +1842,9 @@ msgstr "Posledná úprava: %s"
 
 #: views/developers/dashboard.thtml:111
 msgid "devcp_dashboard_learn"
-msgstr "Momentálne nemáte na serveri Mozilla Add-ons umiestnené žiadne vlastné doplnky. Ak chcete vedieť, ako tak urobiť, kliknite na tla�idlo Za�íname."
+msgstr ""
+"Momentálne nemáte na serveri Mozilla Add-ons umiestnené žiadne vlastné "
+"doplnky. Ak chcete vedieť, ako tak urobiť, kliknite na tla�idlo Za�íname."
 
 #: views/developers/dashboard.thtml:112
 msgid "devcp_dashboard_start"
@@ -2755,34 +1859,176 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Odoslať novú verziu"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr "Ukážka %s nemohla byť odstránená z databázy. Skúste to znova."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Ukážka %s bola úspešne odstránená."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "Nemáte oprávnenie na odstránenie súborov alebo verzií."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s súbor"
 msgstr[1] "%1$s %2$s súbory"
 msgstr[2] "%1$s %2$s súborov"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Pridať ukážku"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autori"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Žiadni"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategórie"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategória"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Popis"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Zakázané"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "Identifikátor (GUID)"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Podrobnosti"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Komentáre vývojára"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Ukážky"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Verzie"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Domovská stránka"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Žiadna"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Žiadny titulok"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nenašli sa žiadne ukážky."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Aktualizovať"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "E-mail na podporu"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Vývojár neposkytol žiadnu e-mailovú adresu na podporu"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Adresa URL na podporu"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Vývojár neposkytol žiadnu adresu URL na podporu"
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Dôveryhodné"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Verzia %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nenašli sa žiadne verzie."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Zrušiť a vrátiť sa späť"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "�no, zakázať"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Naozaj chcete doplnok zakázať?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Zakázaním doplnku ho skryjete z vyhľadávania a zoznamov. Nebude sa dať "
+"prevziať a pri kontrolách aktualizácie nebude viditeľný. Doplnok bude akoby "
+"odstránený, ale budete sa sem môcť vrátiť a kedykoľvek ho znova povoliť."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Zakázať %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "�no, povoliť"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Naozaj chcete doplnok povoliť?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Povolením doplnku sa znova umožní jeho vyhľadanie a bude uvedený v "
+"zoznamoch. Bude sa dať prevziať z webovej stránky a aj pri kontrolách "
+"aktualizácie."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Povoliť %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Pridať odpove�"
@@ -2795,12 +2041,15 @@ msgstr "Odpovede"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "Pri ukladaní vašej odpovede sa vyskytla chyba. Prosím, kontaktujte %1$s."
+msgstr ""
+"Pri ukladaní vašej odpovede sa vyskytla chyba. Prosím, kontaktujte %1$s."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "Editor Mozilla Add-ons vyžaduje dodato�né informácie k verzii %2$s vášho doplnku %1$s."
+msgstr ""
+"Editor Mozilla Add-ons vyžaduje dodato�né informácie k verzii %2$s vášho "
+"doplnku %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
@@ -2814,86 +2063,105 @@ msgstr "Odoslať odpove�"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "Vaša odpove� bola úspešne uložená. Ostatní ú�astníci diskusie budú upozornení e-mailovou správou."
+msgstr ""
+"Vaša odpove� bola úspešne uložená. Ostatní ú�astníci diskusie budú "
+"upozornení e-mailovou správou."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "napísal %1$s dňa %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Pridať autora"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "E-mailová adresa autora"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Odstrániť"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Pridať nového autora"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Pridať autora"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "E-mailová adresa ú�tu autora:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Kontroluje sa e-mailová adresu ú�tu…"
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Zmeny uložíte kliknutím na tla�idlo Aktualizovať autorov."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Aktuálni autori"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Správa autorov doplnku"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "Uviesť ako autora na verejne dostupných stránkach"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Vývojár</strong> - môže vykonávať všetky úkony, okrem pridávania a odstraňovania iných autorov."
+msgstr ""
+"<strong>Vývojár</strong> - môže vykonanávať všetky úkony, okrem pridávania a "
+"odstraňovania iných autorov."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Vlastník</strong> - môže vykonávať všetky úkony, vrátane pridávania a odstraňovania iných autorov."
+msgstr ""
+"<strong>Vlastník</strong> - môže vykonanávať všetky úkony, vrátane "
+"pridávania a odstraňovania iných autorov."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Divák</strong> - môže zobrazovať všetky údaje o doplnku, ale nemôže meniť žiadne údaje."
+msgstr ""
+"<strong>Divák</strong> - môže zobrazovať všetky údaje o doplnku, ale nemôže "
+"meniť žiadne údaje."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Zvoľte funkciu autora:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Autor"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "V zozname"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Funkcia"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Aktualizovať autorov"
 
@@ -2926,11 +2194,14 @@ msgstr "Kategória %s"
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
 msgid "devcp_edit_categories_none_available"
-msgstr "Pre tento typ doplnku a túto aplikáciu nie sú dostupné žiadne kategórie."
+msgstr ""
+"Pre tento typ doplnku a túto aplikáciu nie sú dostupné žiadne kategórie."
 
 #: views/developers/addon_edit_categories.thtml:86
 msgid "devcp_edit_categories_other"
-msgstr "Do tejto kategórie umiestnite doplnok len v prípade, že nespadá ani do jednej z dostupných kategórií."
+msgstr ""
+"Do tejto kategórie umiestnite doplnok len v prípade, že nespadá ani do "
+"jednej z dostupných kategórií."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -2939,7 +2210,9 @@ msgstr "Môžete zvoliť až 3 kategórie doplnku pre %s"
 
 #: views/developers/addon_edit.thtml:47
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Umožňuje pridať alebo odstrániť používateľov, ktorí môžu spravovať tento doplnok."
+msgstr ""
+"Umožňuje pridať alebo odstrániť používateľov, ktorí môžu spravovať tento "
+"doplnok."
 
 #: views/developers/addon_edit.thtml:49
 msgid "devcp_edit_dd_manage_categories"
@@ -2947,61 +2220,80 @@ msgstr "Umožňuje zvoliť relevantné kategórie doplnku pre každú aplikáciu
 
 #: views/developers/addon_edit.thtml:51
 msgid "devcp_edit_dd_manage_description"
-msgstr "Umožňuje pridať a meniť preklady súhrnu doplnku, jeho popisu, zmluvy s koncovým používateľom a zásad ochrany súkromia."
+msgstr ""
+"Umožňuje pridať a meniť preklady súhrnu doplnku, jeho popisu, zmluvy s "
+"koncovým používateľom a zásad ochrany súkromia."
 
 #: views/developers/addon_edit.thtml:53
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Umožňuje zmeniť názov doplnku, domovskú stránku, ikonu a �alšie vlastnosti."
+msgstr ""
+"Umožňuje zmeniť názov doplnku, domovskú stránku, ikonu a �alšie vlastnosti."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Aktualizovať popisy"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Prosím, opravte chyby ozna�ené �ervenou farbou."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Úprava popisov doplnku"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Dodato�né informácie, ktoré by mali používatelia doplnku vedieť, ale nie je potrebné ich uvádzať v súhrne alebo popise doplnku. Bežne sa tu uvádzajú známe problémy, informácie o spôsobe nahlasovania nájdených chýb, predpokladaný dátum sprístupnenia novej verzie at�."
+msgstr ""
+"Dodato�né informácie, ktoré by mali používatelia doplnku vedieť, ale nie je "
+"potrebné ich uvádzať v súhrne alebo popise doplnku. Bežne sa tu uvádzajú "
+"známe problémy, informácie o spôsobe nahlasovania nájdených chýb, "
+"predpokladaný dátum sprístupnenia novej verzie at�."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Poznámky vývojára"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "Popis doplnku slúži na hlbšie popísanie vlastností �i funkcionality doplnku a poskytnutie �alších potrebných informácií. Na stránke doplnku sa zobrazuje pod súhrnom."
+msgstr ""
+"Popis doplnku slúži na hlbšie popísanie vlastností �i funkcionality doplnku "
+"a poskytnutie �alších potrebných informácií. Na stránke doplnku sa zobrazuje "
+"pod súhrnom."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Popis doplnku"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Ak váš doplnok využíva Licen�nú zmluvu s koncovým používateľom (EULA), tu by ste mali zadať jej text. Podľa nastavenia používatelia ju budú musieť pred inštaláciou doplnku odsúhlasiť. Pamätajte, že EULA nie je totožná s licenciou, pod ktorou sa vydáva zdrojový kód (GPL �i MPL)."
+msgstr ""
+"Ak váš doplnok využíva Licen�nú zmluvu s koncovým používateľom (EULA), tu by "
+"ste mali zadať jej text. Podľa nastavenia používatelia ju budú musieť pred "
+"inštaláciou doplnku odsúhlasiť. Pamätajte, že EULA nie je totožná s "
+"licenciou, pod ktorou sa vydáva zdrojový kód (GPL �i MPL)."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Licen�ná zmluva s koncovým používateľom"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Ak váš doplnok používa Zásady ochrany súkromia, zadajte ich tu. Na stránke doplnku sa objaví odkaz na tieto zásady."
+msgstr ""
+"Ak váš doplnok používa Zásady ochrany súkromia, zadajte ich tu. Na stránke "
+"doplnku sa objaví odkaz na tieto zásady."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Zásady ochrany súkromia"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Súhrn je krátky popis základnej funkcionality doplnku, ktorá sa zobrazuje v zoznamoch doplnkov a vo vyhľadávaní, ako aj v hornej �asti stránky doplnku. <strong>Je možné zadať maximálne 250 znakov.</strong>"
+msgstr ""
+"Súhrn je krátky popis základnej funkcionality doplnku, ktorá sa zobrazuje v "
+"zoznamoch doplnkov a vo vyhľadávaní, ako aj v hornej �asti stránky doplnku. "
+"<strong>Je možné zadať maximálne 250 znakov.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Súhrn doplnku"
 
@@ -3021,170 +2313,266 @@ msgstr "Správa popisov doplnku"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Správa vlastností doplnku"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Pre tento typ doplnku nie sú k dispozícii žiadne kategórie."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Prenos nebol kompletný"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Žiadny odoslaný súbor"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Presahuje maximálnu veľkosť pre odoslanie"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autori"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Pridať ikonu"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Zmeniť ikonu"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Povoliť používateľom zobraziť online zdrojové súbory"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategórie"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Predvolený jazyk"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Tento doplnok vyžaduje externý softvér"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Len vymazať existujúcu ikonu"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Súbor s novou ikonou"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikona"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Ďalšie informácie o lokalizácii"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Toto je vývojová verzia"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Tento doplnok je ur�ený pre špecifickú stránku"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Cieľová lokalizácia"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "krátka dodato�ná informácia (napríklad názov lokálneho dialektu)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Aktualizovať vlastnosti"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Meňte len v prípade, že rozumiete všetkým dôsledkom."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Aktuálna ikona"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
-msgstr "Predvolený jazyk doplnku je hlavný jazyk, pre ktorý musí byť dostupná lokalizácia. Ak pre váš doplnok nie sú dostupné popisné texty v jazyku používateľa, ktorý si prehliada stránku doplnku, tieto sa zobrazia v predvolenom jazyku."
+msgstr ""
+"Predvolený jazyk doplnku je hlavný jazyk, pre ktorý musí byť dostupná "
+"lokalizácia. Ak pre váš doplnok nie sú dostupné popisné texty v jazyku "
+"používateľa, ktorý si prehliada stránku doplnku, tieto sa zobrazia v "
+"predvolenom jazyku."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "Pomocou týchto ozna�ení je možné filtrovať a triediť doplnky."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
-msgstr "Unikátny identifikátor GUID vášho doplnku je ur�ený v súbore install.rdf a jednozna�ne identifikuje doplnok. Po pridaní doplnku do zoznamu na Mozilla Add-ons nie je možné identifikátor zmeniť."
+msgstr ""
+"Unikátny identifikátor GUID vášho doplnku je ur�ený v súbore install.rdf a "
+"jednozna�ne identifikuje doplnok. Po pridaní doplnku do zoznamu na Mozilla "
+"Add-ons nie je možné identifikátor zmeniť."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Úprava vlastností doplnku"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Typ doplnku"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Nastavenia administrátora"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Predvolený jazyk"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "Ozna�enie doplnku"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "GUID doplnku"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Ikona doplnku"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Ďalšie nastavenia"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Dôveryhodný doplnok?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Zobraziť zdrojový kód online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
-msgstr "Ikona doplnku je malý obrázok, ktorý je pri prehliadaní stránky doplnku, vo výsledkoch vyhľadávania a pri inštalácii doplnku zobrazený vedľa názvu doplnku. Obrázok bude automaticky nastavený na veľkosť 32 x 32 bodov. Môžete použiť jeden z nasledujúcich typov obrázkov: %s"
+msgstr ""
+"Ikona doplnku je malý obrázok, ktorý je pri prehliadaní stránky doplnku, vo "
+"výsledkoch vyhľadávania a pri inštalácii doplnku zobrazený vedľa názvu "
+"doplnku. Obrázok bude automaticky nastavený na veľkosť 32 x 32 bodov. Môžete "
+"použiť jeden z nasledujúcich typov obrázkov: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Tento doplnok obsahuje binárne sú�asti"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Nedôveryhodný"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Dôveryhodný"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Nová ikona"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Odstrániť ikonu"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Ak má váš doplnok domovskú stránku, zadajte ju tu. Pokiaľ domovská stránka nie je lokalizovaná do viacerých jazykov, pridávanie �alších jazykov nie je potrebné."
+msgstr ""
+"Ak má váš doplnok domovskú stránku, zadajte ju tu. Pokiaľ domovská stránka "
+"nie je lokalizovaná do viacerých jazykov, pridávanie �alších jazykov nie je "
+"potrebné."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Domovská stránka doplnku"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Názov doplnku sa používa vo všetkých zoznamoch a stránkach, kde sa váš doplnok vyskytuje."
+msgstr ""
+"Názov doplnku sa používa vo všetkých zoznamoch a stránkach, kde sa váš "
+"doplnok vyskytuje."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Názov doplnku"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Ak poskytujete technickú podporu prostredníctvom e-mailu, zadajte sem vašu adresu. Pokiaľ pre iné jazyky nepoužívate inú e-mailovú adresu, pridávanie �alších jazykov nie je potrebné."
+msgstr ""
+"Ak poskytujete technickú podporu prostredníctvom e-mailu, zadajte sem vašu "
+"adresu. Pokiaľ pre iné jazyky nepoužívate inú e-mailovú adresu, pridávanie "
+"�alších jazykov nie je potrebné."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Technická podpora prostredníctvom e-mailu"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Ak má váš doplnok stránku technickej podpory alebo fórum, zadajte tu potrebnú adresu. Pokiaľ stránka nie je lokalizovaná do viacerých jazykov, pridávanie �alších jazykov nie je potrebné."
+msgstr ""
+"Ak má váš doplnok stránku technickej podpory alebo fórum, zadajte tu "
+"potrebnú adresu. Pokiaľ stránka nie je lokalizovaná do viacerých jazykov, "
+"pridávanie �alších jazykov nie je potrebné."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Technická podpora"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr "Dôveryhodné doplnky sa môžu stať verejnými bez kontroly editorom."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Ikona bude pri uložení odstránená. <a %s>Zrušiť?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
-msgstr "Ak chcete, zdrojový kód súborov vášho doplnku si môže prezrieť online každý prihlásený používateľ."
+msgstr ""
+"Ak chcete, zdrojový kód súborov vášho doplnku si môže prezrieť online každý "
+"prihlásený používateľ."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Umožniť zobrazenie zdrojového kódu online"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Nezobrazovať zdrojový kód online"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Aktualizovať"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">jednoduchý "
+"názov lokalizácie</a>, napríklad 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Autori"
@@ -3266,14 +2654,70 @@ msgstr[0] "Nevybavené aktualizácie (%s)"
 msgstr[1] "Nevybavené aktualizácie (%s)"
 msgstr[2] "Nevybavené aktualizácie (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Ozna�ené súbory budú odstránené."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Súbory"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Cieľové aplikácie"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Žiadne súbory."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Poznámky pre recenzenta"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Aktualizovať"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nemáte prístup k tomuto doplnku."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Súhrny môžu obsahovať najviac 250 znakov.\n"
+"(Zadali ste %s.)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Názov doplnku už v databáze existuje. Skontrolujte, �i: <br /><li>súhlasí "
+"identifikátor GUID (naj�astejšou prí�inou tejto chyby je nesúlad "
+"identifikátora GUID);</li><li>nemáte v databáze duplicitnú položku (ak áno, "
+"mali by ste položku aktualizovať alebo ju odstrániť a skúsiť znova).</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3287,21 +2731,29 @@ msgstr "Pozrite informácie na %s."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "tejto stránke"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Váš doplnok musí mať aspoň jedného vlastníka."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Opíšte zmeny urobené v tejto aktualizácii doplnku."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 msgid "devcp_error_file_exists"
-msgstr "Táto verzia doplnku už existuje. Ak ju chcete nahradiť, musíte najskôr odstrániť súbor %1$s."
+msgstr ""
+"Táto verzia doplnku už existuje. Ak ju chcete nahradiť, musíte najskôr "
+"odstrániť súbor %1$s."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "Táto prípona súboru (%1$s) nie je pre vybraný typ doplnku povolená. Použite jednu z nasledujúcich: %2$s"
+msgstr ""
+"Táto prípona súboru (%s) nie je pre vybraný typ doplnku povolená. Použite "
+"jednu z nasledujúcich: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Nie všetky identifikátory GUID súborov súhlasia"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3333,9 +2785,18 @@ msgstr "Nie je odoslaný žiadny súbor"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Táto prípona súboru (%1$s) nie je pre ikonu povolená. Použite jednu z nasledujúcich: %2$s."
+msgstr ""
+"Táto prípona súboru (%s) nie je pre ikonu povolená. Použite jednu z "
+"nasledujúcich: %s."
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Pre tento doplnok a platformu už existuje rovnaká verzia (%s)."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Chýba súbor install.rdf."
 
@@ -3343,9 +2804,9 @@ msgstr "Chýba súbor install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "V súbore install.rdf sa našli nasledujúce chyby:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Vyberte platný typ doplnku."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3353,7 +2814,7 @@ msgstr ""
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "%$1s nie platná verzia doplnku %$2s."
+msgstr "%s nie platná verzia %s."
 
 #. %s is a string
 #: controllers/components/developers.php:521
@@ -3366,11 +2827,13 @@ msgstr "ID doplnku je neplatné: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%$1s nie je platná verzia %$2s: minimálna verzia nemôže obsahovať znak *."
+msgstr "%s nie je platná verzia %s: minimálna verzia nemôže obsahovať znak *."
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "Verzia tohto doplnku je neplatná: pozrite <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">špecifikáciu</a>."
+msgstr ""
+"Verzia tohto doplnku je neplatná: pozrite <a href=\"http://developer.mozilla."
+"org/en/docs/Toolkit_version_format\">špecifikáciu</a>."
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
@@ -3395,7 +2858,7 @@ msgstr "Súbor nemožno presunúť"
 #: controllers/components/developers.php:743
 #, php-format
 msgid "devcp_error_moving_file"
-msgstr "Pri presúvaní súboru %s sa vyskytla chyba."
+msgstr "Pri presúvaní %s sa vyskytla chyba."
 
 #: controllers/components/developers.php:595
 msgid "devcp_error_mozilla_application"
@@ -3409,6 +2872,18 @@ msgstr "V súbore install.rdf nemožno nájsť ID tohto doplnku."
 msgid "devcp_error_no_platform"
 msgstr "Nie je vybraná žiadna platforma"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Pri nominácii musíte poskytnúť požadované podrobnosti."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nemôžete nominovať vývojovú verziu doplnku."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Nominovať môžete len doplnky, ktoré sú v Sandboxe."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Vyberte aspoň jednu kategóriu."
@@ -3422,92 +2897,304 @@ msgstr "Doplnok musí mať aspoň jedného autora."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Táto prípona súboru (%1$s) nie je pre ukážku povolená. Použite jednu z nasledujúcich: %2$s"
+msgstr ""
+"Táto prípona súboru (%s) nie je pre ukážku povolená. Použite jednu z "
+"nasledujúcich: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Po�as ukladania údajov došlo k chybe."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Na aktualizáciu tohto doplnku nemáte povolenie."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Doplnok nemôže používať updateKey. Odstráňte ho zo súboru install.rdf a skúste to znova."
+msgstr ""
+"Doplnok nemôže používať updateKey. Odstráňte ho zo súboru install.rdf a "
+"skúste to znova."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Doplnky nemôžu používať externú adresu aktualizácie. Odstráňte ju zo súboru install.rdf a skúste to znova."
+msgstr ""
+"Doplnky nemôžu používať externú adresu aktualizácie. Odstráňte ju zo súboru "
+"install.rdf a skúste to znova."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Odošlite súbor."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Pridať súbor inej platformy"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Pridať autora"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Odstrániť"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Kategórie pre nový typ doplnku budú k dispozícii v �alšom kroku."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Pre tento typ doplnku nie sú k dispozícii žiadne kategórie."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Zadajte popis svojho doplnku."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Zadajte názov svojho doplnku."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Vyberte typ doplnku, ktorý odosielate."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Zadajte súhrn pre svoj doplnok."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Súbor doplnku"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "2. súbor doplnku"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "3. súbor doplnku"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Typ doplnku"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Povoliť používateľom zobraziť online zdrojové súbory"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "E-mailová adresa autora"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autori"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategórie"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Predvolený jazyk"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Popis"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Licen�ná zmluva (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Tento doplnok vyžaduje externý softvér"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Súbory"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Domovská stránka"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Súbor ikony"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Názov"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Podporované platformy"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Toto je vývojová verzia"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Zásady ochrany súkromia"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Toto je doplnok pre špecifickú stránku"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Súhrn"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-mail na podporu"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Adresa URL na podporu"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Cieľové aplikácie"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Verzia"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Poznámky k verzii"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Žiadne"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Poznámky pre recenzenta"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "Tento doplnok je dôveryhodný. Vyberte preto, kam má byť umiestnený:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Verejný"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Vývojárska zmluva"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "1. krok"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Odoslanie súboru"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "2. krok"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Podrobnosti doplnku"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "3. krok"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Podrobnosti o verzii"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "4. krok"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalizácia"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "5. krok"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Úspešné"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Moje doplnky"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "Odoslať súbor"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Zrušiť"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
 msgstr "Prosím, zadajte e-mailovú adresu ú�tu autora, ktorého chcete pridať."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
 msgstr "Posunúť nadol"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
 msgstr "Posunúť nahor"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "Odstrániť kompatibilitu aplikácie"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "Zobraziť ako autora na verejne dostupných stránkach"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Prosím, zvoľte licenciu."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Prosím, zadajte text licencie."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Vývojár"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Vlastník"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Divák"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Odstrániť autora"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "<strong>Naozaj</strong> chcete odstrániť tohto autora?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "Musíte zvoliť súbor, ktorý chcete odoslať."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Vlastná licencia pre doplnok %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Lokalizované polia"
@@ -3517,15 +3204,19 @@ msgstr "Lokalizované polia"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Niektoré polia na tejto stránke sú lokalizované, takže sa objavia v rodnom jazyku používateľa. Vyberte dole jazyk, ak chcete upraviť podrobnosti o doplnku v tomto jazyku. Ak preklad pre jazyk nie je k dispozícii, vráti sa do predvoleného jazyka (%s)."
+msgstr ""
+"Niektoré polia na tejto stránke sú lokalizované, takže sa objavia v rodnom "
+"jazyku používateľa. Vyberte dole jazyk, ak chcete upraviť podrobnosti o "
+"doplnku v tomto jazyku. Ak preklad pre jazyk nie je k dispozícii, vráti sa "
+"do predvoleného jazyka (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Nástroje správcu"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Nástroje editora"
 
@@ -3534,73 +3225,109 @@ msgid "devcp_myaddons_link"
 msgstr "Moje doplnky"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Späť na hlavnú stránku"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Å tatistika"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Odoslať doplnok"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Nástroje vývojára"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
-msgstr "Doplnok s týmto ID (%1$s) už v databáze existuje. Ak je to váš doplnok, môžete <a href=\"%2$s\">odoslať jeho novú verziu</a>."
+msgstr ""
+"Doplnok s týmto ID (%1$s) už v databáze existuje. Ak je to váš doplnok, "
+"môžete <a href=\"%2$s\">odoslať jeho novú verziu</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 msgid "devcp_nominate_cancel"
 msgstr "Zrušiť a návrat"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Späť na podrobnosti doplnku"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominovať %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automaticky zistený typ doplnku: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
-msgstr "<span>Jedna alebo viacero zmien nemohlo byť uložených.</span><br />Prosím, pozrite nižšie uvedené chyby. Ostatné zmeny boli úspešne uložené."
+msgstr ""
+"<span>Jedna alebo viacero zmien nemohlo byť uložených.</span><br />Prosím, "
+"pozrite nižšie uvedené chyby. Ostatné zmeny noli úspešne uložené."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Vaše zmeny boli uložené.</span><br />Pamätajte, že niektorým zmenám môže trvať niekoľko hodín, kým sa prejavia vo všetkých �astiach stránky."
+msgstr ""
+"<span>Vaše zmeny boli uložené.</span><br />Pamätajte, že niektorým zmenám "
+"môže trvať niekoľko hodín, kým sa prejavia vo všetkých �astiach stránky."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Zrušenie predvolenia spôsobí, že predvolenou ukážkou sa automaticky stane �alšia ukážka."
+msgstr ""
+"Zrušenie predvolenia spôsobí, že predvolenou ukážkou sa automaticky stane "
+"�alšia ukážka."
+
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Predvolený jazyk tohto doplnku (%1$s [%2$s]) je odlišný od aktuálne "
+"vybraného jazyka (%3$s [%4$s]). Dole uvedené polia musia byť vyplnené v "
+"jazyku %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
 msgstr "Predvolenie ukážky zruší predvolenie aktuálnej ukážky."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Zmeny zatiaľ neboli uložené. "
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3629,55 +3356,63 @@ msgstr "Upraviť ukážku"
 msgid "devcp_preview_updated_successfully"
 msgstr "Ukážka úspešne aktualizovaná."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Pridať �alšiu ukážku"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Odstrániť ukážku"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Nahradiť ukážku"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Aktualizovať ukážky"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Pridanie novej ukážky"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
-msgstr "Zvoľte obrázok, ktorý chcete odoslať. Veľkosť obrázkov vä�ších ako 700 bodov na šírku a 525 bodov na výšku bude upravená. Povolené typy súborov: %s"
+msgstr ""
+"Zvoľte obrázok, ktorý chcete odoslať. Veľkosť obrázkov vä�ších ako 700 bodov "
+"na šírku a 525 bodov na výšku bude upravená. Povolené typy súborov: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Kliknutím na tla�idlo Aktualizovať ukážky odošlete súbory."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
-msgstr "Kliknutím na tla�idlo Aktualizovať ukážky uložíte tento obrázok. (<a %s>Zrušiť?</a>)"
+msgstr ""
+"Kliknutím na tla�idlo Aktualizovať ukážky uložíte tento obrázok. (<a %"
+"s>Zrušiť?</a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
-msgstr "Táto ukážka bude odstránená po kliknutí na tla�idlo Aktualizovať ukážky. (<a %s>Zrušiť?</a>)"
+msgstr ""
+"Táto ukážka bude odstránená po kliknutí na tla�idlo Aktualizovať ukážky. (<a "
+"%s>Zrušiť?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Na odoslanie snímky svojho doplnku vo formáte PNG, JPG alebo GIF použite dole uvedený formulár. Veľkosť obrázkov širších ako 700 bodov a vyšších ako 525 bodov bude automaticky zmenená."
+msgstr ""
+"Na odoslanie snímky svojho doplnku vo formáte PNG, JPG alebo GIF použite "
+"dole uvedený formulár. Veľkosť obrázkov širších ako 700 bodov a vyšších ako "
+"525 bodov bude automaticky zmenená."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Pridať ukážku"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Popis ukážky"
 
@@ -3685,7 +3420,7 @@ msgstr "Popis ukážky"
 msgid "devcp_previews_header_edit"
 msgstr "Upraviť ukážku"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Predvolená ukážka"
 
@@ -3693,30 +3428,33 @@ msgstr "Predvolená ukážka"
 msgid "devcp_previews_label_file"
 msgstr "Súbor ukážky"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Predvoliť ako obrázok ukážky"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Nový obrázok:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Odoslať ukážku: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "Jedna alebo viaceré ukážky nemohlo byť uložených."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Ukážky boli úspešne aktualizované."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
-msgstr "Obrázky ukážok vášho doplnku sú zobrazené nižšie. Nižšie môžete takisto zmeniť ich menovky alebo aj jednotlivé obrázky. Predvolená ukážka je obrázok, ktorý sa zobrazuje vedľa názvu doplnku v zoznamoch a výsledkoch vyhľadávania."
+msgstr ""
+"Obrázky ukážok vášho doplnku sú zobrazené nižšie. Nižšie môžete takisto "
+"zmeniť ich menovky alebo aj jednotlivé obrázky. Predvolená ukážka je "
+"obrázok, ktorý sa zobrazuje vedľa názvu doplnku v zoznamoch a výsledkoch "
+"vyhľadávania."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3734,31 +3472,49 @@ msgstr "Upraviť ukážku"
 msgid "devcp_previews_submit_upload"
 msgstr "Odoslať ukážku"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Miniatúra"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "Správca ukážok doplnku %s"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Nesprávne?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Naozaj chcete odstrániť tento súbor?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Pred pokra�ovaním si pre�ítajte a prijmite nasledujúcu Vývojársku zmluvu."
+msgstr ""
+"Pred pokra�ovaním si pre�ítajte a prijmite nasledujúcu Vývojársku zmluvu."
 
 #: views/elements/developers/rolecheck.thtml:42
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Nemáte dostato�né oprávnenia na vykonanie zmien na tejto stránke.</span><br />Ak potrebujete vykonať nejaké zmeny, kontaktujte vlastníka doplnku."
+msgstr ""
+"<span>Nemáte dostato�né oprávnenia na vykonanie zmien na tejto stránke.</"
+"span><br />Ak potrebujete vykonať nejaké zmeny, kontaktujte vlastníka "
+"doplnku."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
-msgstr "Pamätajte, že niektorým zmenám môže trvať niekoľko hodín, kým sa objavia vo všetkých �astiach stránky."
+msgstr ""
+"Pamätajte, že niektorým zmenám môže trvať niekoľko hodín, kým sa objavia vo "
+"všetkých �astiach stránky."
 
 #: views/elements/developers/sidebar.thtml:52
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Ovládací panel"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Presko�iť prezeranie informácií o mojom aktuálnom doplnku"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3782,7 +3538,12 @@ msgstr "Prevzatí za týždeň: <em>%s</em>"
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active"
-msgstr "Ozna�enie tohto doplnku ako aktívny spôsobí, že doplnok bude zobrazený vo verejne dostupných zoznamoch, vrátane výsledkov vyhľadávania a zoznamu doplnkov. Bude ho možné prevziať z webovej stránky a dostupné budú aj jeho aktualizácie. Ak budete chcieť, môžete sa sem vrátiť a opätovne ho deaktivovať."
+msgstr ""
+"Ozna�enie tohto doplnku ako aktívny spôsobí, že doplnok bude zobrazený vo "
+"verejne dostupných zoznamoch, vrátane výsledkov vyhľadávania a zoznamu "
+"doplnkov. Bude ho možné prevziať z webovej stránky a dostupné budú aj jeho "
+"aktualizácie. Ak budete chcieť, môžete sa sem vrátiť a opätovne ho "
+"deaktivovať."
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active_sure"
@@ -3794,7 +3555,12 @@ msgstr "Ste si istý?"
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive"
-msgstr "Ozna�enie tohto doplnku ako neaktívny spôsobí, že doplnok nebude zobrazený vo verejne dostupných zoznamoch, vrátane výsledkov vyhľadávania a zoznamu doplnkov. Nebude ho možné prevziať z webovej stránky a nebudú dostupné ani jeho aktualizácie. Ak budete chcieť, môžete sa sem vrátiť a opätovne ho aktivovať."
+msgstr ""
+"Ozna�enie tohto doplnku ako neaktívny spôsobí, že doplnok nebude zobrazený "
+"vo verejne dostupných zoznamoch, vrátane výsledkov vyhľadávania a zoznamu "
+"doplnkov. Nebude ho možné prevziať z webovej stránky a nebudú dostupné ani "
+"jeho aktualizácie. Ak budete chcieť, môžete sa sem vrátiť a opätovne ho "
+"aktivovať."
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive_sure"
@@ -3806,7 +3572,10 @@ msgstr "Nie, zrušiť"
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public"
-msgstr "Ozna�ením tohto doplnku ako verejný ho sprístupníte všetkým používateľom, bude ho možné prevziať zo stránky a takisto bude dostupný cez aktualiza�ný mechanizmus."
+msgstr ""
+"Ozna�ením tohto doplnku ako verejný ho sprístupníte všetkým používateľom, "
+"bude ho možné prevziať zo stránky a takisto bude dostupný cez aktualiza�ný "
+"mechanizmus."
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public_sure"
@@ -3814,7 +3583,12 @@ msgstr "Naozaj chcete nastaviť tento doplnok ako verejný?"
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
-msgstr "Presunutie doplnku späť do Sandboxu spôsobí, že používatelia sa budú musieť prihlásiť, ak si budú chcieť túto verziu nainštalovať. Existujúcim používateľom nebude ponúknutá aktualizácia na túto verziu. Pretože váš doplnok je aktuálne uverejnený, budete ho môcť nastaviť ako verejný kedykoľvek sa rozhodnete."
+msgstr ""
+"Presunutie doplnku späť do Sandboxu spôsobí, že používatelia sa budú musieť "
+"prihlásiť, ak si budú chcieť túto verziu nainštalovať. Existujúcim "
+"používateľom nebude ponúknutá aktualizácia na túto verziu. Pretože váš "
+"doplnok je aktuálne uverejnený, budete ho môcť nastaviť ako verejný "
+"kedykoľvek sa rozhodnete."
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox_sure"
@@ -3826,168 +3600,234 @@ msgstr "�no, ur�ite"
 
 #: views/developers/addon_status_nominate.thtml:46
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Vyžadovaná je správa pre nomináciu.</span><br />Prosím, vyplňte textové pole požadovanými informáciami a skúste to znova."
+msgstr ""
+"<span>Vyžadovaná je správa pre nomináciu.</span><br />Prosím, vyplňte "
+"textové pole požadovanými informáciami a skúste to znova."
 
 #: views/developers/addon_status_nominate.thtml:55
 msgid "devcp_status_nominate_header"
 msgstr "Nominovanie doplnku"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Odosielanie doplnkov je momentálne zakázané. Skúste prosím neskôr."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Súhlasím"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Nesúhlasím"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Tento doplnok bol zakázaný správcom."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Zakázané"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Dôveryhodné"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Najnovšia verzia:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nemáte žiadne doplnky. Kliknutím %s odošlite doplnok."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "sem"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Uistite sa, že ste %s svojej témy."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "odoslali ukážku"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Úprava doplnku %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Pomocník (neopustíte túto stránku)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Pomocník"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Po�et využitých znakov: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Naozaj chcete odstrániť tento preklad?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "Čo sú karty pomenované '%s'?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "Čo ak neposkytnem žiadne preklady?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Skryť pomocníka"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
-msgstr "Ak používateľ prehliada stránku doplnku a táto nie je dostupná v jeho jazyku, bude zobrazená v jazyku, ktorý ur�í autor doplnku v nastavení Predvolený jazyk v sekcii Upraviť doplnok - Vlastnosti. Ak neposkytujete preklad do žiadneho jazyka, jednoducho zvoľte ako predvolený jazyk ten, ktorým hovoríte vy."
+msgstr ""
+"Ak používateľ prehliada stránku doplnku a táto nie je dostupná v jeho "
+"jazyku, bude zobrazená v jazyku, ktorý ur�í autor doplnku v nastavení "
+"Predvolený jazyk v sekcii Upraviť doplnok - Vlastnosti. Ak neposkytujete "
+"preklad do žiadneho jazyka, jednoducho zvoľte ako predvolený jazyk ten, "
+"ktorým hovoríte vy."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
-msgstr "Toto je <i>Lokaliza�né pole</i>. Umožňuje preložiť informa�né texty o doplnku do rôznych jazykov. Jednotlivé preklady môžete pridávať, upravovať a odstraňovať pomocou kariet jednotlivých jazykov."
+msgstr ""
+"Toto je <i>Lokaliza�né pole</i>. Umožňuje preložiť informa�né texty o "
+"doplnku do rôznych jazykov. Jednotlivé preklady môžete pridávať, upravovať a "
+"odstraňovať pomocou kariet jednotlivých jazykov."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Pridať preklad"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Odstrániť preklad"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Pridať jazyk do všetkých polí"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Pridať jazyk"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Zrušiť"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Odstrániť"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Zvoľte jazyk, ktorý chcete pridať:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
-msgstr "Identifikátor GUID použitý v tomto súbore (%1$s) nezodpovedá existujúcemu GUID tohto doplnku (%2$s)."
+msgstr ""
+"Identifikátor GUID použitý v tomto súbore (%1$s) nezodpovedá existujúcemu "
+"GUID tohto doplnku (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "Nemáte dostato�né oprávnenia na aktualizovanie tohto doplnku."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "Zvolená verzia (%1$s) nepatrí k tomuto doplnku (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Číslo odosielanej verzie (%1$s) už pre tento prvok existuje. Ak sa pokúšate pre túto verziu pridať �alší súbor, <a href=\"%2$s\">kliknite sem</a>."
+msgstr ""
+"Číslo odosielanej verzie (%1$s) už pre tento prvok existuje. Ak sa pokúšate "
+"pre túto verziu pridať �alší súbor, <a href=\"%2$s\">kliknite sem</a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
-msgstr "Číslo odosielanej verzie (%1$s) sa nezhoduje s existujúcim �íslom verzie (%2$s)."
+msgstr ""
+"Číslo odosielanej verzie (%1$s) sa nezhoduje s existujúcim �íslom verzie (%2"
+"$s)."
 
 #: views/developers/uploader.thtml:68
 msgid "devcp_uploader_a_start"
 msgstr "Za�íname"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "Odosiela sa súbor…"
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Súhlasiť a pokra�ovať"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Upraviť môj doplnok"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Môj doplnok dokon�ím neskôr."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Pridať Poznámky k vydaniu"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
-msgstr "<p>Stránka vášho doplnku bola vytvorená. Základné údaje získané z vášho doplnku boli uložené v databáze, sami však môžete uviesť oveľa viac údajov a nastavení.</p><p>Váš doplnok je momentálne ozna�ený ako <strong>nekompletný</strong>. Ak ho chcete dokon�iť, musíte sa uistiť, že má správne vyplnený názov, súhrn a popis, ako aj zvolenú aspoň jednu kategóriu, do ktorej patrí. Informácie o doplnku môžete zmeniť kliknutím na nižšie uvedený odkaz, stav doplnku si môžete vždy skontrolovať na stránke <a %s>Stav doplnku</a>."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Stránka vášho doplnku bola vytvorená. Základné údaje získané z vášho "
+"doplnku boli uložené v databáze, sami však môžete uviesť oveľa viac údajov a "
+"nastavení.</p><p>Váš doplnok je momentálne ozna�ený ako <strong>nekompletný</"
+"strong>. Ak ho chcete dokon�iť, musíte sa uistiť, že má správne vyplnený "
+"názov, súhrn a popis, ako aj zvolenú aspoň jednu kategóriu, do ktorej patrí. "
+"Informácie o doplnku môžete zmeniť kliknutím na nižšie uvedený odkaz, stav "
+"doplnku si môžete vždy skontrolovať na stránke <a %s>Stav doplnku</a>."
+
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Prosím, opravte tento problém a odošlite súbor znova."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
-msgstr "Váš nový súbor bol pridaný k verzii %1$s a je aktuálne ozna�ený ako %2$s."
+msgstr ""
+"Váš nový súbor bol pridaný k verzii %1$s a je aktuálne ozna�ený ako %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Doplnok vytvorený!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Oops! S týmto súborom sa vyskytol nejaký problém…"
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "Súbor pridaný!"
 
@@ -3996,74 +3836,96 @@ msgid "devcp_uploader_header_how"
 msgstr "Ako to funguje?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Verzia %s vytvorená"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Odoslanie nového súboru"
 
 #: views/developers/uploader.thtml:67
 msgid "devcp_uploader_how"
-msgstr "<p>Ďakujeme, že ste sa rozhodli odoslať váš doplnok do databázy servera Mozilla Add-ons. Umiestnenie doplnku na serveroch Mozilla Add-ons je najjednoduchší spôsob distribúcie vášho doplnku. Odoslaním doplnku získavate:</p><ul><li>Každý doplnok má svoju vlastnú verejnú stránku s informáciami, ktoré sami poskytnete, ako krátky opis funkcionality doplnku, voliteľný dlhší popis a obrázky s ukážkami doplnku.</li><li>Váš doplnok sa zobrazí v zoznamoch a výsledkoch vyhľadávania na stránke Mozilla Addons a takisto v Správcovi doplnkov prehliada�a Firefox 3.</li><li>Zabezpe�íme hosting pre všetky vaše súbory a ke� sprístupníte novú verziu, poskytneme aktualizácie existujúcim používateľom doplnku.</li><li>Umožníme vám prístup k detailným štatistikám používanosti vášho doplnku.</li></ul><p>Všetky doplnky umiestnené na serveroch Mozilla Add-ons musia byť pred získaním všetkých spomenutých výhod skontrolované editorom. Ak chcete pokra�ovať a máte svoj doplnok pripravený na odoslanie, jednoducho kliknite na tla�idlo Za�íname!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Ďakujeme, že ste sa rozhodli odoslať váš doplnok do databázy servera "
+"Mozilla Add-ons. Umiestnenie doplnku na serveroch Mozilla Add-ons je "
+"najjednoduchší spôsob distribúcie vášho doplnku. Odoslaním doplnku získavate:"
+"</p><ul><li>Každý doplnok má svoju vlastnú verejnú stránku s informáciami, "
+"ktoré sami poskytnete, ako krátky opis funkcionality doplnku, voliteľný "
+"dlhší popis a obrázky s ukážkami doplnku.</li><li>Váš doplnok sa zobrazí v "
+"zoznamoch a výsledkoch vyhľadávania na stránke Mozilla Addons a takisto v "
+"Správcovi doplnkov prehliada�a Firefox 3.</li><li>Zabezpe�íme hosting pre "
+"všetky vaše súbory a ke� sprístupníte novú verziu, poskytneme aktualizácie "
+"existujúcim používateľom doplnku.</li><li>Umožníme vám prístup k detailným "
+"štatistikám používanosti vášho doplnku.</li></ul><p>Všetky doplnky "
+"umiestnené na serveroch Mozilla Add-ons musia byť pred získaním všetkých "
+"spomenutých výhod skontrolované editorom. Ak chcete pokra�ovať a máte svoj "
+"doplnok pripravený na odoslanie, jednoducho kliknite na tla�idlo Za�íname!</"
+"p>"
+
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "Podporované platformy:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Súbor doplnku: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Iné"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
-msgstr "Nový súbor bude verejne dostupný po kontrole editorom. Vo fronte �aká na kontrolu niekoľko doplnkov súborov (celkom %1$s). Chcete urýchliť kontrolu? <a %2$s>Staňte sa editorom</a>."
+msgstr ""
+"Nový súbor bude verejne dostupný po kontrole editorom. Vo fronte �aká na "
+"kontrolu niekoľko doplnkov súborov (celkom %1$s). Chcete urýchliť kontrolu? "
+"<a %2$s>Staňte sa editorom</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
-msgstr "Nová verzia bude verejne dostupná po kontrole editorom. Vo fronte �aká na kontrolu niekoľko doplnkov (celkom %1$s). Chcete urýchliť kontrolu? <a %2$s>Staňte sa editorom</a>."
+msgstr ""
+"Nová verzia bude verejne dostupná po kontrole editorom. Vo fronte �aká na "
+"kontrolu niekoľko doplnkov doplnkov (celkom %1$s). Chcete urýchliť kontrolu? "
+"<a %2$s>Staňte sa editorom</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
-msgstr "Nová verzia bola úspešne vytvorená a doplnok tejto verzie je ozna�ený ako %s."
+msgstr ""
+"Nová verzia bola úspešne vytvorená a doplnok tejto verzie je ozna�ený ako %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
-msgstr "Nový súbor nájdete v sekcii <a %1$s>Verzie s súbory</a>, skontrolujte jeho <a %2$s>aktuálny stav</a>, prípadne kliknutím na nižšie uvedené tla�idlo <b>pridajte poznámky k vydaniu</b> (odporú�ané)."
+msgstr ""
+"Nový súbor nájdete v sekcii <a %1$s>Verzie s súbory</a>, skontrolujte jeho "
+"<a %2$s>aktuálny stav</a>, prípadne kliknutím na nižšie uvedené tla�idlo "
+"<b>pridajte poznámky k vydaniu</b> (odporú�ané)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
-msgstr "Novú verziu nájdete v sekcii <a %1$s>Verzie s súbory</a>, skontrolujte jeho <a %2$s>aktuálny stav</a>, prípadne kliknutím na nižšie uvedené tla�idlo <b>pridajte poznámky k vydaniu</b> (odporú�ané)."
+msgstr ""
+"Novú verziu nájdete v sekcii <a %1$s>Verzie s súbory</a>, skontrolujte jeho "
+"<a %2$s>aktuálny stav</a>, prípadne kliknutím na nižšie uvedené tla�idlo "
+"<b>pridajte poznámky k vydaniu</b> (odporú�ané)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
-msgstr "Súbor doplnku odošlite pomocou tohto formulára. Ak máte niekoľko rôznych súborov pre rôzne platformy, zvoľte jeden súbor a následne odošlite ostatné pomocou Správcu verzií a súborov."
+msgstr ""
+"Súbor doplnku odošlite pomocou tohto formulára. Ak máte niekoľko rôznych "
+"súborov pre rôzne platformy, zvoľte jeden súbor a následne odošlite ostatné "
+"pomocou Správcu verzií a súborov."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "VÅ¡etky"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Špecifická:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Zvoľte..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4079,24 +3941,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Aktualizácia doplnku %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Pozrite %s."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "túto stránku"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Pre zadanú e-mailovú adresu nebol nájdený žiadny ú�et."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Súbor XML je bu� neplatný alebo chýbajú požadované polia. Prosím, <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">pre�ítajte si dokumentáciu</a>, overte váš add-on a skúste to znova."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Upraviť verziu"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Verzia úspešne aktualizovaná."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4155,66 +4024,66 @@ msgstr[2] "%s recenzií"
 msgid "devcp_versions_delete_sure"
 msgstr "Naozaj chcete natrvalo odstrániť verziu %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Zrušiť"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Odstrániť súbor"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Pridať novú aplikáciu"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Odstrániť aplikáciu"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Pridať novú verziu"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
-msgstr "Upravenie údajov o kompatibilných verziách umožní používateľom nainštalovať vaše rozšírenie aj v prípade, ak nie je v súbore install.rdf uvedená kompatibilita s danou verziou programu. <a %s>Zoznam podporovaných aplikácií</a>."
+msgstr ""
+"Upravenie údajov o kompatibilných verziách umožní používateľom nainštalovať "
+"vaše rozšírenie aj v prípade, ak nie je v súbore install.rdf uvedená "
+"kompatibilita s danou verziou programu. <a %s>Zoznam podporovaných "
+"aplikácií</a>."
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
 msgstr "<b>Naozaj</b> chcete odstrániť kompatibilitu s touto aplikáciou?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "<b>Naozaj</b> chcete natrvalo odstrániť tento súbor?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Informácie o schválení doplnku"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Kompatibilné aplikácie"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Informácie o súbore"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licencia"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Správa verzie %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Poznámky k schváleniu doplnku"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Odstrániť súbor"
 
@@ -4223,63 +4092,66 @@ msgstr "Odstrániť súbor"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "Súbor %1$s (%2$s) vytvorený dňa %3$s, stav '%4$s' nastavený dňa %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Zvoľte vhodnú licenciu pre váš doplnok. Táto licencia ur�uje práva, ktoré ur�ujete pre zdrojový kód."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Neboli nájdené žiadne súbory."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "Voliteľné informácie pre editora, ktorý bude kontrolovať túto verziu."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Odstrániť kompatibilitu s aplikáciou"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Zvoľte aplikáciu"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Súbor"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platforma"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Veľkosť"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Stav"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Informácie o zmenách v tejto verzii, nové funkcie, známe chyby a �alšie informácie špecifické pre túto verziu. Tieto informácie budú dostupné používateľom pri aktualizovaní verzie v Správcovi doplnkov Firefoxu 3."
+msgstr ""
+"Informácie o zmenách v tejto verzii, nové funkcie, známe chyby a �alšie "
+"informácie špecifické pre túto verziu. Tieto informácie budú dostupné "
+"používateľom pri aktualizovaní verzie v Správcovi doplnkov Firefoxu 3."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Poznámky k vydaniu"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Zmeny zatiaľ neboli uložené.</strong> Kompatibilita bude odstránená až po kliknutí na tla�idlo Aktualizovať verzie."
+msgstr ""
+"<strong>Zmeny zatiaľ neboli uložené.</strong> Kompatibilita bude odstránená "
+"až po kliknutí na tla�idlo Aktualizovať verzie."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Zmeny zatiaľ neboli uložené.</strong> Súbory budú odstránené až po kliknutí na tla�idlo Aktualizovať verzie."
+msgstr ""
+"<strong>Zmeny zatiaľ neboli uložené.</strong> Súbory budú odstránené až po "
+"kliknutí na tla�idlo Aktualizovať verzie."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Aktualizovať verzie"
 
@@ -4298,7 +4170,9 @@ msgstr "Verzia %s bola úspešne odstránená."
 
 #: views/developers/versions.thtml:73
 msgid "devcp_versions_p_remove"
-msgstr "Táto verzia nemá priradené žiadne súbory a môže byť odstránená. Chcete ju odstrániť?"
+msgstr ""
+"Táto verzia nemá priradené žiadne súbory a môže byť odstránená. Chcete ju "
+"odstrániť?"
 
 #: views/developers/versions.thtml:58
 msgid "devcp_versions_th_created"
@@ -4312,7 +4186,7 @@ msgstr "Stav"
 msgid "devcp_versions_th_version"
 msgstr "Verzia"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Tento doplnok je zakázaný"
 
@@ -4356,8 +4230,7 @@ msgstr "Filtrovať"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter podľa typu/úkonu"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Denník udalostí"
 
@@ -4413,13 +4286,13 @@ msgstr "Zobraziť komentáre"
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "Zobraziť položky od %1$s do %2$s"
+msgstr "Zobraziť položky od %s do %s"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "V tomto období nie sú žiadne recenzie."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Denník recenzií"
 
@@ -4443,29 +4316,28 @@ msgstr "Ostatná aktivita editora"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Recenzie celkom"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Recenzia doplnku"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vyplňte nasledujúce polia:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Vyberte aspoň jeden súbor na recenziu."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Recenzie samým sebou nie sú dovolené."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Externý softvér"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Pridať medzi odporú�ané"
 
@@ -4473,300 +4345,250 @@ msgstr "Pridať medzi odporú�ané"
 msgid "editors_featured_add_feature_submit"
 msgstr "Pridať"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Nepodarilo sa pridať medzi odporú�ané."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Úspešne pridané medzi odporú�ané."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Nepodarilo sa upraviť."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Úspešne upravené."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Jeden alebo niekoľko jazykov je neplatných."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Nepodarilo sa odstrániť."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Úspešne odstránené."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Odporú�ané doplnky"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Prejsť"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Odstrániť z odporú�aných"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filter frontu"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Užito�né odkazy"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Príru�ka editora"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Zásady ochrany súkromia doplnku"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Tieto filtre zostanú platné po�as celej relácie alebo kým nebudú vymazané."
+msgstr ""
+"Tieto filtre zostanú platné po�as celej relácie alebo kým nebudú vymazané."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Momentálne nie je na recenziu žiadny doplnok tohto typu."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 deň"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hod."
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 min."
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Nástroje editora"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "len %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Vývojová verzia"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Kompatibilita s programom %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Doplnok alebo e-mail autora"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Typy doplnku"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Aplikácia"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. verzia"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platformy"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Doba od odoslania (dni)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Výsledky filtrovaného vyhľadávania: <strong>%1$s</strong> doplnok"
-msgstr[1] "Výsledky filtrovaného vyhľadávania: <strong>%1$s</strong> doplnky"
-msgstr[2] "Výsledky filtrovaného vyhľadávania: <strong>%1$s</strong> doplnkov"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Vymazať"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtrovať"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Všetky fronty recenzií sú momentálne zakázané. Skúste neskôr."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Upraviť položku"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "História položky"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Domovská stránka položky"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Prehľad položky"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Ukážky"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Úkon recenzie"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Vyžiadať dodato�né informácie"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Schváliť pre verejnosť"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Požadovať super-recenziu"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Nechať v Sandboxe"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komentáre recenzie"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "Použite tento formulár na vyžiadanie dodato�ných informácií od autora doplnku, ktorý obdrží e-mailovú správu a bude môcť tu odpovedať. Pri jeho odpovedi budete upozornený e-mailovou správou."
+msgstr ""
+"Použite tento formulár na vyžiadanie dodato�ných informácií od autora "
+"doplnku, ktorý obrdží e-mailovú správu a bude môcť tu odpovedať. Pri jeho "
+"odpovedi budete upozornený e-mailovou správou."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Tým ozna�íte doplnok a jeho najnovšiu verziu a súbory ako verejné. Budúce verzie prejdú do Sandboxu, kým sa nepodrobia recenzii editorom."
+msgstr ""
+"Tým ozna�íte doplnok a jeho najnovšiu verziu a súbory ako verejné. Budúce "
+"verzie prejdú do Sandboxu, kým sa nepodrobia recenzii editorom."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Týmto ponecháte doplnok v Sandboxe."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Tým schválite verziu zo Sandboxu nominovanú na uverejnenie, aby sa objavila na verejnej stránke. "
+msgstr ""
+"Tým schválite verziu zo Sandboxu nominovanú na uverejnenie, aby sa objavila "
+"na verejnej stránke. "
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "Tým ur�íte, že verejný doplnok zo Sandboxu má v ňom zostať."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Ak máte pochybnosti o bezpe�nosti tohto doplnku, problémoch s autorskými právami alebo iné, na ktoré by sa mal pozrieť správca, zadajte do dole uvedenej �asti svoje komentáre. Budú odoslané správcom, nie autorovi."
+msgstr ""
+"Ak máte pochybnosti o bezpe�nosti tohto doplnku, problémoch s autorskými "
+"právami alebo iné, na ktoré by sa mal pozrieť správca, zadajte do dole "
+"uvedenej �asti svoje komentáre. Budú odoslané správcom, nie autorovi."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
-msgstr "Porovnať s verejnou verziou"
+msgstr "Provnať s verejnou verziou"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Zobraziť obsah"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autori:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategórie:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilita:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Popis"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komentáre vývojára"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Licen�ná zmluva"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Súbory:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "História položky"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomina�ná správa"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Ukážky"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Zásady ochrany súkromia"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
-msgstr "Recenzia doplnku %s"
+msgstr "Recenzia %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Poznámky pre recenzenta"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Súhrn"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Poznámky k verzii"
 
@@ -4794,7 +4616,7 @@ msgstr "Nominácia schválená/Verejné"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominácia zamietnutá/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nenašli sa žiadne predchádzajúce recenzie."
 
@@ -4822,88 +4644,80 @@ msgstr[0] "Zobraziť/skryť odpove�"
 msgstr[1] "Zobraziť/skryť %1$s odpovede"
 msgstr[2] "Zobraziť/skryť %1$s odpovedí"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Aplikácie:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "alebo vyberte pripravenú odpove�:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komentáre:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Opera�né systémy:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Navrch"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Poznámka: recenziu pre viac súborov píšte len pre vtedy, ak ste testovali KAŽD� zvolený súbor."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "�alší &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Žiadne ukážky sa nenašli."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; predchádzajúci"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Front recenzií"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong>�. %1$s</strong> z %2$s vo fronte"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> z %2$s vo fronte (filtrované)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Spracovať úkon"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Úkon"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komentáre"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Dátum"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recenzent"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Verzia/Súbor"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "Upozorniť ma pri nasledujúcej aktualizácii tohto doplnku. (Ďalšie aktualizácie nevygenerujú e-mailovú správu)"
+msgstr ""
+"Upozorniť ma pri nasledujúcej aktualizácii tohto doplnku. (Ďalšie "
+"aktualizácie nevygenerujú e-mailovú správu)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Recenzia úspešne spracovaná."
 
@@ -4927,7 +4741,7 @@ msgstr "Úkon"
 msgid "editors_reviews_in_reply_to"
 msgstr "V odpovedi na:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recenzie úspešne spracované!"
 
@@ -4939,85 +4753,87 @@ msgstr "V moderovaní nie sú momentálne žiadne recenzie."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Spracovať recenzie"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Pre špecifickú stránku"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Nové"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Aktualizované"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testované aplikácie"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testované opera�né systémy"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Ďalšie informácie"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Doplnok"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Typ"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Typy doplnkov"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Doba"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Aplikácie"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Obmedziť na jazyky?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Doba vo fronte"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Vzostupné zoradenie"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platformy"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Zostupné zoradenie"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Typy odoslania"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dní"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hod."
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s min."
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Prístup odmietnutý"
 
@@ -5025,41 +4841,34 @@ msgstr "Prístup odmietnutý"
 msgid "error_access_denied_message"
 msgstr "Na zobrazenie tejto stránky nemáte oprávnenie."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Doplnok už existuje!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Doplnok sa nenašiel!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Tento doplnok tu nemožno zobraziť."
 
@@ -5067,7 +4876,7 @@ msgstr "Tento doplnok tu nemožno zobraziť."
 msgid "error_addon_selfreview"
 msgstr "Nemôžete recenzovať vlastný doplnok."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "V kategórii nie sú žiadne doplnky!"
 
@@ -5075,108 +4884,85 @@ msgstr "V kategórii nie sú žiadne doplnky!"
 msgid "error_collection_feed_notfound"
 msgstr "Kanál RSS pre doplnok nebol nájdený."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Toto nie je platná e-mailová adresa."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Toto pole nesmie byť prázdne."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Súbor sa nenašiel!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
-msgstr "Chyba: súbor %s neexistuje."
-
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+msgstr "Chyba súboru: %s neexistuje."
+
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "V tomto formulári sú chyby. Opravte ich a odošlite znova."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Nesprávny kód, skúste to znova!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "URL má neplatný formát. Platná adresa vyzerá takto: http://priklad.com/moja_stranka."
+msgstr ""
+"URL má neplatný formát. Platná adresa vyzerá takto: http://priklad.com/"
+"moja_stranka."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Chýba parameter: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "bez súborov"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Oznámenie"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Ukážka sa nenašla!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Musíte zvoliť hodnotenie."
 
@@ -5184,87 +4970,73 @@ msgstr "Musíte zvoliť hodnotenie."
 msgid "error_user_already_confirmed"
 msgstr "Tento používateľský ú�et už je potvrdený."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Neplatný potvrdzovací kód!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Heslá sa nezhodujú."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Táto e-mailová adresa už je obsadená iným používateľom."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Časový interval na zmenu adresy vypršal. Ak chcete zmeniť svoju adresu, urobte tak znova vo vašom používateľskom profile a po prijatí overovacej e-mailovej správy kliknite na odkaz nachádzajúci sa v nej."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Používateľ môže mať v jednom �ase priradenú len jednu rolu. Pred pokra�ovaním odstráňte existujúce role používateľa."
+msgstr ""
+"Časový interval na zmenu adresy vypršal. Ak chcete zmeniť svoju adresu, "
+"urobte tak znova vo vašom používateľskom profile a po prijatí overovacej e-"
+"mailovej správy kliknite na odkaz nachádzajúci sa v nej."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Táto prezývka už je obsadená."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Používateľ sa nenašiel!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Najprv potvr�te svoj používateľský ú�et kódom, ktorý ste dostali e-mailom."
+msgstr ""
+"Najprv potvr�te svoj používateľský ú�et kódom, ktorý ste dostali e-mailom."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Nesprávne meno používateľa alebo heslo!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Verzia sa nenašla!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Zadané nesprávne heslo!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Viac informácií"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Viac informácií o %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
@@ -5272,8 +5044,7 @@ msgstr[0] "%1$s recenzia"
 msgstr[1] "%1$s recenzie"
 msgstr[2] "%1$s recenzií"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Zobraziť �alšie z kategórie "
 
@@ -5313,151 +5084,136 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
 msgid "footer_a_about"
 msgstr "ÄŒo je"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
 msgid "footer_abbr_faq"
 msgstr "Často kladené otázky"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Všetky práva vyhradené."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Copyright"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Tvorcovia"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla poskytuje odkazy na tieto programy ako láskavosť. Nezastupuje autorov týchto aplikácií ani neposkytuje žiadne informácie, ktoré sa ich týkajú. Všetky otázky, sťažnosti alebo požiadavky týkajúce sa aplikácií treba adresovať príslušnému vydavateľovi softvéru."
+msgstr ""
+"Mozilla poskytuje odkazy na tieto programy ako láskavosť. Nezastupuje "
+"autorov týchto aplikácií ani neposkytuje žiadne informácie, ktoré sa ich "
+"týkajú. Všetky otázky, sťažnosti alebo požiadavky týkajúce sa aplikácií "
+"treba adresovať príslušnému vydavateľovi softvéru."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Prejsť"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Právne informácie"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Ďalšie jazyky:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Zásady ochrany súkromia"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Uložiť"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Slovník"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Slovníky"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Rozšírenie"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Rozšírenia"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Jazykový balík (doplnok)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Jazykové balíky (doplnok)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Jazykový balík (aplikácia)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Jazykové balíky (aplikácia)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Zásuvný modul"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Zásuvné moduly"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Vyhľadávací modul"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Vyhľadávacie moduly"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Téma"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Témy"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Všetky lokalizácie"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Návrat na úvodnú stránku %1$s Add-ons"
@@ -5466,81 +5222,37 @@ msgstr "Návrat na úvodnú stránku %1$s Add-ons"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Doplnky <em>pre</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Doplnky"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Doplnky <img alt=\"Doplnky\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "SeaMonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Doplnky <em>pre</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Doplnky <em>pre</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Doplnky <em>pre</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Prejsť do ponuky Ďalšie aplikácie"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Prejsť do ponuky kategórie"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Prejsť na hlavný obsah"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Prejsť na vyhľadávací formulár"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Doplnky"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Prihlásenie"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
-msgstr "Odhlásiť sa"
+msgstr "Odhlásiť"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Môj ú�et"
 
@@ -5548,77 +5260,51 @@ msgstr "Môj ú�et"
 msgid "header_navlink_register"
 msgstr "Registrácia"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Zaregistrujte</a> alebo <a href=\"%2$s\">prihláste sa</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Nástroje"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
-msgstr "Obrázok ukážky doplnku %s"
+msgstr "Obrázok ukážky %s"
 
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "Na inštaláciu tohto doplnku sa musíte <a href=\"%1$s\">prihlásiť</a>. <a href=\"%2$s\">Pre�o</a>?"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Umožniť mi nainštalovať experimentálny doplnok. <a href=\"%1$s\">Čo to je?</a>"
+msgstr ""
+"Na inštaláciu tohto doplnku sa musíte <a href=\"%1$s\">prihlásiť</a>. <a "
+"href=\"%2$s\">Pre�o</a>?"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "Pridať do programu %1$s %2$s"
+msgstr "Pridať do programu %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Pridať %1$s do programu %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Prevziať %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Tento doplnok nie je k dispozícii"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Zoznam jazykových balíkov a slovníkov."
 
@@ -5630,9 +5316,8 @@ msgstr "Prevziať slovník"
 msgid "langtools_download_langpack"
 msgstr "Prevziať jazykový balík"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Slovníky/Jazykové balíky"
 
@@ -5644,74 +5329,36 @@ msgstr "Nainštalovať slovník"
 msgid "langtools_install_langpack"
 msgstr "Nainštalovať jazykový balík"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Slovník"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Jazykový balík"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Jazyk"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Vlastná licencia"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Licencia BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, verzia 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, verzia 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, verzia 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, verzia 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Licencia MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, verzia 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Kliknutím sem sa vrátite na hlavnú stránku."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Dátum"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Prevzatia"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Názov"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Hodnotenie"
@@ -5736,22 +5383,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Slovníky a jazykové balíky"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Zásuvné moduly"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Témy"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Hľadať doplnky pre iné aplikácie"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "a �alší"
 
@@ -5759,29 +5412,12 @@ msgstr "a �alší"
 msgid "page_title_appversions"
 msgstr "Verzie aplikácie"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Kolekcia doplnkov"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ pre kolekcie doplnkov"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Funkcie pre kolekcie doplnkov"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Víta vás rozšírenie Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Tvorcovia"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Často kladené otázky vývojárov"
+msgid "page_title_experimental_addons"
+msgstr "Experimentálne doplnky"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5811,36 +5447,43 @@ msgstr "Systém kontroly v Sandboxe"
 msgid "page_title_submissionhelp"
 msgstr "Pomocník k odoslaniu"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "Identifikátor GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Platné verzie aplikácie"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Doplnky odoslané na Mozilla Add-ons musia obsahovať súbor install.rdf aspoň s jednou z dole podporovaných aplikácií. Pre tieto aplikácie sú podporované len dole uvedené verzie."
+msgstr ""
+"Doplnky odoslané na Mozilla Add-ons musia obsahovať súbor install.rdf aspoň "
+"s jednou z dole podporovaných aplikácií. Pre tieto aplikácie sú podporované "
+"len dole uvedené verzie."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Ak podporovaná aplikácia nevyžaduje súbor install.rdf, musí obsahovať súbor s požadovanými vlastnosťami (ako je ur�ené %s)."
+msgstr ""
+"Ak podporovaná aplikácia nevyžaduje súbor install.rdf, musí obsahovať súbor "
+"s požadovanými vlastnosťami (ako je ur�ené %s)."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "tu"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Verzie"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Naspäť na predchádzajúcu stránku"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "stránku s informáciami o Sandboxe"
 
@@ -5848,6 +5491,13 @@ msgstr "stránku s informáciami o Sandboxe"
 msgid "pagination_next_page"
 msgstr "nasledujúce"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Toto je stránka %1$s z %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "predchádzajúce"
@@ -5870,7 +5520,9 @@ msgstr "Prosím, zadajte vypo�utý text."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Ak toto je ťažko zrozumiteľné, môžete <a href=\"%1$s\">si vypo�uť nie�o iné</a> alebo <a href=\"%2$s\">prepnite naspäť na text</a>."
+msgstr ""
+"Ak toto je ťažko zrozumiteľné, môžete <a href=\"%1$s\">si vypo�uť nie�o iné</"
+"a> alebo <a href=\"%2$s\">prepnite naspäť na text</a>."
 
 # %1 is the link switching refreshing the captcha
 # %2 is the link switching to an audio captcha
@@ -5878,17 +5530,19 @@ msgstr "Ak toto je Å¥ažko zrozumiteľné, môžete <a href=\"%1$s\">si vypoÄ�uÅ
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Ak je to ťažko �itateľné, môžete skúsiť <a href=\"%1$s\">iné slová</a> alebo si namiesto toho <a href=\"%2$s\">nie�o vypo�ujte</a>."
+msgstr ""
+"Ak je to ťažko �itateľné, môžete skúsiť <a href=\"%1$s\">iné slová</a> alebo "
+"si namiesto toho <a href=\"%2$s\">nie�o vypo�ujte</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Ste �lovek?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "ÄŒo je toto?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Chyba pri nahlásení tejto recenzie!"
 
@@ -5896,8 +5550,7 @@ msgstr "Chyba pri nahlásení tejto recenzie!"
 msgid "review_flag_reason_bug_support"
 msgstr "Nevhodne umiestnená správa o chybe alebo žiadosť o podporu"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Nahlásiť túto recenziu (vyberte dôvod)"
 
@@ -5913,9 +5566,8 @@ msgstr "Iný (popíšte)"
 msgid "review_flag_reason_spam"
 msgstr "Spam alebo iný neschválený obsah"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Ďakujeme; táto recenzia bola ozna�ená na schválenie editorom."
 
@@ -5925,156 +5577,135 @@ msgstr "Nahlásiť túto recenziu"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Je táto recenzia nevhodná, nepresná alebo spam? Kliknutím sem ju ozna�íte na schválenie editorom."
+msgstr ""
+"Je táto recenzia nevhodná, nepresná alebo spam? Kliknutím sem ju ozna�íte na "
+"schválenie editorom."
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Pamätajte na tieto tipy:</p><ul><li>Píšte, akoby ste rozprávali svojmu priateľovi o svojich zážitkoch s týmto doplnkom. Uve�te špecifické a užito�né detaily, ako napríklad funkcie, ktoré sa vám pá�ia �i nepá�ia, ako jednoduché je jeho používanie a takisto aké má nevýhody. Vyhýbajte sa všeobecným frázam typu \"Je to super\" alebo \"Je hrozné\" v prípade, že to neviete/nechcete doložiť skúsenosťami a faktami.</li><li>Do recenzií nepíšte hlásenia o chybách. Vaša e-mailová adresa nie je viditeľná ani pre vývojárov doplnku a tí vás môžu chcieť po takom hlásení kontaktovať. Ak chcete pomôcť získať podporu k doplnku, pozrite si <a href=\"%1$s\">sekciu podpory</a>.</li><li>Recenzie píšte jasne, vyhýbajte sa neslušným frázam a nezadávajte do nich žiadne osobné informácie.</li></ul><p>Podrobnejšie informácie o recenziách si pre�ítajte v <a href=\"%2$s\">pravidlách pre pridávanie recenzií</a>.</p>"
+msgstr ""
+"<p>Pamätajte na tieto tipy:</p><ul><li>Píšte, akoby ste rozprávali svojmu "
+"priateľovi o svojich zážitkoch s týmto doplnkom. Uve�te špecifické a "
+"užito�né detaily, ako napríklad funkcie, ktoré sa vám pá�ia �i nepá�ia, ako "
+"jednoduché je jeho používanie a takisto aké má nevýhody. Vyhýbajte sa "
+"všeobecným frázam typu \"Je to super\" alebo \"Je hrozné\" v prípade, že to "
+"neviete/nechcete doložiť skúsenosťami a faktami.</li><li>Do recenzií nepíšte "
+"hlásenia o chybách. Vaša e-mailová adresa nie je viditeľná ani pre vývojárov "
+"doplnku a tí vás môžu chcieť po takom hlásení kontaktovať. Ak chcete pomôcť "
+"získať podporu k doplnku, pozrite si <a href=\"%1$s\">sekciu podpory</a>.</"
+"li><li>Recenzie píšte jasne, vyhýbajte sa neslušným frázam a nezadávajte do "
+"nich žiadne osobné informácie.</li></ul><p>Podrobnejšie informácie o "
+"recenziách si pre�ítajte v <a href=\"%2$s\">pravidlách pre pridávanie "
+"recenzií</a>.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
-msgstr "Recenzie doplnku %s"
+msgstr "Recenzie %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Odporú�ané doplnky"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Najnovšie doplnky"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Populárne doplnky"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Aktualizované doplnky"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Hľadať"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Výsledky vyhľadávania v kolekciách"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Výsledky vyhľadávania v kolekciách"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Vyhľadávanie je momentálne zakázané. Skúste neskôr znova."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "všetky doplnky"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "všetky kolekcie"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "hľadaný doplnok"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "hľadať v kolekciách"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Hľadať doplnky"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Kliknutím pridáte hľadané slová"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "kde"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Všetky vyhľadávacie moduly"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Prehľadávať všetky vyhľadávacie moduly"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s zodpovedajúci doplnok"
+msgstr[1] "%s zodpovedajúce doplnky"
+msgstr[2] "%s zodpovedajúcich doplnkov"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Žiadne výsledky sa nenašli."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Hľadať doplnky"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Kanál výsledkov hľadania"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Výsledky hľadania pre: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Nástroje správcu"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Nástroje vývojára"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Nástroje editora"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Vitajte"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Vitajte, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Slovník"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Odporú�ané doplnky"
 
@@ -6082,7 +5713,7 @@ msgstr "Odporú�ané doplnky"
 msgid "sidebar_pitch_looking_for"
 msgstr "Hľadám:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Najnovšie doplnky"
 
@@ -6090,35 +5721,32 @@ msgstr "Najnovšie doplnky"
 msgid "sidebar_pitch_search"
 msgstr "Zásuvný modul"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Prihlásiť sa k odberu:"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "Tému"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Aktualizované doplnky"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s kB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Nehodnotené"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6138,35 +5766,31 @@ msgstr "Prepnúť doplnok"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e. %B"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e. %B %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e. %B"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "vytvorené: %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "vydané: %1$s"
@@ -6179,180 +5803,179 @@ msgstr "Zavrieť"
 msgid "statistics_help_link"
 msgstr "Pomocník"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "alebo vyberte iný doplnok"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "alebo vyberte doplnok s verejnou Å¡tatistikou"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Vyberte jeden zo svojich doplnkov, ktorého štatistiku zobraziť"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Vyberte doplnok, ktorého štatistiku zobraziť"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Vyberte doplnok s verejnou Å¡tatistikou"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Å tatistika"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Zobraziť štatistiku"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Zobraziť túto tabuľku vo formáte CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "žiadne"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Odstrániť tento diagram"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Zoskupiť podľa: deň"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Zoskupiť podľa: mesiac"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Zoskupiť podľa: týždeň"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Porovnať podľa týždňov"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "nájdené v rozsahu: %s"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Pridať diagram"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Pridať �alší diagram do tohto grafu"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Skryť celkový po�et"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Zobraziť celkový po�et"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Zakresliť celkový po�et do tohto grafu"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Zobraziť údaje (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Získať súbor údajov oddelených �iarkami"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Skryť udalosti: %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Zobraziť udalosti: %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Vyzna�iť na diagramoch dátumy vydania"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Skryť udalosti Firefoxu"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Zobraziť udalosti Firefoxu"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Vyzna�iť na diagramoch dátumy vydania Firefoxu"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Zbaliť graf"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Rozbaliť graf"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Zmeniť veľkosť grafu"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktívni denní používatelia"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Aplikácia"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Vlastné"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Prevzatia"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Opera�ný systém"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Stav doplnku"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Súhrn"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Verzia doplnku"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Aplikácia"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Opera�ný systém"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Stav doplnku"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Neznáme"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Verzia doplnku"
 
@@ -6366,7 +5989,9 @@ msgstr "Pre doplnok zatiaľ nie sú žiadne údaje. Skontrolujte o niekoľko dnÃ
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Štatistika doplnku sa práve aktualizuje. Najnovšie údaje nemusia byť úplné, pretože naše skripty práve údaje aktualizujú. Skontrolujte o niekoľko minút."
+msgstr ""
+"Štatistika doplnku sa práve aktualizuje. Najnovšie údaje nemusia byť úplné, "
+"pretože naše skripty práve údaje aktualizujú. Skontrolujte o niekoľko minút."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
@@ -6383,7 +6008,7 @@ msgstr "Nastavenie bolo aktualizované!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Å tatistika"
 
@@ -6411,103 +6036,108 @@ msgstr "Zmenšiť"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zmenšiť jeden mesiac"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Denné súhrn štatistiky pre %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Kanál RSS údajov súhrnu"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Å tatistika pre %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "V predvolenom nastavení má prístup k štatistike len Mozilla a vy. Môžete ju sprístupniť verejnosti, takže každý bude môcť prezerať údaje o doplnku."
+msgstr ""
+"V predvolenom nastavení má prístup k štatistike len Mozilla a vy. Môžete ju "
+"sprístupniť verejnosti, takže každý bude môcť prezerať údaje o doplnku."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Prístup k štatistike"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Súkromná"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Štatistiku môže prezerať len Mozilla a vy"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Verejná"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Štatistiku doplnku môže prezerať každý"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Zmeniť nastavenie"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Považujte tieto údaje za dôverné."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Táto štatistika je momentálne <b>súkromná</b>"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Táto štatistika je momentálne <b>verejná</b>"
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Zablokované"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Návrat na štatistiku"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Uložiť nastavenie"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Nastavenie Å¡tatistiky pre %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Odblokované"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Apl."
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Nez."
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver."
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Priemer prevzatí denne"
 
@@ -6515,46 +6145,37 @@ msgstr "Priemer prevzatí denne"
 msgid "statistics_summary_downloads_heading"
 msgstr "Prevzatia"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Prevzatí za posledný deň"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Prevzatí sa posledných 7 dní"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Prevzatí celkom"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Od %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Zatiaľ žiadne údaje"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Denní aktívni používatelia priemerne"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Zmena od posledného po�tu"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s dňa: %2$s"
@@ -6563,151 +6184,153 @@ msgstr "%1$s dňa: %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Aktívni denní používatelia"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Aktívni denní používatelia"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "%1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Priemerný týždenný po�et denných používateľov"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s oproti minulému týždňu"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Å tatistika doplnku %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Všetky témy"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Prehľadávať témy"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Zmeniť e-mailovú adresu"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Zmeniť heslo"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Zmena hesla alebo e-mailu"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Potvrdzovací kód znova odoslaný!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Používateľský ú�et %1$s bol úspešne odstránený. Ak sa rozhodnete vrátiť, môžete sa znova zaregistrovať na stránke <a href=\"%2$s\">registrácie používateľov</a>."
+msgstr ""
+"Používateľský ú�et %1$s bol úspešne odstránený. Ak sa rozhodnete vrátiť, "
+"môžete sa znova zaregistrovať na stránke <a href=\"%2$s\">registrácie "
+"používateľov</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Komunita Mozilla Add-ons je smutná z toho, že odchádzate."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Potvrdenie hesla"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Odstrániť môj ú�et"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Váš ú�et nemôžete odstrániť, ak ste uvedený ako <a href=\"%1$s\">autor niektorého z doplnkov</a>. Ak chcete tento ú�et odstrániť, musí najskôr niekto zo skupiny autorov vašich doplnkov odstrániť váš ú�et zo zoznamu autorov týchto rozšírení. Následne môžete na tomto mieste váš ú�et odstrániť."
+msgstr ""
+"Váš ú�et nemôžete odstrániť, ak ste uvedený ako <a href=\"%1$s\">autor "
+"niektorého z doplnkov</a>. Ak chcete tento ú�et odstrániť, musí najskôr "
+"niekto zo skupiny autorov vašich doplnkov odstrániť váš ú�et zo zoznamu "
+"autorov týchto rozšírení. Následne môžete na tomto mieste váš ú�et odstrániť."
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Ak máte �alšie otázky, kontaktujte nás na adrese %1$s."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "Pred odstránením ú�tu musíte ozna�iť pole \"Chápem, že…\"."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Na vykonanie tohto kroku musíte správne zadať vaše heslo."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Pri odstraňovaní tohto ú�tu sa vyskytla neznáma chyba. Prosím, kontaktujte %1$s so žiadosťou o odstránenie ú�tu a my to vykonáme. Ospravedlňujeme sa za túto nepríjemnosť."
+msgstr ""
+"Pri odstraňovaní tohto ú�tu sa vyskytla neznáma chyba. Prosím, kontaktujte %1"
+"$s so žiadosťou o odstránenie ú�tu a my to vykonáme. Ospravedlňujeme sa za "
+"túto nepríjemnosť."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Potvrdenie odstránenia ú�tu"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Odstránenie používateľského ú�tu %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Zbohom!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Už sa nebudete môcť prihlásiť na stránkach Mozilla Add-ons."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Po kliknutí na \"odstrániť\" bude tento ú�et <strong>nenávratne odstránený</strong>. To znamená, že:"
+msgstr ""
+"Po kliknutí na \"odstrániť\" bude tento ú�et <strong>nenávratne odstránený</"
+"strong>. To znamená, že:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Vaše recenzie a hodnotenia nebudú odstránené, ale už nebudú priradené tomuto ú�tu."
+msgstr ""
+"Vaše recenzie a hodnotenia nebudú odstránené, ale už nebudú priradené tomuto "
+"ú�tu."
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Ak máte nejaký problém, s ktorým by sme vám mohli pomôcť, neodstraňujte zatiaľ váš ú�et, ale kontaktujte nás na adrese %1$s a my urobíme všetko preto, aby sme daný problém vyriešili."
+msgstr ""
+"Ak máte nejaký problém, s ktorým by sme vám mohli pomôcť, neodstraňujte "
+"zatiaľ váš ú�et, ale kontaktujte nás na adrese %1$s a my urobíme všetko "
+"preto, aby sme daný problém vyriešili."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Chápem, že tento krok nie je možné vrátiť späť."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Odstránený používateľ"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Na adresu %1$s bola odoslaná overovacia e-mailová správa. Aby bola táto zmena úspešne vykonaná, musíte kliknúť na odkaz nachádzajúci sa v tejto správe. Dovtedy sa môžete prihlasovať použitím aktuálne používanej e-mailovej adresy."
+msgstr ""
+"Na adresu %1$s bola odoslaná overovacia e-mailová správa. Aby bola táto "
+"zmena úspešne vykonaná, musíte kliknúť na odkaz nachádzajúci sa v tejto "
+"správe. Dovtedy sa môžete prihlasovať použitím aktuálne používanej e-"
+"mailovej adresy."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Odstrániť používateľský ú�et"
 
@@ -6723,8 +6346,10 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Vitajte na %2$s Add-ons.\n"
 "\n"
-"Najprv je potrebné nový ú�et aktivovať. Tým spolu skontrolujeme platnosť použitej e-mailovej adresy.\n"
-"Ak chcete aktivovať ú�et, kliknite na dole uvedený odkaz alebo ho skopírujte a prilepte v prehliada�i do panela adresy:\n"
+"Najprv je potrebné nový ú�et aktivovať. Tým spolu skontrolujeme platnosť "
+"použitej e-mailovej adresy.\n"
+"Ak chcete aktivovať ú�et, kliknite na dole uvedený odkaz alebo ho skopírujte "
+"a prilepte v prehliada�i do panela adresy:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6735,16 +6360,20 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Požiadali ste o zmenu e-mailovej adresy vášho ú�tu na %2$s Add-ons.\n"
 "\n"
-"Ak chcete túto zmenu potvrdiť, kliknite na odkaz uvedený nižšie alebo skopírujte adresu a zadajte ju do webového prehliada�a:\n"
+"Ak chcete túto zmenu potvrdiť, kliknite na odkaz uvedený nižšie alebo "
+"skopírujte adresu a zadajte ju do webového prehliada�a:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Na potvrdenie novej e-mailovej adresy máte 48 hodín. Ak ju nechcete zmeniť, ignorujte túto správu.\n"
+"Na potvrdenie novej e-mailovej adresy máte 48 hodín. Ak ju nehcete zmeniť, "
+"ignorujte túto správu.\n"
 "\n"
 "ÄŽakujeme!\n"
 "-- Tím %2$s Add-ons"
@@ -6764,7 +6393,9 @@ msgid "user_email_pwreset"
 msgstr ""
 "Vynulovanie hesla pre %2$s Add-ons\n"
 "\n"
-"Bola prijatá žiadosť o vynulovanie hesla pre tento ú�et na stránke addons.mozilla.org. Ak chcete zmeniť heslo, kliknite na nasledujúci odkaz, alebo ho zadajte v prehliada�i do panela adresy:\n"
+"Bola prijatá žiadosť o vynulovanie hesla pre tento ú�et na stránke addons."
+"mozilla.org. Ak chcete zmeniť heslo, kliknite na nasledujúci odkaz, alebo ho "
+"zadajte v prehliada�i do panela adresy:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6773,117 +6404,92 @@ msgstr ""
 "ÄŽakujeme,\n"
 "-- Tím %2$s Add-ons"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Vynulovanie hesla pre %s Add-ons"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Chyba!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Prosím, potvr�te zmenu vašej e-mailovej adresy konta na %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Zmena úspešná!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Vaša e-mailová adresa bola úspešne zmenená. Odteraz sa prihlasujte použitím adresy %1$s."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "O mne"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Predstavte sa komunite, ak chcete! Tento text sa objaví na informa�nej stránke o Vás. Zlomy riadkov budú zachované, kód HTML nie je povolený."
+msgstr ""
+"Vaša e-mailová adresa bola úspešne zmenená. Odteraz sa prihlasujte použitím "
+"adresy %1$s."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Potvrdiť heslo"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Zobraziť kolekcie, ktoré som vytvoril v mojom používateľskom profile"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Zobraziť obľúbené kolekcie v mojom používateľskom profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Upraviť profil používateľa pre %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-mailová adresa"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Krstné meno"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Skryť e-mailovú adresu"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Adresa webovej stránky"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Priezvisko"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Prihlásenie používateľa"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nové heslo"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Prezývka"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Staré heslo"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Ďalšie akcie"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Heslo"
 
@@ -6891,60 +6497,66 @@ msgstr "Heslo"
 msgid "user_form_registration"
 msgstr "Registrácia nového používateľa"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Zapamätať si ma na tomto po�íta�i"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Zobraziť Sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Uložiť"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Prihlásiť"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Zaregistrovať"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Používateľ %s Add-ons od:"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Vytvoriť nový ú�et"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Kompatibilita doplnku (dôrazne odporú�ané)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Nadchádzajúce udalosti a súťaže"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
-msgstr "Momentálne nie sú dostupné žiadne notifikácie, ktoré môžete nastavovať."
+msgstr ""
+"Momentálne nie sú dostupné žiadne notifikácie, ktoré môžete nastavovať."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Z �asu na �as Vám Mozilla môže odoslať e-mailovú správu s informáciou o nadchádzajúcich vydaniach alebo udalostí. Prosím, zvoľte si oblasti, ktoré Vás zaujímajú:"
+msgstr ""
+"Z �asu na �as Vám Mozilla môže odoslať e-mailovú správu s informáciou o "
+"nadchádzajúcich vydaniach alebo udalostí. Prosím, zvoľte si oblasti, ktoré "
+"Vás zaujímajú:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla si vyhradzuje právo individuálne Vás kontaktovať ohľadne špecifických záležitostí vašich doplnkov hostovaných Mozillou."
+msgstr ""
+"Mozilla si vyhradzuje právo individuálne Vás kontaktovať ohľadne "
+"špecifických záležitostí vašich doplnkov hostovaných Mozillou."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "V zmenách, ktoré ste urobili, sú chyby. Opravte ich a odošlite znova."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil aktualizovaný."
 
@@ -6957,15 +6569,15 @@ msgstr "Vynulovanie hesla pre %s"
 msgid "user_pwreset_header"
 msgstr "Vynulovanie hesla"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Zabudli ste heslo?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Odkaz na vynulovanie hesla bol odoslaný na vašu e-mailovú adresu."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Heslo úspešne vynulované."
 
@@ -6977,7 +6589,7 @@ msgstr "Odoslať zmenu hesla"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Odoslať vynulovanie hesla"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -6987,62 +6599,54 @@ msgstr "%s Add-ons"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Odkaz na aktivovanie používateľského ú�tu bol odoslaný e-mailom na adresu %1$s. Pred prihlásením na %2$s Add-ons je potrebné na tento odkaz kliknúť."
+msgstr ""
+"Odkaz na aktivovanie používateľského ú�tu bol odoslaný e-mailom na adresu %1"
+"$s. Pred prihlásením na %2$s Add-ons je potrebné na tento odkaz kliknúť."
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Na adresu %1$s bol odoslaný e-mail, ktorým potvrdíte svoj ú�et. Pred tým, než sa budete môcť prihlásiť, je potrebné aktivovať ú�et kliknutím na odkaz, ktorý sa nachádza v tejto e-mailovej správe."
+msgstr ""
+"Na adresu %1$s bol odoslaný e-mail, ktorým potvrdíte svoj ú�et. Pred tým, "
+"než sa budete môcť prihlásiť, je potrebné aktivovať ú�et kliknutím na odkaz, "
+"ktorý sa nachádza v tejto e-mailovej správe."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "znova odoslať potvrdzovaciu správu"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Blahoželáme! Váš ú�et používateľa bol úspešne vytvorený."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>Registrácia stránke AMO <strong>nie je vyžadovaná</strong>, ak chcete preberať a inštalovať verejné doplnky.</p><p>Zaregistrovať sa musíte len v prípade, že:</p><ul><li>chcete odoslať recenziu na nejaký doplnok</li><li>ste vývojárom doplnkov a chcete váš doplnok umiestniť na stránke AMO</li></ul><p>Po úspešnej registrácii obdržíte na zadanú adresu potvrdzovaciu e-mailovú správu. Ú�et potvrdíte nasledovaním krokov popísaných v tejto správe.</p><p>Ak chcete, môžete si pre�ítať <a href='%1$s' title='Právne informácie'>Právne informácie</a> a <a href='%2$s' title='Zásady ochrany súkromia'>Zásady ochrany súkromia</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Ak ste nedostali potvrdzovací e-mail, skontrolujte svoju e-mailovú službu, �i neozna�ila správu ako \"spam\". V prípade potreby môžete %1$s na e-mailovú adresu uvedenú vyššie."
+msgstr ""
+"Ak ste nedostali potvrdzovací e-mail, skontrolujte svoju e-mailovú službu, "
+"�i neozna�ila správu ako \"spam\". V prípade potreby môžete %1$s na e-"
+"mailovú adresu uvedenú vyššie."
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Ďakujeme za registráciu a vítame vás na %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Víta vás addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Vyžaduje sa meno, priezvisko alebo prezývka."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Kolekcie"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Upozornenia"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil používateľa"
 
@@ -7050,65 +6654,51 @@ msgstr "Profil používateľa"
 msgid "user_verified_okay"
 msgstr "Úspešne overené!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Odstrániť používateľský ú�et"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Úprava používateľského ú�tu"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "O mne"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Doplnky od autora %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Meno"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil autora"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Kolekcie autora %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-mailová adresa"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Obľúbené kolekcie"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Domovská stránka"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Prezývka"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Informácie o používateľovi %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Recenzie používateľa %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Prihlásenie používateľa"
 
@@ -7119,7 +6709,10 @@ msgstr "Prihlásenie používateľa"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Doplnok, ktorý hľadáte, je momentálne v Sandboxe. Ak máte ú�et na Mozilla Add-ons, prihláste sa alebo si <a href=\"%1$s\">pre�ítajte o Sandboxe</a> �alšie informácie."
+msgstr ""
+"Doplnok, ktorý hľadáte, je momentálne v Sandboxe. Ak máte ú�et na Mozilla "
+"Add-ons, prihláste sa alebo si <a href=\"%1$s\">pre�ítajte o Sandboxe</a> "
+"�alšie informácie."
 
 # %1 is the link to the sandbox/policy explanation page
 # This message is for any given sandbox-related page not found
@@ -7128,131 +6721,18 @@ msgstr "Doplnok, ktorý hľadáte, je momentálne v Sandboxe. Ak máte ú�et na
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "Stránka, ktorú hľadáte, je sú�asťou Sandboxu. Ak máte ú�et na Mozilla Add-ons, prihláste sa alebo si <a href=\"%1$s\">pre�ítajte o Sandboxe</a> �alšie informácie."
+msgstr ""
+"Stránka, ktorú hľadáte, je sú�asťou Sandboxu. Ak máte ú�et na Mozilla Add-"
+"ons, prihláste sa alebo si <a href=\"%1$s\">pre�ítajte o Sandboxe</a> �alšie "
+"informácie."
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Vynulovanie používateľského hesla"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrácia nového používateľa"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Licencia pre zdrojový kód doplnku %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Zobraziť všetky naposledy pridané"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Zobraziť všetky naj�astejšie preberané"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Zobraziť všetky najlepšie hodnotené"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Ďalší doplnok"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Predchádzajúci doplnok"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Posledná verzia je kompatibilná s aplikáciou"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Úplná história verzií"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Najnovšie:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Najobľúbenejšie:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Odporú�ame:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Naposledy aktualizované:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "Zobraziť všetky"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Zobraziť všetky odporú�ané doplnky"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Najprv najvyššie hodnotené"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Najprv naposledy aktualizované"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Najprv najobľúbenejšie"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Na�ítava sa"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Zobraziť �alšie informácie"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Táto verzia doplnku nie je kompatibilná s Firefoxom %s. Mozilla "
-#~ "predpokladá, že nasledujúca verzia Firefoxu bude �oskoro vydaná. "
-#~ "Otestujte preto svoj doplnok v novej verzii a aktualizujte údaj o "
-#~ "kompatibilite. Ďalšie informácie nájdete na <a href=\"%s\">tejto stránke</"
-#~ "a>. Toto je len oznámenie, môžete pokra�ovať v odosielaní tejto verzie na "
-#~ "addons.mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Doplnok úspešne zakázaný"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Upraviť doplnok"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Doplnok úspešne povolený"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Popis doplnku"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "Licen�ná zmluva"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Domovská stránka doplnku"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Názov doplnku"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Zásady ochrany súkromia"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Súhrn doplnku"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "E-mail na podporu"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Adresa URL na podporu"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Poznámky k verziám"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nominovať doplnok"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Doplnok úspešne nominovaný!"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Niekoľko recenzií doplnku (môžu byť externé recenzie)."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Súhlasím"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Nesúhlasím"
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Nové"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Aktualizované"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Vek doplnku"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Typy doplnkov"
-#~ msgid "editors_th_applications"
-#~ msgstr "Aplikácie"
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platformy"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Typy odoslania"
-#~ msgid "forum_save"
-#~ msgstr "Uložiť"
-#~ msgid "home"
-#~ msgstr "domov"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Zásuvné moduly"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s zodpovedajúci doplnok"
-#~ msgstr[1] "%s zodpovedajúce doplnky"
-#~ msgstr[2] "%s zodpovedajúcich doplnkov"
-
diff --git a/site/app/locale/sk/pages/error404.thtml b/site/app/locale/sk/pages/error404.thtml
index e03155c..a10e5ff 100644
--- a/site/app/locale/sk/pages/error404.thtml
+++ b/site/app/locale/sk/pages/error404.thtml
@@ -1,16 +1,16 @@
-<h1>Prepá�te, nie je možné nájsť, �o ste hľadali.</h1>
-
-<p>Stránka alebo súbor, ktorý požadujete, sa na&nbsp;našej stránke nenašli. Je možné, že ste klikli na&nbsp;neplatný odkaz, alebo ste nesprávne zadali adresu.</p>
-
-<ul>
-<li>Ak ste adresu zadávali, skontrolujte dvakrát správnosť.</li>
-<li>Ak ste niekde klikli na&nbsp;odkaz, dajte nám vedieť na&nbsp;adresu <a href="mailto:webmaster@mozilla.com" title="Page Not Found on Mozilla.com">webmaster@mozilla.com</a>. Oznámte nám, odkiaľ ste prišli a&nbsp;�o ste hľadali. Urobíme všetko pre&nbsp;nápravu.</li>
-</ul>
-
-<p>Prípadne prejdite na&nbsp;niektorú z&nbsp;obľúbených stránok na&nbsp;našom webe.</p>
-
-<ul>
-<li>Zaujíma vás <a href="%1$s">zoznam odporú�aných doplnkov</a>?</li>
-<li>Chcete <a href="%2$s">hľadať doplnok</a>? Môžete prejsť na&nbsp;<a href="%2$s">stránku vyhľadávania</a>, alebo jednoducho použite hore uvedené vyhľadávacie pole.</li>
-<li>Ak chcete ísť na&nbsp;za�iatok, prejdite na&nbsp;<a href="%3$s">úvodnú stránku doplnkov</a>.</li>
-</ul>
+<h1>Prepá�te, nie je možné nájsť, �o ste hľadali.</h1>
+
+<p>Stránka alebo súbor, ktorý požadujete, sa na&nbsp;našej stránke nenašli. Je možné, že ste klikli na&nbsp;neplatný odkaz, alebo ste nesprávne zadali adresu.</p>
+
+<ul>
+<li>Ak ste adresu zadávali, skontrolujte dvakrát správnosť.</li>
+<li>Ak ste niekde klikli na&nbsp;odkaz, dajte nám vedieť na&nbsp;adresu <a href="mailto:webmaster@mozilla.com" title="Page Not Found on Mozilla.com">webmaster@mozilla.com</a>. Oznámte nám, odkiaľ ste prišli a&nbsp;�o ste hľadali. Urobíme všetko pre&nbsp;nápravu.</li>
+</ul>
+
+<p>Prípadne prejdite na&nbsp;niektorú z&nbsp;obľúbených stránok na&nbsp;našom webe.</p>
+
+<ul>
+<li>Zaujíma vás <a href="%1$s">zoznam obľúbených doplnkov</a>?</li>
+<li>Chcete <a href="%2$s">hľadať doplnok</a>? Môžete prejsť na&nbsp;<a href="%2$s">stránku vyhľadávania</a>, alebo jednoducho použite hore uvedené vyhľadávacie pole.</li>
+<li>Ak chcete ísť na&nbsp;za�iatok, prejdite na&nbsp;<a href="%3$s">úvodnú stránku doplnkov</a>.</li>
+</ul>
\ No newline at end of file
diff --git a/site/app/locale/sk/pages/statistics_help.thtml b/site/app/locale/sk/pages/statistics_help.thtml
index f6c2548..0b81ffe 100644
--- a/site/app/locale/sk/pages/statistics_help.thtml
+++ b/site/app/locale/sk/pages/statistics_help.thtml
@@ -4,4 +4,4 @@
 <p>Po�et prevzatí je aktualizovaný každý deň a zahŕňa len po�et priamych prevzatí, nie aktualizácie.</p>
 
 <h4>Aktualizácie</h4>
-<p>Doplnky prevzaté z tejto stránky kontrolujú aktualizácie každý deň. Celkový po�et týchto kontrol je známy ako Aktívni denní používatelia. Po�et aktívnych denných používateľov (ADU) môže byť rozdelený podľa verzií doplnku, opera�ného systému, stavu doplnku a aplikácie, ktorej je nainštalovaný.</p>
+<p>Doplnky prevzaté z tejto stránky kontrolujú aktualizácie každý deň. Celkový po�et týchto kontrol je známy ako Aktívni denní používatelia. Po�et aktívnych denných používateľov (ADU) môže byť rozdelený podľa verzií doplnku, opera�ného systému, stavu doplnku a aplikácie, ktorej je nainštalovaný. Tieto údaje sú zbierané vždy jeden deň v týždni, momentálne v stredu.</p>
diff --git a/site/app/locale/sq/LC_MESSAGES/messages.po b/site/app/locale/sq/LC_MESSAGES/messages.po
index e1b461f..575a9c8 100644
--- a/site/app/locale/sq/LC_MESSAGES/messages.po
+++ b/site/app/locale/sq/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-11 14:06+0200\n"
+"PO-Revision-Date: 2009-03-13 23:47+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,190 +11,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Anulo Instalimin"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Shkarkoje %s Tani"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Pranoje dhe Shkarko"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Pranoje dhe Instalo"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "Publike"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Bankoprovë"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Përditësuar më %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "shkarkime"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "shkarkime gjithsej"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "shkarkime javore"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s shtesë"
 msgstr[1] "%1$s shtesa"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "për faqe"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Renditur sipas:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "eksperimentale"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "e këshilluar"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s nuk është i passhëm për %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Prapa te %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Prapa te shqyrtimet..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Vlerësim:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Shqyrtim:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Parashtroni shqyrtimin tuaj"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Shtoni një shqyrtim për %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titull/Përmbledhje:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Fshije"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Përgjigjju"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Jeni i sigurt se doni të fshini këtë shqyrtim?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Jo"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Po"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Fshije Shqyrtimin"
 
@@ -203,7 +173,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Shqyrtimi u fshi me sukses."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Përpunoni Shqyrtimin për %s"
@@ -211,24 +181,30 @@ msgstr "Përpunoni Shqyrtimin për %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Problem me flamurëzimin e shqyrtimit: Shënimet për shqyrtime te flamurëzuar janë të kufizuara nga 10 deri në 100 shenja; tuaja qenë %1$s."
+msgstr ""
+"Problem me flamurëzimin e shqyrtimit: Shënimet për shqyrtime te flamurëzuar "
+"janë të kufizuara nga 10 deri në 100 shenja; tuaja qenë %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Vini re: Përpara se shqyrtimi juaj të shfaqet në \"site\"-in publik, do të shqyrtohet nga një redaktor."
+msgstr ""
+"Vini re: Përpara se shqyrtimi juaj të shfaqet në \"site\"-in publik, do të "
+"shqyrtohet nga një redaktor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Përgjigje zhvilluesi për:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
-msgstr[0] "Shihni %1$s shqyrtim të mëparshëm parashtruar nga %2$s për këtë shtesë."
-msgstr[1] "Shihni %1$s shqyrtime të mëparshme parashtruar nga %2$s për këtë shtesë."
+msgstr[0] ""
+"Shihni %1$s shqyrtim të mëparshëm parashtruar nga %2$s për këtë shtesë."
+msgstr[1] ""
+"Shihni %1$s shqyrtime të mëparshme parashtruar nga %2$s për këtë shtesë."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -240,169 +216,131 @@ msgid "addon_review_pagetitle"
 msgstr "Shqyrtime për %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Përgjigje nga %1$s më %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Përgjigje Zhvilluesi:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Shqyrtimi juaj u ruajt me sukses. Faleminderit!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "nga %1$s më %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "nga %1$s më %2$s (vlerësuar si %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Shtea Pasuese"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Shtesa e Mëparshme"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Lidhje e përhershme për te ky version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Versioni më i fundit i përputhshëm me %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Shko"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Shihni Profilin e Autor-it"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Shfletoni tërë Temat :: Shtesa për %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Shfletoni %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Shfletoni Tema %1$s-i :: Shtesa për %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Ç'është kjo?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Shtoni shqyrtim"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Hollësi të Mëtejshme"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategori"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Shtojeni te një koleksion:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Koleksion i Ri..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Përzgjidhni një koleksion..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Botoje"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s u shtua te koleksioni %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Ç'është kjo?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "dhe %1$s koleksion më tepër"
-msgstr[1] "dhe %1$s koleksione më tepër"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "shqyrtim i hollësishëm"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "S'më pëlqen"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Përpunoni shqyrtimin tuaj"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Kjo shtesë ka rregulla vetësie."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Urreje"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Koleksione të Lidhura"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Komente nga Zhvilluesa"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Faqe Hyrëse"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Leje Kodi Burim"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Shqyrtime"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Asistencë"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Pëlqeje"
 
@@ -410,109 +348,116 @@ msgstr "Pëlqeje"
 msgid "addons_display_long_description"
 msgstr "Përshkrim i Gjatë"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Duaje"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Më tepër Pamje"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Kjo shtesë ende nuk bën pjesë në ndonjë koleksion."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
+#, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
-msgstr[0] "Të tjera shtesa nga %1$s"
-msgstr[1] "Të tjera shtesa nga këta autorë"
+msgstr[0] "Shtesa të tjera nga %1$s"
+msgstr[1] "Other add-ons by these authors"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Asistenca për këtë shtesë ofrohet te %s nga zhvilluesi i saj."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Asistenca për këtë shtesë ofrohet te %s nga zhvilluesi i saj ose mund të kihet duke dërguar një e-mail te %s."
+msgstr ""
+"Asistenca për këtë shtesë ofrohet te %s nga zhvilluesi i saj ose mund të "
+"kihet duke dërguar një e-mail te %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Asistenca për këtë shtesë ofrohet te %s nga zhvilluesi i saj."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Vlerësoje"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Vërtet më pëlqen"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Ju lutemi mos postoni raportime të metash në shqyrtime. Nuk ua japim vendndodhjet tuaja email zhvilluesve të shtesave, e ata mund të kenë nevojë të lidhen me ju për t'ju ndihmuar në zgjidhjen e problemit."
+msgstr ""
+"Ju lutemi mos postoni raportime të metash në shqyrtime. Nuk ua japim "
+"vendndodhjet tuaja email zhvilluesve të shtesave, e ata mund të kenë nevojë "
+"të lidhen me ju për t'ju ndihmuar në zgjidhjen e problemit."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Udhëzime Shqyrtimi</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Për të parë se prej nga mund të keni asistencë rreth kësaj shtese, hidhini një sy <a href=\"%1$s\">ndarjes për asistencë</a>."
+msgstr ""
+"Për të parë se prej nga mund të keni asistencë rreth kësaj shtese, hidhini "
+"një sy <a href=\"%1$s\">ndarjes për asistencë</a>."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Ruaje"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Shihni Tërë Shtesat %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Shihni tërë shqyrtimet (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Shihni Tërë Versionet"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Historik i Plotë Versioni"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Shihni burimin"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Shihni statistikat"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Si ju duket?"
 
@@ -520,447 +465,339 @@ msgstr "Si ju duket?"
 msgid "addons_display_workswith"
 msgstr "Punon me:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Të saposhtuara"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Popullore"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Të këshilluara"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "PajtohuniSubscribe"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Shfletoni Shtesat"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "U përditësua"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "nga"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Koleksione Popullore"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Koleksione"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> shtesë"
-msgstr[1] "<strong>%1$s</strong> shtesa"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Shihini Tërë Koleksionet"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Koleksionet janë një mënyrë për klasifikim, gjetje përputhjesh dhe përzierje shtesash në koleksione të reja.  Pajtohuni në koleksione të krijuar nga përdorues të tjerë ose krijoni tuajt."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> pajtimtar"
-msgstr[1] "<strong>%1$s</strong> pajtimtarë"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Ju Këshillojmë"
 
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Shtesat zgjerojnë %1$s-in, duke ju bërë të mundur të personalizoni përvojën tuaj në shfletim.  Hidhni një sy përreth dhe krijoni %1$s-in tuaj."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Ju pëlqejnë këto? Gjeni shtesa të ngjashme te koleksioni %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Mbi 5000 ekstra falas</strong>, që ju lejojnë të përshtasni dhe zgjeroni Firefox-in për t'ua përshtatur nevojave tuaja."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Çfarë janë Shtesat?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Të lehta në instalim</strong> dhe në përditësim."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Hyrje"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Panele, tema dhe mundësues kërkimesh që <strong>ju ndihin të kryeni veprimet tuaja të zakonshme.</strong>"
+msgstr ""
+"Shtesat zgjerojnë %1$s-in, duke ju bërë të mundur të personalizoni përvojën "
+"tuaj në shfletim.  Hidhni një sy përreth dhe krijoni %1$s-in tuaj."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "E RE!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Më të rejat:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Zbatime të Tjera"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Shtesa %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>shtesë e shkarkuar</span>"
-msgstr[1] "<strong>%1$s</strong> <span>shtesa të shkarkuara</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Më Populloret:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>shtesë në përdorim</span>"
-msgstr[1] "<strong>%1$s</strong> <span>shtesa në përdorim</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Këshillojmë:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Përditësuar së Fundmi:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Shihini të tëra"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Shihni tërë shtesat e krijuara rishtas"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Shihni tërë shtesat popullore"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Shihni tërë shtesat e këshilluara"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Shihni tërë shtesat e përditësuara rishtas"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Klikoni mbi lidhjen e mëposhtme për të ruajtur kartelën.</li><li>Te Mozilla Sunbird-i, hapni Shtesa prej menusë Mjete.</li><li>Klikoni butonin Instaloje, mandej gjeni/përzgjidhni kartelën që shkarkuat dhe klikoni \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Klikoni mbi lidhjen e mëposhtme për të ruajtur kartelën.</li><li>Te "
+"Mozilla Sunbird-i, hapni Shtesa prej menusë Mjete.</li><li>Klikoni butonin "
+"Instaloje, mandej gjeni/përzgjidhni kartelën që shkarkuat dhe klikoni \"OK\"."
+"</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Si të Instalohet në Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Djathtas-klikoni lidhjen më poshtë dhe zgjidhni \"Ruaje Lidhjen Si...\" për të shkarkuar dhe ruajtur kartelën te hard disku juaj.</li><li>Te Mozilla Thunderbird, hapni Shtesat prej menusë Mjete.</li><li>Klikoni butonin Instaloje, dhe gjeni/përzgjidhni kartelën që shkarkuat dhe klikoni \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Djathtas-klikoni lidhjen më poshtë dhe zgjidhni \"Ruaje Lidhjen Si..."
+"\" për të shkarkuar dhe ruajtur kartelën te hard disku juaj.</li><li>Te "
+"Mozilla Thunderbird, hapni Shtesat prej menusë Mjete.</li><li>Klikoni "
+"butonin Instaloje, dhe gjeni/përzgjidhni kartelën që shkarkuat dhe klikoni "
+"\"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Si ta Instaloni te Thunderbird-i"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "shfaq shtesa eksperimentale"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Shko"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Nga"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "për Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "për Mac OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "për Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Kjo faqe radhit vetëm disa prej shtojcave më të zakonshme dhe më të njohura. Për më tepër të dhëna rreth të tjera shtojcash të pashme për Shfletuesa me bazë Mozilla-n, vizitoni %1$s"
+msgstr ""
+"Kjo faqe radhit vetëm disa prej shtojcave më të zakonshme dhe më të njohura. "
+"Për më tepër të dhëna rreth të tjera shtojcash të pashme për Shfletuesa me "
+"bazë Mozilla-n, vizitoni %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Po shihni për një shtojcë të paradhitur këtu?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Shtojcat e ndihmojnë shfletuesin tuaj të përmbushin funksione të veçantë si parje formatesh të veçantë grafikë ose luajtje kartelash multimedia. Shtojcat janë pakëz ndryshe nga zgjerimet, të cialt ndryshojnë ose shtojnë diçka te një anë ekzistuese."
+msgstr ""
+"Shtojcat e ndihmojnë shfletuesin tuaj të përmbushin funksione të veçantë si "
+"parje formatesh të veçantë grafikë ose luajtje kartelash multimedia. "
+"Shtojcat janë pakëz ndryshe nga zgjerimet, të cialt ndryshojnë ose shtojnë "
+"diçka te një anë ekzistuese."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Shtojca të Zakonshme për %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Shtojca"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Dokumentacion Asistence: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s kërkon që ju të pranoni \"End User License Agreement\" (Marrëveshje License Përdoruesi të Fundëm) vijuese para se të bëhet procesi i instalimit:"
+msgstr ""
+"%s kërkon që ju të pranoni \"End User License Agreement\" (Marrëveshje "
+"License Përdoruesi të Fundëm) vijuese para se të bëhet procesi i instalimit:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Paraparje për %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Shtuar Së Fundmi"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Me kaq shumë shtesa të forta të passhme, ka diçka për secilin. Për t'ia filluar, ja një listë me disa nga më populloret. Kënaquni!"
+msgstr ""
+"Me kaq shumë shtesa të forta të passhme, ka diçka për secilin. Për t'ia "
+"filluar, ja një listë me disa nga më populloret. Kënaquni!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Shtesa të Këshilluara"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Shtesa të Këshilluara"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Burime Shtesë"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Qendra e Zhvilluesave Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Na ndjeni, lypset të kini një shfletues me bazë Mozilla (si Firefox-i) për të instaluar një shtojcë kërkimi."
+msgstr ""
+"Na ndjeni, lypset të kini një shfletues me bazë Mozilla (si Firefox-i) për "
+"të instaluar një shtojcë kërkimi."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "Lypset JavaScript për të instaluar shtojcat, por duket sikur ju ta keni të çaktivizuar.  Ju lutem aktivizoni JavaScript-in përpara se të provoni të instaloni ndonjërën prej shtojcave për kërkime që shihni."
+msgstr ""
+"Lypset JavaScript për të instaluar shtojcat, por duket sikur ju ta keni të "
+"çaktivizuar.  Ju lutem aktivizoni JavaScript-in përpara se të provoni të "
+"instaloni ndonjërën prej shtojcave për kërkime që shihni."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Mësoni se si të %1$s te %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/sq/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "krijoni të tuajën"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Shfletoni nëpër më tepër motorë kërkimesh te %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Motorë Kërkimesh"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "Falënderime të veçanta Projektit Mycroft për punën e tyre në Motorë Kërkimesh për Firefox-in."
+msgstr ""
+"Falënderime të veçanta Projektit Mycroft për punën e tyre në Motorë "
+"Kërkimesh për Firefox-in."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Ndajeni me të tjerë"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Shtoje te Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
 msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Postoje te Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Ndajeni te FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Postoje te MySpace"
+msgstr "Post to MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "E çaktivizuar"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Version Jo i Plotë"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "Në Bankoprovë; Propozuar Publikisht"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Në Bankoprovë; Në Pritje të Shqyrtimit"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Publike"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Në Bankoprovë"
@@ -969,34 +806,26 @@ msgstr "Në Bankoprovë"
 msgid "addons_status_unknown"
 msgstr "E panjohur"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Mësoni më tepër rreth kësaj shtese"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Shkarkimet Kryesuese"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Më të Vlerësurat"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Bëni Kujdes Me Versione të Vjetër"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Këta versione paraqiten për qëllime reference dhe prove. Do të duhej që të përdorni përherë versionin më të fundit të një shtese."
+msgstr ""
+"Këta versione paraqiten për qëllime reference dhe prove. Do të duhej që të "
+"përdorni përherë versionin më të fundit të një shtese."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Historik Versionesh me Regjistrime Ndryshimesh"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "Historik Versionesh të %1$s"
@@ -1019,8 +848,7 @@ msgstr "Grupi me id %s u fshi"
 msgid "admin_group_edit_pagetitle"
 msgstr "Përpunoni Grup"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "Id e pavlefshme për Grup"
 
@@ -1028,1364 +856,423 @@ msgstr "Id e pavlefshme për Grup"
 msgid "admin_group_pagetitle"
 msgstr "Adminstrator Grupi"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Grupi u ruajt"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "I thelluar"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Çfarëdo kohe"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
-msgstr "Çfarëdo"
+msgstr "Cilido"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
-msgstr "Çfarëdo"
+msgstr "Cilido"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Zbatim"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Përputhje për Fjalëkyç"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Përditësuar Së Fundmi"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Emër"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Më e reja"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 muajt e kaluar"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 muajt e kaluar"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Ditën e Kaluar"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Muajin e Kaluar"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Javën e Kaluar"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Vitin e kaluar"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Për Faqe"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Platformë"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popullaritet"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Vlerësim"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Renditur Sipas"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "te"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Këmbe mënyrë kërkimi të përparuar"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Lloj"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Pasuesja"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "E mëparshmja"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Shpërfill kontroll versioni"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Kjo shtesë është për versione te vjetra të Firefox-it"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Mund <a href=\"%1$s\">të provoni  një version të vjetër</a> ose <a href=\"#\" onclick=\"%2$s\">shpërfilleni këtë kontroll</a>"
+msgstr ""
+"Mund <a href=\"%1$s\">të provoni  një version të vjetër</a> ose <a href=\"#"
+"\" onclick=\"%2$s\">shpërfilleni këtë kontroll</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Mund të bëjë punë ndonjë <a href=\"%1$s\">version më i vjetër</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Kjo shtesë lyp <a href=\"%1$s\">Firefox %2$s</a> ende të pahedhur në qarkullim"
+msgstr ""
+"Kjo shtesë lyp <a href=\"%1$s\">Firefox %2$s</a> ende të pahedhur në "
+"qarkullim"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Përditësoni Firefox-in</a> që të mund të përdorni këtë shtesë"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s ndryshoi gjendjen e %2$s në %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s kreu një veprim të panjohur administrativ %2$s mbi ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s hoqi veçorinë %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s krijoi zbatimin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s përpunoi zbatimin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s krijoi versionin %2$s për %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s fshiu versionin %2$s për %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s ndryshoi përshkrimin '%2$s' nga '%3$s' në '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s kreu një veprim të panjohur redaktorial %2$s mbi ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s hoqi shtesën %2$s nga lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s shtoi shtesën %2$s te lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s ndryshoi një veçori për vendoren %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s ndryshoi vendoret për shtesën %2$s te lista"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s rillogariti hashin për kartelën %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s shtoi %2$s te grupi %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s përshoqëroi veten me %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s krijoi grupin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s fshiu grupin %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s përpunoi grupin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s hoqi %2$s nga grupi %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s kreu një veprim të panjohur %2$s mbi %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s u përpoq të ndryshoi grupin e kyçur %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s u përpoq të ndryshonte pa leje përkthimet në %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s krijoi platformën %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s fshiu platformën %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s përpunoi platformën %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s dështoi në ri-mirëfilltësim për hyrje te %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s krijoi përgjigjen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s fshiu përgjigjen %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s përpunoi përgjigjen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s miratoi shqyrtimin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s fshiu shqyrtimin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s kreu një veprim të panjohur sigurien %2$s mbi ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s krijoi etiketën %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s fshiu kategorinë %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s përpunoi kategorinë %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s përditësoi përkthime zbatimi për %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s përditësoi përkthime postimesh blogu për %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s përditësoi përkthime platforme për %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s përditësoi përkthime kategorie për %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s përpunoi të dhëna përdoruesi për %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Përditësoni Firefox-in</a> që të mund të "
+"përdorni këtë shtesë"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Shtesa sipas Emrash"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Shtesat Më të Reja"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Shtesa Popullore"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Shtesa sipas Vlerësimeve"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Shtesa të Përditësuara së Fundmi"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Kategoria e Tanishme"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategori"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Zgjidhni kategori"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Shihni Tërë %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Emri duhet të jetë më pak se %1$s shenja."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Shihni Tërë Shtesat e Këshilluara"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Koleksioni %s"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Më të Vlerësuarat Së Pari"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Gabim në fshirjen e shtesës!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Të Përditësuarat Rishtas Së Pari"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Gabim në ruajtjen e shtesës!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Më Populloret Së Pari"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Gabim në ruajtjen e komentit!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Emri duhet të jetë më pak se %1$s shenja."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Shihni Tërë %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Nuk u gjet përmbledhje!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Po qe se i dini tashmë cilat shtesa doni të shtoni te koleksioni juaj, thjesht filloni e shtypni më poshtë emrat e tyre. Po qe se do të donit të prisni më mirë e ta bëni këtë më vonë, thjesht klikoni tani te %1$s."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Zgjidhni shtesat tuaja të para"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Krijoni një Koleksion"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Shtesa të Përzgjedhura"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Duke plotësuar pak fusha më poshtë, është e lehtë të krijoni koleksionin tuaj të shtesave."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Krijoni një Koleksion"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Koleksione"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Mësoni Më Tepër"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Shtoje te Të parapëlqyerit"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Hiqe prej Të parapëlqyerve"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Më poshtë mund të shihni koleksionin tuaj. Po qe se doni t'i vendosni një nofkë koleksionit tuaj, të ngarkoni një ikonë, ose ndryshoni rregullime shtesë, ju lutem vizitoni faqen <a href='%1$s'>Administroni Koleksione</a>.</p><p>Koleksioni juaj ndodhet te vendi: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Tani koleksioni juaj është gati!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Rreth Këtij Koleksioni"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Shtesë në këtë Koleksion"
-msgstr[1] "%1$s Shtesa në këtë Koleksion"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Krijuar nga:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>U përditësua:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Po shtohet te Të parapëlqyerit&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Po hiqet prej Të parapëlqyerve&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Bëni hyrjen</a>, që të mund të shtoni këtë koleksion te të parapëlqyerit tuaj."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Administroni Koleksionin"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Datë Shtimi"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Emër"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popullaritet"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s shkarkim këtë javë"
-msgstr[1] "%1$s shkarkime këtë javë"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Shtesat e përzgjedhura do të hiqen pasi të klikoni Ruaje"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "Për të botuar shtesa të reja te ky koleksion, fillojani duke shtypur më poshtë emrat e tyre."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "Për të botuar shtesa të reja te ky koleksion, jepni më poshtë një listë ID-sh Shtesash të ndara me presje."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Një shtesë mund ta botoni po ashtu edhe nga faqja e saj normale."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "Shtuar më %1$s nga %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Shtoni koment botuesi"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Fshini koment botuesi"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Përpunoni koment botuesi"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Shënim: Komenti do të duket si i shkruajtur nga botuesi fillestar më datën e botimit fillestar"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Ruaje Komentin"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Hiqe"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Shtoje te Koleksioni"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Kontrolloni A Mund të Kihet"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Po, do të doja ta fshija këtë koleksion."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "I vini shenja kutizës, mandej klikoni te \"%1$s\" për ta fshirë këtë koleksion."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Me klikimin e \"%1$s\" më poshtë, koleksioni juaj do të fshihet. Po qe se nuk doni të fshihet koleksioni juaj, hiqeni shenjën nga kutiza e ripohimit te skeda \"%2$s\" dhe vazhdoni përpunimin e koleksionit tuaj. Po qe se ikni prej kësaj faqeje pa bërë ruajtje, koleksioni juaj prapë nuk do të fshihet."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Ju ndan një hap nga fshirja e koleksionit tuaj!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Duhet të jepni një përshkrim për koleksionin tuaj."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Pati një gabim gjatë ngarkimit të ikonës suaj."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Duhet t'i jepni një emër koleksionit tuaj."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Po qe se zgjidhni një nofkë, ajo duhet të jetë unike."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Emër shtese:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Zbatim i Përshoqëruar"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Përzgjidhni zbatimin që mbulon koleksioni juaj."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Lloj Koleksioni"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Fshije Koleksionin"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Fshirja e koleksionit tuaj do ta zhdukë atë përgjithmonë."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Përshkrim Koleksioni"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Përshkruani shkurtimisht koleksionin tuaj dhe llojin e shtesave në të"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Ikonë"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Mund të ngarkoni një ikonë JPG, GIF ose PNG, e cila do të ripërmasohet në 32x32 piksela."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Kush mund ta shohë koleksionin tuaj?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Si parazgjedhje, koleskionet shfaqen në Drejtorinë publike të Koleksioneve dhe mund t'i gjejë kushdo. Po qe se doni ta kufizoni parjen vetëm nga persona të cilëve u është dhënë një lidhje speciale, zgjidhni më poshtë atë mundësi."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Vetëm persona që i ftoj unë mund të shohin koleksionin tim"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Koleksionin tim në drejtori mund ta shohë cilido"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Kush mund ta administrojë koleksionin tim?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Këta përdorues mund të botojnë shtesa te koleksioni juaj, mund të administrojnë tërë shtesat dhe rregullimet, dhe të akordojnë leje për përdoruesa të tjerë."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Emër Koleksioni"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "Jepini koleksionit tuaj një emër përshkrues, si p.sh. \"Shtesat e Parapëlqyera nga Beni për Udhëtime\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Nofkë Koleksioni"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Po deshët, jepini koleksionit tuaj një nofkë unike për orientim më të shpejtë:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Cilët mund të botojnë shtesa te koleksioni juaj?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Këta përdoruesa mund të botojnë shtesa te koleksioni juaj dhe të heqin shtesat që kanë botuar ata vetë."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Jepni vendndodhjen e-mail të një llogarie Shtesa Firefox-i:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Llogaritë e përzgjedhura do të hiqen gjatë Ruajtjes"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Jepni një listë vendndodhjesh e-mail llogarish te Shtesa Firefox-i, të ndara me presje"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Vetëm unë"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Unë dhe këta përdoruesa:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Shtoni"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Administroni %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Administroni Lëndë Koleksionesh"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Shtesa e Tanishme:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Rregullime të Mëtejshme"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Administroni Leje Koleksioni"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Anuloje"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Fshije Ikonën"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Zëvendësoje Ikonën"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Ikona do të hiqet kur të klikohet \"%1$s\" më poshtë"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Nofkë e Mundshme"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Nofka juaj pat shenja të pavlefshme dhe u ndreq. Ju lutem riprovoni."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Nofkë e Përdorur"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Koleksioni juaj mund të shihet në këtë vend:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Koleksioni juaj u ruajt me sukses!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Përditësoni Koleksionin"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Fshije Koleksionin"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Shtesa"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Të mëtejshme"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Emër &amp; Hollësi"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Leje"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Mbani nën kontroll fëmijët dhe kalendarin tuaj"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Familje"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Hidhini një Sy Mbledhësit të Shtesave"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Krijoni një Koleksion"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Shko"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Nuk keni ndonjë koleksion të parapëlqyer.</strong></p> <p>Koleksionet që i shënoni si të parapëlqyer mund të shihen shpejt e shpejt prej kësaj faqeje, dhe do të duken te <a href='%1$s'>Mbedhësi i Shtesave</a> po qe e keni instaluar.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Nuk keni krijuar ende ndonjë koleksion. Është e lehtë të krijohen koleksionet dhe të mbushen me shtesat  tuaja të parapëlqyera.  <a href='%1$s'>Provojeni</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Koleksione"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Mbledhës Shtesash"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "krijuar nga %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Çfarë janë Koleksionet?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Renditi sipas"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Zgjedhjet e Redaktorit"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Të parapëlqyerit e Mij"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Koleksionet e Mia"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Popullore"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Më populloret e tërë kohërave"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Më populloret e këtij muaji"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Më të rejat"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Më populloret e kësaj jave"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Ka një mënyrë të re për të gjetur dhe administruar shtesa të pëlqyeshme. Komentoni, ndajini me të tjerët dhe njëkohësoni koleksionet tuaja, e tërë kjo nga shfletuesi."
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Koleksionet janë grupe shtesash që kanë lidhje me njëra-tjetrën të vëna tok për t'u ndarë më lehtë me të tjerë përdoruesa."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "U shtua %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Kërkoni \"online\" për gjithçka"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referencë"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Administroni rrjetin tuaj shoqëror"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Shoqërore"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Mbylle"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Ndodhi një gabim gjatë provës për shtim të një koleksioni të parapëlqyer. Mos është tashmë pjesë e koleksioneve të parapëlqyer?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Mos ma shfaq sërish këtë mesazh."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s u shtua te koleksionet tuaja të parapëlqyer."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Tani mund të hyni shpejt te ky koleksion përmes skedës <a href=\"%1$s\">%2$s</a> te drejtoria. Për një rrugë edhe më të kollajshme për të ndjekur koleksionet tuaja të parapëlqyera, provoni zgjerimin tonë <a href=\"%3$s\">Mbledhës Shtesash</a> për Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Koleksioni u fshi."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Planifikoni udhëtime pune dhe pushime të paharrueshme"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Udhëtime"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Vetëbotues"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Zgjedhja e Redaktorit"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Ndodhi një gabim gjatë provës për heqjen e një koleksioni të parapëlqyer. Mos nuk qe koleksion i parapëlqyer?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s u hoq nga koleksionet tuaja të parapëlqyer."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Krijoni \"site\"-in e përsosur web"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Zhvillim Web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Çfarë janë Koleksionet?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Lexoni FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Ka një rrugë të re për të administruar dhe gjetur shtesa të parapëlqyera. Komentoni, ndajini me të tjerët dhe njëkohësoni koleksionet, e tëra kjo prej shfletuesit tuaj."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Faqe Hyrëse e Mbledhësit të Shtesave"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Shkarkoni Mbledhësin e Shtesave:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Logo e Mbledhësit të Shtesave"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Qendra e Përputhshmërisë së Shtojcave"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
+#, fuzzy
 msgid "compatibility_dashboard_intro"
-msgstr "Të jini gati për hedhjen në qarkullim të %1$s me mjete dhe të dhëna për bashkësinë e Shtesave %2$s gjetur më poshtë."
+msgstr ""
+"Jini gati për hedhjen në qarkullim të %1$s me mjete dhe të dhëna për "
+"bashkësinë e Shtesave %2$s gjetur më poshtë."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Po ngarkohen të dhëna..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Mbrapsht te Kryesorja"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Raport Përputhshmërie Shtese"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Të dhëna për Zhvilluesa Shtese"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Rregulloni maxVersion pa e ngarkuar"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Kontrollo Gjendjen e Shtesave të Mia"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Nëse keni shtesa të strehuara te Shtesa Mozilla, <a href=\"%1$s\">ju lutem bëni hyrjen</a>, që të mund të analizoni gjendjen e shtesave tuaja për %2$s."
+msgstr ""
+"Nëse keni shtesa të strehuara te Shtesa Mozilla, <a href=\"%1$s\">ju lutem "
+"bëni hyrjen</a>, që të mund të analizoni gjendjen e shtesave tuaja për %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Shenja Dalluese e Qendrës Mozilla të Zhvilluesve"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Nuk keni ndonjë shtesë të strehuar te Shtesat Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Përfundime Kontrolli për Gjendje Shtojce"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "Po shihet gjendja e shtesave të strehuara..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s përdoruesa %2$s-i (%3$s&#37; gjithsej)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Shtesat e mëposhtme përbëjnë 95% të përdorimit të shtesave që di Mozilla dhe janë renditur sipas masës së përdorimit."
+msgstr ""
+"Shtesat e mëposhtme përbëjnë 95% të përdorimit të shtesave që di Mozilla dhe "
+"janë renditur sipas masës së përdorimit."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Shihni Raportin e Hollësishëm"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Nga %1$s shtesat që përbëjnë 95&#37; të përdorimit të shtesa që di Mozilla, <b>%2$s&#37;</b> konsiderohen si të përputhshme me versionet e fundit të %3$s-it."
+msgstr ""
+"Nga %1$s shtesat që përbëjnë 95&#37; të përdorimit të shtesa që di Mozilla, "
+"<b>%2$s&#37;</b> konsiderohen si të përputhshme me versionet e fundit të %3"
+"$s-it."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Versione Alfa"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Shtesa të përputhshme me një version alfa të %1$s-it"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Versione Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Shtesa të përputhshme me një version beta ose version kandidat të %1$s-it"
+msgstr ""
+"Shtesa të përputhshme me një version beta ose version kandidat të %1$s-it"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Version Më i Fundit"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Shtesa të përditësuara për montimet më të fundit të %1$s-it"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Versione të Tjera"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Shtesa të papërputhshme me ndonjë version të %1$s-it"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Raport Përputhshmërie Shtese"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Të dhëna për Përdoruesit e Shtesës"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Shihni Raport Përputhshmërie"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Për të dhëna se si të merrni pjesë, ju lutemi shihni %s tonë."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "faqe wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla dëshiron të falënderojë personat vijues për ndihmën e tyre te projekti addons.mozilla.org përgjatë vitesh:"
+msgstr ""
+"Mozilla dëshiron të falënderojë personat vijues për ndihmën e tyre te "
+"projekti addons.mozilla.org përgjatë vitesh:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Zhvilluesa"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Redaktorë"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Përkthyesa"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Pjesëmarrës të Tjerë"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Zhvilluesa të Dikurshëm"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Software dhe Pamje"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Disa ikona të përdorura janë prej <a href=\"http://www.famfamfam.com/lab/icons/silk/\">famfamfam Silk Icon Set</a>, licensuar sipas <a href=\"http://creativecommons.org/licenses/by/2.5/\">Licensës Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Disa ikona të përdorura janë prej <a href=\"http://www.famfamfam.com/lab/"
+"icons/silk/\">famfamfam Silk Icon Set</a>, licensuar sipas <a href=\"http://"
+"creativecommons.org/licenses/by/2.5/\">Licensës Creative Commons Attribution "
+"2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
-msgstr "Disa faqe përdorin elemente nga <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, të lejuar sipas një <a href=\"http://simile.mit.edu/license.html\">Lejeje BSD</a>."
+msgstr ""
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B, %Y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e %B, %Y, %I:%M %p"
@@ -2413,29 +1300,46 @@ msgstr "Pult Statistikash"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "Kartela %1$s ka zgjatim të pavlefshëm (%2$s). Zgjatime të lejuar: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "Kartela %s nuk mund të ruhej dot te baza e të dhënave. Ju lutem riprovoni."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Paraparja %1$s u zëvendësua me sukses me kartelën %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Kartela %s u ngarkua me sukses. Më poshtë mund të shtoni një përshkrim."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(vetë-zbulo)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Ky version i shtesës suaj nuk pretendon për përputhshmëri me Firefox %1$s. "
+"Mozilla pret që versioni i ardhshëm i Firefox-it të qarkullojë së shpejti, "
+"ndaj ju lutemi ta provoi shtesën tuaj me versionin e ri dhe të përditësoni "
+"të dhënat mbi përputhshmërinë. Rreth kësaj mund të mësoni më tepër <a href="
+"\"%2$s\">këtu</a>. Ky është vetëm një njoftim dhe mund të doni të vazhdoni "
+"me parashtrimin e këtij versioni te addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Hapet në një dritare të re"
@@ -2472,270 +1376,696 @@ msgstr "Hapi 5: Sukses"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Ndihmë për Parashtrim"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Shtesa u çaktivizua me sukses"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Përpunoni Shtesë"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Shtesa u aktivizua me sukses"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Përshkrim Shtese"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Faqe hyrëse e Shtesave"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Emër Shtese"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Foto Paraparjeje"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Bëje Aktive"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Rregulla Vetësie"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Përmbledhje Shtesash"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Email Asistence"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL Asistence"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Shënime Versioni"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Propozoni Shtesë"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Shtesë e propozuar me sukses!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Bëjeni shtesën tuaj aktive që të shfaqet në lista publike dhe aktivizoni shërbimin e kontrollit për përditësime."
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Plotësojeni Shtesën"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Plotësoni shtesën tuaj dhe kalojeni në Bankoprovë"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Bëje Joaktive"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Kalojeni shtesën tuaj joaktive që të mos duket në asnjë listë publike dhe çaktivizoni shërbimin e kontrollit për përditësime."
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Shpjere në Bankoprovë"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Shpjereni shtesën tuaj prapë te Bankoprova. Ky është veprim që mund të kthehet mbrapsht."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Propozojeni për Publike"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Propozojeni shtesën tuaj të bëhet Publike"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Bëje Publike"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Bëjeni shtesën tuaj sërish Publike"
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
-msgstr "Shtesa juaj është <span class=\"inactive-0\">Aktive</span>. Kjo do të thotë që shtesa juaj duket te tërë listat e passhme për gjendjen e saj si më sipër."
+msgstr ""
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Ju lutem përmbushni kriterin më sipër përpara se të plotësoni shtesën tuaj dhe kalojeni atë te <span class=\"status-1\">Bankoprova</span>."
+msgstr ""
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Tani mund të plotësoni shtesën tuaj dhe ta kaloni te <span class=\"status-1\">Bankoprova</span> duke klikuar butonin më poshtë."
+msgstr ""
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Të paktën u përzgjodh një kategori"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Lypset Përshkrim Shtese"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Lypset Emër Shtese"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Shtesa nuk ka shenjë si paraqarkullim."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Për zgjerimet dhe temat lypset e pakta një pamje paraparjej."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Lypset Përmbledhje Shtese"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Gjendje Shtese: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Veprime të Mundshme"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Gjendje Aktive: <span class=\"inactive-0\">Aktive</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Kriter Plotësimi Shtese"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Gjendje Aktive: <span class=\"inactive-1\">Joaktive</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Kriter Propozimi Publik"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Gjendje Besimi: <span class=\"status-4\">E besueshme</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
-msgstr "Shtesa juaj është <span class=\"inactive-1\">Joaktive</span>. Kjo do të thotë që shtesa juaj nuk do të shfaqet në ndonjë radhitje, pavarësisht nga gjendja më sipër. <b>Nuk</b> do t'i ofrohen përditësime përmesh shërbimit të kontrollit për përditësime."
+msgstr ""
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Ju lutem, plotësoni kriterin më sipër përpara se ta propozoni shtesën tuaj për ta bërë <span class=\"status-4\">Publike</span>."
+msgstr ""
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Tani mund ta propozoni shtesën tuaj për ta bërë <span class=\"status-4\">Publike</span> duke klikuar butonin më sipër."
+msgstr ""
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Publike"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Bankoprovë"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Shtesa juaj qe <span class=\"status-5\">Çaktivizuar</span> nga një administrator dhe nuk mund të përdoret. nëse keni ndonjë pyetje, dërgoni një e-mail te %s."
+msgstr ""
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Shtesa juaj hëpërhë është <span class=\"status-0\">E paplotë</span>. Kjo do të thotë që shtesa juaj nuk shfaqet në ndonjë vend të \"site\"-it ose te shërbimi i kontrollit për përditësime. Pasi ajo të plotësojë kriterin më poshtë, mund të ktheheni te kjo faqe për të plotësuar shtesën tuaj  dhe kaluar te <span class=\"status-1\">Bankoprova</span>."
+msgstr ""
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Shtesa juaj është e propozuar për t'u bërë <span class=\"status-4\">Publike</span> dhe është në pritje të shqyrtimit nga një redaktor. Hëpërhë ka %s shtesa të tjera në radhë për shqyrtim."
+msgstr ""
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
-msgstr "Shtesa juaj gjendet në radhë. Kjo nuk duhej të ndodhte. Ju lutem dërgoni te %s një e-mail me ID-në e shtesës suaj dhe deklaroni këtë gabim."
+msgstr ""
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
-msgstr "Shtesa juaj është <span class=\"status-4\">Publike</span>, që do të thotë se do të shfaqet te tërë listat dhe kërkimet, dhe se mund të shkarkohet pa kufizime. Për shtesën tuaj po jepen përditësime përmesh shërbimit të kontrollit për përditësime."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Shtesa juaj gjendet në <span class=\"status-1\">Bankoprovë</span>, që do të thotë se do të shfaqet në lista dhe kërkime, por përdoruesit duhet të bëjnë hyrje para se ta shkarkojnë. <b>Nuk</b> po ofrohen përditësime për të te shërbimi i kontrollit për përditësime."
+msgstr ""
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "Gjendje e %s"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
-msgstr "Shtesa juaj është e <span class=\"status-4\">Besuar</span>. Kjo do të thotë që mund të parashtroni përditësime për shtesën tuaj pa shqyrtim nga redaktorët."
+msgstr ""
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Vizitoni faqen %1$s për të bërë ndryshime te ajo çka keni parashtruar, ose %2"
+"$s për t'u rikthyer te Mjete për Zhvilluesat."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "klikoni këtu"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Përpunoni Shtesa"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Ky version është zëvendësuar te bankoprova ndërkohë që është në pritje të "
+"shqyrtimeve nga provuesa bankoprove dhe të një redaktori Shtesash Mozilla. "
+"Kur të ketë ndryshime, do të njoftoheni me e-mail."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr ""
+"Mund të lexoni më tepër rreth Sistemit të Shqyrtimeve të Bankoprovës %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "këtu"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Ky version është lënë në bankoprovë për përdorim nga përdoruesa të sprovuar. "
+"Që të mund të duket te \"site\"-i publik, duhet të %s shtesën tuaj dhe t'ia "
+"nënshtroni një procesi shqyrtimi."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "propozoni"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Parashtrimi i shtesës suaj u plotësua me sukses."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Ngaqë shtesa juaj është e besuar, ky version është miratuar vetvetiu për "
+"zonën publike."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Parashtroni Shtesë"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Shtesa u ngarkua me sukses"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Mund t'u pëlqejë të %s për të rritur interesin rreth shtesës suaj."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "ngarkoni një koment"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Nuk u gjet autor [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Hiq"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Anulo"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Jeni i sigurt se doni të anuloni parashtrimin tuaj?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Pasues"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Ndryshoni lloj shtese:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Komentent e Zhvilluesit u përditësuan."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Vepruese"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s hëpërhë %2$s dhe %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Ndryshojini Gjendjen"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Shtesa juaj është çaktivizuar nga një administrator dhe nuk mund të përdoret. Nëse keni ndonjë pyetje, dërgoni një email te %s."
+msgstr ""
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Gjendje Shtese: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Pult Zhvilluesi"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Mirë se vini te Pulti i Zhvilluesit"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Jovepruese"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Përpunuar së fundmi %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
-msgstr "Hëpërhë nuk keni ndonjë shtesë të strehuar te Shtesat Mozilla. Për të mësuar se funksionon procesi dhe për të parashtruar shtesën tuaj të parë, klikoni më poshtë te Fillojani."
+msgstr ""
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Filloni"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Versione dhe Kartela"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Ngarkoni një version të ri"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "Paraparja %s nuk mund të fshihet prej bazës së të dhënave. Ju lutem riprovoni."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "Paraparja %s u fshi me sukses."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "Nuk keni të drejta fshirjeje versionesh apo kartelash."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s kartelë %2$s"
-msgstr[1] "%1$s kartela %2$s "
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Shtoni Paraparje"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Autor"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Autorë"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Asnjë"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategori"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategori"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Përshkrim"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Çaktivizuar"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Hollësi"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Komente Zhvilluesi"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Paraparje"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versione"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Faqe Hyrëse"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Asnjë"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Pa foto"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Nuk u gjetën paraparje."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Përditësoje"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Email Asistence"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Nuk ka email asistence të dhënë nga zhvilluesi."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL Asistence"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Nuk ka url asistence të dhënë nga zhvilluesi."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "E besuar"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Nuk u gjetën versione."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Anuloje dhe kthehu mbrapsht"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Po, çaktivizoje"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Jeni i sigurt se doni të çaktivizoni këtë shtesë?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Çaktivizimi i kësaj shtese do ta fshehë atë nga kërkime dhe renditje. Nuk do "
+"të jetë e shkarkueshme nga site-t web dhe nuk do të figurojë gjatë "
+"kontrollesh përditësimi nga ana e klientëve. Faktikisht, shtesa do të "
+"fshihet, edhe pse do të jeni në gjendje të ktheheni këtu dhe ta riaktivizoni "
+"kur të keni dëshirë."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Çaktivizo %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Po, aktivizoje"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Jeni i sigurt se doni të aktivizohet kjo shtesë?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Aktivizimi i kësaj shtese do të bëjë që ajo të shfaqet edhe një herë në "
+"kërkime dhe renditje. Do të jetë e shkarkueshme si nga site-t web, ashtu "
+"edhe gjatë kontrollesh përditësimi nga ana e klientëve."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Aktivizo %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Shtoni Përgjigje"
@@ -2748,12 +2078,16 @@ msgstr "Përgjigje"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "Pati një gabim gjatë ruajtjes së përgjigjes suaj. Ju lutemi lidhuni me %1$s-n rreth kësaj çështjeje."
+msgstr ""
+"Pati një gabim gjatë ruajtjes së përgjigjes suaj. Ju lutemi lidhuni me %1$s-"
+"n rreth kësaj çështjeje."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "Një redaktor Shtesash Mozilla ka kërkuar më tepër të dhëna nga ju lidhur me versionin %2$s të shtesës suaj %1$s."
+msgstr ""
+"Një redaktor Shtesash Mozilla ka kërkuar më tepër të dhëna nga ju lidhur me "
+"versionin %2$s të shtesës suaj %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
@@ -2767,422 +2101,649 @@ msgstr "Parashtrojeni Përgjigjen"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "Përgjigja juaj u ruajt me sukses. Pjesëmarrësit e tjerë në diskutim do të njoftohen me email."
+msgstr ""
+"Përgjigja juaj u ruajt me sukses. Pjesëmarrësit e tjerë në diskutim do të "
+"njoftohen me email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "shkruajtur nga %1$s më %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Shtoni Autor"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Vendndodhje Email e Autorit"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Hiq"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Shtoni Autor të Ri"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Shtoni Autor"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Email-i i Llogarisë së Autorit:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Po kontrollohet email-i i llogarisë..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Klikoni butonin Përditëso Autorët më poshtë për ta ruajtur."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr " Autorët e Tanishëm"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Administroni Autorë Shtese"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Paraqite si autor në faqe publike"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Zhvillues</strong> - Mund të administrojë tërë anët e e procesit të paraqitjes së shtesës, me përjashtim të shtimit dhe heqjes së autorëve të tjerë."
+msgstr ""
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Pronar</strong> - Mund të administrojë tërë anët e e procesit të paraqitjes së shtesës, përfshi shtimin dhe heqjen e autorëve të tjerë."
+msgstr ""
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Parës</strong> - Mund të shorë lista dhe statistika zhvilluesish shtesash, por nuk mund të bëjë dot ndonjë ndryshim."
+msgstr ""
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Përzgjidhni rol për autorin:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Autor"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Në listë"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Rol"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Përditësoni autorët"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Përditësoni Kategoritë"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Shtesa ime nuk hyn në ndonjë nga kategoritë e mundshme."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "%s Kategori"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Administroni Kategori Shtese"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Kalojeni miun sipër një kategorie që të shihni përshkrimin për të."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Kategori %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "Nuk ka kategori për këtë lloj shtese dhe zbatimi."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "Vendoseni shtesën tuaj në këtë kategori vetëm nëse nuk hyn në ndonjë nga kategoritë e deritanishme."
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Përzgjidhni për shtesën tuaj deri në tre kategori %s-i"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Shtoni ose hiqni përdorues të cilët mund të administrojnë këtë shtesë."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Përzgjidhni kategoritë e afërta për secilin zbatim të mbuluar nga shtesa juaj."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "Shtoni dhe ndryshoni përkthime për përmbledhjen, përshkrimin, lejen e përdoruesit dhe rregullat e vetësisë të shtesës suaj."
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Ndryshoni emrin e shtesës suaj, faqen hyrëse për të, ikonën, dhe të tjerë elementë."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Përditësoni Përshkrime"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Ju lutem ndreqni gabimet e treguara më sipër me të kuqe."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Përpunoni Përshkrime Shtese"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Çfarëdo të dhënash që përdoruesit mund të duan të dinë dhe që s'janë domosdoshmërisht të përshtatshme për përmbledhjen apo përshkrimin e shtesës. Raste të rëndomtë përfshijnë paraqitje të metash të rëndësishme, të dhëna rreth se si të njoftohen të meta për të, datë paraprake e hedhjes në qarkullim të një versioni të ri, etj."
+msgstr ""
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Komente Zhvilluesi"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "Përshkrimi i shtesës suaj është një shpjegim pakëz më i shtjelluar i veçorive të saj, punimit, dhe të tjera të dhëna me rëndësi. Shfaqet nën përmbledhjen, te faqja e paraqitjes së shtesës."
+msgstr ""
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Përshkrim Shtese"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Nëse shtesa juaj ka një Marrëveshje Lejeje Përdoruesi (EULA), ju lutem jepeni tekstin e saj më poshtë. Po qe se më poshtë caktohet kështu, përdoruesve do t'u kërkohet të pajtohen me të, përpara se të mund të instalojnë shtesën tuaj. Ju lutem mbani shënim që kjo EULA nuk është njëlloj si lejet për kod, bie fjala  GPL apo MPL."
+msgstr ""
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Marrëveshje Leje Përdoruesi (EULA)"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Po qe se shtesa juaj ka rregulla vetësie, jepeni tekstin e tyre këtu. Faqja e paraqitjes së shtesës suaj do të shfaqë një lidhje për te rregullat."
+msgstr ""
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Rregulla Vetësie"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Përmbledhja është një shpjegim i shkurtër i funksioneve bazë të shtesës suaj e që shfaqet në lista kërkimi dhe shfletimi, si edhe në krye të faqes së paraqitjes së shtesës suaj. <strong>E shumta 250 gërma.</strong>"
+msgstr ""
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Përmbledhje Shtese"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Administroni Autorë Shtesash"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Administroni Kategori Shtesash"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Administroni Përshkrime Shtesash"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Administroni Veti Shtesash"
+msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Nuk ka kategori të mundshme për këtë lloj shtese."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Autorë"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Shtoni Ikonë"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Ndryshoni Ikonë"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Lejo përdoruesit të shohin kartelat burim \"online\""
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategori"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Vendore Parazgjedhje"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Kjo shtesë lyp \"software\" të jashtëm"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Pastro vetëm ikonën ekzistuese"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Kartelë Ikone të Re"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikonë"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Të Dhëna Shtesë për Vendoren"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Ky është paraqarkullim"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Kjo është një shtesë e lidhur me një \"site\" të caktuar"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Vendore Objektiv"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "të dhëna shtesë shkurt (si p.sh. emër dialekti vendor)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Përditësoni Vetitë"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Ndryshojeni vetëm nëse i kuptoni tërë pasojat."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Ikonë e Tanishme"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
-msgstr "Në këtë \"site\" web, të dhënat mbi shtesën tuaj shfaqen në vendoren parazgjedhje, po qe se nuk e anashkaloni me një përkthim në një vendore të dhënë."
+msgstr ""
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "Këta filtra përdoren për të filtruar dhe kategorizuar shtesat."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
-msgstr "GUID-ja e shtesës suaj caktohet te install.rdf-ja përkatëse dhe e identifikon atë në mënyrë unike. GUID-në nuk mund ta ndryshoni më dot pasi shtesa të jetë paraqitur te Shtesat Mozilla."
+msgstr ""
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Përpunoni Veti Shtese"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Lloj Shtese"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Rregullime Administratori"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Gjuhë Parazgjedhje"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Flamurka Shtese"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "GUID Shtese"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Ikonë Shtese"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Rregullime të Tjera"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Shtesë e Besuar?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Shihini Burimin \"Online\""
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
-msgstr "Ikona e një shtese është një pamje e vockël që shfaqet përbri emrit të shtesës suaj në përfundime kërkimi dhe shfletimi të tyre, faqe paraqitjeje, dhe te dialogu i instalimit të shtesës. Pamja do të ripërmasohet vetvetiu në 32 x 32 piksela.  Ju lutem përdorni një nga llojet vijuese të pamjeve: %s"
+msgstr ""
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Kjo shtesë përmban përbërësa dyorë"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Jo e Besuar"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "E besuar"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Ikonë e Re"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Hiqe Ikonën"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Po qe se shtesa juaj ka një tjetër faqe hyrëse, jepeni këtu  vendndodhjen e saj. Shtimi i përkthimeve të tjera nuk është i nevojshëm, po qe se \"site\"-i juaj web nuk është përkthyer në gjuhë të tjera."
+msgstr ""
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Faqe Hyrëse e Shtesës"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Emri i shtesës suaj shfaqet kudo ku paraqitet shtesa juaj."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Emër Shtese"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Po qe se keni një vendndodhje email për kërkesa asistence, jepeni këtu. Shtimi i përkthimeve të tjera nuk është i nevojshëm, po qe se nuk keni vendndodhje email të ndryshme për gjuhë të ndryshme."
+msgstr ""
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "Vendndodhje Email për Asistencë"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Po qe se shtesa juaj ka një \"site\" web ose forum asistence, jepini këtu  vendndodhjen e tyre. Shtimi i përkthimeve të tjera nuk është i nevojshëm, po qe se \"site\"-i juaj web nuk është përkthyer në gjuhë të tjera."
+msgstr ""
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Site Web Asistence"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "Shtesat e besuara mund të bëhen publike pa shqyrtim Redaktori."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Ikona do të fshihet me ruajtjen. <a %s>Të anulohet?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "Burimi i kartelave të shtesës suaj mund të shihet \"online\" nga cilido përdorues që ka bërë hyrjen, nëse doni."
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Lejo parje burimi \"online\""
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Mos lejo parje burimi \"online\""
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Përditësoni"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">emër i thjeshtë "
+"vendoreje</a>, si p.sh. 'sq-AL'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Autorë"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Kategori"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Ndryshoji Gjendjen"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Përshkrime"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Përpunoni Shtesën"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Version i Ri"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Veti"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Paraparje Fotosh Ekrani"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Pult Statistikash"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Versione dhe Kartela"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
 #, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Shihni Listën"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3215,14 +2776,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Përditësim në radhë (%s)"
 msgstr[1] "Përditësime në Radhë (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Kartelat me shenjë do të fshihen."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Kartela"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Zbatime Objektiv"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Pa kartela."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Shënime për Shqyrtyesat"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Përditëso"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Nuk keni hyrje tek kjo shtesë."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Përmbledhjet kufizohen deri në një maksimum 250 shenjash.\n"
+"(Dhatë %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Emri për shtesën tuaj gjendet tashmë në bazën e të dhënave. Ju lutem "
+"sigurohuni që: <br /><li>GUID-të tuaja përputhen. Shkaku më i zakonshëm për "
+"këtë gabim është mospërputhja e GUID-ëve.</li><li>Nuk keni dy herë të "
+"njëjtën gjë në bazën e të dhënave. Nëse e keni, duhet ta përditësoni ose ta "
+"fshini e të riprovoni.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3236,21 +2852,30 @@ msgstr "Ju lutem shihni %s për të dhëna."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "këtë faqe"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Shtesa juaj duhet të ketë të paktën një pronar."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Ju lutem përshkruani ndryshimet e bëra në këtë përditësim shtese."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "Ka tashmë një version të kësaj shtese. Për ta zëvendësuar, duhet së pari të fshini kartelën %1$s."
+msgstr ""
+"Ka tashmë një version të kësaj shtese. Për ta zëvendësuar, duhet së pari të "
+"fshini kartelën %1$s."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "Kjo prapashtesë kartele (%s) nuk lejohet për llojin e përzgjedhur të shtesës. Ju lutem përdorni një nga vijueset: %s"
+msgstr ""
+"Kjo prapashtesë kartele (%s) nuk lejohet për llojin e përzgjedhur të "
+"shtesës. Ju lutem përdorni një nga vijueset: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Jo tërë GUID-et e kartelës përputhen"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3282,9 +2907,19 @@ msgstr "Nuk u ngarkua kartelë"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Kjo prapashtesë kartele (%s) nuk lejohet për një ikonë. Ju lutem përdorni një nga vijueset: %s"
+msgstr ""
+"Kjo prapashtesë kartele (%s) nuk lejohet për një ikonë. Ju lutem përdorni "
+"një nga vijueset: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr ""
+"Ka tashmë një version identik (%s) për këtë shtesë dhe për këtë platformë."
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Pa install.rdf të pranishme."
 
@@ -3292,9 +2927,9 @@ msgstr "Pa install.rdf të pranishme."
 msgid "devcp_error_install_manifest"
 msgstr "U gjetën gabimet vijues te install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "Ju lutem përzgjidhni një lloj të vlefshëm shtese."
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3315,15 +2950,22 @@ msgstr "ID-ja e kësaj shtese është e pavlefshme: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%s nuk është version i vlefshëm për %s: versionet më të vegjël nuk mund të përmbajnë *"
+msgstr ""
+"%s nuk është version i vlefshëm për %s: versionet më të vegjël nuk mund të "
+"përmbajnë *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "Versioni i kësaj shtese është i pavlefshëm: ju lutem shihni <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">përcaktimet përkatëse</a>"
+msgstr ""
+"Versioni i kësaj shtese është i pavlefshëm: ju lutem shihni <a href=\"http://"
+"developer.mozilla.org/en/docs/Toolkit_version_format\">përcaktimet "
+"përkatëse</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "Versioni i kësaj shtese është i pavlefshëm: versionet nuk mund të përmbajnë hapësira."
+msgstr ""
+"Versioni i kësaj shtese është i pavlefshëm: versionet nuk mund të përmbajnë "
+"hapësira."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
@@ -3358,6 +3000,18 @@ msgstr "Nuk u gjet dot ID për këtë shtesë tek install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Nuk u përzgjodh platformë"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Duhet të jepni hollësitë e kërkuara për propozim."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Nuk mund të propozoni një shtesë paraqarkullim."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Mund të propozoni vetëm shtesa që për çastin gjenden në bankoprovë."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Ju lutem përzgjidhni të paktën një kategori."
@@ -3371,91 +3025,320 @@ msgstr "Duhet të ketë të paktën një autor për këtë shtesë."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Kjo prapashtesë kartelash (%s) nuk lejohet për paraparjet. Ju lutem përdorni një nga vijueset: %s"
+msgstr ""
+"Kjo prapashtesë kartelash (%s) nuk lejohet për paraparjet. Ju lutem përdorni "
+"një nga vijueset: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Ndodhi një gabim gjatë ruajtje së të dhënave tuaja."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Nuk keni leje të përditësoni këtë shtesë."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Shtesat nuk mund të përdorin Kyç të përditësuar. Ju lutem hiqeni atë prej install.rdf dhe riprovoni."
+msgstr ""
+"Shtesat nuk mund të përdorin Kyç të përditësuar. Ju lutem hiqeni atë prej "
+"install.rdf dhe riprovoni."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Shtesat nuk mund të përdorin një updateURL të jashtme. Ju lutem hiqeni këtë prej install.rdf dhe riprovoni."
+msgstr ""
+"Shtesat nuk mund të përdorin një updateURL të jashtme. Ju lutem hiqeni këtë "
+"prej install.rdf dhe riprovoni."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Ju lutem ngarkoni një kartelë."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Shtoni Kartelë për një Tjetër Platformë"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Shtoni Autor"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Hiq"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Kategoritë për llojin e ri të shtesës suaj do të jenë të dukshme në hapin "
+"pasues."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Nuk ka kategori të passhme për këtë lloj shtese."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Ju lutem jepni një përshkrim për shtesën tuaj."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Ju lutem jepni një emër për shtesën tuaj."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Ju lutem përzgjidhni llojin e shtesës që po parashtroni."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Ju lutem jepni një përmbledhje për shtesën tuaj."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Kartelë Shtese"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Kartelë Shtese 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Kartelë Shtese 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Lloj Shtese"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Lejo përdoruesit të shohin kartelat burim \"online\""
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Vendndodhje Email e Autorit"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Autorë"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategori"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Vendore Parazgjedhje"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Përshkrim"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Marrëveshje License Përdoruesi të Thjeshtë (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Kjo shtesë lyp \"software\" të jashtëm"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Kartela"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Faqe Hyrëse"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Kartelë Ikone"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Emër"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Platforma të Mbuluara"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Ky është paraqarkullim"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Rregulla Vetësie"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Kjo është një shtesë e lidhur me një \"site\" të dhënë"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Përmbledhje"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Email Asistence"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL Asistence"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Zbatime Objektiv"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Shënime Versioni"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Asnjë"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Shënime për Shqyrtuesin"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Ngaqë shtesa juaj është e besuar, ju lutem zgjidhni ku duhet të shkojë ky "
+"version:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publik"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Bankoprovë"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Marrëveshje Zhvilluesi"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Hapi 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Ngarkoni Kartele"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Hapi 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Hollësi Shtese"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Hapi 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Hollësi Versioni"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Hapi 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Përkthim"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Hapi 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Sukses"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Shtesat e Mia"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
 msgid "devcp_input_upload_file"
-msgstr "Ngarkoni Kartelë"
+msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Anuloje"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Ju lutem jepni llogarinë email të autorit që doni të shtohet."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Zbrite"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Ngjite"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Hiq Përputhshmëri Zbatimi"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Shfaqe si autor në lista publike"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Ju lutem përzgjidhni një leje."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Ju lutem jepni tekstin për lejen tuaj."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Zhvillues"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Pronar"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Parës"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Hiqe Autorin"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Jeni  <strong>i sigurt</strong> se doni të hiqet ky autor?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Duhet të përzgjidhni një kartelë për ngarkim."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Leje e përshtatur për shtesën %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3465,15 +3348,20 @@ msgstr "Pjesë të Përkthyera"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Disa prej pjesëve në këtë faqe janë përkthyer për t'u shfaqur në gjuhën amëtare të përdoruesit. Përzgjidhni më poshtë një vendore për të përpunuar në atë gjuhë hollësitë e shtesës suaj. Nëse përkthimi për një vendore nuk është ende gati, do të kalohet vetiu te vendorja e përzgjedhur si parazgjedhje (%s)."
+msgstr ""
+"Disa prej pjesëve në këtë faqe janë përkthyer për t'u shfaqur në gjuhën "
+"amëtare të përdoruesit. Përzgjidhni më poshtë një vendore për të përpunuar "
+"në atë gjuhë hollësitë e shtesës suaj. Nëse përkthimi për një vendore nuk "
+"është ende gati, do të kalohet vetiu te vendorja e përzgjedhur si "
+"parazgjedhje (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Mjete për Administratorë"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Mjete për Komentatorë"
 
@@ -3482,72 +3370,110 @@ msgid "devcp_myaddons_link"
 msgstr "Shtesat e Mia"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Prapa te Kryesorja"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Pult Statistikash"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Parashtroni Shtesë"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Mjete Zhvilluesi"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
-msgstr "Kjo ID shtese (%1$s) gjendet tashmë në bazën e të dhënave. Po qe se kjo është shtesë e juaja, mund të <a href=\"%2$s\">ngarkoni versionin e ri</a>."
+msgstr ""
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Anuloje dhe kthehu"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Kthehuni te hollësi shtese"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Propozoni %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "U zbulua vetvetiu lloji i shtesës: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
-msgstr "<span>Një ose më shumë prej ndryshimeve tuaja nuk u ruajtën dot.</span><br />Ju lutem shihni më poshtë për gabime. Pjesa tjetër e ndryshimeve tuaja u ruajt me sukses."
+msgstr ""
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Ndryshimet tuaja u ruajtën.</span><br />Ju lutem mbani parasysh që disa ndryshime mund të duan disa orë që të duken në të tëra zoant e \"site\"-it web."
+msgstr ""
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Heqja e kësaj si paraparje parazgjedhje do të bëjë që një tjetër paraparje të bëhet vetvetiu paraparja parazgjedhje."
+msgstr ""
+"Heqja e kësaj si paraparje parazgjedhje do të bëjë që një tjetër paraparje "
+"të bëhet vetvetiu paraparja parazgjedhje."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Vendorja parazgjedhje e kësaj shtese (%1$s [%2$s]) është e ndryshme nga "
+"vendodhja juaj e përzgjedhur (%3$s [%4$s]). Kutitë më poshtë duhen plotësuar "
+"në %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "Kalimi i kësaj si paraparje parazgjedhje do të heqë gjendjen parazgjedhje nga paraparja parazgjedhje e çastit."
+msgstr ""
+"Kalimi i kësaj si paraparje parazgjedhje do të heqë gjendjen parazgjedhje "
+"nga paraparja parazgjedhje e çastit."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Keni ndryshime të paruajtura."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3576,94 +3502,120 @@ msgstr "Përpunoni Paraparje"
 msgid "devcp_preview_updated_successfully"
 msgstr "Paraparja u ngarkua me sukses."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Shtoni një Tjetër Paraprje"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Fshije Paraparjen"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Zëvendësoje Paraparjen"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Përditësoje Paraparjen"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Shto Paraparje të Re"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
-msgstr "Përzgjidhni më poshtë një pamje për ngarkim. pamjet më të mëdhaja se 700 piksel të gjera dhe 525 piksel të larta do të ripërmasohen. Lloje të lejuar kartelash: %s"
+msgstr ""
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Për ta ngarkuar, klikoni më poshtë Përditëso Paraparje."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "Për ta ruajtur këtë pamje, klikoni më poshtë butonin Përditëso Paraparje. (<a %s>Të anulohet?</a>)"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "Kjo paraparje do të fshihet kur të klikohet Përditëso Paraparje më poshtë. (<a %s>Të anulohet?</a>)"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Përdorni formularin më poshtë për të ngarkuar një foto PNG, JPG, ose GIF të shtesës suaj. Pamje më të mëdhaja se 700 piksela gjerësi dhe 525 piksela lartësi do të ripërmasohen vetvetiu."
+msgstr ""
+"Përdorni formularin më poshtë për të ngarkuar një foto PNG, JPG, ose GIF të "
+"shtesës suaj. Pamje më të mëdhaja se 700 piksela gjerësi dhe 525 piksela "
+"lartësi do të ripërmasohen vetvetiu."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Shtoni Paraparje"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Përshkrim Paraparje"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Përpunoni Paraparje"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Paraparje Parazgjedhje"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
 msgstr "Kartelë Paraparje"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "Vendose këtë si pamje paraparjeje parazgjedhje"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Paraparje e re:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Ngarkoje Paraparjen: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "Një ose disa prej paraparjeve tuaja nuk u ruajt dot."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Paraparjet tuaja u përditësuan me sukses."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
-msgstr "Paraparjet për shtesën tuaj tregohen më poshtë. Në përshkrimet ose pamjet e mëposhtme mund të bëni ndryshime. Paraparja Parazgjedhje është paraparja që duket përbri shtesës suaj në përfundime kërkimesh dhe shfletimi."
+msgstr ""
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3681,30 +3633,53 @@ msgstr "Përpunoni Paraparje"
 msgid "devcp_previews_submit_upload"
 msgstr "Ngarkoni Paraparje"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Miniaturë"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "Përgjegjës Paraparjesh për %s"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "E pasaktë?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Jeni i sigurtë se doni të fshihet kjo kartelë?"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Ju lutem shqyrtoni dhe pranoni Marrëveshjen vijuese për Zhvilluesa përpara se të vazhdoni."
+msgstr ""
+"Ju lutem shqyrtoni dhe pranoni Marrëveshjen vijuese për Zhvilluesa përpara "
+"se të vazhdoni."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Nuk keni privilegje të mjaftueshme për të bërë ndryshime në këtë faqe.</span><br />Lidhuni me Pronarin e Shtesës, po qe se keni nevojë të bëni ndryshime."
+msgstr ""
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "Ju lutem kini parasysh që disa ndryshime duan disa orë që të shfaqen në tërë zonat e \"site\"-it web."
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Pult"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Anashkalo përditësimin e të dhënave të mia të tanishme për shtesën"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3728,536 +3703,763 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> Shkarkime të Përjavshme"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
-msgstr "Shënimi i kësaj shtese si aktive do të bëjë që të duket në zona publike të përshtatshme për gjendjen e saj, përfshi përfundime kërkimesh dhe shfletimi. Do të mund të shkarkohet nga \"site\"-i web dhe të tregohen për të përditësime kur kontrollohet për ta, në varësi të gjendjes së saj. Do të keni mundësinë të riktheheni këtu dhe ta çaktivizoni sipas dëshirës."
+msgstr ""
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Jeni i sigurt se doni ta shënoni këtë shtesë si aktive?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Jeni i sigurt?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
-msgstr "Shënimi i kësaj shtese si joaktive do të pengojë dukjen e saj në çfarëdo zone publike, përfshi përfundime kërkimesh dhe shfletimi. Nuk do të mund të shkarkohet nga \"site\"-i web dhe nuk do të tregohen për të përditësime kur kontrollohet për tillë. Do të keni mundësinë të riktheheni këtu dhe ta riaktivizoni sipas dëshirës."
+msgstr ""
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Jeni i sigurt se doni të shënohet kjo shtesë si joaktive?"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "Jo, anuloje"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "Kalimi i kësaj shtese si publike do ta bëjë të passhme si shkarkim prej cilitdo dhe përdoruesve ekzistues do t'u ofrohen përditësime të saj."
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Jeni i sigurt se doni ta bëni këtë shtesë publike?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
-msgstr "Kalimi i kësaj shtese në bankoprovë do të kërkojë që përdoruesit të bëjnë hyrjen përpara se të mundin ta shkarkojnë dhe për përdoruesit ekzistues nuk do të ofrohen më përditësime. Ngaqë shtesa juaj tani është publike, do të keni mundësinë të riktheheni këtu në çfarëdo kohe dhe ta bëni sërish publike."
+msgstr ""
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Jeni i sigurt se doni ta kaloni këtë shtesë te bankoprova?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Po, Jam i Sigurt"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Mesazhi i propozimit është i domosdoshëm.</span><br />Ju lutem, plotësoni kutinë e tekstit me të dhënat e nevojshme dhe riprovoni."
+msgstr ""
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Propozim Shtese"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Parashtrimi i shtesave është i çaktivizuar për çastin. Ju lutem hidhni një "
+"sy më vonë."
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Pranoj"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Nuk e Pranoj"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Kjo shtesë është çaktivizuar nga një administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Çaktivizuar"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "E besuar"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Versioni Më i Fundit:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Nuk keni ndonjë shtesë. Klikoni %s për të parashtruar një të tillë."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "këtu"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Ju lutem sigurohuni të %s për temën tuaj."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "ngarkoni një paraparje"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Përpunoni %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Ndihmë (nuk ikën prej faqes)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Ndihmë"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Gërma të përdorura: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Jeni i sigurt se doni ta fshini këtë përkthim?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Ç'janë këto %s skeda?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Po kur nuk kam ndonjë përkthim?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Fshihe Ndihmën"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
-msgstr "Po qe se një përdorues shfleton \"site\"-in dhe nuk ka përkthim në gjuhën e tij, do të përdoret Vendorja Parazgjedhje e shtesës suaj, e caktuar te zona Përpunoni Veti Shtese. Nëse nuk keni ndonjë përkthim, jepni ç'të mundni te Vendorja Parazgjedhje, që i bie të jetë gjuha që flisni."
+msgstr ""
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
-msgstr "Kjo është <i>Kutia e Përkthimit</i>. Ju lejon të përktheni një fushë të caktuar në çfarëdo gjuhe tjetër për të cilën ju mirëmbani një përkthim. Mund të shtoni, përpunoni, dhe hiqni përkthime duke përdorur skedat e vendores."
+msgstr ""
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Shtoni Përkthim"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Hiqe Përkthimin"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Shtoni Vendore te Tërë"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Shtoni Vendore"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Anuloje"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Fshije"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Përzgjidhni gjuhën e përkthimit për shtim:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "GUID-ja e shtesës e përdorur në këtë kartelë (%1$s) nuk përputhet me GUID-në ekzistuese për këtë shtesë (%2$s)."
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "Nuk kini privilegje të mjaftueshme për të përditësuar këtë shtesë."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "Versioni i treguar (%1$s) nuk gjendet për këtë shtesë (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Numri i versionit që ngarkuat (%1$s) gjendet tashmë për këtë shtesë. Po qe se po provoni të shtoni një tjetër kartelë te ky version, <a href=\"%2$s\">klikoni këtu</a>."
+msgstr ""
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "Numri i versionit që ngarkuat (%1$s) nuk përputhet me nurmin ekzistues të versionit (%2$s)."
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Fillojani"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Ngarkim kartele..."
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "E pranoj dhe vazhdo"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Përpuno Shtesën Time"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Do ta plotësoj shtesën time më vonë."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Shtoni Shënime Versioni"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
-msgstr "<p>Pjesëmarrja e shtesës suaj u krijua me sukses. Të dhënat bazë të fituara nga kartela që ngarkuat u ruajtën, por ka mjaft  gjëra të tjera që mund t'i përshtatni.</p><p>Shtesa suaj, hëpërhë, është shënuar si <strong>e Paplotë</strong>. Që ta plotësoni shtesën tuaj, lypset t'i vini një emër të saktë, një përmbledhje, dhe një përshkrim, si edhe t'i përzgjidhni të paktën një kategori. Duke klikuar lidhjen më poshtë mund të rregulloni të dhënat e shtesës dhe të shihni për gjendjen e shtesës suaj në cilëndo kohë te <a %s>faqja e gjendjes</a>."
-
-#: views/developers/uploader.thtml:143
+msgstr ""
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Ju lutem ndreqeni këtë problem dhe ngarkojeni kartelën tuaj sërish."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "Kartela juaj e re u shtua te versioni %1$s dhe hëpërhë është shënuar si %2$s."
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "U krijua Shtesa!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Oh! Duket se ka një problem me këtë kartelë..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Kartela u Shtua!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Si punon gjithë kjo?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "U krijua Versioni %s"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Ngarkoni Kartelën Tuaj"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
-msgstr "<p>Faleminderit për interesin që tregoni duke parashtruar shtesën tuaj te Shtesat Mozilla. Strehimi i shtesës suaj te Shtesat Mozilla është rruga më e lehtë për të trajtuar shpërndarjen e saj. Ja ç'përfitoni:</p><ul><li>Çdo shtesë ka faqen e vet publike për paraqitje, me të dhënat që jepni, të tilla si një përmbledhje e shkurtër e funksioneve të shtesës, një përshkrim opsional më të gjatë, dhe shfaqjen e një pamjeje prej shtesës suaj në punë e sipër.</li><li>Shtesa juaj do të duket në përfundime kërkimesh dhe shfletimi kudo në \"site\", dhe madje edhe te Përgjegjësi i Shtesave të Firefox 3-it.</li><li>Do të kujdesemi ne për tërë shkarkimet e saj dhe ofrimit të përditësimeve të vetvetishme te përdoruesit kur të ngarkoni një version të ri.</li><li>Do të keni hyrje në një pult statistikash me të dhëna të hollësishme rreth bazës së përdoruesve për të.</li></ul><p>Shtesat e strehuara te \"site\"-i duhet të shqyrtohen nga një Redaktor i Shtesave Mozilla përpara se të ofrohen tërë veçoritë e mësipërme. Po qe se jeni gati për fillimin e procesit dhe e keni paketimin e shtesës suaj gati për ngarkim, thjesht klikoni më poshtë te Fillojani!</p>"
-
-#: views/developers/uploader.thtml:125
+msgstr ""
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Platforma të Mbuluara:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Kartelë Shtese: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Tjetër"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
-msgstr "Kartela e re do të jetë e passhme për publikun sapo një redaktor ta shqyrtojë. Hëpërhë ka %1$s shtesa të tjera në radhë. Doni të shqyrtohet më shpejt? Shihni mundësinë të <a %2$s>bëheni një redaktor</a>."
+msgstr ""
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
-msgstr "Versioni i ri do të jetë i passhëm për publikun sapo një redaktor ta shqyrtojë. Hëpërhë ka %1$s shtesa të tjera në radhë. Doni të shqyrtohet më shpejt? Shihni mundësinë të <a %2$s>bëheni një redaktor</a>."
+msgstr ""
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "Versioni juaj i ri u krijua dhe hëpërhë është shënuar si %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
-msgstr "Shiheni kartelën tuaj të re te <a %1$s>faqja Versione dhe Kartela</a>, kontrolloni <a %2$s>gjendjen e tanishme</a> të shtesës suaj, ose <b>shtoni shënime versioni</b> duke klikuar butonin më poshtë (këshillohet me forcë)."
+msgstr ""
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
-msgstr "Shiheni versionin tuaj të ri te <a %1$s>faqja Versione dhe Kartela</a>, kontrolloni <a %2$s>gjendjen e tanishme</a> të shtesës suaj, ose <b>shtoni shënime versioni</b> duke klikuar butonin më poshtë (këshillohet me forcë)."
+msgstr ""
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
-msgstr "Ngarkojeni kartelën e shtesën suaj duke përdorur formularin më poshtë. Po qe se keni disa kartela, sipas platformave të caktuara, për ngarkim, zgjidhni një kartelë njëherë e mandej ngarkoni të tjerat duke përdorur Versione dhe Përgjegjësin e Kartelave."
+msgstr ""
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Të tëra"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Specifik:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Ju lutem Zgjidhni..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Shtoni Kartelë te %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Parashtroni Shtesë të Re"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Përditëso %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Ju lutem shihni %s për të dhëna."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "këtë faqe"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Nuk u gjet llogari për këtë vendndodhje email."
+msgstr "No account found for that email address."
+
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Përpunoni Version"
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Ose XML-ja është e mangët, ose nuk janë plotësuar kutiza të domosdoshme.  Ju lutem, <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">lexoni dokumentimin</a>, verifikoni shtesën tuaj, dhe riprovoni."
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versioni përditësua me sukses."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Anuloje"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Fshije Versionin"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Hiq Version Bosh"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Të hiqet?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Shtoni Version të Ri"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Anuloje"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Fshije Versionin"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Kjo do të fshijë gjithashtu:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s kartelë"
-msgstr[1] "%s kartela"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Të fshihet Versioni %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s shqyrtim"
-msgstr[1] "%s shqyrtime"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Jeni i sigurt se doni të fshihet përgjithmonë versioni %s?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Anuloje"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Fshije Kartelën"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Shto Zbatim të Ri"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Hiqe Zbatimin"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Shto Kartelë të Re"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
-msgstr "Rregullimi i të dhënave të zbatimit këtu do t'u lejojë përdoruesve të instalojnë shtesën tuaj edhe kur install.rdf te paketa tregon që ajo shtesë është e papërputhshme. <a %s>Listë zbatimesh që mbulohen</a>"
+msgstr ""
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "Jeni  <b>i sigurt</b> se dëshironi t'i hiqet përputhshmëria me këtë zbatim?"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Jeni  <b>i sigurt</b> se dëshironi të fshihet kjo kartelë përgjithmonë?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Të dhëna Miratimi"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Zbatime të Përputhshme"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Të dhëna Kartele"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Leje"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Administroni Versionin %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Shënime Miratimi"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Fshije Kartelën"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Kartela %1$s (%2$s) krijuar më %3$s dhe ndryshuar te %4$s më %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Ju lutem përzgjidhni lejen e duhur për shtesën tuaj. Kjo leje përcakton të drejtat që jepni mbi kodin tuaj burim."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Nuk u gjetën  kartela."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Të dhëna opsionale për Redaktorin që shqyrton këtë version."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Hiqi Përputhshmërinë me Zbatimin"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Ju lutem Përzgjidhni një Zbatim"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Kartelë"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Platformë"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Madhësi"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "Gjendje"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Të dhëna rreth ndryshimesh në këtë version, veçori të reja, të meta të njohura, dhe të tjera të dhëna të dobishme të lidhura me këtë version. Këto të dhëna do të mund të kihen gjithashtu nga përdoruesit që përditësojnë shtesën përmes ndërfaqes Përgjegjësi i Shtesave te Firefox 3-i."
+msgstr ""
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Shënime Versioni"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Keni ndryshime të paruajtura.</strong> Përputhshmëria nuk do të fshihet para se të klikoni më poshtë  Përditësoni Versionin."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Keni ndryshime të paruajtura.</strong> Kartelat nuk do të fshihen para se të klikoni më poshtë  Përditësoni Versionin."
+msgstr ""
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Përditësoni Versione"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Administroni Versione dhe Kartela"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "S'ka versione."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Versioni %s u fshi me sukses."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "Ky version nuk ka kartela të përshoqëruara me të dhe mund të hiqet. Do të donit ta hiqni këtë version?"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "U krijua"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "Gjendje"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Kjo shtesë është çaktivizuar"
 
@@ -4266,8 +4468,9 @@ msgid "editor_review_error_addon_not_nominated"
 msgstr "Kjo shtesë nuk është propuzuar."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Kjo kartelë nuk është në pritje të shqyrtimit."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
@@ -4301,8 +4504,7 @@ msgstr "Filtro"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtro sipas llojesh/veprimi"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Regjistër Ngjarjesh"
 
@@ -4364,7 +4566,7 @@ msgstr "Shfaq zëra nga %s deri më %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Nuk u gjetën shqyrtime për këtë periudhë."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Regjistër Shqyrtimesh"
 
@@ -4388,29 +4590,28 @@ msgstr "Veprimtari Redaktori së Fundmi"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Shqyrtime Gjithsej"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Shqyrtoni Shtesë"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Ju lutem plotësoni kutitë vijuese:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Ju lutem përzgjidhni të paktën një kartelë për shqyrtim."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Nuk lejohen shqyrtime nga vetja."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "\"Software\" i Jashtëm"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Shto karakteristikë"
 
@@ -4418,296 +4619,251 @@ msgstr "Shto karakteristikë"
 msgid "editors_featured_add_feature_submit"
 msgstr "Shto"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Dështova në shtim karakteristike."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Karakteristika u shtua me sukses."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Dështova në përpunim karakteristike."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Karakteristika u përpunua me sukses."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Një ose më tepër vendore janë të pavlefshme."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Dështova në heqjen e karakteristikës."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Karakteristika u hoq me sukses."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Shtesë e Trajtuar"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Shko"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Hiqe karakteristikën"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Radhë Filtrimi"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Lidhje të Dobishme"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Udhërrëfyes Redaktorësh"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Rregulla Shtese"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Këta filtra do të jenë në punë për këtë sesion ose derisa të shfuqizohen."
+msgstr ""
+"Këta filtra do të jenë në punë për këtë sesion ose derisa të shfuqizohen."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Hëpërhë nuk shtesa të këtij lloji për shqyrtim."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ditë"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 orë"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minutë"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Mjete Redaktorësh"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "vetëm %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Paraqarkullim"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Përputhje %s me"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Email Autori ose Shtese "
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Lloje Shtesash"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Zbatim"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Version Maksimum"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforma"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Kohë Parashtrimi (në ditë)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Përfundimet e kërkimit tuaj të filtruar: <strong>%1$s</strong> Shtesë"
-msgstr[1] "Përfundimet e kërkimit tuaj të filtruar: <strong>%1$s</strong> Shtesa"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Pastro"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtër"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "Radhët për shqyrtime hëpërhë janë të bllokuara. Rikthehuni më vonë."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Përpunojeni Objektin"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Historik Objekti"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Faqe Hyrëse e Objektit"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Përmbledhje e Objektit"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Paraparje"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Veprim për Shqyrtime"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Kërkoni Më Tepër të Dhëna"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Kaloje në Publik"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Kërko Super-Shqyrtim"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Mbaje në Bankoprovë"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Komente Shqyrtimi"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "Përdorni këtë formular për të kërkuar më tepër të dhëna prej autorit. Ai do të marrë një email dhe do të mundë të përgjigjet këtu. Do të njoftoheni me email kur të përgjigjet."
+msgstr ""
+"Përdorni këtë formular për të kërkuar më tepër të dhëna prej autorit. Ai do "
+"të marrë një email dhe do të mundë të përgjigjet këtu. Do të njoftoheni me "
+"email kur të përgjigjet."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Me këtë, shtesa dhe versioni më i fundit, së bashku me kartelat përkatëse, do të shfaqen si publike. Versione të ardhshme do të kalohen në bankoprovë derisa të jenë shqyrtuar nga një redaktor."
+msgstr ""
+"Me këtë, shtesa dhe versioni më i fundit, së bashku me kartelat përkatëse, "
+"do të shfaqen si publike. Versione të ardhshme do të kalohen në bankoprovë "
+"derisa të jenë shqyrtuar nga një redaktor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Kjo do ta mbajë shtesën në bankoprovë."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Kjo do të miratojë shfaqjen në pjesën publike të një versioni bankoprovë nga një shtese publike."
+msgstr ""
+"Kjo do të miratojë shfaqjen në pjesën publike të një versioni bankoprovë nga "
+"një shtese publike."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "Kjo do të bëjë që një version bankoprovë i një shtese publike të mbesë te bankoprova."
+msgstr ""
+"Kjo do të bëjë që një version bankoprovë i një shtese publike të mbesë te "
+"bankoprova."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Nëse keni shqetësime rreth sigurisë së kësaj shtese, problemesh me të drejtat e kopjimit, ose shqetësime të tjera të cilat duhet t'i shohë një administrator, jepini komentet tuaja në zonën më poshtë. Ato do t'u dërgohen administratorëve, jo autorit."
+msgstr ""
+"Nëse keni shqetësime rreth sigurisë së kësaj shtese, problemesh me të "
+"drejtat e kopjimit, ose shqetësime të tjera të cilat duhet t'i shohë një "
+"administrator, jepini komentet tuaja në zonën më poshtë. Ato do t'u dërgohen "
+"administratorëve, jo autorit."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Krahasoje me versionin publik"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Shihni Pëmbajtje"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Autorë:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategori:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Përputhshmëri:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Përshkrim"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Komente Zhvilluesish"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Kartela:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historik Objekti"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Mesazh Propozimi"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Paraparje"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Rregulla Vetësie"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Shqyrtoni %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Shënime për Shqyrtuesin"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Përmbledhje"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Shënime Versioni"
 
@@ -4735,7 +4891,7 @@ msgstr "Propozimi u Miratua/Publike"
 msgid "editors_review_history_nominated_denied"
 msgstr "Propozimi u Mohua/Bankoprovë"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Nuk u gjetën shqyrtime të mëparshme."
 
@@ -4762,87 +4918,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Shfaqi/Fshihi Përgjigjet (%1$s)"
 msgstr[1] "Shfaqi/Fshihi Përgjigjet (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Zbatime:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "ose përzgjidhni një përgjigje të konservuar:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Komente:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Sisteme Operativë:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Krye"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Shënim: Shqyrtoni më tepër se një kartelë vetëm po qe se keni provuar ÇDO kartelë që përzgjidhni."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "pasuesja &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Nuk u gjetën paraparje."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; e mëparshmja"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Radhë Shqyrtimi"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> nga %2$s në radhë"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "I <strong># %1$s</strong> te %2$s në radhë (filtruar)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Përpunoni Veprim"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Veprim"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Komente"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datë"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Shqyrtues"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Kartelë"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "Njoftomë herës tjetër që përditësohet kjo shtesë. (Përditësime të njëpasnjëshëm nuk do të shoqërohen me email)"
+msgstr ""
+"Njoftomë herës tjetër që përditësohet kjo shtesë. (Përditësime të "
+"njëpasnjëshëm nuk do të shoqërohen me email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Shqyrtimi u krye me sukses."
 
@@ -4866,7 +5014,7 @@ msgstr "Veprim"
 msgid "editors_reviews_in_reply_to"
 msgstr "Në përgjigje të:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Shqyrtimet u kryen me sukses."
 
@@ -4878,85 +5026,87 @@ msgstr "Nuk ka shqyrtime në pritje për miratim."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Përpunoni Shqyrtime"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Për një \"Site\" të Dhënë"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "I ri"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Përditësuar"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Zbatim i Provuar"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Sistem Operativ i Provuar"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Të dhëna Shtesë"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Shtesë"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Lloj"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Lloje Shtesash"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Mosha"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Zbatime"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Ta kufizoj te vendoret?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Kohë në Radhë"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Rend rritës"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforma"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Rend zbritës"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Lloje Parashtrimi"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ditë"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s orë"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuta"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Hyrje e Mohuar"
 
@@ -4964,41 +5114,34 @@ msgstr "Hyrje e Mohuar"
 msgid "error_access_denied_message"
 msgstr "Nuk jeni të autorizuar të shihni këtë faqe."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Ka tashmë një shtesë të tillë!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Shtesë që nuk gjendet!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Kjo shtesë nuk mund të shihet këtu."
 
@@ -5006,116 +5149,93 @@ msgstr "Kjo shtesë nuk mund të shihet këtu."
 msgid "error_addon_selfreview"
 msgstr "Nuk mund shqyrtoni shtesën tuaj."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Nuk ka shtesa në këtë kategori!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Nuk u gjet prurje RSS për shtesën."
+msgstr ""
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Kjo nuk është një vendndodhje email e vlefshme."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Kjo fushë nuk mund të lihet bosh."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Nuk u gjet kartelë!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Gabim kartele: %s nuk ekziston."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Ka gabime në këtë formular. Ju lutem ndreqini dhe riparashtrojeni."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha e pavlefshme, ju lutem riprovoni!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "Kjo URL ka format të pavlefshëm. URL-të e vlefshme kanë pamje si kjo http://shembull.com/faqja_ime."
+msgstr ""
+"Kjo URL ka format të pavlefshëm. URL-të e vlefshme kanë pamje si kjo http://"
+"shembull.com/faqja_ime."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Mungon një argument: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Pa Kartela"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Shënim"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Nuk u gjet paraparje!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Duhet të përzgjidhni një vlerësim."
 
@@ -5123,94 +5243,80 @@ msgstr "Duhet të përzgjidhni një vlerësim."
 msgid "error_user_already_confirmed"
 msgstr "Kjo llogari përdoruesi është njohur tashmë."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Kod i pavlefshëm ripohimi!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Fjalëkalimet nuk u përputhën."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Kjo vendndodhje email është zënë tashmë nga një tjetër përdorues."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Ndryshimi i email-it ka skaduar. Ju lutem ndryshoni sërish vendndodhjen tuaj email te profili juaj i përdoruesit dhe mandej klikoni lidhjen te email-i i ripohimit sapo ta merrni."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Përdoruesit mund të kenë vetëm një rol në herë.  Ju lutem hiqini përdoruesit çfarëdo roli tjetër përpara se të vazhdoni."
+msgstr ""
+"Ndryshimi i email-it ka skaduar. Ju lutem ndryshoni sërish vendndodhjen tuaj "
+"email te profili juaj i përdoruesit dhe mandej klikoni lidhjen te email-i i "
+"ripohimit sapo ta merrni."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Kjo nofkë është e zënë tashmë."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Nuk u gjet përdorues!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Ju lutem, fillimisht ripohoni llogarinë tuaj të përdoruesit me kodin që morët me email."
+msgstr ""
+"Ju lutem, fillimisht ripohoni llogarinë tuaj të përdoruesit me kodin që "
+"morët me email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Emër përdoruesi ose fjalëkalim gabim!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Nuk u gjet version!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "U dha fjalëkalim i gabuar!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Mësoni më tepër"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Mësoni më tepër rreth %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s shqyrtim"
 msgstr[1] "%1$s shqyrtime"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Shihni më tepër prej"
 
@@ -5250,144 +5356,133 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Rreth"
+msgstr "About"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Pyetje të Bëra Shpesh"
+msgstr "Frequently Asked Questions"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
 msgstr "Tërë të drejtat të rezervuara."
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Të drejta Kopjimi"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Kredite"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla lidhjet për te këto zbatime i jep për mirësjellje, dhe nuk merr përsipër përfaqësime që kanë të bëjnë me zbatimet apo çfarëdo të dhëne të lidhur me to. Çfarëdo pyetjeje, ankese apo pretendimi lidhur me zbatimet duhet shpënë te shitësi përkatës i \"software\"-it."
+msgstr ""
+"Mozilla lidhjet për te këto zbatime i jep për mirësjellje, dhe nuk merr "
+"përsipër përfaqësime që kanë të bëjnë me zbatimet apo çfarëdo të dhëne të "
+"lidhur me to. Çfarëdo pyetjeje, ankese apo pretendimi lidhur me zbatimet "
+"duhet shpënë te shitësi përkatës i \"software\"-it."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Shko"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
 msgstr "Shënime Ligjore"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Gjuhë të tjera:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Rregulla Vetësie"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Ruaj"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Fjalor"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Fjalorë"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Zgjerim"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Zgjerime"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Paketë Gjuhësore (Shtesë)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Paketa Gjuhësore (Shtesë)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Paketë Gjuhësore (Zbatim)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Paketa Gjuhësore (Zbatim)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Shtojcë"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Shtojca"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Motor Kërkimi"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Motorë Kërkimesh"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Temë"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Tema"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Tërë Vendoret"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Kthehuni te faqja hyrëse e Shtesave %1$s"
@@ -5396,81 +5491,37 @@ msgstr "Kthehuni te faqja hyrëse e Shtesave %1$s"
 msgid "header_main_firefox_header"
 msgstr "Shtesa Firefox-i"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Shtesa <em>për</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Shtesa"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Shtesa <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Shtesa Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Shtesa <em>për</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Shtesa Sunbird-i"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Shtesa <em>për</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Shtesa Thunderbird-i"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Shtesa <em>për</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Kalo te menuja e zbatimeve të tjera"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Kalo te menuja e kategorive"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Kalo te lënda bazë"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Kalo te formular kërkimesh"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Shtesa"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Hyni"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Dilni"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Llogaria Ime"
 
@@ -5478,23 +5529,11 @@ msgstr "Llogaria Ime"
 msgid "header_navlink_register"
 msgstr "Regjistrohuni"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Regjistrohuni</a> ose <a href=\"%2$s\">Hyni</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Mjete"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5502,51 +5541,35 @@ msgstr "Paraparje Pamjeje për %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Hyni</a> që të instaloni këtë shtesë"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Lermë ta instaloj këtë shtesë eksperimentale. <a href=\"%1$s\">Ç'është kjo?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Shtoje te %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Shto %1$s te %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Shkarko %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Kjo shtesë nuk është e vlefshme."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Listë paketash gjuhësore dhe fjalorësh."
 
@@ -5558,9 +5581,8 @@ msgstr "Shkarkoni Fjalor"
 msgid "langtools_download_langpack"
 msgstr "Shkarkoni Paketë Gjuhësore"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Fjalorë dhe Paketa Gjuhësore"
 
@@ -5572,77 +5594,39 @@ msgstr "Instalo Fjalor"
 msgid "langtools_install_langpack"
 msgstr "Instalo Paketë Gjuhësore"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Fjalor"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Paketë Gjuhësore"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Gjuhë"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Leje e Përshtatur"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Leje BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Leje e Përgjithshme Publike GNU, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Leje e Përgjithshme Publike GNU, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Leje e Përgjithshme Publike Më e Pakët GNU, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Leje e Përgjithshme Publike Më e Pakët GNU, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Leje MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Leje Publike Mozilla, version 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klikoni këtu për t'u kthyer te faqja hyrëse."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Datë"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Shkarkime"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Emër Shtese"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
-msgstr "Vlerësimi"
+msgstr "Vlerësimit"
 
 #: config/bootstrap.php:278
 msgid "main_prettyname_fennec"
@@ -5664,21 +5648,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Fjalorë & Paketa Gjuhësore"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Shtojca"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Tema"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Gjej shtesa për zbatime të tjera"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "të tjera"
 
@@ -5686,29 +5676,12 @@ msgstr "të tjera"
 msgid "page_title_appversions"
 msgstr "Versione Zbatimesh"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Mbledhës Shtesash"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ rreth Mbledhësit të Shtesave"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Veçori të Mbledhësit të Shtesave"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Mirë se vini te Mbledhësi i Shtesave"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Kredite"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ për Zhvilluesit"
+msgid "page_title_experimental_addons"
+msgstr "Shtesa Eksperimentale"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5738,36 +5711,43 @@ msgstr "Sistemi Bankoprovë i Shqyrtimeve"
 msgid "page_title_submissionhelp"
 msgstr "Ndihmë për Parashtrime"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Versione të Vlefshëm Zbatimi"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Shtesat e parashtruara te Shtesat Mozilla duhet të kenë një kartelë install.rdf me mbulim për të paktën një nga zbatimet më poshtë. Janë të lejuar vetëm versionet e radhitur më poshtë për këta zbatime."
+msgstr ""
+"Shtesat e parashtruara te Shtesat Mozilla duhet të kenë një kartelë install."
+"rdf me mbulim për të paktën një nga zbatimet më poshtë. Janë të lejuar vetëm "
+"versionet e radhitur më poshtë për këta zbatime."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Nëse zbatimi juaj i mbuluar nuk kërkon një kartelë install.rdf file, prapë mund të përfshini një me vetitë e nevojshme siç tregohet nga %s."
+msgstr ""
+"Nëse zbatimi juaj i mbuluar nuk kërkon një kartelë install.rdf file, prapë "
+"mund të përfshini një me vetitë e nevojshme siç tregohet nga %s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "këtu"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versione"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Mbrapsht te faqja e mëparshme"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Faqe të Dhënash Bankoprove"
 
@@ -5775,13 +5755,21 @@ msgstr "Faqe të Dhënash Bankoprove"
 msgid "pagination_next_page"
 msgstr "pasues"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Kjo është faqja %1$s e %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "i mëparshëm"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Ju lutem jepni më poshtë <strong>që të dyja fjalët</strong>, <strong>të ndara nga një hapësirë</strong>."
+msgstr ""
+"Ju lutem jepni më poshtë <strong>që të dyja fjalët</strong>, <strong>të "
+"ndara nga një hapësirë</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5795,23 +5783,27 @@ msgstr "Ju lutem, shtypni këtu atë çka dëgjoni."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Nëse është e zorshme të kuptohet, mundeni të <a href=\"%1$s\">dëgjoni diçka tjetër</a> ose <a href=\"%2$s\">të kaloni sërish te teksti</a>."
+msgstr ""
+"Nëse është e zorshme të kuptohet, mundeni të <a href=\"%1$s\">dëgjoni diçka "
+"tjetër</a> ose <a href=\"%2$s\">të kaloni sërish te teksti</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Nëse është e zorshme të kuptohet, mundeni të <a href=\"%1$s\">provoni fjalë të ndryshme</a> ose <a href=\"%2$s\">të dëgjoni diçka tjetër</a>."
+msgstr ""
+"Nëse është e zorshme të kuptohet, mundeni të <a href=\"%1$s\">provoni fjalë "
+"të ndryshme</a> ose <a href=\"%2$s\">të dëgjoni diçka tjetër</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Jeni qenie njerëzore?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Ç'është kjo?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Gabim në flamurëzimin e këtij shqyrtimi!"
 
@@ -5819,8 +5811,7 @@ msgstr "Gabim në flamurëzimin e këtij shqyrtimi!"
 msgid "review_flag_reason_bug_support"
 msgstr "Njoftim të metash apo kërkesë për asistencë jo në vendin e duhur"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Njoftojeni këtë shqyrtim (përzgjidhni një arsye)"
 
@@ -5836,9 +5827,8 @@ msgstr "Tjetër (ju lutem jepeni hollësisht)"
 msgid "review_flag_reason_spam"
 msgstr "Spam ose përndryshe lëndë jo nga shqyrtime"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Faleminderit; ky shqyrtim u flamurëzua për miratim nga botuesi."
 
@@ -5848,155 +5838,134 @@ msgstr "Njoftoni mbi këtë shqyrtim"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "A është ky shqyrtim i papërshtatshëm, i pasaktë apo spam? Klikoni këtu që të flamurëzohet për shqyrtim nga botuesi."
+msgstr ""
+"A është ky shqyrtim i papërshtatshëm, i pasaktë apo spam? Klikoni këtu që të "
+"flamurëzohet për shqyrtim nga botuesi."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Mbani parasysh këto ndihmëza:</p><ul><li>Shkruani si t'i tregonit një shoku rreth përshtypjeve nga shtesa.  Jepni hollësi të veçanta dhe të dobishme, të tilla si cilat veçori ju pëlqyen dhe/ose nuk ju pëlqyen, sa i kollajtë qe përdorimi, dhe çfarëdo mangësie që ka.  Shmangni gjuhën e përgjithshme si, fjala vjen, etiketimet si \"E shkëlqyeshme\" ose \"E keqe\", në rast se nuk keni arsye pse besoni të jetë kështu.</li><li>Ju lutem mos postoni në shqyrtime njoftime të metash. Nuk ua japim vendndodhjet tuaja email zhvilluesve të shtesave e këta mund të kenë nevojë të lidhen me ju për të zgjidhur problemin tuaj. Shihni <a href=\"%1$s\">ndarjen rreth asistencës</a> për të mësuar nga të kihet asistencë për këtë shtesë.</li><li>Ju lutem mbajini shqyrtimet pastër, shmangni përdorimin e papërshtatshëm të gjuhës dhe mos postoni të dhëna vetjake.</li></ul><p>Ju lutem, për më tepër hollësi rreth shqyrtimesh përdoruesi shtese, lexoni <a href=\"%2$s\">Udhëzuesa Shqyrtimesh</a>.</p>"
+msgstr ""
+"<p>Mbani parasysh këto ndihmëza:</p><ul><li>Shkruani si t'i tregonit një "
+"shoku rreth përshtypjeve nga shtesa.  Jepni hollësi të veçanta dhe të "
+"dobishme, të tilla si cilat veçori ju pëlqyen dhe/ose nuk ju pëlqyen, sa i "
+"kollajtë qe përdorimi, dhe çfarëdo mangësie që ka.  Shmangni gjuhën e "
+"përgjithshme si, fjala vjen, etiketimet si \"E shkëlqyeshme\" ose \"E keqe"
+"\", në rast se nuk keni arsye pse besoni të jetë kështu.</li><li>Ju lutem "
+"mos postoni në shqyrtime njoftime të metash. Nuk ua japim vendndodhjet tuaja "
+"email zhvilluesve të shtesave e këta mund të kenë nevojë të lidhen me ju për "
+"të zgjidhur problemin tuaj. Shihni <a href=\"%1$s\">ndarjen rreth "
+"asistencës</a> për të mësuar nga të kihet asistencë për këtë shtesë.</"
+"li><li>Ju lutem mbajini shqyrtimet pastër, shmangni përdorimin e "
+"papërshtatshëm të gjuhës dhe mos postoni të dhëna vetjake.</li></ul><p>Ju "
+"lutem, për më tepër hollësi rreth shqyrtimesh përdoruesi shtese, lexoni <a "
+"href=\"%2$s\">Udhëzuesa Shqyrtimesh</a>.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Shqyrtime %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Shtesa të Trajtuara"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Shtesat më të Reja"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Shtesa Popullore"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Shtesa të Përditësuara"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Kërkoni"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Përfundime Kërkimi Koleksionesh"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Përfundime Kërkimi Koleksionesh"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Kërkimi është i çaktivizuar hëpërhë. Ju lutem riprovoni më vonë."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "tërë shtesat"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "tërë koleksionet"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "kërkoni për shtesa"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "kërko për koleksione"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Kërkoni për shtesa"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klikoni për të dhënë terma kërkimi"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "te"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Tërë Motorët e Kërkimeve"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Shfletoni Motorë Kërkimesh"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s shtesë me përputhje"
+msgstr[1] "%s shtesa me përputhje"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Nuk u gjetën përfundime."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Kërkoni në Shtesa"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Prurje për përfundime kërkimi"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Përfundime kërkimi për: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Mjete Admin"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Mjete Zhvilluesi"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Mjete Përpunuesi"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Mirësevini"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Mirësevini, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Fjalor"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Shtesa të Trajtuara"
 
@@ -6004,7 +5973,7 @@ msgstr "Shtesa të Trajtuara"
 msgid "sidebar_pitch_looking_for"
 msgstr "Po kërkoj për:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Shtesat Më Të Reja"
 
@@ -6012,34 +5981,31 @@ msgstr "Shtesat Më Të Reja"
 msgid "sidebar_pitch_search"
 msgstr "Shtojcë Kërkimesh"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Pajtohuni te"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "Temë"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Shtesa të Përditësuara"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ende e pavlerësuar"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6059,35 +6025,31 @@ msgstr "Këmbe Shtesën"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e %b."
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e %b. %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e %b."
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s të krijuara"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s të hedhura në qarkullim"
@@ -6100,198 +6062,206 @@ msgstr "Mbylle"
 msgid "statistics_help_link"
 msgstr "Ndihmë"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "ose, përzgjidhni një shtesë tjetër"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "ose, përzgjidhni një shtesë me statistika publike"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Përzgjidhni një nga shtesat tuaja për të parë statistikat rreth saj"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Përzgjidhni shtesë për të parë statistikat rreth saj"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Përzgjidhni shtesë me statistika publike"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Pult Statistikash"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Shihni Statistika"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Shiheni këtë tabelë në formatin CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "asnjë"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Hiqe këtë kurbë"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Grupoji sipas: Ditësh"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Grupoji sipas: Muajsh"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Grupoji sipas: Javësh"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Krahasoji sipas: Javësh"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "U gjetën %s te intervali"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Shtoni Kurbë"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Shtoni një tjetër kurbë në këtë grafik"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Shfaqe Numërimin për Gjithsej"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Fshihe Numërimin për Gjithsej"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Hidhe në këtë grafik numërimin për gjithsej"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Shihni të Dhëna (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Merrni një kartelë \"Comma Separated Values\" të këtyre të dhënave"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Fshih Ngjarje %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Shfaq Ngjarje %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Mbivendosja kurbave datat e qarkullimi të shtesës"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Fshih Ngjarje Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Shfaq Ngjarje Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Mbivendosja kurbave datat e qarkullimi të Firefox-it"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Tkurre Grafikun"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Zgjeroje Grafikun"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ripërmaso grafikun"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Përdoruesa të Përditshëm Aktivë"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Zbatim"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Vetjak"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Shkarkime"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Sistem Operativ"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Gjendje Shtese"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Përmbledhje"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Version Shtese"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Zbatim"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Sistem Operativ"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Gjendje Shtese"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "E panjohur"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Version Shtese"
 
 #: views/statistics/addon.thtml:118
 msgid "statistics_notice_data_insufficient"
-msgstr "Ende nuk ka të dhëna të mjafta për shfaqjen e këtij grafiku. Ju lutem kontrolloni sërish më vonë."
+msgstr ""
+"Ende nuk ka të dhëna të mjafta për shfaqjen e këtij grafiku. Ju lutem "
+"kontrolloni sërish më vonë."
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "Ende s'kemi ndonjë të dhënë për shtesën tuaj. Ju lutem kontrolloni sërish pas pak ditësh."
+msgstr ""
+"Ende s'kemi ndonjë të dhënë për shtesën tuaj. Ju lutem kontrolloni sërish "
+"pas pak ditësh."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Hëpërhë statistikat e shtesës janë duke u përditësuar. Të dhënat më të fundit mund të mos jenë të plota, ngaqë programet tona ende janë në punë e sipër për përditësimin e tyre. Ju lutem kontrolloni sërish pas pak minutash."
+msgstr ""
+"Hëpërhë statistikat e shtesës janë duke u përditësuar. Të dhënat më të "
+"fundit mund të mos jenë të plota, ngaqë programet tona ende janë në punë e "
+"sipër për përditësimin e tyre. Ju lutem kontrolloni sërish pas pak minutash."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
-msgstr "Pulti i Statistikave hëpërhë është i çaktivizuar. Ju lutem kontrolloni prapë më vonë."
+msgstr ""
+"Pulti i Statistikave hëpërhë është i çaktivizuar. Ju lutem kontrolloni prapë "
+"më vonë."
 
 #: views/statistics/addon.thtml:123
 msgid "statistics_notice_nojavascript"
@@ -6304,7 +6274,7 @@ msgstr "Rregullimet tuaja u përditësuan!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Pult Statistikash"
 
@@ -6332,103 +6302,109 @@ msgstr "Zvogëloje"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zvogëloje me një muaj"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Përmbledhje e përditshme e statistikave për %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "Prurje RSS për të dhënat e përmbledhjes"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e %B %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistika për %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Si parazgjedhje, vetëm ju dhe Mozilla mund të hyjë në të dhënat te pulti juaj. Mund edhe ta hapni për publikun, që kështu cilido të mund të shohë të dhënat tuaja për shtesat."
+msgstr ""
+"Si parazgjedhje, vetëm ju dhe Mozilla mund të hyjë në të dhënat te pulti "
+"juaj. Mund edhe ta hapni për publikun, që kështu cilido të mund të shohë të "
+"dhënat tuaja për shtesat."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Hyrje në Pult"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Vetjake"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Vetëm ju dhe Mozilla mund të shohin statistikat e kësaj shtese"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Publike"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Statistikat e kësaj shtese mund t'i shohë kushdo"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ndryshoni Rregullimet"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Ju lutem trajtojini këto të dhëna si të rezervuara."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Ky pult, hëpërhë, është <b>vetjak</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Ky pult, për çastin, është <b>publik</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Kyçur"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Kthehu te Pulti"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Ruaji Rregullimet"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Rregullime Pulti Statistikash për %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Çkyçur"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Zbt"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Gjn"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Pnj"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Shkarkime të Përditshme Mesatarisht"
 
@@ -6436,46 +6412,37 @@ msgstr "Shkarkime të Përditshme Mesatarisht"
 msgid "statistics_summary_downloads_heading"
 msgstr "Shkarkime"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Numërimi i Ditës së Fundit"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Shkarkime gjatë 7 ditëve të fundit"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Shkarkime Gjithsej"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Që prej %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Ende pa të dhëna"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Përdoruesa Aktivë të Përditshëm Mesatarisht"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Ndryshimi me numërimin e mëparshëm"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s më %2$s"
@@ -6484,144 +6451,149 @@ msgstr "%1$s më %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Përdoruesa Aktivë të Përditshëm"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Përdoruesa Aktivë të Përditshëm"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Më %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Mesatare Ditore Përdoruesish këtë Javë"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s që nga java e fundit"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Statistika %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Tërë Temat"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Shfletoni Tema"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Ndryshoni Vendndodhje Email"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Ndryshoni fjalëkalimin"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Ndryshoni Fjalëkalimin ose Email-in"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "U ridërgua kodi i ripohimit!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Llogaria juaj si përdoruesi %1$s u fshi me sukses. Nëse doni të ktheheni ndonjëherë, mund të riregjistroheni te <a href=\"%2$s\">faqja e regjistrimeve të përdoruesve</a>."
+msgstr ""
+"Llogaria juaj si përdoruesi %1$s u fshi me sukses. Nëse doni të ktheheni "
+"ndonjëherë, mund të riregjistroheni te <a href=\"%2$s\">faqja e "
+"regjistrimeve të përdoruesve</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Bashkësia e Shtesave Mozilla trishtohet nga largimi juaj."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Ripohoni Fjalëkalimin"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Fshije tani llogarinë time si përdorues"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Nuk mund ta fshini llogarinë tuaj, po qe se radhiteni mes <a href=\"%1$s\">autorëve të ndonjë shtese</a>. Për të fshirë llogarinë tuaj, ju lutem i kërkoni një personi tjetër nga grupi juaj i zhvillimeve t'ju fshijë nga lista e autorëve për shtesën tuaj. Më pas, do të jeni në gjendje të fshini llogarinë tuaj këtu."
+msgstr ""
+"Nuk mund ta fshini llogarinë tuaj, po qe se radhiteni mes <a href=\"%1$s"
+"\">autorëve të ndonjë shtese</a>. Për të fshirë llogarinë tuaj, ju lutem i "
+"kërkoni një personi tjetër nga grupi juaj i zhvillimeve t'ju fshijë nga "
+"lista e autorëve për shtesën tuaj. Më pas, do të jeni në gjendje të fshini "
+"llogarinë tuaj këtu."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Nëse keni pyetje shtesë, për ndihmë ju lutem lidhuni me %1$s."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Lypset të vini shenjë te kutiza \"E kuptoj...\" përpara se të fshijmë llogarinë tuaj."
+msgstr ""
+"Lypset të vini shenjë te kutiza \"E kuptoj...\" përpara se të fshijmë "
+"llogarinë tuaj."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
-msgstr "Që të mund të plotësohet ky hap, ju lutem jepeni saktë fjalëkalimin tuaj."
+msgstr ""
+"Që të mund të plotësohet ky hap, ju lutem jepeni saktë fjalëkalimin tuaj."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Ndodhi një gabim gjatë fshirjes së llogarisë suaj. Për problemin, ju lutem lidhuni me %1$s dhe do ta fshijmë ne për ju. Na ndjeni për problemin."
+msgstr ""
+"Ndodhi një gabim gjatë fshirjes së llogarisë suaj. Për problemin, ju lutem "
+"lidhuni me %1$s dhe do ta fshijmë ne për ju. Na ndjeni për problemin."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Ripohoni fshirjen e llogarisë"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Fshi Llogarinë e Përdoruesit %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Lamtumirë!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Nuk do të jeni më në gjendje të hyni te Shtesat Mozilla."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Duke klikuar \"fshije\" llogaria juaj <strong>ka për t'u fshirë përgjithmonë</strong>. Kjo do të thotë:"
+msgstr ""
+"Duke klikuar \"fshije\" llogaria juaj <strong>ka për t'u fshirë "
+"përgjithmonë</strong>. Kjo do të thotë:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Shqyrtimet dhe vlerësimet tuaja nuk do të fshihen, por nuk do të shfaqen më si tuajat."
+msgstr ""
+"Shqyrtimet dhe vlerësimet tuaja nuk do të fshihen, por nuk do të shfaqen më "
+"si tuajat."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Mund t'ju ndihmojmë nëse keni një problem të veçantë; ju lutem mos e fshini llogarinë tuaj këtë herë, por lidhuni me ne te %1$s dhe do të bëjmë ç'të jetë e mundur për t'ju ndihur në zgjidhjen e tij."
+msgstr ""
+"Mund t'ju ndihmojmë nëse keni një problem të veçantë; ju lutem mos e fshini "
+"llogarinë tuaj këtë herë, por lidhuni me ne te %1$s dhe do të bëjmë ç'të "
+"jetë e mundur për t'ju ndihur në zgjidhjen e tij."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "E kam të qartë që ky hap nuk mund të zhbëhet."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Përdoruesi u Fshi"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Për ripohimin e vendndodhjes tuaj të re email u dërgua një email te %1$s. Që të hyjë në fuqi ndryshimi, lypset të klikoni te lidhja e dhënë në këtë email. Deri atëherë, mund të vazhdoni të hyni me vendndodhjen tuaj të tanishme email."
+msgstr ""
+"Për ripohimin e vendndodhjes tuaj të re email u dërgua një email te %1$s. Që "
+"të hyjë në fuqi ndryshimi, lypset të klikoni te lidhja e dhënë në këtë "
+"email. Deri atëherë, mund të vazhdoni të hyni me vendndodhjen tuaj të "
+"tanishme email."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Fshi llogari përdoruesi"
 
@@ -6634,27 +6606,36 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Mirësevini te Shtesa %2$s.\n"
 "\n"
-"Para se ta përdorni llogarinë tuaj të re duhet ta aktivizoni atë - kjo na siguron që vendndodhja email që përdorët është e vlefshme dhe ju përket juve.\n"
-"Për aktivizimin e llogarisë suaj, klikoni lidhjen më poshtë ose kopjojeni dhe ngjiteni te shtylla e vendeve te shfletuesi juaj:\n"
+"Para se ta përdorni llogarinë tuaj të re duhet ta aktivizoni atë - kjo na "
+"siguron që vendndodhja email që përdorët është e vlefshme dhe ju përket "
+"juve.\n"
+"Për aktivizimin e llogarisë suaj, klikoni lidhjen më poshtë ose kopjojeni "
+"dhe ngjiteni te shtylla e vendeve te shfletuesi juaj:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Pasi të keni aktivizuar me sukses llogarinë tuaj, mund ta hidhni tej këtë e-mail.\n"
+"Pasi të keni aktivizuar me sukses llogarinë tuaj, mund ta hidhni tej këtë e-"
+"mail.\n"
 "\n"
 "Ju faleminderit që ju bashkuat Shtesave %2$s\n"
 "-- Ekipi i Shtesave %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Kërkuat ndryshimin e vendndodhjes suaj email te Shtesa %2$s.\n"
 "\n"
-"Që të mund të ripohoni vendndodhjen e re, ju lutem klikoni lidhjen më poshtë ose kopjojeni dhe hidheni të tërën te shtylla e vendndodhjeve e shfletuesit tuaj:\n"
+"Që të mund të ripohoni vendndodhjen e re, ju lutem klikoni lidhjen më poshtë "
+"ose kopjojeni dhe hidheni të tërën te shtylla e vendndodhjeve e shfletuesit "
+"tuaj:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Keni 48 orë kohë për ripohimin e vendndodhjes suaj të re. Nëse nuk dëshironi më të ndryshoni vendndodhjen, mundeni thjesht ta shpërfillni këtë email.\n"
+"Keni 48 orë kohë për ripohimin e vendndodhjes suaj të re. Nëse nuk dëshironi "
+"më të ndryshoni vendndodhjen, mundeni thjesht ta shpërfillni këtë email.\n"
 "\n"
 "Faleminderit!\n"
 "-- Stafi i Shtesave r%2$s"
@@ -6672,7 +6653,9 @@ msgid "user_email_pwreset"
 msgstr ""
 "Ricaktim Fjalëkalimi për te Shtesa %2$s\n"
 "\n"
-"Morëm një kërkesë për ricaktimin e fjalëkalimit për këtë llogari te addons.mozilla.org. Për ta ndryshuar këtë fjalëkalim ju lutem klikoni lidhjen vijuese, ose ngjiteni te shtyllë vendesh te shfletuesi juaj:\n"
+"Morëm një kërkesë për ricaktimin e fjalëkalimit për këtë llogari te addons."
+"mozilla.org. Për ta ndryshuar këtë fjalëkalim ju lutem klikoni lidhjen "
+"vijuese, ose ngjiteni te shtyllë vendesh te shfletuesi juaj:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6681,115 +6664,90 @@ msgstr ""
 "Faleminderit,\n"
 "-- Stafi i Shtesave %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Ricaktoni fjalëkalimin tuaj për te Shtesa %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Gabim!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Ju lutem ripohoni ndryshimin e vendndodhjes tuaj email te Shtesa %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Sukses!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "Vendndodhja juaj email u ndryshua me sukses. Tani e tutje, ju lutem përdorni %1$s për hyrje."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Rreth meje"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Paraqiteni veten te bashkësia, nëse doni! Ky tekst do të shfaqet publikisht te faqja me të dhënat tuaja si përdorues. Nërprerjet e rreshtave do të ruhen, por nuk lejohet HTML."
+msgstr ""
+"Vendndodhja juaj email u ndryshua me sukses. Tani e tutje, ju lutem përdorni "
+"%1$s për hyrje."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Ripohoni fjalëkalimin"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Koleksionin që krijova shfaqe te profili im si përdorues"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Koleksionet e mij të parapëlqyer shfaqi te profili im si përdorues"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Përpunoni profil përdoruesi për %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Vendndodhje email"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Emër"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Fshih vendndodhje email"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL \"website\"-i"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Mbiemër"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Hyrje Përdoruesi"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Fjalëkalim i ri"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Nofkë"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Fjalëkalim i vjetër"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Të tjera Veprime"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Fjalëkalim"
 
@@ -6797,60 +6755,66 @@ msgstr "Fjalëkalim"
 msgid "user_form_registration"
 msgstr "Regjistrim Përdoruesi të Ri"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Mbamë mend në këtë kompjuter"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Të shfaq bankoprovën?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Ruaj"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Hyrje"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Regjistrohuni"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Përdorues Shtesash %s që prej"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Krijoni një llogari përdoruesi të re"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Përputhshmëri Shtese (këshillohet me forcë)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Veprimtare dhe konkurse"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Nuk ka njoftime që të mund t'i formësoni."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Mozilla mund t'ju dërgojë, herë pas here, email rreth versionesh të ardhshëm dhe veprimtari që lidhen me shtesat. Ju lutem përzgjidhni më poshtë temat që ju interesojnë:"
+msgstr ""
+"Mozilla mund t'ju dërgojë, herë pas here, email rreth versionesh të ardhshëm "
+"dhe veprimtari që lidhen me shtesat. Ju lutem përzgjidhni më poshtë temat që "
+"ju interesojnë:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla ruan të drejtën të lidhet me ju veçmas lidhur me çështje të caktuara te shtesat që keni strehuar këtu."
+msgstr ""
+"Mozilla ruan të drejtën të lidhet me ju veçmas lidhur me çështje të caktuara "
+"te shtesat që keni strehuar këtu."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Pati gabime në ndryshimet që bëtë. Ndreqini, ju lutem, dhe riparashtrojini..."
+msgstr ""
+"Pati gabime në ndryshimet që bëtë. Ndreqini, ju lutem, dhe riparashtrojini..."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profili u përditësua."
 
@@ -6863,15 +6827,16 @@ msgstr "Ricaktim fjalëkalimi për %s"
 msgid "user_pwreset_header"
 msgstr "Ricaktim Fjalëkalimi"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Harruat fjalëkalimin tuaj?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
-msgstr "Lidhja për ricaktim fjalëkalimi ju dërgua te vendndodhja email e juaja."
+msgstr ""
+"Lidhja për ricaktim fjalëkalimi ju dërgua te vendndodhja email e juaja."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Fjalëkalim i ricaktuar me sukses."
 
@@ -6883,7 +6848,7 @@ msgstr "Parashtroni ndryshim fjakëlalimi"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Dërgo lidhje ricaktimi fjalëkalimi"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Shtesa %s"
@@ -6892,59 +6857,51 @@ msgstr "Shtesa %s"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Ju dërguam me email lidhjen për aktivizimin e llogarisë suaj të përdoruesit te vendndodhja juaj %1$s. Duhet ta klikoni përpara se të hyni te Shtesa %2$s."
+msgstr ""
+"Ju dërguam me email lidhjen për aktivizimin e llogarisë suaj të përdoruesit "
+"te vendndodhja juaj %1$s. Duhet ta klikoni përpara se të hyni te Shtesa %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Ju dërguam email te vendndodhja juaj %1$s që të ripohoni llogarinë tuaj. Përpara se të hyni, duhet ta aktivizoni llogarinë tuaj duke klikuar mbi lidhjen e dhënë në këtë email."
+msgstr ""
+"Ju dërguam email te vendndodhja juaj %1$s që të ripohoni llogarinë tuaj. "
+"Përpara se të hyni, duhet ta aktivizoni llogarinë tuaj duke klikuar mbi "
+"lidhjen e dhënë në këtë email."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "ridërgo mesazhin e ripohimit"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Përgëzime! Llogaria juaj e përdoruesit u krijua me sukses."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>Regjistrimi te AMO <strong>nuk është i domosdoshëm</strong> po qe se thjesht doni të shkarkoni dhe instaloni një shtesë publike.</p><p>Lypset të regjistroheni vetëm po qe se:</p><ul><li>Dëshironi të parashtroni shqyrtime për shtesa</li><li>Jeni zhvillues shtese dhe doni të ngarkoni shtesën tuaj për strehim te AMO</li></ul><p>Pas regjistrimit me sukses, do t'ju dërgohet një email ripohimi te vendndodhja që dhatë. Ju lutem ndiqni udhëzimet e atjeshme për të ripohuar llogarinë tuaj.</p><p>Nëse doni, mund të lexoni our <a href='%1$s' title='Legal Notices'>Shënimet Ligjore</a> dhe <a href='%2$s' title='Privacy Policy'>Rregullat e Vetësisë</a> tonat.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Nëse nuk morët email ripohimi, sigurohuni që shërbimi email nuk e ka shënuar \"postë hedhurinë\" ose \"spam\". Nëse e shihni të nevojshme, mund t'ju %1$s te vendndodhja juaj email e përmendur më sipër."
+msgstr ""
+"Nëse nuk morët email ripohimi, sigurohuni që shërbimi email nuk e ka shënuar "
+"\"postë hedhurinë\" ose \"spam\". Nëse e shihni të nevojshme, mund t'ju %1$s "
+"te vendndodhja juaj email e përmendur më sipër."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Faleminderit që u regjistruat dhe mirësevini te %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Mirë se vini te addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Lypset një emër, mbiemër ose nofkë."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Koleksione"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Njoftime"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Profil Përdoruesi"
 
@@ -6952,64 +6909,50 @@ msgstr "Profil Përdoruesi"
 msgid "user_verified_okay"
 msgstr "Verifikuar me sukses!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Fshi Llogari Përdoruesi"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Përpunim Llogarie Përdoruesi"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Rrerthe Meje"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Shtesa nga %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Emër"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Profil Autori"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Koleksione nga %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Vendndodhje email"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Koleksionet e Parapëlqyera"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Faqe Hyrëse"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nofkë"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Të dhëna Përdoruesi për %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "Shqyrtime nga %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Hyrje përdoruesi"
 
@@ -7018,40 +6961,28 @@ msgstr "Hyrje përdoruesi"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Shtesa që po kërkoni ndodhet në bankoprovë hëpërhë. Nëse keni tashmë një llogari te Shtesat Mozilla, ju lutem hyni në të, ose <a href=\"%1$s\">mësoni më tepër rreth bankoprovës.</a>"
+msgstr ""
+"Shtesa që po kërkoni ndodhet në bankoprovë hëpërhë. Nëse keni tashmë një "
+"llogari te Shtesat Mozilla, ju lutem hyni në të, ose <a href=\"%1$s\">mësoni "
+"më tepër rreth bankoprovës.</a>"
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "Faqja që po kërkoni është pjesë e bankoprovës. Nëse keni tashmë një llogari te Shtesat Mozilla, ju lutem hyni në të, ose <a href=\"%1$s\">mësoni më tepër rreth bankoprovës.</a>"
+msgstr ""
+"Faqja që po kërkoni është pjesë e bankoprovës. Nëse keni tashmë një llogari "
+"te Shtesat Mozilla, ju lutem hyni në të, ose <a href=\"%1$s\">mësoni më "
+"tepër rreth bankoprovës.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Ricaktim Fjalëkalimi Përdoruesi"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Regjistrim Përdoruesi të Ri"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Leje kodi burim për %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Shihni tërë të shtuarat së fundmi"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Shihni tërë shkarkimet kryesuese"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Shihni tërë më të vlerësuarat"
-
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "Versioni më i fundit i përputhshëm me"
diff --git a/site/app/locale/sv_SE/LC_MESSAGES/messages.po b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
index a791672..2fd7f05 100644
--- a/site/app/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the REMORA package.
 # Wil Clouser <clouserw@mozilla.com>, 2006.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-11 09:20+0200\n"
+"PO-Revision-Date: 2008-08-26 12:12+0200\n"
 "Last-Translator: Pontus Freyhult <pontus_amo_translate@soua.net>\n"
 "Language-Team: SWEDISH <SV@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,169 +17,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Avbryt installation"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Hämta hem nu %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Godkänn och hämta hem"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Godkänn och installera"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Publikt"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandlåda"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Uppdaterad %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Version %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "hämtningar"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "totala antal hämtningar"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "hämtningar per vecka"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s tillägg"
 msgstr[1] "%1$s tillägg"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "per sida"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Sortera på:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "experimentell"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "rekommenderat"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s är inte tillgänglig för %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Tillbaka till %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Tillbaka till recensionerna..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Betyg:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Recension:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Skicka in din recension"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Lägg till en recension för %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Titel/Sammanfattning:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Ta bort"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Svara"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Är du säker på att du vill ta bort den här recensionen?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Nej"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Ja"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Ta bort recension"
 
@@ -187,36 +179,37 @@ msgid "addon_review_deleted_successfully"
 msgstr "Recensionen är nu borttagen."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Redigera recension av %s"
 
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
+#, fuzzy
 msgid "addon_review_flag_error_other_length"
 msgstr ""
-"Problem med att flagga recensionen: Information för flaggade recensioner "
-"begränsas till mellan 10 och 100 tecken, du hade %1$s."
+"Problem flagging review: Notes for flagged reviews are limited to between 10 "
+"and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Observera: Innan din recension dyker upp i det publika gränssnittet kommer "
 "den att granskas av en modererare."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Svar från utvecklaren till:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
-#, php-format
+#: views/reviews/display.thtml:135
+#, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
-msgstr[0] "Se %1$s tidigare recension inskickad av %2$s för detta tillägg."
-msgstr[1] "Se %1$s tidigare recensioner inskickade av %2$s för detta tillägg."
+msgstr[0] "See %1$s previous review submitted by %2$s for this add-on."
+msgstr[1] "See %1$s previous reviews submitted by %2$s for this add-on."
 
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
@@ -228,161 +221,136 @@ msgid "addon_review_pagetitle"
 msgstr "Recensioner av %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Svar från %1$s den %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Svar från utvecklaren:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Din recension sparades, tack så mycket!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "av %1$s den %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "av %1$s den %2$s (betyg %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Permanent länk till denna version"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "Senaste versionen kompatibel med %1$s %2$s"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Skicka in"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Se författarens profil"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
+#, fuzzy
 msgid "addons_browse_all_themes_title"
-msgstr "Bläddra bland alla teman :: %1$s Add-ons"
+msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Bläddra bland %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
+#, fuzzy
 msgid "addons_browse_categories_header_theme"
-msgstr "Bläddra bland %1$s teman :: %2$s tillägg"
+msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "Vad är detta?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Lägg till recension"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Avancerad information"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Kategorier"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Lägg till samling:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Ny samling..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Välj en samling..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Publicera"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s har lagts till %2$s-samlingen."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "Vad är detta?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "och %1$s ytterligare samling"
-msgstr[1] "och %1$s ytterligare samlingar"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "utförlig recension"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Gillar den inte"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Redigera din recension"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Detta tillägg har integritetsriktlinjer."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Hatar det"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Relaterade samlingar"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Utvecklarkommentarer"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Hemsida"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Källkodslicens"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Recensioner"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hjälp"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Gillar det"
 
@@ -390,45 +358,43 @@ msgstr "Gillar det"
 msgid "addons_display_long_description"
 msgstr "Utförlig beskrivning"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Älskar det"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Fler bilder"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Detta tillägg är inte inlagt i någon samling ännu."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
+#, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Andra tillägg från %1$s"
-msgstr[1] "Andra tillägg av dessa författare"
+msgstr[1] "Other add-ons by these authors"
 
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Hjälp för denna utökning ges av utvecklaren på %s."
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -436,20 +402,21 @@ msgstr ""
 "post till %s."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Hjälp för denna utökning ges av utvecklaren på %s."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Betygsätt"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Tycker verkligen om det"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Skicka inte felrapporter i recensioner. Vi gör inte din e-postadress "
@@ -457,45 +424,50 @@ msgstr ""
 "lösa ditt problem."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">riktlinjer för recensioner</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Se <a href=\"%1$s\">hjälpsektionen</a> för att ta reda på var du kan få "
 "hjälp med detta tillägg."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Spara"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Visa alla %1$s tillägg"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Visa alla recensioner (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Visa alla versioner"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Komplett versionshistorik"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Visa källkoden"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Visa statistik"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Vad tycker du?"
 
@@ -503,263 +475,161 @@ msgstr "Vad tycker du?"
 msgid "addons_display_workswith"
 msgstr "Fungerar med:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Nyss inlagda"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Populära"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Rekommenderade"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Prenumerera"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Bläddra bland tillägg"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Uppdaterade"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "av"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Populära samlingar"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Samlingar"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> tillägg"
-msgstr[1] "<strong>%1$s</strong> tillägg"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Visa alla samlingar"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"Samlingar är ett sätt för dig att kategorisera, blanda, mixa och matcha "
-"tillägg. Prenumerera på samlingar skapad av andra användare eller skapa din "
-"egen."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> prenumerant"
-msgstr[1] "<strong>%1$s</strong> prenumeranter"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Vi rekommenderar"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Tillägg utökar %1$s och låter dig göra din webbupplevelse mer personlig. "
 "Titta runt lite och skapa din egen %1$s."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Gillar du dessa? Hitta fler tillägg i %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Mer än 5000 gratis tillägg</strong> som låter dig anpassa och utöka "
-"Firefox så den uppfyller dina behov."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Vad är tillägg?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Lätt att installera</strong>, bli underrättade när uppdateringar "
-"finns tillgängliga."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Introduktion"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Nyaste:"
 
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Verktygsrader, teman och sökmotorer som <strong>hjälper dig utföra dina "
-"vanliga sysslor.</strong>"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "NYTT!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Andra applikationer"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s Add-ons"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>tillägg nedladdat</span>"
-msgstr[1] "<strong>%1$s</strong> <span>tillägg nedladdade</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Populärast:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>tillägg används</span>"
-msgstr[1] "<strong>%1$s</strong> <span>tillägg används</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Vi rekommenderar:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Nyligen uppdaterade:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Visa alla"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Visa alla nyligen skapade tillägg"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Visa alla populära tillägg"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Visa alla rekommenderade tillägg"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Visa alla nyligen uppdaterade tillägg"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
+#, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
-"<ol><li>Klicka på länken nedan för att spara filen.</li><li>I Mozilla "
-"Sunbird, öppna Tillägg från Verktygsmenyn.</li><li>Klicka på knappen "
-"Installera och hitta/välj filen du laddat ner och tryck \"Öppna\".</li></ol>"
+"<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, "
+"open Add-ons from the Tools menu.</li><li>Click the Install button, and "
+"locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
+#, fuzzy
 msgid "addons_install_in_sunbird_title"
-msgstr "Hur du installerar i Sunbird"
+msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Högerklicka på länken nedan och välj \"Spara länk som...\" för att "
-"hämta hem och spara filen till din hårddisk.</li><li>I Mozilla Thunderbird, "
+"hämta hem och spara filen till din hårddiska.</li><li>I Mozilla Thunderbird, "
 "öppna Tillägg från Verktygsmenyn.</li><li>Klicka på knappen Installera, leta "
 "på och välj filen du hämtat hem och klicka \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Hur man installerar i Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "visa experimentella tillägg"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Skicka"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "från"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "för Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "för Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "för Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -767,11 +637,11 @@ msgstr ""
 "insticksprogrammen. För mer information om andra tillgängliga "
 "insticksprogram för Mozilla-baserade webbläsare, besök %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Letar du efter ett insticksprogram som inte finns listat här"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Insticksprogram hjälper din webbläsare utföra särskilda funktioner som att "
@@ -780,24 +650,24 @@ msgstr ""
 "funktionalitet."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Vanliga insticksprogram för %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Insticksprogram"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Hjälpdokumentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -805,40 +675,36 @@ msgstr ""
 "fortsätta:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Förhandsvisningar för %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Nyligen tillagt"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Med så många utmärkta tillägg tillgängliga finns det alltid något för alla. "
 "För att komma igång får du här en lista med de populäraste. Lycka till!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Rekommenderade tillägg"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Rekommenderat tillägg"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Ytterligare resurser"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Utvecklarcenter"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Tyvärr, du behöver en Mozilla-baserad webbläsare (som Firefox) för att "
@@ -853,125 +719,129 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Lär hur du %1$s på %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "gör din egen"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Bläddra bland fler sökmotorer på %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Sökmotorer"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Särskilt tack till Mycroft-projektet för deras arbete med Firefox-sökmotorer."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Dela detta"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Lägg till Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Digga detta!"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "Posta till Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Dela med FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "Posta till MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
+#, fuzzy
 msgid "addons_status_disabled"
-msgstr "Avstängd"
+msgstr "Disabled"
 
 #: controllers/components/amo.php:191 controllers/components/amo.php:224
+#, fuzzy
 msgid "addons_status_incomplete"
-msgstr "Inkomplett version"
+msgstr "Incomplete Version"
 
 #: controllers/components/amo.php:197 controllers/components/amo.php:227
+#, fuzzy
 msgid "addons_status_nominated"
-msgstr "I sandlådan; Nominerad för publik"
+msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
+#, fuzzy
 msgid "addons_status_pending"
-msgstr "I sandlådan; avvaktar granskning"
+msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
+#, fuzzy
 msgid "addons_status_public"
-msgstr "Publik"
+msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
+#, fuzzy
 msgid "addons_status_sandbox"
-msgstr "I sandlådan"
+msgstr "In Sandbox"
 
 #: controllers/components/amo.php:203
+#, fuzzy
 msgid "addons_status_unknown"
-msgstr "Okänd"
+msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Läs mer om detta tillägg"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Mest nedladdat"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Högst betyg"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Var försiktig med gamla versioner"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Dessa versioner visas för referens och teständamål. Du bör alltid använda "
 "den senaste versionen av ett tillägg."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Versionshistorik med ändringsloggar"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s versionshistorik"
@@ -1006,423 +876,155 @@ msgstr "Gruppadministratör"
 msgid "admin_group_saved"
 msgstr "Gruppen har sparats"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Avancerad"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "När som helst"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Alla"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Alla"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Applikation"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
+#, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Nyckelordspassning"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "Senast uppdaterad"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Namn"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Nyast"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Senaste 3 månaderna"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Senaste 6 månaderna"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Senaste dagen"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Senaste månaden"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Senaste veckan"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Senaste året"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "Per sida"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Plattform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "Popularitet"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Betyg"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Sortera på"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "till"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Växla mellan enkelt och avancerat sökläge"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Typ"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Nästa"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Föreg"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "Ignorera versionskontroll"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Detta tillägg är för en äldre version av Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
+#, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
-"Du kan <a href=\"%1$s\">testa en äldre version</a> eller <a href=\"#\" "
-"onclick=\"%2$s\">strunta i den här kontrollen</a>"
+"You can <a href=\"%1$s\">try an older version</a> or <a href=\"#\" onclick="
+"\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "En <a href=\"%1$s\">äldre version</a> kanske fungerar"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
+#, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
-"Detta tillägg kräver den ännu ej släppta <a href=\"%1$s\">Firefox %2$s</a>"
+"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Uppgradera Firefox</a> för att använda "
 "detta tillägg"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s ändrade status för %2$s till %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s utförde okänd administrativ handling %2$s på id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s tog bort egenskapen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s skapad applikationen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s redigerade applikationen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s skapade version %2$s för %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s tog bort version %2$s för %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s ändrade inställningen '%2$s' från '%3$s' till '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s utförde okänd redaktörshandling %2$s på id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s tog bort %2$s från framhävningslistan"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s lade till tillägget %2$s till framhävningslistan"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s ändrade en framhävning för %2$s lokalen"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s ändrade lokaler för tillägget %2$s på framhävningslistan"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s kalkylerade om hashen för filen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s adderade %2$s till gruppen %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s för knippade sig själv med %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s skapade gruppen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s tog bot gruppen %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s redigerade gruppen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s tog bort %2$s från gruppen %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s utförde okände handling %2$s för %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s försökte ändra den låsta gruppen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s försökte ändra översättningar i %2$s utan att ha rätt till det"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s skapade plattformen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s tog bort plattformen %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s ändrade plattformen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s kunde inte omautentisera sig för att komma åt %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s skapade svaret %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s tog bort svaret %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s ändrade svaret %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s godkände granskningen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s tog bort granskningen %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s utförde okänd säkerhetshandling %2$s på id %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s skapade etiketten %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s tog bort kategorin %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s redigerade kategorin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s uppdaterade applikationsöversättningen för %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s uppdaterade översättningar av bloggposter för %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s uppdaterade plattformsöversättningarna för %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s uppdaterade kategoriöversättningarna för %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s ändrade %2$ss användarinformation"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Tillägg sorterade på namn"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Nyaste tilläggen"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Populära tillägg"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Tillägg sorterade på betyg"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Nyligen uppdaterade tillägg"
 
@@ -1431,902 +1033,284 @@ msgid "categories_current_title"
 msgstr "Nuvarande kategori"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Kategorier"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Välj en kategori"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Visa alla %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Beskrivningen ska vara kortare än %1$s tecken."
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Visa alla rekommederade tillägg"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s-amling"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Högst betyg först"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Fel vid borttagning av tillägg!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Senast uppdaterat först"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Fel vid sparning av tillägg!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Mest populära först"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Fel vid sparning av kommentar!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Namnet ska vara kortare än 1$s tecken."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Visa alla %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
+#, fuzzy
 msgid "collection_not_found"
-msgstr "Samling ej hittad!"
-
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"Om du redan vet vilka tillägg du vill ha i din samling kan du börja skriva "
-"deras namn nedanför. Om du hellre väntar och gör detta senare så kan du "
-"klicka på %1$s nu."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Välj ditt första tillägg"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Skapa en samling"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Valda tillägg"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr ""
-"Det är lätt stt skapa din egen samling av tillägg genom att fylla i några "
-"fält nedanför."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Skapa samling"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Samlingar"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Läs mer"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Lägg till Favoriter"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Ta bort från Favoriter"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Du kan se din nya samling nedanför. Om du vill välja ett smeknamn för samlingen, ladda upp en ikon eller ändra andra inställningar, gå till sidan för att <a href='%1$s'>Hantera samlingar</a>.</p><p>Du kan komma åt dina samlingar här: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Din samling är nu klar!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Om denna samling"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s tillägg i denna samling"
-msgstr[1] "%1$s tillägg i denna samling"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Skapad av:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Uppdaterad:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Att lägga till favoriter&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Att ta bort favoriter&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Logga in</a> för att lägga till denna samling till dina favoriter."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Hantera samling"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Tillagd datum"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Namn"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Popularitet"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s nedladdning denna vecka"
-msgstr[1] "%1$s nedladdningar denna vecka"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Valda tillägg tas bort vid sparning"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr ""
-"För att publicera nya tillägg i den här samling, börja skriv deras namn "
-"nedanför."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"För att publicera nya tillägg i den här samling, ange en kommaseparerad "
-"lista af deras tillägsid nedanför."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Du kan också publicera ett tillägg från dess vanliga sida."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "lades till %1$s av %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Lägg till kommentar till samling"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Ta bort kommentar till samling"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Redigera kommentar till samling"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Obs: Kommentaren kommer att synas som om den vore skriven av den som "
-"ursprungligen publicerade, med det ursprungliga publiceringsdatumet"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Spara kommentar"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Ta bort"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Lägg till i samling"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Kontrollera tillgänglighet"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Ja, jag vill ta bort den här samlingen."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Kryssa i rutan, klicka sedan på \"%1$s\" för att ta bort samlingen."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"När du klickar \"%1$s\" nedanför kommer din samling aatt tas bort. Om du "
-"inte vill radera din samling, välj bort bekräftelsen i \"%2$s\"-fliken och "
-"fortsätt redigera din samling. Om du lämnar den här sidan utan att spara "
-"kommer din samling inte att tas bort."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Din samling tas bort!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Du måste ge en beskrivning av din samling."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Det uppstod ett fel när du laddade upp ikonen."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Du måste ge din samling ett namn."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Om du väljer ett smeknamn måste det vara unikt."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Tillägsnamn:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Tillhörande applikation"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Välj den applikation din samling är tänkt för."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Samlingstyp"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Ta bort samling"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Tar du bort din samling raderas den permanent."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Samlingsbeskrivning"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Beskriver kortfattat din samling och tilläggen i den"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Ikon"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"Du kan ladda upp en JPG, GIF eller PNG-ikon som skalas om till 32x32 punkter."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Vem kan se din samling?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"Som standard syns samlingar i den publika Samlingskatalogen och kan hittas "
-"av vem som helst. Om du vill begränsa åtkomst till din samling så den bara "
-"kan ses av de du gett en särskild länk till, använd valet nedan."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Bara de jag bjuder in att se min samling"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "Alla kan se min samling i katalogen"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Vem kan hantera min samling?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"Dessa användare kan publicera tillägg till din samling, hantera alla tillägg "
-"och inställningar och ge andra användare rättigheter."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Samlingsnamn"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Ge din samling ett beskrivande namn, som \"Dave's Favorite Travel Add-ons\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Smeknamn för samling"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Frivilligt, ge din samling ett unikt smeknamn för snabb åtkomst:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Vem kan publicera tillägg i din samling?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"Dessa användare kan publicera tillägg  till din samling och ta bort tillägg "
-"de publicerat."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Ang e-postadressen till ett Firefox Add-ons-konto:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Valda konto tas bort när du sparar"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Skriv en kommaseparerad lista med e-postadresser till Firefox Add-ons-konton"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Bara jag"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Jag och dessa användare:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Lägg till"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Hantera %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Hantera samlingsinnehåll"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Nuvarande tillägg:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Avancerade inställningaar"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Hantera samlingsrättigheter"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Avbryt"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Ta bort ikon"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Byt ut ikon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Ikonen tas bort när du klickard \"%1$s\" nedanför"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Smeknamnet är tillgängligt"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Ditt smeknamn innehöll ogiltiga tecken och justerades. Försök igen."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Smeknamnet är upptaget"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Du kan komma åt din samling på den här adressen:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Din samling är skapad!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Uppdatera samling"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Ta bort samling"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Tillägg"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Avancerat"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Namn &amp; Detaljer"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Rättigheter"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Tillägg kan hålla ett öga på dina barn och din kalender."
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Familjeplanering"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Spana in tilläggssamlaren"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Skapa en samling"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Sätt igång"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Du har inga favoritsamlingar än.</strong></p> <p>Samlingar du markerar som favoriter kan lätt kommas åt från denna sida, och dyker upp i <a href='%1$s'>Tilläggsamlaren</a> om du har installerat den.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Du har inte skapat några smalingar än. Samlingar är lätta att skapa och fylla med dina favorittillägg. <a href='%1$s'>Testa</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Samlingar"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Tilläggssamling"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "skapad av %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Vad är samlingar?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sortera på"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Redaktörernas utvalda"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Mina favoriter"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Mina samlingar"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Populära"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Mest populära totalt"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Mest populära denna månad"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Nyaste"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Mest populära denna vecka"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"Det finns ett nytt sätt att hantera och hitta favorittillägg. Kommentera, "
-"dela och synkaa samlingar, allt detta från din webbläsare"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr ""
-"Samlingar är grupper av tillägg som samlats ihop för att dela med sig av dem "
-"enkelt."
+msgstr "Collection not found!"
 
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
-#, php-format
+#, fuzzy, php-format
 msgid "collections_interactive_addon_added"
-msgstr "Lade till %s"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Tillägg kan göra bättre nätsökningar."
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Referensdisken"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Tillägg som hjälper dig hantera sociala nätverk."
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Sällskapslivet"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "Stäng"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Ett fel upstod när samlingen skulle läggas till dina favoriter. Är samlingen redan en favorit?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Visa inte detta meddelande igen."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s har lagts till bland dina favoritsamlingar."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Du kan nu enkelt hitta den här samlingen från <a href=\"%1$s\">%2$s</a>-fliken i din katalog. För ett ännu enklare sätt att hålla reda på dina favoritsamlinga, testa <a href=\"%3$s\">Tilläggsamlar</a>-utökningen för Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Samlingen har tagits bort."
+msgstr "Added %s"
 
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Tilläggen som kan förvandla dig till en reseagent."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Resepaketet"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Auto-publicerad"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Redaktörernas val"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Ett fel uppstod när samlingen skulle tas bort från dina favoriter. Var denna samling inte en favorit?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s har tagits bort från dina favoritsamlingar."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Tillägg gör det enklare att bygga den perfekta webbsidan."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Webbutvecklarens verktygslåda"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Vad är samlingar?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "Läs FAQn"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"Det finns ett nytt sätt att hitta och hantera favorittillägg. Kommentera, "
-"dela och synka, allt från din webbläsare."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Tilläggssamlingars Hem"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Ladda ner tilläggssamlaren:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Tilläggssamlarens logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
+#, fuzzy
 msgid "compatibility_dashboard_center_header"
-msgstr "Tillägskompatibilitetscenter"
+msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
+#, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
-"Var beredd på släppet av %1$s med de verktyg och den information som finns "
-"tillgänglig för %2$s tilläggsmakare nedan."
+"Be prepared for the release of %1$s with the tools and information available "
+"for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
+#, fuzzy
 msgid "compatibility_dashboard_loading"
-msgstr "Laddar data..."
+msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
+#, fuzzy
 msgid "compatibility_dashboard_main_link"
-msgstr "Tillbaka till huvudsidan"
+msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
+#, fuzzy
 msgid "compatibility_dashboard_report"
-msgstr "Tilläggskompatibilitetsrapport"
+msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
+#, fuzzy
 msgid "compatibility_developer_info"
-msgstr "Information för tilläggsutvecklare"
+msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
+#, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
-msgstr "Justera maxVersion utan att ladda upp på nytt"
+msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
+#, fuzzy
 msgid "compatibility_developers_check_status"
-msgstr "Kontrollera status på Mina tillägg"
+msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
+#, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
-"Om du har ett tillägg hos Mozilla Add-ons, <a href=\"%1$s\">logga in</a> för "
-"att analusera statusen på %2$s."
+"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
+"login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
+#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
+#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "Du har inga tillägg publicerade hos Mozilla Add-ons."
+msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
+#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Tilläggsstatuskontrolresultat"
+msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
+#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Hämtar status på publicerade tillägg..."
+msgstr "Retrieving status of hosted add-ons..."
 
 #. %1$s is a number
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
+#, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s %2$s användare (%3$s&#37; av totala antalet)"
+msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
+#, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
-"Tilläggen nedan utgör 95% av tillägsanvändandet Mozilla känner till och är "
-"sorterade på deras användande."
+"The add-ons below make up 95% of add-on usage known to Mozilla and are "
+"ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
+#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "Visa detaljerade rapport"
+msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
+#, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
-"Av de %1$s tillägg som utgör 95&#37; av användningen Mozilla känner till "
-"bedöms <b>%2$s&#37;</b> vara kompatibel med de senaste byggena av %3$s."
+"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
+"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
+"of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "Alpha-versioner"
+msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Tillägg kompatibla med en alphaversion av %1$s"
+msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Beta-versioner"
+msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta_description"
-msgstr "Tillägg kompatibla med en betaversion eller släppkandidat av %1$s"
+msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "Senaste versionen"
+msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest_description"
-msgstr "Tillägg uppdaterade för de senaste byggena av %1$s"
+msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Andra versioner"
+msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Tillägg ej kompatibla med någon version av %1$s"
+msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
+#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Tilläggskompatibilitetsrapport"
+msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
+#, fuzzy
 msgid "compatibility_user_info"
-msgstr "Information för tilläggsanvändare"
+msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
+#, fuzzy
 msgid "compatibility_view_report"
-msgstr "Visa kompatibilitetsrapport"
+msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "För mer information om hur du kan bidra, se vår %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "wikisida"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla vill tacka följande personer för deras bidrag till addons.mozilla."
 "org-projektet genom åren:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Utvecklare"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Redaktörer"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Lokaliserare"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Andra som bidragit"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Tidigare utvecklare"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Programvara och bilder"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Vissa ikoner kommer från <a href=\"http://www.famfamfam.com/lab/icons/silk/\">ikonuppsättningen famfamfam Silk</a>, licensierad under en <a href=\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 License</a>."
+msgstr ""
+"Vissa ikoner kommer från<a href=\"http://www.famfamfam.com/lab/icons/silk/"
+"\">ikonuppsättningen famfamfam Silk</a>, licensierad under en <a href="
+"\"http://creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution "
+"2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
-"Vissa sidor använder element från <a href=\"http://www.simile-widgets.org/"
-"timeplot/\">Timeplot</a>, licensierade enligt en <a href=\"http://simile.mit."
-"edu/license.html\">BSD-licens</a>."
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B, %Y"
 
@@ -2361,29 +1345,46 @@ msgstr "Statistikpanel"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "Filen %1$s har ogiltig filändelse (%2$s). Tillåtna filändelser: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "Filen %s kunde inte sparas i databasen. Försök igen."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Förhandsvisningen %1$s ersattes med %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Filen %s laddades upp. Du kan ange en bildtext nedan."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(autodetektera)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Denna version av ditt tillägg uppger sig inte vara kompatibelt med Firefox %1"
+"$s. Mozilla kommer att släppa nästa version av Firefox snart, så testa gärna "
+"ditt tillägg i den nya versionen och uppdatera informationen om "
+"kompatibilitet. Du kan hitta mer information om detta <a href=\"%2$s\">här</"
+"a>. Detta är bara en upplysning och du kan fortsätta med att skicka in denna "
+"version till addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Öppna i ett nytt fönster"
@@ -2420,807 +1421,1380 @@ msgstr "Steg 5: Klart"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Hjälp med inskickningsprocessen"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Tillägget inaktiverat"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Redigera tillägg"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Tillägget aktiverades"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Tilläggets beskrivning"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "Användarvillkor"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Tilläggets hemsida"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Tilläggets namn"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Förhandsgranska bildtext"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Gör aktiv"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Integritetsriktlinjer"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Tilläggets sammanfattning"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "E-postaddress för hjälp"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL för hjälp"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Viktig information för denna version"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominera tillägg"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Tillägget nominerades!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Gör ditt tillägg aktivt för att det ska dyka upp i publika listningar och "
-"erbjudas via uppdateringsskontrollen."
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Färdigställ tillägg"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Färdigställ ditt tillägg och flytta till sandlådan"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Gör inaktivt"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Gör du ditt tillägg inaktivt tas det bort från publika listningar och "
-"uppdateringskontrolltjänsten."
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Flytta till sandlådan"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Flytta ditt tillägg tillbaka till sandlådan. Detta går att ångra."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Nominera för att bli publikt"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Nominera ditt tillägg att bli publikt"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Gör publikt"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Gör ditt tillägg publikt igen."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"Ditt tillägg är <span class=\"inactive-0\">Aktivt</span>. Det betyder att "
-"ditt tilägg dyker upp i all tillgängliga listor tillämpliga för dess status "
-"ovan."
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Du måste uppfylla kriterien ovan innan du kan färdigställa ditt tillägg och "
-"flytta det till <span class=\"status-1\">sandlådan</span>."
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Du kan nu färdigställa ditt tillägg och flytta det till <span class=\"status-"
-"1\">sandlådan</span> genom att klicka på knappen nedan."
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Minst en kategori vald"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "Tilläggsbeskrivning krävs"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "Tilläggsnamn krävs"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Tillägget är ej markerat som en förhandsversion."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "Minst en förhandsvisningsbild krävs för utökningar och teman."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "Tilläggssammanfattning krävs"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Tilläggstatus: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Möjliga handlingar"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Aktiv status: <span class=\"inactive-0\">Aktiv</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Tilläggsfärdigställningkriterie"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Aktiv status: <span class=\"inactive-1\">Inaktiv</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Publiknomineringskriteria"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Betrott status: <span class=\"status-4\">Betrott</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"Ditt tillägg är <span class=\"inactive-1\">Inactive</span>. Det betyder att "
-"ditt tillägg inte dyker upp i några listor, oavsett dess status ovan. "
-"Uppdateringar av ditt tillägg erbjuds <b>ej</> via "
-"uppdateringskontrolltjänsten."
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"Du måste uppfylla kriterien ovan innan du kan nominera ditt tillägg att bli "
-"<span class=\"status-4\">publikt</span>."
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Du kan nu nominera ditt tillägg att bli <span class=\"status-4\">publikt</"
-"span> genom att klicka på knappen nedan."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Publikt"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Sandlåda"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"Ditt tillägg har blivit <span class=\"status-5\">Avstängt</span> av en "
-"administratör och kan inte användas. Om du har några frågor, kontakta %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
 msgstr ""
-"Ditt tillägg är för närvarande <span class=\"status-0\">Ej komplett</span>. "
-"Det betyder att ditt tillägg inte visas någonstans på webbplatsen eller "
-"erbjuds via uppdateringskontrolltjänsten. Du kan gå till den här sidan och "
-"färdigställa ditt tillägg när det uppfyller färdigkriterien nedan och flytta "
-"det till <span class=\"status-1\">sandlådan</span>."
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
-"Ditt tillägg är för nuvarande nominerat för att bli <span class=\"status-4"
-"\">publikt</span> och väntar på redaktörsgodkännande. Det är för närvarande %"
-"s andra tillägg i nomineringskön."
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
 msgstr ""
-"Ditt tillägg är i vänteläge. Det borde inte vara så, kontakta %s med ditt "
-"tiläggs-id och berätta om detta fel."
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
 msgstr ""
-"Ditt tillägg är <span class=\"status-4\">publikt</span>, vilket betyder att "
-"det dyker upp i alla listningar och sökningar och kan laddas ner utan "
-"restriktioner. Uppdateringar erbjuds genom uppdateringskontrolltjänsten."
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
 msgstr ""
-"Ditt tillägg är i <span class=\"status-1\">sandlådan</span>, vilket betyder "
-"att det dyker upp i listningar och sökningar, men användare måste logga in "
-"för att ladda ner det. Uppdateringar erbjuds <b>inte</b> för ditt tillägg "
-"genom uppdateringskontrolltjänsten."
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "%s status"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
-"Ditt tillägg är <span class=\"status-4\">betrott</span>. Det betyder att du "
-"kan publicera uppdateringar av ditt tillägg utan redaktörsgranskning."
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Besök %1$s-sidan för att ändra eller %2$s för att återvända till "
+"Utvecklarverktygen."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "klicka här"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Redigera tillägg"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Denna version har placerats i sandlådan tills den granskats av "
+"sandlådetestare och redaktörer för Mozilla Add-ons. Du kommer att få e-post "
+"när något händer."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Du kan läsa mer om systemet med sandlådans granskningssystem %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "här"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Denna version har placerats i sandlådan för erfarna användare. För att "
+"finnas med på den publika webbplatsen måste du %s ditt tillägg och genomgå "
+"en granskningsprocess."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominera"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Ditt tilläggs inläggning är nu klar."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Eftersom ditt tillägg är betrott har denna version automatiskt godkänts för "
+"denna publika ytan."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Lägg till tillägg"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Tillägget uppdaterat"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Du kan vilja %s för att öka intresset för ditt tillägg."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "lägga till en förhandsvisning"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Ingen författare hittad [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Ta bort"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Avbryt"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Är du säker på att du vill avbryta din inskickning?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Nästa"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Ändra tilläggstyp:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Utvecklarekommentarer uppdaterade."
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "Aktiv"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s för närvarande %2$s och %3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "Ändra status"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
-"Ditt tillägg har blivit avstängt av en administratör och kan ej användas. "
-"Har du några frågor, kontakta %s."
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "Tilläggsstatus: %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "Utvecklarpanelen"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "Välkommen till utvecklarpanelen"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "Inaktiv"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "Senast redigerad den %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
 msgstr ""
-"Du har för närvarande inga tillägg publicerade på Mozilla Add-ons. För att "
-"lära dig hur processen fungerar och skicka in ditt första tillägg, klicka på "
-"Sätt igång nedanför."
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "Sätt igång"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "Versioner och filer"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "Ladda upp en ny version"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "Förhandsvisningen %s kunde inte tas bort från databasen. Försök igen."
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "Förhandsvisningen %s har tagits bort."
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "Du har inte rättigheter att ta bort versioner eller filer."
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s %2$s fil"
-msgstr[1] "%1$s %2$s filer"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Lägg till förhandsvisning"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Författare"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Författare"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Inga"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Kategorier"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Kategori"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Beskrivning"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Inaktiverat"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Detaljer"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Utvecklarekommentarer"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Förhandsvisningar"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versioner"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Hemsida"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Inga"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Ingen bildtext"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Ingen förhandsvisning hittad."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Uppdatera"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "E-post för hjälp"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Ingen e-postadress för hjälp angiven av utvecklaren."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL för hjälp"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Ingen URL för hjälp angiven av utvecklaren."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Betrott"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Inga versioner hittade."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Avbryt och gå tillbaka"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Ja, inaktivera det"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Är det säkert att du vill inaktivera detta tillägg?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Inaktivering av detta tillägg kommer att gömma det från sökningar och "
+"listningar. Det kommer inte längre att kunnas laddas ner från webbplatsen "
+"och hanteras inte av den automatiska klientuppdateringen. Tillägget kommer "
+"för alla praktiska syften att verka borttaget, även om du kan återvända hit "
+"och återaktivera det när det passar."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Inaktivera %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Ja, aktivera det"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Är du säker på att du vill aktivera detta tillägg?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Om du aktiverar detta tillägg kommer det återigen att finnas med i sökningar "
+"och listningar. Det kommer att kunna laddas ner båda från webbplatsen och "
+"automatisk klientuppdatering."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Aktivera %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "Lägg till svar"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "Svar"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
 msgstr ""
-"Det uppstod ett fel när ditt svar sparades. Kontakta gärna %1$s om problemet."
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
 msgstr ""
-"En Mozilla Add-ons redaktör begärde ytterligare information från dig "
-"anågende version %2$s av ditt tillägg %1$s."
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "Ge mer information för tilläggsgranskning av %1$s"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "Skicka in svar"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
 msgstr ""
-"Ditt svar sparades. Andra deltagare i diskussionen underrättas via e-post."
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "Skriven av %1$s den %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Lägg till författare"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "E-postadress till författaren"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Ta bort"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
 msgid "devcp_edit_authors_add_author"
-msgstr "Lägg till ny författare"
+msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "Lägg till författare"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "Författarkontos e-post:"
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "Kontrollerar kontots e-post..."
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "Klicka på Uppdatera författare nedan för att spara."
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "Nuvarande författare"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "Hantera tilläggsförfattare"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "Lista som författare på de publika sidorna"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
-"<strong>Utvecklare</strong> - Kan hantera alla aspekter av tilläggets "
-"visning, utom att lägga till eller ta bort författare."
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
-"<strong>Ägare</strong> - Kan hantera alla aspekter av tilläggets visning, "
-"inklusive lägga till och ta bort författare."
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
-"<strong>Observatör</strong> - Kan se tilläggsutvecklarlistor och statistik, "
-"men kan inte göra några ändringar."
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "Välj en roll för författaren:"
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "Författare"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "Listad"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "Roll"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "Uppdatera författare"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "Uppdatera kategorier"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "Mitt tillägg passar inte i någon av de tillgängliga kategorierna."
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "%s kategorier"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "Hantera tilläggskategorier"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "Håll musen över en kategori för att se dess beskrivning."
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "Kategori %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "Inga kategorier är tillgängliga för denna tilläggstyp och applikation."
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
 msgstr ""
-"Lägg ditt tillägg i denna kategori bara om det inte passar i någon av de "
-"övriga kategorierna."
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "Välj upp till tre %s kategorier för ditt tillägg"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "Lägg till eller ta bort användare som kan hantera detta tillägg."
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Välj relevanta kategorier för varje applikation ditt tillägg stöder."
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
 msgstr ""
-"Lägg till och redigera översättningar för ditt tilläggs sammanfattning, "
-"beskrivning, användarlicens och integritetsriktlinjer."
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "Ändra ditt tilläggs namn, hemsida, ikon och andra flaggor."
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "Uppdatera beskrivningar"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "Rätta felen ovan markerade med rött."
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "Redigera tilläggsbeskrivningar"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
-"All information användare kan vilja ha som inte nödvändigtvis hör hemma i "
-"tilläggets sammanfattning eller beskrivning. Vanliga användningsområden är "
-"listor över kända problem, information om hur man felrapporterar, planerat "
-"datum för en framtida version med mera."
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "Utvecklarkommentarer"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
-"Beskrivningen av ditt tillägg är en längre genomgång av finesser, "
-"funktionalitet  och annat relevant informaiton. Den visas under "
-"sammanfattningen på tilläggets sida."
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "Tilläggsbeskrivning"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
-"Om ditt tillägg har en användarlicens, skriv den i rutan nedan. Om den är "
-"ifylld kommer användare att behöva godkänna den innan de kan installera ditt "
-"tillägg. Notera att en avnändarlicens inte är samma sak som en kodlicens som "
-"GPL eller MPL."
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "Användarlicens"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
-"Om ditt tillägg har integritetsriktlinjer, skriv dem här. Ditt tilläggs "
-"visningssida kommer att ha en länk till dessa."
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "Integritetsriktlinjer"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
-"Sammanfattningen är en kort förklaring av ditt tilläggs grundläggande "
-"funktionalitet som visas i sök och bläddringslistor, liksom på ditt tilläggs "
-"visningssida. <strong>Högst 250 tecken.</strong>"
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "Tilläggssammanfattning"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "Hantera tilläggsförfattare"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "Hantera tilläggskategorier"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "Hantera tilläggsbeskrivningar"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "Hantera tilläggsegenskaper"
+msgstr "Manage Add-on Properties"
+
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Inga kategorier tillgängliga för detta tilläggs typ."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Författare"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Lägg till ikon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Byt ikon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Tillåt användare att se källkodsfilerna på nätet"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Kategorier"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Standardlokal"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Detta tillägg kräver extern programvara"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Rensa bara den existerande ikonen"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Ny ikonfil"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Ikon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Ytterligare lokalinformation"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Detta är en förhandsversion"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Detta är ett tillägg för en specifik webbplats"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "MÃ¥llokal"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "kort ytterligare information (som namn på lokal dialekt)"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "Uppdatera egenskaper"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "Ändra bara om du förstår konsekvenserna."
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "Nuvarande ikon"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
-"Ett tilläggs standardlokal är dess huvudlokal för vilken de måste finnas en "
-"översättning. Om det inte finns någon översättning för ditt tillägg i "
-"användarens valda språk kommer denna lokal att användas istället."
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "Dessa flaggor användas för att filtrera och klassificera tillägg."
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
-"Ditt tilläggs GUID anges i dess install.rdf och används för att identifiera "
-"det. Du kan inte ändra ditt GUID när det väl är listat hos Mozilla Add-ons."
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "Rediga tilläggsegenskaper"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "Tilläggstyp"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "Administratörsinställningar"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "Standardlokal"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "Tilläggsflaggor"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "Tilläggets GUID"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "Tilläggsikon"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "Andra inställningar"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "Betrott tillägg?"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "Visa källkoden på nätet"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
-"Tilläggets ikon är en liten bild som visas bredvid ditt tilläggs namn i sök- "
-"och bläddringslistor, dess huvudsida och installationsdialogen. Bilden "
-"skalas automatiskt ner till 32x32 pixlar. Använd en av följande bildtyper: %s"
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "Detta tillägg innehåller binära komponenter"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "Ej betrott"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "Betrott"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "Ny ikon"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "Ta bort ikon"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
-"Om ditt tillägg har en till hemsida, skriv dess adress här. Översättningar "
-"behövs inte om inte din webbplats är lokaliserad för andra språk."
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "Tilläggshemsida"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "Namnet på ditt tillägg visas överallt där ditt tilläg listas."
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "Tilläggsnamn"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
-"Om du har en e-postadress för hjälpförfrågningar, ange den här. "
-"Översättningar för andra språk behöver inte anges om du inte har olika e-"
-"postadresser för olika språk."
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "E-postadress för hjälp"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
-"Om ditt tillägg har en webbplats eller ett forum för hjälp, ange adressen "
-"här. Översättningar för andra språk behövs inte om inte din webbplats har "
-"specialversioner för andra språk."
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "Webbplats för hjälp"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "Betrodda tillägg kan bli publika direkt utan redaktörsgodkännande."
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "Ikonen tas bort när du sparar. <a %s>Avbryt?</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
-"Källkoden för ditt tillägg kan visas direkt på nätet för inloggade användare "
-"om du vill."
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "Tillåt källkodsvisning på nätet"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "Tillåt inte källkodsvisning på nätet"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Uppdatera"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">enkelt "
+"lokalnamn</a>, exempelvis 'en-US'"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "Författare"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "Kategorier"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "Ändra status"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "Beskrivningar"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "Redigera tillägg"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "Ny version"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "Egenskaper"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "Förhandsvisa skärmbilder"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "Statistikpanelen"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "Versioner och filer"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "Visa listning"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
@@ -3232,7 +2806,7 @@ msgstr "Uppmärksammat tillägg"
 #, php-format
 msgid "devcp_editorsqueue_moderatedreviews"
 msgid_plural "devcp_editorsqueue_moderatedreviews"
-msgstr[0] "Modererad recension (%s)"
+msgstr[0] "Modererade recensioner (%s)"
 msgstr[1] "Modererade recensioner (%s)"
 
 #. %1 is the nominated addons count
@@ -3241,7 +2815,7 @@ msgstr[1] "Modererade recensioner (%s)"
 #, php-format
 msgid "devcp_editorsqueue_nominated"
 msgid_plural "devcp_editorsqueue_nominated"
-msgstr[0] "Nominerat tillägg (%s)"
+msgstr[0] "Nominerade tillägg (%s)"
 msgstr[1] "Nominerade tillägg (%s)"
 
 #. %1 is the update count
@@ -3250,17 +2824,71 @@ msgstr[1] "Nominerade tillägg (%s)"
 #, php-format
 msgid "devcp_editorsqueue_pendingupdates"
 msgid_plural "devcp_editorsqueue_pendingupdates"
-msgstr[0] "Väntande uppdatering (%s)"
+msgstr[0] "Väntande uppdateringar (%s)"
 msgstr[1] "Väntande uppdateringar (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Förkryssade filer kommer att tas bort."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Filer"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "MÃ¥lapplikationer"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Inga filer."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Information till granskare"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Uppdatera"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Du har inte åtkomst till det tillägget."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Sammanfattningar är begränsade till max 250 tecken \n"
+"(du skrev %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Namnet på detta tillägg finns redan i databasen. Försäkra dig om att: <br /"
+"><li>Dina GUIDs stämmer. Den vanligaste orsaken till detta fel är GUIDs som "
+"inte stämmer.</li><li>Du inte har två poster i databasen. Har du det bör du "
+"uppdatera den posten eller ta bort den och försöka igen.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3274,16 +2902,17 @@ msgstr "Se %s för referens."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "denna sida"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Ditt tillägg måste ha minst en ägare."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Beskriv ändringarna i denna tilläggsuppdatering."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
 msgstr ""
-"En version av det tillägget finns redan. För att ersätta det måste du ta "
-"bort filen %1$s först."
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
@@ -3294,6 +2923,10 @@ msgstr ""
 "Den filextensionen (%s) tillåts inte för den valda tilläggstypen. Använd en "
 "av följande: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Inte alla fil-GUID stämde"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Välj mindre en fem kategorier."
@@ -3328,7 +2961,14 @@ msgstr ""
 "Den filextensionen (%s) är inte tillåten för en ikon. Använd en av följande: "
 "%s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "En identisk version (%s) finns redan för detta tillägg och plattform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Ingen install.rdf fanns."
 
@@ -3336,7 +2976,7 @@ msgstr "Ingen install.rdf fanns."
 msgid "devcp_error_install_manifest"
 msgstr "Följande fel hittades i install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Välj en giltig tilläggstyp."
 
@@ -3407,6 +3047,18 @@ msgstr "Inget ID fanns för detta tillägg i install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "Ingen plattform vald"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Du måste ange de begärda detaljerna för att nominera."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Du kan inte nominera ett förhandssläppt tillägg."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Du kan bara nominera tillägg som finns i sandlådan."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Välj minst en kategori."
@@ -3424,6 +3076,16 @@ msgstr ""
 "Den filändelsen (%s) är inte tillåten för en förhandsvisning. Använd en av "
 "följande: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Ett fel inträffade när dina data skulle sparas."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Du har inte rättighet att uppdatera detta tillägg."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3436,81 +3098,290 @@ msgstr ""
 "Tillägg kan inte ha en extern updateURL. Ta bort den från install.rdf och "
 "försök igen."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Ladda upp en fil."
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Lägg till en till plattformsfil"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Lägg till författare"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Ta bort"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Kategorier för din nya tilläggstyp kommer att finnas i nästa steg."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Inga kategorier fanns tillgängliga för denna tilläggstyp."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Ge en beskrivning av ditt tillägg."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Skriv namnet på ditt tillägg."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Välj typ på tillägget du skickar in."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Skriv en sammanfattning av ditt tillägg."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Tilläggsfil"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Tilläggsfil 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Tilläggsfil 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Tilläggstyp"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Tillåt användare att titta på källkoden direkt"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Författarens e-postadress"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Författare"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Kategorier"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Standardlokal"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Beskrivning"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Användningsvillkor (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Detta tillägg kräver extern programvara"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Filer"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Hemsida"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Ikonfil"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Namn"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Plattformar som stöds"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Detta är en förhandsversion"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Integritetsriktlinjer"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Detta tillägg är specifikt för en särskild webbplats"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Sammanfattning"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "E-postadress för hjälp"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL för hjälp"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "MÃ¥lapplikationer"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Information för versionen"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Inga"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Information till granskaren"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "Efersom ditt tillägg är betrott, välj var denna version ska placeras:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Publik"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandlåda"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Utvecklareavtal"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Steg 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "Ladda upp fil"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Steg 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Detaljer för tillägget"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Steg 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Versionsdetaljer"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Steg 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Lokalisering"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Steg 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Klart"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Mina tillägg"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "Avbryt"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "Ange e-postadressen för den författare du vill lägga till."
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "Flytta ner"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "Flytta upp"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "Ta bort applikationskompatibilitet"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "Lista som författare i publika listningar"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Välj en licens."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Skriv texten för din licens."
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "Utvecklare"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "Ägare"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "Observatör"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "Ta bort författare"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "Är du <strong>säker</strong> på att du vill ta bort denna författare?"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "Du måste välja en fil att ladda upp."
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Anpassad licens för tillägget %1$s v%2$s"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
@@ -3527,12 +3398,12 @@ msgstr ""
 "kommer den förvalda (%s) att användas istället."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Adminverktyg"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Redigerarverktyg"
 
@@ -3541,61 +3412,76 @@ msgid "devcp_myaddons_link"
 msgstr "Mina tillägg"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Tillbaka till huvudsidan"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistikpanelen"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Skicka in tillägg"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Utvecklarverktyg"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
-"Detta tilläggsid (%1$s) finns redan i databasen. Om detta är ditt tillägg "
-"kan du <a href=\"%2$s\">ladda upp en ny version</a>."
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "Avbryt och återvänd"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Tillbaka till detaljer för tillägget"
 
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominera %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatiskt detekterad tilläggstyp: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
-"<span>En eller flera av dina ändringar kunde inte sparas.</span><br />Se "
-"felen nedanför, dina övriga ändringar sparades ordentligt."
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
 msgstr ""
-"<span>Dina ändringar är sparade.</span><br />Notera att det kan ta flera "
-"timmar innan ändringar slår igenom på alla delar av webbplatsen."
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
@@ -3603,6 +3489,17 @@ msgstr ""
 "Om du tar bort detta som standardförhandsvisning kommer en annan "
 "förhandsvisning automatiskt att bli ny standardförhandsvisning."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Standardlokalen för detta tillägg (%1$s [%2$s]) skiljer sig från din "
+"nuvarande lokal (%3$s [%4$s]). Fälten nedan bör fyllas i enligt %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -3610,13 +3507,14 @@ msgstr ""
 "Om du gör detta till standardförhandsvisning kommer det att ta bort denna "
 "status från nuvarande standardförhandsvisning."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "Du har osparade ändringar."
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3645,50 +3543,59 @@ msgstr "Redigera förhandsvisning"
 msgid "devcp_preview_updated_successfully"
 msgstr "Förhandsvisning uppdaterad."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "Lägg till en till förhandsvisning"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "Ta bort förhandsvisning"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "Ersätt förhandsvisning"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "Uppdatera förhandsvisningar"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "Lägg till ny förhandsvisning"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
-"Välj en bild att ladda upp nedanför. Bilder större än maxstorleken 700 "
-"pixlar bred, 525 pixlar häg kommer att skalas ned. Godkända filtyper: %s"
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "Klicka uppdatera förhandsvisningar nedan för att ladda upp."
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
-"Klicka på knappen Uppdatera förhandsvisningar nedan för att spara denna "
-"bild. (<a %s>Avbryt?</a>)"
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
-"Denna förhandsvisning tas bort när du klickar på Uppdatera förhandsvisningar "
-"nedan. (<a %s>Avbryt?</a>)"
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
@@ -3701,17 +3608,19 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Lägg till förhandsvisning"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "Bildtext för förhandsvisning"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "Redigera förhandsvisning"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "Huvudförhandsvisning"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
@@ -3721,28 +3630,33 @@ msgstr "Förhandsvisningsfil"
 msgid "devcp_previews_label_makedefault"
 msgstr "Gör detta till standardvald förhandsvisningsbild"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "Ny bild:"
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "Ladda upp förhandsvisning: "
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "En eller flera av dina nya förhandsvisningar kunde inte sparas."
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "Dina förhandsvisningar har uppdaterats."
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
-"Förhandsvisningen för ditt tillägg visas nedan. Du kan ändra bildtexter "
-"eller bilder där. Huvudförhandsvisningen är den som visas bredvid ditt "
-"tillägg i sök- och bläddringslistor."
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3760,35 +3674,52 @@ msgstr "Redigera förhandsvisning"
 msgid "devcp_previews_submit_upload"
 msgstr "Ladda upp förhandsvisning"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "Tumnagel"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "%s förhandsvisningshanterare"
+msgstr "%s Preview Manager"
+
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Felaktig?"
 
-#: views/developers/uploader.thtml:74
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Är du säker på att du vill ta bort den här filen?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Var vänlig läs igenom och godkänn Utvecklaravtalet innan du fortsätter."
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
-"<span>Du har inte tillräckliga rättiigheter för att göra ändringar på denna "
-"sida.</span><br />Kontakta tilläggets ägare om du behöver göra ändringar."
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
-"Notera att en del ändringar kan ta flera timmar innan de slår igenom på alla "
-"delar av webbplatsen."
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "Panelen"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Hoppa över uppdatering av information för mitt nuvarande tillägg"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3812,662 +3743,802 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "<em>%s</em> hämtningar denna vecka"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"Markeras detta tillägg som aktivt gör att det dyker upp i publika områden "
-"tillämpliga för dess status, inklusive sökningar och när man bläddrar. Det "
-"kommer att kunna laddas ner från webbplatsen och kan vara tillgängligt via "
-"uppdateringskontrolltjänsten beroende på status. Du kan komma tillbaka hit "
-"och inaktivera det när du vill."
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "Är du säker på att du vill göra detta tillägg aktivt?"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "Är du säker?"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
-"Markeras detta tillägg som inaktivt kommer det inte att dyka upp i publika "
-"områden, inklusive sökningar och när man bläddrar. Det kommer inte att "
-"kunnas laddas ner från webbplatsen och är inte tillgängligt via "
-"uppdateringskontrolltjänsten. Du kan komma in här och tillgängliggöra det "
-"igen när du vill."
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "Är du säker på att du vill markera detta tillägg som inaktivt?'"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "Nej, avbryt"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
 msgstr ""
-"Gör du detta tillägg publikt kommer det att bli tillgängligt att ladda ner "
-"för alla och erbjuds som uppdatering för befintliga användare."
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "Är du säker på att du vill göra tilläggget publikt?"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"Flyttar du detta tillägg tillbaka till sandlådan kommer användare att behöva "
-"logga in innan de kan ladda ner det och uppdateringar kommer inte längre att "
-"erbjudas till befintliga användare. Eftersom ditt tillägg är publikt för "
-"närvarande kan du komma tillbaka hit när som helst och göra det publikt igen."
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "Är du säker på att du vill flytta tillägget till sandlådan?"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "Ja, jag är säker"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
-"<span>Ett nomineringsmeddelande krävs.</span><br />Fyll i textrutan med den "
-"begärda informationen och försök igen."
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "Tilläggsnominering"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "Tillägg kan inte läggas till för närvarande. Försök igen senare."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Jag accepterar"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Jag avböjer"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Detta tillägg har inaktiverats av en administratör."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Inaktiverat"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Betrott"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Senaste version:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Du har inga tillägg. Klicka %s för att skicka in ett."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "här"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Se till att %s för ditt tema."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "ladda upp en förhandsvisning"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "Redigera %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "Hjälp (lämnar inte sidan)"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "Hjälp"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "Använda tecken: %1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "Är du säker på att du vill ta bort denna översättning?"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "Vad är dessa %s flikar?"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "Om jag inte har några översättningar?"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "Göm hjälp"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"Om en användare bläddrar på webbplatsen och det inte finns någon "
-"översättning för deras språk kommer den att använda standardlokalen som "
-"anges på Redigera tilläggsegenskaper. Om du inte har några översättningar, "
-"skriv bara vad du kan i din standardlokal som bör vara ett språk du kan."
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"Det här är en <i>översättnignsruta</i>. Det låter dig lokalisra ett enskilt "
-"fält till andra språk du har översättningar för. Du kan lägga till, redigera "
-"och ta bort översättningar på lokalfliken."
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "Lägg till översättning"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "Ta bort översättning"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "Lägg till lokal till alla"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "Lägg till lokal"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "Avbryt"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "Ta bort den"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "Välj lokal för översättningen du lägger till:"
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
-"Det GUID som används i denna fil (%1$s) stämmer inte med GUID-t för detta "
-"tillägg (%2$s)."
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "Du har inte rättighet att uppdatera detta tillägg."
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "Den angivna versionen (%1$s) tillhör inte detta tillägg (%2$s)."
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"Versionsnumret du laddade upp (%1$s) finns redan för detta tillägg. Om du "
-"vill lägga till en till fil för denna version, <a href=\"%2$s\">klicka här</"
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
-"Det uppladdade versionsnumret (%1$s) stämmer inte med befintligt "
-"versionsnummer (%2$s)."
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "Sätt igång"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "Laddar upp fil..."
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "Godkänn och fortsätt"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "Redigera mitt tillägg"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "Jag gör klart mitt tillägg senare."
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "Lägg till versionsinformation"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
-"<p>Ditt tilläggslistning har skapats. Grundläggande information från din "
-"uppladdade fil har lagrats, men det finns mycket mer i din listning som kan "
-"anpassas.</p><p>Ditt tillägg är för närvarande märkt som <strong>ej "
-"komplett</strong>. För att färdigställa ditt tillägg måste du försäkra dig "
-"om att det har rätt namn, sammanfattning och beskrivning, liksom att välja "
-"minst en kategori. Du kan redigera ditt tilläggs information via länken "
-"nedanför och kontrollera status för ditt tillägg när som helst på <a %"
-"s>statussidan</a>."
-
-#: views/developers/uploader.thtml:143
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "Vänligen rätta detta och ladda upp din fil igen."
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
-"Din nya fil har lagts till version %1$s och är för närvarande märkt som %2$s."
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "Tillägg skapat!"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "Oj! Det verkar vara ett problem med den här filen..."
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "Fil tillagd!"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "Hur fungerar det?"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "Version %s skapad"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "Ladda upp din fil"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
-"<p>Tack för ditt intresse av att skicka in ditt tillägg till Mozilla Add-"
-"ons. Publicering på Mozilla Add-ons är det enklaste sättet att hantera "
-"distribution av ditt tillägg. Det här får du:</p><ul><li>Varje tillägg har "
-"en publik visningssida med information du anger, som en kort sammanfattning "
-"av tilläggets funktionalitet, en frivillig längre beskrivning och "
-"förhandsvisningar av ditt tillägg.</li><li>Ditt tillägg dyker upp i sök- och "
-"bläddringslistor på webbplatsen och till och med i tilläggshanteraren i "
-"Firefox 3.</li><li>Vi hanterar publicering av alla dina nedladdningsbara "
-"filer och erbjuder en automatisk uppdateringstjänst till användare när du "
-"laddar upp en ny version.</li><li>Du får tillgång till en statistikpanel med "
-"detaljerad information om dina användare.</li></ul><p>Tillägg publicerade på "
-"webbplatsen måste granskas av en redaktör från Mozilla Add-ons innan de "
-"åtnjuter alla finesser ovanför. Om du är redo att starta processen och har "
-"ditt tillägg färdigt för uppladdning, klicka bara på Sätt igång nedanför!</p>"
-
-#: views/developers/uploader.thtml:125
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "Stödda plattformar:"
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "Tilläggsfil: "
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Annat"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
-"Den nya filen kommer att bli publikt tillgänglig så snart en editor har "
-"godkänt den. Det är för närvarande %1$s andra tillägg i kön. Vill du fått "
-"ditt tillägg granskat snabbare? Överväg att <a %2$s>bli en editor</a>."
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
-"Den nya versionen blir tillgänglig för alla så snart som en redaktör har "
-"granskat det. Det är för närvarande %1$s andra tillägg i kön. Vill du få det "
-"granskat snabbare? Fundera på att <a %2$s>bli redaktör</a>."
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "Din nya version är skapad och är för närvarande märkt som %s."
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
-"Se din nya fil på <a %1$s>Versioner och filer-sidan</a>, kontrollera ditt "
-"tilläggs <a %2$s>nuvarande status</a>, eller <b>lägg till "
-"versionsinformation</b> genom att klicka på knappen nedan (rekommenderas "
-"starkt)."
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
-"Se din nya version på <a %1$s>Versioner och filer-sidan</a>, kontrollera "
-"ditt tilläggs <a %2$s>nuvarande status</a>, eller <b>lägg till "
-"versionsinformation</b> genom att klicka på knappen nedan (rekommenderas "
-"starkt)."
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
-"Ladda upp din fil med formuläret nedanför. Om du har flera, "
-"plattformsspecifika filer att ladda upp, välj en fil och ladda upp de andra "
-"senare med Versioner och filer-hanteraren."
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "Alla"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "Specifik:"
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Var god välj..."
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "Lägg till fil till %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "Skicka in nytt tillägg"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "Uppdatera %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Se %s för referens."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "denna sida"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "Det fanns inget konto med den e-postadressen."
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Antingen är XMLn ogiltig eller så saknas obligatoriska fält. <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">Läs dokumentationen</a>, kontrollera ditt tillägg och försök igen."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Redigera version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Versionen uppdaterad."
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "Avbryt"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "Ta bort version"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "Ta bort tom version"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "Ta bort?"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "Lägg till ny version"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "Avbryt"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "Ta bort version"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "Detta tar också bort:"
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s fil"
-msgstr[1] "%s filer"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "Ta bort version %s?"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s recension"
-msgstr[1] "%s recensioner"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "Är du säker på att du vill ta bort version %s permanent?"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "Avbryt"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "Ta bort fil"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "Lägg till ny applikation"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "Ta bort applikation"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "Lägg till ny fil"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"Ändrar du applikationsinformation här låter det användare installera ditt "
-"tillägg även om dess install.rdf säger att tillägget inte är kompatibelt. <a "
-"%s>Lista på applikationer som stöds</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
-"Är du <b>säker</b> på att du vill ta bort kompatibilitet med denna "
-"applikation?"
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "Är du <b>säker</b> på att du vill ta bort filen permanent?"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "Godkännandeinformation"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "Kompatibla applikationer"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "Filinformation"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Licens"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "Hantera version %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "Information vid godkännande"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "Ta bort fil"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "Filen %1$s (%2$s) skapad den %3$s och ändrad till %4$s den %5$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Välj den licens som är tillämplig för ditt tillägg. Denna licens bestämmer "
-"vilka rättigheter du ger till din källkod."
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "Hittade inga filer."
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "Frivillig information för den redaktör som granskar denna version."
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "Ta bort applikationskompatibilitet"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "Välj en applikation"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "Fil"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "Plattform"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "Storlek"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"Information om ändringar i denna version, nya finesser, kända fel och annan "
-"användbar information för denna version. Denna information är även "
-"tillgänglig för användare som uppdaterar tillägget med Firefox 3s "
-"tilläggshanterare."
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "Versionsinformation"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>Du har osparade ändringar.</strong> kompatibilitet tas inte bort "
-"förrän du klickar Uppdatera version nedanför."
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>Du har osparade ändringar.</strong> Filer tas inte bort förrän du "
-"klickar Uppdatera version nedanför."
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "Uppdatera versioner"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "Hantera versioner och filer"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "Inga versioner."
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "Version %s togs bort."
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
 msgstr ""
-"Denna version har inga filer kopplade till sig och kan tas bort.d Vill du ta "
-"bort denna version?"
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "Skapad"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
 msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Detta tillägg är inaktiverat"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "Detta tillägg har inte blivit nominerat."
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "Denna fil väntar inte på granskning."
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
 #: controllers/components/editors.php:79
 #: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "Välj ett granskningsutfall."
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "Skriv de applikationer du testat."
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
 #: controllers/components/editors.php:84
 #: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "Ange granskningskommentarer."
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "Välj minst en fil att granska."
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "Skriv de operativsystem du testat."
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
@@ -4477,7 +4548,7 @@ msgstr "Filtrera"
 msgid "editorcp_logs_filter_by"
 msgstr "Filtrera på typ/handling"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Händelselogg"
 
@@ -4539,7 +4610,7 @@ msgstr "Visa poster mellan %s och %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Inga granskningar hittade i denna period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Granskningslogg"
 
@@ -4563,24 +4634,24 @@ msgstr "Färsk redaktörsaktivitet"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Totala granskningar"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Granska tillägg"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Fyll i följande fält:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Välj minst en fil att granska."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Granskningar av eget material är inte tillåtet."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Extern programvara"
 
@@ -4592,39 +4663,39 @@ msgstr "Lägg till uppmärksamhet"
 msgid "editors_featured_add_feature_submit"
 msgstr "Lägg till"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Misslyckades med att lägga till uppmärksamhet för tillägg."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Uppmärksammade tillägg."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Misslyckades med att redigera uppmärksamhet."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Redigerade uppmärksamhet."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "En eller flera lokaler är ogiltiga."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Misslyckades med att ta bort uppmärksamhet."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Tog bort uppmärksamhet."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Uppmärksammade tillägg"
 
@@ -4636,266 +4707,220 @@ msgstr "Utför"
 msgid "editors_featured_remove_feature"
 msgstr "Ta bort uppmärksamhet"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filtrera kö"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Hjälpsamma länkar"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Redaktörsguide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Add-ons riktlinjer"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Detta filter kvarstår för denna session eller tills de rensas."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Det finns just nu inga tillägg av denna typ att granska."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 dag"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 timme"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minut"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Redaktörsverktyg"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s bara"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Förhandsversion"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s kompatibilitet"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Tilläggs- eller författarepostadress"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Tilläggstyper"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Applikation"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. version"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "Plattformar"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Ålder på inskickning (dagar)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Resultatet av din filtrerade sökning: <strong>%1$s</strong> tillägg"
-msgstr[1] "Resultatet av din filtrerade sökning: <strong>%1$s</strong> tillägg"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Rensa"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filtrera"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "Alla granskningsköer är för närvarande avstängda. Titta tillbaka senare."
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Redigera post"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Historik för post"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Hemsida för post"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Översikt för post"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Förhandsgranskningar"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Granska handling"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "Begär mer information"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Tryck ut till publika"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Begär super-granskning"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Håll kvar i sandlådan"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Granska kommentarer"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
-"Använd det här formuläret för att begära mer information av en författare. "
-"De får e-post och kan svara här. När de har svarat får du besked via e-post."
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Detta markerar tillägget och dess senaste version och filer som publika. "
 "Framtida versioner placeras i sandlådan tills de granskats av en redaktör."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Detta håller kvar tillägget i sandlådan."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Detta godkänner att en version i sandlådan av ett publikt tillägg flyttas "
 "över till den publika sidan."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "Detta gör att en version i sandlådan av ett publikt tillägg stannar kvar i "
 "sandlådan."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Om du har farhågor om detta tilläggs säkerhet, upphovsrättsstatus eller "
 "annat som administratörerna borde undersöka, skriv dina kommentarer i rutan "
 "nedan. De kommer att skickas till administratörerna, inte författaren."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Jämför med publik version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Visa innehåll"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Författare:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Kategorier:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Kompatibilitet:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Beskrivning"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Utvecklarekommentarer"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Användningsvillkor (EULA)"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Filer:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Historik"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomineringsmeddelande"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Förhandsvisningar"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Integritetspolicy"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Granskning %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Information till granskare"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Sammanfattning"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Information för versionen"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "Svara"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "Begäran av information"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -4912,7 +4937,7 @@ msgstr "Nominering godkänd/Publik"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nominering nekad/Sandlåda"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Inga tidigare granskningsposter hittades."
 
@@ -4934,103 +4959,101 @@ msgstr "Nekad/Sandlåda"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "Visa/göm svar (%1$s)"
-msgstr[1] "Visa/göm svar (%1$s)"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applikationer:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "eller välj ett färdigt svar:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Kommentarer:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operativsystem:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Högst upp"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Obs: Granska bara mer en än fil om du har testat VARJE fil du väljer."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
+#, fuzzy
 msgid "editors_review_next_link"
-msgstr "nästa &raquo;"
+msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Inga förhandsivsningar funna."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
+#, fuzzy
 msgid "editors_review_previous_link"
-msgstr "&laquo; föregående"
+msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Granskningskö"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
+#, fuzzy
 msgid "editors_review_rank_in_queue"
-msgstr "<strong># %1$s</strong> av %2$s i kön"
-
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> av %2$s i kön (filtrerad)"
+msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Utför"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Handling"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Kommentarer"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Datum"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Recensent"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/Fil"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
-"Underrätta mig nästa gång det här tillägget uppdateras (e-post skickas inte "
-"för därpå följande uppdateringar)"
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Recensionen hanterad."
 
 #: views/editors/reviews_queue.thtml:106
+#, fuzzy
 msgid "editors_reviews_action_delete_review"
-msgstr "Ta bort recension"
+msgstr "Delete review"
 
 #: views/editors/reviews_queue.thtml:104
+#, fuzzy
 msgid "editors_reviews_action_keep"
-msgstr "Ta bort flagga; behåll recension"
+msgstr "Remove flags; keep review"
 
 #: views/editors/reviews_queue.thtml:102
 msgid "editors_reviews_action_skip"
@@ -5044,7 +5067,7 @@ msgstr "Handling"
 msgid "editors_reviews_in_reply_to"
 msgstr "Som svar till:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Recensioner hanterade!"
 
@@ -5056,79 +5079,87 @@ msgstr "Det finns för närvarande inga recensioner att moderera."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Hantera recensioner"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Webbplatsspecifik"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Ny"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Uppdaterad"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Testade applikationer"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Testade operativsystem"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Ytterligare information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Tillägg"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Typ"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Tilläggstyper"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Ã…lder"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applikationer"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Begränsa till lokaler?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Tid i kön"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Stigande sortering"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Plattformar"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Fallande sortering"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Inskickningstyper"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s dagar"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s timmar"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minuter"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Ã…tkomst nekad"
 
@@ -5136,18 +5167,17 @@ msgstr "Ã…tkomst nekad"
 msgid "error_access_denied_message"
 msgstr "Du har inte rättigheter att se denna sida."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Tillägget finns redan!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5156,14 +5186,11 @@ msgstr "Tillägget finns redan!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Tillägget hittades inte!"
 
@@ -5175,53 +5202,58 @@ msgstr "Detta tillägg är inte synligt här."
 msgid "error_addon_selfreview"
 msgstr "Du kan inte recensera ditt eget tillägg."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Inga tillägg i denna kategori!"
 
 #: controllers/api_controller.php:424
 msgid "error_collection_feed_notfound"
-msgstr "Kanal för tillägg hittades inte."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Detta är inte en giltig e-postadress."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Detta fält får inte vara tomt."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Filen hittades inte!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Fel: filen %s finns inte."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Det finns fel i formuläret. Rätta dem och skicka in igen."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Felaktigt svar, försök igen!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "URLen har ett ogiltigt format. Giltiga URLer ser ut som http://example.com/"
@@ -5229,46 +5261,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Saknat argument: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
+#, fuzzy
 msgid "error_no_files_in_addon"
-msgstr "Inga filer"
+msgstr "No Files"
+
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Information"
 
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Förhandsvisning ej funnen!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Du måste välja ett betyg."
 
@@ -5276,45 +5297,37 @@ msgstr "Du måste välja ett betyg."
 msgid "error_user_already_confirmed"
 msgstr "Detta användarkonto har redan bekräftats."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Felaktig bekräftelsekod!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Lösenorden skiljde sig."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Denna e-postadress används redan av en annan användare."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "E-poständringen har expirerat. Ändra din e-postadress i profilen igen och "
 "klicka på länken i bekräftelsebrevet direkt när du har fått det."
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr ""
-"Användare kan bara ha en roll i tagit. Tabort användaren från existerande "
-"roller innan du fortsätter."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Detta kortnamn är upptaget."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Användaren fanns inte!"
 
@@ -5322,113 +5335,118 @@ msgstr "Användaren fanns inte!"
 msgid "error_user_unconfirmed"
 msgstr "Bekräfta ditt konto med koden du fick via e-post först."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Fel användarnamn eller lösenord!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Versionen fanns inte!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Fel lösenord angett!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Läs mer"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Lär dig mer om %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s recension"
 msgstr[1] "%1$s recensioner"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Se mer från"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "Tillbaka till tillägg"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "Expandera alla"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "Tillbaka till recension"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: Filbläddrare :: %2$s Tillägg"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "Om"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "Ofta ställda frågor"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Alla rättigheter reserverade."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Upphovsrättsskyddad"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "De som bidragit"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla bistår med länkar till dessa applikationer av välvilja och kan inte "
@@ -5436,96 +5454,91 @@ msgstr ""
 "Alla frågor, klagomål eller krav rörande applikationerna måste riktas till "
 "utgivaren av applikationen."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Utför"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Rättighetsinformation"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Andra språk:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Integritetsriktlinjer"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Spara"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Ordlista"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Ordlistor"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Utökning"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Utökningar"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Språkpaket (Tillägg)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Språkpaket (Tillägg)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Språkpaket (Applikation)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Språkpaket (Applikation)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Insticksprogram"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Insticksprogram"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Sökmotor"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Sökmotorer"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Tema"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Teman"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Alla lokaler"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "tillbaka till %1$s tilläggshemsida"
@@ -5534,78 +5547,37 @@ msgstr "tillbaka till %1$s tilläggshemsida"
 msgid "header_main_firefox_header"
 msgstr "Firefox-tillägg"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Tillägg <em>för</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Tillägg"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Tillägg <img alt=\"Tillägg\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey-tillägg"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Tillägg <em>för</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird-tillägg"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Tillägg <em>för</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird-tillägg"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Tillägg <em>för</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "Hoppa till menyn för andra applikationer"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "Hoppa till menyn för kategorier"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "Hoppa till huvudinnehållet"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "Hoppa till sökformuläret"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Tillägg"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Logga in"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Logga ut"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Mitt konto"
 
@@ -5613,69 +5585,47 @@ msgstr "Mitt konto"
 msgid "header_navlink_register"
 msgstr "Registrera dig"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr ""
-"<a href=\"%1$s\">Registrera dig</a> eller <a href=\"%2$s\">Logga in</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Verktyg"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Förhandsvisningsbild av %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Logga in</a> för att installera detta tillägg"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Låt mig installera detta experimentella tillägg. <a href=\"%1$s\">Vad är "
-"detta?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Lägg till %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Lägg till %1$s till %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Hämta hem %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Detta tillägg är inte tillgängligt."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Lista på språkpaket och ordböcker."
 
@@ -5687,8 +5637,8 @@ msgstr "Hämta hem ordlista"
 msgid "langtools_download_langpack"
 msgstr "Hämta hem språkpaket"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Ordlistor & språkpaket"
 
@@ -5700,77 +5650,42 @@ msgstr "Installera ordlista"
 msgid "langtools_install_langpack"
 msgstr "Installera språkpaket"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Ordlista"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Språkpaket"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Språk"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Anpassad licens"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD-licens"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11-licens"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Klicka här för att komma tillbaka till förstasidan."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Datum"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Hämtningar"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Tilläggets namn"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Betyg"
 
 #: config/bootstrap.php:278
+#, fuzzy
 msgid "main_prettyname_fennec"
 msgstr "Fennec"
 
@@ -5790,88 +5705,88 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Ordlistor och språkpaket"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Insticksprogram"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Teman"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Hitta tillägg för andra applikationer"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "andra"
 
 #: controllers/pages_controller.php:90
+#, fuzzy
 msgid "page_title_appversions"
-msgstr "Applikationsversioner"
-
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Tillägssamlaren"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Tillägssamlaren FAQ"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Tillägssamlaren finesser"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Välkommen till tilläggssamlaren"
+msgstr "Application Versions"
 
 #: controllers/pages_controller.php:92
+#, fuzzy
 msgid "page_title_credits"
-msgstr "De som bidragit"
+msgstr "Credits"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "Utvecklar FAQ"
+#, fuzzy
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
+#, fuzzy
 msgid "page_title_faq"
-msgstr "Ofta ställda frågor"
+msgstr "Frequently Asked Questions"
 
 #: controllers/pages_controller.php:94
+#, fuzzy
 msgid "page_title_fashionyourfirefox_faq"
-msgstr "Vanliga frågor om Fashion your Firefox"
+msgstr "Fashion your Firefox FAQ"
 
 #: controllers/pages_controller.php:101
+#, fuzzy
 msgid "page_title_policy"
-msgstr "Add-ons-riktlinjer"
+msgstr "Add-ons Policy"
 
 #: controllers/pages_controller.php:103
+#, fuzzy
 msgid "page_title_privacy"
-msgstr "Mozillas integritetsriktlinjer"
+msgstr "Mozilla Privacy Policy"
 
 #: controllers/pages_controller.php:105
+#, fuzzy
 msgid "page_title_review_guide"
-msgstr "Recensionsriktlinjer"
+msgstr "Review Guidelines"
 
 #: controllers/pages_controller.php:107
+#, fuzzy
 msgid "page_title_sandbox"
-msgstr "Sandlåderecensionssystemet"
+msgstr "Sandbox Review System"
 
 #: controllers/pages_controller.php:109
+#, fuzzy
 msgid "page_title_submissionhelp"
-msgstr "Hjälp med inskickning"
+msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Giltiga applikationsversioner"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Tillägg som skickas in till Mozilla Add-ons måste ha en install.rdf-fil där "
@@ -5879,7 +5794,7 @@ msgstr ""
 "för dessa applikationer."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5888,15 +5803,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "här"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Versioner"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Tillbaka till föregående sida"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Informationssida för sandlådan"
 
@@ -5904,6 +5822,12 @@ msgstr "Informationssida för sandlådan"
 msgid "pagination_next_page"
 msgstr "nästa"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Detta är sida %1$s av %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "föregående"
@@ -5919,59 +5843,67 @@ msgid "recaptcha_enter_here"
 msgstr "Skriv svaret här:"
 
 #: views/elements/recaptcha.thtml:74
+#, fuzzy
 msgid "recaptcha_enter_whatyouhear"
-msgstr "Skriv vad du hör."
+msgstr "Please type what you hear."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
+#, fuzzy
 msgid "recaptcha_hardtohear_text"
 msgstr ""
-"Om detta är svårt att första kan du <a href=\"%1$s\">lyssna till något "
-"annat</a> eller <a href=\"%2$s\">byta tillbaka till text</a>."
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
+#, fuzzy
 msgid "recaptcha_hardtoread_text"
 msgstr ""
-"Om detta är svårt att läsa kan du <a href=\"%1$s\">testa andra ord</a> eller "
-"<a href=\"%2$s\">lyssna på något</a> istället."
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Är du en människa?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Vad är detta?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Ett fel uppstod vid märkning av recensionen!"
 
 #: models/reviews_moderation_flag.php:69
+#, fuzzy
 msgid "review_flag_reason_bug_support"
-msgstr "Felrapport eller begäran om hjälp på fel ställe"
+msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
+#, fuzzy
 msgid "review_flag_reason_instructions"
-msgstr "Rapportera den här recensionen (välj orsak)"
+msgstr "Report this review (select a reason)"
 
 #: models/reviews_moderation_flag.php:67
+#, fuzzy
 msgid "review_flag_reason_language"
-msgstr "Opassande språk/innehåll"
+msgstr "Inappropriate language/dialog"
 
 #: models/reviews_moderation_flag.php:71
+#, fuzzy
 msgid "review_flag_reason_other"
-msgstr "Annan (var god ange)"
+msgstr "Other (please specify)"
 
 #: models/reviews_moderation_flag.php:65
+#, fuzzy
 msgid "review_flag_reason_spam"
-msgstr "Skräpkommentar eller annat icke recensionsartat innehåll"
+msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Tack; recensionen har märkts för redaktörsgranskning."
 
@@ -5986,7 +5918,7 @@ msgstr ""
 "märka den för redaktörsgranskning."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Tänk på följande tips:</p><ul><li>Skriv som om du berättar för en vän om "
@@ -6003,125 +5935,101 @@ msgstr ""
 "information om användares tilläggsrecensioner.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Recensioner för %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Uppmärksammade tillägg"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Nyaste tilläggen"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Populära tillägg"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Uppdaterade tillägg"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Sök"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Sökresultat för samlingar"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Sökresultat för samlingar"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Sökfunktion är avstängd för närvarande. Försök igen senare."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "alla tillägg"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "alla samlingar"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "sök efter tillägg"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "sök efter samlingar"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Sök efter tillägg"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Klicka för att ange söktermer"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "inom"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Alla sökmotorer"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Bläddra bland sökmotorer"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s passande tillägg"
+msgstr[1] "%s passande tillägg"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Inga resultat funna."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Sök tillägg"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Kanal för sökresultat"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Sökresultat för: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Adminverktyg"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Utvecklarverktyg"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Redigerarverktyg"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Välkommen"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Välkommen, %s"
@@ -6130,7 +6038,7 @@ msgstr "Välkommen, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Ordlista"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Uppmärksammade tillägg"
 
@@ -6138,7 +6046,7 @@ msgstr "Uppmärksammade tillägg"
 msgid "sidebar_pitch_looking_for"
 msgstr "Jag letar efter:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Senaste tilläggen"
 
@@ -6146,7 +6054,7 @@ msgstr "Senaste tilläggen"
 msgid "sidebar_pitch_search"
 msgstr "Sökmotor"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Prenumerera på"
 
@@ -6154,23 +6062,24 @@ msgstr "Prenumerera på"
 msgid "sidebar_pitch_theme"
 msgstr "Tema"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Uppdaterade tillägg"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Inte betygsatt än"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Fått %s av 5 stjärnor i betyg"
@@ -6207,13 +6116,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %b. %e"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s skapad"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s släpptes"
@@ -6226,179 +6135,185 @@ msgstr "Stäng"
 msgid "statistics_help_link"
 msgstr "Hjälp"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "eller, välj ett annat tillägg"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "eller, välj ett tillägg med publik statistik"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Välj ett av dina tillägg för att se dess statistik"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Välj ett tillägg för att se dess statistik"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Välj ett tillägg med publik statistik"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistikpanelen"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Visa statistik"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
+#, fuzzy
 msgid "statistics_js_download_csv"
-msgstr "Visa denna tabell i CSV-format"
+msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "inga"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Ta bort denna kurva"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
+#, fuzzy
 msgid "statistics_js_groupby_selector_date"
-msgstr "Gruppera på: Dag"
+msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
+#, fuzzy
 msgid "statistics_js_groupby_selector_month"
-msgstr "Gruppera på: Månad"
+msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
+#, fuzzy
 msgid "statistics_js_groupby_selector_week"
-msgstr "Gruppera på: Vecka"
+msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "Jämför på: Vecka"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s fanns i området"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Lägg till kurva"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Lägg till en kurva till denna graf"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Göm totalräknare"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Visa totalräknare"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
+#, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
-msgstr "Visa totalräknaren i denna graf"
+msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Visa data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "FÃ¥ en CSV-fil med dessa data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Göm %s-händelser"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Visa %s-händelser"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Visa datum för tilläggssläpp ovanpå plottarna"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Göm Firefox-händelser"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Visa Firefox-händelser"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Visa datum för Firefox-släpp ovanpå plottarna"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Kollapsa graf"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expandera graf"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Ändra storlek på grafen"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Aktiva dagliga användare"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Applikation"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Anpassad"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Hämtningar"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operativsystem"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Tilläggstatus"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Sammanfattning"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Tilläggsversion"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Applikation"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operativsystem"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Tilläggstatus"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Okänt"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Tilläggsversion"
 
@@ -6434,7 +6349,7 @@ msgstr "Dina inställningar har uppdaterats!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistikpanel"
 
@@ -6462,105 +6377,109 @@ msgstr "Zooma ut"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zooma ut en månad"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daglig summering av statistik för %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS-kanal för sammanfattningsdata"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %B %e, %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistik för %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "Som standard kan bara du och Mozilla komma åt informationen i din "
 "statistikpanel. Du kan ändra detta och låta alla se ditt tilläggs data om du "
 "vill."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Ã…tkomst till panelen"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Privat"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Bara du och Mozilla kan se detta tilläggs statistik"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Publik"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Alla kan se detta tilläggs statistik"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Ändra inställningar"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Behandla detta som konfidentiell information."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Denna statistikpanel är för närvarande <b>privat</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Denna statistikpanel är för närvarande <b>publik</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "LÃ¥st"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Återvänd till panelen"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Spara inställningar"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistikpanelinställningar för %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Olåst"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Ok"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Dagliga hämtningar i genomsnitt"
 
@@ -6572,7 +6491,7 @@ msgstr "Hämtningar"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Räknare för senaste dagen"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Hämtningar senaste 7 dagarna"
 
@@ -6590,7 +6509,7 @@ msgstr "Sedan %1$s"
 msgid "statistics_summary_nodata"
 msgstr "Inga data ännu"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Dagliga aktiva användare i genomsnitt"
 
@@ -6616,155 +6535,159 @@ msgstr "Aktiva dagliga användare"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Den %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Genomsnittliga dagliga användar denna vecka"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s sen förra veckan"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s-statistik"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Alla teman"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Bläddra bland teman"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Ändra e-postadress"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Ändra lösenord"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Ändra lösenord eller e-post"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Bekräftelsekoden omskickad!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
+#, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
-"Ditt användarkonto %1$s har tagits bort. Om du vill komma tillbaka vid något "
-"senare tillfälle kan du omregistera dig på <a href=\"%2$s"
-"\">användarregistreringssidan</a>."
+"Your user account %1$s has been successfully deleted. If you want to come "
+"back some time, you can re-register on the <a href=\"%2$s\">user "
+"registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
+#, fuzzy
 msgid "user_del_community_sad"
-msgstr "Gemenskapen kring Mozilla Add-ons beklagar att du försvinner."
+msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
+#, fuzzy
 msgid "user_del_confirm_password"
-msgstr "Bekräfta lösenord"
+msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
+#, fuzzy
 msgid "user_del_deletenow"
-msgstr "Ta bort mitt användarkonto nu"
+msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
+#, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
-"Du kan inte ta bort ditt konto om du är listad som <a href=\"%1$s"
-"\">författare till något tillägg</a>. För att ta bort ditt konto, se till "
-"att någon annan i din utvecklingsgrupp tar bort dig från listan av "
-"författare till era tillägg. Efter detta kommer du att kunna ta bort ditt "
-"konto här."
+"You cannot delete your account if you are listed as an <a href=\"%1$s"
+"\">author of any add-ons</a>. To delete your account, please have another "
+"person in your development group delete you from the list of authors for "
+"your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
+#, fuzzy
 msgid "user_del_error_addons_more_questions"
-msgstr "Om du har ytterligare frågor, kontakta %1$s för assistans."
+msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
+#, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
-"Du måste kryssa i rutan med texten \"Jag förstår...\" innan vi kan ta bort "
-"ditt konto."
+"You need to check the box \"I understand...\" before we can delete your "
+"account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
+#, fuzzy
 msgid "user_del_error_password"
-msgstr "Skriv ditt lösenord korrekt för att genomföra detta steg."
+msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
+#, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
-"Ett okänt fel uppstod när ditt konto skulle tas bort. Kontakta %1$s och "
-"berätta så tar vi bort det åt dig. Vi ber om ursäkt för besväret."
+"An unknown error occured deleting your account. Please contact %1$s with the "
+"issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
+#, fuzzy
 msgid "user_del_header_confirm_deletion"
-msgstr "Bekräfta kontoborttagning"
+msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
+#, fuzzy
 msgid "user_del_header_delete_account"
-msgstr "Ta bort användarkonto %1$s"
+msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
+#, fuzzy
 msgid "user_del_header_farewell"
-msgstr "Farväl!"
+msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
+#, fuzzy
 msgid "user_del_nologin"
-msgstr "Du kan inte längre logga in på Mozilla Add-ons."
+msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
+#, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
-"Genom att klicka på \"ta bort\" blir ditt konto <strong>permanent borttaget</"
-"strong>. Det betyder:"
+"By clicking \"delete\" your account is going to be <strong>permanently "
+"removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
+#, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
-"Dina recensioner och betyg tas inte bort, men de är inte längre kopplade "
-"till dig."
+"Your reviews and ratings will not be deleted, but they will no longer be "
+"associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
+#, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
-"Om du har ett specifikt problem du vill ha hjälp med, ta inte bort ditt "
-"konto nu utan kontakta oss på %1$s och vi kommer att göra vårt bästa för att "
-"hjälpa dig lösa problemet."
+"If you have a specific problem we may help you with, please do not delete "
+"your account now, but contact us at %1$s and we will do our best to assist "
+"you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
+#, fuzzy
 msgid "user_del_understand_permanent"
-msgstr "Jag förstår att detta steg inte kan göras ogjort."
+msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
+#, fuzzy
 msgid "user_deleted_nickname"
-msgstr "Tog bort användare"
+msgstr "Deleted User"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "Ett e-postmeddelande har skickats till %1$s för att bekräfta din nya e-"
-"postadress. För att ändringen ska ge effekt måste du klicka på länken i det "
+"postadress. För att ändrignen ska ge effekt måste du klicka på länken i det "
 "brevet. Till dess det är gjort kan du fortsätta logga in med din nuvarande e-"
 "postadress."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
+#, fuzzy
 msgid "user_edit_delete_user"
-msgstr "Ta bort användarkonto"
+msgstr "Delete user account"
 
 #. This contains the email sent to users when they signed up for a new
 #. account:
@@ -6789,7 +6712,9 @@ msgstr ""
 "-- %2$s Add-ons-staben"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Du ändrade din e-postadress på %2$s Add-ons.\n"
@@ -6829,106 +6754,91 @@ msgstr ""
 "Tack,\n"
 "-- %2$s Add-ons-staben"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Återställ ditt %s Add-ons lösenord"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Fel!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "Bekräfta din e-postadressändring på %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Klart!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Din e-postadress ändrades. Från och med nu ska du använda %1$s för att logga "
 "in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "Om mig"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"Presentera dig själv, om du vill! Denna text visas publikt på din "
-"användarinformationssida. Radbrytningar behålls, men ingen HTML kan användas."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Bekräfta lösenord"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Visa de samlingar jag har skapat i min profil"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Visa mina favoritsamlingar i min profil"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Redigera användarprofil för %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-postadress"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Förnamn"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Göm e-postadress"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL för webbplats"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Efternamn"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Användarinloggning"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Nytt lösenord"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Kortnamn"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Gammalt lösenord"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
+#, fuzzy
 msgid "user_form_otheractions"
-msgstr "Annat"
+msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Lösenord"
 
@@ -6936,64 +6846,69 @@ msgstr "Lösenord"
 msgid "user_form_registration"
 msgstr "Registrering av ny användare"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Kom ihåg mig på denna dator"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Visa sandlådan?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Spara"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Logga in"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Registrera"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons-användare sedan"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Skapa ett nytt användarkonto"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
+#, fuzzy
 msgid "user_notifications_item_compat"
-msgstr "Tillägskompatibilitet (starkt rekommenderat)"
+msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
+#, fuzzy
 msgid "user_notifications_item_events"
-msgstr "Kommande händelser och tävlingar"
+msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
+#, fuzzy
 msgid "user_notifications_none_available"
-msgstr "Just nu finns det inga notifieringar du behöver konfigurera."
+msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
+#, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
-"Ibland kan Mozilla skicka e-post om kommande programsläpp och händelser på "
-"Add-ons. Välj vilka ämnen du är intresserad av här nedanför:"
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
+#, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
-"Mozilla reserverar sig rätten att kontakta dig individuellt om eventuella "
-"särskilda frågeställningar med ditt tillägg."
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "Det fanns fel i dina ändringar. Vänligen korrigera och skicka in igen."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profilen uppdaterad."
 
@@ -7006,16 +6921,16 @@ msgstr "Återställ lösenordet för %s"
 msgid "user_pwreset_header"
 msgstr "Återställ lösenord"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Glömt ditt lösenord?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr ""
 "Länken för att återställa lösenordet har skickats till din e-postadress."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Lösenordet återställt."
 
@@ -7027,7 +6942,7 @@ msgstr "Ändra lösenord"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Skicka länk för att återställa lösenord"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -7041,7 +6956,7 @@ msgstr ""
 "$s. Du måste klicka på den före du kan logga in på %2$s Add-ons."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7053,23 +6968,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "skicka bekräftelsebrevet igen"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Grattis! Ditt konto skapades."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>Registrering på AMO <strong>krävs inte</strong> om du bara vill ladda ner "
-"och installera publika tillägg.</p><p>Du behöver bara registrera dig om:</"
-"p><ul><li>Du vill skriva recensioner av tillägg</li><li>Du är en "
-"tilläggsutvecklare och vill ladda upp ditt tillägg för publicering på AMO</"
-"li></ul><p>Efter registrering får du ett bekräftelsebrev via e-post till "
-"adressen du angett. Följ instruktionerna där för att bekräfta ditt konto.</"
-"p><p>Om du vill kan du läsa vår <a href='%1$s' "
-"title='Rättighetsinformation'>Rättighetsinformation</a> och <a href='%2$s' "
-"title='Integritetsriktlinjer'>Integritetsriktlinjer</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7080,92 +6982,76 @@ msgstr ""
 "\"). Om du behöver kan vi %1$s till e-postadressen ovanför."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Tack för att du registerade dig och välkommen till %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Välkommen till addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
+#, fuzzy
 msgid "user_required_firstlast_or_nickname"
-msgstr "Ett förnamn, efternamn eller kortnamn krävs."
-
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Samlingar"
+msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
+#, fuzzy
 msgid "user_tab_notifications"
-msgstr "Underrättelser"
+msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
+#, fuzzy
 msgid "user_tab_profile"
-msgstr "Användarprofil"
+msgstr "User Profile"
 
 #: controllers/users_controller.php:209
 msgid "user_verified_okay"
 msgstr "Verifierad!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
+#, fuzzy
 msgid "users_delete_pagetitle"
-msgstr "Ta bort användarkonto"
+msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Redigera användarkonto"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "Om mig"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Tillägg från %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Namn"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Användarprofil"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Samlingar av %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "E-postadress"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Favoritsamlingar"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Hemsida"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Kortnamn"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Användarinformation för %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
+#, fuzzy
 msgid "users_info_reviews_by_user"
-msgstr "Recensioner av %s"
+msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Användarinloggning"
 
@@ -7196,684 +7082,5 @@ msgstr "Återställ användarlösenord"
 msgid "users_register_pagetitle"
 msgstr "Registrering av ny användare"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Källkodslicens för %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Visa alla nyligen tillagda"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Visa alla mest nedladdade"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Visa alla högst rankade"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Nästa tillägg"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Föregående tillägg"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Senaste version som är kompatibel med"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Komplett versionshistorik"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Nyaste:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Populärast:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Vi rekommenderar:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Nyligen uppdaterade:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Visa alla"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Visa alla rekommederade tillägg"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Högst betyg först"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Senast uppdaterat först"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Mest populära först"
-
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Laddar"
-
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Visa mer information"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Denna version av ditt tillägg uppger sig inte vara kompatibelt med "
-#~ "Firefox %1$s. Mozilla kommer att släppa nästa version av Firefox snart, "
-#~ "så testa gärna ditt tillägg i den nya versionen och uppdatera "
-#~ "informationen om kompatibilitet. Du kan hitta mer information om detta <a "
-#~ "href=\"%2$s\">här</a>. Detta är bara en upplysning och du kan fortsätta "
-#~ "med att skicka in denna version till addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Tillägget inaktiverat"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Redigera tillägg"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Tillägget aktiverades"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Tilläggets beskrivning"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "Användarvillkor"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Tilläggets hemsida"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Tilläggets namn"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Integritetsriktlinjer"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Tilläggets sammanfattning"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "E-postaddress för hjälp"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL för hjälp"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Viktig information för denna version"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nominera tillägg"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Tillägget nominerades!"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Flera användarrecensioner av tillägget (kan vara externa recensioner)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Besök %1$s-sidan för att ändra eller %2$s för att återvända till "
-#~ "Utvecklarverktygen."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "klicka här"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Redigera tillägg"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Denna version har placerats i sandlådan tills den granskats av "
-#~ "sandlådetestare och redaktörer för Mozilla Add-ons. Du kommer att få e-"
-#~ "post när något händer."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Du kan läsa mer om systemet med sandlådans granskningssystem %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "här"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Denna version har placerats i sandlådan för erfarna användare. För att "
-#~ "finnas med på den publika webbplatsen måste du %s ditt tillägg och "
-#~ "genomgå en granskningsprocess."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nominera"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Ditt tilläggs inläggning är nu klar."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Eftersom ditt tillägg är betrott har denna version automatiskt godkänts "
-#~ "för denna publika ytan."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Lägg till tillägg"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Tillägget uppdaterat"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Du kan vilja %s för att öka intresset för ditt tillägg."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "lägga till en förhandsvisning"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Ingen författare hittad [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Ta bort"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Är du säker på att du vill avbryta din inskickning?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Nästa"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Ändra tilläggstyp:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Utvecklarekommentarer uppdaterade."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Lägg till förhandsvisning"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Författare"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Författare"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Inga"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Kategori"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Beskrivning"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Inaktiverat"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Detaljer"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Utvecklarekommentarer"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Förhandsvisningar"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versioner"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Hemsida"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Inga"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Ingen bildtext"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Ingen förhandsvisning hittad."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Uppdatera"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "E-post för hjälp"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Ingen e-postadress för hjälp angiven av utvecklaren."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL för hjälp"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Ingen URL för hjälp angiven av utvecklaren."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Betrott"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Inga versioner hittade."
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Avbryt och gå tillbaka"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Ja, inaktivera det"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Är det säkert att du vill inaktivera detta tillägg?"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Inaktivering av detta tillägg kommer att gömma det från sökningar och "
-#~ "listningar. Det kommer inte längre att kunnas laddas ner från webbplatsen "
-#~ "och hanteras inte av den automatiska klientuppdateringen. Tillägget "
-#~ "kommer för alla praktiska syften att verka borttaget, även om du kan "
-#~ "återvända hit och återaktivera det när det passar."
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Inaktivera %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Ja, aktivera det"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Är du säker på att du vill aktivera detta tillägg?"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Om du aktiverar detta tillägg kommer det återigen att finnas med i "
-#~ "sökningar och listningar. Det kommer att kunna laddas ner båda från "
-#~ "webbplatsen och automatisk klientuppdatering."
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Aktivera %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Lägg till författare"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "E-postadress till författaren"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Ta bort"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Inga kategorier tillgängliga för detta tilläggs typ."
-
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Författare"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Lägg till ikon"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Byt ikon"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Tillåt användare att se källkodsfilerna på nätet"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Standardlokal"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Rensa bara den existerande ikonen"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Ny ikonfil"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Ikon"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "kort ytterligare information (som namn på lokal dialekt)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Uppdatera"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">enkelt "
-#~ "lokalnamn</a>, exempelvis 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Förkryssade filer kommer att tas bort."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Filer"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "MÃ¥lapplikationer"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Inga filer."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Information till granskare"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Uppdatera"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Sammanfattningar är begränsade till max 250 tecken \n"
-#~ "(du skrev %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Namnet på detta tillägg finns redan i databasen. Försäkra dig om att: "
-#~ "<br /><li>Dina GUIDs stämmer. Den vanligaste orsaken till detta fel är "
-#~ "GUIDs som inte stämmer.</li><li>Du inte har två poster i databasen. Har "
-#~ "du det bör du uppdatera den posten eller ta bort den och försöka igen.</"
-#~ "li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Beskriv ändringarna i denna tilläggsuppdatering."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Inte alla fil-GUID stämde"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "En identisk version (%s) finns redan för detta tillägg och plattform."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Du måste ange de begärda detaljerna för att nominera."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Du kan inte nominera ett förhandssläppt tillägg."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Du kan bara nominera tillägg som finns i sandlådan."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Ett fel inträffade när dina data skulle sparas."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Du har inte rättighet att uppdatera detta tillägg."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Lägg till en till plattformsfil"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Lägg till författare"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Ta bort"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "Kategorier för din nya tilläggstyp kommer att finnas i nästa steg."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Inga kategorier fanns tillgängliga för denna tilläggstyp."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Ge en beskrivning av ditt tillägg."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Skriv namnet på ditt tillägg."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Välj typ på tillägget du skickar in."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Skriv en sammanfattning av ditt tillägg."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Tilläggsfil"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Tilläggsfil 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Tilläggsfil 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Tilläggstyp"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Tillåt användare att titta på källkoden direkt"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Författarens e-postadress"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Författare"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Standardlokal"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Beskrivning"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Användningsvillkor (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Detta tillägg kräver extern programvara"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Filer"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Hemsida"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Ikonfil"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Namn"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Plattformar som stöds"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Detta är en förhandsversion"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Integritetsriktlinjer"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Detta tillägg är specifikt för en särskild webbplats"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Sammanfattning"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "E-postadress för hjälp"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL för hjälp"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "MÃ¥lapplikationer"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Version"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Information för versionen"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Inga"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Information till granskaren"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Efersom ditt tillägg är betrott, välj var denna version ska placeras:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Publik"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandlåda"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Utvecklareavtal"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Steg 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Ladda upp fil"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Steg 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Detaljer för tillägget"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Steg 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Versionsdetaljer"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Steg 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Lokalisering"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Steg 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Klart"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Mina tillägg"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Tillbaka till detaljer för tillägget"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatiskt detekterad tilläggstyp: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Standardlokalen för detta tillägg (%1$s [%2$s]) skiljer sig från din "
-#~ "nuvarande lokal (%3$s [%4$s]). Fälten nedan bör fyllas i enligt %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Felaktig?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Är du säker på att du vill ta bort den här filen?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Hoppa över uppdatering av information för mitt nuvarande tillägg"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "Tillägg kan inte läggas till för närvarande. Försök igen senare."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Jag accepterar"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Jag avböjer"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Detta tillägg har inaktiverats av en administratör."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Inaktiverat"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Betrott"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Du har inga tillägg. Klicka %s för att skicka in ett."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "här"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Se till att %s för ditt tema."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "ladda upp en förhandsvisning"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Redigera version"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Versionen uppdaterad."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Ny"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Uppdaterad"
-
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Tilläggsålder"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Tilläggstyper"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Ã…lder"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Applikationer"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Plattformar"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Inskickningstyper"
-
-#~ msgid "error_notice"
-#~ msgstr "Information"
-
-#~ msgid "forum_save"
-#~ msgstr "Spara"
-
-#~ msgid "home"
-#~ msgstr "hem"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Insticksprogram"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimentella tillägg"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Tillbaka till föregående sida"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Detta är sida %1$s av %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s passande tillägg"
-#~ msgstr[1] "%s passande tillägg"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS-kanal för sammanfattningsdata"
diff --git a/site/app/locale/sv_SE/pages/sandbox.thtml b/site/app/locale/sv_SE/pages/sandbox.thtml
index 735a9e8..322e64e 100644
--- a/site/app/locale/sv_SE/pages/sandbox.thtml
+++ b/site/app/locale/sv_SE/pages/sandbox.thtml
@@ -6,8 +6,8 @@
 <!-- To localize the flowchart image, see http://wiki.mozilla.org/Update:Remora_Sandbox_Flowchart -->
 <div style="text-align: center;">%s</div>
 <ol>
-    <li><b>Skicka in ditt tillägg med Utvecklarverktygen.</b> Ditt bidrag kommer omedelbart att dyka upp på "sandlådesidan" av Mozilla Add-ons, där erfarna användare kommer att testa det och ge kommentarer. För att se sandlådan måste du slå på det i dina kontoinställningar.</li>
-    <li><b>Nominera ditt tillägg till att bli publikt.</b> Bland utvecklarverktygen finns det en länk för att nominera ditt tillägg. Efter att det blivit nominerat kommer ditt tillägg att placeras i redaktörernas nomineringskö för granskning.</li>
+    <li><b>Skicka in ditt tillägg med Utvecklarverktygen.</b> Ditt bidrag kommer omedelbart att dyka upp på "sandlådesidan" av Mozilla Add-ons, där erfarna användare kommer att testa det och ge kommentarer. För att se sandlådan, måste du slå på det i dina konotinställningar.</li>
+    <li><b>Nominera ditt tillägg till att bli publikt.</b> Bland utvecklarvektygen finns det en länk för att nominera ditt tillägg. Efter att det blivit nominerat kommer ditt tillägg att placeras i redaktörernas nomineringskö för granskning.</li>
     <li><b>En redaktör granskar ditt tillägg.</b> En redaktör för Mozilla Add-ons installerar ditt tillägg och testar att det fungerar. Redaktören kommer även att läsa recensionerna det fått av testarna i sandlådan.</li>
     <li><b>Ditt tillägg blir publikt eller hålls kvar i sandlådan.</b> 
 Redaktören kommer antingen att göra ditt tillägg publikt eller hålla kvar det i sandlådan. Om det hålls kvar i sandlådan kan du nominera det igen efter att göra ändringar som redaktören föreslår i kommentarer.
diff --git a/site/app/locale/tr/LC_MESSAGES/messages.po b/site/app/locale/tr/LC_MESSAGES/messages.po
index 2f5d570..996bd5f 100644
--- a/site/app/locale/tr/LC_MESSAGES/messages.po
+++ b/site/app/locale/tr/LC_MESSAGES/messages.po
@@ -17,188 +17,179 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Cancel Installation"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, fuzzy, php-format
 msgid "a_download"
 msgstr "Download Now %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 #, fuzzy
 msgid "a_eula_download"
 msgstr "Accept and Download"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Accept and Install"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Public"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Sandbox"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 #, fuzzy
 msgid "addon_detail_last_updated"
 msgstr "Updated %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "%s sürümü"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads"
 msgstr "downloads"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 #, fuzzy
 msgid "addon_downloads_total"
 msgstr "total downloads"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 #, fuzzy
 msgid "addon_downloads_weekly"
 msgstr "weekly downloads"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, fuzzy, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" add-on"
 msgstr[1] "%1$s \"%2$s\" add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 #, fuzzy
 msgid "addon_list_perpage"
 msgstr "per page"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 #, fuzzy
 msgid "addon_list_sortby"
 msgstr "Sort by:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 #, fuzzy
 msgid "addon_listitem_flag_experimental"
 msgstr "experimental"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 #, fuzzy
 msgid "addon_listitem_flag_recommended"
 msgstr "recommended"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 #, fuzzy
 msgid "addon_not_available_for_platform"
 msgstr "%1$s is not available for %2$s."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "%1$s... eklentisine geri dön"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Görüşlere geri dön..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "BeÄŸeni:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Ä°nceleme:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Görüşü gönder"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "%s hakkında görüş ekle"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Başlık/Özet:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 #, fuzzy
 msgid "addon_review_admin_delete"
 msgstr "Delete"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 #, fuzzy
 msgid "addon_review_author_reply_link"
 msgstr "Reply"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 #, fuzzy
 msgid "addon_review_confirm_delete"
 msgstr "Are you sure you wish to delete this review?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 #, fuzzy
 msgid "addon_review_confirm_no"
 msgstr "No"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 #, fuzzy
 msgid "addon_review_confirm_yes"
 msgstr "Yes"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 #, fuzzy
 msgid "addon_review_delete_header"
 msgstr "Delete Review"
@@ -209,7 +200,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Review deleted successfully."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "%s hakkındaki görüşü düzenle"
@@ -224,21 +215,21 @@ msgstr ""
 "and 100 characters; your character length was %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 #, fuzzy
 msgid "addon_review_in_moderation"
 msgstr ""
 "Please note: Before your review shows up on the public site, it will be "
 "moderated by an editor."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 #, fuzzy
 msgid "addon_review_in_reply_to"
 msgstr "Developer reply to:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, fuzzy, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -257,34 +248,48 @@ msgstr "%s incelemeleri"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, fuzzy, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Reply by %1$s on %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 #, fuzzy
 msgid "addon_review_reply_prefix"
 msgstr "Developer Reply:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Görüşünüz başarıyla kaydedildi. Teşekkürler!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
-#, fuzzy
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, fuzzy, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "by %1$s on %2$s"
 
 # %1 is the (localized) date, y is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr " %1$s tarihinde  ,%2$d izlendi"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+#, fuzzy
+msgid "addon_slider_tooltip_next"
+msgstr "Next Add-on"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+#, fuzzy
+msgid "addon_slider_tooltip_previous"
+msgstr "Previous Add-on"
+
 #: views/elements/addon_version_detail.thtml:52
 #, fuzzy
 msgid "addon_version_permalink"
@@ -294,31 +299,30 @@ msgstr "Permanent link to this version"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 #, fuzzy
 msgid "addons_author_addons_submit"
 msgstr "Go"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 #, fuzzy
 msgid "addons_author_tooltip"
 msgstr "View Author's Profile"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "%s gözat"
@@ -327,122 +331,70 @@ msgstr "%s gözat"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Görüş ekle"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 #, fuzzy
 msgid "addons_display_advanced_details"
 msgstr "Advanced Details"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 #, fuzzy
 msgid "addons_display_categories"
 msgstr "Categories"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 #, fuzzy
 msgid "addons_display_detailed_review"
 msgstr "detailed review"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 #, fuzzy
 msgid "addons_display_dont_like_it"
 msgstr "Don't like it"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Görüşü düzenle"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "This add-on has a privacy policy."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 #, fuzzy
 msgid "addons_display_hate_it"
 msgstr "Hate it"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Developer Comments"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 #, fuzzy
 msgid "addons_display_header_homepage"
 msgstr "Homepage"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Görüşler"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 #, fuzzy
 msgid "addons_display_header_support"
 msgstr "Support"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 #, fuzzy
 msgid "addons_display_like_it"
 msgstr "Like it"
@@ -452,28 +404,24 @@ msgstr "Like it"
 msgid "addons_display_long_description"
 msgstr "Long Description"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 #, fuzzy
 msgid "addons_display_love_it"
 msgstr "Love it"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 #, fuzzy
 msgid "addons_display_more_images"
 msgstr "More Images"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -483,14 +431,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -504,7 +452,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -518,7 +466,7 @@ msgstr ""
 "upcoming version."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, fuzzy, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -530,17 +478,18 @@ msgstr ""
 "post a review, they will not be able to contact you to ask for more details "
 "or let you know if the bug has been fixed in an upcoming version."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 #, fuzzy
 msgid "addons_display_rate_it"
 msgstr "Rate It"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 #, fuzzy
 msgid "addons_display_really_like_it"
 msgstr "Really like it"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 #, fuzzy
 msgid "addons_display_review_etiquette"
 msgstr ""
@@ -550,52 +499,57 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 #, fuzzy
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Review Guidelines</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
-#, fuzzy
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, fuzzy, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "See the <a href=\"%1$s\">support section</a> to find out where to get "
 "assistance for this add-on."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 #, fuzzy
 msgid "addons_display_review_submit"
 msgstr "Save"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, fuzzy, php-format
 msgid "addons_display_see_all_addons"
 msgstr "See All %1$s Add-ons"
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Tüm incelemelere bak (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 #, fuzzy
 msgid "addons_display_see_all_versions"
 msgstr "See All Versions"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+#, fuzzy
+msgid "addons_display_version_history"
+msgstr "Complete Version History"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "View the source"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 #, fuzzy
 msgid "addons_display_view_stats"
 msgstr "View statistics"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 #, fuzzy
 msgid "addons_display_what_do_you_think"
 msgstr "What do you think?"
@@ -605,231 +559,118 @@ msgstr "What do you think?"
 msgid "addons_display_workswith"
 msgstr "Works with:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "Yazan:"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Tavsiyemiz"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "Add-ons extend %1$s, letting you personalize your browsing experience.  Take "
 "a look around and make %1$s your own."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
+#: views/addons/home.thtml:201
 #, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
+msgid "addons_home_newest_header"
+msgstr "Newest:"
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 #, fuzzy
 msgid "addons_home_other_applications"
 msgstr "Other Applications"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Mozilla Eklentileri :: Mozilla Yazılımına Özellik Ekle"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
+#: views/addons/home.thtml:191
+#, fuzzy
+msgid "addons_home_popular_header"
+msgstr "Most Popular:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+#, fuzzy
+msgid "addons_home_recommended_header"
+msgstr "We Recommend:"
+
+#: views/addons/home.thtml:211
+#, fuzzy
+msgid "addons_home_updated_header"
+msgstr "Recently Updated:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+#, fuzzy
+msgid "addons_home_view_all"
+msgstr "View all"
+
+#: views/addons/home.thtml:209
 #, fuzzy
 msgid "addons_home_view_all_newest_title"
 msgstr "View all newly created add-ons"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 #, fuzzy
 msgid "addons_home_view_all_popular_title"
 msgstr "View all popular add-ons"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 #, fuzzy
 msgid "addons_home_view_all_recommended_title"
 msgstr "View all recommended add-ons"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 #, fuzzy
 msgid "addons_home_view_all_updated_title"
 msgstr "View all recently updated add-ons"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 #, fuzzy
 msgid "addons_install_in_sunbird"
 msgstr ""
@@ -837,12 +678,12 @@ msgstr ""
 "open Add-ons from the Tools menu.</li><li>Click the Install button, and "
 "locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 #, fuzzy
 msgid "addons_install_in_sunbird_title"
 msgstr "How to Install in Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 #, fuzzy
 msgid "addons_install_in_thunderbird"
 msgstr ""
@@ -851,45 +692,42 @@ msgstr ""
 "Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install "
 "button, and locate/select the file you downloaded and click \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 #, fuzzy
 msgid "addons_install_in_thunderbird_title"
 msgstr "How to Install in Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 #, fuzzy
 msgid "addons_options_show_experimental"
 msgstr "show experimental add-ons"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 #, fuzzy
 msgid "addons_options_submit"
 msgstr "Go"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "By"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "for Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "for Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "for Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -897,11 +735,11 @@ msgstr ""
 "more information about other plugins available for Mozilla-based Browsers, "
 "visit %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Looking for a plugin not listed here?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Plugins help your browser perform specific functions like viewing special "
@@ -909,24 +747,24 @@ msgstr ""
 "from extensions, which modify or add to existing functionality."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, fuzzy, php-format
 msgid "addons_plugins_main_header"
 msgstr "Common Plugins for %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Plugins"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Support Documentation: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -935,43 +773,38 @@ msgstr ""
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Previews for %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "Binden fazla eklentiyle, herkes için birşey bulunmaktadır. Başlamanıza "
 "yardımcı olmak için beğendiklerimizden bazılarının listesini sunuyoruz. İyi "
 "eÄŸlenceler!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Önerilen Eklentiler"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Tavsiye edilen eklentiler"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Additional Resources"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla Developer Center"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Sorry, you need a Mozilla-based browser (such as Firefox) to install a "
@@ -988,48 +821,47 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
-#, fuzzy
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, fuzzy, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Learn how to %1$s at the %2$s."
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "make your own"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
-#, fuzzy
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, fuzzy, php-format
 msgid "addons_searchengines_more"
 msgstr "Browse through more search engines at %1$s"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Search Engines"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "Special thanks to the Mycroft Project for their work on Firefox Search "
 "Engines."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -1074,19 +906,19 @@ msgstr "Incomplete Version"
 msgid "addons_status_nominated"
 msgstr "In Sandbox; Public Nomination"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 #, fuzzy
 msgid "addons_status_pending"
 msgstr "In Sandbox; Pending Review"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 #, fuzzy
 msgid "addons_status_public"
 msgstr "Public"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 #, fuzzy
 msgid "addons_status_sandbox"
@@ -1097,39 +929,27 @@ msgstr "In Sandbox"
 msgid "addons_status_unknown"
 msgstr "Unknown"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 #, fuzzy
 msgid "addons_title_tooltip"
 msgstr "Learn more about this add-on"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Be Careful With Old Versions"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "These versions are displayed for reference and testing purposes. You should "
 "always use the latest version of an add-on."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "Version History with Changelogs"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s Version History"
@@ -1164,150 +984,138 @@ msgstr "Group Admin"
 msgid "admin_group_saved"
 msgstr "The Group has been saved"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 #, fuzzy
 msgid "advanced_search_form"
 msgstr "Advanced"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 #, fuzzy
 msgid "advanced_search_form_any_time"
 msgstr "Any time"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 #, fuzzy
 msgid "advanced_search_form_any_type"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 #, fuzzy
 msgid "advanced_search_form_any_version"
 msgstr "Any"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 #, fuzzy
 msgid "advanced_search_form_application"
 msgstr "Application"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 #, fuzzy
 msgid "advanced_search_form_keyword_match"
 msgstr "Keyword Match"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 #, fuzzy
 msgid "advanced_search_form_lastupdate"
 msgstr "Last Updated"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 #, fuzzy
 msgid "advanced_search_form_name"
 msgstr "Name"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 #, fuzzy
 msgid "advanced_search_form_newest"
 msgstr "Newest"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 #, fuzzy
 msgid "advanced_search_form_past_3_months"
 msgstr "Past 3 months"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 #, fuzzy
 msgid "advanced_search_form_past_6_months"
 msgstr "Past 6 months"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 #, fuzzy
 msgid "advanced_search_form_past_day"
 msgstr "Past Day"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 #, fuzzy
 msgid "advanced_search_form_past_month"
 msgstr "Past month"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 #, fuzzy
 msgid "advanced_search_form_past_week"
 msgstr "Past week"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 #, fuzzy
 msgid "advanced_search_form_past_year"
 msgstr "Past year"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 #, fuzzy
 msgid "advanced_search_form_perpage"
 msgstr "Per Page"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 #, fuzzy
 msgid "advanced_search_form_platform"
 msgstr "Platform"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 #, fuzzy
 msgid "advanced_search_form_popularity"
 msgstr "Popularity"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 #, fuzzy
 msgid "advanced_search_form_rating"
 msgstr "Rating"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 #, fuzzy
 msgid "advanced_search_form_sortby"
 msgstr "Sort By"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 #, fuzzy
 msgid "advanced_search_form_to"
 msgstr "to"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 #, fuzzy
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Toggle advanced search mode"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 #, fuzzy
 msgid "advanced_search_form_type"
 msgstr "Type"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 #, fuzzy
 msgid "advanced_search_form_version"
 msgstr "version"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 #, fuzzy
 msgid "app_compat_ignore_check"
 msgstr "Ignore version check"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 #, fuzzy
 msgid "app_compat_older_firefox_only"
 msgstr "This add-on is for older versions of Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 #, fuzzy
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
@@ -1315,348 +1123,46 @@ msgstr ""
 "\"%2$s\">ignore this check</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 #, fuzzy
 msgid "app_compat_try_old_version"
 msgstr "An <a href=\"%1$s\">older version</a> may work"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 #, fuzzy
 msgid "app_compat_unreleased_version"
 msgstr ""
 "This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 #, fuzzy
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 #, fuzzy
 msgid "browse_addons_name"
 msgstr "Add-ons by Name"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 #, fuzzy
 msgid "browse_addons_newest"
 msgstr "Newest Add-ons"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 #, fuzzy
 msgid "browse_addons_popular"
 msgstr "Popular Add-ons"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 #, fuzzy
 msgid "browse_addons_rated"
 msgstr "Add-ons by Rating"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 #, fuzzy
 msgid "browse_addons_updated"
 msgstr "Recently Updated Add-ons"
@@ -1667,865 +1173,54 @@ msgid "categories_current_title"
 msgstr "Current Category"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 #, fuzzy
 msgid "categories_header"
 msgstr "Categories"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 #, fuzzy
 msgid "categories_header_title"
 msgstr "Choose a category"
 
-# %1 is the category name
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, fuzzy, php-format
-msgid "category_extra_see_all"
-msgstr "See All %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
+#: views/addons/category_landing.thtml:68
 #, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+msgid "category_extra_allrecommended"
+msgstr "See All Recommended Add-ons"
 
-#: controllers/collections_controller.php:1065
+#: views/addons/category_landing.thtml:59
 #, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+msgid "category_extra_highestrated"
+msgstr "Highest Rated First"
 
-#: controllers/collections_controller.php:1051
+#: views/addons/category_landing.thtml:60
 #, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+msgid "category_extra_lastupdated"
+msgstr "Last Updated First"
 
-#: controllers/collections_controller.php:1080
+#: views/addons/category_landing.thtml:58
 #, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+msgid "category_extra_mostpopular"
+msgstr "Most Popular First"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+# %1 is the category name
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, fuzzy, php-format
+msgid "category_extra_see_all"
+msgstr "See All %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 #, fuzzy
 msgid "collection_not_found"
 msgstr "Collection not found!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, fuzzy, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Added %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 #, fuzzy
 msgid "compatibility_dashboard_center_header"
@@ -2533,71 +1228,71 @@ msgstr "Add-on Compatibility Center"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 #, fuzzy
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Be prepared for the release of %1$s with the tools and information available "
 "for the %2$s Add-ons community found below."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 #, fuzzy
 msgid "compatibility_dashboard_loading"
 msgstr "Loading data..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_main_link"
 msgstr "Back to Main"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 #, fuzzy
 msgid "compatibility_dashboard_report"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 #, fuzzy
 msgid "compatibility_developer_info"
 msgstr "Information for Add-on Developers"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 #, fuzzy
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Adjust maxVersion without uploading"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 #, fuzzy
 msgid "compatibility_developers_check_status"
 msgstr "Check Status of My Add-ons"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 #, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
 "If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
 "login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 #, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 #, fuzzy
 msgid "compatibility_developers_no_addons"
 msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 #, fuzzy
 msgid "compatibility_developers_results"
 msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 #, fuzzy
 msgid "compatibility_developers_retrieving"
 msgstr "Retrieving status of hosted add-ons..."
@@ -2606,26 +1301,26 @@ msgstr "Retrieving status of hosted add-ons..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 #, fuzzy
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 #, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "The add-ons below make up 95% of add-on usage known to Mozilla and are "
 "ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 #, fuzzy
 msgid "compatibility_report_detailed_link"
 msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 #, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
@@ -2633,115 +1328,115 @@ msgstr ""
 "<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
 "of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 #, fuzzy
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta"
 msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 #, fuzzy
 msgid "compatibility_report_legend_beta_description"
 msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest"
 msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 #, fuzzy
 msgid "compatibility_report_legend_latest_description"
 msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other"
 msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 #, fuzzy
 msgid "compatibility_report_legend_other_description"
 msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 #, fuzzy
 msgid "compatibility_report_title"
 msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 #, fuzzy
 msgid "compatibility_user_info"
 msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 #, fuzzy
 msgid "compatibility_view_report"
 msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy, php-format
 msgid "credits_contributing"
 msgstr "For information on contributing, please see our %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, fuzzy
 msgid "credits_contributing_wikipage"
 msgstr "wiki page"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 #, fuzzy
 msgid "credits_intro"
 msgstr ""
 "Mozilla would like to thank the following people for their contributions to "
 "the addons.mozilla.org project over the years:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 #, fuzzy
 msgid "credits_section_developers"
 msgstr "Developers"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 #, fuzzy
 msgid "credits_section_editors"
 msgstr "Editors"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 #, fuzzy
 msgid "credits_section_localizers"
 msgstr "Localizers"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 #, fuzzy
 msgid "credits_section_other_contributors"
 msgstr "Other Contributors"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 #, fuzzy
 msgid "credits_section_past_developers"
 msgstr "Past Developers"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 #, fuzzy
 msgid "credits_section_software"
 msgstr "Software and Images"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 #, fuzzy
 msgid "credits_software_famfamfam"
 msgstr ""
@@ -2750,7 +1445,7 @@ msgstr ""
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 "
 "License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2763,20 +1458,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %B %Y"
 
@@ -2816,25 +1508,25 @@ msgstr "Statistics Dashboard"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2844,6 +1536,19 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(auto-detect)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, fuzzy, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Opens in a new window"
@@ -2881,76 +1586,143 @@ msgstr "Step 5: Success"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Submission Help"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Add-on disabled successfully"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Edit Add-on"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Add-on enabled successfully"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Add-on Description"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Add-on Homepage"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Add-on Name"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Preview Caption"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Privacy Policy"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Add-on Summary"
+
+#: controllers/developers_controller.php:2540
+#, fuzzy
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+#, fuzzy
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Version Notes"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Nominate Add-on"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Add-on nominated successfully!"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2986,7 +1758,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2996,6 +1768,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -3007,13 +1784,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -3023,7 +1800,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -3033,12 +1810,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -3047,14 +1824,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -3133,13 +1910,128 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, fuzzy, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Visit the %1$s page to make changes to your submission, or %2$s to return to "
+"the Developer Control Panel."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "click here"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Edit Add-on"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"This version has been placed in the sandbox while it awaits review from "
+"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"when action has been taken."
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "You can read more about the Sandbox Review System %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "here"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, fuzzy, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"This version has been placed in the sandbox for use by experienced users. In "
+"order for it to be shown on the public site, you must %s your add-on and "
+"undergo a review process."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "nominate"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Your add-on submission has been completed successfully."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Because your add-on is trusted, this version has automatically been approved "
+"for the public area."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Submit Add-on"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Add-on updated successfully"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, fuzzy, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "You may wish to %s to increase interest in your add-on."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "upload a preview"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "No author found [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Remove"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Cancel"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Are you sure you wish to cancel your submission?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Next"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Change add-on type:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Developer Comments updated."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3216,37 +2108,191 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Add Preview"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Author"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Authors"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "None"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Categories"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Category"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Description"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Disabled"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Details"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Developer Comments"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Previews"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Versions"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Homepage"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "None"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "No caption"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "No previews found."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Update"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+#, fuzzy
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+#, fuzzy
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Trusted"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Version %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "No versions found."
+
+#: views/developers/disable.thtml:64
+#, fuzzy
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+#, fuzzy
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+#, fuzzy
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+#, fuzzy
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, fuzzy, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+#, fuzzy
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+#, fuzzy
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+#, fuzzy
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, fuzzy, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3300,62 +2346,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Add Author"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Remove"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3368,30 +2426,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3470,22 +2528,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3494,12 +2552,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3507,12 +2565,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3521,24 +2579,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3546,7 +2604,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3571,44 +2629,110 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Authors"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Add Icon"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Change Icon"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Categories"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "This add-on requires external software"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Only clear the existing icon"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "New Icon File"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Icon"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 #, fuzzy
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "This is a pre-release"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "This is a site-specific add-on"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 #, fuzzy
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+#, fuzzy
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3616,12 +2740,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3629,60 +2753,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3691,32 +2815,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3724,22 +2848,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3747,12 +2871,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3760,39 +2884,50 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Update"
+
+#: views/developers/edit.thtml:121
+#, fuzzy
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3883,14 +3018,70 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "One Pending update"
 msgstr[1] "Pending Updates (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Checked files will be deleted."
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Files"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Target Applications"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "No files."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Update"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "You do not have access to that add-on."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Summaries are limited to a maximum of 250 characters.\n"
+"(You entered %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"The name for your add-on already exists in the database. Please make sure "
+"that: <br /><li>Your GUIDs match. The most common cause for this error is "
+"mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. "
+"If you do, you should update that entry or delete it and try again.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3905,10 +3096,9 @@ msgstr "Please see %s for reference."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "this page"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Please describe the changes made in this add-on update."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3927,6 +3117,10 @@ msgstr ""
 "That file extension (%s) is not allowed for the selected add-on type. Please "
 "use one of the following: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Not all file GUIDs match"
+
 #: controllers/components/developers.php:64
 #, fuzzy
 msgid "devcp_error_five_categories"
@@ -3966,7 +3160,14 @@ msgstr ""
 "That file extension (%s) is not allowed for an icon. Please use one of the "
 "following: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "An identical version (%s) already exists for this add-on and platform."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "No install.rdf present."
 
@@ -3975,7 +3176,7 @@ msgstr "No install.rdf present."
 msgid "devcp_error_install_manifest"
 msgstr "The following errors were found in install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Please select a valid add-on type."
 
@@ -4049,6 +3250,20 @@ msgstr "No ID could be found for this add-on in install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "No platform selected"
 
+#: controllers/developers_controller.php:2803
+#, fuzzy
+msgid "devcp_error_nominate_message"
+msgstr "You must supply the requested details for nomination."
+
+#: controllers/developers_controller.php:2797
+#, fuzzy
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "You cannot nominate a pre-release add-on."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "You can only nominate add-ons currently in the sandbox."
+
 #: controllers/components/developers.php:59
 #, fuzzy
 msgid "devcp_error_one_category"
@@ -4068,6 +3283,16 @@ msgstr ""
 "That file extension (%s) is not allowed for a preview. Please use one of the "
 "following: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "An error occurred trying to save your data."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "You do not have permission to update this add-on."
+
 #: controllers/components/developers.php:511
 #, fuzzy
 msgid "devcp_error_updatekey"
@@ -4082,99 +3307,296 @@ msgstr ""
 "Add-ons cannot use an external updateURL. Please remove this from install."
 "rdf and try again."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 #, fuzzy
 msgid "devcp_error_upload_file"
 msgstr "Please upload a file."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Add Another Platform File"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Add Author"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Remove"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Categories for your new add-on type will be available in the next step."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "No categories available for this add-on type."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Please enter a description of your add-on."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Please enter the name of your add-on."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Please select the type of add-on you are submitting."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Please enter a summary of your add-on."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Add-on File"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Add-on File 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Add-on File 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Add-on Type"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Allow users to view the source files online"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Author's Email Address"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Authors"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Categories"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Default Locale"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Description"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "End User License Agreement (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "This add-on requires external software"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Files"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Homepage"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Icon File"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Name"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Supported Platforms"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "This is a pre-release"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Privacy Policy"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "This is a site-specific add-on"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Summary"
+
+#: views/developers/add_step2.thtml:115
+#, fuzzy
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+#, fuzzy
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Target Applications"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Version"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Version Notes"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "None"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Notes to Reviewer"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Because your add-on is trusted, please choose where this version should go:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Public"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Sandbox"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Developer Agreement"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Step 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Upload File"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Step 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Add-on Details"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Step 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Version Details"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Step 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Localization"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Step 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Success"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "My Add-ons"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Localized Fields"
@@ -4191,12 +3613,12 @@ msgstr ""
 "to the selected default locale (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Admin Control Panel"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Editor Control Panel"
 
@@ -4205,30 +3627,30 @@ msgid "devcp_myaddons_link"
 msgstr "My Add-ons"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Back to Main"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 #, fuzzy
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Submit Add-on"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 #, fuzzy
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4240,27 +3662,39 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Return to add-on details"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Nominate %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Automatically detected add-on type: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4274,6 +3708,22 @@ msgstr ""
 "Removing this as the default preview will cause another preview to "
 "automatically become the default preview."
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"The default locale of this add-on (%1$s [%2$s]) is different from your "
+"currently selected locale (%3$s [%4$s]). The fields below should be "
+"completed in %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4281,14 +3731,14 @@ msgstr ""
 "Making this the default preview will remove default status from the current "
 "default preview."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4317,46 +3767,46 @@ msgstr "Edit Preview"
 msgid "devcp_preview_updated_successfully"
 msgstr "Preview updated successfully."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4364,7 +3814,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4382,7 +3832,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Add Preview"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4391,7 +3841,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Edit Preview"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4404,27 +3854,27 @@ msgstr "Preview File"
 msgid "devcp_previews_label_makedefault"
 msgstr "Make this the default preview image"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4448,18 +3898,26 @@ msgstr "Edit Preview"
 msgid "devcp_previews_submit_upload"
 msgstr "Upload Preview"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Incorrect?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Are you sure you want to delete this file?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr ""
 "Please review and accept the following Developer Agreement before proceeding."
@@ -4471,7 +3929,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4483,6 +3941,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Skip reviewing my current add-on information"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4586,17 +4048,64 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Add-on submissions are currently disabled. Please check back at a later time."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "I Accept"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "I Decline"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "This add-on has been disabled by an administrator."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Disabled"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Trusted"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Latest Version:"
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "You don't have any add-ons. Click %s to submit one."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "here"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, fuzzy, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Please be sure to %s for your theme."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "upload a preview"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4604,44 +4113,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4651,7 +4160,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4659,64 +4168,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4725,7 +4234,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4737,33 +4246,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4776,29 +4280,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4809,12 +4313,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4838,23 +4342,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4863,7 +4362,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4872,14 +4371,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4889,7 +4388,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4897,7 +4396,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4905,22 +4404,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4939,29 +4432,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Please see %s for reference."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "this page"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Edit Version"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Version updated successfully."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -5030,34 +4526,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -5065,49 +4561,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -5117,59 +4608,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -5178,26 +4662,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5240,7 +4724,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 #, fuzzy
 msgid "downloads_disable_warning"
 msgstr "This add-on is disabled"
@@ -5294,7 +4778,7 @@ msgstr "Filter"
 msgid "editorcp_logs_filter_by"
 msgstr "Filter by type/action"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 #, fuzzy
 msgid "editorcp_logs_page_heading"
 msgstr "Event Log"
@@ -5370,7 +4854,7 @@ msgstr "View entries between %s and %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "No reviews found for this period."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 #, fuzzy
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Review Log"
@@ -5400,24 +4884,24 @@ msgstr "Recent Editor Activity"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Total Reviews"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Review Add-on"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Please complete the following fields:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Please select at least one file to review."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Self-reviews are not allowed."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "External Software"
 
@@ -5431,46 +4915,46 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 #, fuzzy
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 #, fuzzy
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 #, fuzzy
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 #, fuzzy
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 #, fuzzy
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 #, fuzzy
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 #, fuzzy
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 #, fuzzy
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
@@ -5485,172 +4969,109 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Filter Queue"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_helpful_links"
 msgstr "Helpful Links"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_guide"
 msgstr "Editors' Guide"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 #, fuzzy
 msgid "editors_link_policy"
 msgstr "Add-on Policy"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "These filters will remain in place for this session or until cleared."
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "There are currently no %s add-ons to review."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 day"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 hour"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 minute"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Editor Control Panel"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s only"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Pre-release"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "%s Compatibility"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Clear"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Filter"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Review Action"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Push to Public"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Request Super-Review"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Retain in Sandbox"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Review Comments"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5658,106 +5079,106 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "This will mark the add-on and its most recent version and files as public. "
 "Future versions will go into the sandbox until they are reviewed by an "
 "editor."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "This will retain the add-on in the sandbox."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "This will approve a sandboxed version of a public add-on to appear on the "
 "public side."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr ""
 "This will cause a sandboxed version of a public add-on to remain in the "
 "sandbox."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "If you have concerns about this add-on's security, copyright issues, or "
 "other concerns that an administrator should look into, enter your comments "
 "in the area below. They will be sent to administrators, not the author."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "View Contents"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Authors:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Categories:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Compatibility:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Description"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Developer Comments"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "EULA"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Files:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Item History"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 #, fuzzy
 msgid "editors_review_header_nominationmessage"
 msgstr "Nomination Message"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Previews"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Privacy Policy"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Review %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Notes to Reviewer"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Summary"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Version Notes"
 
@@ -5787,7 +5208,7 @@ msgstr "Nomination Approved/Public"
 msgid "editors_review_history_nominated_denied"
 msgstr "Nomination Denied/Sandbox"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "No previous review entries could be found."
 
@@ -5815,97 +5236,84 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Applications:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "or select a canned response:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Comments:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Operating Systems:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Top"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "No previews found."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Review Queue"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Process Action"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Action"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Comments"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Date"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Reviewer"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Version/File"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Review successfully processed."
 
@@ -5932,7 +5340,7 @@ msgstr "Action"
 msgid "editors_reviews_in_reply_to"
 msgstr "In reply to:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Reviews processed successfully!"
 
@@ -5944,83 +5352,88 @@ msgstr "There are currently no reviews in moderation."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Process Reviews"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Site Specific"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "New"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Updated"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Tested Application"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Tested Operating Systems"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Additional Information"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Add-on"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Type"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Add-on Types"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Age"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Applications"
+
 #: views/editors/featured.thtml:64
 #, fuzzy
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Platforms"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Submission Types"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s days"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s hours"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s minutes"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Access Denied"
 
@@ -6028,19 +5441,17 @@ msgstr "Access Denied"
 msgid "error_access_denied_message"
 msgstr "You are not authorized to view this page."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -6049,14 +5460,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Eklenti bulunamadı!"
 
@@ -6069,55 +5477,59 @@ msgstr "This add-on is not viewable here."
 msgid "error_addon_selfreview"
 msgstr "You cannot review your own add-on."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Kategoride eklenti yok!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Bu geçerli bir eposta adresi değil."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Bu alan boş bırakılmamalı."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "File not found!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "File error: %s does not exist."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Bu formda hatalar var. Lütfen düzeltip yeniden gönderin."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 #, fuzzy
 msgid "error_invalid_captcha"
 msgstr "Invalid captcha, please try again!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "This URL has an invalid format. Valid URLs look like http://example.com/"
@@ -6125,47 +5537,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Eksik argüman: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Notice"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 #, fuzzy
 msgid "error_review_rating_required"
 msgstr "You must select a rating."
@@ -6174,24 +5574,24 @@ msgstr "You must select a rating."
 msgid "error_user_already_confirmed"
 msgstr "This user account is already confirmed."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Geçersiz onay kodu!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Parolalar eÅŸleÅŸmedi."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Bu eposta adresi başka bir kullanıcı tarafından alınmış."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 #, fuzzy
 msgid "error_user_emailchange_expired"
 msgstr ""
@@ -6199,23 +5599,14 @@ msgstr ""
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Bu takma ad alınmış durumda."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Kullanıcı bulunamadı!"
 
@@ -6223,43 +5614,40 @@ msgstr "Kullanıcı bulunamadı!"
 msgid "error_user_unconfirmed"
 msgstr "Lütfen önce kullanıcı hesabınızı doğrulayınız."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Yanlış kullanıcı adı ya da parola girildi!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Version not found!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Yanlış parola girildi!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 #, fuzzy
 msgid "feature_learnmore"
 msgstr "Learn more"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, fuzzy, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Learn more about %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, fuzzy, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "reviews"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 #, fuzzy
 msgid "feature_view_more_from_category"
 msgstr "View more from"
@@ -6304,44 +5692,43 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "Bütün hakları saklıdır."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "Telif hakları"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 #, fuzzy
 msgid "footer_credits"
 msgstr "Credits"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla is providing links to these applications as a courtesy, and makes no "
@@ -6349,120 +5736,113 @@ msgstr ""
 "to. Any questions, complaints or claims regarding the applications must be "
 "directed to the appropriate software vendor."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Git"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Yasal uyarılar"
 
 # This is the lang code -- should be the same as the dir for this locale.
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "DiÄŸer diller:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Gizlilik politikası"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Kaydet"
+
+#: models/addontype.php:89
 #, fuzzy
 msgid "general_addontype_dict"
 msgstr "Dictionary"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 #, fuzzy
 msgid "general_addontype_dict_plural"
 msgstr "Dictionaries"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 #, fuzzy
 msgid "general_addontype_extension"
 msgstr "Extension"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 #, fuzzy
 msgid "general_addontype_extension_plural"
 msgstr "Extensions"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 #, fuzzy
 msgid "general_addontype_lpaddon"
 msgstr "Language Pack (Add-on)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 #, fuzzy
 msgid "general_addontype_lpaddon_plural"
 msgstr "Language Packs (Add-on)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 #, fuzzy
 msgid "general_addontype_lpapp"
 msgstr "Language Pack (Application)"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 #, fuzzy
 msgid "general_addontype_lpapp_plural"
 msgstr "Language Packs (Application)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 #, fuzzy
 msgid "general_addontype_plugin"
 msgstr "Plugin"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 #, fuzzy
 msgid "general_addontype_plugin_plural"
 msgstr "Plugins"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 #, fuzzy
 msgid "general_addontype_search"
 msgstr "Search Engine"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 #, fuzzy
 msgid "general_addontype_search_plural"
 msgstr "Search Engines"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 #, fuzzy
 msgid "general_addontype_theme"
 msgstr "Theme"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 #, fuzzy
 msgid "general_addontype_theme_plural"
 msgstr "Themes"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, fuzzy, php-format
 msgid "header_home_tooltip"
 msgstr "Return to the %1$s Add-ons homepage"
@@ -6472,99 +5852,41 @@ msgstr "Return to the %1$s Add-ons homepage"
 msgid "header_main_firefox_header"
 msgstr "Firefox Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 #, fuzzy
 msgid "header_main_header"
 msgstr "Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 #, fuzzy
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 #, fuzzy
 msgid "header_main_sunbird_header"
 msgstr "Sunbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 #, fuzzy
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird Add-ons"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Add-ons"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "GiriÅŸ yap"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Çıkış yap"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 #, fuzzy
 msgid "header_navlink_myaccount"
 msgstr "My Account"
@@ -6573,24 +5895,12 @@ msgstr "My Account"
 msgid "header_navlink_register"
 msgstr "Kaydol"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, fuzzy, php-format
 msgid "img_preview_of"
 msgstr "Preview Image of %s"
@@ -6598,48 +5908,37 @@ msgstr "Preview Image of %s"
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 #, fuzzy
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Log in</a> to install this add-on"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, fuzzy, php-format
 msgid "install_button_text"
 msgstr "Add to %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, fuzzy, php-format
 msgid "install_button_title"
 msgstr "Add %1$s to %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, fuzzy, php-format
 msgid "install_download"
 msgstr "Download %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Eklenti bulunamadı!"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 #, fuzzy
 msgid "langtools_a11y_tablesummary"
 msgstr "List of language packs and dictionaries."
@@ -6654,8 +5953,8 @@ msgstr "Download Dictionary"
 msgid "langtools_download_langpack"
 msgstr "Download Language Pack"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 #, fuzzy
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Dictionaries & Language Packs"
@@ -6670,87 +5969,43 @@ msgstr "Install Dictionary"
 msgid "langtools_install_langpack"
 msgstr "Install Language Pack"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 #, fuzzy
 msgid "langtools_tableheader_dictionary"
 msgstr "Dictionary"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 #, fuzzy
 msgid "langtools_tableheader_langpack"
 msgstr "Language Pack"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 #, fuzzy
 msgid "langtools_tableheader_language"
 msgstr "Language"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 #, fuzzy
 msgid "link_return_to_front_page"
 msgstr "Click here to return to the front page."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 #, fuzzy
 msgid "list_sortby_date"
 msgstr "Date"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 #, fuzzy
 msgid "list_sortby_downloads"
 msgstr "Downloads"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 #, fuzzy
 msgid "list_sortby_name"
 msgstr "Add-on Name"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 #, fuzzy
 msgid "list_sortby_rating"
@@ -6781,24 +6036,32 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 #, fuzzy
 msgid "nav_category_dicts_langpacks"
 msgstr "Dictionaries & Language Packs"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+#, fuzzy
+msgid "nav_category_plugins"
+msgstr "Plugins"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 #, fuzzy
 msgid "nav_category_themes"
 msgstr "Themes"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 #, fuzzy
 msgid "other_apps_tooltip"
 msgstr "Find add-ons for other applications"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "others"
 
@@ -6807,35 +6070,14 @@ msgstr "others"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6872,17 +6114,17 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 #, fuzzy
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 #, fuzzy
 msgid "pages_appversions_header"
 msgstr "Valid Application Versions"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 #, fuzzy
 msgid "pages_appversions_intro"
 msgstr ""
@@ -6891,7 +6133,7 @@ msgstr ""
 "below are allowed for these applications."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6900,17 +6142,21 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, fuzzy
 msgid "pages_appversions_required_files_link"
 msgstr "here"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 #, fuzzy
 msgid "pages_appversions_versions"
 msgstr "Versions"
 
-#: views/pages/policy.thtml:51
+#, fuzzy
+msgid "pages_experimental_addons_backbutton"
+msgstr "Back to the previous page"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Sandbox Information Page"
 
@@ -6918,6 +6164,13 @@ msgstr "Sandbox Information Page"
 msgid "pagination_next_page"
 msgstr "sonraki"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, fuzzy, php-format
+msgid "pagination_page_number_title"
+msgstr "This is page %1$s of %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "önceki"
@@ -6961,17 +6214,17 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 #, fuzzy
 msgid "recaptcha_label"
 msgstr "Are you human?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 #, fuzzy
 msgid "recaptcha_whatsthis"
 msgstr "What's this?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 #, fuzzy
 msgid "review_flag_error"
 msgstr "Error flagging this review!"
@@ -6981,7 +6234,7 @@ msgstr "Error flagging this review!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -7001,8 +6254,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 #, fuzzy
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
@@ -7021,7 +6274,7 @@ msgstr ""
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 #, fuzzy
 msgid "review_guidelines_short"
 msgstr ""
@@ -7039,141 +6292,111 @@ msgstr ""
 "a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "%s hakkındaki görüşler"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Özellikli Eklenti"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "En yeni eklentiler"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 #, fuzzy
 msgid "rss_updatedaddons"
 msgstr "Updated Add-ons"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 #, fuzzy
 msgid "search_disabled"
 msgstr "Search is currently disabled. Please try again later."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 #, fuzzy
 msgid "search_form_all_addons"
 msgstr "all add-ons"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 #, fuzzy
 msgid "search_form_default_text"
 msgstr "search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 #, fuzzy
 msgid "search_form_submit_tooltip"
 msgstr "Search for add-ons"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 #, fuzzy
 msgid "search_form_tooltip"
 msgstr "Click to enter search terms"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 #, fuzzy
 msgid "search_form_within"
 msgstr "within"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 #, fuzzy
 msgid "search_landing_all_search_engines"
 msgstr "All Search Engines"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 #, fuzzy
 msgid "search_landing_browse_search_engines"
 msgstr "Browse Search Engines"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, fuzzy, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s matching add-on"
+msgstr[1] "%s matching add-ons"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Sonuç bulunamadı."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Eklentilerde ara"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Arama sonuçları beslemesi"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Sonuçlarda bunu ara: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Admin Tools"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Developer Tools"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Editor Tools"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy
 msgid "sidebar_navlink_welcome"
 msgstr "Welcome"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, fuzzy, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Welcome, %s"
@@ -7183,7 +6406,7 @@ msgstr "Welcome, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Dictionary"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 #, fuzzy
 msgid "sidebar_pitch_featured_addons"
 msgstr "Featured Add-ons"
@@ -7193,7 +6416,7 @@ msgstr "Featured Add-ons"
 msgid "sidebar_pitch_looking_for"
 msgstr "I am looking for a:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 #, fuzzy
 msgid "sidebar_pitch_newest_addons"
 msgstr "Newest Add-ons"
@@ -7203,7 +6426,7 @@ msgstr "Newest Add-ons"
 msgid "sidebar_pitch_search"
 msgstr "Search Plugin"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 #, fuzzy
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Subscribe to"
@@ -7213,26 +6436,27 @@ msgstr "Subscribe to"
 msgid "sidebar_pitch_theme"
 msgstr "Theme"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 #, fuzzy
 msgid "sidebar_pitch_updated_addons"
 msgstr "Updated Add-ons"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 #, fuzzy
 msgid "stars_not_yet_rated"
 msgstr "Not yet rated"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, fuzzy, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Rated %s out of 5 stars"
@@ -7275,13 +6499,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "l, M. j"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, fuzzy, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s created"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, fuzzy, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s released"
@@ -7296,222 +6520,222 @@ msgstr "Close"
 msgid "statistics_help_link"
 msgstr "Help"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 #, fuzzy
 msgid "statistics_index_anotheraddon"
 msgstr "or, select another add-on"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 #, fuzzy
 msgid "statistics_index_anotheraddon_public"
 msgstr "or, select an add-on with public statistics"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 #, fuzzy
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 #, fuzzy
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 #, fuzzy
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 #, fuzzy
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 #, fuzzy
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 #, fuzzy
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 #, fuzzy
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 #, fuzzy
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 #, fuzzy
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 #, fuzzy
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 #, fuzzy
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 #, fuzzy
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 #, fuzzy
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 #, fuzzy
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 #, fuzzy
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 #, fuzzy
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 #, fuzzy
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 #, fuzzy
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 #, fuzzy
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 #, fuzzy
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 #, fuzzy
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 #, fuzzy
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 #, fuzzy
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 #, fuzzy
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 #, fuzzy
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
@@ -7555,7 +6779,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #, fuzzy
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
@@ -7590,22 +6814,27 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, fuzzy, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+#, fuzzy
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy
 msgid "statistics_rss_title_fulldate"
 msgstr "l, F j, Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, fuzzy, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 #, fuzzy
 msgid "statistics_settings_access_description"
 msgstr ""
@@ -7613,102 +6842,102 @@ msgstr ""
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 #, fuzzy
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 #, fuzzy
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 #, fuzzy
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 #, fuzzy
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 #, fuzzy
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 #, fuzzy
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 #, fuzzy
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 #, fuzzy
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 #, fuzzy
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 #, fuzzy
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, fuzzy, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 #, fuzzy
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 #, fuzzy
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 #, fuzzy
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 #, fuzzy
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 #, fuzzy
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 #, fuzzy
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 #, fuzzy
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
@@ -7723,7 +6952,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 #, fuzzy
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
@@ -7744,7 +6973,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 #, fuzzy
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
@@ -7774,55 +7003,38 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, fuzzy, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 #, fuzzy
 msgid "themes_landing_all_themes"
 msgstr "All Themes"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 #, fuzzy
 msgid "themes_landing_browse_themes"
 msgstr "Browse Themes"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 #, fuzzy
 msgid "user_change_email"
 msgstr "Change Email Address"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Parolayı değiştir"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "The confirmation code was resent!"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7830,24 +7042,24 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7858,62 +7070,62 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7922,7 +7134,7 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7930,19 +7142,19 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "I understand that this step cannot be undone."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Deleted User"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 #, fuzzy
 msgid "user_edit_confirm_email_sent"
 msgstr ""
@@ -7950,7 +7162,7 @@ msgstr ""
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Delete user account"
@@ -7982,8 +7194,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -8025,118 +7238,95 @@ msgstr ""
 "Teşekkürler,\n"
 "-- Mozilla Eklentileri Yönetimi"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Mozilla Eklentileri şifremi sıfırla"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 #, fuzzy
 msgid "user_emailchange_error"
 msgstr "Error!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Please confirm your email address change at %1$s Add-ons"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 #, fuzzy
 msgid "user_emailchange_success"
 msgstr "Success!"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Your email address was changed successfully. From now on, please use %1$s to "
 "log in."
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Parolayı doğrulayın"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "%s hakkındaki kullanıcı profilini düzenle"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "E-posta adresi"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Ad"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "E-posta adresini gizle"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "Web sitesi"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Soyad"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Kullanıcı Girişi"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Yeni parola"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Takma ad"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Eski parola"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Other Actions"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Parola"
 
@@ -8144,72 +7334,72 @@ msgstr "Parola"
 msgid "user_form_registration"
 msgstr "Yeni kullanıcı kaydı"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 #, fuzzy
 msgid "user_form_remember_me"
 msgstr "Remember me on this computer"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Show sandbox?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Kaydet"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Oturum aç"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Kaydol"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s Add-ons user since"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Yeni kullanıcı hesabı aç"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Yaptığınız değişikliklerde hatalar bulunmaktadır. Lütfen düzeltip yeniden "
 "gönderiniz..."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Profil güncellendi."
 
@@ -8222,15 +7412,15 @@ msgstr "%s kullanıcısı için parolayı sıfırla"
 msgid "user_pwreset_header"
 msgstr "Parola Sıfırlama"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Şifre sıfırlama bağlantısı e-postanıza gönderildi."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Şifre başarıyla sıfırlandı."
 
@@ -8242,7 +7432,7 @@ msgstr "Parola değişikliğini gönder"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Parola sıfırlama bağlantısı gönder"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s Add-ons"
@@ -8258,7 +7448,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -8270,24 +7460,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "resend the confirmation message"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Congratulations! Your user account was successfully created."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -8300,32 +7476,22 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Thanks for registering and welcome to %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "A first name, last name or nickname is required."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -8334,70 +7500,54 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "Başarıyla doğrulandı!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Delete User Account"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Kullanıcı Hesabı Düzenlemesi"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Add-ons by %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 #, fuzzy
 msgid "users_info_author_name"
 msgstr "Name"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Author Profile"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Email address"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Homepage"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Nickname"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "User Info for %1$s"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Kullanıcı Girişi"
 
@@ -8433,761 +7583,6 @@ msgstr "Kullanıcı Şifre Sıfırlaması"
 msgid "users_register_pagetitle"
 msgstr "Yeni Kullanıcı Kaydı"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Next Add-on"
-
-#, fuzzy
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Previous Add-on"
-
 #, fuzzy
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "The most recent version compatible with"
-
-#, fuzzy
-#~ msgid "addons_display_version_history"
-#~ msgstr "Complete Version History"
-
-#, fuzzy
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Newest:"
-
-#, fuzzy
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Most Popular:"
-
-#, fuzzy
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "We Recommend:"
-
-#, fuzzy
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Recently Updated:"
-
-#, fuzzy
-#~ msgid "addons_home_view_all"
-#~ msgstr "View all"
-
-#, fuzzy
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "See All Recommended Add-ons"
-
-#, fuzzy
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Highest Rated First"
-
-#, fuzzy
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Last Updated First"
-
-#, fuzzy
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Most Popular First"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#, fuzzy
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "This version of your add-on does not claim compatibility with Firefox %1"
-#~ "$s. Mozilla is expecting the next version of Firefox to be released soon, "
-#~ "so please test your add-on in the new version and update compatibility "
-#~ "information. You can find out more about this <a href=\"%2$s\">here</a>. "
-#~ "This is only a notice and you may continue to submit this version to "
-#~ "addons.mozilla.org."
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Add-on disabled successfully"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Edit Add-on"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Add-on enabled successfully"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Add-on Description"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Add-on Homepage"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Add-on Name"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Privacy Policy"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Add-on Summary"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "Support URL"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Version Notes"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Nominate Add-on"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Add-on nominated successfully!"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#, fuzzy
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Visit the %1$s page to make changes to your submission, or %2$s to return "
-#~ "to the Developer Control Panel."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "click here"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Edit Add-on"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox while it awaits review from "
-#~ "sandbox testers and a Mozilla Add-ons editor. You will be notified by e-"
-#~ "mail when action has been taken."
-
-# %1 is the link to the sandbox information page
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "You can read more about the Sandbox Review System %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "here"
-
-# %1 is the "nominate" link
-#, fuzzy
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "This version has been placed in the sandbox for use by experienced users. "
-#~ "In order for it to be shown on the public site, you must %s your add-on "
-#~ "and undergo a review process."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "nominate"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Your add-on submission has been completed successfully."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Because your add-on is trusted, this version has automatically been "
-#~ "approved for the public area."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Submit Add-on"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Add-on updated successfully"
-
-# %1 is the link to the preview upload page
-#, fuzzy
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "You may wish to %s to increase interest in your add-on."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "upload a preview"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "No author found [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Remove"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Cancel"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Are you sure you wish to cancel your submission?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Next"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Change add-on type:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Developer Comments updated."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Add Preview"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "Author"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "Authors"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "None"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Category"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Description"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Disabled"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Details"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Developer Comments"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Previews"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Versions"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Homepage"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "None"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "No caption"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "No previews found."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "No support email provided by developer."
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Support URL"
-
-#, fuzzy
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "No support url provided by developer."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Trusted"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "No versions found."
-
-#, fuzzy
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Cancel and go back"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "Yes, disable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Are you sure you want to disable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Disabling this add-on will hide it from searches and listings. It will "
-#~ "not be downloadable from the website and will not be returned in client "
-#~ "update checks. The add-on will effectively be deleted, although you will "
-#~ "be able to return here and re-enable it at your convenience."
-
-#, fuzzy
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Disable %s"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "Yes, enable it"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Are you sure you want to enable this add-on?"
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Enabling this add-on will cause it to once again appear in searches and "
-#~ "listings. It will be downloadable both from the website and from client "
-#~ "update checks."
-
-#, fuzzy
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Enable %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Add Author"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Author's Email Address"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Remove"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Authors"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Add Icon"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Change Icon"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Only clear the existing icon"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "New Icon File"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Icon"
-
-#, fuzzy
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "short additional info (such as a local dialect name)"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Update"
-
-#, fuzzy
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple "
-#~ "locale name</a>, such as 'en-US'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Checked files will be deleted."
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Files"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Target Applications"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "No files."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Update"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Summaries are limited to a maximum of 250 characters.\n"
-#~ "(You entered %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "The name for your add-on already exists in the database. Please make sure "
-#~ "that: <br /><li>Your GUIDs match. The most common cause for this error is "
-#~ "mismatched GUIDs.</li><li>You do not have a duplicate entry in the "
-#~ "database. If you do, you should update that entry or delete it and try "
-#~ "again.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Please describe the changes made in this add-on update."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Not all file GUIDs match"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr ""
-#~ "An identical version (%s) already exists for this add-on and platform."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "You must supply the requested details for nomination."
-
-#, fuzzy
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "You cannot nominate a pre-release add-on."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "You can only nominate add-ons currently in the sandbox."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "An error occurred trying to save your data."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "You do not have permission to update this add-on."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Add Another Platform File"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Add Author"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Remove"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Categories for your new add-on type will be available in the next step."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "No categories available for this add-on type."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Please enter a description of your add-on."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Please enter the name of your add-on."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Please select the type of add-on you are submitting."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Please enter a summary of your add-on."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Add-on File"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Add-on File 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Add-on File 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Add-on Type"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Allow users to view the source files online"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Author's Email Address"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Authors"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Categories"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Default Locale"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Description"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "End User License Agreement (EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "This add-on requires external software"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Files"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Homepage"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Icon File"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Name"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Supported Platforms"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "This is a pre-release"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Privacy Policy"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "This is a site-specific add-on"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Summary"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Support Email"
-
-#, fuzzy
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Support URL"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Target Applications"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Version"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Version Notes"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "None"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Notes to Reviewer"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Because your add-on is trusted, please choose where this version should "
-#~ "go:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Public"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Sandbox"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Developer Agreement"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Step 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Upload File"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Step 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Add-on Details"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Step 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Version Details"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Step 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Localization"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Step 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Success"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "My Add-ons"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Return to add-on details"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Automatically detected add-on type: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "The default locale of this add-on (%1$s [%2$s]) is different from your "
-#~ "currently selected locale (%3$s [%4$s]). The fields below should be "
-#~ "completed in %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Incorrect?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Are you sure you want to delete this file?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Skip reviewing my current add-on information"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Add-on submissions are currently disabled. Please check back at a later "
-#~ "time."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "I Accept"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "I Decline"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "This add-on has been disabled by an administrator."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Disabled"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Trusted"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "You don't have any add-ons. Click %s to submit one."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "here"
-
-# %1 is the link to the preview upload page
-#, fuzzy
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Please be sure to %s for your theme."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "upload a preview"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Edit Version"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Version updated successfully."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "New"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Updated"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Add-on Types"
-
-#~ msgid "editors_th_age"
-#~ msgstr "Age"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "Applications"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Platforms"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Submission Types"
-
-#~ msgid "error_notice"
-#~ msgstr "Notice"
-
-#~ msgid "forum_save"
-#~ msgstr "Kaydet"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#, fuzzy
-#~ msgid "nav_category_plugins"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Experimental Add-ons"
-
-#, fuzzy
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Back to the previous page"
-
-# %1 is page number, %2 is total page count
-#, fuzzy
-#~ msgid "pagination_page_number_title"
-#~ msgstr "This is page %1$s of %2$s"
-
-#, fuzzy
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s matching add-on"
-#~ msgstr[1] "%s matching add-ons"
-
-#, fuzzy
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS feed of summary data"
diff --git a/site/app/locale/uk/LC_MESSAGES/messages.po b/site/app/locale/uk/LC_MESSAGES/messages.po
index dcff8a3..a2057f7 100644
--- a/site/app/locale/uk/LC_MESSAGES/messages.po
+++ b/site/app/locale/uk/LC_MESSAGES/messages.po
@@ -19,169 +19,160 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Ска�увати в�тановленн�"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Завантажити зараз %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Прийн�ти і завантажити"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Прийн�ти і в�тановити"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "Публічний"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "Пі�очниц�"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Оновлено %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Вер�і� %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "завантаженн�"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "в�ього завантажень"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "завантажень на тижні"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" додаток"
 msgstr[1] "%1$s \"%2$s\" додатків"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "на �торінку"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "Сортувати за:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "ек�периментальний"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "рекомендований"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s недо�тупний дл� %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "�азад до %1$s…"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "�азад до відгуків…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Рейтинг:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "Відгук:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "�аді�лати �вій відгук"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Додати відгук дл� %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Заголовок/Під�умок:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Стерти"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Відпові�ти"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Ви впевнені, що хочете �терти цей відгук?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "�і"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Так"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "Стерти відгук"
 
@@ -190,7 +181,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "Відгук у�пішно �терто."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Редагувати відгук дл� %s"
@@ -203,18 +194,18 @@ msgstr ""
 "�имволів, а ваш має довжину %1$s �имволів."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr ""
 "Будь ла�ка, зауважте: перед тим, �к ваш відгук з’�вить�� на публічному "
 "�айті, його буде модеровано редактором."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Відповідь розробника на:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -232,171 +223,131 @@ msgid "addon_review_pagetitle"
 msgstr "Відгук дл� %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Відповідь %1$s на %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Відповідь розробника:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "Ваш відгук збережено вдало. Д�куємо!"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "огл�нено %1$s %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "%1$s %2$s (рейтинг %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "�а�тупний додаток"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Попередній додаток"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "По�тійне по�иланн� на цю вер�ію"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "�айновіша вер�і�, �умі�на з %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "За�лати"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Перегл�нути профіль автора"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Перегл�д у�іх тем :: Додатки до %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Перегл�нути %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Перегл�д тем — %1$s :: Додатки до %2$s"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Додати відгук"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Додаткові подробиці"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Категорії"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "детальний огл�д"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�е �подобало�ь"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Редагувати �вій відгук"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "У цього додатку є умови конфіденційно�ті."
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "�енавиджу"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Коментарі розробника"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Початкова"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "Відгуки"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Підтримка"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Сподобало�ь"
 
@@ -404,23 +355,19 @@ msgstr "Сподобало�ь"
 msgid "addons_display_long_description"
 msgstr "Докладний опи�"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Обожнюю"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Додаткові зображенн�"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Інші додатки від %1$s"
@@ -429,14 +376,14 @@ msgstr[1] "Інші додатки від цих авторів"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -450,7 +397,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -463,7 +410,7 @@ msgstr ""
 "�пові�тити про те що ваду було виправлено."
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -475,15 +422,16 @@ msgstr ""
 "ви пи�али відгуки, вони не зможуть перепитати ва� або �пові�тити про те що "
 "ваду було виправлено."
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Оцінка"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Дій�но �подобало�ь"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "Будь ла�ка не над�илайте повідомленн� про помилки у відгуках. Ми не "
@@ -491,45 +439,50 @@ msgstr ""
 "щоб допомогти."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Поради щодо оцінюванн�</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "Завітайте у <a href=\"%1$s\">розділ підтримки</a>  щоб дізнати�ь де ви "
 "зможете отримати допомогу �то�овно цього додатку."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "Зберегти"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Перегл�нути в�і додатки %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Дивити�� в�і відгуки (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Показати в�і вер�ії"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Повна і�торі� вер�ій"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Перегл�нути джерело"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Перегл�нути �тати�тику"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Що �кажете?"
 
@@ -537,89 +490,24 @@ msgstr "Що �кажете?"
 msgid "addons_display_workswith"
 msgstr "Працює з:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Щойно додані"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Попул�рні"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Рекомендовані"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "Підпи�ати�ь"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Перегл�нути додатки"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Оновлені"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "від"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "Ми рекомендуємо"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
@@ -627,130 +515,84 @@ msgstr ""
 "комфортними. Озирніть�� навколо та зробіть %1$s таким, �ким його хочете "
 "бачити о�оби�то ви."
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "�айновіші:"
 
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "Інші програми"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "Додатки %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>додаток завантажено</span>"
-msgstr[1] "<strong>%1$s</strong> <span>додатків завантажено</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "�айпопул�рніші:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Ми рекомендуємо:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "�едавно оновлені:"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "Перегл�нути в�і"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "Перегл�нути в�і недавно �творені додатки"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "Перегл�нути в�і попул�рні додатки"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "Перегл�нути в�і рекомендовані додатки"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "Перегл�нути в�і недавно оновлені додатки"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>Дл� того щоб зберегти файл, нати�ніть на по�иланні нижче.</li><li>У "
@@ -758,11 +600,11 @@ msgstr ""
 "кнопку В�тановити, виберіть завантажений вами файл та нати�ніть \"OK\".</"
 "li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Як в�тановлювати  у Sunbird"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>Клацніть правою клавішею мишки на по�иланні нижче і оберіть "
@@ -771,42 +613,39 @@ msgstr ""
 "на кнопці В�тановити, знайдіть/оберіть файл, �кий ви завантажили і клацніть "
 "\"Гаразд\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Як в�тановлювати у Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "показувати ек�периментальні додатки"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Перейти"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Від"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "дл� Linux"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "дл� Mac OS X"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "дл� Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
@@ -814,11 +653,11 @@ msgstr ""
 "подальшої інформації щодо інших модулів, до�тупних дл� браузерів на о�нові "
 "Mozilla, відвідайте %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "Шукаєте модуль, не зазначений тут?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "Модулі допомагають вашому браузеру виконувати окремі функції, такі �к "
@@ -827,24 +666,24 @@ msgstr ""
 "і�нуючої функціонально�ті."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Поширені модулі дл� %1$s"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Модулі"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Документаці�: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr ""
@@ -852,41 +691,36 @@ msgstr ""
 "кори�тувачем перед продовженн�м в�тановленн�:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Знімки екрану дл� %s"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "З такою кількі�тю на�вних додатків кожен може знайти �обі що�ь цікаве. "
 "Почніть з переліку найпопул�рніших. �а�олоджуйте�ь!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Рекомендовані додатки"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Рекомендовані додатки"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Додаткові ре�ур�и"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Центр розробників Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr ""
 "Вибачте, але вам потрібно мати браузер на о�нові Mozilla (�к Firefox) дл� "
@@ -901,63 +735,70 @@ msgstr ""
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "Дізнайте�ь �к %1$s на %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "�творіть �вій"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Перегл�нути за�оби пошуку на %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "За�оби пошуку"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr ""
 "О�облива под�ка проекту Mycroft за їх роботу над за�обами пошуку Firefox"
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "Поділити��"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "Додати до Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "�аді�лати до Digg"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "�аді�лати на Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "Поділити�� з друз�ми на FriendFeed"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "�аді�лати до MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -971,17 +812,17 @@ msgstr "�еповна вер�і�"
 msgid "addons_status_nominated"
 msgstr "У пі�очниці; кандидат у загальнодо�тупні"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "У пі�очниці; очікує на відгук"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Загальнодо�тупний"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "У пі�очниці"
@@ -990,38 +831,26 @@ msgstr "У пі�очниці"
 msgid "addons_status_unknown"
 msgstr "�евідомо"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "Дізнайте�ь більше про цей додаток"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Будьте обережні з �тарими вер�і�ми"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "Ці вер�ії показані з метою по�иланн� і випробуванн�. Ви повинні завжди "
 "викори�товувати найо�таннішу вер�ію додатку."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "І�торі� вер�ій із протоколом змін"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "І�торі� вер�ій %1$s"
@@ -1056,463 +885,151 @@ msgstr "Група адміна"
 msgid "admin_group_saved"
 msgstr "Група збережена"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Хитріше"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "Будь-коли"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "Будь-що"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "Будь-�ка"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Програма"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
-msgstr "Збігом �лова"
+msgstr "Співпадінн� �лова"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
-msgstr "Датою оновленн�"
+msgstr "Во�таннє оновлено"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
-msgstr "Ім’�м"
+msgstr "Ім’�"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
-msgstr "�овизною"
+msgstr "�айновіші"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "Минулі 3 мі��ці"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "Минулі 6 мі��ців"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Минулий день"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Минулий мі��ць"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Минулий тиждень"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Минулий рік"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "�а �торінку"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Платформа"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
-msgstr "Попул�рні�тю"
+msgstr "Попул�рні�ть"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
-msgstr "Рейтингом"
+msgstr "Рейтинг"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "Сортувати за"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "до"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Перемкнути хитрий режим пошуку"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Тип"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "вер�і�"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "�а�тупна"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "Попередн�"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "�е зважати на цільову вер�ію"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "Цей додаток розраховано на �тару вер�ію Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "Ви можете <a href=\"%1$s\">�пробувати �тарішу вер�ію додатку</a> чи <a href="
 "\"#\" onclick=\"%2$s\">пропу�тити цю перевірку</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">Старіша вер�і�</a> може запрацювати"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr "Цей додаток вимагає ще не випущений <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr ""
 "<a href=\"http://getfirefox.com\">Оновіть Firefox</a> щоб �кори�тати�ь цим "
 "додатком"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Додатки за ім’�м"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "�айновіші додатки"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Попул�рні додатки"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Додатки за рейтингом"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "�едавно оновлені додатки"
 
@@ -1521,1049 +1038,253 @@ msgid "categories_current_title"
 msgstr "Поточна категорі�"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Категорії"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Оберіть категорії"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Показати в�і %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Перегл�нути в�і рекомендовані додатки"
 
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "�айрейтинговіші �початку"
 
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "�айновіші �початку"
 
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "�айпопул�рніші �початку"
 
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Показати в�і %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Колекцію не знайдено!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "Додано %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Центр �умі�но�ті додатків"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
 "Будьте готові до випу�ку %1$s з ін�трументами та інформацією, "
 "до�тупниминижче дл� �пільноти розробників додатків до %2$s."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "Завантаженн� даних..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "�азад до опи�у"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Звіт про �умі�ні�ть додатку"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Інформаці� дл� розробників додатків"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "Змінити maxVersion без відвантаженн�"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Перевірити �тату� моїх додатків"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
+#, fuzzy
 msgid "compatibility_developers_login_first"
 msgstr ""
-"Якщо ваші додатки розміщені на Сайті додатків Mozilla, <a href=\"%1$s"
-"\">зайдітьіз паролем</a> дл� того, щоб дізнати�� про �тан ваших додатків до %"
-"2$s."
+"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please "
+"login</a> to analyze the status of your add-ons for %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
+#, fuzzy
 msgid "compatibility_developers_mdclogo_alt"
-msgstr "Лого Центру розробників Mozilla"
+msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
+#, fuzzy
 msgid "compatibility_developers_no_addons"
-msgstr "�а Сайті додатків Mozilla не розміщено жодного вашого додатку."
+msgstr "You do not have any add-ons hosted on Mozilla Add-ons."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
+#, fuzzy
 msgid "compatibility_developers_results"
-msgstr "Результати перевірки �тану додатків"
+msgstr "Add-on Status Check Results"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
+#, fuzzy
 msgid "compatibility_developers_retrieving"
-msgstr "Отриманн� �тану розміщених додатків..."
+msgstr "Retrieving status of hosted add-ons..."
 
 #. %1$s is a number
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
+#, fuzzy
 msgid "compatibility_developers_user_count"
-msgstr "%1$s кори�тувачів %2$s users (%3$s&#37; від загальної кілько�ті)"
+msgstr "%1$s %2$s users (%3$s&#37; of total)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
+#, fuzzy
 msgid "compatibility_report_detail_intro"
 msgstr ""
-"Подані нижче додатки разом, на�кільки відомо Mozilla, �кладають 95% від "
-"загального викори�танн�; їх від�ортовано за мірою викори�танн�."
+"The add-ons below make up 95% of add-on usage known to Mozilla and are "
+"ordered by their usage size."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
+#, fuzzy
 msgid "compatibility_report_detailed_link"
-msgstr "Показати детальний звіт"
+msgstr "View Detailed Report"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
+#, fuzzy
 msgid "compatibility_report_intro"
 msgstr ""
-"Із %1$s додатків, �кі �кладають 95&#37; від загального відомого Mozilla "
-"викори�танн�, <b>%2$s&#37;</b> вважають�� �умі�ними з найновішими збірками %3"
-"$s."
+"Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, "
+"<b>%2$s&#37;</b> are currently considered compatible with the latest builds "
+"of %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha"
-msgstr "�льфа-вер�і�"
+msgstr "Alpha Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
+#, fuzzy
 msgid "compatibility_report_legend_alpha_description"
-msgstr "Додатки, �умі�ні з альфа-вер�ією %1$s"
+msgstr "Add-ons compatible with an alpha version of %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta"
-msgstr "Бета-вер�і�"
+msgstr "Beta Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
+#, fuzzy
 msgid "compatibility_report_legend_beta_description"
-msgstr "Додатки, �умі�ні з бета-вер�ією чи з реліз-кандидатом %1$s"
+msgstr "Add-ons compatible with a beta version or release candidate of %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest"
-msgstr "�айновіша вер�і�"
+msgstr "Latest Version"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
+#, fuzzy
 msgid "compatibility_report_legend_latest_description"
-msgstr "Додатки, �умі�ні з найновішими збірками %1$s"
+msgstr "Add-ons up-to-date with the latest builds of %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other"
-msgstr "Інші вер�ії"
+msgstr "Other Versions"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
+#, fuzzy
 msgid "compatibility_report_legend_other_description"
-msgstr "Додатки, не �умі�ні з жодною вер�ією %1$s"
+msgstr "Add-ons not compatible with any version of %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
+#, fuzzy
 msgid "compatibility_report_title"
-msgstr "Звіт про �умі�ні�ть додатків"
+msgstr "Add-on Compatibility Report"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
+#, fuzzy
 msgid "compatibility_user_info"
-msgstr "Інформаці� дл� кори�тувачів додатку"
+msgstr "Information for Add-on Users"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
+#, fuzzy
 msgid "compatibility_view_report"
-msgstr "Показати звіт про �умі�ні�ть"
+msgstr "View Compatibility Report"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "Дл� інформації щодо вне�ку, будь ла�ка, завітайте на нашу %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "вікі-�торінку"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr ""
 "Mozilla хотіла б под�кувати на�тупним люд�м за їхні вне�ки у проект addons."
 "mozilla.org впродовж років:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Розробники"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Редактори"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Перекладачі"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Інші помічники"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Минулі розробники"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Програми та зображенн�"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "Де�кі іконки вз�то з <a href=\"http://www.famfamfam.com/lab/icons/silk/"
 "\">famfamfam Silk Icon Set</a>, до�тупні за ліцензією<a href=\"http://"
 "creativecommons.org/licenses/by/2.5/\">Creative Commons Attribution 2.5 </a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2574,20 +1295,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e %b %Y"
 
@@ -2622,30 +1340,46 @@ msgstr "Панель �тати�тики"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "Файл %1$s має недій�не розширенн� (2$s). Дозволені розширенн�: %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr ""
-"�е вдало�� зберегти файл %s у базі даних. Спробуйте ще раз, будь ла�ка."
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "Файл попереднього перегл�ду %1$s було з у�піхом замінено файлом %2$s."
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "Файл %s у�пішно завантажено. �ижче можна дати йому заголовок."
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(автовизначенн�)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"This version of your add-on does not claim compatibility with Firefox %1$s. "
+"Mozilla is expecting the next version of Firefox to be released soon, so "
+"please test your add-on in the new version and update compatibility "
+"information. You can find out more about this <a href=\"%2$s\">here</a>. "
+"This is only a notice and you may continue to submit this version to addons."
+"mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Відкриває нове вікно"
@@ -2682,170 +1416,273 @@ msgstr "Крок 5: У�піх"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Підказка з подаванн�"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Додаток відключено у�пішно"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Редагувати додаток"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Додаток включено у�пішно"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Опи� додатку"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "ЛУКК"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Домашн� �торінка додатку"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "�азва додатку"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Перегл�д заголовку"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "Зробити активним"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Умови конфіденційно�ті"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Під�умок додатку"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Support Email"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "Support URL"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Примітки вер�ії"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "Подати додаток"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Додаток подано у�пішно!"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
-"Зробити додаток активним, вна�лідок чого він з’�вить�� у публічних �пи�ках, "
-"а �лужбу перевірки його оновлень буде запущено."
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "Завершити додаток"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "Завершити ваш додаток і перене�ти його до Пі�очниці"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "Зробити неактивним"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
-"Зробити ваш додаток неактивним дл� того, щоб �ховати його з публічних "
-"�пи�ків і вимкнути дл� нього �лужбу перевірки оновлень."
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "Перене�ти до Пі�очниці"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "Перене�ти ваш додаток назад до Пі�очниці. Цю дію не можна �ка�увати."
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "Подати в загальнодо�тупні"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "Ви�унути ваш додаток у кандидати в категорію загальнодо�тупних"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "Зробити загальнодо�тупним"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "Знову зробити ваш додаток загальнодо�тупним."
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"Ваш додаток <span class=\"inactive-0\">активний</span>. Це означає, що "
-"йогоможна побачити в у�іх �пи�ках, відповідних його �танові."
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"Приведіть, будь ла�ка, ваш додаток до вимог, наведених вище, перш ніж "
-"переводити його до <span class=\"status-1\">Пі�очниці</span>."
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"Тепер ви можете завершити ваш додаток і перене�ти його до <span class="
-"\"status-1\">Пі�очниці</span> одним нати�ком кнопки, розташованої нижче."
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "Обрано хоча б одну категорію"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "�еобхідний опи� додатку"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "�еобхідне ім’� додатку"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "Додаток не помічено �к попередній реліз."
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr ""
-"Дл� тем та розширень необхідне хоча б одне зображенн� попереднього перегл�ду."
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "�еобхідне резюме додатку"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "Стан додатку: %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "Можливі дії"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "Стан активно�ті: <span class=\"inactive-0\">�ктивний</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "Умови завершено�ті додатку"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "Стан активно�ті: <span class=\"inactive-1\">�еактивний</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "Умови ви�уненн� в кандидати до загальнодо�тупних"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "Стан довіри: <span class=\"status-4\">Можна довір�ти</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"Ваш додаток зараз <span class=\"inactive-1\">неактивний</span>. Це означає, "
-"що йогоне можна побачити в жодному �пи�ку незалежно від його �тану. "
-"Оновленн� через �лужбу оновленьдл� нього <b>не</b> надають��."
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"Приведіть, будь ла�ка, ваш додаток до на�тупних умов, перш ніж ви�увати його "
-"в кандидати до <span class=\"status-4\">загальнодо�тупних</span>."
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"Тепер ви можете ви�унути ваш додаток у кандидати до <span class=\"status-4"
-"\">загальнодо�тупних</span>, нати�нувши кнопку нижче."
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "Загальнодо�тупний"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "Пі�очниц�"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"Ваш додаток було <span class=\"status-5\">заблоковано</span> "
-"адміні�тратором; ним не можна кори�тувати��. Якщо ви маєте питанн�, "
-"надішліть електронного ли�та на адре�у %s."
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
 #, fuzzy
@@ -2901,13 +1738,122 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Відвідайте �торінку %1$ дл� вне�енн� змін в �воє поданн�, або %2$s дл� "
+"поверненн� у Панель управлінн� розробника."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "клацніть тут"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Редагувати додаток"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Ц� вер�і� розміщена у пі�очниці і очікує перегл�дів від випробувальників "
+"пі�очниці та редактора додатків Mozilla’и. Ва� повідомл�ть електронною "
+"поштою, коли відбудеть�� поді�."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Ви можете прочитати більше про �и�тему перегл�ду пі�очниці %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "тут"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Ц� вер�і� розміщена у пі�очниці дл� викори�танн� до�відченими кори�тувачами. "
+"Щоб її показали на публічному �айті, ви повинні %s ваш додаток і пройти "
+"проце� перегл�ду."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "наді�лати"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "�ад�иланн� вашого додатку завершено у�пішно."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Тому, що вашому додатку довір�ють, ц� вер�і� автоматично �хвалена дл� "
+"публічної діл�нки."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "�аді�лати додаток"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Додаток оновлено у�пішно"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Ви можете захотіти %s , щоб підвищити інтере� до �вого додатку."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "відвантажити знімок екрану"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "Жодного автора [%s] не знайдено"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Вилучити"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Відкликати"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Певні, що бажаєте відкликати �воє поданн�?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Далі"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Змінити тип додатку:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Оновлено коментарі розробника."
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -2984,37 +1930,180 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Додати знімок екрану"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "�втор"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "�втори"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Жодних"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Категорії"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Категорі�"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Опи�"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Відключено"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Деталі"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Коментарі розробника"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Знімки екрану"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Вер�ії"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Домашн� �торінка"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Жодних"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Без заголовка"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Знімків екрану не знайдено."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Оновити"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Support Email"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "No support email provided by developer."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "Support URL"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "No support url provided by developer."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "Довірити"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Вер�і� %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Вер�ій не знайдено."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Cancel and go back"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "Yes, disable it"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Are you sure you want to disable this add-on?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Disabling this add-on will hide it from searches and listings. It will not "
+"be downloadable from the website and will not be returned in client update "
+"checks. The add-on will effectively be deleted, although you will be able to "
+"return here and re-enable it at your convenience."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Disable %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "Yes, enable it"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Are you sure you want to enable this add-on?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Enabling this add-on will cause it to once again appear in searches and "
+"listings. It will be downloadable both from the website and from client "
+"update checks."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Enable %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3068,62 +2157,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Додати автора"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "Email автора"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Стерти"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3136,30 +2237,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3238,22 +2339,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3262,12 +2363,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3275,12 +2376,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3289,24 +2390,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3314,7 +2415,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3339,42 +2440,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Категорії від�утні дл� цього типу додатку."
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "�втори"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Додати значка"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Змінити значок"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Дозволити кори�тувачам читати початкові файли в мережі"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Категорії"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Типова мова"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Цей додаток потребує зовнішніх програм"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Тільки �терти і�нуючий значок"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "�овий файл значка"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Значок"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Additional Locale Info"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "Це попередній випу�к"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "Це додаток дл� окремого �айту"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "Target Locale"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "short additional info (such as a local dialect name)"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3382,12 +2548,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3395,60 +2561,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3457,32 +2623,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3490,22 +2656,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3513,12 +2679,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3526,39 +2692,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Оновити"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">simple locale "
+"name</a>, such as 'en-US'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3645,14 +2821,68 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Оновленн� в черзі (%s)"
 msgstr[1] "Оновленн� в черзі (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Позначені файли будуть �терті."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Файли"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Цільові програми"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "�емає файлів."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Примітки огл�дачу"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Оновити"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "У ва� немає до�тупу до цього додатку."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Під�умки обмежені до мак�имально 250 �имволів.\n"
+"(Ви ввели %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"�азва дл� вашого додатку вже і�нує в базі даних. Будь ла�ка, переконайте��, "
+"що: <br /><li>ваші GUIDи відповідають. �айпоширеніша причина цієї помилки – "
+"це невідповідні GUIDи.</li><li>ви не маєте дублікату запи�у у базі даних. "
+"Якщо маєте, ви повинні оновити або �терти цей запи� і �пробувати знову.</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3666,10 +2896,9 @@ msgstr "Будь ла�ка, дивіть�� %s дл� довідки."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "цю �торінку"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Будь ла�ка, опишіть зміни, зроблені у цьому оновленні додатку."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3688,6 +2917,10 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� обраного типу додатку. Будь ла�ка, "
 "викори�тайте одне з на�тупних: %s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "�е в�і файли GUIDів відповідають"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "Будь ла�ка, оберіть не більше п’�ти категорій."
@@ -3722,7 +2955,14 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� значка. Будь ла�ка, викори�тайте "
 "одне з на�тупних: %s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Ідентична вер�і� (%s) вже і�нує дл� цього додатку і платформи."
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Від�утній install.rdf."
 
@@ -3730,7 +2970,7 @@ msgstr "Від�утній install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "�а�тупні помилки знайдені у install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Будь ла�ка, оберіть дій�ний тип додатку."
 
@@ -3798,6 +3038,18 @@ msgstr "Дл� цього додатку не знайдено жодного ID
 msgid "devcp_error_no_platform"
 msgstr "Жодної платформи не обрано"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Ви повинні подати потрібні деталі дл� поданн�."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Ви не можете подавати додаток попередньої вер�ії."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Ви можете подавати тільки додатки, �кі вже в пі�очниці."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Будь ла�ка, оберіть принаймні одну категорію."
@@ -3815,6 +3067,16 @@ msgstr ""
 "Це розширенн� файлу (%s) недозволене дл� знімку екрану. Будь ла�ка, "
 "викори�тайте одне з на�тупних: %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Стала�� помилка при збереженні ваших даних."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Вам не дозволено оновлювати цей додаток."
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr ""
@@ -3827,98 +3089,294 @@ msgstr ""
 "Додатки не можуть викори�товувати URL оновленн�. Будь ла�ка, вилучте його з "
 "install.rdf та �пробуйте знову."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Будь ла�ка, відвантажте файл."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Додати файл іншої платформи"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Додати автора"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Вилучити"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr ""
+"Категорії дл� вашого нового типу додатку будуть до�тупні на на�тупному кроці."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Дл� цього типу додатку категорії недо�тупні."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Будь ла�ка, введіть опи� вашого додатку."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Будь ла�ка, введіть назву вашого додатку."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Будь ла�ка, оберіть тип додатку, �кий ви подаєте."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Будь ла�ка, введіть під�умок вашого додатку."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Файл додатку"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Файл додатку 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Файл додатку 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Тип додатку"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Дозволити кори�тувачам перегл�дати початковий код в онлайні"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "Email адре�а автора"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "�втори"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Категорії"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Типова мова"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Опи�"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Ліцензійна угода з кінцевим кори�тувачем (ЛУКК)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Цей додаток потребує зовнішніх програм"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Файли"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Домашн� �торінка"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Файл значка"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Ім’�"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "Підтримувані платформи"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "Це попередн� вер�і�"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Умови конфіденційно�ті"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "Це додаток дл� окремого �айту"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Під�умок"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Support Email"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "Support URL"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Цільові програми"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Вер�і�"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Примітки вер�ії"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Жодних"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Примітки перегл�дачу"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Тому що вашому додатку довір�ють, будь ла�ка, оберіть куди повинна піти ц� "
+"вер�і�:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Публіка"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Пі�очниц�"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Угода з розробником"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "Крок 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Відвантажити файл"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "Крок 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Деталі додатку"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "Крок 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Деталі вер�ії"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "Крок 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Переклади"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "Крок 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "У�піх"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Мої додатки"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Локалізовані пол�"
@@ -3934,12 +3392,12 @@ msgstr ""
 "обраної типової мови (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Панель управлінн� адміна"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Панель управлінн� редактора"
 
@@ -3948,28 +3406,28 @@ msgid "devcp_myaddons_link"
 msgstr "Мої додатки"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "�азад до головного"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Statistics Dashboard"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "�аді�лати додаток"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Developer Tools"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -3981,26 +3439,37 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Повернути�� до деталей додатку"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "Подати %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "�втоматично визначений тип додатку: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4014,6 +3483,17 @@ msgstr ""
 "Ска�уванн� цього, �к типового знімку екрану �причинить автоматичне "
 "перемиканн� іншого знімку на роль типового."
 
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Типова мова цього додатку (%1$s [%2$s]) відмінна від поточно обраної вами "
+"мови (%3$s [%4$s]). Пол� нижче повинні бути заповнені на %1$s."
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
@@ -4021,14 +3501,14 @@ msgstr ""
 "Зробивши цей знімок типовим ви приберете типовий �тату� з поточного типового "
 "знімку."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4057,46 +3537,46 @@ msgstr "Редагувати знімок"
 msgid "devcp_preview_updated_successfully"
 msgstr "Знімок екрану оновлено у�пішно."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4104,7 +3584,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4122,7 +3602,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "Додати знімок екрану"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4131,7 +3611,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "Редагувати знімок екрану"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4144,27 +3624,27 @@ msgstr "Файл знімку екрану"
 msgid "devcp_previews_label_makedefault"
 msgstr "Зробити це типовим зображенн�м перегл�ду"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4188,18 +3668,26 @@ msgstr "Редагувати знімок"
 msgid "devcp_previews_submit_upload"
 msgstr "Відвантажити знімок екрану"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "�евірно?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Ви впевнені, що хочете �терти цей файл?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "Будь ла�ка, перегл�ньте та прийміть на�тупну Угоду перед продовженн�м."
 
@@ -4210,7 +3698,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4222,6 +3710,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "Пропу�тити оновленн� інформації про мій поточний додаток"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4325,17 +3817,62 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Подаванн� додатків зараз відключено. Будь ла�ка, �пробуйте знову пізніше."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Я погоджую�ь"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Я відмовл�ю�ь"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Цей додаток було відключено адміні�тратором."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Відключено"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Довірено"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "О�танн� вер�і�:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "У ва� немає жодних додатків. Клацніть %s дл� поданн�."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "тут"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Будь ла�ка, переконайте��, що %s дл� вашої теми."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "Відвантажити знімок екрану"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4343,44 +3880,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4390,7 +3927,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4398,64 +3935,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4464,7 +4001,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4476,33 +4013,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4515,29 +4047,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4548,12 +4080,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4577,23 +4109,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4602,7 +4129,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4611,14 +4138,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4628,7 +4155,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4636,7 +4163,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4644,22 +4171,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4678,29 +4199,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Будь ла�ка, дивіть�� %s дл� довідки."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "цю �торінку"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Редагувати вер�ію"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Вер�і� оновлена у�пішно."
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4769,34 +4293,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4804,49 +4328,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4856,59 +4375,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4917,26 +4429,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -4979,7 +4491,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Цей додаток відключено"
 
@@ -5030,7 +4542,7 @@ msgstr "Фільтр"
 msgid "editorcp_logs_filter_by"
 msgstr "Фільтр за типом/дією"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Журнал подій"
 
@@ -5092,7 +4604,7 @@ msgstr "Дивити�� запи�и між %s та %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "За цей період не знайдено перегл�дів."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Журнал огл�ду"
 
@@ -5116,24 +4628,24 @@ msgstr "�ещодавн� активні�ть редакторів"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Загалом перегл�дів"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "Перегл�д додатку"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Будь ла�ка, заповніть на�тупні пол�:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Будь ла�ка, оберіть принаймні один файл дл� перегл�ду."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Самоперегл�ди недозволені."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Зовнішні програми"
 
@@ -5145,39 +4657,39 @@ msgstr "Add feature"
 msgid "editors_featured_add_feature_submit"
 msgstr "Add"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Failed to add feature."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Successfully added feature."
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Failed to edit feature."
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Successfully edited feature."
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "One or more locales are invalid."
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Failed to remove feature."
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Successfully removed feature."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Featured Add-ons"
 
@@ -5189,167 +4701,104 @@ msgstr "Go"
 msgid "editors_featured_remove_feature"
 msgstr "Remove feature"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Фільтр черги"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Помічні по�иланн�"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Керівництво редакторів"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Політика додатків"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "Ці фільтри залишатимуть�� на мі�ці на цю �е�ію або до очищенн�."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Зараз немає %s додатків дл� перегл�ду."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 день"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 година"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 хвилина"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Панель управлінн� редактора"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "лише %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Попередн� вер�і�"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Сумі�ні�ть %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Очи�тка"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Фільтр"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "В�і черги перегл�дів зараз відключено. Будь ла�ка, �пробуйте знову пізніше."
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Ді� перегл�ду"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "Проштовхнути на публіку"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "Запро�ити �уперперегл�д"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Залишити у пі�очниці"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "Перегл�д коментарів"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5357,100 +4806,100 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "Це позначить додаток і його о�танню вер�ію та файли �к публічні. Майбутні "
 "вер�ії підуть у пі�очницю, поки їх не перегл�не редактор."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Це залишить додаток у пі�очниці."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr ""
 "Це �хвалить вер�ію пі�очниці публічного додатку до по�ви на публічній "
 "�тороні."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "Це зму�ить вер�ію пі�очниці публічного додатку залишити�� у пі�очниці."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "Якщо у ва� є думки щодо безпеки цього додатку, питань автор�ьких прав або "
 "інші думки, �кі повинен розгл�нути адміні�тратор, введіть �вої коментарі у "
 "поле нижче. Їх буде наді�лано адміні�тратору, не автору."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "Порівн�ти з публічною вер�ією"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Дивити�� змі�т"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "�втори:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Категорії:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Сумі�ні�ть:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Опи�"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Коментарі розробника"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "ЛУКК"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Файли:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "І�торі� предмету"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Повідомленн� поданн�"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Попередні перегл�ди"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Умови конфіденційно�ті"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "Перегл�д %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Примітки перегл�дачу"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Під�умок"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Примітки вер�ії"
 
@@ -5480,7 +4929,7 @@ msgstr "Поданн� �хвалено/публіка"
 msgid "editors_review_history_nominated_denied"
 msgstr "Поданн� відхилено/пі�очниц�"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "�еможливо знайти попередні перегл�ди."
 
@@ -5508,96 +4957,83 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Програми:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "або оберіть �тандартну відповідь:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Коментарі:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Операційні �и�теми:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Верх"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 #, fuzzy
 msgid "editors_review_next_link"
 msgstr "next &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "�е знайдено попередніх перегл�дів."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 #, fuzzy
 msgid "editors_review_previous_link"
 msgstr "&laquo; prev"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Перегл�д черги"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 #, fuzzy
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> of %2$s in queue"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Ді� обробки"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Ді�"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Коментарі"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Дата"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Перегл�дач"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Вер�і�/файл"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Перегл�д у�пішно оброблено."
 
@@ -5623,7 +5059,7 @@ msgstr "Ді�"
 msgid "editors_reviews_in_reply_to"
 msgstr "У відповідь на:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "Перегл�ди оброблено у�пішно!"
 
@@ -5635,82 +5071,87 @@ msgstr "�а модеруванні зараз немає перегл�дів."
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Перегл�ди обробки"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Окремий �айт"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "�ове"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "Оновлене"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Випробувана програма"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Випробувані операційні �и�теми"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Додаткова інформаці�"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Додаток"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Тип"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Тип додатків"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Вік"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Програми"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Restrict to locales?"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "Платформи"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Типи подаванн�"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s днів"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s годин"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s хвилин"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "У до�тупі відмовлено"
 
@@ -5718,19 +5159,17 @@ msgstr "У до�тупі відмовлено"
 msgid "error_access_denied_message"
 msgstr "Вам недозволено огл�дати цю �торінку."
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5739,14 +5178,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Додаток не знайдено!"
 
@@ -5758,54 +5194,58 @@ msgstr "Цей додаток не перегл�даєть�� тут."
 msgid "error_addon_selfreview"
 msgstr "Ви не можете огл�дати �вої вла�ні додатки."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Жодних додатків у цій категорії!"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Це недій�на email адре�а."
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Це поле не повинно бути пу�тим."
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Файл не знайдено!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Помилка файлу: %s не знайдено."
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "У цій формі є помилки. Будь ла�ка, виправте їх і знову надішліть."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "�евірно введено код перевірки люд�но�ті (каптча), пробуйте ще раз!"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr ""
 "Цей URL має недій�ний формат. Дій�ні URLи вигл�дають http://example.com/"
@@ -5813,47 +5253,35 @@ msgstr ""
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Бракує аргумента: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 #, fuzzy
 msgid "error_no_files_in_addon"
 msgstr "No Files"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Повідомленн�"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Знімок не знайдено!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Ви повинні зазначити рейтинг."
 
@@ -5861,47 +5289,38 @@ msgstr "Ви повинні зазначити рейтинг."
 msgid "error_user_already_confirmed"
 msgstr "Цей рахунок кори�тувача вже підтверджений."
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "�едій�ний код підтвердженн�!"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Паролі не �піпадають."
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "Ц� email адре�а вже зайн�та іншим кори�тувачем."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "The email change has expired. Please change your email address again in your "
 "user profile and click the link in the confirmation email as soon as you "
 "receive it."
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Це прізви�ько вже зайн�те."
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Кори�тувача не знайдено!"
 
@@ -5911,42 +5330,39 @@ msgstr ""
 "Будь ла�ка, �початку підтвердіть ваш кори�тувацький рахунок кодом, �кий ви "
 "отримали email’ом."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "�евірне ім’� кори�тувача або пароль!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Вер�ію не знайдено!"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Введено невірний пароль!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Дізнайте�ь більше"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Дізнати�ь більше про %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "огл�дів"
 msgstr[1] "огл�дів"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Перегл�нути ще з"
 
@@ -5990,43 +5406,42 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "В�і права захищені."
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "�втор�ькі права"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "Колектив"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla люб’�зно надає по�иланн� на ці програми, але не відповідає за їх "
@@ -6034,98 +5449,91 @@ msgstr ""
 "програм �лід над�илати до відповідного по�тачальника програмного "
 "забезпеченн�."
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Далі"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "Правові повідомленн�"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "Інші мови:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "Умови конфіденційно�ті"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "Зберегти"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Словник"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Словники"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Розширенн�"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Розширенн�"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Пакет перекладу додатка"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Пакети перекладу додатка"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Пакет перекладу"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Пакети перекладу"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Модуль"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Модулі"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "За�іб Пошуку"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "За�іб Пошуку"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Тема"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Теми"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Повернути�ь на %1$s домашню �торінку додатків"
@@ -6134,92 +5542,37 @@ msgstr "ПовернутиÑ�ÑŒ на %1$s домашню Ñ�торінку додÐ
 msgid "header_main_firefox_header"
 msgstr "Додатки Firefox"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Додатки <em>дл�</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Додатки"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Додатки <img alt=\"Додатки\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Додатки Seamonkey"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Додатки <em>дл�</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Додатки Sunbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Додатки <em>дл�</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Додатки Thunderbird"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Додатки <em>дл�</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Додатки"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "Увійти"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "Вийти"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "Мій профіль"
 
@@ -6227,69 +5580,47 @@ msgstr "Мій профіль"
 msgid "header_navlink_register"
 msgstr "Реє�траці�"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Зареє�труйте�ь</a> чи <a href=\"%2$s\">Увійдіть</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "Попередній перегл�д %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">Увійдіть</a>, щоб в�тановити цей додаток"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Додати до %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Додати %1$s до %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Завантажити %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Цей додаток недо�тупний."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Перелік мовних пакетів та �ловників."
 
@@ -6301,8 +5632,8 @@ msgstr "Завантажити �ловник"
 msgid "langtools_download_langpack"
 msgstr "Завантажити мовний пакет"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Словники та мовні пакети"
 
@@ -6314,80 +5645,36 @@ msgstr "В�тановити �ловник"
 msgid "langtools_install_langpack"
 msgstr "В�тановити мовний пакет"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Словник"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Мовний пакет"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Мова"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Клацніть тут щоб повернути�ь на початкову �торінку."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Датою"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Завантаженн�ми"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "�азвою"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Рейтингом"
@@ -6413,20 +5700,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Словники та мовні пакети"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Модулі"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Теми"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "Знайти додатки дл� іншої програми"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "інші"
 
@@ -6435,35 +5729,14 @@ msgstr "інші"
 msgid "page_title_appversions"
 msgstr "Application Versions"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 #, fuzzy
 msgid "page_title_credits"
 msgstr "Credits"
 
-#: controllers/pages_controller.php:113
 #, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "Experimental Add-ons"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6500,15 +5773,15 @@ msgstr "Sandbox Review System"
 msgid "page_title_submissionhelp"
 msgstr "Submission Help"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Дій�ні вер�ії програми"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "Додатки, наді�лані до додатків Mozilla’и, повинні мати файл install.rdf з "
@@ -6516,7 +5789,7 @@ msgstr ""
 "вер�ії дозволені дл� цих програм."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6525,15 +5798,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "тут"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Вер�ії"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "�азад на попередню �торінку"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Сторінка інформації пі�очниці"
 
@@ -6541,6 +5817,12 @@ msgstr "Сторінка інформації пі�очниці"
 msgid "pagination_next_page"
 msgstr "далі"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "Це �торінка %1$s з %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "назад"
@@ -6578,15 +5860,15 @@ msgstr ""
 "If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
 "<a href=\"%2$s\">listen to something</a> instead."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Ви людина?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "Що це?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Помилка відмічанн� цього відгуку!"
 
@@ -6595,7 +5877,7 @@ msgstr "Помилка відмічанн� цього відгуку!"
 msgid "review_flag_reason_bug_support"
 msgstr "Misplaced bug report or support request"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 #, fuzzy
 msgid "review_flag_reason_instructions"
 msgstr "Report this review (select a reason)"
@@ -6615,8 +5897,8 @@ msgstr "Other (please specify)"
 msgid "review_flag_reason_spam"
 msgstr "Spam or otherwise non-review content"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Thanks; this review has been flagged for editor approval."
 
@@ -6631,7 +5913,7 @@ msgstr ""
 "editor review."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend "
@@ -6648,131 +5930,101 @@ msgstr ""
 "a> for more detail about user add-on reviews.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "Перегл�дів дл� %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Вла�тиві додатки"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "�айновіші додатки"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Оновлені додатки"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Пошук зараз відключено. Будь ла�ка, �пробуйте пізніше."
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "у�іх додатків"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "шукати додатки"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Шукати додатки"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Клацніть щоб вве�ти терміни пошуку"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "�еред"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "В�і пошукові за�оби"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "перегл�нути пошукові за�оби"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s відповідний додаток"
+msgstr[1] "%s відповідних додатків"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "�емає результатів."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Пошук додатків"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Пошук RSS результатів"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Пошук результатів дл�: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Ін�трументи адміна"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Ін�трументи розробника"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Ін�трументи редактора"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Ла�каво про�имо"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Вітаємо, %s"
@@ -6781,7 +6033,7 @@ msgstr "Вітаємо, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "Словник"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Обрані додатки"
 
@@ -6789,7 +6041,7 @@ msgstr "Обрані додатки"
 msgid "sidebar_pitch_looking_for"
 msgstr "Я шукаю"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "�айновіші додатки"
 
@@ -6797,7 +6049,7 @@ msgstr "�айновіші додатки"
 msgid "sidebar_pitch_search"
 msgstr "Пошуковий за�іб"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "Підпи�ати�ь на"
 
@@ -6805,23 +6057,24 @@ msgstr "Підпи�ати�ь на"
 msgid "sidebar_pitch_theme"
 msgstr "Тему"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Оновлені додатки"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s КБ"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Ще не оцінений:"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "Оцінений на %s з 5 зірочок"
@@ -6858,13 +6111,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "l, M. j"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "�творений %1$s"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "випущений %1$s"
@@ -6877,185 +6130,185 @@ msgstr "Закрити"
 msgid "statistics_help_link"
 msgstr "Довідка"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "або оберіть інший додаток"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "або оберіть додаток з публічною �тати�тикою"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Select one of your add-ons to view its statistics"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Select an add-on to view its statistics"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Select an add-on with public statistics"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Statistics Dashboard"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "View Statistics"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "none"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Remove this plot"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s found in range"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Add Plot"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Add another plot to this graph"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Hide Total Count"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Show Total Count"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 #, fuzzy
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Plot the total count on this graph"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "View Data (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "Get a Comma Separated Values file of this data"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Hide %s Events"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Show %s Events"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Overlay add-on release dates on the plots"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Hide Firefox Events"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Show Firefox Events"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Overlay Firefox release dates on the plots"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Collapse Graph"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Expand Graph"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "Resize the graph"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Active Daily Users"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Application"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Custom"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Downloads"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Operating System"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Add-on Status"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Summary"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Add-on Version"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Application"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Operating System"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Add-on Status"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Unknown"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Add-on Version"
 
@@ -7092,7 +6345,7 @@ msgstr "Your settings have been updated!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Statistics Dashboard"
 
@@ -7120,105 +6373,109 @@ msgstr "Zoom Out"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Zoom out one month"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Daily summary of statistics for %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed of summary data"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "l, F j, Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Statistics for %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "By default, only you and Mozilla can access the information in your "
 "dashboard. You can open this up to the public so that anyone can view your "
 "add-on's data."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Dashboard Access"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Private"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Only you and Mozilla can view this add-on's statistics"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Public"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Anyone can view this add-on's statistics"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Change Settings"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Please treat this information as confidential."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "This dashboard is currently <b>private</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "This dashboard is currently <b>public</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "Locked"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Return to Dashboard"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Save Settings"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Statistics Dashboard Settings for %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Unlocked"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "App"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "OS"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "St"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Uk"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "Ver"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Average Daily Downloads"
 
@@ -7230,7 +6487,7 @@ msgstr "Downloads"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Last Day Count"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Downloads in the last 7 days"
 
@@ -7248,7 +6505,7 @@ msgstr "Since %1$s"
 msgid "statistics_summary_nodata"
 msgstr "No data yet"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Average Daily Active Users"
 
@@ -7274,51 +6531,34 @@ msgstr "Active Daily Users"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "On %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s Statistics"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "В�і теми"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Перегл�нути теми"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Змінити мою поштову адре�у"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Змінити пароль"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Код підтвердженн� було повторно наді�лано!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 #, fuzzy
 msgid "user_del_account_deleted"
 msgstr ""
@@ -7326,23 +6566,23 @@ msgstr ""
 "back some time, you can re-register on the <a href=\"%2$s\">user "
 "registration page</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 #, fuzzy
 msgid "user_del_community_sad"
 msgstr "The Mozilla Add-ons community is sad to see you go."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 #, fuzzy
 msgid "user_del_confirm_password"
 msgstr "Confirm Password"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 #, fuzzy
 msgid "user_del_deletenow"
 msgstr "Delete my user account now"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 #, fuzzy
 msgid "user_del_error_addons"
 msgstr ""
@@ -7352,60 +6592,60 @@ msgstr ""
 "your add-ons. Afterwards you will be able to delete your account here."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 #, fuzzy
 msgid "user_del_error_addons_more_questions"
 msgstr "If you have additional questions, please contact %1$s for assistance."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 #, fuzzy
 msgid "user_del_error_checkbox"
 msgstr ""
 "You need to check the box \"I understand...\" before we can delete your "
 "account."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 #, fuzzy
 msgid "user_del_error_password"
 msgstr "Please enter your password correctly in order to perform this step."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 #, fuzzy
 msgid "user_del_error_unknown"
 msgstr ""
 "An unknown error occured deleting your account. Please contact %1$s with the "
 "issue and we will delete it for you. We apologize for the inconvenience."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 #, fuzzy
 msgid "user_del_header_confirm_deletion"
 msgstr "Confirm account deletion"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 #, fuzzy
 msgid "user_del_header_delete_account"
 msgstr "Delete User Account %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 #, fuzzy
 msgid "user_del_header_farewell"
 msgstr "Farewell!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 #, fuzzy
 msgid "user_del_nologin"
 msgstr "You will not be able to log into Mozilla Add-ons anymore."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 #, fuzzy
 msgid "user_del_permanently_removed_means"
 msgstr ""
 "By clicking \"delete\" your account is going to be <strong>permanently "
 "removed</strong>. That means:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 #, fuzzy
 msgid "user_del_reviews_anonymized"
 msgstr ""
@@ -7413,7 +6653,7 @@ msgstr ""
 "associated with you."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 #, fuzzy
 msgid "user_del_specific_problem_editors"
 msgstr ""
@@ -7421,25 +6661,25 @@ msgstr ""
 "your account now, but contact us at %1$s and we will do our best to assist "
 "you in solving it."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 #, fuzzy
 msgid "user_del_understand_permanent"
 msgstr "Я розумію, що цей крок не відворотній."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 #, fuzzy
 msgid "user_deleted_nickname"
 msgstr "Видалений кори�тувач"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "An email has been sent to %1$s to confirm your new email address. For the "
 "change to take effect, you need to click on the link provided in this email. "
 "Until then, you can keep logging in with your current email address."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 #, fuzzy
 msgid "user_edit_delete_user"
 msgstr "Видалити ваш обліковий запи�"
@@ -7467,8 +6707,9 @@ msgstr ""
 "-- Колектив додатків %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
-#, fuzzy
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, fuzzy, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "You requested a change to your email address at %2$s Add-ons.\n"
@@ -7508,114 +6749,91 @@ msgstr ""
 "Д�куємо,\n"
 "-- Колектив додатків %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "Скиньте �вій пароль додатків %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Помилка!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
-#, fuzzy
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, fuzzy, php-format
 msgid "user_emailchange_subject"
 msgstr "Будь ла�ка підтвердіть зміну �воєї поштової адре�и на %1$s Додатків"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "У�піх!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
-#, fuzzy
+#: views/users/emailchange.thtml:52
+#, fuzzy, php-format
 msgid "user_emailchange_successful_description"
 msgstr ""
 "Вашу поштову адре�у у�пішно змінено. від цього моменту, викори�товуйте дл� "
 "входу %1$s"
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Підтвердіть пароль"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Редагувати профіль кори�тувача дл� %s"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Email"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Ім’�"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Приховати email"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL веб�айту"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "Прізвище"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Вхід кори�тувача"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "�овий пароль"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Прізви�ько"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Старий пароль"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 #, fuzzy
 msgid "user_form_otheractions"
 msgstr "Інше"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Пароль"
 
@@ -7623,71 +6841,71 @@ msgstr "Пароль"
 msgid "user_form_registration"
 msgstr "Реє�траці� нового кори�тувача"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Запам’�тати мене на цьому комп’ютері"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Показати пі�очницю?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "Зберегти"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "Вхід"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "Реє�траці�"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s додатків з ча�у"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Створити новий рахунок кори�тувача"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 #, fuzzy
 msgid "user_notifications_item_compat"
 msgstr "Add-on Compatibility (strongly recommended)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 #, fuzzy
 msgid "user_notifications_item_events"
 msgstr "Upcoming events and contests"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 #, fuzzy
 msgid "user_notifications_none_available"
 msgstr "There are currently no notifications available for you to configure."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 #, fuzzy
 msgid "user_notifications_select_topics"
 msgstr ""
 "From time to time, Mozilla may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 #, fuzzy
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr ""
 "Були помилки у змінах, �кі ви зробили. Будь ла�ка, виправте і знову "
 "надішліть…"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Профіль оновлено."
 
@@ -7700,15 +6918,15 @@ msgstr "Скиданн� парол� дл� %s"
 msgid "user_pwreset_header"
 msgstr "Скиданн� парол�"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Забули �вій пароль?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "По�иланн� �киданн� парол� наді�лано на ваш email."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Пароль у�пішно �кинуто."
 
@@ -7720,7 +6938,7 @@ msgstr "�аді�лати зміну парол�"
 msgid "user_pwreset_submit_sendlink"
 msgstr "�аді�лати по�иланн� �киданн� парол�"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s додатків"
@@ -7735,7 +6953,7 @@ msgstr ""
 "�к увійти на Додатки %2$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7747,24 +6965,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "повторно наді�лати повідомленн� підтвердженн�"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Вітаємо! Ваш кори�тувацький рахунок у�пішно �творено."
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -7775,32 +6979,22 @@ msgstr ""
 "можемо  %1$s на ваш вищезгаданий email."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Д�куємо за реє�трацію і вітаємо на %1$s!"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 #, fuzzy
 msgid "user_required_firstlast_or_nickname"
 msgstr "�еобхідно ім’�, прізвище або прізви�ько."
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 #, fuzzy
 msgid "user_tab_notifications"
 msgstr "Notifications"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 #, fuzzy
 msgid "user_tab_profile"
 msgstr "User Profile"
@@ -7809,68 +7003,52 @@ msgstr "User Profile"
 msgid "user_verified_okay"
 msgstr "У�пішно перевірено!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 #, fuzzy
 msgid "users_delete_pagetitle"
 msgstr "Видалити обліковий запи�"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Редагуванн� вашого облікового запи�у"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Додатки від %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "�азва"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Профіль кори�тувача"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Ваша електронна пошта"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Домашн� �торінка"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Прізви�ько"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Інформаці� кори�тувача дл� %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 #, fuzzy
 msgid "users_info_reviews_by_user"
 msgstr "Reviews by %s"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Вхід кори�тувача"
 
@@ -7902,597 +7080,5 @@ msgstr "Скиданн� парол� кори�тувача"
 msgid "users_register_pagetitle"
 msgstr "Реє�траці� нового кори�тувача"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "�а�тупний додаток"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Попередній додаток"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "�айо�танніша вер�і� �умі�на з"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "Повна і�торі� вер�ій"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "�айновіші:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "�айпопул�рніші:"
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Ми рекомендуємо:"
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "�едавно оновлені:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "Перегл�нути в�і"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Перегл�нути в�і рекомендовані додатки"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "�айрейтинговіші �початку"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "�айновіші �початку"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "�айпопул�рніші �початку"
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Додаток відключено у�пішно"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Редагувати додаток"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Додаток включено у�пішно"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Опи� додатку"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "ЛУКК"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Домашн� �торінка додатку"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "�азва додатку"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Умови конфіденційно�ті"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Під�умок додатку"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Примітки вер�ії"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "Подати додаток"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Додаток подано у�пішно!"
-
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Кілька відгуків кори�тувачів додатку (можна зовнішніх)."
-
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Відвідайте �торінку %1$ дл� вне�енн� змін в �воє поданн�, або %2$s дл� "
-#~ "поверненн� у Панель управлінн� розробника."
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "клацніть тут"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Редагувати додаток"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Ц� вер�і� розміщена у пі�очниці і очікує перегл�дів від випробувальників "
-#~ "пі�очниці та редактора додатків Mozilla’и. Ва� повідомл�ть електронною "
-#~ "поштою, коли відбудеть�� поді�."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Ви можете прочитати більше про �и�тему перегл�ду пі�очниці %s."
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "тут"
-
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Ц� вер�і� розміщена у пі�очниці дл� викори�танн� до�відченими "
-#~ "кори�тувачами. Щоб її показали на публічному �айті, ви повинні %s ваш "
-#~ "додаток і пройти проце� перегл�ду."
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "наді�лати"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "�ад�иланн� вашого додатку завершено у�пішно."
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Тому, що вашому додатку довір�ють, ц� вер�і� автоматично �хвалена дл� "
-#~ "публічної діл�нки."
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "�аді�лати додаток"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Додаток оновлено у�пішно"
-
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Ви можете захотіти %s , щоб підвищити інтере� до �вого додатку."
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "відвантажити знімок екрану"
-
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "Жодного автора [%s] не знайдено"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Вилучити"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Відкликати"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Певні, що бажаєте відкликати �воє поданн�?"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "Далі"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Змінити тип додатку:"
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Оновлено коментарі розробника."
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Додати знімок екрану"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "�втор"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "�втори"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Жодних"
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "Категорії"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "Категорі�"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "Опи�"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Відключено"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Деталі"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Коментарі розробника"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Знімки екрану"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Вер�ії"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Домашн� �торінка"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Жодних"
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Без заголовка"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Знімків екрану не знайдено."
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Оновити"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Support Email"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "No support email provided by developer."
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "Support URL"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "No support url provided by developer."
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "Довірити"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Вер�ій не знайдено."
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Додати автора"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "Email автора"
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Стерти"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Категорії від�утні дл� цього типу додатку."
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "�втори"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Додати значка"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Змінити значок"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Дозволити кори�тувачам читати початкові файли в мережі"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Категорії"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Типова мова"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Тільки �терти і�нуючий значок"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "�овий файл значка"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Значок"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Оновити"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Позначені файли будуть �терті."
-
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Файли"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Цільові програми"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "�емає файлів."
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Примітки огл�дачу"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Оновити"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Під�умки обмежені до мак�имально 250 �имволів.\n"
-#~ "(Ви ввели %s)"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "�азва дл� вашого додатку вже і�нує в базі даних. Будь ла�ка, "
-#~ "переконайте��, що: <br /><li>ваші GUIDи відповідають. �айпоширеніша "
-#~ "причина цієї помилки – це невідповідні GUIDи.</li><li>ви не маєте "
-#~ "дублікату запи�у у базі даних. Якщо маєте, ви повинні оновити або �терти "
-#~ "цей запи� і �пробувати знову.</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Будь ла�ка, опишіть зміни, зроблені у цьому оновленні додатку."
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "�е в�і файли GUIDів відповідають"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "Ідентична вер�і� (%s) вже і�нує дл� цього додатку і платформи."
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Ви повинні подати потрібні деталі дл� поданн�."
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Ви не можете подавати додаток попередньої вер�ії."
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Ви можете подавати тільки додатки, �кі вже в пі�очниці."
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "Стала�� помилка при збереженні ваших даних."
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Вам не дозволено оновлювати цей додаток."
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Додати файл іншої платформи"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Додати автора"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Вилучити"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Категорії дл� вашого нового типу додатку будуть до�тупні на на�тупному "
-#~ "кроці."
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Дл� цього типу додатку категорії недо�тупні."
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Будь ла�ка, введіть опи� вашого додатку."
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Будь ла�ка, введіть назву вашого додатку."
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Будь ла�ка, оберіть тип додатку, �кий ви подаєте."
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Будь ла�ка, введіть під�умок вашого додатку."
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Файл додатку"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Файл додатку 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Файл додатку 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Тип додатку"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Дозволити кори�тувачам перегл�дати початковий код в онлайні"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "Email адре�а автора"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "�втори"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Категорії"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Типова мова"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Опи�"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Ліцензійна угода з кінцевим кори�тувачем (ЛУКК)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Цей додаток потребує зовнішніх програм"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Файли"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Домашн� �торінка"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Файл значка"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Ім’�"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "Підтримувані платформи"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "Це попередн� вер�і�"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Умови конфіденційно�ті"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "Це додаток дл� окремого �айту"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Під�умок"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Support Email"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "Support URL"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Цільові програми"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Вер�і�"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Примітки вер�ії"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Жодних"
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Примітки перегл�дачу"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Тому що вашому додатку довір�ють, будь ла�ка, оберіть куди повинна піти "
-#~ "ц� вер�і�:"
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Публіка"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Пі�очниц�"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Угода з розробником"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "Крок 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Відвантажити файл"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "Крок 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Деталі додатку"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "Крок 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Деталі вер�ії"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "Крок 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Переклади"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "Крок 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "У�піх"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Мої додатки"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Повернути�� до деталей додатку"
-
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "�втоматично визначений тип додатку: %s."
-
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Типова мова цього додатку (%1$s [%2$s]) відмінна від поточно обраної вами "
-#~ "мови (%3$s [%4$s]). Пол� нижче повинні бути заповнені на %1$s."
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "�евірно?"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Ви впевнені, що хочете �терти цей файл?"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "Пропу�тити оновленн� інформації про мій поточний додаток"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Подаванн� додатків зараз відключено. Будь ла�ка, �пробуйте знову пізніше."
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Я погоджую�ь"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Я відмовл�ю�ь"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Цей додаток було відключено адміні�тратором."
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Відключено"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Довірено"
-
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "У ва� немає жодних додатків. Клацніть %s дл� поданн�."
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "тут"
-
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Будь ла�ка, переконайте��, що %s дл� вашої теми."
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "Відвантажити знімок екрану"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Редагувати вер�ію"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Вер�і� оновлена у�пішно."
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "�ове"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "Оновлене"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Тип додатків"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "Платформи"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Типи подаванн�"
-
-#~ msgid "error_notice"
-#~ msgstr "Повідомленн�"
-
-#~ msgid "forum_save"
-#~ msgstr "Зберегти"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "Модулі"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "�азад на попередню �торінку"
-
-#~ msgid "pagination_page_number_title"
-#~ msgstr "Це �торінка %1$s з %2$s"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s відповідний додаток"
-#~ msgstr[1] "%s відповідних додатків"
-
diff --git a/site/app/locale/uk/pages/error404.thtml b/site/app/locale/uk/pages/error404.thtml
index d09c583..5f4ba71 100644
--- a/site/app/locale/uk/pages/error404.thtml
+++ b/site/app/locale/uk/pages/error404.thtml
@@ -1,16 +1,16 @@
-<h1>Перепрошуємо, <br/> але шукане знайти не вдало�ь.</h1>
-
-<p>Сторінка чи файл, що ви шукали, від�утн� на нашому �айті. Можливо, ви клацнули на по�иланні, котре вже за�таріло, або невірно набрали адре�у.</p>
-
-<ul>
-<li>Якщо ви набирали адре�у, перевірте напи�анн� ще раз.</li>
-<li>Якщо ви переходили звідки�ь за по�иланн�м, будь ла�ка, дайте нам знати на <a href="mailto:webmaster@mozilla.com" title="Сторінку на Mozilla.com не знайдено">webmaster@mozilla.com</a>. Скажіть, звідки ви перейшли і що шукали, і ми зробимо в�е можливе дл� того, щоб  виправити цей негаразд.</li>
-</ul>
-
-<p>�бо ви можете перейти на інші попул�рні �торінки нашого веб�айту.</p>
-
-<ul>
-<li>Чи зацікавить ва� <a href="%1$s">перелік попул�рних додатків</a>?</li>
-<li>Щукаєте <a href="%2$s">додатки</a>? Можете перейти на <a href="%2$s">�торінку пошуку</a> або про�то �кори�тати�ь полем унизу �торінки.</li>
-<li>Якщо хочете розпочати з початку, перейдіть на <a href="%3$s">початкову �торінку додатків</a>.</li>
-</ul>
+<h1>Перепрошуємо, <br/> але шукане знайти не вдало�ь.</h1>
+
+<p>Сторінка чи файл, що ви шукали, від�утн� на нашому �айті. Можливо, ви клацнули на по�иланні, котре вже за�таріло, або невірно набрали адре�у.</p>
+
+<ul>
+<li>Якщо ви набирали адре�у, перевірте напи�анн� ще раз.</li>
+<li>Якщо ви переходили звідки�ь за по�иланн�м, будь ла�ка, дайте нам знати на <a href="mailto:webmaster@mozilla.com" title="Сторінку на Mozilla.com не знайдено">webmaster@mozilla.com</a>. Скажіть, звідки ви перейшли і що шукали, і ми зробимо в�е можливе дл� того, щоб  виправити цей негаразд.</li>
+</ul>
+
+<p>�бо ви можете перейти на інші попул�рні �торінки нашого веб�айту.</p>
+
+<ul>
+<li>Чи зацікавить ва� <a href="%1$s">перелік попул�рних додатків</a>?</li>
+<li>Щукаєте <a href="%2$s">додатки</a>? Можете перейти на <a href="%2$s">�торінку пошуку</a> або про�то �кори�тати�ь полем унизу �торінки.</li>
+<li>Якщо хочете розпочати з початку, перейдіть на <a href="%3$s">початкову �торінку додатків</a>.</li>
+</ul>
diff --git a/site/app/locale/uk/pages/nomination.thtml b/site/app/locale/uk/pages/nomination.thtml
index 158b5c9..0bc474f 100644
--- a/site/app/locale/uk/pages/nomination.thtml
+++ b/site/app/locale/uk/pages/nomination.thtml
@@ -1,10 +1,10 @@
-<p>Додаток, �кий зараз в пі�очниці, може подавати�� на те, щоб бути ча�тиною публічного �айту і бути до�тупним в�ім кори�тувачам пі�л� того, �к його перегл�не редактор. Дл� найкращих результатів зауважте на на�тупне:</p>
-<ul>
-    <li>Презентаційні зображенн� потрібні дл� тем і дуже рекомендують�� дл� в�іх інших типів додатків.</li>
-    <li>Додаток повинен прове�ти до�татньо ча�у у пі�очниці, щоб отримати огл�ди і зворотній зв’�зок від кори�тувачів. <b>Огл�ди потрібні дл� того, щоб �тати публічним.</b></li>
-    <li>Публічні додатки мають вищий рівень �ко�ті, ніж додатки з пі�очниці, і повинні покращувати мережу.</li>
-    <li>В�і критерії поданн� до�тупні у <a href="%s">Політиці додатків</a>.</li>
-</ul>
-<p>Якщо ваш додаток відповідає вищезазначеним критері�м, ви можете подавати його, заповнивши поле нижче. Ва� повідомл�ть електронною поштою про �тан вашого поданн�.</p>
-
-<p>Дл� поданн� вашого додатку, будь ла�ка, опишіть, �к його те�тували (маючи на увазі, що у ньому від�утні помилки і попередженн�) і �к він буде кори�ним розширенню мережі. Можете також включити по�иланн� на зовнішні огл�ди вашого додатку.</p>
+<p>Додаток, �кий зараз в пі�очниці, може подавати�� на те, щоб бути ча�тиною публічного �айту і бути до�тупним в�ім кори�тувачам пі�л� того, �к його перегл�не редактор. Дл� найкращих результатів зауважте на на�тупне:</p>
+<ul>
+    <li>Презентаційні зображенн� потрібні дл� тем і дуже рекомендують�� дл� в�іх інших типів додатків.</li>
+    <li>Додаток повинен прове�ти до�татньо ча�у у пі�очниці, щоб отримати огл�ди і зворотній зв’�зок від кори�тувачів. <b>Огл�ди потрібні дл� того, щоб �тати публічним.</b></li>
+    <li>Публічні додатки мають вищий рівень �ко�ті, ніж додатки з пі�очниці, і повинні покращувати мережу.</li>
+    <li>В�і критерії поданн� до�тупні у <a href="%s">Політиці додатків</a>.</li>
+</ul>
+<p>Якщо ваш додаток відповідає вищезазначеним критері�м, ви можете подавати його, заповнивши поле нижче. Ва� повідомл�ть електронною поштою про �тан вашого поданн�.</p>
+
+<p>Дл� поданн� вашого додатку, будь ла�ка, опишіть, �к його те�тували (маючи на увазі, що у ньому від�утні помилки і попередженн�) і �к він буде кори�ним розширенню мережі. Можете також включити по�иланн� на зовнішні огл�ди вашого додатку.</p>
diff --git a/site/app/locale/uk/pages/policy.thtml b/site/app/locale/uk/pages/policy.thtml
index 12aec6b..aa1509a 100644
--- a/site/app/locale/uk/pages/policy.thtml
+++ b/site/app/locale/uk/pages/policy.thtml
@@ -1,110 +1,110 @@
-<h1>Правила поданн� додатків</h1>
-
-<h2>Що таке пі�очниц�?</h2>
-<p>Дивіть�� %s.</p>
-
-<h2>Які додатки знаход�ть�� у пі�очниці?</h2>
-<p>В�і додатки, що надход�ть до �МО �початку попадають у пі�очницю. Вона мі�тить нові вер�ії публічних додатків, а також в�і вер�ії додатків, що не �тали публічними. При відвантаженні на �МО нового додатку, або оновленні і�нуючого, його розміщують у пі�очниці.</p>
-
-<p>Де�кі додатки та окремі їх вер�ії �тають публічними пі�л� того, �к перевірка покаже, що вони до цього готові. Інші додатки залишатимуть�� у пі�очниці невизначено довго, де вони будуть до�тупні дл� кори�тувачів, �кі обирають перегл�дати пі�очницю та ек�периментувати там з програмним забезпеченн�м.</p>
-
-<h2>Як додатки �тають публічними?</h2>
-
-<p>Додатки те�тують�� кори�тувачами AMO, �кі надають перевагу перегл�ду пі�очниці та випробуванню пакетів, �кі там можна знайти. Відгуки, �кі напишуть кори�тувачі AMO, показуватимуть, чи є додаток до�татньо кори�ним, добре напи�аним і готовим до того, щоб його викла�ти у загальний до�туп. Вони, можливо, на додачу до інших відгуків та превірки командою AMO, допоможуть визначити, чи даний додаток пора зробити публічним, чи він потребує ще опрацюванн� до ширшого огл�ду, чи може він не підходить дл� про�уванн� на �айті AMO за межі пі�очниці взагалі.</p>
-
-<h2>Як мені опубліковати �вій додаток?</h2>
-
-<p>Якщо ви вірите, що ваш додаток (і ваша поведінка!) відповідають критері�м що ви�увають�� до публічних додатків, ви можете подавати його з панелі управлінн� розробника.</p>
-
-<h2>Які є інші критерії дл� публічних додатків?</h2>
-
-<p>Додаток, щоб �тати публічним на AMO, повинен бути ви�око�кі�ним: покращувати кори�тувачам роботу в мережі. Ми зважаємо на на�тупні речі при вірішенні, чи додаток відповідає публічній �тороні AMO:</p>
-
-<h3>Чи ви відповідальні?</h3>
-
-<p>Ми очікуємо, що автор, �кий про�уває �вій додаток дл� багатьох кори�тувачів Firefox’у, є відповідальним щодо звітів з проблем, підтримує �вою контактну інформацію актуальною, та оновлює �вій додаток відповідно до правил �МО щодо випу�ків та змін Firefox. Це не означає, що ви повинні відповідати на кожне запитанн�, �ке хто�ь над�илає у ди�ку�і�х, або навіть що вам потрібно виправл�ти кожну ваду, але ми �правді очікуємо, що ви відповідатимете на питанн� так, �к вимагає їх рівень �ерйозно�ті.</p>
-
-<h3>Чи додаток чітко і правильно опи�уєть��?</h3>
-
-<p>Дл� на� найбільш важливо, щоб кори�тувачі отримували те, чого вони чекають, пробуючи новий додаток. Ваш опи� повинен детально розповідати про те, що робить додаток, �к кори�тувач може кори�тувати�� його перевагами, і чого кори�тувач повинен очікувати при його в�тановленні. По�иланн� на зовнішні документи про детальні ін�трукції �приймають�� чудово, але �ам опи� повинен охоплювати о�нови і залишати кори�тувачів впевненими, що вони знають, що отримують.</p>
-
-<p>Також важливо, щоб ви підтримували примітки вер�ій відповідно до того, �к вдо�коналюєте і змінюєте �вій додаток. Кори�тувачі повинні бути в змозі побачити, що нового у додатку, �кий вони вже, можливо, випробовували. І повинні розуміти зміни, �кі можуть вплинути на їхнє поточне викори�танн� додатку, �кий вони оновлюють. (Пр�мо зараз кори�тувачі не бачать приміток вер�ій, коли їх питають про оновленн� в�ередині браузера, але ми над цим працюємо. Якщо ви добре підтримуєте примітки вер�ій, ваші кори�тувачі отримуватимуть зи�к до та пі�л� того, �к завершить�� ц� робота.)</p>
-
-<h3>Чи в�і питанн� конфіденційно�ті та безпеки чітко розгл�дають��?</h3>
-
-<p>Це а�пект чіткого і точного опи�у, але на�тільки важливий, що ми вважаємо, що він за�луговує на окрему згадку. Багато дуже кори�них і добре напи�аних додатків маніпулювали �ким�ь чином даними кори�тувача, або �вл�ли небезпеку за неправильного викори�танн�; вони бажані на публічній ча�тині AMO, але також повинні чітко роз’��нювати кори�тувачам, з �ким ризиком вони можуть �тикнути�� та що можуть зробити дл� вла�ного захи�ту.</p>
-
-<h3>Чи додаток добре проте�товано, і чи немає в ньому очевидних або �ерйозних дефектів?</h3>
-
-<p>Важливим критерієм під ча� обмірковуванн� чи �тавити додаток у публічний до�туп є відгуки з пі�очниці. Вони показують, чи було його до�татньо проте�товано, і чи не має він �ерйозних проблем або негативних впливів на браузер. Якщо огл�дачі повідомл�ють про негаразди, такі, �к �ильні проблеми з роботою, падінн�, ча�ті збої через викори�танн� функцій додатку, або наплив повідомлень у кон�оль помилок — ви повинні прийн�ти такі звіти близько до �ерц�, й повторно подати �вій додаток лише пі�л� того �к впорали��. Ми не очікуємо ідеальної оптимізації або повної від�утно�ті вад — Firefox �ам по�тійно вдо�коналюєть�� — але ми не хочемо, щоб ви витрачали значні зу�илл� дл� мінімізації маленьких негараздів і в той же ча� оминали ті моменти, �кими кори�тувачі можуть бути неприємно здивовані.</p>
-
-<p>Якщо ваш додаток було проте�товано поза межами пі�очниці AMO, �к, наприклад, групою кори�тувачів вашої компанії або внутрішньою командою ТК (технічного контролю), ви повинні це вказати у �воєму повідомленні поданн�. Це неодмінно допоможе нам в�тановити рівень проведеного те�туванн�, і може допомогти викла�ти ваш додаток на �айт.</p>
-
-<h3>Чи додаток та автор додатку �тавл�ть�� до кори�тувача з повагою?</h3>
-
-<p>Ваше програмне забезпеченн� не повинно втручати�� без потреби до �прав кори�тувача, пробувати надурити кори�тувача, або приховувати таку ді�льні�ть від кори�тувача. Кори�тувачі (або навіть не-кори�тувачі) ча�ом бувають грубі в �воїх коментар�х, і поки ми намагаємо�� зробити в�е можливе дл� відфільтровуванн� тих хто нам не допомагає, ми дій�но очікуємо, що автори уникатимуть відповідати їм �воєю грубі�тю.</p>
-
-<h3>Чи додаток кори�ний до�татньо широкому загалу кори�тувачів Firefox’а?</h3>
-
-<p>Ваш додаток не зобов’�заний �тати на�тупним Greasemonkey або FireBug, але �кщо він кори�ний лише люд�м вашої компанії або ча�тині малої мережевої �пільноти, ми можемо відчути, що ще не ча� викладати його перед у�іма кори�тувачами Firefox’у.</p>
-
-<p>Ми по�тійно шукаємо шл�хів вдо�коналенн� організації �айту дл� кращого отриманн� додатків, котрі певним чином кори�ні, але націлені на лише малу �пільноту потенційних кори�тувачів. Правильний вибір категорії та підтримка метаданих вашого додатку допоможе нам зрозуміти, �к ми можемо викла�ти на поверхню більшу кількі�ть такого типу додатків люд�м, �кі б найшвидше отримали з них кори�ть.</p>
-
-<p>Якщо ваш додаток надає лише закладку або інші �прощені шл�хи до�тупу до вашого �айту, можливо, це не підходить дл� публічної ча�тини нашого �айту. Як і решта проекту Mozilla, ми любимо мережеві зручно�ті та нові по�луги, але додатки Firefox повинні покращувати житт� в інтернеті, а не бути про�то �по�обом про�уванн� нового �айту або �ерві�у за допомогою переліку AMO. Якщо опи� вашого додатка радше про �ерві�, ніж про вдо�коналенн� роботи браузера в мережі, то, можливо, ви не туди потрапили.</p>
-
-<h3>Чи не мі�тить додаток неліцензованих торгових марок, чи не порушує він чиї�ь права?</h3>
-
-<p>Хоча ви можете не мати наміру вчинити шкоду вла�нику торгової марки, або вла�нику автор�ької роботи, ми не можемо тримати додатки, �кі порушують торгові марки або права. Якщо у ва� немає дозволу на викори�танн� імені торгової марки або зображенн�, будь ла�ка, не подавайте ваш додаток до AMO. Якщо ваш додаток включає код, �кий за�тережено ким�ь іншим, і не ліцензовано вам на викори�танн� у додатку, будь ла�ка, не подавайте ваш додаток до AMO. (Якщо вла�ник торгової марки або об’єктів, за�тережених правами, проте�туватиме проти дл� викори�танн� його торгової марки, ваш запит буде розгл�дати�ь комітетом. Якщо буде необхідно за законом, ми вилучимо ваш додаток. Це дорогий проце� у термінах ре�ур�ів проекту, включно по ча�у і грошам, тому ми про�имо ва� бути ввічливими і не �творювати непотрібні �кладнощі.)</p>
-
-<p>Якщо ви непевні, чи назва вашого додатку або викори�танн� чого�ь у ньому не дозволить його по�тавити на �айт, ви можете звернути�ь до amo-editors@mozilla.org по допомогу. В�ЖЛИВО: будь ла�ка, зауважте, що ц� група не може надавати юридичні поради, і навіть �кщо б ми відчували, що ваше викори�танн� прийн�тне, ми можемо перегл�нути таке рішенн� у �вітлі �карг від правовла�ників і порад від юридичних радників.</p>
-
-<p>У термінах повторного викори�танн� коду інших додатків, �кщо автор чітко не зазначив, що вам дозволено викори�товувати його код у вла�ній роботі — ліцензувавши його під ліцензію відкритого коду — тоді ви повинні припу�кати, що у ва� немає на це права. Ви можете �контактувати�� з автором дл� отриманн� такого дозволу, але повторюємо: ні�ких додаткових прав через те що «додаток вже був на �МО» чи тому, що автор не відповідає на ваш запит у ва� не з’�вл�єть��. (І, знову, ми не можемо надавати юридичні поради, лише поради щодо того, �к ваш додаток повинен взаємоді�ти з правилами �айту.)</p>
-
-<p>Це �то�уєть�� торгових марок Фонду Mozilla, включно з «Mozilla», «Firefox», та «Thunderbird». Політика Mozilla щодо викори�танн� торгових марок призначена дл� захи�ту від непорозумінь та дл� запобіганн� перекрученню торгових марок через брак захи�ту; будь ла�ка, поважайте потребу такого захи�ту і допомагайте нам зберігати де�кі з найцінніших вла�но�тей фонду Mozilla.</p>
-
-<h2>Що відбуваєть�� пі�л� того, �к � подаю додаток?</h2>
-
-<p>Коли ваш додаток подано, його оцінює команда редакторів AMO відповідно до вищеопи�аних критеріїв. Якщо його визнано готовим до публічного показу, його ви�тавл�ть у загальний до�туп, і ви отримаєте повідомленн� електронною поштою.</p>
-
-<p>Якщо ми відчуємо, що додаток ще не годить�� дл� публічної �торони AMO, ви отримаєте повідомленн� електронною поштою з по��ненн�м чому, а ваше поданн� буде вилучено з черги. Якщо і коли ви відчуєте, що ви виправили недоліки, зазначені у повідомленні, і хочете щоб знову це оцінили, ви можете наді�лати запит ще раз. Повторювані за�вки без значних вдо�коналень у додатку �погл�дають�� не�хвально. Тому, будь ла�ка, робіть перерви; ви швидше можете на� роз�ердити, ніж подолати.</p>
-
-<h2>Чи можу � подавати додаток кого�ь іншого?</h2>
-
-<p>�аразі ми про�имо, щоб автори додатків �амі подавали вла�ну роботу на публікацію. Ми хочемо переконати��, що автор почуваєть�� зручно з збільшеною публічні�тю, і що він відчуває, що додаток у поточному �тані відповідно показує �кі�ть його роботи. Якщо ви вірите, що додаток відполіровано, що автор вірний букві і духу політик AMO, і що Firefox, наші кори�тувачі та мережа загалом від того тільки виграють, коли майже мільйон чоловік у в�ьому �віті отримають до�туп до додатку, обов’�зково підбадьорте автора до поданн� �вого твору.</p>
-
-<h2>Мій додаток вже довгий ча� у черзі поданн�, чи ви мене ненавидите?</h2>
-
-<p>Ми не ненавидимо ва�. Ми любимо розробників додатків, і важко працюємо, щоб зробити їх ща�ливими і продуктивними, щоб кори�тувачі у�ього �віту могли отримувати кори�ть від їхньої роботи. �ле перебуванн� на публічній �тороні AMO має цінні�ть �аме завд�ки тому, що ми турбуємо�ь про те, що туди надходить, тому ми не можемо по�пішати лише щоб при�корити проце�. Ми розуміємо, що чеканн� на оцінку вашого додатку може за�мучувати, і ми �тараємо�ь робити огл�ди �кнайшвидше. Що більше людей надають виважені та чіткі перегл�ди додатків у пі�очниці, то про�тіше їх оцінювати. Тому ви можете допомогти нам в цьому, �кщо така ваша ла�ка.</p>
-
-<h2>Я знайшов �ерйозну ваду у �воєму додатку, і � �правді хочу його швидко виправити. Що мені потрібно зробити?</h2>
-
+<h1>Правила поданн� додатків</h1>
+
+<h2>Що таке пі�очниц�?</h2>
+<p>Дивіть�� %s.</p>
+
+<h2>Які додатки знаход�ть�� у пі�очниці?</h2>
+<p>В�і додатки, що надход�ть до �МО �початку попадають у пі�очницю. Вона мі�тить нові вер�ії публічних додатків, а також в�і вер�ії додатків, що не �тали публічними. При відвантаженні на �МО нового додатку, або оновленні і�нуючого, його розміщують у пі�очниці.</p>
+
+<p>Де�кі додатки та окремі їх вер�ії �тають публічними пі�л� того, �к перевірка покаже, що вони до цього готові. Інші додатки залишатимуть�� у пі�очниці невизначено довго, де вони будуть до�тупні дл� кори�тувачів, �кі обирають перегл�дати пі�очницю та ек�периментувати там з програмним забезпеченн�м.</p>
+
+<h2>Як додатки �тають публічними?</h2>
+
+<p>Додатки те�тують�� кори�тувачами AMO, �кі надають перевагу перегл�ду пі�очниці та випробуванню пакетів, �кі там можна знайти. Відгуки, �кі напишуть кори�тувачі AMO, показуватимуть, чи є додаток до�татньо кори�ним, добре напи�аним і готовим до того, щоб його викла�ти у загальний до�туп. Вони, можливо, на додачу до інших відгуків та превірки командою AMO, допоможуть визначити, чи даний додаток пора зробити публічним, чи він потребує ще опрацюванн� до ширшого огл�ду, чи може він не підходить дл� про�уванн� на �айті AMO за межі пі�очниці взагалі.</p>
+
+<h2>Як мені опубліковати �вій додаток?</h2>
+
+<p>Якщо ви вірите, що ваш додаток (і ваша поведінка!) відповідають критері�м що ви�увають�� до публічних додатків, ви можете подавати його з панелі управлінн� розробника.</p>
+
+<h2>Які є інші критерії дл� публічних додатків?</h2>
+
+<p>Додаток, щоб �тати публічним на AMO, повинен бути ви�око�кі�ним: покращувати кори�тувачам роботу в мережі. Ми зважаємо на на�тупні речі при вірішенні, чи додаток відповідає публічній �тороні AMO:</p>
+
+<h3>Чи ви відповідальні?</h3>
+
+<p>Ми очікуємо, що автор, �кий про�уває �вій додаток дл� багатьох кори�тувачів Firefox’у, є відповідальним щодо звітів з проблем, підтримує �вою контактну інформацію актуальною, та оновлює �вій додаток відповідно до правил �МО щодо випу�ків та змін Firefox. Це не означає, що ви повинні відповідати на кожне запитанн�, �ке хто�ь над�илає у ди�ку�і�х, або навіть що вам потрібно виправл�ти кожну ваду, але ми �правді очікуємо, що ви відповідатимете на питанн� так, �к вимагає їх рівень �ерйозно�ті.</p>
+
+<h3>Чи додаток чітко і правильно опи�уєть��?</h3>
+
+<p>Дл� на� найбільш важливо, щоб кори�тувачі отримували те, чого вони чекають, пробуючи новий додаток. Ваш опи� повинен детально розповідати про те, що робить додаток, �к кори�тувач може кори�тувати�� його перевагами, і чого кори�тувач повинен очікувати при його в�тановленні. По�иланн� на зовнішні документи про детальні ін�трукції �приймають�� чудово, але �ам опи� повинен охоплювати о�нови і залишати кори�тувачів впевненими, що вони знають, що отримують.</p>
+
+<p>Також важливо, щоб ви підтримували примітки вер�ій відповідно до того, �к вдо�коналюєте і змінюєте �вій додаток. Кори�тувачі повинні бути в змозі побачити, що нового у додатку, �кий вони вже, можливо, випробовували. І повинні розуміти зміни, �кі можуть вплинути на їхнє поточне викори�танн� додатку, �кий вони оновлюють. (Пр�мо зараз кори�тувачі не бачать приміток вер�ій, коли їх питають про оновленн� в�ередині браузера, але ми над цим працюємо. Якщо ви добре підтримуєте примітки вер�ій, ваші кори�тувачі отримуватимуть зи�к до та пі�л� того, �к завершить�� ц� робота.)</p>
+
+<h3>Чи в�і питанн� конфіденційно�ті та безпеки чітко розгл�дають��?</h3>
+
+<p>Це а�пект чіткого і точного опи�у, але на�тільки важливий, що ми вважаємо, що він за�луговує на окрему згадку. Багато дуже кори�них і добре напи�аних додатків маніпулювали �ким�ь чином даними кори�тувача, або �вл�ли небезпеку за неправильного викори�танн�; вони бажані на публічній ча�тині AMO, але також повинні чітко роз’��нювати кори�тувачам, з �ким ризиком вони можуть �тикнути�� та що можуть зробити дл� вла�ного захи�ту.</p>
+
+<h3>Чи додаток добре проте�товано, і чи немає в ньому очевидних або �ерйозних дефектів?</h3>
+
+<p>Важливим критерієм під ча� обмірковуванн� чи �тавити додаток у публічний до�туп є відгуки з пі�очниці. Вони показують, чи було його до�татньо проте�товано, і чи не має він �ерйозних проблем або негативних впливів на браузер. Якщо огл�дачі повідомл�ють про негаразди, такі, �к �ильні проблеми з роботою, падінн�, ча�ті збої через викори�танн� функцій додатку, або наплив повідомлень у кон�оль помилок — ви повинні прийн�ти такі звіти близько до �ерц�, й повторно подати �вій додаток лише пі�л� того �к впорали��. Ми не очікуємо ідеальної оптимізації або повної від�утно�ті вад — Firefox �ам по�тійно вдо�коналюєть�� — але ми не хочемо, щоб ви витрачали значні зу�илл� дл� мінімізації маленьких негараздів і в той же ча� оминали ті моменти, �кими кори�тувачі можуть бути неприємно здивовані.</p>
+
+<p>Якщо ваш додаток було проте�товано поза межами пі�очниці AMO, �к, наприклад, групою кори�тувачів вашої компанії або внутрішньою командою ТК (технічного контролю), ви повинні це вказати у �воєму повідомленні поданн�. Це неодмінно допоможе нам в�тановити рівень проведеного те�туванн�, і може допомогти викла�ти ваш додаток на �айт.</p>
+
+<h3>Чи додаток та автор додатку �тавл�ть�� до кори�тувача з повагою?</h3>
+
+<p>Ваше програмне забезпеченн� не повинно втручати�� без потреби до �прав кори�тувача, пробувати надурити кори�тувача, або приховувати таку ді�льні�ть від кори�тувача. Кори�тувачі (або навіть не-кори�тувачі) ча�ом бувають грубі в �воїх коментар�х, і поки ми намагаємо�� зробити в�е можливе дл� відфільтровуванн� тих хто нам не допомагає, ми дій�но очікуємо, що автори уникатимуть відповідати їм �воєю грубі�тю.</p>
+
+<h3>Чи додаток кори�ний до�татньо широкому загалу кори�тувачів Firefox’а?</h3>
+
+<p>Ваш додаток не зобов’�заний �тати на�тупним Greasemonkey або FireBug, але �кщо він кори�ний лише люд�м вашої компанії або ча�тині малої мережевої �пільноти, ми можемо відчути, що ще не ча� викладати його перед у�іма кори�тувачами Firefox’у.</p>
+
+<p>Ми по�тійно шукаємо шл�хів вдо�коналенн� організації �айту дл� кращого отриманн� додатків, котрі певним чином кори�ні, але націлені на лише малу �пільноту потенційних кори�тувачів. Правильний вибір категорії та підтримка метаданих вашого додатку допоможе нам зрозуміти, �к ми можемо викла�ти на поверхню більшу кількі�ть такого типу додатків люд�м, �кі б найшвидше отримали з них кори�ть.</p>
+
+<p>Якщо ваш додаток надає лише закладку або інші �прощені шл�хи до�тупу до вашого �айту, можливо, це не підходить дл� публічної ча�тини нашого �айту. Як і решта проекту Mozilla, ми любимо мережеві зручно�ті та нові по�луги, але додатки Firefox повинні покращувати житт� в інтернеті, а не бути про�то �по�обом про�уванн� нового �айту або �ерві�у за допомогою переліку AMO. Якщо опи� вашого додатка радше про �ерві�, ніж про вдо�коналенн� роботи браузера в мережі, то, можливо, ви не туди потрапили.</p>
+
+<h3>Чи не мі�тить додаток неліцензованих торгових марок, чи не порушує він чиї�ь права?</h3>
+
+<p>Хоча ви можете не мати наміру вчинити шкоду вла�нику торгової марки, або вла�нику автор�ької роботи, ми не можемо тримати додатки, �кі порушують торгові марки або права. Якщо у ва� немає дозволу на викори�танн� імені торгової марки або зображенн�, будь ла�ка, не подавайте ваш додаток до AMO. Якщо ваш додаток включає код, �кий за�тережено ким�ь іншим, і не ліцензовано вам на викори�танн� у додатку, будь ла�ка, не подавайте ваш додаток до AMO. (Якщо вла�ник торгової марки або об’єктів, за�тережених правами, проте�туватиме проти дл� викори�танн� його торгової марки, ваш запит буде розгл�дати�ь комітетом. Якщо буде необхідно за законом, ми вилучимо ваш додаток. Це дорогий проце� у термінах ре�ур�ів проекту, включно по ча�у і грошам, тому ми про�имо ва� бути ввічливими і не �творювати непотрібні �кладнощі.)</p>
+
+<p>Якщо ви непевні, чи назва вашого додатку або викори�танн� чого�ь у ньому не дозволить його по�тавити на �айт, ви можете звернути�ь до amo-editors@mozilla.org по допомогу. В�ЖЛИВО: будь ла�ка, зауважте, що ц� група не може надавати юридичні поради, і навіть �кщо б ми відчували, що ваше викори�танн� прийн�тне, ми можемо перегл�нути таке рішенн� у �вітлі �карг від правовла�ників і порад від юридичних радників.</p>
+
+<p>У термінах повторного викори�танн� коду інших додатків, �кщо автор чітко не зазначив, що вам дозволено викори�товувати його код у вла�ній роботі — ліцензувавши його під ліцензію відкритого коду — тоді ви повинні припу�кати, що у ва� немає на це права. Ви можете �контактувати�� з автором дл� отриманн� такого дозволу, але повторюємо: ні�ких додаткових прав через те що «додаток вже був на �МО» чи тому, що автор не відповідає на ваш запит у ва� не з’�вл�єть��. (І, знову, ми не можемо надавати юридичні поради, лише поради щодо того, �к ваш додаток повинен взаємоді�ти з правилами �айту.)</p>
+
+<p>Це �то�уєть�� торгових марок Фонду Mozilla, включно з «Mozilla», «Firefox», та «Thunderbird». Політика Mozilla щодо викори�танн� торгових марок призначена дл� захи�ту від непорозумінь та дл� запобіганн� перекрученню торгових марок через брак захи�ту; будь ла�ка, поважайте потребу такого захи�ту і допомагайте нам зберігати де�кі з найцінніших вла�но�тей фонду Mozilla.</p>
+
+<h2>Що відбуваєть�� пі�л� того, �к � подаю додаток?</h2>
+
+<p>Коли ваш додаток подано, його оцінює команда редакторів AMO відповідно до вищеопи�аних критеріїв. Якщо його визнано готовим до публічного показу, його ви�тавл�ть у загальний до�туп, і ви отримаєте повідомленн� електронною поштою.</p>
+
+<p>Якщо ми відчуємо, що додаток ще не годить�� дл� публічної �торони AMO, ви отримаєте повідомленн� електронною поштою з по��ненн�м чому, а ваше поданн� буде вилучено з черги. Якщо і коли ви відчуєте, що ви виправили недоліки, зазначені у повідомленні, і хочете щоб знову це оцінили, ви можете наді�лати запит ще раз. Повторювані за�вки без значних вдо�коналень у додатку �погл�дають�� не�хвально. Тому, будь ла�ка, робіть перерви; ви швидше можете на� роз�ердити, ніж подолати.</p>
+
+<h2>Чи можу � подавати додаток кого�ь іншого?</h2>
+
+<p>�аразі ми про�имо, щоб автори додатків �амі подавали вла�ну роботу на публікацію. Ми хочемо переконати��, що автор почуваєть�� зручно з збільшеною публічні�тю, і що він відчуває, що додаток у поточному �тані відповідно показує �кі�ть його роботи. Якщо ви вірите, що додаток відполіровано, що автор вірний букві і духу політик AMO, і що Firefox, наші кори�тувачі та мережа загалом від того тільки виграють, коли майже мільйон чоловік у в�ьому �віті отримають до�туп до додатку, обов’�зково підбадьорте автора до поданн� �вого твору.</p>
+
+<h2>Мій додаток вже довгий ча� у черзі поданн�, чи ви мене ненавидите?</h2>
+
+<p>Ми не ненавидимо ва�. Ми любимо розробників додатків, і важко працюємо, щоб зробити їх ща�ливими і продуктивними, щоб кори�тувачі у�ього �віту могли отримувати кори�ть від їхньої роботи. �ле перебуванн� на публічній �тороні AMO має цінні�ть �аме завд�ки тому, що ми турбуємо�ь про те, що туди надходить, тому ми не можемо по�пішати лише щоб при�корити проце�. Ми розуміємо, що чеканн� на оцінку вашого додатку може за�мучувати, і ми �тараємо�ь робити огл�ди �кнайшвидше. Що більше людей надають виважені та чіткі перегл�ди додатків у пі�очниці, то про�тіше їх оцінювати. Тому ви можете допомогти нам в цьому, �кщо така ваша ла�ка.</p>
+
+<h2>Я знайшов �ерйозну ваду у �воєму додатку, і � �правді хочу його швидко виправити. Що мені потрібно зробити?</h2>
+
 <p>Якщо є �ерйозна вада (безпеки, �табільно�ті, велика проблема з функціональні�тю) у додатку, через �ку ви хочете негайно зробити оновленн�, ви так і повинні зазначити у «примітках дл� перегл�дача» при поданні оновленн� — �к, певно ж, і у примітках вер�ії! Ви також можете �пробувати доручити кори�тувачам вашого додатку поте�тити його та відпи�ати результати в пі�очницю. Долученн� до каналу #addons на irc.mozilla.org може допомогти люд�м бути в кур�і �итуації, але будь ла�ка, будьте терпл�чі і ввічливі в таких випадках.</p>
 
 <p>Будь ла�ка, не кричить «вовки!» без потреби. Ми намагаємо�� швидко пропу�кати ви�окоприорітетні оновленн�, проте перегл�данн� інших оновлень та вер�ій забирає наші �или, і ча�то коштує нам �ну або ча�у з �ім’�ми та друз�ми. Тому ми не дуже любимо людей  людей, �кі хочуть �кори�тувати�� цим механізмом, щоб «про�кочити чергу». Якщо ви непевні, чи варто йти цим шл�хом, запитайте�� у #addons на irc.mozilla.org, там вам можуть допомогти вирішити.</p>
-
-<h2>Я думаю, що до мене нече�но відне�ли�� при оцінці мого додатку. Що � повинен робити?</h2>
-
-<p>Якщо ви вірите, що ваш додаток був невірно оцінений, і йому не надали публічного �тату�у помилково, вам потрібно наді�лати ли�та на amo-editors@mozilla.org з детальним обґрунтуванн�м. Будь ла�ка, будьте ввічливими і чіткими у �воєму ли�ті, і переконайте��, що надаєте подробиці того, �к додаток був недооцінений.</p>
-
-<p>(Якщо ви виправили *в�і* речі, �кі були зазначені �к проблеми у повідомленні, вам не треба апелювати на оцінку, але, натомі�ть, �лід про�то подати новий варіант за допомогою панелі керуванн� розробника.)</p>
-
-<h2>Мій додаток був публічним, а зараз він лише у пі�очниці. Що �тало��? </h2>
-
-<p>Якщо додаток більше не задовольн�є критері�м перебуванн� на публічній �тороні �айту, ми можемо перемі�тити його назад до пі�очниці. Якщо нам юридично не заборон�ть цього зробити, ми повідомимо вам про це електронною поштою, і зазначимо причини таких дій.</p>
-
-<p>Також можливо, що ви найшли ваду у �айті, в такому випадку прозвітуйте за допомогою Bugzilla; викори�товуйте продукт «addons.mozilla.org» та компоненту «Публічні �торінки» дл� �вого звіту і надайте �кнайбільше подробиць.</p>
-
-<h2>Мій додаток публічний, і, здаєть��, люди його любл�ть. Як � можу попа�ти у перелік рекомендованих додатків?</h2>
-
-<p>Якщо ви вважаєте, що ваш додаток є бли�кучим прикладом могутно�ті додатків, що він демон�трує і розширює цінно�ті Mozilla дл� мережі, розширюваної і контрольованої кори�тувачем, і що він дає кори�тувачу нову функціональні�ть, можете  попро�ити про те, щоб розгл�нули можливі�ть вне�енн� його до переліку рекомендованих додатків. Щоб зробити це, ви повинні наді�лати ли�та на amo-editors@mozilla.org з по��ненн�м про те, чому ваш додаток чудовий.</p>
-
-<p>Ваш ли�т повинен включати <b>принаймні</b> інформацію про такі речі:</p>
-<ul>
-<li>�к покращуєть�� житт� кори�тувачів в мережі</li>
-<li>�ким чином ваш додаток підходить великій ча�тині кори�тувачів Firefox’у</li>
-<li>�к ваш додаток демон�трує та/або �лужить цінно�т�м проекту Mozilla, о�обливо з погл�ду наданн� повноважень кори�тувачу, захи�ту конфіденційно�ті та безпеки, універ�альному до�тупу до мережі, та відкритим �тандартам і даним</li>
-<li>�к ваш додаток відрізн�єть�� від інших �хожих додатків ( чим гірший, чим кращий)</li>
-<li>�ку реакцію ви бачили від кори�тувачів, перегл�дачів, блоґґерів, ко�монавтів ваших домашніх тварин. Як  і позитивну, так і негативну</li>
-</ul>
-
-<p>Що повнішу інформацію ви нада�те у �воєму запиті, то більше шан�ів буде на те, що ми включимо додаток у перелік рекомендованих. Хоча навіть чудово напи�аний і вичерпний опи� не дає на це гарантії. Зрештою, цей перелік повинен — і є — підтримувати�ь на роз�уд Mozilla і турбота про кори�тувачів має переважувати інші міркуванн�.</p>
+
+<h2>Я думаю, що до мене нече�но відне�ли�� при оцінці мого додатку. Що � повинен робити?</h2>
+
+<p>Якщо ви вірите, що ваш додаток був невірно оцінений, і йому не надали публічного �тату�у помилково, вам потрібно наді�лати ли�та на amo-editors@mozilla.org з детальним обґрунтуванн�м. Будь ла�ка, будьте ввічливими і чіткими у �воєму ли�ті, і переконайте��, що надаєте подробиці того, �к додаток був недооцінений.</p>
+
+<p>(Якщо ви виправили *в�і* речі, �кі були зазначені �к проблеми у повідомленні, вам не треба апелювати на оцінку, але, натомі�ть, �лід про�то подати новий варіант за допомогою панелі керуванн� розробника.)</p>
+
+<h2>Мій додаток був публічним, а зараз він лише у пі�очниці. Що �тало��? </h2>
+
+<p>Якщо додаток більше не задовольн�є критері�м перебуванн� на публічній �тороні �айту, ми можемо перемі�тити його назад до пі�очниці. Якщо нам юридично не заборон�ть цього зробити, ми повідомимо вам про це електронною поштою, і зазначимо причини таких дій.</p>
+
+<p>Також можливо, що ви найшли ваду у �айті, в такому випадку прозвітуйте за допомогою Bugzilla; викори�товуйте продукт «addons.mozilla.org» та компоненту «Публічні �торінки» дл� �вого звіту і надайте �кнайбільше подробиць.</p>
+
+<h2>Мій додаток публічний, і, здаєть��, люди його любл�ть. Як � можу попа�ти у перелік рекомендованих додатків?</h2>
+
+<p>Якщо ви вважаєте, що ваш додаток є бли�кучим прикладом могутно�ті додатків, що він демон�трує і розширює цінно�ті Mozilla дл� мережі, розширюваної і контрольованої кори�тувачем, і що він дає кори�тувачу нову функціональні�ть, можете  попро�ити про те, щоб розгл�нули можливі�ть вне�енн� його до переліку рекомендованих додатків. Щоб зробити це, ви повинні наді�лати ли�та на amo-editors@mozilla.org з по��ненн�м про те, чому ваш додаток чудовий.</p>
+
+<p>Ваш ли�т повинен включати <b>принаймні</b> інформацію про такі речі:</p>
+<ul>
+<li>�к покращуєть�� житт� кори�тувачів в мережі</li>
+<li>�ким чином ваш додаток підходить великій ча�тині кори�тувачів Firefox’у</li>
+<li>�к ваш додаток демон�трує та/або �лужить цінно�т�м проекту Mozilla, о�обливо з погл�ду наданн� повноважень кори�тувачу, захи�ту конфіденційно�ті та безпеки, універ�альному до�тупу до мережі, та відкритим �тандартам і даним</li>
+<li>�к ваш додаток відрізн�єть�� від інших �хожих додатків ( чим гірший, чим кращий)</li>
+<li>�ку реакцію ви бачили від кори�тувачів, перегл�дачів, блоґґерів, ко�монавтів ваших домашніх тварин. Як  і позитивну, так і негативну</li>
+</ul>
+
+<p>Що повнішу інформацію ви нада�те у �воєму запиті, то більше шан�ів буде на те, що ми включимо додаток у перелік рекомендованих. Хоча навіть чудово напи�аний і вичерпний опи� не дає на це гарантії. Зрештою, цей перелік повинен — і є — підтримувати�ь на роз�уд Mozilla і турбота про кори�тувачів має переважувати інші міркуванн�.</p>
diff --git a/site/app/locale/uk/pages/sandbox.thtml b/site/app/locale/uk/pages/sandbox.thtml
index badb8bb..000fa25 100644
--- a/site/app/locale/uk/pages/sandbox.thtml
+++ b/site/app/locale/uk/pages/sandbox.thtml
@@ -1,13 +1,13 @@
-<h1>Перевірка у пі�очниці</h1>
-<h2>Що таке пі�очниц�?</h2>
-<p>Пі�очниц� є мі�цем, де передові кори�тувачі можуть випробувати додатки до того, �к їх випу�т�ть у загальне кори�туванн�. Щоб отримати до�туп до пі�очниці, ви повинні включити її у �воїх налаштуванн�х. Обережно в�тановлюйте додатки з пі�очниці, о�кільки їх ще не перевірив редактор і вони можуть зашкодити вашому комп’ютеру.</p>
-
-<h2>Як � можу помі�тити �вій додаток на публічний �айт?</h2>
-<!-- To localize the flowchart image, see http://wiki.mozilla.org/Update:Remora_Sandbox_Flowchart -->
-<div style="text-align: center;">%s</div>
-<ol>
-    <li><b>Відвантажте �вій додаток через Панель керуванн� розробника.</b> Він одразу з’�вить�� у Пі�очниці Додатків Mozilla, де до�відчені кори�тувачі будуть випробовувати його і надаватимуть зворотній зв’�зок. Дл� того щоб побачити пі�очницю, потрібно увімкнути її в �воїх налаштуванн� рахунку.</li>
-    <li><b>Подайте запит на публікацію.</b> У Панелі керуванн� розробника є по�иланн� на поданн� �вого додатка. Пі�л� цього він з’�вить�� у редактор�ькій черзі перегл�ду.</li>
-    <li><b>Редактор перегл�не ваш додаток.</b> Редактор додатків Mozilla в�тановить ваш додаток і випробує його роботу. Редактор також зважить на відгуки випробувачів з пі�очниці.</li>
-    <li><b>Ваш додаток �тає публічним або залишаєть�� у пі�очниці.</b> Редактор або робить ваш додаток публічним, або залишає його у пі�очниці. Якщо додаток залишаєть�� у пі�очниці, ви можете знову його подати пі�л� виправленн� змін, �кі запропонує редактор у коментар�х. Якщо він �тає публічним, майбутні вер�ії вашого додатку з’�вл�тимуть�� у пі�очниці до того ча�у, доки їх не огл�не редактор і не зробить публічними. Коли ваш додаток �тає публічним, немає потреби знову його подавати — майбутні вер�ії автоматично переходитимуть у чергу очікуванн� на огл�д.</li>
+<h1>Перевірка у пі�очниці</h1>
+<h2>Що таке пі�очниц�?</h2>
+<p>Пі�очниц� є мі�цем, де передові кори�тувачі можуть випробувати додатки до того, �к їх випу�т�ть у загальне кори�туванн�. Щоб отримати до�туп до пі�очниці, ви повинні включити її у �воїх налаштуванн�х. Обережно в�тановлюйте додатки з пі�очниці, о�кільки їх ще не перевірив редактор і вони можуть зашкодити вашому комп’ютеру.</p>
+
+<h2>Як � можу помі�тити �вій додаток на публічний �айт?</h2>
+<!-- To localize the flowchart image, see http://wiki.mozilla.org/Update:Remora_Sandbox_Flowchart -->
+<div style="text-align: center;">%s</div>
+<ol>
+    <li><b>Відвантажте �вій додаток через Панель керуванн� розробника.</b> Він одразу з’�вить�� у Пі�очниці Додатків Mozilla, де до�відчені кори�тувачі будуть випробовувати його і надаватимуть зворотній зв’�зок. Дл� того щоб побачити пі�очницю, потрібно увімкнути її в �воїх налаштуванн� рахунку.</li>
+    <li><b>Подайте запит на публікацію.</b> У Панелі керуванн� розробника є по�иланн� на поданн� �вого додатка. Пі�л� цього він з’�вить�� у редактор�ькій черзі перегл�ду.</li>
+    <li><b>Редактор перегл�не ваш додаток.</b> Редактор додатків Mozilla в�тановить ваш додаток і випробує його роботу. Редактор також зважить на відгуки випробувачів з пі�очниці.</li>
+    <li><b>Ваш додаток �тає публічним або залишаєть�� у пі�очниці.</b> Редактор або робить ваш додаток публічним, або залишає його у пі�очниці. Якщо додаток залишаєть�� у пі�очниці, ви можете знову його подати пі�л� виправленн� змін, �кі запропонує редактор у коментар�х. Якщо він �тає публічним, майбутні вер�ії вашого додатку з’�вл�тимуть�� у пі�очниці до того ча�у, доки їх не огл�не редактор і не зробить публічними. Коли ваш додаток �тає публічним, немає потреби знову його подавати — майбутні вер�ії автоматично переходитимуть у чергу очікуванн� на огл�д.</li>
 </ol>
diff --git a/site/app/locale/uk/pages/submission_help.thtml b/site/app/locale/uk/pages/submission_help.thtml
index ea4293d..cbcebc5 100644
--- a/site/app/locale/uk/pages/submission_help.thtml
+++ b/site/app/locale/uk/pages/submission_help.thtml
@@ -1,37 +1,37 @@
-<h1>Підказка з подаванн�</h1>
-Обов’�зкові пол� виділені <b>жирним</b>. �еобов’�зкові пол� виділені <i>кур�ивом</i>.
-<h2 id="step1">Крок 1: Відвантаженн�</h2>
-<ul class="submissionHelp">
-    <li><span class="required">Тип додатку</span> — зазвичай тип додатку автоматично визначаєть�� з відвантаженого файла. Ви не зобов’�зані змінювати це поле.</li>
-    <li><span class="required">Файл додатку</span> — пакетний файл вашого додатку що мі�тить файл install.rdf. Якщо файл працює тільки з окремою платформою, вибір такої платформи дозволить відвантажити багато файлів за один раз.</li>
-    <li><span class="optional">Файл значка</span> — значок показуєть�� пор�д із назвою додатку на його �торінці та у діалозі в�тановленн� додатку. Його розміри автоматично будуть змінені на 32x32 пік�елі, зберігаючи �піввідношенн� �торін.</li>
-    <li><span class="required">Типова мова</span> — типова мова додатку буде його о�новною мовою. Якщо дл� додатку недо�тупна мова обрана кори�тувачем, то буде викори�тана типова.</li>
-    <li><span class="optional">Пропу�тити перегл�д інформації цього додатку</span> — �кщо ви оновлюєте і�нуючий додаток, з’�вить�� це поле. Виділенн� прапорц� перемі�тить ва� до кроку 3, де можна буде вве�ти інформацію про вер�ію.</li>
-</ul>
-
-<h2 id="step2">Крок 2: Подробиці додатку</h2>
-<ul class="submissionHelp">
-    <li><span class="required">�азва</span> — назва додатку типовою мовою.</li>
-    <li><span class="required">�втори</span> — в�і кори�тувачі, �кі можуть змінювати інформацію додатка і будуть перелічені �к автори на його �торінці.</li>
-    <li><span class="required">Категорії</span> — категорії, за�то�овувані до додатку.</li>
-    <li><span class="optional">Домашн� �торінка</span> — веб�айт додатку типовою мовою.</li>
-    <li><span class="required">Під�умок</span> — короткий під�умок додатку типовою мовою. Мак�имум 250 �имволів. Цей тек�т з’�вл�тиметь�� на �торінці показу додатка, а також у результатах пошуку/огл�ду.</li>
-    <li><span class="required">Опи�</span> — опи� додатку типовою мовою. З’�вл�тиметь�� на �торінці показу додатка під під�умком.</li>
-    <li><span class="optional">ЛУКК</span> — Ліцензійна угода з кінцевим кори�тувачем, �ку кори�тувачі повинні прийн�ти перед завантаженн�м. Типовою мовою.</li>
-    <li><span class="optional">Умови конфіденційно�ті</span> — умови конфіденційно�ті додатка типовою мовою. Умови конфіденційно�ті по��нюють, що робить�� з о�оби�тою інформацією кінцевого кори�тувача. По�иланн� на умови конфіденційно�ті з’�вить��  біл� кнопки в�тановленн� на �торінці додатка. Додаткова інформаці� �то�овно того, що повинно включати�� в умови кофіденційно�ті і чи ваш додаток її потребує, до�тупна у <a href="%s">Правилах Додатків</a>.</li>
-    <li><span class="optional">Дозволити кори�тувачам перегл�дати джерела файлів в мережі</span> — кори�тувачі зможуть читати початковий код вашого додатку.</li>
-    <li><span class="optional">Попередній випу�к</span> — додаток є попереднім випу�ком або «бета»-вер�ією. Додатки попереднього випу�ку повинні залишати�� у пі�очниці і не можуть подавати�� на публікацію, доки цей прапорець не буде зн�то.</li>
+<h1>Підказка з подаванн�</h1>
+Обов’�зкові пол� виділені <b>жирним</b>. �еобов’�зкові пол� виділені <i>кур�ивом</i>.
+<h2 id="step1">Крок 1: Відвантаженн�</h2>
+<ul class="submissionHelp">
+    <li><span class="required">Тип додатку</span> — зазвичай тип додатку автоматично визначаєть�� з відвантаженого файла. Ви не зобов’�зані змінювати це поле.</li>
+    <li><span class="required">Файл додатку</span> — пакетний файл вашого додатку що мі�тить файл install.rdf. Якщо файл працює тільки з окремою платформою, вибір такої платформи дозволить відвантажити багато файлів за один раз.</li>
+    <li><span class="optional">Файл значка</span> — значок показуєть�� пор�д із назвою додатку на його �торінці та у діалозі в�тановленн� додатку. Його розміри автоматично будуть змінені на 32x32 пік�елі, зберігаючи �піввідношенн� �торін.</li>
+    <li><span class="required">Типова мова</span> — типова мова додатку буде його о�новною мовою. Якщо дл� додатку недо�тупна мова обрана кори�тувачем, то буде викори�тана типова.</li>
+    <li><span class="optional">Пропу�тити перегл�д інформації цього додатку</span> — �кщо ви оновлюєте і�нуючий додаток, з’�вить�� це поле. Виділенн� прапорц� перемі�тить ва� до кроку 3, де можна буде вве�ти інформацію про вер�ію.</li>
+</ul>
+
+<h2 id="step2">Крок 2: Подробиці додатку</h2>
+<ul class="submissionHelp">
+    <li><span class="required">�азва</span> — назва додатку типовою мовою.</li>
+    <li><span class="required">�втори</span> — в�і кори�тувачі, �кі можуть змінювати інформацію додатка і будуть перелічені �к автори на його �торінці.</li>
+    <li><span class="required">Категорії</span> — категорії, за�то�овувані до додатку.</li>
+    <li><span class="optional">Домашн� �торінка</span> — веб�айт додатку типовою мовою.</li>
+    <li><span class="required">Під�умок</span> — короткий під�умок додатку типовою мовою. Мак�имум 250 �имволів. Цей тек�т з’�вл�тиметь�� на �торінці показу додатка, а також у результатах пошуку/огл�ду.</li>
+    <li><span class="required">Опи�</span> — опи� додатку типовою мовою. З’�вл�тиметь�� на �торінці показу додатка під під�умком.</li>
+    <li><span class="optional">ЛУКК</span> — Ліцензійна угода з кінцевим кори�тувачем, �ку кори�тувачі повинні прийн�ти перед завантаженн�м. Типовою мовою.</li>
+    <li><span class="optional">Умови конфіденційно�ті</span> — умови конфіденційно�ті додатка типовою мовою. Умови конфіденційно�ті по��нюють, що робить�� з о�оби�тою інформацією кінцевого кори�тувача. По�иланн� на умови конфіденційно�ті з’�вить��  біл� кнопки в�тановленн� на �торінці додатка. Додаткова інформаці� �то�овно того, що повинно включати�� в умови кофіденційно�ті і чи ваш додаток її потребує, до�тупна у <a href="%s">Правилах Додатків</a>.</li>
+    <li><span class="optional">Дозволити кори�тувачам перегл�дати джерела файлів в мережі</span> — кори�тувачі зможуть читати початковий код вашого додатку.</li>
+    <li><span class="optional">Попередній випу�к</span> — додаток є попереднім випу�ком або «бета»-вер�ією. Додатки попереднього випу�ку повинні залишати�� у пі�очниці і не можуть подавати�� на публікацію, доки цей прапорець не буде зн�то.</li>
     <li><span class="optional">Додаток дл� окремого �айту</span> — додаток призначено дл� певного веб�айту. Скажімо, додаток змінює його змі�т чи вигл�д. �бо призначений дл� отриманн� звідти інформації. 
-Це поле допомагає редакторам і у майбутньому може викори�товувати�� дл� фільтруванн� пошуку.</li>
+Це поле допомагає редакторам і у майбутньому може викори�товувати�� дл� фільтруванн� пошуку.</li>
     <li><span class="optional">Додаток потребує зовнішнього програмного забезпеченн�</span> — додаток потребує зовнішніх програм або бібліотек. 
-Це поле допомагає редакторам і у майбутньому може викори�товувати�� дл� фільтруванн� пошуку.</li>
-</ul>
-
-<h2 id="step3">Крок 3: Подробиці вер�ії</h2>
-<ul class="submissionHelp">
-    <li><span class="required optional">Примітки до вер�ії</span> — під�умок або перелік змін у цій вер�ії. Це необов’�зково дл� нових подань, але потрібно дл� оновлень.</li>
-    <li><span class="optional">Примітки дл� огл�дача</span> — це поле викори�товуєть�� дл� наданн� інформації редакторам, �кі перегл�датимуть ваш додаток. Тут �лід вказати дані про те�товий до�туп (�кщо потрібен) та інші о�обливі примітки.</li>
-</ul>
-
-<h2 id="step4">Крок 4: Переклади</h2>
+Це поле допомагає редакторам і у майбутньому може викори�товувати�� дл� фільтруванн� пошуку.</li>
+</ul>
+
+<h2 id="step3">Крок 3: Подробиці вер�ії</h2>
+<ul class="submissionHelp">
+    <li><span class="required optional">Примітки до вер�ії</span> — під�умок або перелік змін у цій вер�ії. Це необов’�зково дл� нових подань, але потрібно дл� оновлень.</li>
+    <li><span class="optional">Примітки дл� огл�дача</span> — це поле викори�товуєть�� дл� наданн� інформації редакторам, �кі перегл�датимуть ваш додаток. Тут �лід вказати дані про те�товий до�туп (�кщо потрібен) та інші о�обливі примітки.</li>
+</ul>
+
+<h2 id="step4">Крок 4: Переклади</h2>
 Тут пол� додатку можуть перекладати�� в�іма підтримуваними мовами. Про�то клацніть на мові, щоб почати перекладати.
diff --git a/site/app/locale/vi/LC_MESSAGES/messages.po b/site/app/locale/vi/LC_MESSAGES/messages.po
index 7ff1508..0689828 100644
--- a/site/app/locale/vi/LC_MESSAGES/messages.po
+++ b/site/app/locale/vi/LC_MESSAGES/messages.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: addons.mozilla.org\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-09 18:11+0700\n"
-"Last-Translator: Hung. NGUYEN Manh <loveleeyoungae@yahoo.com>\n"
+"PO-Revision-Date: 2008-12-16 05:36-0800\n"
+"Last-Translator: NGUYEN-Manh Hung <loveleeyoungae@yahoo.com>\n"
 "Language-Team: Vietnamese <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12,199 +12,169 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Narro 0.9.2 on https://l10n.mozilla.org/narro\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "Hủy b� Cài đặt"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312
-#: views/elements/install.thtml:73
-#: views/elements/install.thtml:181
-#: views/elements/install.thtml:205
-#: views/elements/install.thtml:248
-#: views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66
-#: views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86
-#: views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "Tải Ngay %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "Chấp thuận và Tải xuống"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "Chấp thuận và Cài đặt"
 
-#: views/elements/header.thtml:76
-#: views/elements/header.thtml:82
-#: views/api/api_addon.thtml:55
-#: views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
+#: views/elements/header.thtml:76 views/elements/header.thtml:82
+#: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
 msgid "a_header_public"
 msgstr "Công cộng"
 
-#: views/elements/header.thtml:58
-#: views/elements/header.thtml:75
-#: views/elements/header.thtml:80
-#: views/api/api_addon.thtml:57
+#: views/elements/header.thtml:58 views/elements/header.thtml:75
+#: views/elements/header.thtml:80 views/api/api_addon.thtml:57
 #: views/api/collections_feed.thtml:77
-#: views/sharing_api/addon.thtml:66
 msgid "a_header_sandbox"
 msgstr "Hộp cát"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122
-#: views/elements/feature.thtml:106
-#: views/addons/display.thtml:104
-#: views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "Cập nhật %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "Phiên bản %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "số lượt tải"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "tổng số lượt tải"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115
-#: views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157
-#: views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "lượt tải hàng tuần"
 
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104
-#: views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s tiện ích"
 msgstr[1] "%1$s tiện ích"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "má»—i trang"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
-msgstr "Sắp xếp theo:"
+msgstr "Sắp theo:"
 
-#: views/helpers/addons_html.php:568
-#: views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "thử nghiệm"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "khuyên dùng"
 
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s không hiện hữu cho %2$s."
 
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101
-#: views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130
-#: views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114
-#: views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "Quay lại %1$s..."
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60
-#: views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "Quay lại phần đánh giá..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "Xếp hạng:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "�ánh giá:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "Gửi đánh giá"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "Thêm đánh giá cho %s"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "Tiêu đ� / Tóm tắt:"
 
-#: views/reviews/display.thtml:77
-#: views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "Xóa"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "Trả l�i"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "Bạn có chắc bạn muốn xóa đánh giá này?"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "Không"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "Có"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
-msgstr "Xóa đánh giá"
+msgstr "Xóa �ánh-giá"
 
 #: controllers/reviews_controller.php:449
 msgid "addon_review_deleted_successfully"
 msgstr "�ánh giá đã được xóa thành công."
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "Chỉnh sửa �ánh giá của %s"
@@ -212,19 +182,23 @@ msgstr "Chỉnh sửa �ánh giá của %s"
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
-msgstr "Vấn đ� khi gán c� hiệu cho đánh giá: Ghi chú cho các đánh giá được gán c� bị giới hạn trong 10 đến 100 kí tự; độ dài kí tự bạn vừa gõ là %1$s."
+msgstr ""
+"Vấn đ� khi gán c� hiệu cho đánh giá: Ghi chú cho các đánh giá được gán c� bị "
+"giới hạn trong 10 đến 100 kí tự; độ dài kí tự bạn vừa gõ là %1$s."
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
-msgstr "Vui lòng chú ý: Trước khi đánh giá của bạn hiện công khai trên trang, nó sẽ được đi�u chỉnh bởi một biên tập viên."
+msgstr ""
+"Vui lòng chú ý: Trước khi đánh giá của bạn hiện công khai trên trang, nó sẽ "
+"được đi�u chỉnh bởi một biên tập viên."
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "Nhà phát triển trả l�i:"
 
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -241,169 +215,131 @@ msgid "addon_review_pagetitle"
 msgstr "�ánh giá cho %s"
 
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "Trả l�i bởi %1$s ngày %2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "Nhà phát triển trả l�i:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "�ánh giá của bạn đã được lưu thành công. Cảm ơn!"
 
-#: views/addons/display.thtml:354
-#: views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "bởi %1$s ngày %2$s"
 
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63
-#: views/reviews/delete.thtml:54
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "bởi %1$s ngày %2$s (xếp hạng %3$s)"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "Tiện ích Kế"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "Tiện ích Trước"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "Liên kết tĩnh đến tiện ích này"
 
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 msgid "addon_versions_getlatestversion"
 msgstr "Phiên bản mới nhất tương thích với %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "Gá»­i Ä‘i"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "Xem hồ sơ của Tác giả"
 
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "Duyệt xem tất cả Giao diện :: Tiện ích %1$s"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "Duyệt %s"
 
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "Duyệt xem Giao diện %1$s :: Tiện ích %2$s"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "�ây là gì?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "Thêm đánh giá"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "Chi tiết Nâng cao"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "Phân mục"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "Thêm vào một bộ sưu tập:"
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "Bộ sưu tập mới..."
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "Ch�n một bộ sưu tập..."
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "Xuất bản"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103
-#: views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s vừa được thêm vào bộ sưu tập %2$s."
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "�ây là gì?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "và %1$s bộ sưu tập nữa"
-msgstr[1] "và %1$s bộ sưu tập nữa"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "đánh giá chi tiết"
 
-#: views/reviews/add.thtml:89
-#: views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "Không thích"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "Chỉnh sửa đánh giá của bạn"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "Tiện ích này có đi�u khoản v� quy�n riêng tư."
 
-#: views/reviews/add.thtml:87
-#: views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "Ghét"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "Bộ sưu tập Liên quan"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "Bình luận của Nhà phát triển"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "Trang chủ"
 
-#: views/addons/display.thtml:247
-#: views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "Giấy phép Mã nguồn"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�ánh giá"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "Hỗ trợ"
 
-#: views/reviews/add.thtml:91
-#: views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "Thích"
 
@@ -411,23 +347,19 @@ msgstr "Thích"
 msgid "addons_display_long_description"
 msgstr "Mô tả �ầy đủ"
 
-#: views/reviews/add.thtml:95
-#: views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "Yêu"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "Nhi�u Hình Hơn"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "Tiện ích này chưa có trong bất kì bộ sưu tập nào."
-
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "Tiện ích khác của %1$s"
@@ -436,84 +368,94 @@ msgstr[1] "Tiện ích khác của các tác giả này"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "Hỗ trợ cho tiện ích này được cung cấp bởi nhà phát triển tại %s"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "Hỗ trợ cho tiện ích này được cung cấp bởi nhà phát triển tại %s hoặc bằng cách gửi e-mail đến %s"
+msgstr ""
+"Hỗ trợ cho tiện ích này được cung cấp bởi nhà phát triển tại %s hoặc bằng "
+"cách gửi e-mail đến %s"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "Hỗ trợ cho tiện ích này được cung cấp bởi nhà phát triển tại %s"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "Xếp hạng nó"
 
-#: views/reviews/add.thtml:93
-#: views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "Thật sự thích"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
-msgstr "Vui lòng đừng báo lỗi trong phần đánh giá. Chúng tôi không cho nhà phát triển tiện ích thấy địa chỉ email của bạn, trong khi h� có thể cần liên lạc riêng với bạn để giải quyết vấn đ�."
+msgstr ""
+"Vui lòng đừng báo lỗi trong phần đánh giá. Chúng tôi không cho nhà phát "
+"triển tiện ích thấy địa chỉ email của bạn, trong khi h� có thể cần liên lạc "
+"riêng với bạn để giải quyết vấn đ�."
 
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">Hướng dẫn �ánh giá</a>"
 
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "Xem <a href=\"%1$s\">phần hỗ trợ</a> để tìm nơi nhận được hỗ trợ cho tiện ích này."
+msgstr ""
+"Xem <a href=\"%1$s\">phần hỗ trợ</a> để tìm nơi nhận được hỗ trợ cho tiện "
+"ích này."
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "LÆ°u"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "Xem tất cả Tiện ích %1$s"
 
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "Xem tất cả đánh giá (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "Xem tất cả Phiên bản"
 
-#: views/addons/display.thtml:321
-#: views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "Lịch sử Phiên bản Hoàn thiện"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "Xem mã nguồn"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "Xem thống kê"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "Bạn nghĩ sao?"
 
@@ -521,395 +463,284 @@ msgstr "Bạn nghĩ sao?"
 msgid "addons_display_workswith"
 msgstr "Hoạt động trên:"
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "Vừa thêm"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "Thông dụng"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "Khuyên dùng"
-
-#: views/addons/home.thtml:127
-#: views/addons/home.thtml:134
-#: views/addons/home.thtml:141
-#: views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "�ăng kí"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "Duyệt xem Tiện ích"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "Cập nhật"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109
-#: views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66
-#: views/addons/policy.thtml:57
-#: views/addons/display.thtml:70
-#: views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "bởi"
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "Bộ sưu tập Thông dụng"
-
-#: views/elements/amo2009/categories.thtml:69
-#: views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "Bộ sưu tập"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> tiện ích"
-msgstr[1] "<strong>%1$s</strong> tiện ích"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "Xem tất cả Các bộ sưu tập"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr "Bộ sưu tập là một cách để bạn phân loại, trộn, so sánh các tiện ích. Hãy đăng kí vào bộ sưu tập tạo bởi ngư�i dùng khác hoặc tự tạo cho riêng bạn."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96
-#: views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> ngư�i đăng kí"
-msgstr[1] "<strong>%1$s</strong> ngư�i đăng kí"
-
-#: views/addons/searchengines.thtml:54
-#: views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
-msgstr "<a href=\"http://vi.mozdev.org\" target=\"_blank\">Mozilla Việt Nam</a> khuyên dùng"
-
-#: controllers/search_controller.php:218
-#: controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428
-#: controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+msgstr "Chúng tôi khuyên dùng"
+
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
-msgstr "Tiện ích mở rộng %1$s, cho phép bạn tùy biến việc duyệt web. Hãy dạo quanh một vòng và làm chủ %1$s."
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "Thích những cái này? Hãy tìm thêm tiện ích trong %1$s."
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr "<strong>Trên 5000 thành phần bổ sung miễn phí</strong> giúp bạn tùy biến và mở rộng Firefox phù hợp với nhu cầu của mình."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "Tiện ích là gì?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>Dễ cài đặt</strong> và luôn được cập nhật."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "Giới thiệu"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "Thanh công cụ, giao diện và nhà cung cấp tìm kiếm <strong>giúp bạn thực hiện các tác vụ thông thư�ng.</strong>"
+msgstr ""
+"Tiện ích mở rộng %1$s, cho phép bạn tùy biến việc duyệt web. Hãy dạo quanh "
+"một vòng và làm chủ %1$s."
 
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "MỚI!"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "Mới nhất:"
 
 #: views/elements/app_chooser.thtml:48
-#: views/layouts/amo2009.thtml:257
 msgid "addons_home_other_applications"
 msgstr "Chương trình Khác"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49
-#: views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46
-#: views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81
-#: controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
-#: controllers/previews_controller.php:67
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:414
-#: controllers/users_controller.php:708
-#: controllers/users_controller.php:723
-#: controllers/reviews_controller.php:204
+#: controllers/statistics_controller.php:216
+#: controllers/previews_controller.php:67 controllers/users_controller.php:90
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185
-#: controllers/search_controller.php:297
-#: controllers/search_controller.php:301
-#: controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132
-#: controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71
-#: controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
-msgstr "%1$s Add-ons - Tiện ích %1$s"
+msgstr "Tiện ích %1$s"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>tiện ích đã được tải xuống</span>"
-msgstr[1] "<strong>%1$s</strong> <span>tiện ích đã được tải xuống</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "Thông dụng Nhất:"
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>tiện ích đang được dùng</span>"
-msgstr[1] "<strong>%1$s</strong> <span>tiện ích đang được dùng</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "Khuyên Dùng:"
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "Cập nhật Gần đây:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "xem tất cả"
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "xem tất cả các tiện ích mới được tạo"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "xem tất cả các tiện ích thông dụng"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "xem tất cả các tiện ích khuyên dùng"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "xem tất cả các tiện ích được cập nhật gần đây"
 
-#: views/elements/amo2009/install.thtml:334
-#: views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
-msgstr "<ol><li>Nhấn vào liên kết bên dưới để lưu tập tin.</li><li>Trong Mozilla Sunbird, mở Tiện ích từ trình đơn Công cụ</li><li>Nhấn vào nút Cài đặt, và tìm/ch�n tập tin bạn đã tải xuống và nhấn \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Nhấn vào liên kết bên dưới để lưu tập tin.</li><li>Trong Mozilla "
+"Sunbird, mở Tiện ích từ trình đơn Công cụ</li><li>Nhấn vào nút Cài đặt, và "
+"tìm/ch�n tập tin bạn đã tải xuống và nhấn \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333
-#: views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "Cách thức Cài đặt trong Sunbird"
 
-#: views/elements/amo2009/install.thtml:331
-#: views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
-msgstr "<ol><li>Nhấn chuột phải liên kết bên dưới và ch�n \"Lưu Liên Kết dưới dạng...\" để tải xuống và lưu tập tin vào đĩa của bạn.</li><li>Trong Mozilla Thunderbird, mở Tiện ích từ trình đơn Công cụ.</li><li>Nhấn nút Cài đặt, và định vị/ch�n tập tin bạn đã tải xuống rồi nhấn \"OK\".</li></ol>"
+msgstr ""
+"<ol><li>Nhấn chuột phải liên kết bên dưới và ch�n \"Lưu Liên Kết dưới dạng..."
+"\" để tải xuống và lưu tập tin vào đĩa của bạn.</li><li>Trong Mozilla "
+"Thunderbird, mở Tiện ích từ trình đơn Công cụ.</li><li>Nhấn nút Cài đặt, và "
+"định vị/ch�n tập tin bạn đã tải xuống rồi nhấn \"OK\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330
-#: views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "Làm thế nào để Cài đặt trong Thunderbird"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "hiện các tiện ích đang thử nghiệm"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "Gá»­i Ä‘i"
 
-#: views/addons/plugins.thtml:63
-#: views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83
-#: views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103
-#: views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "Bởi"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "cho Linux"
 
-#: views/addons/plugins.thtml:108
-#: views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "cho Max OS X"
 
-#: views/addons/plugins.thtml:106
-#: views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "cho Windows"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
-msgstr "Trang này chỉ liệt kê một số phần bổ trợ thông dụng nhất. �ể có thêm thông tin v� các phần bổ trợ khác cho các Trình duyệt dựa trên Mozilla, hãy vào %1$s"
+msgstr ""
+"Trang này chỉ liệt kê một số phần bổ trợ thông dụng nhất. �ể có thêm thông "
+"tin v� các phần bổ trợ khác cho các Trình duyệt dựa trên Mozilla, hãy vào %1"
+"$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "�ang tìm một phần bổ trợ không được liệt kê tại đây?"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
-msgstr "Phần bổ trợ giúp trình duyệt của bạn thực hiện một số chức năng như xem các định dạng đồ h�a đặc biệt hoặc chơi các tập tin đa phương tiện. Phần bổ trợ hơi khác một chút so với phần mở rộng - những cái dùng để chỉnh sửa hoặc thêm tính năng cho những chức năng sẵn có."
+msgstr ""
+"Phần bổ trợ giúp trình duyệt của bạn thực hiện một số chức năng như xem các "
+"định dạng đồ h�a đặc biệt hoặc chơi các tập tin đa phương tiện. Phần bổ trợ "
+"hơi khác một chút so với phần mở rộng - những cái dùng để chỉnh sửa hoặc "
+"thêm tính năng cho những chức năng sẵn có."
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "Phần bổ trợ Thông dụng cho %1$s"
 
-#: controllers/components/amo.php:698
-#: controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "Phần bổ trợ"
 
-#: views/addons/plugins.thtml:68
-#: views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88
-#: views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110
-#: views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "Tài liệu Trợ giúp: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s yêu cầu bạn chấp thuận Th�a thuận Giấy phép Ngư�i dùng Cuối trước khi việc cài đặt có thể tiến hành:"
+msgstr ""
+"%s yêu cầu bạn chấp thuận Th�a thuận Giấy phép Ngư�i dùng Cuối trước khi "
+"việc cài đặt có thể tiến hành:"
 
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "Xem trÆ°á»›c cho %s"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "Vừa được Thêm"
-
-#: views/addons/recommended.thtml:51
-#: controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
-msgstr "Với nhi�u tiện ích tuyệt v�i hiện có, hẳn sẽ có gì đó cho từng ngư�i. �ể giúp bạn bắt đầu, đây là danh sách một số cái thông dụng. Hãy thử nhé!"
+msgstr ""
+"Với nhi�u tiện ích tuyệt v�i hiện có, hẳn sẽ có gì đó cho từng ngư�i. �ể "
+"giúp bạn bắt đầu, đây là danh sách một số cái thông dụng. Hãy thử nhé!"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "Tiện ích được Khuyên dùng"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "Tiện ích được Khuyên dùng"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "Tài nguyên Khác"
 
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Trung tâm Phát triển Mozilla"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
-msgstr "Xin lỗi, bạn cần một trình duyệt dựa trên Mozilla (như Firefox) để có thể cài đặt phần bổ trợ tìm kiếm."
+msgstr ""
+"Xin lỗi, bạn cần một trình duyệt dựa trên Mozilla (như Firefox) để có thể "
+"cài đặt phần bổ trợ tìm kiếm."
 
 #: views/addons/searchengines.thtml:49
 msgid "addons_searchengines_error_nojavascript"
-msgstr "JavaScript cần có để cài đặt phần bổ trợ, nhưng có vẻ như bạn đã vô hiệu hóa nó. Vui lòng kích hoạt JavaScript trước khi có ý định cài đặt bất kì phần bổ trợ tìm kiếm nào."
+msgstr ""
+"JavaScript cần có để cài đặt phần bổ trợ, nhưng có vẻ như bạn đã vô hiệu hóa "
+"nó. Vui lòng kích hoạt JavaScript trước khi có ý định cài đặt bất kì phần bổ "
+"trợ tìm kiếm nào."
 
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "H�c cách %1$s trên %2$s."
 
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/en/docs/Creating_OpenSearch_plugins_for_Firefox"
 
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "tự tạo cho mình một cái"
 
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "Duyệt qua các máy tìm kiếm tại %1$s"
 
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "Máy tìm kiếm"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
-msgstr "�ặc biệt cảm ơn Dự án Mycroft vì công việc của h� trong Máy tìm kiếm Firefox."
+msgstr ""
+"�ặc biệt cảm ơn Dự án Mycroft vì công việc của h� trong Máy tìm kiếm Firefox."
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 msgid "addons_share_button_text"
 msgstr "Chia sẻ cái này"
 
@@ -933,35 +764,29 @@ msgstr "Chia sẻ trên FriendFeed"
 msgid "addons_share_label_myspace"
 msgstr "�ăng lên MySpace"
 
-#: controllers/components/amo.php:201
-#: controllers/components/amo.php:229
+#: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
 msgstr "Bị vô hiệu hóa"
 
-#: controllers/components/amo.php:191
-#: controllers/components/amo.php:224
+#: controllers/components/amo.php:191 controllers/components/amo.php:224
 msgid "addons_status_incomplete"
 msgstr "Phiên bản Chưa hoàn thành"
 
-#: controllers/components/amo.php:197
-#: controllers/components/amo.php:227
+#: controllers/components/amo.php:197 controllers/components/amo.php:227
 msgid "addons_status_nominated"
 msgstr "Trong Hộp-cát; �� cử thành Công cộng"
 
-#: views/pages/js_constants.js.thtml:80
-#: controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "Trong Hộp-cát; �ang ch� �ánh giá"
 
-#: views/pages/js_constants.js.thtml:78
-#: controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "Công cộng"
 
-#: views/pages/js_constants.js.thtml:79
-#: controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "Trong Hộp-cát"
@@ -970,37 +795,29 @@ msgstr "Trong Hộp-cát"
 msgid "addons_status_unknown"
 msgstr "Không rõ"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "��c thêm v� tiện ích này"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "Tải xuống Nhi�u nhất"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "Xếp hạng Cao nhất"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "Hãy Cẩn Thận Với Phiên Bản Cũ"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
-msgstr "Những phiên bản này được hiện ra cho mục đích thử nghiệm và tham khảo. Bạn chỉ nên dùng phiên bản mới nhất của tiện ích này."
+msgstr ""
+"Những phiên bản này được hiện ra cho mục đích thử nghiệm và tham khảo. Bạn "
+"chỉ nên dùng phiên bản mới nhất của tiện ích này."
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
-msgstr "Lược sử Phiên bản cùng với Lưu kí Thay đổi"
+msgstr "Lịch sử Phiên bản cùng với Lưu kí Thay đổi"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
-msgstr "%1$s Lược sử Phiên bản"
+msgstr "%1$s Lịch sử Phiên bản"
 
 #: controllers/groups_controller.php:71
 msgid "admin_group_add_pagetitle"
@@ -1020,8 +837,7 @@ msgstr "Nhóm có định danh %s đã được xóa"
 msgid "admin_group_edit_pagetitle"
 msgstr "Chỉnh sửa Nhóm"
 
-#: controllers/groups_controller.php:92
-#: controllers/groups_controller.php:113
+#: controllers/groups_controller.php:92 controllers/groups_controller.php:113
 msgid "admin_group_error_invalid_id"
 msgstr "ID không phù hợp cho Nhóm"
 
@@ -1029,1364 +845,419 @@ msgstr "ID không phù hợp cho Nhóm"
 msgid "admin_group_pagetitle"
 msgstr "Quản trị Nhóm"
 
-#: controllers/groups_controller.php:77
-#: controllers/groups_controller.php:99
+#: controllers/groups_controller.php:77 controllers/groups_controller.php:99
 msgid "admin_group_saved"
 msgstr "Nhóm đã được lưu"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "Nâng cao"
 
-#: views/elements/amo2009/search.thtml:126
-#: views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
-msgstr "Bất kì lúc nào"
+msgstr "Bất cứ lúc nào"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110
-#: views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
-msgstr "Kiểu bất kì"
+msgstr "Bất cứ phần nào"
 
-#: views/elements/amo2009/search.thtml:275
-#: views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
-msgstr "Phiên bản bất kì"
+msgstr "Bất cứ phiên bản nào"
 
-#: views/elements/amo2009/search.thtml:217
-#: views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "Chương trình"
 
-#: views/elements/amo2009/search.thtml:143
-#: views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "Từ khóa Phù hợp"
 
-#: views/elements/amo2009/search.thtml:251
-#: views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
-msgstr "Cập nhật cuối"
+msgstr "Cập nhật Cuối"
 
-#: views/elements/amo2009/search.thtml:145
-#: views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "Tên"
 
-#: views/elements/amo2009/search.thtml:144
-#: views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "Mới nhất"
 
-#: views/elements/amo2009/search.thtml:130
-#: views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "3 tháng qua"
 
-#: views/elements/amo2009/search.thtml:131
-#: views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "6 tháng qua"
 
-#: views/elements/amo2009/search.thtml:127
-#: views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "Ngày qua"
 
-#: views/elements/amo2009/search.thtml:129
-#: views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "Tháng qua"
 
-#: views/elements/amo2009/search.thtml:128
-#: views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "Tuần qua"
 
-#: views/elements/amo2009/search.thtml:132
-#: views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "Năm qua"
 
-#: views/elements/amo2009/search.thtml:239
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
-msgstr "Má»—i trang"
+msgstr "Từng Trang"
 
-#: views/elements/amo2009/search.thtml:243
-#: views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "Hệ đi�u hành"
 
-#: views/elements/amo2009/search.thtml:147
-#: views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
-msgstr "Mức độ thông dụng"
+msgstr "Sự thông dụng"
 
-#: views/elements/amo2009/search.thtml:146
-#: views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "Xếp hạng"
 
-#: views/elements/amo2009/search.thtml:247
-#: views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
-msgstr "Sắp xếp theo"
+msgstr "Sắp theo"
 
-#: views/elements/amo2009/search.thtml:227
-#: views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "đến"
 
-#: views/elements/amo2009/search.thtml:257
-#: views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "Bật/Tắt chế độ tìm kiếm nâng cao"
 
-#: views/elements/amo2009/search.thtml:235
-#: views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "Kiểu"
 
-#: views/elements/amo2009/search.thtml:222
-#: views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "phiên bản"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "Tiếp"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "TrÆ°á»›c"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "B� qua việc kiểm tra phiên bản"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
-msgstr "Tiện ích này dành cho các phiên bản Firefox cũ"
+msgstr "Tiện ích này dành cho các phiên bản cũ hơn của Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
-msgstr "Bạn có thể <a href=\"%1$s\">thử dùng phiên bản cũ hơn</a> hoặc <a href=\"#\" onclick=\"%2$s\">b� qua việc kiểm tra này</a>"
+msgstr ""
+"Bạn có thể <a href=\"%1$s\">thử dùng phiên bản cũ hơn</a> hoặc <a href=\"#\" "
+"onclick=\"%2$s\">b� qua việc kiểm tra này</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "Có lẽ <a href=\"%1$s\">phiên bản cũ</a> chạy được"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
-msgstr "Tiện ích này yêu cầu phiên bản <a href=\"%1$s\">Firefox %2$s</a> chưa phát hành."
+msgstr ""
+"Tiện ích này yêu cầu phiên bản <a href=\"%1$s\">Firefox %2$s</a> chưa phát "
+"hành."
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
-msgstr "<a href=\"http://getfirefox.com\">Nâng cấp Firefox</a> để dùng tiện ích này"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s đã thay đổi trạng thái của %2$s thành %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s thực hiện thao tác quản trị chưa biết %2$s để ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s đã xóa tính năng %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s đã tạo chương trình %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s đã sửa đổi chương trình %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s đã tạo phiên bản %2$s cho %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s đã xóa phiên bản %2$s cho %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s đã thay đổi cấu hình '%2$s' từ  '%3$s' thành '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s thực hiện thao tác biên tập chưa biết %2$s để ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s đã xóa tiện ích %2$s kh�i danh sách khuyên dùng"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s đã thêm tiện ích %2$s vào danh sách khuyên dùng"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s đã thay đổi một tính năng cho bản địa %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s đã thay đổi bản địa cho tiện ích %2$s trên danh sách khuyên dùng"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s đã tính toán lại mã băm cho tập tin %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s thêm %2$s vào nhóm %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s kết hợp h� với %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s đã tạo nhóm %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s đã xóa nhóm %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s đã chỉnh sửa nhóm %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s đã xóa %2$s kh�i nhóm %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s thực hiện thao tác chưa biết %2$s đối với %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s đã cố gắng sửa đổi nhóm bị khóa %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s đã cố gắng sửa đổi bản dịch trong %2$s mà chưa được phép"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s đã tạo n�n tảng %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s đã xóa n�n tảng %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s đã chỉnh sửa n�n tảng %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s gặp thất bại khi xác thực lại để truy cập %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s đã tạo phản hồi %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s đã xóa phản hồi %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s đã chỉnh sửa phản hồi %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s đã chấp thuận đánh giá %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250
-#: controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s đã xóa đánh giá %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s thực hiện thao tác bảo mật chưa biết %2$s để ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s đã tạo nhãn %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s đã xóa phân mục %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s đã chỉnh sửa phân mục %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s đã cập nhật bản dịch ứng dụng cho %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s đã cập nhật bản dịch bài viết blog cho %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s đã cập nhật bản dịch n�n tảng cho %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s đã cập nhật bản dịch phân mục cho %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s đã chỉnh sửa thông tin ngư�i dùng của %2$s"
-
-#: controllers/addons_controller.php:1012
+msgstr ""
+"<a href=\"http://getfirefox.com\">Nâng cấp Firefox</a> để dùng tiện ích này"
+
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "Tiện ích xếp theo Tên"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "Tiện ích Mới nhất"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "Tiện ích Thông dụng"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "Tiện ích xếp theo Xếp hạng"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "Tiện ích được Cập nhật Gần đây"
 
-#: views/elements/categories.thtml:73
-#: views/elements/categories.thtml:82
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "Phân mục Hiện tại"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "Phân mục"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "Ch�n một phân mục"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "Xem tất cả %1$s"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "Mô tả phải ít hơn %1$s kí tự."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "Bộ sưu tập %s"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "Xem tất cả các Tiện ích được khuyên dùng"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "Gặp lỗi khi xóa tiện ích!"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "Xếp hạng Cao nhất Trước"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "Gặp lỗi khi lưu tiện ích!"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "Cập nhật Gần đây Trước"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "Gặp lỗi khi lưu bình luận!"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "Thông dụng nhất Trước"
 
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "Tên phải ít hơn %1$s kí tự."
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "Xem tất cả %1$s"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "Không tìm thấy bộ sưu tập!"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr "Nếu bạn đã biết tiện ích nào mà mình muốn thêm vào bộ sưu tập, chỉ cần gõ tên của chúng ở bên dưới. Nếu bạn muốn đợi và làm việc này sau, chỉ cần nhấn %1$s ngay bây gi�."
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "Ch�n các tiện ích đầu tiên của bạn"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "Tạo một Bộ sưu tập"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "Tiện ích �ã ch�n"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "Thật dễ dàng tạo ra bộ sưu tập các tiện ích của riêng bạn bằng cách đi�n vào các khung bên dưới."
-
-#: views/collections/add.thtml:92
-#: views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "Tạo mới Bộ sưu tập"
-
-#: views/pages/collector_faq.thtml:50
-#: views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47
-#: views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "Bộ sưu tập"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "Tìm hiểu Thêm"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "Thêm vào Ưa thích"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "Xóa kh�i Ưa thích"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr "<p>Bạn có thể xem bộ sưu tập mới của mình ở dưới. Nếu bạn muốn đặt một biệt hiệu, tải lên biểu tượng, hoặc thay đổi thiết lập phụ, vui lòng vào trang <a href='%1$s'>Quản lí Bộ sưu tập</a>.</p><p>Bộ sưu tập có thể được truy cập tại địa chỉ: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "Bộ sưu tập của bạn đã sẵn sàng!"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "Thông tin v� Bộ sưu tập này"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Tiện ích trong Bộ sưu tập"
-msgstr[1] "%1$s Tiện ích trong Bộ sưu tập"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>Tạo bởi:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>Cập nhật:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "Thêm vào Ưa thích&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "Xóa Ưa thích&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">�ăng nhập</a> để thêm bộ sưu tập này vào danh sách ưa thích của bạn."
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "Quản lí Bộ sưu tập"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "Ngày thêm"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "Tên"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "Thông dụng"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s lượt tải tuần này"
-msgstr[1] "%1$s lượt tải tuần này"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Các tiện ích đã ch�n sẽ bị xóa khi Lưu"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "�ể xuất bản các tiện ích mới vào bộ sưu tập này, hãy bắt đầu gõ tên của chúng ở bên dưới."
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "�ể xuất bản các tiện ích mới vào bộ sưu tập này, hãy nhập một danh sách ID Tiện ích được ngăn cách bởi dấu phẩy ở bên dưới."
-
-#: views/collections/edit.thtml:247
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "Bạn cũng có thể xuất bản một tiện ích từ trang liệt kê thông thư�ng của nó."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "�ã thêm %1$s bởi %2$s"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Thêm bình luận của ngư�i xuất bản"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Xóa bình luận của ngư�i xuất bản"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Chỉnh sửa bình luận của ngư�i xuất bản"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "Lưu ý: Bình luận sẽ xuất hiện như thể được viết bởi ngư�i xuất bản gốc vào ngày xuất bản"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Lưu bình luận"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Xóa"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "Thêm vào Bộ sưu tập"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "Kiểm tra Tính khả thi"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Có, tôi muốn xóa bộ sưu tập này."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Hãy ch�n hộp này, rồi nhấn \"%1$s\" để xóa bộ sưu tập này."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr "Ngay khi nhấn \"%1$s\" bên dưới, bộ sưu tập của bạn sẽ bị xóa. Nếu bạn không muốn xóa bộ sưu tập của mình, hãy b� ch�n hộp xác nhận trong thẻ \"%2$s\" và tiếp tục chỉnh sửa bộ sưu tập. Nếu bạn r�i trang này mà không lưu, bộ sưu tập cũng sẽ không bị xóa."
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "Bộ sưu tập của bạn sắp sửa bị xóa!"
-
-#: views/collections/add.thtml:76
-#: views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "Bạn phải cung cấp một mô tả cho bộ sưu tập của bạn."
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "Có một lỗi khi đang tải lên biểu tượng của bạn."
-
-#: views/collections/add.thtml:69
-#: views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "Bạn phải đặt tên cho bộ sưu tập."
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "Nếu bạn ch�n một biệt hiệu, nó phải là độc nhất."
-
-#: views/collections/add.thtml:93
-#: views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "Tên tiện ích:"
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "Chương trình Kết hợp"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "Ch�n chương trình mà bộ sưu tập của bạn hỗ trợ."
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Kiểu của Bộ sưu tập"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Xóa bộ sưu tập"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Xóa bộ sưu tập của bạn cũng sẽ xóa nó vĩnh viễn."
-
-#: views/collections/add.thtml:73
-#: views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "Mô tả Bộ sưu tập"
-
-#: views/collections/add.thtml:74
-#: views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "Mô tả ngắn g�n bộ sưu tập của bạn và kiểu tiện ích trong nó"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "Biểu tượng"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "Bạn có thể tải lên một biểu tượng JPG, GIF hoặc PNG, nó sẽ được chỉnh lại thành cỡ 32x32 điểm ảnh."
-
-#: views/collections/add.thtml:80
-#: views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "Ai có thể xem bộ sưu tập của bạn?"
-
-#: views/collections/add.thtml:81
-#: views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr "Mặc định, các bộ sưu tập xuất hiện trong Thư mục Bộ sưu tập và có thể được khám phá bởi bất kì ai. Nếu bạn muốn giới hạn bộ sưu tập của mình chỉ có thể được xem bởi những ngư�i được bạn đưa một liên kết đặc biệt, hãy ch�n tùy ch�n bên dưới."
-
-#: views/collections/add.thtml:84
-#: views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "Chỉ những ngư�i tôi m�i mới có thể xem bộ sưu tập của tôi"
-
-#: views/collections/add.thtml:83
-#: views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "M�i ngư�i đ�u có thể xem bộ sưu tập của tôi trong thư mục"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "Ai có thể quản lí bộ sưu tập của tôi?"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr "Những ngư�i dùng này có thể xuất bản các tiện ích vào bộ sưu tập của bạn, quản lí tất cả các tiện ích và thiết lập, và trao quy�n cho ngư�i dùng khác."
-
-#: views/collections/add.thtml:66
-#: views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "Tên bộ sưu tập"
-
-#: views/collections/add.thtml:67
-#: views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "�ặt một tên có tính mô tả cho bộ sưu tập, ví dụ như \"Tiện ích Du lịch Ưa thích của Mạnh Hùng\""
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "Biệt hiệu Bộ sưu tập"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Thêm vào đó, nên đặt một biệt hiệu riêng biệt cho bộ sưu tập của bạn để truy cập nhanh:"
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "Ai có thể xuất bản tiện ích vào bộ sưu tập của bạn?"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "Những ngư�i dùng này có thể xuất bản các tiện ích vào bộ sưu tập của bạn và xóa các tiện ích mà h� xuất bản."
-
-#: views/collections/edit.thtml:210
-#: views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "Nhập địa chỉ email của một tài khoản Tiện ích Firefox:"
-
-#: views/collections/edit.thtml:216
-#: views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Các tài khoản đã ch�n sẽ bị xóa ngay khi Lưu"
-
-#: views/collections/edit.thtml:215
-#: views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "Nhập một danh sách địa chỉ email tài khoản Tiện ích Firefox ngăn cách bởi dấu phẩy"
-
-#: views/collections/edit.thtml:204
-#: views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Chỉ mình tôi"
-
-#: views/collections/edit.thtml:205
-#: views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Tôi và những ngư�i dùng này:"
-
-#: views/collections/edit.thtml:211
-#: views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "Thêm"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "Quản lí %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "Quản lí Nội dung Bộ sưu tập"
-
-#: views/collections/edit.thtml:253
-#: views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "Tiện ích Hiện tại:"
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "Thiết lập Nâng cao"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "Quản lí Quy�n hạn Bộ sưu tập"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "Hủy b�"
-
-#: views/collections/edit.thtml:174
-#: views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "Xóa biểu tượng"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "Thay thế Biểu tượng"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "Biểu tượng sẽ bị xóa khi \"%1$s\" được nhấn bên dưới"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "Biệt hiệu Khả thi"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "Biệt hiệu của bạn chứa các kí tự không hợp lệ nên đã được sửa. Vui lòng thử lại."
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "Biệt hiệu �ã bị lấy"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "Bộ sưu tập của bạn có thể được truy cập tại địa chỉ này:"
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "Bộ sưu tập đã được lưu thành công!"
-
-#: views/collections/edit.thtml:169
-#: views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308
-#: views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "Cập nhật Bộ sưu tập"
-
-#: views/collections/edit.thtml:96
-#: views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "Xóa bộ sưu tập"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "Tiện ích"
-
-#: views/collections/edit.thtml:97
-#: views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "Nâng cao"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "Tên &amp; Chi tiết"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "Quy�n hạn"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "Trông chừng con cái và bộ lịch của bạn"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "Gia đình"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "Hãy thử Add-on Collector (Trình sưu tập Tiện ích)"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "Tạo một Bộ sưu tập"
-
-#: views/collections/detail.thtml:139
-#: views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "Gá»­i"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr "<p><strong>Bạn chưa có bộ sưu tập ưa thích nào.</strong></p> <p>Các bộ sưu tập mà bạn đánh dấu là ưa thích có thể được truy cập nhanh từ trang này, và sẽ xuất hiện trong <a href='%1$s'>Trình sưu tập Tiện ích</a> nếu bạn đã có cài đặt nó.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr "<p>Bạn chưa tạo bộ sưu tập nào. Các bộ sưu tập có thể dễ dàng được tạo và chứa đầy các tiện ích ưa thích của bạn.  <a href='%1$s'>Hãy thử ngay</a>!</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "Bộ sưu tập"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Trình sưu tập Tiện ích"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "tạo bởi %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "Bộ sưu tập là gì?"
-
-#: views/collections/detail.thtml:132
-#: views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "Sắp xếp theo"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "Lựa ch�n của Biên tập viên"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "Ưa thích của Tôi"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "Bộ sưu tập của Tôi"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "Thông dụng"
-
-#: views/search/collections.thtml:74
-#: controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "Thông dụng nhất từ trước đến nay"
-
-#: views/search/collections.thtml:72
-#: controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "Thông dụng nhất tháng này"
-
-#: views/search/collections.thtml:76
-#: controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "Mới nhất"
-
-#: views/search/collections.thtml:70
-#: controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "Thông dụng nhất tuần này"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr "Có một cách mới để quản lí và tìm các tiện ích ưa thích. Bình luận, chia sẻ và đồng bộ các bộ sưu tập, từ ngay trong trình duyệt của bạn"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "Các bộ sưu tập là nhóm gồm các tiện ích liên quan được kết hợp để chia sẻ dễ dàng."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "�ã thêm %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "Thực hiện nghiên cứu trực tuyến"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "Tham khảo"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "Quản lí mạng xã hội của bạn"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "Mạng xã hội"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "�óng"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "Một lỗi đã xảy ra khi đang cố thêm một bộ sưu tập ưa thích. Có phải bộ sưu tập này đã được đánh dấu là ưa thích rồi?"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "Không hiện thông báo này nữa."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "%1$s vừa được thêm vào danh sách bộ sưu tập ưa thích của bạn."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr "Bây gi� bạn có thể nhanh chóng tìm thấy bộ sưu tập này từ thẻ <a href=\"%1$s\">%2$s</a> trong thư mục. Nếu muốn theo dõi các bộ sưu tập ưa thích dễ dàng hơn, hãy thử phần mở rộng <a href=\"%3$s\">Trình sưu tập Tiện ích</a> cho Firefox."
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "Bộ sưu tập đã được xóa."
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "Lập kế hoạch cho những chuyến du ngoạn và kì nghỉ đáng nhớ"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "Du lịch"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "Tự động Xuất bản"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "Lựa ch�n của Biên tập viên"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "Bình thư�ng"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "Một lỗi đã xảy ra khi đang cố xóa một bộ sưu tập ưa thích. Có phải bộ sưu tập này vốn đã không nằm trong danh sách ưa thích?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s vừa bị xóa kh�i danh sách bộ sưu tập ưa thích của bạn."
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "Xây dựng trang web hoàn hảo"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "Phát triển Web"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "Bộ sưu tập là gì?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "��c FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr "Có một cách mới để quản lí và tìm các tiện ích ưa thích. Bình luận, chia sẻ và đồng bộ các bộ sưu tập, ngay trong trình duyệt của bạn."
-
-#: views/pages/collector_faq.thtml:61
-#: views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Trang chủ Trình sưu tập Tiện ích"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "Tải xuống Trình sưu tập Tiện ích:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116
-#: views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Biểu trưng Trình sưu tập Tiện ích"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "Trung tâm Tính tương thích Tiện ích"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
-msgstr "Sẵn sàng cho lần phát hành %1$s với các công cụ và thông tin cho cộng đồng Tiện �ch %2$s ở bên dưới."
+msgstr ""
+"Sẵn sàng cho lần phát hành %1$s với các công cụ và thông tin cho cộng đồng "
+"Tiện �ch %2$s ở bên dưới."
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "�ang tải dữ liệu..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "Trở v� Trang Chính"
 
-#: views/compatibility/dashboard.thtml:100
-#: views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "Báo cáo Tính tương thích Tiện ích"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "Thông tin cho Nhà phát triển Tiện ích"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "�i�u chỉnh maxVersion mà không cần tải lên"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "Kiểm tra Trạng thái của Tiện ích của Tôi"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
-msgstr "Nếu bạn có tiện ích được lưu trữ trên Tiện �ch Mozilla, <a href=\"%1$s\">vui lòng đăng nhập</a> để phân tích trạng thái tiện ích của bạn cho %2$s."
+msgstr ""
+"Nếu bạn có tiện ích được lưu trữ trên Tiện �ch Mozilla, <a href=\"%1$s\">vui "
+"lòng đăng nhập</a> để phân tích trạng thái tiện ích của bạn cho %2$s."
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Biểu trưng Trung tâm Nhà phát triển Mozilla"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "Bạn không có tiện ích nào được lưu trữ trên Tiện �ch Mozilla."
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "Kết quả Kiểm tra Trạng thái Tiện ích"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "�ang thu thập trạng thái của các tiện ích được lưu trữ..."
 
 #. %1$s is a number
-#. %2$s is an application name
+#. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s ngư�i dùng %2$s (%3$s&#37; trên tổng số)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "Các tiện ích bên dưới chiếm 95% số lượng sử dụng tiện ích của Mozilla và được sắp xếp theo khối lượng sử dụng."
+msgstr ""
+"Các tiện ích bên dưới chiếm 95% số lượng sử dụng tiện ích của Mozilla và "
+"được sắp xếp theo khối lượng sử dụng."
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "Hiển thị Báo cáo Chi tiết"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
-msgstr "Trong số %1$s tiện ích chiếm 95&#37; lượng sử dụng tiện ích của Mozilla, <b>%2$s&#37;</b> tương thích với các bản xây dựng hiện tại của %3$s."
+msgstr ""
+"Trong số %1$s tiện ích chiếm 95&#37; lượng sử dụng tiện ích của Mozilla, <b>%"
+"2$s&#37;</b> tương thích với các bản xây dựng hiện tại của %3$s."
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Phiên bản Alpha"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "Các tiện ích tương thích với phiên bản alpha của %1$s"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Phiên bản Beta"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
-msgstr "Các tiện ích tương thích với phiên bản beta hoặc ứng cử phát hành của %1$s"
+msgstr ""
+"Các tiện ích tương thích với phiên bản beta hoặc ứng cử phát hành của %1$s"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "Phiên bản Mới nhất"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "Các tiện ích cập nhật theo các bản xây dựng của %1$s"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "Phiên bản Khác"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "Các tiện ích không tương thích với bất kì phiên bản nào của %1$s"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "Báo cáo Tính tương thích Tiện ích"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144
-#: views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "Thông tin cho Ngư�i dùng Tiện ích"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "Hiển thị Báo cáo Tính tương thích"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
-msgstr "�ể biết thêm thông tin v� việc đóng góp, vui lòng xem %s."
+msgstr "�ể thêm thông tin v� sự đóng góp, vui lòng xem %s."
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "trang wiki"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
-msgstr "Mozilla gửi l�i cảm ơn đến những ngư�i sau vì sự đóng góp của h� cho dự án addons.mozilla.org trong các năm qua:"
+msgstr ""
+"Mozilla gửi l�i cảm ơn đến những ngư�i sau vì sự đóng góp của h� cho dự án "
+"addons.mozilla.org trong các năm qua:"
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "Nhà phát triển"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "Biên tập viên"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "Những ngư�i làm bản địa hóa"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "Những ngư�i đóng góp khác"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "Những nhà phát triển trước đây"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "Phần m�m và Hình ảnh"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
-msgstr "Một số biểu tượng được lấy từ <a href=\"http://www.famfamfam.com/lab/icons/silk/\">Bộ biểu tượng Lụa famfamfam</a>, được cấp phép theo <a href=\"http://creativecommons.org/licenses/by/2.5/\">Giấy phép Creative Commons Attribution 2.5</a>."
+msgstr ""
+"Một số biểu tượng được lấy từ <a href=\"http://www.famfamfam.com/lab/icons/"
+"silk/\">Bộ biểu tượng Lụa famfamfam</a>, được cấp phép theo <a href=\"http://"
+"creativecommons.org/licenses/by/2.5/\">Giấy phép Creative Commons "
+"Attribution 2.5</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 msgid "credits_software_timeplot"
-msgstr "Một số trang sử dụng các thành phần của <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a>, được cấp phép theo <a href=\"http://simile.mit.edu/license.html\">Giấy phép BSD</a>."
+msgstr ""
+"Một số trang sử dụng các thành phần của <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, được cấp phép theo <a href=\"http://simile.mit.edu/license."
+"html\">Giấy phép BSD</a>."
 
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124
-#: views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118
-#: views/collections/edit.thtml:325
-#: views/users/info.thtml:76
-#: views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68
-#: views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208
-#: views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5
-#: views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104
-#: views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75
-#: views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74
-#: views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54
-#: controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
+#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
+#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%e tháng %m năm %Y"
 
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 #: views/admin/addons_status.thtml:57
 msgid "datetime"
 msgstr "%e tháng %m năm %Y, %I:%M %p"
@@ -2414,22 +1285,22 @@ msgstr "Bảng Thống Kê"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 msgid "devcp_add_previews_extension_error"
 msgstr "Tập tin %1$s có đuôi mở rộng bất hợp lệ (%2$s). Các đuôi mở rộng được cho phép: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 msgid "devcp_add_previews_save_error"
 msgstr "Không thể lưu tập tin %s vào cơ sở dữ liệu. Vui lòng thử lại lần nữa."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 msgid "devcp_add_previews_success_replace"
 msgstr "Phần xem trước %1$s đã được thay thế bằng tập tin %2$s thành công."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 msgid "devcp_add_previews_success_upload"
 msgstr "Tập tin %s đã được tải lên thành công. Bạn có thể thêm tiêu đ� ở bên dưới."
 
@@ -2437,6 +1308,19 @@ msgstr "Tập tin %s đã được tải lên thành công. Bạn có thể thê
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(tự động ch�n)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"Phiên bản tiện ích này của bạn không cho thấy sự tương thích với Firefox %1"
+"$s. Mozilla đang chuẩn bị cho ra mắt phiên bản Firefox kế tiếp trong nay "
+"mai, cho nên vui lòng kiểm tra tiện ích của bạn trong phiên bản mới và cập "
+"nhật thông tin v� tính tương thích cho nó. Bạn có thể tìm hiểu thêm v� việc "
+"này <a href=\"%2$s\">tại đây</a>. �ây chỉ là một thông báo, bạn vẫn có thể "
+"tiếp tục gửi phiên bản này lên addons.mozilla.org."
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "Mở trong cửa sổ mới"
@@ -2473,70 +1357,145 @@ msgstr "Bước 5: Thành công"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "Trợ giúp Gửi lên"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "Tiện ích đã được vô hiệu hóa thành công"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "Chỉnh sửa Tiện ích"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "Tiện ích đã được kích hoạt thành công"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "Mô tả Tiện ích"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "EULA"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "Trang chủ Tiện ích"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "Tên của Tiện ích"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "Tiêu đ� xem trước"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "Chính sách Riêng tư"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "Tóm tắt v� Tiện ích"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "Email hỗ trợ"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "URL hỗ trợ"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "Chú ý Phiên bản"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "�� cử Tiện ích"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "Tiện ích đã được ứng cử thành công!"
+
+#: views/developers/addon_status.thtml:178
 msgid "devcp_addon_status_action_activate"
 msgstr "Kích hoạt"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 msgid "devcp_addon_status_action_activate_description"
-msgstr "Kích hoạt tiện ích của bạn để cho nó hiện lên trong phần liệt kê công cộng và kích hoạt dịch vụ kiểm tra cập nhật."
+msgstr ""
+"Kích hoạt tiện ích của bạn để cho nó hiện lên trong phần liệt kê công cộng và kích hoạt "
+"dịch vụ kiểm tra cập nhật."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 msgid "devcp_addon_status_action_complete"
 msgstr "Hoàn tất Tiện ích"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Hoàn tất tiện ích của bạn và di chuyển nó qua Hộp cát"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Ngừng kích hoạt"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "Ngừng kích hoạt tiện ích của bạn để ẩn nó kh�i tất cả danh sách liệt kê công cộng và vô hiệu hóa dịch vụ kiểm tra cập nhật."
+msgstr ""
+"Ngừng kích hoạt tiện ích của bạn để ẩn nó kh�i tất cả danh sách liệt kê công cộng và vô hiệu hóa "
+"dịch vụ kiểm tra cập nhật."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 msgid "devcp_addon_status_action_move"
 msgstr "Di chuyển vào Hộp cát"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 msgid "devcp_addon_status_action_move_description"
 msgstr "Di chuyển tiện ích của bạn trở lại Hộp cát. Việc này không thể đảo ngược được."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 msgid "devcp_addon_status_action_nominate"
 msgstr "�� cử ra Công cộng"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "�� cử tiện ích của bạn trở thành Công cộng"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 msgid "devcp_addon_status_action_public"
 msgstr "Chuyển thành Công cộng"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 msgid "devcp_addon_status_action_public_description"
 msgstr "Chuyển tiện ích của bạn thành Công cộng lần nữa."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 msgid "devcp_addon_status_active"
-msgstr "Tiện ích của bạn đang <span class=\"inactive-0\">Hoạt động</span>. �i�u này có nghĩa là tiệních của bạn đang hiện trong tất cả danh sách liệt kê phù hợp với trạng thái của nó ở trên."
+msgstr ""
+"Tiện ích của bạn đang <span class=\"inactive-0\">Hoạt động</span>. �i�u này có nghĩa là tiện"
+"ích của bạn đang hiện trong tất cả danh sách liệt kê phù hợp với trạng thái của nó ở trên."
 
 #: views/developers/addon_status.thtml:111
 msgid "devcp_addon_status_completion_disabled"
-msgstr "Vui lòng đi�n đầy đủ các tiêu chí ở trên trước khi bạn hoàn tất tiện ích của mình và di chuyển nó vào <span class=\"status-1\">Hộp cát</span>."
+msgstr ""
+"Vui lòng đi�n đầy đủ các tiêu chí ở trên trước khi bạn hoàn tất tiện ích của mình và "
+"di chuyển nó vào <span class=\"status-1\">Hộp cát</span>."
 
 #: views/developers/addon_status.thtml:108
 msgid "devcp_addon_status_completion_enabled"
-msgstr "Bây gi� bạn có thể hoàn tất tiện ích và di chuyển nó vào <span class=\"status-1\">Hộp cát</span> bằng cách nhấn lên nút bên dưới."
+msgstr ""
+"Bây gi� bạn có thể hoàn tất tiện ích và di chuyển nó vào <span class=\"status-1"
+"\">Hộp cát</span> bằng cách nhấn lên nút bên dưới."
 
 #: views/developers/addon_status.thtml:102
 msgid "devcp_addon_status_criteria_category"
@@ -2550,7 +1509,7 @@ msgstr "Cần có Mô tả Tiện ích"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Cần có Tên của Tiện ích"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Tiện ích không được đánh dấu là phát-hành-thử."
 
@@ -2558,6 +1517,10 @@ msgstr "Tiện ích không được đánh dấu là phát-hành-thử."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "�t nhất cần có một ảnh xem trước cho phần mở rộng và giao diện."
 
+#: views/developers/addon_status.thtml:120
+msgid "devcp_addon_status_criteria_review"
+msgstr "Một số bài đánh giá của ngư�i dùng v� tiện ích (có thể dùng bài bên ngoài)."
+
 #: views/developers/addon_status.thtml:100
 msgid "devcp_addon_status_criteria_summary"
 msgstr "Cần có Tóm tắt Tiện ích"
@@ -2567,12 +1530,12 @@ msgstr "Cần có Tóm tắt Tiện ích"
 msgid "devcp_addon_status_header"
 msgstr "Trạng thái Tiện ích: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 msgid "devcp_addon_status_header_actions"
 msgstr "Thao tác Khả thi"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 msgid "devcp_addon_status_header_active"
 msgstr "Trạng thái Hoạt động: <span class=\"inactive-0\">Hoạt động</span>"
 
@@ -2580,7 +1543,7 @@ msgstr "Trạng thái Hoạt động: <span class=\"inactive-0\">Hoạt động<
 msgid "devcp_addon_status_header_criteria"
 msgstr "Tiêu chí Hoàn tất Tiện ích"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 msgid "devcp_addon_status_header_inactive"
 msgstr "Trạng thái Hoạt động: <span class=\"inactive-1\">Im lìm</span>"
 
@@ -2588,21 +1551,29 @@ msgstr "Trạng thái Hoạt động: <span class=\"inactive-1\">Im lìm</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Tiêu chí �� cử Công cộng"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trạng thái Tin cậy: <span class=\"status-4\">�áng tin</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 msgid "devcp_addon_status_inactive"
-msgstr "Tiện ích của bạn đang <span class=\"inactive-1\">Im lìm</span>. �i�u này có nghĩa là tiện ích của bạn sẽ không hiện trong bất kì liệt kê nào, liên quan đến trạng thái của nó ở trên. Các bản cập nhật sẽ <b>không</b> được cung cấp cho tiện ích của bạn thông qua dịch vụ kiểm tra cập nhật."
+msgstr ""
+"Tiện ích của bạn đang <span class=\"inactive-1\">Im lìm</span>. �i�u này có nghĩa là "
+"tiện ích của bạn sẽ không hiện trong bất kì liệt kê nào, liên quan đến trạng thái của nó ở trên. "
+"Các bản cập nhật sẽ <b>không</b> được cung cấp cho tiện ích của bạn thông qua dịch vụ "
+"kiểm tra cập nhật."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 msgid "devcp_addon_status_nominate_disabled"
-msgstr "Vui lòng đi�n đầy đủ tiêu chí ở trên trước khi đ� cử tiện ích của bạn trở thành <span class=\"status-4\">Công cộng</span>."
+msgstr ""
+"Vui lòng đi�n đầy đủ tiêu chí ở trên trước khi đ� cử tiện ích của bạn trở thành "
+"<span class=\"status-4\">Công cộng</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 msgid "devcp_addon_status_nominate_enabled"
-msgstr "Bây gi� bạn có thể đ� cử tiện ích của mình trở thành <span class=\"status-4\">Công cộng</span> bằng cách nhấn vào nút bên dưới."
+msgstr ""
+"Bây gi� bạn có thể đ� cử tiện ích của mình trở thành <span class=\"status-4\">Công cộng</span> "
+"bằng cách nhấn vào nút bên dưới."
 
 #: views/developers/addon_status.thtml:64
 msgid "devcp_addon_status_public"
@@ -2615,30 +1586,50 @@ msgstr "Hộp cát"
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
 msgid "devcp_addon_status_switch_disabled"
-msgstr "Tiện ích của bạn đã bị <span class=\"status-5\">Vô hiệu hóa</span> bởi một quản trị viên và không thể sử dụng được. Nếu có thắc mắc, vui lòng email tới %s."
+msgstr ""
+"Tiện ích của bạn đã bị <span class=\"status-5\">Vô hiệu hóa</span> bởi một quản trị viên "
+"và không thể sử dụng được. Nếu có thắc mắc, vui lòng email tới %s."
 
 #: views/developers/addon_status.thtml:67
 msgid "devcp_addon_status_switch_incomplete"
-msgstr "Tiện ích của bạn hiện tại đang <span class=\"status-0\">Dang dở</span>. �i�u này có nghĩa là tiện ích của bạn không hiện trên bất kì mục nào của site hoặc dịch vụ kiểm tra cập nhật. Bạn có thể vào trang này để hoàn tất tiện ích của bạn sau khi nó đạt đủ tiêu chí bên dưới cho việc hoàn tất và di chuyển vào <span class=\"status-1\">Hộp cát</span>."
+msgstr ""
+"Tiện ích của bạn hiện tại đang <span class=\"status-0\">Dang dở</span>. �i�u này "
+"có nghĩa là tiện ích của bạn không hiện trên bất kì mục nào của site hoặc dịch vụ "
+"kiểm tra cập nhật. Bạn có thể vào trang này để hoàn tất tiện ích của bạn sau khi nó "
+"đạt đủ tiêu chí bên dưới cho việc hoàn tất và di chuyển vào <span class="
+"\"status-1\">Hộp cát</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
 msgid "devcp_addon_status_switch_nominated"
-msgstr "Tiện ích của bạn hiện đang được đ� cử để trở thành <span class=\"status-4\">Công cộng</span> và đang ch� đánh giá của biên tập viên. Hiện đang có %s tiện ích khác trong danh sách ch� đ� cử."
+msgstr ""
+"Tiện ích của bạn hiện đang được đ� cử để trở thành <span class=\"status-4"
+"\">Công cộng</span> và đang ch� đánh giá của biên tập viên. Hiện đang có %s tiện ích "
+"khác trong danh sách ch� đ� cử."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
 msgid "devcp_addon_status_switch_pending"
-msgstr "Tiện ích của bạn đang bị kẹt. �áng nhẽ đi�u này không thể xảy ra. Vui lòng email tới %s với ID tiện ích của bạn và thông báo lỗi này."
+msgstr ""
+"Tiện ích của bạn đang bị kẹt. �áng nhẽ đi�u này không thể xảy ra. Vui lòng email tới %s với "
+"ID tiện ích của bạn và thông báo lỗi này."
 
 #: views/developers/addon_status.thtml:85
 msgid "devcp_addon_status_switch_public"
-msgstr "Tiện ích của bạn đang là <span class=\"status-4\">Công cộng</span>, có nghĩa là nó sẽ hiện trong tất cả liệt kê và tìm kiếm và có thể được tải xuống mà không bị giới hạn. Các bản cập nhật được cung cấp tới tiện ích của bạn thông qua dịch vụ kiểm tra cập nhật."
+msgstr ""
+"Tiện ích của bạn đang là <span class=\"status-4\">Công cộng</span>, có nghĩa là nó sẽ "
+"hiện trong tất cả liệt kê và tìm kiếm và có thể được tải xuống mà không bị "
+"giới hạn. Các bản cập nhật được cung cấp tới tiện ích của bạn thông qua dịch vụ "
+"kiểm tra cập nhật."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
 msgid "devcp_addon_status_switch_sandbox"
-msgstr "Tiện ích của bạn đang nằm trong <span class=\"status-1\">Hộp cát</span>, có nghĩa là nó sẽ hiện trong liệt kê và tìm kiếm, nhưng ngư�i dùng phải đăng nhập để tải nó xuống. Các bản cập nhật <b>không</b> được cung cấp tới tiện ích của bạn thông qua dịch vụ kiểm tra cập nhật."
+msgstr ""
+"Tiện ích của bạn đang nằm trong <span class=\"status-1\">Hộp cát</span>, có nghĩa là "
+"nó sẽ hiện trong liệt kê và tìm kiếm, nhưng ngư�i dùng phải đăng nhập để tải nó "
+"xuống. Các bản cập nhật <b>không</b> được cung cấp tới tiện ích của bạn thông qua dịch vụ "
+"kiểm tra cập nhật."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
@@ -2647,9 +1638,120 @@ msgstr "Tiện ích của bạn đang nằm trong <span class=\"status-1\">Hộp
 msgid "devcp_addon_status_title"
 msgstr "Trạng thái %s"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 msgid "devcp_addon_status_trusted"
-msgstr "Tiện ích của bạn là <span class=\"status-4\">�áng tin</span>. �i�u này có nghĩa là bạn có thể gửi lên các bản cập nhật cho tiện ích của mình mà không cần đánh giá của biên tập viên."
+msgstr ""
+"Tiện ích của bạn là <span class=\"status-4\">�áng tin</span>. �i�u này có nghĩa là bạn có thể "
+"gửi lên các bản cập nhật cho tiện ích của mình mà không cần đánh giá của biên tập viên."
+
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr ""
+"Vào trang %1$s để thay đổi những gì bạn gửi lên, hoặc %2$s để trở lại Công "
+"cụ Nhà phát triển."
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "nhấn vào đây"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "Chỉnh sửa Tiện ích"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"Phiên bản này đã được đưa vào hộp cát trong khi ch� đợi sự đánh giá của "
+"những ngư�i kiểm tra hộp cát và một ngư�i biên tập Tiện ích của Mozilla. Bạn "
+"sẽ được thông báo qua e-mail sau khi m�i thứ đã được kiểm tra."
+
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "Bạn có thể đ�c thêm v� Hệ Thống �ánh Giá Hộp Cát %s."
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "tại đây"
+
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"Phiên bản này đã được đưa vào hộp cát để những ngư�i có kinh nghiệm dùng "
+"thử. �ể nó được hiện trên trang công cộng, bạn phải %s tiện ích của bạn và "
+"ch� cho xong quá trình đánh giá."
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "ứng cử"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "Việc gửi lên tiện ích của bạn đã thực hiện thành công."
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr ""
+"Vì tiện ích của bạn đã được tin tưởng, nên phiên bản này được chấp thuận tự "
+"động để đưa sang khu vực công cộng."
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "Gửi Tiện �ch"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "Tiện ích đã được cập nhật thành công"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "Có thể bạn sẽ muốn %s để tăng sự quan tâm đối với tiện ích của bạn."
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "tải lên một phiên bản để xem trước"
+
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "không tìm thấy tác giả [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "Xóa"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "Hủy b�"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "Bạn có chắc bạn muốn hủy b� việc gửi lên?"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "Tiếp"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "Thay đổi kiểu tiện ích:"
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "Bình luận của Nhà phát triển đã được cập nhật."
 
 #: views/developers/dashboard.thtml:68
 msgid "devcp_dashboard_active"
@@ -2669,7 +1771,9 @@ msgstr "Thay đổi Trạng thái"
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
 msgid "devcp_dashboard_disabled_questions"
-msgstr "Tiện ích của bạn đã bị vô hiệu hóa bởi một quản trị viên và không thể dùng được.  Nếu bạn có thắc mắc, vui lòng email tới %s."
+msgstr ""
+"Tiện ích của bạn đã bị vô hiệu hóa bởi một quản trị viên và không thể dùng được.  Nếu bạn "
+"có thắc mắc, vui lòng email tới %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
@@ -2695,7 +1799,9 @@ msgstr "Chỉnh sửa lần cuối vào %s"
 
 #: views/developers/dashboard.thtml:111
 msgid "devcp_dashboard_learn"
-msgstr "Bạn hiện không có tiện ích nào được lưu trữ trên Tiện ích Mozilla. �ể tìm hiểu v� cách thức quy trình hoạt động và gửi lên tiện ích đầu tiên của bạn, hãy nhấn vào nút Bắt �ầu ở dưới."
+msgstr ""
+"Bạn hiện không có tiện ích nào được lưu trữ trên Tiện ích Mozilla. �ể tìm hiểu v� cách thức "
+"quy trình hoạt động và gửi lên tiện ích đầu tiên của bạn, hãy nhấn vào nút Bắt �ầu ở dưới."
 
 #: views/developers/dashboard.thtml:112
 msgid "devcp_dashboard_start"
@@ -2710,33 +1816,175 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Tải lên một phiên bản mới"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 msgid "devcp_delete_previews_error"
 msgstr "Không thể xóa phần xem trước %s kh�i cơ sở dữ liệu. Vui lòng thử lại lần nữa."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 msgid "devcp_delete_previews_success"
 msgstr "Phần xem trước %s đã được xóa thành công."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 msgid "devcp_delete_version_priv_error"
 msgstr "Bạn không có thẩm quy�n xóa các phiên bản hoặc tập tin."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s tập tin %2$s"
 msgstr[1] "%1$s tập tin %2$s"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "Thêm hình ảnh xem trước"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "Tác giả"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "Tác giả"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "Không"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "Phân mục"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "Phân mục"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "Mô tả"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "Bị vô hiệu hóa"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "Chi tiết"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "Bình luận của Nhà phát triển"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "Xem trÆ°á»›c"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "Phiên bản"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "Trang chủ"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "Không"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "Không tiêu đ�"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "Không có phần xem trước."
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "Cập nhật"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "Email hỗ trợ"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "Không có email hỗ trợ của nhà phát triển."
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "URL hỗ trợ"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "Không có url hỗ trợ của nhà phát triển."
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "�ược tin tưởng"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "Phiên bản %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "Không tìm thấy phiên bản nào."
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "Hủy b� và quay trở lại"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "�úng, vô hiệu hóa nó"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "Bạn có chắc bạn muốn vô hiệu hóa tiện ích này?"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"Vô hiệu hóa tiện ích này sẽ ẩn nó khi tìm kiếm và liệt kê. Không thể tải nó "
+"xuống từ trang web và trình duyệt sẽ không hiện nó khi kiểm tra các cập "
+"nhật. Tiện ích rồi cũng sẽ bị xóa, mặc dù vậy bạn vẫn có thể quay lại đây và "
+"kích hoạt lại khi bạn muốn."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "Vô hiệu hóa %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "�úng, kích hoạt nó"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "Bạn có chắc bạn muốn kích hoạt tiện ích này?"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"Kích hoạt tiện ích này sẽ cho phép nó được hiện ra khi tìm kiếm và liệt kê. "
+"Nó có thể được tải xuống từ trang web và trình duyệt."
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "Kích hoạt %s"
+
 #: views/developers/discuss.thtml:68
 msgid "devcp_discuss_addreply_header"
 msgstr "Thêm Trả L�i"
@@ -2749,12 +1997,15 @@ msgstr "Trả l�i"
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
 msgid "devcp_discuss_error_notice"
-msgstr "Có lỗi khi đang lưu trả l�i của bạn. Vui lòng liên hệ %1$s v� vấn đ� này."
+msgstr ""
+"Có lỗi khi đang lưu trả l�i của bạn. Vui lòng liên hệ %1$s v� vấn đ� này."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
 msgid "devcp_discuss_intro"
-msgstr "Một Biên tập viên của Tiện ích Mozilla yêu cầu thêm thông tin v� phiên bản %2$s của tiện ích %1$s của bạn."
+msgstr ""
+"Một Biên tập viên của Tiện ích Mozilla yêu cầu thêm thông tin v� "
+"phiên bản %2$s của tiện ích %1$s của bạn."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
@@ -2768,86 +2019,101 @@ msgstr "Gửi Trả L�i"
 
 #: views/developers/discuss.thtml:72
 msgid "devcp_discuss_success_message"
-msgstr "Trả l�i của bạn đã được lưu thành công. Những ngư�i tham gia vào thảo luận sẽ được thông báo qua email."
+msgstr ""
+"Trả l�i của bạn đã được lưu thành công. Những ngư�i tham gia vào thảo luận sẽ được thông báo qua email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
-#: views/developers/discuss.thtml:52
-#: views/developers/discuss.thtml:62
+#: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
 msgid "devcp_discuss_writtenby"
 msgstr "được viết bởi %1$s vào %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "Thêm Tác Giả"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "�ịa chỉ Email của Tác giả"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "Xóa"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 msgid "devcp_edit_authors_add_author"
 msgstr "Thêm Tác Giả Mới"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Thêm Tác Giả"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 msgid "devcp_edit_authors_add_email"
 msgstr "Email Tài khoản Tác giả:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 msgid "devcp_edit_authors_add_loading"
 msgstr "Kiểm tra email tài khoản..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_edit_authors_click_save"
 msgstr "Nhấn nút Cập nhật Tác giả bên dưới để lưu."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 msgid "devcp_edit_authors_header_current"
 msgstr "Tác giả Hiện tại"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 msgid "devcp_edit_authors_header_manage"
 msgstr "Quản lí Tác giả Tiện ích"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "Liệt kê là tác giả trong trang hiển thị công cộng"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 msgid "devcp_edit_authors_label_developer"
-msgstr "<strong>Nhà phát triển</strong> - Có thể quản lí tất cả khía cạnh của việc liệt kê tiện ích, ngoại trừ việc thêm và xóa các tác giả khác."
+msgstr ""
+"<strong>Nhà phát triển</strong> - Có thể quản lí tất cả khía cạnh của việc liệt kê tiện ích, ngoại trừ việc thêm và xóa các tác giả khác."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 msgid "devcp_edit_authors_label_owner"
-msgstr "<strong>Ngư�i sở hữu</strong> - Có thể quản lí tất cả khía cạnh của việc liệt kê tiện ích, bao gồm cả việc thêm và xóa các tác giả khác."
+msgstr ""
+"<strong>Ngư�i sở hữu</strong> - Có thể quản lí tất cả khía cạnh của việc liệt kê tiện ích, bao gồm cả việc thêm và xóa các tác giả khác."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 msgid "devcp_edit_authors_label_viewer"
-msgstr "<strong>Ngư�i quan sát</strong> - Có thể xem thống kê và danh sách liệt kê các nhà phát triển tiện ích nhưng không thể thay đổi bất kì mục nào."
+msgstr ""
+"<strong>Ngư�i quan sát</strong> - Có thể xem thống kê và danh sách liệt kê các nhà phát triển tiện ích nhưng không thể thay đổi bất kì mục nào."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 msgid "devcp_edit_authors_select_role"
 msgstr "Ch�n một vai trò cho tác giả:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 msgid "devcp_edit_authors_th_author"
 msgstr "Tác giả"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 msgid "devcp_edit_authors_th_listed"
 msgstr "Liệt kê"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 msgid "devcp_edit_authors_th_role"
 msgstr "Vai trò"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 msgid "devcp_edit_authors_update_author"
 msgstr "Cập nhật tác giả"
 
@@ -2884,7 +2150,8 @@ msgstr "Không có phân mục nào cho chương trình và kiểu tiện ích n
 
 #: views/developers/addon_edit_categories.thtml:86
 msgid "devcp_edit_categories_other"
-msgstr "Chỉ đặt tiện ích của bạn vào phân mục này nếu nó không phù hợp với bất kì phân mục nào."
+msgstr ""
+"Chỉ đặt tiện ích của bạn vào phân mục này nếu nó không phù hợp với bất kì phân mục nào."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
@@ -2897,65 +2164,72 @@ msgstr "Thêm hoặc xóa những ngÆ°á»�i dùng có quyá»�n quản lí tiện Ã
 
 #: views/developers/addon_edit.thtml:49
 msgid "devcp_edit_dd_manage_categories"
-msgstr "Ch�n phân mục tương ứng cho mỗi chương trình mà tiện ích của bạn hỗ trợ."
+msgstr ""
+"Ch�n phân mục tương ứng cho mỗi chương trình mà tiện ích của bạn hỗ trợ."
 
 #: views/developers/addon_edit.thtml:51
 msgid "devcp_edit_dd_manage_description"
-msgstr "Thêm hoặc sửa đổi các bản dịch cho các phần chính sách riêng tư, giấy phép, ngư�i dùng cuối, mô tả và tóm tắt cho tiện ích của bạn."
+msgstr ""
+"Thêm hoặc sửa đổi các bản dịch cho các phần chính sách riêng tư, giấy phép, ngư�i dùng cuối, mô tả và tóm tắt cho tiện ích của bạn."
 
 #: views/developers/addon_edit.thtml:53
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Thay đổi tên, trang chủ, biểu tượng, và các c� hiệu khác cho tiện ích của bạn."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 msgid "devcp_edit_description_button_update"
 msgstr "Cập nhật Mô tả"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 msgid "devcp_edit_description_correct_error"
 msgstr "Vui lòng sửa các lỗi được đánh dấu màu đ� ở trên."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 msgid "devcp_edit_descriptions_header"
 msgstr "Chỉnh sửa Mô tả Tiện ích"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 msgid "devcp_edit_descriptions_transbox_comments_description"
-msgstr "Bất kì thông tin nào có thể ngư�i dùng cuối muốn biết mà không phù hợp để đưa vào mô tả hoặc tóm tắt của tiện ích. Thông thư�ng dùng cho việc bao gồm thông tin v� các lỗi lớn đã biết, cách báo lỗi, ngày phát hành dự kiến của phiên bản mới, v.v.."
+msgstr ""
+"Bất kì thông tin nào có thể ngư�i dùng cuối muốn biết mà không phù hợp để đưa vào mô tả hoặc tóm tắt của tiện ích. Thông thư�ng dùng cho việc bao gồm thông tin v� các lỗi lớn đã biết, cách báo lỗi, ngày phát hành dự kiến của phiên bản mới, v.v.."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Bình luận của Nhà phát triển"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 msgid "devcp_edit_descriptions_transbox_description_description"
-msgstr "Mô tả của tiện ích là l�i giải thích rõ ràng hơn v� các tính năng, và các thông tin liên quan khác. Nó được hiển thị ngay dưới phần tóm tắt trên trang giới thiệu tiện ích."
+msgstr ""
+"Mô tả của tiện ích là l�i giải thích rõ ràng hơn v� các tính năng, và các thông tin liên quan khác. Nó được hiển thị ngay dưới phần tóm tắt trên trang giới thiệu tiện ích."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Mô tả Tiện ích"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 msgid "devcp_edit_descriptions_transbox_eula_description"
-msgstr "Nếu tiện ích của bạn có một Th�a thuận Giấy phép Ngư�i dùng Cuối (EULA), vui lòng nhập văn bản của nó ở dưới. Nếu được thiết lập, ngư�i dùng sẽ được yêu cầu phải đồng ý nó trước khi cài đặt tiện ích của bạn. Vui lòng lưu ý là EULA không giống giấy phép mã nguồn như GPL hoặc MPL."
+msgstr ""
+"Nếu tiện ích của bạn có một Th�a thuận Giấy phép Ngư�i dùng Cuối (EULA), vui lòng nhập văn bản của nó ở dưới. Nếu được thiết lập, ngư�i dùng sẽ được yêu cầu phải đồng ý nó trước khi cài đặt tiện ích của bạn. Vui lòng lưu ý là EULA không giống giấy phép mã nguồn như GPL hoặc MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "Th�a thuận Giấy phép Ngư�i dùng Cuối"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 msgid "devcp_edit_descriptions_transbox_privacy_description"
-msgstr "Nếu tiện ích của bạn có một chính sách riêng tư, vui lòng nhập văn bản của nó ở đây. Trang giới thiệu tiện ích của bạn sẽ hiển thị một liên kết đến chính sách đó."
+msgstr ""
+"Nếu tiện ích của bạn có một chính sách riêng tư, vui lòng nhập văn bản của nó ở đây. Trang giới thiệu tiện ích của bạn sẽ hiển thị một liên kết đến chính sách đó."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Chính sách Riêng tư"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 msgid "devcp_edit_descriptions_transbox_summary_description"
-msgstr "Tóm tắt là một đoạn giải thích ngắn v� chức năng cơ bản của tiện ích của bạn, sẽ được hiển thị trong tìm kiếm và liệt kê, cũng như � trên đầu trang giới thiệu tiện ích của bạn. <strong>Giới hạn 250 kí tự.</strong>"
+msgstr ""
+"Tóm tắt là một đoạn giải thích ngắn v� chức năng cơ bản của tiện ích của bạn, sẽ được hiển thị trong tìm kiếm và liệt kê, cũng như � trên đầu trang giới thiệu tiện ích của bạn. <strong>Giới hạn 250 kí tự.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Tóm tắt Tiện ích"
 
@@ -2975,170 +2249,249 @@ msgstr "Quản lí Mô tả Tiện ích"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Quản lí Thuộc tính Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "Không có phân mục nào cho kiểu tiện ích này."
+
+#: controllers/developers_controller.php:2419
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Truy�n tải không hoàn tất"
+
+#: controllers/developers_controller.php:2420
+msgid "devcp_edit_file_error_no"
+msgstr "Không có tập tin nào được tải lên"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+msgid "devcp_edit_file_error_size"
+msgstr "Vượt quá dung lượng tải lên tối đa"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "Tác giả"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "Thêm Biểu Tượng"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "Thay đổi Biểu tượng"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "Cho phép ngư�i dùng xem tập tin nguồn trực tuyến"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "Phân mục"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "Bản địa Mặc định"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "Tiện ích này yêu cầu có phần m�m bên ngoài"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "Chỉ xóa biểu tượng sẵn có"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "Tập tin Biểu tượng Mới"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "Biểu tượng"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "Thông tin Bản địa Bổ sung"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "�ây là bản phát hành thử"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "�ây là tiện ích liên quan đến trang web"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "�ịa danh �ích"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "thông tin bổ sung ngắn g�n (như là tên phương ngữ)"
+
+#: views/developers/addon_edit_properties.thtml:211
 msgid "devcp_edit_properties_button_update"
 msgstr "Cập nhật Thuộc tính"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 msgid "devcp_edit_properties_change_guid"
 msgstr "Chỉ thay đổi nếu bạn đã hiểu rõ tất cả hậu quả."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 msgid "devcp_edit_properties_current_icon"
 msgstr "Biểu tượng Hiện tại"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 msgid "devcp_edit_properties_default_locale"
-msgstr "Bản địa mặc định của một tiện ích là bản địa chính cần có bản dịch. Nếu không có các bản dịch cho ngôn ngữ của ngư�i dùng, chúng sẽ tự động dùng bản địa mặc định này."
+msgstr ""
+"Bản địa mặc định của một tiện ích là bản địa chính cần có bản dịch. Nếu không có các bản dịch cho ngôn ngữ của ngư�i dùng, chúng sẽ tự động dùng bản địa mặc định này."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 msgid "devcp_edit_properties_flags"
 msgstr "Các c� hiệu này dùng để l�c và phân loại các tiện ích."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 msgid "devcp_edit_properties_guid"
-msgstr "GUID tiện ích của bạn được chỉ định trong install.rdf và dùng để nhận dạng riêng nó. Bạn không thể thay GUID một khi nó đã được liệt kê trên Tiện ích Mozilla."
+msgstr ""
+"GUID tiện ích của bạn được chỉ định trong install.rdf và dùng để nhận dạng riêng nó. Bạn không thể thay GUID một khi nó đã được liệt kê trên Tiện ích Mozilla."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 msgid "devcp_edit_properties_header"
 msgstr "Chỉnh sửa Thuộc tính Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Kiểu của Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Quản trị Thiết lập"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Bản địa Mặc định"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 msgid "devcp_edit_properties_header_flags"
 msgstr "C� hiệu Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 msgid "devcp_edit_properties_header_guid"
 msgstr "GUID Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 msgid "devcp_edit_properties_header_icon"
 msgstr "Biểu tượng Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Thiết lập Khác"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Tiện ích �áng tin?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 msgid "devcp_edit_properties_header_view_source"
 msgstr "Hiển thị Mã nguồn Trực tuyến"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 msgid "devcp_edit_properties_icon"
-msgstr "Biểu tượng tiện ích là một hình nh� được hiển thị bên cạnh tên tiện ích của bạn trong kết quả tìm kiếm, trang giới thiệu, và trong hộp thoại cài đặt. Hình này sẽ tự động được sửa kích thước thành 32 x 32 pixel.  Vui lòng dùng một trong các kiểu hình ảnh sau: %s"
+msgstr ""
+"Biểu tượng tiện ích là một hình nh� được hiển thị bên cạnh tên tiện ích của bạn trong kết quả tìm kiếm, trang giới thiệu, và trong hộp thoại cài đặt. Hình này sẽ tự động được sửa kích thước thành 32 x 32 pixel.  Vui lòng dùng một trong các kiểu hình ảnh sau: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 msgid "devcp_edit_properties_label_binary"
 msgstr "Tiện ích này chứa các thành phần nhị phân"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Không đáng tin"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 msgid "devcp_edit_properties_label_trusted"
 msgstr "�áng tin"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 msgid "devcp_edit_properties_new_icon"
 msgstr "Biểu tượng Mới"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Xóa Biểu tượng"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 msgid "devcp_edit_properties_transbox_homepage_description"
-msgstr "Nếu tiện ích của bạn có trang chủ khác, hãy nhập địa chỉ của nó vào đây. Thêm bản dịch khác là không cần thiết trừ khi trang web của bạn được dịch sang các ngôn ngữ khác."
+msgstr ""
+"Nếu tiện ích của bạn có trang chủ khác, hãy nhập địa chỉ của nó vào đây. Thêm bản dịch khác là không cần thiết trừ khi trang web của bạn được dịch sang các ngôn ngữ khác."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Trang chủ Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "Tên tiện ích của bạn được hiển thị ở m�i nơi mà nó được liệt kê."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Tên của Tiện ích"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 msgid "devcp_edit_properties_transbox_supportemail_description"
-msgstr "Nếu bạn có một địa chỉ email để hỗ trợ, nhập nó vào đây. Thêm các bản dịch khác là không cần thiết trừ khi bạn có các địa chỉ email khác cho các ngôn ngữ khác."
+msgstr ""
+"Nếu bạn có một địa chỉ email để hỗ trợ, nhập nó vào đây. Thêm các bản dịch khác là không cần thiết trừ khi bạn có các địa chỉ email khác cho các ngôn ngữ khác."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "�ịa chỉ Email Hỗ trợ"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 msgid "devcp_edit_properties_transbox_supporturl_description"
-msgstr "Nếu tiện ích của bạn có diễn đàn hoặc trang web hỗ trợ, hãy nhập nó vào đây. Thêm bản dịch khác là không cần thiết trừ khi trang web của bạn được dịch sang các ngôn ngữ khácI."
+msgstr ""
+"Nếu tiện ích của bạn có diễn đàn hoặc trang web hỗ trợ, hãy nhập nó vào đây. Thêm bản dịch khác là không cần thiết trừ khi trang web của bạn được dịch sang các ngôn ngữ khácI."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Trang web Hỗ trợ"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 msgid "devcp_edit_properties_trusted"
 msgstr "Các tiện ích đáng tin có thể trở thành công cộng mà không cần đánh giá của Biên tập viên."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 msgid "devcp_edit_properties_undelete"
 msgstr "Biểu tượng sẽ bị xóa khi lưu. <a %s>Hủy b�?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 msgid "devcp_edit_properties_view_source"
-msgstr "Mã nguồn các tập tin tiện ích của bạn có thể được xem trực tuyến bởi bất kì ngư�i dùng nào nếu bạn muốn."
+msgstr ""
+"Mã nguồn các tập tin tiện ích của bạn có thể được xem trực tuyến bởi bất kì ngư�i dùng nào nếu bạn muốn."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Cho phép xem mã nguồn trực tuyến"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Không cho phép xem mã nguồn trực tuyến"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "Cập nhật"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">tên địa danh "
+"đơn giản</a>, như là 'vi-VN'"
+
 #: views/elements/developers/editbox.thtml:46
 msgid "devcp_editbox_authors"
 msgstr "Tác giả"
@@ -3214,14 +2567,69 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "Các bản cập nhật �ang xem xét (%s)"
 msgstr[1] "Các bản cập nhật �ang xem xét (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "Tập tin đã đánh dấu sẽ bị xóa."
+
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "Tập tin"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "Chương trình �ích"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "Không có tập tin nào."
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "Chú ý đối với Ngư�i đánh giá"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "Cập nhật"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "Bạn không có quy�n truy nhập tiện ích đó."
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"Tóm tắt có giới hạn tối đa 250 kí tự.\n"
+"(Bạn đã nhập %s)"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"Tên cho tiện ích này đã tồn tại trong cơ sở dữ liệu. Vui lòng chắc chắn "
+"rằng: <br /><li>GUIDs của bạn đã khớp. Nguyên nhân thông dụng nhất của lỗi "
+"này là vì GUIDs không khớp.</li><li>Bạn không thể có một mục bị trùng trong "
+"cơ sở dữ liệu. Nếu như vậy, bạn phải cập nhật mục đó hoặc xóa nó và thử lại."
+"</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3235,21 +2643,28 @@ msgstr "Vui lòng xem %s để tham khảo."
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "trang này"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "Tiện ích của bạn phải có ít nhất một ngư�i sở hữu."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "Vui lòng mô tả các thay đổi trong lần cập nhật này."
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
 msgid "devcp_error_file_exists"
-msgstr "Một phiên bản của tiện ích đó đã tồn tại. �ể thay thế nó, bạn phải xóa tập tin %1$S trước."
+msgstr ""
+"Một phiên bản của tiện ích đó đã tồn tại. �ể thay thế nó, bạn phải xóa tập tin %1$S trước."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "Phần mở rộng tập tin (%s) không được cho phép đối với kiểu tiện ích đã ch�n. Vui lòng dùng một trong các đuôi sau: %s"
+msgstr ""
+"Phần mở rộng tập tin (%s) không được cho phép đối với kiểu tiện ích đã ch�n. "
+"Vui lòng dùng một trong các đuôi sau: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "Tất cả GUIDs tập tin chưa khớp"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3281,9 +2696,18 @@ msgstr "Không có tập tin nào được tải lên"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "Phần mở rộng tập tin (%s) không được phép dùng cho biểu tượng. Vui lòng dùng trong các đuôi sau: %s"
+msgstr ""
+"Phần mở rộng tập tin (%s) không được phép dùng cho biểu tượng. Vui lòng dùng "
+"trong các đuôi sau: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "Một phiên bản giống hệt tiện ích với n�n tảng này (%s) đã tồn tại."
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "Không có install.rdf."
 
@@ -3291,7 +2715,7 @@ msgstr "Không có install.rdf."
 msgid "devcp_error_install_manifest"
 msgstr "Tìm thấy những lỗi sau trong install.rdf:"
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "Vui lòng ch�n một kiểu tiện ích hợp lệ."
 
@@ -3314,15 +2738,21 @@ msgstr "�ịnh danh của tiện ích này không hợp lệ: %s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%s không phải là phiên bản hợp lệ cho %s: các phiên bản nh� nhất không được để dấu *"
+msgstr ""
+"%s không phải là phiên bản hợp lệ cho %s: các phiên bản nh� nhất không được "
+"để dấu *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
-msgstr "Phiên bản của tiện ích này không hợp lệ: vui lòng xem <a href=\"http://developer.mozilla.org/en/docs/Toolkit_version_format\">chi tiết kĩ thuật</a>"
+msgstr ""
+"Phiên bản của tiện ích này không hợp lệ: vui lòng xem <a href=\"http://"
+"developer.mozilla.org/en/docs/Toolkit_version_format\">chi tiết kĩ thuật</a>"
 
 #: controllers/components/developers.php:531
 msgid "devcp_error_invalid_version_spaces"
-msgstr "Phiên bản của tiện ích này không hợp lệ: phiên bản không được chứa khoảng trắng."
+msgstr ""
+"Phiên bản của tiện ích này không hợp lệ: phiên bản không được chứa khoảng "
+"trắng."
 
 #. %s is an error message from the parser.
 #: controllers/components/developers.php:501
@@ -3357,6 +2787,18 @@ msgstr "Không tìm thấy định danh cho tiện ích này trong install.rdf."
 msgid "devcp_error_no_platform"
 msgstr "N�n tảng chưa được ch�n"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "Bạn phải cung cấp các chi tiết được yêu cầu để đ� cử."
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "Bạn không thể đ� cử một tiện ích được phát hành thử."
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "Bạn chỉ có thể đ� cử các tiện ích hiện có trong hộp cát."
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "Vui lòng thêm ít nhất một phân mục."
@@ -3370,92 +2812,306 @@ msgstr "Tiện ích này cần có ít nhất một tác giả."
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "Phần mở rộng tập tin (%s) không được phép cho tính năng xem trước. Vui lòng sử dụng một trong các đuôi sau: %s"
+msgstr ""
+"Phần mở rộng tập tin (%s) không được phép cho tính năng xem trước. Vui lòng "
+"sử dụng một trong các đuôi sau: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "Lỗi xảy ra khi đang cố gắng lưu dữ liệu của bạn."
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "Bạn không có quy�n cập nhật tiện ích này."
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
-msgstr "Tiện ích không thể dùng Khóa cập nhật. Vui lòng xóa trong install.rdf và thử lại."
+msgstr ""
+"Tiện ích không thể dùng Khóa cập nhật. Vui lòng xóa trong install.rdf và thử "
+"lại."
 
 #: controllers/components/developers.php:506
 msgid "devcp_error_updateurl"
-msgstr "Tiện ích không thể dùng URL cập nhật bên ngoài. Vui lòng xóa kh�i install.rdf và thử lại."
+msgstr ""
+"Tiện ích không thể dùng URL cập nhật bên ngoài. Vui lòng xóa kh�i install."
+"rdf và thử lại."
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "Vui lòng tải lên một tập tin."
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "Thêm một Tập tin N�n tảng Khác"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "Thêm Tác Giả"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "Xóa"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "Phân mục cho kiểu tiện ích của bạn sẽ hiện hữu trong bước tiếp theo."
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "Không có phân mục nào cho kiểu tiện ích này."
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "Vui lòng nhập mô tả cho tiện ích của bạn."
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "Vui lòng nhập tên cho tiện ích của bạn."
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "Vui lòng ch�n kiểu cho tiện ích bạn gửi lên."
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "Vui lòng nhập tóm tắt cho tiện ích của bạn."
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "Tập tin Tiện ích"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "Tập tin Tiện ích 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "Tập tin Tiện ích 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "Kiểu của Tiện ích"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "Cho phép ngư�i dùng xem tập tin nguồn trực tuyến"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "�ịa chỉ Email của Tác giả"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "Tác giả"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "Phân mục"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "Bản địa Mặc định"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "Mô tả"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "Th�a thuận Giấy phép Ngư�i dùng Cuối  (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "Tiện ích này yêu cầu có phần m�m bên ngoài"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "Tập tin"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "Trang chủ"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "Tập tin Biểu tượng"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "Tên"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "N�n tảng được Hỗ trợ"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "�ây là bản phát hành thử"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "Chính sách Riêng tư"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "�ây là tiện ích liên quan đến trang web"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "Tóm tắt"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "Email Hỗ Trợ"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "URL Hỗ Trợ"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "Ứng dụng �ích"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "Phiên bản"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "Ghi chú Phiên bản"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "Không"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "Ghi chú cho Ngư�i đánh giá"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr ""
+"Bởi vì tiện ích của bạn được tin tưởng, vui lòng ch�n nơi hiển thị phiên bản "
+"này:"
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "Công cộng"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "Hộp cát"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "Th�a thuận Nhà phát triển"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "BÆ°á»›c 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "Tải lên Tập tin"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "BÆ°á»›c 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "Chi tiết v� Tiện ích"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "BÆ°á»›c 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "Chi tiết v� Phiên bản"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "BÆ°á»›c 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "Bản địa hóa"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "BÆ°á»›c 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "Thành công"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "Tiện ích của Tôi"
+
+#: views/developers/uploader.thtml:101
 msgid "devcp_input_upload_file"
 msgstr "Tải lên Tập tin"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 msgid "devcp_js_a_cancel"
 msgstr "Hủy b�"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 msgid "devcp_js_add_email"
 msgstr "Vui lòng nhập email tài khoản của tác giả mà bạn muốn thêm vào."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 msgid "devcp_js_img_move_down"
-msgstr "Chuyển Xuống"
+msgstr "Di chuyển Xuống"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 msgid "devcp_js_img_move_up"
-msgstr "Chuyển Lên"
+msgstr "Di chuyển Lên"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 msgid "devcp_js_img_remove_compat"
 msgstr "Xóa Tính tương thích Chương trình"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 msgid "devcp_js_input_list_author"
 msgstr "Liệt kê tác giả trong phần liệt kê công khai"
 
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "Vui lòng ch�n một giấy phép."
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "Vui lòng nhập văn bản cho giấy phép của bạn."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 msgid "devcp_js_option_developer"
 msgstr "Nhà phát triển"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 msgid "devcp_js_option_owner"
 msgstr "Ngư�i sở hữu"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 msgid "devcp_js_option_viewer"
 msgstr "Ngư�i quan sát"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 msgid "devcp_js_remove_author"
 msgstr "Xóa Tác Giả"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 msgid "devcp_js_sure_remove"
 msgstr "Bạn có <strong>chắc</strong> là bạn muốn xóa tác giả này không?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 msgid "devcp_js_upload_alert"
 msgstr "Bạn phải ch�n một tập tin để tải lên."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "Giấy phép tùy biến cho tiện ích %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "Các phần được Bản địa hóa"
@@ -3464,15 +3120,19 @@ msgstr "Các phần được Bản địa hóa"
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
-msgstr "Một số phần trên trang này được bản địa hóa để hiển thị theo ngôn ngữ địa phương của ngư�i dùng. Vui lòng ch�n một địa danh bên dưới để chỉnh sửa chi tiết tiện ích của bạn trong ngôn ngữ đó. Nếu bản dịch cho địa danh đó không tồn tại, nó sẽ hiển thị theo địa danh mặc định đã ch�n (%s)."
+msgstr ""
+"Một số phần trên trang này được bản địa hóa để hiển thị theo ngôn ngữ địa "
+"phương của ngư�i dùng. Vui lòng ch�n một địa danh bên dưới để chỉnh sửa chi "
+"tiết tiện ích của bạn trong ngôn ngữ đó. Nếu bản dịch cho địa danh đó không "
+"tồn tại, nó sẽ hiển thị theo địa danh mặc định đã ch�n (%s)."
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "Công cụ Quản trị"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "Công cụ Biên tập"
 
@@ -3481,72 +3141,103 @@ msgid "devcp_myaddons_link"
 msgstr "Tiện ích của Tôi"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "Trở lại Trang Chính"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "Bảng Thống Kê"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "Gửi Tiện �ch"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "Công cụ Nhà phát triển"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 msgid "devcp_new_addon_error"
-msgstr "ID tiện ích này (%1$s) đã tồn tại trong cơ sở dữ liệu. Nếu đây là tiện ích của mình, bạn có thể <a href=\"%2$s\">tải lên một phiên bản mới</a>."
+msgstr ""
+"ID tiện ích này (%1$s) đã tồn tại trong cơ sở dữ liệu. Nếu đây là tiện ích của mình, bạn có thể <a href=\"%2$s\">tải lên một phiên bản mới</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
 msgid "devcp_nominate_cancel"
 msgstr "Hủy b� và quay trở lại"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "Trở lại phần chi tiết tiện ích"
+
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "�� cử %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "Tự động dò kiểu tiện ích: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 msgid "devcp_notice_changes_error"
-msgstr "<span>Một hoặc nhi�u thay đổi của bạn đã không được lưu.</span><br />Vui lòng xem lỗi ở dưới. Các thay đổi còn lại của bạn đã được lưu thành công."
+msgstr ""
+"<span>Một hoặc nhi�u thay đổi của bạn đã không được lưu.</span><br />Vui lòng xem "
+"lỗi ở dưới. Các thay đổi còn lại của bạn đã được lưu thành công."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 msgid "devcp_notice_changes_saved"
-msgstr "<span>Các thay đổi của bạn đã được lưu.</span><br />Vui lòng lưu ý rằng một số thay đổi có thể mất vài gi� mới xuất hiện trên tất cả khu vực của trang web."
+msgstr ""
+"<span>Các thay đổi của bạn đã được lưu.</span><br />Vui lòng lưu ý rằng một số "
+"thay đổi có thể mất vài gi� mới xuất hiện trên tất cả khu vực của trang web."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
-msgstr "Xóa hình ảnh xem trước này sẽ đưa hình khác thành hình ảnh xem trước mặc định."
+msgstr ""
+"Xóa hình ảnh xem trước này sẽ đưa hình khác thành hình ảnh xem trước mặc "
+"định."
+
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"Bản địa mặc định cho tiện ích này (%1$s [%2$s]) khác với bản địa đã ch�n của "
+"bạn (%3$s [%4$s]). Các phần sau nên được hoàn tất trong %1$s."
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
-msgstr "�ưa cái này lên thành hình ảnh mặc định sẽ xóa b� trạng thái mặc định của hình ảnh xem trước mặc định đang dùng."
+msgstr ""
+"�ưa cái này lên thành hình ảnh mặc định sẽ xóa b� trạng thái mặc định của "
+"hình ảnh xem trước mặc định đang dùng."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 msgid "devcp_notice_unsaved_changes"
 msgstr "Bạn có các thay đổi chưa lưu."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3575,55 +3266,62 @@ msgstr "Chỉnh sửa Ảnh xem trước"
 msgid "devcp_preview_updated_successfully"
 msgstr "Ảnh xem trước được cập nhật thành công."
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 msgid "devcp_previews_a_another"
 msgstr "Thêm Hình ảnh Xem trước Khác"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 msgid "devcp_previews_a_delete"
 msgstr "Xóa Hình ảnh Xem trước"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 msgid "devcp_previews_a_replace"
 msgstr "Thay thế Hình ảnh Xem trước"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 msgid "devcp_previews_a_update"
 msgstr "Cập nhật Hình ảnh Xem trước"
 
-#: views/developers/previews.thtml:115
-#: views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 msgid "devcp_previews_add_new"
 msgstr "Thêm Hình ảnh Xem trước Mới"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 msgid "devcp_previews_add_select"
-msgstr "Ch�n một hình để tải lên. Các hình lớn hơn kích thước tối đa 700 pixel chi�u rộng và 525 pixel chi�u cao sẽ bị chỉnh lại. Các kiểu tập tin cho phép: %s"
+msgstr ""
+"Ch�n một hình để tải lên. Các hình lớn hơn kích thước tối đa 700 pixel chi�u rộng và 525 pixel chi�u cao sẽ bị chỉnh lại. Các kiểu tập tin cho phép: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 msgid "devcp_previews_click_below"
 msgstr "Nhấn Cập nhật Hình ảnh Xem trước để tải lên."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 msgid "devcp_previews_click_update"
-msgstr "Nhấn nút Cập nhật Hình ảnh Xem trước để lưu hình này. (<a %s>Hủy b�?</a>)"
+msgstr ""
+"Nhấn nút Cập nhật Hình ảnh Xem trước để lưu hình này. (<a %s>Hủy b�?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 msgid "devcp_previews_error_message"
-msgstr "Hình xem trước này sẽ bị xóa khi Cập nhật Hình ảnh Xem trước được nhấn. (<a %s>Hủy b�?</a>)"
+msgstr ""
+"Hình xem trước này sẽ bị xóa khi Cập nhật Hình ảnh Xem trước được nhấn. (<a %"
+"s>Hủy b�?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
-msgstr "Dùng biểu mẫu bên dưới để tải lên một ảnh chụp PNG, JPG, hoặc GIF của tiện ích của bạn. Các hình ảnh rộng hơn 700 pixel và cao hơn 525 pixel sẽ tự động được đi�u chỉnh kích thước."
+msgstr ""
+"Dùng biểu mẫu bên dưới để tải lên một ảnh chụp PNG, JPG, hoặc GIF của tiện "
+"ích của bạn. Các hình ảnh rộng hơn 700 pixel và cao hơn 525 pixel sẽ tự động "
+"được đi�u chỉnh kích thước."
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "Thêm ảnh Xem trước"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 msgid "devcp_previews_header_caption"
 msgstr "Tiêu đ� Ảnh xem Trước"
 
@@ -3631,7 +3329,7 @@ msgstr "Tiêu đ� Ảnh xem Trước"
 msgid "devcp_previews_header_edit"
 msgstr "Chỉnh sửa Ảnh xem trước"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 msgid "devcp_previews_label_default"
 msgstr "Ảnh xem trước Mặc định"
 
@@ -3639,30 +3337,30 @@ msgstr "Ảnh xem trước Mặc định"
 msgid "devcp_previews_label_file"
 msgstr "Tập tin Ảnh xem trước"
 
-#: views/previews/add.thtml:59
-#: views/previews/edit.thtml:50
+#: views/previews/add.thtml:59 views/previews/edit.thtml:50
 msgid "devcp_previews_label_makedefault"
 msgstr "�ưa ảnh này thành hình ảnh xem trước mặc định"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 msgid "devcp_previews_label_new"
 msgstr "Hình mới:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 msgid "devcp_previews_label_upload"
 msgstr "Tải lên Hình xem trước: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 msgid "devcp_previews_notice_error"
 msgstr "Một hoặc nhi�u hình xem trước mới của bạn không thể lưu được."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 msgid "devcp_previews_notice_success"
 msgstr "Hình xem trước của bạn đã được cập nhật thành công."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 msgid "devcp_previews_p_screenshots"
-msgstr "Hình ảnh xem trước của tiện ích của bạn được hiển thị bên dưới. Bạn có thể thay đổi tiêu đ� hoặc hình ảnh. Hình xem trước Mặc định là hình được hiển thị bên canh tiện ích của bạn trong liệt kê và tìm kiếm."
+msgstr ""
+"Hình ảnh xem trước của tiện ích của bạn được hiển thị bên dưới. Bạn có thể thay đổi tiêu đ� hoặc hình ảnh. Hình xem trước Mặc định là hình được hiển thị bên canh tiện ích của bạn trong liệt kê và tìm kiếm."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3680,31 +3378,47 @@ msgstr "Chỉnh sửa Ảnh xem trước"
 msgid "devcp_previews_submit_upload"
 msgstr "Tải lên Ảnh xem trước"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 msgid "devcp_previews_thumbnail"
 msgstr "Hình thu nh�"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 msgid "devcp_previews_title"
 msgstr "Quản lí Hình xem trước %s"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "Không đúng?"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "Bạn có chắc bạn muốn xóa tập tin này?"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
-msgstr "Vui lòng xem lại và chấp thuận Th�a thuận Nhà phát triển trước khi tiến hành."
+msgstr ""
+"Vui lòng xem lại và chấp thuận Th�a thuận Nhà phát triển trước khi tiến hành."
 
 #: views/elements/developers/rolecheck.thtml:42
 msgid "devcp_rolecheck_no_privs"
-msgstr "<span>Bạn không có đủ quy�n để tạo ra thay đổi trên trang này.</span><br />Liên hệ Ngư�i sở hữu Tiện ích nếu bạn muốn tạo ra thay đổi."
+msgstr ""
+"<span>Bạn không có đủ quy�n để tạo ra thay đổi trên trang này.</"
+"span><br />Liên hệ Ngư�i sở hữu Tiện ích nếu bạn muốn tạo ra thay đổi."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 msgid "devcp_several_hours"
-msgstr "Vui lòng lưu ý rằng một số thay đổi có thể mất vài gi� mới xuất hiện trên tất cả khu vực của trang web."
+msgstr ""
+"Vui lòng lưu ý rằng một số thay đổi có thể mất vài gi� mới xuất hiện trên tất cả khu vực của trang web."
 
 #: views/elements/developers/sidebar.thtml:52
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Bảng �i�u Khiển"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "B� qua việc cập nhật thông tin cho tiện ích hiện tại của tôi"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -3728,7 +3442,8 @@ msgstr "<em>%s</em> Số lượt tải Hàng tuần"
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active"
-msgstr "�ánh dấu tiện ích này là hoạt động sẽ cho nó hiển thị trong những khu vực công cộng phù hợp với trạng thái của nó, bao gồm liệt kê và tìm kiếm. Nó có thể được tải xuống từ trang web và quay trở lại trong việc kiểm tra cập nhật trên máy khách, tùy vào trạng thái của nó. Bạn có thể trở lại đây và vô hiệu hóa nó lần nữa nếu muốn."
+msgstr ""
+"�ánh dấu tiện ích này là hoạt động sẽ cho nó hiển thị trong những khu vực công cộng phù hợp với trạng thái của nó, bao gồm liệt kê và tìm kiếm. Nó có thể được tải xuống từ trang web và quay trở lại trong việc kiểm tra cập nhật trên máy khách, tùy vào trạng thái của nó. Bạn có thể trở lại đây và vô hiệu hóa nó lần nữa nếu muốn."
 
 #: views/developers/addon_status_confirm.thtml:59
 msgid "devcp_status_confirm_active_sure"
@@ -3740,7 +3455,8 @@ msgstr "Bạn có chắc không?"
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive"
-msgstr "�ánh dấu tiện ích này là im lìm sẽ không cho nó hiển thị trong bất kì khu vực công cộng nào, bao gồm liệt kê và tìm kiếm. Nó sẽ không thể được tải xuống từ trang web và sẽ không được quay trở lại trong việc kiểm tra cập nhật trên máy khách. Bạn có thể trở lại đây và kích hoạt nó nếu muốn."
+msgstr ""
+"�ánh dấu tiện ích này là im lìm sẽ không cho nó hiển thị trong bất kì khu vực công cộng nào, bao gồm liệt kê và tìm kiếm. Nó sẽ không thể được tải xuống từ trang web và sẽ không được quay trở lại trong việc kiểm tra cập nhật trên máy khách. Bạn có thể trở lại đây và kích hoạt nó nếu muốn."
 
 #: views/developers/addon_status_confirm.thtml:55
 msgid "devcp_status_confirm_inactive_sure"
@@ -3752,7 +3468,8 @@ msgstr "Không, hủy b�"
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public"
-msgstr "�ánh dấu tiện ích này là công cộng sẽ làm nó hiện hữu để m�i ngư�i tải và sẽ bắt đầu cung cấp các cập nhật cho ngư�i dùng hiện tại."
+msgstr ""
+"�ánh dấu tiện ích này là công cộng sẽ làm nó hiện hữu để m�i ngư�i tải và sẽ bắt đầu cung cấp các cập nhật cho ngư�i dùng hiện tại."
 
 #: views/developers/addon_status_confirm.thtml:67
 msgid "devcp_status_confirm_public_sure"
@@ -3760,7 +3477,8 @@ msgstr "Bạn có chắc là bạn muốn Ä‘Æ°a tiện ích này thành công cá
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox"
-msgstr "Di chuyển tiện ích này trở lại hộp cát sẽ yêu cầu ngư�i dùng phải đăng nhập trước khi tải xuống và cập nhật sẽ không còn được cung cấp cho ngư�i dùng hiện tại. Vì tiện ích của bạn hiện đang là công cộng, bạn có thể trở lại đây vào bất kì lúc nào để chuyển nó thành công cộng."
+msgstr ""
+"Di chuyển tiện ích này trở lại hộp cát sẽ yêu cầu ngư�i dùng phải đăng nhập trước khi tải xuống và cập nhật sẽ không còn được cung cấp cho ngư�i dùng hiện tại. Vì tiện ích của bạn hiện đang là công cộng, bạn có thể trở lại đây vào bất kì lúc nào để chuyển nó thành công cộng."
 
 #: views/developers/addon_status_confirm.thtml:63
 msgid "devcp_status_confirm_sandbox_sure"
@@ -3772,168 +3490,220 @@ msgstr "Có, tôi chắc chắn"
 
 #: views/developers/addon_status_nominate.thtml:46
 msgid "devcp_status_nominate_error_notice"
-msgstr "<span>Cần có thông điệp đ� cử.</span><br />Vui lòng đi�n vào hộp văn bản thông tin được yêu cầu và thử lại."
+msgstr ""
+"<span>Cần có thông điệp đ� cử.</span><br />Vui lòng đi�n vào hộp "
+"văn bản thông tin được yêu cầu và thử lại."
 
 #: views/developers/addon_status_nominate.thtml:55
 msgid "devcp_status_nominate_header"
 msgstr "�� cử Tiện ích"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr ""
+"Việc gửi lên tiện ích hiện đang bị vô hiệu hóa. Vui lòng kiểm tra lại sau."
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "Tôi Chấp Thuận"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "Tôi Từ Chối"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "Tiện ích này bị vô hiệu hóa bởi quản trị viên."
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "Bị vô hiệu hóa"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "Tin cậy"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "Phiên bản Gần nhất:"
 
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "Bạn không có tiện ích nào. Nhấn %s để gửi lên một cái."
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "vào đây"
+
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "Vui lòng nhớ %s cho giao diện của bạn."
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "tải lên một ảnh xem trước"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 msgid "devcp_title_edit_addon"
 msgstr "Chỉnh sửa %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_a_title_help"
 msgstr "Trợ giúp (không r�i trang)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 msgid "devcp_transbox_alt_help"
 msgstr "Trợ giúp"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 msgid "devcp_transbox_chars_used"
 msgstr "Kí tự đã dùng: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 msgid "devcp_transbox_delete_sure"
 msgstr "Bạn có chắc là bạn muốn xóa bản dịch này không?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 msgid "devcp_transbox_help_header_tabs"
 msgstr "Các thẻ %s là gì?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 msgid "devcp_transbox_help_header_what"
 msgstr "Nếu tôi không có bất kì bản dịch nào thì sao?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 msgid "devcp_transbox_help_hide"
 msgstr "Ẩn Trợ giúp"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 msgid "devcp_transbox_help_if"
-msgstr "Nếu một ngư�i dùng duyệt xem một site và không có bản dịch cho ngôn ngữ của ngư�i đó, nó sẽ dùng Bản địa Mặc định của tiện ích của bạn, được xác định trong khu vực Chỉnh sửa Thuộc tính Tiện ích. Nếu không có bản dịch nào, chỉ cần nhập những gì mà bạn muốn vào Bản địa Mặc định, vốn phải là ngôn ngữ mà bạn nói."
+msgstr ""
+"Nếu một ngư�i dùng duyệt xem một site và không có bản dịch cho ngôn ngữ của ngư�i đó, nó sẽ dùng Bản địa Mặc định của tiện ích của bạn, được xác định trong khu vực Chỉnh sửa Thuộc tính Tiện ích. Nếu không có bản dịch nào, chỉ cần nhập những gì mà bạn muốn vào Bản địa Mặc định, vốn phải là ngôn ngữ mà bạn nói."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 msgid "devcp_transbox_help_transbox"
-msgstr "�ây là một <i>Hộp Dịch Thuật</i>. Nó cho phép bạn bản địa hóa một trư�ng xác định thành các ngôn ngữ khác mà bạn có bản dịch. Bạn có thể thêm, chỉnh sửa, và xóa các bản dịch bằng cách dùng thẻ bản địa."
+msgstr ""
+"�ây là một <i>Hộp Dịch Thuật</i>. Nó cho phép bạn bản địa hóa một trư�ng xác định thành các ngôn ngữ khác mà bạn có bản dịch. Bạn có thể thêm, chỉnh sửa, và xóa các bản dịch bằng cách dùng thẻ bản địa."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 msgid "devcp_transbox_img_add_trans"
 msgstr "Thêm Bản Dịch"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Xóa Bản Dịch"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 msgid "devcp_transbox_input_add_all"
 msgstr "Thêm Bản địa cho Tất cả"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 msgid "devcp_transbox_input_add_locale"
 msgstr "Thêm Bản �ịa"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 msgid "devcp_transbox_input_cancel"
 msgstr "Hủy b�"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 msgid "devcp_transbox_input_delete"
 msgstr "Xóa nó"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 msgid "devcp_transbox_select_locale"
 msgstr "Ch�n tên bản địa của bản dịch mà bạn muốn thêm vào:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 msgid "devcp_update_addon_guid_error"
-msgstr "GUID tiện ích dùng trong tập tin này (%1$s) không phù hợp với GUID có sẵn của tiện ích này (%2$s)."
+msgstr ""
+"GUID tiện ích dùng trong tập tin này (%1$s) không phù hợp với GUID có sẵn của tiện ích này (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 msgid "devcp_update_addon_priv_error"
 msgstr "Bạn không có đủ thẩm quy�n để cập nhật tiện ích này."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 msgid "devcp_update_addon_version_belong_error"
 msgstr "Phiên bản xác định (%1$s) không thuộc v� tiện ích này (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 msgid "devcp_update_addon_version_exists_error"
-msgstr "Số phiên bản tải lên (%1$s) đã tồn tại. Nếu bạn đang cố thêm tập tin khác cho phiên bản này, <a href=\"%2$s\">nhấn vào đây</a>."
+msgstr ""
+"Số phiên bản tải lên (%1$s) đã tồn tại. Nếu bạn đang cố thêm tập tin khác cho phiên bản này, <a href=\"%2$s\">nhấn vào đây</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 msgid "devcp_update_addon_version_match_error"
-msgstr "Số phiên bản tải lên (%1$s) không phù hợp với số phiên bản sẵn có (%2$s)."
+msgstr ""
+"Số phiên bản tải lên (%1$s) không phù hợp với số phiên bản sẵn có (%2$s)."
 
 #: views/developers/uploader.thtml:68
 msgid "devcp_uploader_a_start"
 msgstr "Bắt �ầu"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 msgid "devcp_uploader_ajax_loading"
 msgstr "�ang tải tập tin..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "�ồng ý và tiếp tục"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 msgid "devcp_uploader_button_edit"
 msgstr "Chỉnh sửa Tiện ích Của tôi"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 msgid "devcp_uploader_button_later"
 msgstr "Tôi sẽ hoàn tất tiện ích của tôi sau."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 msgid "devcp_uploader_button_release"
 msgstr "Thêm Ghi chú Phát hành"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 msgid "devcp_uploader_created_results"
-msgstr "<p>Liệt kê cho tiện ích của bạn đã được tạo thành công. Thông tin cơ bản lấy từ tập tin tải lên đã được lưu trữ, nhưng vẫn còn nhi�u thứ trong phần liệt kê có thể tùy biến được.</p><p>Tiện ích của bạn hiện đang được đánh dấu là <strong>Im lìm</strong>. �ể hoàn tất tiện ích của mình, bạn sẽ cần phải chắc chắn rằng nó có tên, tóm tắt, và mô tả chính xác, cũng như có ít nhất một phân mục được ch�n. Bạn có thể chỉnh sửa thông tin tiện ích bằng cách dùng liên kết bên dưới và kiểm tra trạng thái tiện ích của bạn vào bất kì lúc nào trên <a %s>trang trạng thái</a>."
+msgstr ""
+"<p>Liệt kê cho tiện ích của bạn đã được tạo thành công. Thông tin cơ bản lấy từ tập tin tải lên đã được lưu trữ, nhưng vẫn còn nhi�u thứ trong phần liệt kê có thể tùy biến được.</p><p>Tiện ích của bạn hiện đang được đánh dấu là <strong>Im lìm</strong>. �ể hoàn tất tiện ích của mình, bạn sẽ cần phải chắc chắn rằng nó có tên, tóm tắt, và mô tả chính xác, cũng như có ít nhất một phân mục được ch�n. Bạn có thể chỉnh sửa thông tin tiện ích bằng cách dùng liên kết bên dưới và kiểm tra trạng thái tiện ích của bạn vào bất kì lúc nào trên "
+"<a %s>trang trạng thái</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 msgid "devcp_uploader_error_correct"
 msgstr "Vui lòng sửa vấn đ� và tải tập tin lên lần nữa."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 msgid "devcp_uploader_file_created"
-msgstr "Tập tin mới của bạn đã được thêm vào phiên bản %1$s và hiện được đánh dấu là %2$s."
+msgstr ""
+"Tập tin mới của bạn đã được thêm vào phiên bản %1$s và hiện được đánh dấu là %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 msgid "devcp_uploader_header_created"
 msgstr "Tiện ích �ã được tạo!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 msgid "devcp_uploader_header_error"
 msgstr "Ôi! Hình như có vấn đ� với tập tin này..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 msgid "devcp_uploader_header_file_added"
 msgstr "Tập tin �ã được thêm!"
 
@@ -3942,74 +3712,76 @@ msgid "devcp_uploader_header_how"
 msgstr "Nó hoạt động như thế nào?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 msgid "devcp_uploader_header_update_created"
 msgstr "Phiên bản %s �ã được tạo"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 msgid "devcp_uploader_header_upload"
 msgstr "Tải lên Tập tin Của bạn"
 
 #: views/developers/uploader.thtml:67
 msgid "devcp_uploader_how"
-msgstr "<p>Cảm ơn bạn đã có nhã ý gửi tiện ích lên Tiện ích Mozilla. Lưu trữ tiện ích trên Tiện ích Mozilla là cách thức dễ dàng nhất để quản lí việc phân phối tiện ích của bạn. �ây là những gì bạn sẽ nhận được:</p><ul><li>Mỗi tiện ích sẽ có một trang giới thiệu công cộng với các thông tin do bạn cung cấp, ví dụ như một tóm tắt ngắn g�n v� chức năng của tiện ích, một mô tả dài hơn, và một mục trưng bày các hình ảnh xem trước v� tiện ích của bạn.</li><li>Tiện ích của bạn sẽ xuất hiện trong phần liệt kê và tìm kiếm xuyên suốt site, và thậm chí trong mục Quản lí Tiện ích của Firefox.</li><li>Chúng tôi sẽ lo nơi lưu trữ tất cả các phiên tải xuống của bạn, và cung cấp cập nhật tự động cho ngư�i dùng khi bạn tải lên một phiên bản mới.</li><li>Bạn sẽ có quy�n truy cập bảng thống kê với các thông tin chi tiết v� dữ liệu ngư�i dùng.</li></ul><p>Tiện ích được lưu trữ trên site phải được đánh giá bởi Biên tập viên Tiện ích Mozilla trước khi chúng có tất cả các tính năng được liệt kê ở trên. Nếu bạn đã sẵn sàng để bắt đầu quá trình và gói tiện ích của bạn đã sẵn sàng để tải lên, hãy nhấn nút Bắt �ầu bên dưới!</p>"
+msgstr ""
+"<p>Cảm ơn bạn đã có nhã ý gửi tiện ích lên Tiện ích Mozilla. "
+"Lưu trữ tiện ích trên Tiện ích Mozilla là cách thức dễ dàng nhất để quản lí việc phân phối tiện ích của bạn. �ây là những gì bạn sẽ nhận được:</p><ul><li>Mỗi tiện ích sẽ có một trang giới thiệu công cộng với các thông tin do bạn cung cấp, ví dụ như một tóm tắt ngắn g�n v� chức năng của tiện ích, một mô tả dài hơn, và một mục trưng bày các hình ảnh xem trước v� tiện ích của bạn.</li><li>Tiện ích của bạn sẽ xuất hiện trong phần liệt kê và tìm kiếm xuyên suốt site, và thậm chí trong mục Quản lí Tiện ích của Firefox.</li><li>Chúng tôi sẽ lo nơi lưu trữ tất cả các phiên tải xuống của bạn, và cung cấp cập nhật tự động cho ngư�i dùng khi bạn tải lên một phiên bản mới.</li><li>Bạn sẽ có quy�n truy cập bảng thống kê với các thông tin chi tiết v� dữ liệu ngư�i dùng.</li></ul><p>Tiện ích được lưu trữ trên site phải được đánh giá bởi Biên tập viên Tiện ích Mozilla trước khi chúng có tất cả các tính năng được liệt kê ở trên. Nếu bạn đã sẵn sàng để bắt đầu quá trình và gói tiện ích của bạn đã sẵn sàng để tải lên, hãy nhấn nút Bắt �ầu bên dưới!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_label_platformtype"
 msgstr "N�n tảng Hỗ trợ:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 msgid "devcp_uploader_label_upload_field"
 msgstr "Tập tin Tiện ích: "
 
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "Khác"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 msgid "devcp_uploader_p_pending_file"
-msgstr "Tập tin mới sẽ hiện hữu ra công cộng ngay khi biên tập viên có thể đánh giá nó. Hiện có %1$s tiện ích khác cũng đang trong hàng ch�. Muốn được đánh giá nhanh hơn? Hãy cân nhắc việc <a %2$s>trở thành một biên tập viên</a> nhé."
+msgstr ""
+"Tập tin mới sẽ hiện hữu ra công cộng ngay khi biên tập viên có thể đánh giá nó. Hiện có %1$s tiện ích khác cũng đang trong hàng ch�. Muốn được đánh giá nhanh hơn? Hãy cân nhắc việc <a %2$s>trở thành một biên tập viên</a> nhé."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 msgid "devcp_uploader_p_pending_version"
-msgstr "Phiên bản mới sẽ hiện hữu ra công cộng ngay khi biên tập viên có thể đánh giá nó. Hiện có %1$s tiện ích khác cũng đang trong hàng ch�. Muốn được đánh giá nhanh hơn? Hãy cân nhắc việc <a %2$s>trở thành một biên tập viên</a> nhé."
+msgstr ""
+"Phiên bản mới sẽ hiện hữu ra công cộng ngay khi biên tập viên có thể đánh giá nó. Hiện có %1$s tiện ích khác cũng đang trong hàng ch�. Muốn được đánh giá nhanh hơn? Hãy cân nhắc việc <a %2$s>trở thành một biên tập viên</a> nhé."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 msgid "devcp_uploader_p_update_created"
 msgstr "Phiên bản mới của bạn đã được tạo và hiện được đánh dấu là %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 msgid "devcp_uploader_p_update_file"
-msgstr "Xem tập tin mới của bạn trong <a %1$s>trang Phiên bản và Tập tin</a>, kiểm tra <a %2$s>trạng thái hiện tại</a> của tiện ích của bạn, hoặc <b>thêm ghi chú phát hành</b> bằng cách nhấn vào nút bên dưới (đặc biệt khuyến nghị)."
+msgstr ""
+"Xem tập tin mới của bạn trong <a %1$s>trang Phiên bản và Tập tin</a>, kiểm tra "
+"<a %2$s>trạng thái hiện tại</a> của tiện ích của bạn, hoặc <b>thêm ghi chú phát hành</b> bằng cách "
+"nhấn vào nút bên dưới (đặc biệt khuyến nghị)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 msgid "devcp_uploader_p_update_version"
-msgstr "Xem phiên bản mới của bạn trong <a %1$s>trang Phiên bản và Tập tin</a>, kiểm tra <a %2$s>trạng thái hiện tại</a> của tiện ích của bạn, hoặc <b>thêm ghi chú phát hành</b> bằng cách nhấn vào nút bên dưới (đặc biệt khuyến nghị)."
+msgstr ""
+"Xem phiên bản mới của bạn trong <a %1$s>trang Phiên bản và Tập tin</a>, kiểm tra "
+"<a %2$s>trạng thái hiện tại</a> của tiện ích của bạn, hoặc <b>thêm ghi chú phát hành</b> bằng cách "
+"nhấn vào nút bên dưới (đặc biệt khuyến nghị)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 msgid "devcp_uploader_p_upload"
-msgstr "Tải lên tập tin tiện ích của bạn bằng biểu mẫu bên dưới. Nếu bạn có các tập tin cho nhi�u n�n tảng riêng biệt cần tải lên, hãy ch�n một tập tin đơn lẻ và tải lên những tập tin khác bằng phần Quản lí Phiên bản và Tập tin."
+msgstr ""
+"Tải lên tập tin tiện ích của bạn bằng biểu mẫu bên dưới. Nếu bạn có các tập tin cho nhi�u n�n tảng riêng biệt cần tải lên, hãy ch�n một tập tin đơn lẻ và tải lên những tập tin khác bằng phần Quản lí Phiên bản và Tập tin."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 msgid "devcp_uploader_platformtype_all"
 msgstr "Tất cả"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Riêng biệt:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "Vui lòng ch�n..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 msgid "devcp_uploader_title_file"
@@ -4025,24 +3797,31 @@ msgid "devcp_uploader_title_update"
 msgstr "Cập nhật %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "Vui lòng xem %s để tham khảo."
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "trang này"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 msgid "devcp_verify_author_error"
 msgstr "Không tìm thấy tài khoản cho địa chỉ email đó."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr "Hoặc XML bất hợp lệ hoặc các trư�ng đang bị để trống. Vui lòng <a href=\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox\">đ�c tài liệu</a>, xác minh tiện ích của bạn, rồi thử lại."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "Chỉnh sửa Phiên bản"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "Phiên bản được cập nhật thành công."
 
 #: views/developers/versions.thtml:75
 msgid "devcp_versions_a_cancel"
@@ -4099,66 +3878,64 @@ msgstr[1] "%s đánh giá"
 msgid "devcp_versions_delete_sure"
 msgstr "Bạn có chắc là mình muốn xóa vĩnh viễn phiên bản %s không?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Hủy b�"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 msgid "devcp_versions_edit_a_delete"
 msgstr "Xóa Tập Tin"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Thêm Chương Trình Mới"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Xóa Chương Trình"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 msgid "devcp_versions_edit_add"
 msgstr "Thêm Tập Tin Mới"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 msgid "devcp_versions_edit_adjust"
-msgstr "�i�u chỉnh thông tin chương trình ở đây sẽ cho phép ngư�i dùng cài đặt tiện ích của bạn cho dù install.rdf trong gói thông báo là tiện ích không tương thích. <a %s>Liệt kê các chương trình được hỗ trợ</a>"
+msgstr ""
+"�i�u chỉnh thông tin chương trình ở đây sẽ cho phép ngư�i dùng cài đặt tiện ích của bạn cho dù install.rdf trong gói thông báo là tiện ích không tương thích. <a %s>Liệt kê các chương trình được hỗ trợ</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 msgid "devcp_versions_edit_compat_sure"
-msgstr "Bạn có <b>chắc</b> là mình muốn xóa tính tương thích với chương trình này không?"
+msgstr ""
+"Bạn có <b>chắc</b> là mình muốn xóa tính tương thích với chương trình này không?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Bạn có <b>chắc</b> là mình muốn xóa vĩnh viễn tập tin này không?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 msgid "devcp_versions_edit_header_approval"
 msgstr "Thông tin Chấp thuận"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 msgid "devcp_versions_edit_header_compat"
 msgstr "Chương trình Tương thích"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 msgid "devcp_versions_edit_header_file"
 msgstr "Thông tin Tập tin"
 
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "Giấy phép"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 msgid "devcp_versions_edit_header_manage"
 msgstr "Quản lí Phiên bản %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 msgid "devcp_versions_edit_header_notes"
 msgstr "Ghi chú Chấp thuận"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 msgid "devcp_versions_edit_img_delete"
 msgstr "Xóa Tập Tin"
 
@@ -4167,63 +3944,62 @@ msgstr "Xóa Tập Tin"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 msgid "devcp_versions_edit_li_file"
 msgstr "Tập tin %1$s (%2$s) được tạo vào %3$s và đã được thay đổi thành %4$s vào %5$s"
 
-#: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr "Vui lòng ch�n một giấy phép phù hợp cho tiện ích của bạn. Giấy phép này xác định các quy�n mà bạn xác lập cho mã nguồn của mình."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 msgid "devcp_versions_edit_no_files"
 msgstr "Không tìm thấy tập tin."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 msgid "devcp_versions_edit_optional"
 msgstr "Thông tin phụ cho Biên tập viên đánh giá phiên bản này."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Xóa Tính tương thích Chương trình"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 msgid "devcp_versions_edit_select_app"
 msgstr "Vui lòng Ch�n một Chương trình"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 msgid "devcp_versions_edit_th_file"
 msgstr "Tập tin"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 msgid "devcp_versions_edit_th_platform"
 msgstr "N�n tảng"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 msgid "devcp_versions_edit_th_size"
 msgstr "Dung lượng"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 msgid "devcp_versions_edit_th_status"
 msgstr "Trạng thái"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 msgid "devcp_versions_edit_transbox_releasenotes_description"
-msgstr "Thông tin v� các thay đổi, các tính năng mới, các lỗi đã biết, và các thông tin hữu ích khác riêng cho bản phát hành/phiên bản này. Thông tin này cũng sẽ hiện hữu tới những ngư�i dùng cập nhật tiện ích trong phần Quản lí Tiện ích Firefox."
+msgstr ""
+"Thông tin v� các thay đổi, các tính năng mới, các lỗi đã biết, và các thông tin hữu ích khác riêng cho bản phát hành/phiên bản này. Thông tin này cũng sẽ hiện hữu tới những ngư�i dùng cập nhật tiện ích trong phần Quản lí Tiện ích Firefox."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Ghi chú Phát hành"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 msgid "devcp_versions_edit_unsaved_compat"
-msgstr "<strong>Bạn có các thay đổi chưa lưu.</strong> Tính tương thích sẽ không bị xóa cho tới khi bạn nhấn Cập nhật Phiên bản ở dưới."
+msgstr ""
+"<strong>Bạn có các thay đổi chưa lưu.</strong> Tính tương thích sẽ không bị xóa cho tới khi bạn nhấn Cập nhật Phiên bản ở dưới."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 msgid "devcp_versions_edit_unsaved_files"
-msgstr "<strong>Bạn có các thay đổi chưa lưu.</strong> Tập tin sẽ không bị xóa cho tới khi bạn nhấn Cập nhật Phiên bản ở dưới."
+msgstr ""
+"<strong>Bạn có các thay đổi chưa lưu.</strong> Tập tin sẽ không bị xóa cho tới khi bạn nhấn Cập nhật Phiên bản ở dưới."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 msgid "devcp_versions_edit_update"
 msgstr "Cập nhật Phiên bản"
 
@@ -4242,7 +4018,8 @@ msgstr "Phiên bản %s đã được xóa thành công."
 
 #: views/developers/versions.thtml:73
 msgid "devcp_versions_p_remove"
-msgstr "Phiên bản này không có tập tin nào đi kèm với nó và sẽ bị xóa. Bạn có muốn xóa phiên bản này không?"
+msgstr ""
+"Phiên bản này không có tập tin nào đi kèm với nó và sẽ bị xóa. Bạn có muốn xóa phiên bản này không?"
 
 #: views/developers/versions.thtml:58
 msgid "devcp_versions_th_created"
@@ -4256,7 +4033,7 @@ msgstr "Trạng thái"
 msgid "devcp_versions_th_version"
 msgstr "Phiên bản"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "Tiện ích này đã bị vô hiệu hóa."
 
@@ -4300,8 +4077,7 @@ msgstr "Bộ l�c"
 msgid "editorcp_logs_filter_by"
 msgstr "L�c theo kiểu/thao tác"
 
-#: views/editors/logs.thtml:42
-#: controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "Lưu kí Sự kiện"
 
@@ -4363,7 +4139,7 @@ msgstr "Xem các mục trong khoảng %s và %s"
 msgid "editorcp_reviewlog_none_found"
 msgstr "Không tìm thấy đánh giá nào trong khoảng th�i gian này."
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "Lưu kí �ánh giá"
 
@@ -4387,29 +4163,28 @@ msgstr "Hoạt động Biên tập Gần đây"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "Tổng số Bài đánh giá"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "�ánh giá Tiện ích"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "Vui lòng hoàn tất các phần sau:"
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "Vui lòng ch�n ít nhất một tập tin để đánh giá."
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "Không được phép tự đánh giá."
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "Phần m�m Bên ngoài"
 
-#: views/editors/featured.thtml:120
-#: views/editors/featured.thtml:121
+#: views/editors/featured.thtml:120 views/editors/featured.thtml:121
 msgid "editors_featured_add_feature"
 msgstr "Thêm tính năng"
 
@@ -4417,296 +4192,249 @@ msgstr "Thêm tính năng"
 msgid "editors_featured_add_feature_submit"
 msgstr "Thêm"
 
-#: views/editors/featured.thtml:49
-#: controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "Thất bại khi thêm tính năng."
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "Thêm tính năng thành công."
 
-#: views/editors/featured.thtml:50
-#: controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "Thất bại khi chỉnh sửa tính năng."
 
-#: views/editors/featured.thtml:51
-#: controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "Chỉnh sửa tính năng thành công."
 
-#: views/editors/featured.thtml:53
-#: controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "Một hay nhi�u bản địa không hợp lệ."
 
-#: views/editors/featured.thtml:52
-#: controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "Thất bại khi xóa b� tính năng"
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "Xóa b� tính năng thành công."
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "Các Tiện-ích được Giới thiệu"
 
-#: views/editors/featured.thtml:54
-#: views/editors/featured.thtml:107
+#: views/editors/featured.thtml:54 views/editors/featured.thtml:107
 msgid "editors_featured_edit_feature_submit"
 msgstr "Gá»­i Ä‘i"
 
-#: views/editors/featured.thtml:90
-#: views/editors/featured.thtml:91
+#: views/editors/featured.thtml:90 views/editors/featured.thtml:91
 msgid "editors_featured_remove_feature"
 msgstr "Xóa tính năng"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "Dãy Bộ L�c"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "Liên kết Hữu ích"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "Hướng dẫn của Biên tập viên"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "Chính sách Tiện ích"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
-msgstr "Các bộ l�c này vẫn sẽ giữ nguyên cho phiên này hoặc cho đến khi bị xóa."
+msgstr ""
+"Các bộ l�c này vẫn sẽ giữ nguyên cho phiên này hoặc cho đến khi bị xóa."
 
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177
-#: views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "Hiện tại không có tiện ích nào thuộc kiểu này để đánh giá."
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 ngày"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 gi�"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 phút"
 
-#: controllers/editors_controller.php:64
-#: controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "Công cụ Biên tập"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "Chỉ cho %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "Phát hành thử"
 
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "Tính tương thích %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "Tiện ích hoặc �ịa chỉ Tác giả"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Kiểu tiện ích"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "Chương trình"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Phiên bản Cao nhất"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "N�n tảng"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Th�i gian Gửi lên (ngày)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Kết quả tìm kiếm đã được l�c của bạn: <strong>%1$s</strong> Tiện ích"
-msgstr[1] "Kết quả tìm kiếm đã được l�c của bạn: <strong>%1$s</strong> Tiện ích"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "Xóa trắng"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "Bộ l�c"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
-msgstr "Tất cả dãy đánh giá hiện đang bị vô hiệu hóa. Vui lòng kiểm tra lại sau."
-
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "Chỉnh sửa Mục"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "Lược sử của Mục"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "Trang chủ của Mục"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "Tổng quan v� Mục"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "Xem trÆ°á»›c"
+msgstr ""
+"Tất cả dãy đánh giá hiện đang bị vô hiệu hóa. Vui lòng kiểm tra lại sau."
 
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "Thao tác �ánh giá"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 msgid "editors_review_action_info"
 msgstr "Yêu cầu Thêm Thông tin"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�ưa ra Công cộng"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�� nghị �ánh giá Cấp cao"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "Vẫn để trong Hộp cát"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "�ánh giá Bình luận"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 msgid "editors_review_details_info_request"
-msgstr "Dùng biểu mẫu này để yêu cầu thêm thông tin từ tác giả. H� sẽ nhận được một email và có thể trả l�i ngay tại đây. Bạn cũng sẽ được thông báo qua email khi h� trả l�i."
+msgstr ""
+"Dùng biểu mẫu này để yêu cầu thêm thông tin từ tác giả. H� sẽ nhận được một email và có thể trả l�i ngay tại đây. Bạn cũng sẽ được thông báo qua email khi h� trả l�i."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
-msgstr "Phần này sẽ đánh dấu tiện ích cùng các tập tin và phiên bản gần nhất của nó là công cộng. Các phiên bản tương lai sẽ ở trong hộp cát cho đến khi chúng được đánh giá bởi một biên tập viên."
+msgstr ""
+"Phần này sẽ đánh dấu tiện ích cùng các tập tin và phiên bản gần nhất của nó "
+"là công cộng. Các phiên bản tương lai sẽ ở trong hộp cát cho đến khi chúng "
+"được đánh giá bởi một biên tập viên."
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "Phần này vẫn sẽ giữ tiện ích lại trong hộp cát."
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
-msgstr "Phần này sẽ chấp thuận một phiên bản trong hộp cát của một tiện ích công cộng được xuất hiện ngoài công cộng."
+msgstr ""
+"Phần này sẽ chấp thuận một phiên bản trong hộp cát của một tiện ích công "
+"cộng được xuất hiện ngoài công cộng."
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
-msgstr "Phần này vẫn sẽ giữ một phiên bản hộp cát của một tiện ích công cộng trong hộp cát."
+msgstr ""
+"Phần này vẫn sẽ giữ một phiên bản hộp cát của một tiện ích công cộng trong "
+"hộp cát."
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
-msgstr "Nếu bạn quan tâm v� tính bảo mật, vấn đ� bản quy�n của tiện ích, hoặc các vấn đ� khác mà quản trị viên cần xem xét, hãy nhập bình luận của bạn vào ô bên dưới. Chúng sẽ chỉ được gửi tới quản trị viên, chứ không gửi tới tác giả."
+msgstr ""
+"Nếu bạn quan tâm v� tính bảo mật, vấn đ� bản quy�n của tiện ích, hoặc các "
+"vấn đ� khác mà quản trị viên cần xem xét, hãy nhập bình luận của bạn vào ô "
+"bên dưới. Chúng sẽ chỉ được gửi tới quản trị viên, chứ không gửi tới tác giả."
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "So sánh phiên bản công cộng"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "Xem Ná»™i Dung"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "Tác giả:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "Phân mục:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "Tính tương thích:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "Mô tả"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "Bình luận của Nhà phát triển"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "Th�a thuận Ngư�i dùng Cuối"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "Tập tin:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "Lược sử Danh mục"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "Thông điệp �� cử"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "Xem trÆ°á»›c"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "Chính sách Riêng tư"
 
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "�ánh giá %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "Ghi chú cho Ngư�i đánh giá"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "Tóm tắt"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "Ghi chú Phiên bản"
 
@@ -4734,7 +4462,7 @@ msgstr "�� cử �ược chấp thuận / Công cộng"
 msgid "editors_review_history_nominated_denied"
 msgstr "�� cử Bị từ chối / Hộp cát"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "Không tìm thấy các mục đánh giá trước đây."
 
@@ -4761,87 +4489,79 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Hiện/Ẩn Trả l�i (%1$s)"
 msgstr[1] "Hiện/Ẩn Trả l�i (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "Ứng dụng:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "hoặc ch�n một phản hồi đã được đóng kín:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "Bình luận:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "Hệ đi�u  hành:"
 
-#: views/editors/review.thtml:285
-#: views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "Trên cùng"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "Lưu ý: Chỉ nên đánh giá nhi�u hơn một tập tin nếu bạn đã kiểm tra MỌI tập tin mà bạn ch�n."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "tiếp &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "Không tìm thấy ảnh xem trước."
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; trÆ°á»›c"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "Danh sách ch� �ánh giá"
 
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "<strong># %1$s</strong> trên %2$s trong danh sách ch�"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> trên %2$s trong danh sách ch� (đã l�c)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "Thao tác Xử lí"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "Thao tác"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "Bình luận"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "Ngày"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "Ngư�i đánh giá"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "Phiên bản / Tập tin"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 msgid "editors_review_update_notify_once"
-msgstr "Báo tôi khi tiện ích này được cập nhật lần tới. (Các cập nhật tiếp theo sẽ không gửi email)"
+msgstr ""
+"Báo tôi khi tiện ích này được cập nhật lần tới. (Các cập nhật tiếp theo sẽ "
+"không gửi email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "�ánh giá được tiến hành thành công."
 
@@ -4865,7 +4585,7 @@ msgstr "Thao tác"
 msgid "editors_reviews_in_reply_to"
 msgstr "Trả l�i:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "�ánh giá đã được tiến hành thành công!"
 
@@ -4877,85 +4597,87 @@ msgstr "Hiện tại không có đánh giá nào đang được đi�u chỉnh.
 msgid "editors_reviews_submit_process_reviews"
 msgstr "Tiến hành �ánh giá"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "Riêng biệt của Trang"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "Má»›i"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "�ã cập nhật"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "Ứng dụng đã được Thử nghiệm"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "Hệ đi�u hành đã được Thử nghiệm"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "Thông tin Thêm"
 
-#: views/editors/featured.thtml:63
-#: views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "Tiện ích"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "Kiểu"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "Kiểu của Tiện ích"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "Tuổi"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "Ứng dụng"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "Giới hạn cho các bản địa?"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "Th�i gian trong Hàng ch�"
-
-#: views/editors/queue.thtml:101
-#: views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "Sắp xếp thuận chi�u"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "N�n tảng"
 
-#: views/editors/queue.thtml:105
-#: views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "Sắp xếp ngược chi�u"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "Kiểu gửi lên"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s ngày"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s gi�"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s phút"
 
-#: views/errors/error401.thtml:50
-#: controllers/components/simple_acl.php:81
+#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83
-#: controllers/components/amo.php:607
-#: controllers/components/amo.php:608
-#: controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "Truy cập Bị từ chối"
 
@@ -4963,41 +4685,34 @@ msgstr "Truy cập Bị từ chối"
 msgid "error_access_denied_message"
 msgstr "Bạn không có quy�n xem trang này."
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "Tiện ích đã tồn tại!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
 #: controllers/reviews_controller.php:77
 #: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
-#: controllers/reviews_controller.php:340
-#: controllers/api_controller.php:123
-#: controllers/api_controller.php:759
-#: controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/reviews_controller.php:340 controllers/api_controller.php:123
+#: controllers/api_controller.php:759 controllers/addons_controller.php:131
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "Không tìm thấy tiện ích!"
 
-#: controllers/files_controller.php:83
-#: controllers/files_controller.php:196
+#: controllers/files_controller.php:83 controllers/files_controller.php:196
 msgid "error_addon_notviewable"
 msgstr "Tiện ích không thể xem được tại đây."
 
@@ -5005,7 +4720,7 @@ msgstr "Tiện ích không thể xem được tại đây."
 msgid "error_addon_selfreview"
 msgstr "Bạn không thể tự đánh giá tiện ích của bạn."
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "Không có tiện ích trong phân mục này!"
 
@@ -5013,108 +4728,85 @@ msgstr "Không có tiện ích trong phân mục này!"
 msgid "error_collection_feed_notfound"
 msgstr "Không tìm thấy feed tiện ích"
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "�ây không phải là địa chỉ email hợp lệ."
 
-#: views/users/pwreset.thtml:74
-#: views/users/register.thtml:70
-#: views/users/register.thtml:80
-#: views/users/register.thtml:86
-#: views/users/edit.thtml:105
-#: views/users/edit.thtml:111
-#: views/users/edit.thtml:192
-#: views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83
-#: views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "Phần này không được để trống."
 
-#: controllers/files_controller.php:75
-#: controllers/files_controller.php:93
-#: controllers/files_controller.php:96
-#: controllers/files_controller.php:163
-#: controllers/files_controller.php:176
-#: controllers/files_controller.php:185
-#: controllers/files_controller.php:204
-#: controllers/editors_controller.php:412
+#: controllers/files_controller.php:75 controllers/files_controller.php:93
+#: controllers/files_controller.php:96 controllers/files_controller.php:163
+#: controllers/files_controller.php:176 controllers/files_controller.php:185
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "Không tìm thấy tập tin!"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "Lỗi tập tin: %s không tồn tại."
 
-#: views/collections/add.thtml:55
-#: views/collections/edit.thtml:89
-#: views/users/register.thtml:54
-#: views/users/edit.thtml:81
-#: views/reviews/add.thtml:70
-#: controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "Có lỗi trong biểu mẫu này. Vui lòng sửa chúng và gửi lại."
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "Captcha không đúng, hãy thử lại!"
 
-#: views/users/register.thtml:100
-#: views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
-msgstr "URL có định dạng sai. URL đúng sẽ trông như thế này http://www.mozilla.com/vi."
+msgstr ""
+"URL có định dạng sai. URL đúng sẽ trông như thế này http://www.mozilla.com/"
+"vi."
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185
-#: controllers/users_controller.php:264
-#: controllers/users_controller.php:559
-#: controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "Thiếu tham số: %s"
 
-#: controllers/components/amo.php:507
-#: controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "Không có Tập tin"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "Cảnh báo"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Không tìm thấy ảnh xem trước!"
 
-#: views/addons/display.thtml:400
-#: views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "Bạn phải ch�n một mức xếp hạng."
 
@@ -5122,94 +4814,80 @@ msgstr "Bạn phải ch�n một mức xếp hạng."
 msgid "error_user_already_confirmed"
 msgstr "Tài khoản ngư�i dùng này đã được xác nhận."
 
-#: controllers/users_controller.php:202
-#: controllers/users_controller.php:276
-#: controllers/users_controller.php:569
-#: controllers/users_controller.php:581
-#: controllers/users_controller.php:587
-#: controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "Mã xác nhận không hợp lệ!"
 
-#: views/users/pwreset.thtml:79
-#: views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "Mật khẩu không khớp."
 
-#: views/users/register.thtml:65
-#: views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "�ịa chỉ email này đã được dùng bởi ngư�i khác."
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
-msgstr "Th�i gian thay đổi email đã hết hạn. Vui lòng thay đổi lại địa chỉ email trong hồ sơ của bạn và nhấn vào liên kết trong email ngay khi bạn nhận được nó."
-
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "Ngư�i dùng chỉ có thể có một vai trò. Vui lòng xóa ngư�i dùng kh�i các vai trò hiện tại trước khi tiếp tục."
+msgstr ""
+"Th�i gian thay đổi email đã hết hạn. Vui lòng thay đổi lại địa chỉ email "
+"trong hồ sơ của bạn và nhấn vào liên kết trong email ngay khi bạn nhận được "
+"nó."
 
-#: views/users/register.thtml:91
-#: views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "Tên truy nhập này đã được dùng."
 
-#: views/users/pwreset.thtml:54
-#: controllers/users_controller.php:191
-#: controllers/users_controller.php:270
-#: controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: views/users/pwreset.thtml:54 controllers/users_controller.php:191
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "Không tìm thấy ngư�i dùng!"
 
 #: views/users/activatefirst.thtml:47
 msgid "error_user_unconfirmed"
-msgstr "Vui lòng xác nhận tài khoản của bạn trước bằng mã xác nhận bạn nhận được trong email."
+msgstr ""
+"Vui lòng xác nhận tài khoản của bạn trước bằng mã xác nhận bạn nhận được "
+"trong email."
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "Sai tên truy nhập hoặc mật khẩu!"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "Không tìm thấy phiên bản!"
 
-#: views/users/delete.thtml:125
-#: views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "Nhập sai mật khẩu!"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "Tìm hiểu thêm"
 
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "Tìm hiểu thêm v� %1$s"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112
-#: views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s đánh giá"
 msgstr[1] "%1$s đánh giá"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "Xem thêm trong"
 
@@ -5249,227 +4927,168 @@ msgstr "+/-"
 
 #. Link text for the AMO About page.
 #: views/elements/footer.thtml:72
-#: views/layouts/amo2009.thtml:341
 msgid "footer_a_about"
 msgstr "Giới thiệu"
 
 #. Link text to the AMO blog.
 #: views/elements/footer.thtml:74
-#: views/layouts/amo2009.thtml:343
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
 #: views/elements/footer.thtml:73
-#: views/layouts/amo2009.thtml:342
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
 #: views/elements/footer.thtml:73
-#: views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
 msgid "footer_abbr_faq"
 msgstr "H�i đáp Thư�ng gặp"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_all_rights_reserved"
-msgstr "M�i quy�n được bảo lưu. <br/><b>Vào trang web</b> <a href=\"http://vi.mozdev.org\">Mozilla Việt Nam</a>"
+msgstr "M�i quy�n được bảo lưu. <a href=\"http://vi.mozdev.org\">Vào trang web của Mozilla Việt Nam</a>"
 
 #: views/elements/footer.thtml:67
-#: views/layouts/amo2009.thtml:336
 msgid "footer_copyright"
 msgstr "Bản quy�n"
 
 #: views/elements/footer.thtml:71
-#: views/layouts/amo2009.thtml:340
 msgid "footer_credits"
 msgstr "Công trạng"
 
 #: views/elements/footer.thtml:76
-#: views/layouts/amo2009.thtml:346
 msgid "footer_disclaimer"
-msgstr "Mozilla cung cấp liên kết đến các ứng dụng này theo đúng trách nhiệm của mình, và không đại diện cho ứng dụng hoặc bất kì thông tin nào liên quan đến chúng. M�i câu h�i, phàn nàn hoặc yêu cầu đối với các ứng dụng này phải được chuyển trực tiếp tới nhà viết phần m�m tương ứng."
+msgstr ""
+"Mozilla cung cấp liên kết đến các ứng dụng này theo đúng trách nhiệm của "
+"mình, và không đại diện cho ứng dụng hoặc bất kì thông tin nào liên quan đến "
+"chúng. M�i câu h�i, phàn nàn hoặc yêu cầu đối với các ứng dụng này phải được "
+"chuyển trực tiếp tới nhà viết phần m�m tương ứng."
 
 #: views/elements/footer.thtml:61
-#: views/layouts/amo2009.thtml:332
 msgid "footer_lang_form_lang_submit_go"
 msgstr "Gá»­i Ä‘i"
 
 #: views/elements/footer.thtml:70
-#: views/layouts/amo2009.thtml:339
 msgid "footer_legal_notices"
-msgstr "Lưu ý Pháp lí"
+msgstr "Lưu ý Pháp lý"
 
 #: views/elements/footer.thtml:50
-#: views/layouts/amo2009.thtml:321
 msgid "footer_other_languages"
 msgstr "Ngôn ngữ khác:"
 
 #: views/elements/footer.thtml:69
-#: views/layouts/amo2009.thtml:338
 msgid "footer_privacy_policy"
 msgstr "Chính sách Riêng tư"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "LÆ°u"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "Từ điển"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "Từ điển"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "Phần mở rộng"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "Phần mở rộng"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "Gói ngôn ngữ (Tiện ích)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "Gói ngôn ngữ (Tiện ích)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "Gói ngôn ngữ (Chương trình)"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "Gói ngôn ngữ (Chương trình)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "Phần bổ trợ"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "Phần bổ trợ"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "Máy tìm kiếm"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "Máy tìm kiếm"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "Giao diện"
 
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "Giao diện"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "Tất cả Bản địa"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
-#: views/elements/header.thtml:111
-#: views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
+#: views/elements/header.thtml:111 views/elements/header.thtml:122
 #, php-format
 msgid "header_home_tooltip"
 msgstr "Trở lại trang chủ Tiện ích %1$s"
 
 #: views/elements/header.thtml:87
 msgid "header_main_firefox_header"
-msgstr "Firefox Add-ons - Tiện ích Cáo Lửa Siêu Việt"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "Tiện ích <em>cho</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox - Cáo Lửa</strong>"
+msgstr "Tiện ích Firefox"
 
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "Tiện ích"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "Tiện ích <img alt=\"Tiện ích\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
-msgstr "Seamonkey Add-ons - Tiện ích Khỉ Biển Oai Hùng"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr "Tiện ích <em>cho</em> <img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey - Khỉ Biển</strong>"
+msgstr "Tiện ích Seamonkey"
 
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
-msgstr "Sunbird Add-ons - Tiện ích Chim Hút Mật"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "Tiện ích <em>cho</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird - Chim Hút Mật</strong>"
+msgstr "Tiện ích Sunbird"
 
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
-msgstr "Thunderbird Add-ons - Tiện ích Chim Sét Thần Thánh"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr "Tiện ích <em>cho</em> <img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird - Chim Sét</strong>"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "�i tới trình đơn chương trình khác"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "�i tới trình đơn phân mục"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "�i tới nội dung chính"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "�i tới biểu mẫu tìm kiếm"
+msgstr "Tiện ích Thunderbird"
 
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "Tiện ích"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50
-#: views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "�ăng nhập"
 
 #: views/elements/header.thtml:156
-#: views/layouts/amo2009.thtml:304
 msgid "header_navlink_logout"
 msgstr "Thoát"
 
 #: views/elements/header.thtml:145
-#: views/layouts/amo2009.thtml:303
 msgid "header_navlink_myaccount"
 msgstr "Tài khoản của Tôi"
 
@@ -5477,23 +5096,11 @@ msgstr "Tài khoản của Tôi"
 msgid "header_navlink_register"
 msgstr "�ăng kí"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">�ăng kí</a> hoặc <a href=\"%2$s\">�ăng nhập</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "Công cụ"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67
-#: views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
 #: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
@@ -5501,51 +5108,37 @@ msgstr "Hình ảnh Xem trước của %s"
 
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307
-#: views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">�ăng nhập</a> để cài đặt tiện ích thử nghiệm này. <a href=\"%2$s\">Tại sao</a>?"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283
-#: views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "Hãy để tôi cài đặt tiện ích thử nghiệm này. <a href=\"%1$s\">�ây là gì?</a>"
+msgstr ""
+"<a href=\"%1$s\">�ăng nhập</a> để cài đặt tiện ích thử nghiệm này. <a href="
+"\"%2$s\">Tại sao</a>?"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128
-#: views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "Thêm vào %s %s"
 
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298
-#: views/elements/install.thtml:150
-#: views/elements/install.thtml:165
-#: views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "Thêm %1$s vào %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200
-#: views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "Tải xuống %1$s"
 
-#: views/elements/amo2009/install.thtml:147
-#: views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "Tiện ích này không tồn tại."
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "Danh sách gói ngôn ngữ và từ điển."
 
@@ -5557,9 +5150,8 @@ msgstr "Tải xuống Từ điển"
 msgid "langtools_download_langpack"
 msgstr "Tải xuống Gói ngôn ngữ"
 
-#: views/addons/dictionaries.thtml:63
-#: controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "Từ điển và Gói ngôn ngữ"
 
@@ -5571,74 +5163,36 @@ msgstr "Cài đặt Từ điển"
 msgid "langtools_install_langpack"
 msgstr "Cài đặt Gói ngôn ngữ"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "Từ điển"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "Gói ngôn ngữ"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "Ngôn ngữ"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "Giấy phép Tùy biến"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "Giấy phép BSD"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "Giấy phép Công cộng GNU, phiên bản 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "Giấy phép Công cộng GNU, phiên bản 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "Giấy phép Công cộng �t hơn GNU, phiên bản 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "Giấy phép Công cộng �t hơn GNU, phiên bản 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "Giấy phép MIT/X11"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Giấy phép Công cộng Mozilla, phiên bản 1.1"
-
-#: views/users/emailchange.thtml:51
-#: views/users/delete.thtml:55
-#: views/users/delete.thtml:137
-#: views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "Nhấn vào đây để trở lại trang chủ."
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "Ngày"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "Số lượt tải"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "Tên tiện ích"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "Xếp hạng"
@@ -5663,21 +5217,27 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "Từ điển & Gói ngôn ngữ"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "Phần bổ trợ"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "Giao diện"
 
 #: views/elements/app_chooser.thtml:47
-#: views/layouts/amo2009.thtml:255
 msgid "other_apps_tooltip"
 msgstr "Tìm tiện ích cho các chương trình khác"
 
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "ngư�i khác"
 
@@ -5685,29 +5245,12 @@ msgstr "ngư�i khác"
 msgid "page_title_appversions"
 msgstr "Phiên bản Ứng dụng"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Trình sưu tập Tiện ích"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "FAQ của Trình sưu tập Tiện ích"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Tính năng của Trình sưu tập Tiện ích"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "Chào mừng đến với Trình sưu tập Tiện ích"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "Công trạng"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "FAQ cho Nhà phát triển"
+msgid "page_title_experimental_addons"
+msgstr "Các tiện ích Thử nghiệm"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
@@ -5737,36 +5280,43 @@ msgstr "Hệ thống �ánh giá Hộp cát"
 msgid "page_title_submissionhelp"
 msgstr "Trợ giúp Gửi lên"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79
-#: controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "Các phiên bản Ứng dụng Hợp lệ"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
-msgstr "Tiện ích được gửi lên Tiện �ch Mozilla phải có một tập tin install.rdf với ít nhất một trong các ứng dụng bên dưới được hỗ trợ. Chỉ các phiên bản được liệt kê bên dưới là được phép cho các ứng dụng này."
+msgstr ""
+"Tiện ích được gửi lên Tiện �ch Mozilla phải có một tập tin install.rdf với "
+"ít nhất một trong các ứng dụng bên dưới được hỗ trợ. Chỉ các phiên bản được "
+"liệt kê bên dưới là được phép cho các ứng dụng này."
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
-msgstr "Nếu ứng dụng được hỗ trợ không yêu cầu một tập tin install.rdf, bạn vẫn phải kèm theo một cái với các thuộc tính bắt buộc đã được chỉ định %s."
+msgstr ""
+"Nếu ứng dụng được hỗ trợ không yêu cầu một tập tin install.rdf, bạn vẫn phải "
+"kèm theo một cái với các thuộc tính bắt buộc đã được chỉ định %s."
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "ở đây"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "Phiên bản"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "Trở v� trang trước"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "Trang thông tin Hộp cát"
 
@@ -5774,13 +5324,21 @@ msgstr "Trang thông tin Hộp cát"
 msgid "pagination_next_page"
 msgstr "tiếp"
 
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "�ây là trang %1$s trong %2$s"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "trÆ°á»›c"
 
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
-msgstr "Vui lòng nhập <strong>cả hai từ</strong> bên dưới, <strong>cách nhau bởi khoảng trắng</strong>."
+msgstr ""
+"Vui lòng nhập <strong>cả hai từ</strong> bên dưới, <strong>cách nhau bởi "
+"khoảng trắng</strong>."
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5794,23 +5352,27 @@ msgstr "Vui lòng gõ những gì bạn nghe thấy."
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
-msgstr "Nếu khó hiểu, bạn có thể <a href=\"%1$s\">nghe cái gì đó khác</a> hoặc <a href=\"%2$s\">quay lại phần văn bản</a>."
+msgstr ""
+"Nếu khó hiểu, bạn có thể <a href=\"%1$s\">nghe cái gì đó khác</a> hoặc <a "
+"href=\"%2$s\">quay lại phần văn bản</a>."
 
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
 msgid "recaptcha_hardtoread_text"
-msgstr "Nếu khó đ�c, bạn có thể <a href=\"%1$s\">thử từ khác</a> hoặc <a href=\"%2$s\">nghe đ�c cái khác</a>."
+msgstr ""
+"Nếu khó đ�c, bạn có thể <a href=\"%1$s\">thử từ khác</a> hoặc <a href=\"%2$s"
+"\">nghe đ�c cái khác</a>."
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "Bạn có phải là ngư�i?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "�ây là gì?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "Lỗi khi gán c� hiệu cho đánh giá này!"
 
@@ -5818,8 +5380,7 @@ msgstr "Lỗi khi gán c� hiệu cho đánh giá này!"
 msgid "review_flag_reason_bug_support"
 msgstr "Yêu cầu hỗ trợ hoặc báo cáo lỗi bị đặt nhầm"
 
-#: views/reviews/display.thtml:103
-#: views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "Báo cáo đánh giá này (hãy ch�n một lí do)"
 
@@ -5835,9 +5396,8 @@ msgstr "Khác (vui lòng chỉ ra)"
 msgid "review_flag_reason_spam"
 msgstr "Spam hoặc các nội dung không phải là đánh giá"
 
-#: views/reviews/display.thtml:91
-#: views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "Cảm ơn; đánh giá này được gán c� để ch� chấp thuận của biên tập viên."
 
@@ -5847,155 +5407,133 @@ msgstr "Báo cáo đánh giá này"
 
 #: views/reviews/display.thtml:42
 msgid "review_flag_this_titletip"
-msgstr "Báo cáo này không phù hợp, không chính xác hoặc chỉ là spam? Nhấn vào đây để gán c� để ch� đánh giá của biên tập viên."
+msgstr ""
+"Báo cáo này không phù hợp, không chính xác hoặc chỉ là spam? Nhấn vào đây để "
+"gán c� để ch� đánh giá của biên tập viên."
 
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
-msgstr "<p>Hãy ghi nhớ các mẹo này trong đầu:</p><ul><li>Viết như thể bạn đang kể cho một ngư�i bạn v� trải nghiệm của bạn đối với tiện ích. �ưa ra những chi tiết hữu ích và cụ thể, như là những tính năng nào mà bạn thích và/hoặc không thích, dùng nó khó hay dễ như thế nào, và những điểm chưa hay của nó. Tránh ngôn ngữ thông thư�ng như là \"Tuyệt v�i\" hoặc \"Dở tệ\" trừ khi bạn có thể đưa ra lí do vì sao bạn tin như vậy.</li><li>Vui lòng không báo lỗi trong bài đánh giá. Chúng tôi không để địa chỉ email của bạn hiện hữu trước nhà phát triển tiện ích, trong khi có thể h� cần liên hệ với bạn để giúp bạn giải quyết vấn đ�. Xem <a href=\"%1$s\">phần trợ giúp</a> để tìm nơi nhận được hỗ trợ cho tiện ích này.</li><li>Vui lòng giữ phần đánh giá được sạch sẽ, tránh dùng ngôn từ không phù hợp và đừng đưa lên bất kì thông tin cá nhân nào.</li></ul><p>Vui lòng đ�c <a href=\"%2$s\">Hướng dẫn �ánh giá</a> để biết thêm chi tiết v� cách đánh giá tiện ích.</p>"
+msgstr ""
+"<p>Hãy ghi nhớ các mẹo này trong đầu:</p><ul><li>Viết như thể bạn đang kể "
+"cho một ngư�i bạn v� trải nghiệm của bạn đối với tiện ích. �ưa ra những chi "
+"tiết hữu ích và cụ thể, như là những tính năng nào mà bạn thích và/hoặc "
+"không thích, dùng nó khó hay dễ như thế nào, và những điểm chưa hay của nó. "
+"Tránh ngôn ngữ thông thư�ng như là \"Tuyệt v�i\" hoặc \"Dở tệ\" trừ khi bạn "
+"có thể đưa ra lí do vì sao bạn tin như vậy.</li><li>Vui lòng không báo lỗi "
+"trong bài đánh giá. Chúng tôi không để địa chỉ email của bạn hiện hữu trước "
+"nhà phát triển tiện ích, trong khi có thể h� cần liên hệ với bạn để giúp bạn "
+"giải quyết vấn đ�. Xem <a href=\"%1$s\">phần trợ giúp</a> để tìm nơi nhận "
+"được hỗ trợ cho tiện ích này.</li><li>Vui lòng giữ phần đánh giá được sạch "
+"sẽ, tránh dùng ngôn từ không phù hợp và đừng đưa lên bất kì thông tin cá "
+"nhân nào.</li></ul><p>Vui lòng đ�c <a href=\"%2$s\">Hướng dẫn �ánh giá</a> "
+"để biết thêm chi tiết v� cách đánh giá tiện ích.</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56
-#: views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "�ánh giá cho %s"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "Tiện ích được �� cao"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "Tiện ích Mới nhất"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "Tiện ích Thông dụng"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "Tiện ích được Cập nhật"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "Tìm kiếm"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "Kết quả Tìm kiếm Bộ sưu tập"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "Kết quả Tìm kiếm Bộ sưu tập"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "Tìm kiếm hiện đang bị vô hiệu hóa. Vui lòng thử lại sau."
 
-#: views/elements/amo2009/search.thtml:188
-#: views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "tất cả tiện ích"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "tất cả các bộ sưu tập"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408
-#: views/elements/search.thtml:171
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
 #: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "tìm kiếm tiện ích"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "tìm kiếm các bộ sưu tập"
-
-#: views/elements/amo2009/search.thtml:206
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "Tìm kiếm tiện ích"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Nhấn để nhập thuật ngữ tìm kiếm"
 
-#: views/elements/amo2009/search.thtml:186
-#: views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "trong"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "Tất cả Bộ máy Tìm kiếm"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "Duyệt các Máy tìm kiếm"
 
-#: views/search/collections.thtml:58
-#: views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s tiện ích phù hợp"
+msgstr[1] "%s tiện ích phù hợp"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "Không tìm thấy kết quả."
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "Tìm kiếm Tiện ích"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "Feed từ kết quả tìm kiếm"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "Kết quả tìm kiếm cho: %s"
 
-#: views/elements/header.thtml:154
-#: views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "Công cụ Quản trị"
 
-#: views/elements/header.thtml:146
-#: views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "Công cụ Nhà phát triển"
 
-#: views/elements/header.thtml:148
-#: views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "Công cụ Biên tập viên"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "Chào mừng"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "Chào mừng, %s"
 
-#: views/elements/pitch.thtml:50
-#: views/elements/pitch.thtml:55
+#: views/elements/pitch.thtml:50 views/elements/pitch.thtml:55
 msgid "sidebar_pitch_dictionary"
 msgstr "Từ điển"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "Tiện ích Nổi bật"
 
@@ -6003,7 +5541,7 @@ msgstr "Tiện ích Nổi bật"
 msgid "sidebar_pitch_looking_for"
 msgstr "Tôi đang tìm một:"
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "Tiện ích Mới nhất"
 
@@ -6011,34 +5549,31 @@ msgstr "Tiện ích Mới nhất"
 msgid "sidebar_pitch_search"
 msgstr "Phần bổ trợ Tìm kiếm"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "�ăng kí nhận tin từ"
 
-#: views/elements/pitch.thtml:48
-#: views/elements/pitch.thtml:54
+#: views/elements/pitch.thtml:48 views/elements/pitch.thtml:54
 msgid "sidebar_pitch_theme"
 msgstr "Giao diện"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "Tiện ích Cập nhật"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65
-#: views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s kB"
 
-#: views/elements/amo2009/stars.thtml:57
 #: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "Chưa được xếp hạng"
 
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49
 #: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
@@ -6058,35 +5593,31 @@ msgstr "Chuyển Tiện �ch"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 msgid "statistics_date_shortmonth"
 msgstr "%e tháng %m"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%e tháng %m, %Y"
 
 #. This is a date format.
 #. http://php.net/strftime
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
-#: views/statistics/addon.thtml:172
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
+#: views/statistics/addon.thtml:161 views/statistics/addon.thtml:172
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%A, %e tháng %m"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s được tạo"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s được phát hành"
@@ -6099,180 +5630,181 @@ msgstr "�óng"
 msgid "statistics_help_link"
 msgstr "Trợ giúp"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "hoặc, ch�n một tiện ích khác"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "hoặc, ch�n một tiện ích có thống kê công khai"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "Ch�n một trong các tiện ích của bạn để xem thống kê của nó"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "Ch�n một tiện ích để xem thống kê của nó"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "Ch�n một tiện ích để xem thống kê công khai của nó"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "Bảng Thống Kê"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "Xem Thống Kê"
 
-#: views/statistics/addon.thtml:222
-#: controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "Xem bảng này trong dạng CSV"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "không có"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "Xóa b� đồ thị này"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "Nhóm theo: Ngày"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "Nhóm theo: Tháng"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "Nhóm theo: Tuần"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "So sánh theo: Tuần"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "%s được tìm thấy trong khoảng"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "Thêm �ồ Thị"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "Thêm đồ thị vào biểu đồ này"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "Ẩn Tổng Số Lần �ếm"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "Hiện Tổng Số Lần �ếm"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "Vẽ đồ thị tổng số lần đếm trên biểu đồ này"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "Xem Dữ Liệu (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
-msgstr "Lấy một tập tin Giá trị Ngăn cách Theo dấu phẩy (Comma Separated Values) của dữ liệu này"
+msgstr ""
+"Lấy một tập tin Giá trị Ngăn cách Theo dấu phẩy (Comma Separated Values) của "
+"dữ liệu này"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "Ẩn Sự Kiện %s"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "Hiện Sự Kiện %s"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "Cho ngày phát hành tiện ích phủ lên đồ thị"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "Ẩn Sự Kiện Firefox"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "Hiện Sự Kiện Firefox"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "Cho ngày phát hành Firefox phủ lên đồ thị"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "Thu g�n Biểu đồ"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "Mở rộng Biểu đồ"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "�i�u chỉnh kích thước Biểu đồ"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "Ngư�i dùng Mỗi ngày"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "Ứng dụng"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "Tùy biến"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "Số lần tải"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "Hệ đi�u hành"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "Trạng thái Tiện ích"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "Tóm tắt"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "Phiên bản Tiện ích"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "Ứng dụng"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "Hệ đi�u hành"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "Trạng thái Tiện ích"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "Không rõ"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "Phiên bản Tiện ích"
 
@@ -6282,11 +5814,16 @@ msgstr "Không đủ dữ liệu để hiển thị biểu đồ này. Vui lòng
 
 #: views/statistics/addon.thtml:130
 msgid "statistics_notice_data_none"
-msgstr "Chúng tôi chưa có dữ liệu cho tiện ích này. Vui lòng kiểm tra lại sau vài ngày."
+msgstr ""
+"Chúng tôi chưa có dữ liệu cho tiện ích này. Vui lòng kiểm tra lại sau vài "
+"ngày."
 
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
-msgstr "Thống kê cho tiện ích hiện tại đang trong quá trình cập nhật. Dữ liệu gần đây có thể chưa hoàn tất vì script của chúng tôi hoạt động để cập nhật thông tin này. Vui lòng kiểm tra lại sau vài phút."
+msgstr ""
+"Thống kê cho tiện ích hiện tại đang trong quá trình cập nhật. Dữ liệu gần "
+"đây có thể chưa hoàn tất vì script của chúng tôi hoạt động để cập nhật thông "
+"tin này. Vui lòng kiểm tra lại sau vài phút."
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
@@ -6303,7 +5840,7 @@ msgstr "Thiết lập của bạn đã được cập nhật!"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "Bảng Thống Kê"
 
@@ -6331,103 +5868,109 @@ msgstr "Thu Nh�"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "Thu nh� một tháng"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "Tóm tắt thống kê mỗi ngày cho %1$s"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "RSS feed của dữ liệu tóm tắt"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%A, %e tháng %m năm %Y"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "Thống kê cho %1$s"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
-msgstr "Mặc định, chỉ có bạn và Mozilla có thể truy cập thông tin trên bảng thống kê của bạn. Bạn có thể đưa nó ra công khai để ai cũng xem được dữ liệu v� tiện ích của bạn."
+msgstr ""
+"Mặc định, chỉ có bạn và Mozilla có thể truy cập thông tin trên bảng thống kê "
+"của bạn. Bạn có thể đưa nó ra công khai để ai cũng xem được dữ liệu v� tiện "
+"ích của bạn."
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "Truy cập Bảng"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "Riêng tư"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "Chỉ bạn và Mozilla có thể xem thống kê của tiện ích này"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "Công cộng"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "Bất kì ai cũng có thể xem thống kê của tiện ích này"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "Thay đổi Thiết lập"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "Vui lòng xem như thông tin này là bí mật."
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "Bảng thống kê hiện đang ở chế độ <b>riêng tư</b>."
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "Bảng thống kê hiện đang ở chế độ <b>công khai</b>."
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "�ã khóa"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "Trở lại Bảng"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "Lưu Thiết Lập"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "Thiết lập Bảng Thống Kê cho %1$s"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "Không khóa"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "Ứ.dụng"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "H�H"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "Tr.thái"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "Ko.rõ"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "P.bản"
 
-#: views/statistics/rss/summary.thtml:42
-#: views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "Số lượt tải Trung bình Mỗi ngày"
 
@@ -6435,46 +5978,37 @@ msgstr "Số lượt tải Trung bình Mỗi ngày"
 msgid "statistics_summary_downloads_heading"
 msgstr "Số lần tải"
 
-#: views/statistics/rss/summary.thtml:41
-#: views/statistics/addon.thtml:171
+#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:171
 msgid "statistics_summary_downloads_lastcount"
 msgstr "Số lượt của Ngày Cuối"
 
-#: views/statistics/rss/summary.thtml:43
-#: views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "Số lượt tải trong 7 ngày vừa qua"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:151
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:151
 msgid "statistics_summary_downloads_total"
 msgstr "Tổng số lượt Tải"
 
-#: views/statistics/rss/summary.thtml:40
-#: views/statistics/addon.thtml:152
+#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:152
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "Từ %1$s"
 
-#: views/statistics/rss/summary.thtml:50
-#: views/statistics/rss/summary.thtml:56
-#: views/statistics/addon.thtml:163
-#: views/statistics/addon.thtml:183
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
+#: views/statistics/addon.thtml:163 views/statistics/addon.thtml:183
 msgid "statistics_summary_nodata"
 msgstr "Chưa có dữ liệu"
 
-#: views/statistics/rss/summary.thtml:60
-#: views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "Số ngư�i dùng Trung bình Mỗi ngày"
 
-#: views/statistics/rss/summary.thtml:52
-#: views/statistics/addon.thtml:177
+#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:177
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "Thay đổi kể từ lượt đếm trước"
 
-#: views/statistics/rss/summary.thtml:54
-#: views/statistics/addon.thtml:181
+#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:181
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s vào %2$s"
@@ -6483,144 +6017,146 @@ msgstr "%1$s vào %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "Ngư�i dùng Trung bình Mỗi ngày"
 
-#: views/statistics/rss/summary.thtml:46
-#: views/statistics/addon.thtml:157
+#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:157
 msgid "statistics_summary_updatepings_total"
 msgstr "Số ngư�i dùng Trung bình Mỗi ngày"
 
-#: views/statistics/rss/summary.thtml:48
-#: views/statistics/addon.thtml:161
+#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:161
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "Vào %1$s"
 
-#: views/statistics/rss/summary.thtml:61
-#: views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Ngư�i dùng Hàng ngày Trung bình của Tuần này"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62
-#: views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s kể từ tuần trước"
-
-#: views/statistics/addon.thtml:65
-#: controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "Thống kê %1$s"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "Tất cả Giao diện"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "Duyệt xem Giao diện"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "Thay đổi �ịa chỉ Email"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "Thay đổi mật khẩu"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "Thay đổi Mật khẩu hoặc Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "Mã xác nhận đã được gửi lại!"
 
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
-msgstr "Tài khoản của bạn %1$s đã được xóa thành công. Nếu bạn muốn quay lại lúc nào đó, bạn có thể đăng kí lại trên <a href=\"%2$s\">trang đăng kí</a>."
+msgstr ""
+"Tài khoản của bạn %1$s đã được xóa thành công. Nếu bạn muốn quay lại lúc nào "
+"đó, bạn có thể đăng kí lại trên <a href=\"%2$s\">trang đăng kí</a>."
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Cộng đồng Tiện �ch Mozilla rất buồn khi thấy bạn b� đi."
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "Xác nhận Mật khẩu"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "Xóa tài khoản của tôi ngay bây gi�"
 
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
-msgstr "Bạn không thể xóa tài khoản của bạn nếu bạn được liệt kê là <a href=\"%1$s\">tác giả của bất kì tiện ích nào</a>. �ể xóa tài khoản của bạn, vui lòng nh� ngư�i khác trong nhóm phát triển của bạn xóa bạn kh�i danh sách tác giả của tiện ích đó. Sau đó bạn sẽ có thể xóa tài khoản của mình tại đây."
+msgstr ""
+"Bạn không thể xóa tài khoản của bạn nếu bạn được liệt kê là <a href=\"%1$s"
+"\">tác giả của bất kì tiện ích nào</a>. �ể xóa tài khoản của bạn, vui lòng "
+"nh� ngư�i khác trong nhóm phát triển của bạn xóa bạn kh�i danh sách tác giả "
+"của tiện ích đó. Sau đó bạn sẽ có thể xóa tài khoản của mình tại đây."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "Nêu bạn còn câu h�i nào, vui lòng liên hệt %1$s để được hỗ trợ."
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
-msgstr "Bạn cần xóa hộp \"Tôi hiểu...\" trước khi chúng tôi có thể xóa tài khoản của bạn."
+msgstr ""
+"Bạn cần xóa hộp \"Tôi hiểu...\" trước khi chúng tôi có thể xóa tài khoản của "
+"bạn."
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "Vui lòng nhập mật khẩu chính xác để thực hiện bước này."
 
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
-msgstr "Mội lỗi không rõ xảy ra khi đang xóa tài khoản của bạn. Vui lòng liên hệ %1$s và kèm theo vấn đ� để chúng tôi xóa nó cho bạn. Chúng tôi xin lỗi vì sự bất tiện này."
+msgstr ""
+"Mội lỗi không rõ xảy ra khi đang xóa tài khoản của bạn. Vui lòng liên hệ %1"
+"$s và kèm theo vấn đ� để chúng tôi xóa nó cho bạn. Chúng tôi xin lỗi vì sự "
+"bất tiện này."
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "Xác nhận xóa tài khoản"
 
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "Xóa Tài Khoản %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "Vĩnh biệt!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "Bạn sẽ không thể đăng nhập vào Tiện �ch Mozilla được nữa."
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
-msgstr "Khi nhấn \"xóa\" tài khoản của bạn sẽ bị <strong>xóa vĩnh viễn</strong>. �i�u đó có nghĩa là:"
+msgstr ""
+"Khi nhấn \"xóa\" tài khoản của bạn sẽ bị <strong>xóa vĩnh viễn</strong>. "
+"�i�u đó có nghĩa là:"
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
-msgstr "Các đánh giá và xếp hạng của bạn sẽ không bị xóa, nhưng chúng sẽ không còn được gán cho bạn."
+msgstr ""
+"Các đánh giá và xếp hạng của bạn sẽ không bị xóa, nhưng chúng sẽ không còn "
+"được gán cho bạn."
 
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
-msgstr "Nếu bạn có một vấn đ� riêng biệt nào đó, chúng tôi có thể giúp bạn. Vui lòng đừng xóa tài khoản của bạn bây gi�, mà hãy liên hệ chúng tôi tại %1$s và chúng tôi sẽ cố hết sức để hỗ trợ bạn giải quyết nó."
+msgstr ""
+"Nếu bạn có một vấn đ� riêng biệt nào đó, chúng tôi có thể giúp bạn. Vui lòng "
+"đừng xóa tài khoản của bạn bây gi�, mà hãy liên hệ chúng tôi tại %1$s và "
+"chúng tôi sẽ cố hết sức để hỗ trợ bạn giải quyết nó."
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "Tôi hiểu rằng bước này sẽ không thể hoàn tác được."
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "Ngư�i dùng �ã bị xóa"
 
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
-msgstr "Một email đã được gửi tới %1$s để xác nhận địa chỉ email mới của bạn. �ể thay đổi có hiệu lực, bạn cần nhấn lên liên kết được cung cấp trong email. Cho đến lúc đó, bạn vẫn có thể đăng nhập bằng địa chỉ email hiện tại."
+msgstr ""
+"Một email đã được gửi tới %1$s để xác nhận địa chỉ email mới của bạn. �ể "
+"thay đổi có hiệu lực, bạn cần nhấn lên liên kết được cung cấp trong email. "
+"Cho đến lúc đó, bạn vẫn có thể đăng nhập bằng địa chỉ email hiện tại."
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "Xóa tài khoản ngư�i dùng"
 
@@ -6633,10 +6169,10 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "Chào mừng đến với Tiện �ch %2$s.\n"
 "\n"
-"Hãy luôn tìm đ�c thêm thông tin tại trang web của <a href=\"http://vi.mozdev.org\">Mozilla Việt Nam</a>.\n"
-"\n"
-"Trước khi có thể sử dụng tài khoản mới bạn phải kích hoạt nó - đi�u này nhằm đảm bảo rằng địa chỉ email bạn dùng là hợp lệ và thuộc v� bạn.\n"
-"�ể kích hoạt tài khoản của bạn, hãy nhấn vào liên kết bên dưới hoặc chép và dán tòan bộ vào thanh địa chỉ trên trình duyệt:\n"
+"Trước khi có thể sử dụng tài khoản mới bạn phải kích hoạt nó - đi�u này nhằm "
+"đảm bảo rằng địa chỉ email bạn dùng là hợp lệ và thuộc v� bạn.\n"
+"�ể kích hoạt tài khoản của bạn, hãy nhấn vào liên kết bên dưới hoặc chép và "
+"dán tòan bộ vào thanh địa chỉ trên trình duyệt:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6646,18 +6182,20 @@ msgstr ""
 "-- �ội ngũ Tiện �ch %2$s"
 
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "Bạn đã yêu cầu thay đổi địa chỉ email trên Tiện �ch %2$s.\n"
 "\n"
-"Hãy luôn tìm đ�c thêm thông tin tại trang web của <a href=\"http://vi.mozdev.org\">Mozilla Việt Nam</a>.\n"
-"\n"
-"�ể xác nhận địa chỉ mới, vui lòng nhấn vào liên kết bên dưới hoặc chép và dán toàn bộ vào thanh địa chỉ trên trình duyệt:\n"
+"�ể xác nhận địa chỉ mới, vui lòng nhấn vào liên kết bên dưới hoặc chép và "
+"dán toàn bộ vào thanh địa chỉ trên trình duyệt:\n"
 "\n"
 "%1$s\n"
 "\n"
-"Bạn có 48 gi� để xác nhận địa chỉ mới. Nếu bạn không muốn thay đổi địa chỉ nữa, bạn chỉ cần b� qua email này.\n"
+"Bạn có 48 gi� để xác nhận địa chỉ mới. Nếu bạn không muốn thay đổi địa chỉ "
+"nữa, bạn chỉ cần b� qua email này.\n"
 "\n"
 "Cảm ơn!\n"
 "-- �ội ngũ Tiện �ch %2$s"
@@ -6665,7 +6203,7 @@ msgstr ""
 #: controllers/users_controller.php:168
 #, php-format
 msgid "user_email_confirm_subject"
-msgstr "Cảm ơn đã tham gia Tiện ích %s "
+msgstr "Cảm ơn đã tham gia Tiện �ch %s "
 
 #. This is the password reset email
 #. %1 is the pw reset URL, %2 is the application
@@ -6675,9 +6213,9 @@ msgid "user_email_pwreset"
 msgstr ""
 "Khôi phục Mật khẩu Tiện ích %2$s\n"
 "\n"
-"Hãy luôn tìm đ�c thêm thông tin tại trang web của <a href=\"http://vi.mozdev.org\">Mozilla Việt Nam</a>.\n"
-"\n"
-"Nhận được yêu cầu khôi phục mật khẩu cho tài khoản này trên addons.mozilla.org. �ể thay đổi mật khẩu vui lòng nhấn vào liên kết sau đây, hoặc dán nó vào thanh địa chỉ trên trình duyệt:\n"
+"Nhận được yêu cầu khôi phục mật khẩu cho tài khoản này trên addons.mozilla."
+"org. �ể thay đổi mật khẩu vui lòng nhấn vào liên kết sau đây, hoặc dán nó "
+"vào thanh địa chỉ trên trình duyệt:\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6686,115 +6224,90 @@ msgstr ""
 "Cảm ơn,\n"
 "-- �ội ngũ Tiện �ch  %2$s"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
-msgstr "Khôi phục mật khẩu Tiện ích %s"
+msgstr "Khôi phục mật khẩu Tiện �ch %s"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "Lá»—i!"
 
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
-msgstr "Vuil lòng xác nhận thay đổi địa chỉ email trên Tiện ích %1$s"
+msgstr "Vuil lòng xác nhận thay đổi địa chỉ email trên Tiện �ch %1$s"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "Thành công!"
 
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
-msgstr "�ịa chỉ email của bạn đã được thay đổi thành công. Kể từ bây gi�, hãy dùng %1$s để đăng nhập."
-
-#: views/users/edit.thtml:134
-#: views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "V� tôi"
-
-#: views/users/edit.thtml:135
-#: views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr "Giới thiệu bản thân bạn trước cộng đồng, nếu bạn thích! Văn bản này sẽ xuất hiện công khai trên trang thông tin ngư�i dùng của bạn. Dấu ngắt dòng vẫn được giữ nguyên, nhưng HTML sẽ không được dùng."
+msgstr ""
+"�ịa chỉ email của bạn đã được thay đổi thành công. Kể từ bây gi�, hãy dùng %1"
+"$s để đăng nhập."
 
-#: views/users/pwreset.thtml:77
-#: views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "Xác nhận mật khẩu"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "Hiển thị các bộ sưu tập mà tôi đã tạo trong hồ sơ ngư�i dùng của tôi"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "Hiển thị các bộ sưu tập ưa thích trong hồ sơ ngư�i dùng của tôi"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "Chỉnh sửa hồ sơ ngư�i dùng cho %s"
 
-#: views/users/pwreset.thtml:52
-#: views/users/login.thtml:81
-#: views/users/register.thtml:63
-#: views/users/edit.thtml:187
+#: views/users/pwreset.thtml:52 views/users/login.thtml:81
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "�ịa chỉ email"
 
-#: views/users/register.thtml:78
-#: views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "Tên"
 
-#: views/users/register.thtml:94
-#: views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "Ẩn địa chỉ email"
 
-#: views/users/register.thtml:98
-#: views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "URL trang web"
 
-#: views/users/register.thtml:84
-#: views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "H�"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "Ngư�i dùng �ăng nhập"
 
-#: views/users/pwreset.thtml:72
-#: views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "Mật khẩu mới"
 
-#: views/users/register.thtml:89
-#: views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "Tên nick"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "Mật khẩu cũ"
 
-#: views/users/edit.thtml:97
-#: views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "Thao tác Khác"
 
-#: views/users/login.thtml:85
-#: views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "Mật khẩu"
 
@@ -6802,60 +6315,66 @@ msgstr "Mật khẩu"
 msgid "user_form_registration"
 msgstr "�ăng kí Ngư�i dùng Mới"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "Nhớ tôi trên máy tính này"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "Hiện hộp cát?"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "LÆ°u"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "�ăng nhập"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "�ăng kí"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "Ngư�i dùng trên Tiện ích %s kể từ"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "Tạo một tài khoản mới"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "Tính tương thích Tiện ích (đặc biệt khuyến nghị)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "Các sự kiện và cuộc thi sắp diễn ra"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "Hiện tại không có thông báo nào để bạn cấu hình."
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
-msgstr "Thỉnh thoảng, Mozilla có thể gửi email cho bạn v� các bản phát hành sắp có và các sự kiện liên quan đến tiện ích. Vui lòng ch�n chủ đ� mà bạn thích bên dưới:"
+msgstr ""
+"Thỉnh thoảng, Mozilla có thể gửi email cho bạn v� các bản phát hành sắp có "
+"và các sự kiện liên quan đến tiện ích. Vui lòng ch�n chủ đ� mà bạn thích bên "
+"dÆ°á»›i:"
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
-msgstr "Mozilla bảo lưu quy�n liên hệ với cá nhân bạn v� các mối quan tâm đối với tiện ích được lưu trữ trên đây của bạn."
+msgstr ""
+"Mozilla bảo lưu quy�n liên hệ với cá nhân bạn v� các mối quan tâm đối với "
+"tiện ích được lưu trữ trên đây của bạn."
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
-msgstr "Có lỗi trong các thay đổi mà bạn đã tạo. Vui lòng sửa chúng và gửi lại."
+msgstr ""
+"Có lỗi trong các thay đổi mà bạn đã tạo. Vui lòng sửa chúng và gửi lại."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "Hồ sơ đã được cập nhật."
 
@@ -6868,15 +6387,15 @@ msgstr "Khôi phục mật khẩu cho %s"
 msgid "user_pwreset_header"
 msgstr "Khôi phục Mật khẩu"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "Quên mật khẩu?"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "Liên kết để khôi phục mật khẩu đã được gửi tới địa chỉ email của bạn."
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "Mật khẩu đã được khôi phục thành công"
 
@@ -6888,7 +6407,7 @@ msgstr "Gửi lên thay đổi mật khẩu"
 msgid "user_pwreset_submit_sendlink"
 msgstr "Gửi liên kết khôi phục mật khẩu"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "Tiện ích %s"
@@ -6897,59 +6416,52 @@ msgstr "Tiện ích %s"
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
-msgstr "Một liên kết để kích hoạt tài khoản đã được gửi bằng email đến địa chỉ %1$s của bạn. Bạn phải nhấn vào nó trước khi bạn có thể đăng nhập vào Tiện �ch %2$s."
+msgstr ""
+"Một liên kết để kích hoạt tài khoản đã được gửi bằng email đến địa chỉ %1$s "
+"của bạn. Bạn phải nhấn vào nó trước khi bạn có thể đăng nhập vào Tiện �ch %2"
+"$s."
 
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
-msgstr "Một email đã được gửi tới địa chỉ %1$s của bạn để xác nhận tài khoản của bạn. Trước khi có thể đăng nhập, bạn phải kích hoạt tài khoản bằng cách nhấn lên liên kết trong email này."
+msgstr ""
+"Một email đã được gửi tới địa chỉ %1$s của bạn để xác nhận tài khoản của "
+"bạn. Trước khi có thể đăng nhập, bạn phải kích hoạt tài khoản bằng cách nhấn "
+"lên liên kết trong email này."
 
 #: views/users/activatefirst.thtml:51
 msgid "user_register_confirmation_link_text"
 msgstr "gửi lại thư xác nhận"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "Chúc mừng! Tài khoản của bạn đã được tạo thành công."
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr "<p>�ăng kí trên AMO là <strong>không bắt buộc</strong> nếu như bạn chỉ đơn giản muốn tải xuống và cài đặt tiện ích công cộng.</p><p>Bạn chỉ cần đăng kí nếu:</p><ul><li>Bạn muốn gửi đánh giá cho tiện ích</li><li>Bạn là một nhà phát triển tiện ích và muốn tải tiện ích của bạn lên AMO để lưu trữ</li></ul><p>Khi đăng kí thành công, bạn sẽ nhận được một email xác nhận tại địa chỉ mà bạn đã cung cấp. Vui lòng làm theo chỉ dẫn trong đó để xác nhận tài khoản của bạn.</p><p>Nếu muốn, bạn có thể đ�c <a href='%1$s' title='Lưu ý Pháp lí'>Lưu ý Pháp lí</a> và <a href='%2$s' title='Chính sách Riêng tư'>Chính sách Riêng tư</a> của chúng tôi.</p>"
-
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
 msgid "user_register_resend_confirmation_link"
-msgstr "Nếu bạn không nhận được email xác nhận, hãy chắc chắn rằng dịch vụ email không đánh dấu nó là \"thư rác\" hoặc \"spam\". Nếu cần, bạn có thể yêu cầu chúng tôi %1$s đến địa chỉ email đã nhắc tới ở trên."
+msgstr ""
+"Nếu bạn không nhận được email xác nhận, hãy chắc chắn rằng dịch vụ email "
+"không đánh dấu nó là \"thư rác\" hoặc \"spam\". Nếu cần, bạn có thể yêu cầu "
+"chúng tôi %1$s đến địa chỉ email đã nhắc tới ở trên."
 
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "Cảm ơn đã đăng kí và chào mừng đến %1$s!"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "Chào mừng đến addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81
-#: views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "Tên, h� hoặc tên nick là bắt buộc."
 
-#: views/users/edit.thtml:94
-#: views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "Bộ sưu tập"
-
-#: views/users/edit.thtml:95
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "Thông báo"
 
-#: views/users/edit.thtml:93
-#: views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "Hồ sơ Ngư�i dùng"
 
@@ -6957,64 +6469,50 @@ msgstr "Hồ sơ Ngư�i dùng"
 msgid "user_verified_okay"
 msgstr "�ã xác thực thành công!"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "Xóa Tài Khoản"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "Chỉnh sửa Tài khoản"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "V� tôi"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "Tiện ích bởi %1$s"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "Tên"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "Hồ sơ Ngư�i dùng"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "Bộ sưu tập bởi %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "�ịa chỉ email"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "Bộ sưu tập Ưa thích"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "Trang chủ"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "Tên nick"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "Thông tin Ngư�i dùng cho %1$s"
 
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "�ánh giá bởi %s"
 
-#: controllers/users_controller.php:330
-#: controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "Ngư�i dùng �ăng nhập"
 
@@ -7023,498 +6521,28 @@ msgstr "Ngư�i dùng �ăng nhập"
 #: views/users/login.thtml:53
 #, php-format
 msgid "users_login_sandbox_display_warning"
-msgstr "Tiện ích bạn đang tìm hiện đang trong hộp cát. Nếu bạn đã có một tài khoản trên Tiện �ch Mozilla, vui lòng đăng nhập, hoặc <a href=\"%1$s\">tìm hiểu thêm v� hộp cát.</a>"
+msgstr ""
+"Tiện ích bạn đang tìm hiện đang trong hộp cát. Nếu bạn đã có một tài khoản "
+"trên Tiện �ch Mozilla, vui lòng đăng nhập, hoặc <a href=\"%1$s\">tìm hiểu "
+"thêm v� hộp cát.</a>"
 
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
 #, php-format
 msgid "users_login_sandbox_page_warning"
-msgstr "Trang bạn đang tìm là một phần của hộp cát. Nếu bạn đã có một tài khoản trên Tiện �ch Mozilla, vui lòng đăng nhập, hoặc <a href=\"%1$s\">tìm hiểu thêm v� hộp cát.</a>"
+msgstr ""
+"Trang bạn đang tìm là một phần của hộp cát. Nếu bạn đã có một tài khoản trên "
+"Tiện �ch Mozilla, vui lòng đăng nhập, hoặc <a href=\"%1$s\">tìm hiểu thêm v� "
+"hộp cát.</a>"
 
-#: controllers/users_controller.php:223
-#: controllers/users_controller.php:225
+#: controllers/users_controller.php:223 controllers/users_controller.php:225
 msgid "users_pwreset_pagetitle"
 msgstr "Khôi phục Mật khẩu Ngư�i dùng"
 
-#: controllers/users_controller.php:90
-#: controllers/users_controller.php:92
+#: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "�ăng kí Ngư�i dùng Mới"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "Giấy phép mã nguồn cho %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "Xem tất cả những cái được thêm gần đây"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "Xem tất cả những cái được tải nhi�u nhất"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "Xem tất cả những cái được xếp hạng cao nhất"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "Tiện ích Kế"
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "Tiện ích Trước"
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "Phiên bản gần nhất tương thích với"
-#~ msgid "addons_display_version_history"
-#~ msgstr "Lịch sử Phiên bản Hoàn thiện"
-#~ msgid "addons_home_newest_header"
-#~ msgstr "Mới nhất:"
-#~ msgid "addons_home_popular_header"
-#~ msgstr "Thông dụng Nhất:"
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "Khuyên Dùng:"
-#~ msgid "addons_home_updated_header"
-#~ msgstr "Cập nhật Gần đây:"
-#~ msgid "addons_home_view_all"
-#~ msgstr "xem tất cả"
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "Xem tất cả các Tiện ích được khuyên dùng"
-#~ msgid "category_extra_highestrated"
-#~ msgstr "Xếp hạng Cao nhất Trước"
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "Cập nhật Gần đây Trước"
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "Thông dụng nhất Trước"
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "�ang tải"
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Hiện thêm Thông tin"
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "Phiên bản tiện ích này của bạn không cho thấy sự tương thích với Firefox %"
-#~ "1$s. Mozilla đang chuẩn bị cho ra mắt phiên bản Firefox kế tiếp trong nay "
-#~ "mai, cho nên vui lòng kiểm tra tiện ích của bạn trong phiên bản mới và "
-#~ "cập nhật thông tin v� tính tương thích cho nó. Bạn có thể tìm hiểu thêm "
-#~ "v� việc này <a href=\"%2$s\">tại đây</a>. �ây chỉ là một thông báo, bạn "
-#~ "vẫn có thể tiếp tục gửi phiên bản này lên addons.mozilla.org."
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "Tiện ích đã được vô hiệu hóa thành công"
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "Chỉnh sửa Tiện ích"
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "Tiện ích đã được kích hoạt thành công"
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "Mô tả Tiện ích"
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "EULA"
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "Trang chủ Tiện ích"
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "Tên của Tiện ích"
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "Chính sách Riêng tư"
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "Tóm tắt v� Tiện ích"
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "Email hỗ trợ"
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "URL hỗ trợ"
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "Chú ý Phiên bản"
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "�� cử Tiện ích"
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "Tiện ích đã được ứng cử thành công!"
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr ""
-#~ "Một số bài đánh giá của ngư�i dùng v� tiện ích (có thể dùng bài bên "
-#~ "ngoài)."
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "Vào trang %1$s để thay đổi những gì bạn gửi lên, hoặc %2$s để trở lại "
-#~ "Công cụ Nhà phát triển."
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "nhấn vào đây"
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "Chỉnh sửa Tiện ích"
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "Phiên bản này đã được đưa vào hộp cát trong khi ch� đợi sự đánh giá của "
-#~ "những ngư�i kiểm tra hộp cát và một ngư�i biên tập Tiện ích của Mozilla. "
-#~ "Bạn sẽ được thông báo qua e-mail sau khi m�i thứ đã được kiểm tra."
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "Bạn có thể đ�c thêm v� Hệ Thống �ánh Giá Hộp Cát %s."
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "tại đây"
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "Phiên bản này đã được đưa vào hộp cát để những ngư�i có kinh nghiệm dùng "
-#~ "thử. �ể nó được hiện trên trang công cộng, bạn phải %s tiện ích của bạn "
-#~ "và ch� cho xong quá trình đánh giá."
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "ứng cử"
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "Việc gửi lên tiện ích của bạn đã thực hiện thành công."
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr ""
-#~ "Vì tiện ích của bạn đã được tin tưởng, nên phiên bản này được chấp thuận "
-#~ "tự động để đưa sang khu vực công cộng."
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "Gửi Tiện �ch"
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "Tiện ích đã được cập nhật thành công"
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "Có thể bạn sẽ muốn %s để tăng sự quan tâm đối với tiện ích của bạn."
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "tải lên một phiên bản để xem trước"
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "không tìm thấy tác giả [%s]"
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "Xóa"
-#~ msgid "devcp_button_cancel"
-#~ msgstr "Hủy b�"
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "Bạn có chắc bạn muốn hủy b� việc gửi lên?"
-#~ msgid "devcp_button_next"
-#~ msgstr "Tiếp"
-#~ msgid "devcp_change_addontype"
-#~ msgstr "Thay đổi kiểu tiện ích:"
-#~ msgid "devcp_comments_updated"
-#~ msgstr "Bình luận của Nhà phát triển đã được cập nhật."
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "Thêm hình ảnh xem trước"
-#~ msgid "devcp_details_author"
-#~ msgstr "Tác giả"
-#~ msgid "devcp_details_authors"
-#~ msgstr "Tác giả"
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "Không"
-#~ msgid "devcp_details_categories"
-#~ msgstr "Phân mục"
-#~ msgid "devcp_details_category"
-#~ msgstr "Phân mục"
-#~ msgid "devcp_details_description"
-#~ msgstr "Mô tả"
-#~ msgid "devcp_details_disabled"
-#~ msgstr "Bị vô hiệu hóa"
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-#~ msgid "devcp_details_header_details"
-#~ msgstr "Chi tiết"
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "Bình luận của Nhà phát triển"
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "Xem trÆ°á»›c"
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "Phiên bản"
-#~ msgid "devcp_details_homepage"
-#~ msgstr "Trang chủ"
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "Không"
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "Không tiêu đ�"
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "Không có phần xem trước."
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "Cập nhật"
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "Email hỗ trợ"
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "Không có email hỗ trợ của nhà phát triển."
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "URL hỗ trợ"
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "Không có url hỗ trợ của nhà phát triển."
-#~ msgid "devcp_details_trusted"
-#~ msgstr "�ược tin tưởng"
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "Không tìm thấy phiên bản nào."
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "Hủy b� và quay trở lại"
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "�úng, vô hiệu hóa nó"
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "Bạn có chắc bạn muốn vô hiệu hóa tiện ích này?"
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "Vô hiệu hóa tiện ích này sẽ ẩn nó khi tìm kiếm và liệt kê. Không thể tải "
-#~ "nó xuống từ trang web và trình duyệt sẽ không hiện nó khi kiểm tra các "
-#~ "cập nhật. Tiện ích rồi cũng sẽ bị xóa, mặc dù vậy bạn vẫn có thể quay lại "
-#~ "đây và kích hoạt lại khi bạn muốn."
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "Vô hiệu hóa %s"
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "�úng, kích hoạt nó"
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "Bạn có chắc bạn muốn kích hoạt tiện ích này?"
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "Kích hoạt tiện ích này sẽ cho phép nó được hiện ra khi tìm kiếm và liệt "
-#~ "kê. Nó có thể được tải xuống từ trang web và trình duyệt."
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "Kích hoạt %s"
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "Thêm Tác Giả"
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "�ịa chỉ Email của Tác giả"
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "Xóa"
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "Không có phân mục nào cho kiểu tiện ích này."
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Truy�n tải không hoàn tất"
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "Không có tập tin nào được tải lên"
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Vượt quá dung lượng tải lên tối đa"
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "Tác giả"
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "Thêm Biểu Tượng"
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "Thay đổi Biểu tượng"
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "Cho phép ngư�i dùng xem tập tin nguồn trực tuyến"
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "Phân mục"
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "Bản địa Mặc định"
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "Chỉ xóa biểu tượng sẵn có"
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "Tập tin Biểu tượng Mới"
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "Biểu tượng"
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "thông tin bổ sung ngắn g�n (như là tên phương ngữ)"
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "Cập nhật"
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">tên địa danh "
-#~ "đơn giản</a>, như là 'vi-VN'"
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "Tập tin đã đánh dấu sẽ bị xóa."
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "Tập tin"
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "Chương trình �ích"
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "Không có tập tin nào."
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "Chú ý đối với Ngư�i đánh giá"
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "Cập nhật"
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr ""
-#~ "Tóm tắt có giới hạn tối đa 250 kí tự.\n"
-#~ "(Bạn đã nhập %s)"
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "Tên cho tiện ích này đã tồn tại trong cơ sở dữ liệu. Vui lòng chắc chắn "
-#~ "rằng: <br /><li>GUIDs của bạn đã khớp. Nguyên nhân thông dụng nhất của "
-#~ "lỗi này là vì GUIDs không khớp.</li><li>Bạn không thể có một mục bị trùng "
-#~ "trong cơ sở dữ liệu. Nếu như vậy, bạn phải cập nhật mục đó hoặc xóa nó và "
-#~ "thử lại.</li>"
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "Vui lòng mô tả các thay đổi trong lần cập nhật này."
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "Tất cả GUIDs tập tin chưa khớp"
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "Một phiên bản giống hệt tiện ích với n�n tảng này (%s) đã tồn tại."
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "Bạn phải cung cấp các chi tiết được yêu cầu để đ� cử."
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "Bạn không thể đ� cử một tiện ích được phát hành thử."
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "Bạn chỉ có thể đ� cử các tiện ích hiện có trong hộp cát."
-#~ msgid "devcp_error_saving"
-#~ msgstr "Lỗi xảy ra khi đang cố gắng lưu dữ liệu của bạn."
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "Bạn không có quy�n cập nhật tiện ích này."
-#~ msgid "devcp_file_addanother"
-#~ msgstr "Thêm một Tập tin N�n tảng Khác"
-#~ msgid "devcp_form_author_add"
-#~ msgstr "Thêm Tác Giả"
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "Xóa"
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr ""
-#~ "Phân mục cho kiểu tiện ích của bạn sẽ hiện hữu trong bước tiếp theo."
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "Không có phân mục nào cho kiểu tiện ích này."
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "Vui lòng nhập mô tả cho tiện ích của bạn."
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "Vui lòng nhập tên cho tiện ích của bạn."
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "Vui lòng ch�n kiểu cho tiện ích bạn gửi lên."
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "Vui lòng nhập tóm tắt cho tiện ích của bạn."
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "Tập tin Tiện ích"
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "Tập tin Tiện ích 2"
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "Tập tin Tiện ích 3"
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "Kiểu của Tiện ích"
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "Cho phép ngư�i dùng xem tập tin nguồn trực tuyến"
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "�ịa chỉ Email của Tác giả"
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "Tác giả"
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "Phân mục"
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "Bản địa Mặc định"
-#~ msgid "devcp_form_label_description"
-#~ msgstr "Mô tả"
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "Th�a thuận Giấy phép Ngư�i dùng Cuối  (EULA)"
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "Tiện ích này yêu cầu có phần m�m bên ngoài"
-#~ msgid "devcp_form_label_files"
-#~ msgstr "Tập tin"
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "Trang chủ"
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "Tập tin Biểu tượng"
-#~ msgid "devcp_form_label_name"
-#~ msgstr "Tên"
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "N�n tảng được Hỗ trợ"
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "�ây là bản phát hành thử"
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "Chính sách Riêng tư"
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "�ây là tiện ích liên quan đến trang web"
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "Tóm tắt"
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "Email Hỗ Trợ"
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "URL Hỗ Trợ"
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "Ứng dụng �ích"
-#~ msgid "devcp_form_label_version"
-#~ msgstr "Phiên bản"
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "Ghi chú Phiên bản"
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "Không"
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "Ghi chú cho Ngư�i đánh giá"
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr ""
-#~ "Bởi vì tiện ích của bạn được tin tưởng, vui lòng ch�n nơi hiển thị phiên "
-#~ "bản này:"
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "Công cộng"
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "Hộp cát"
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "Th�a thuận Nhà phát triển"
-#~ msgid "devcp_header_step1"
-#~ msgstr "BÆ°á»›c 1"
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "Tải lên Tập tin"
-#~ msgid "devcp_header_step2"
-#~ msgstr "BÆ°á»›c 2"
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "Chi tiết v� Tiện ích"
-#~ msgid "devcp_header_step3"
-#~ msgstr "BÆ°á»›c 3"
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "Chi tiết v� Phiên bản"
-#~ msgid "devcp_header_step4"
-#~ msgstr "BÆ°á»›c 4"
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "Bản địa hóa"
-#~ msgid "devcp_header_step5"
-#~ msgstr "BÆ°á»›c 5"
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "Thành công"
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "Tiện ích của Tôi"
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "Trở lại phần chi tiết tiện ích"
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "Tự động dò kiểu tiện ích: %s."
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "Bản địa mặc định cho tiện ích này (%1$s [%2$s]) khác với bản địa đã ch�n "
-#~ "của bạn (%3$s [%4$s]). Các phần sau nên được hoàn tất trong %1$s."
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "Không đúng?"
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "Bạn có chắc bạn muốn xóa tập tin này?"
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "B� qua việc cập nhật thông tin cho tiện ích hiện tại của tôi"
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr ""
-#~ "Việc gửi lên tiện ích hiện đang bị vô hiệu hóa. Vui lòng kiểm tra lại sau."
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "Tôi Chấp Thuận"
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "Tôi Từ Chối"
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "Tiện ích này bị vô hiệu hóa bởi quản trị viên."
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "Bị vô hiệu hóa"
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "Tin cậy"
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "Bạn không có tiện ích nào. Nhấn %s để gửi lên một cái."
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "vào đây"
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "Vui lòng nhớ %s cho giao diện của bạn."
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "tải lên một ảnh xem trước"
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "Chỉnh sửa Phiên bản"
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "Phiên bản được cập nhật thành công."
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "Má»›i"
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "�ã cập nhật"
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Tuổi của Tiện ích"
-#~ msgid "editors_th_addontypes"
-#~ msgstr "Kiểu của Tiện ích"
-#~ msgid "editors_th_age"
-#~ msgstr "Tuổi"
-#~ msgid "editors_th_applications"
-#~ msgstr "Ứng dụng"
-#~ msgid "editors_th_platforms"
-#~ msgstr "N�n tảng"
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "Kiểu gửi lên"
-#~ msgid "error_notice"
-#~ msgstr "Cảnh báo"
-#~ msgid "forum_save"
-#~ msgstr "LÆ°u"
-#~ msgid "home"
-#~ msgstr "trang chủ"
-#~ msgid "nav_category_plugins"
-#~ msgstr "Phần bổ trợ"
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "Các tiện ích Thử nghiệm"
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "Trở v� trang trước"
-#~ msgid "pagination_page_number_title"
-#~ msgstr "�ây là trang %1$s trong %2$s"
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s tiện ích phù hợp"
-#~ msgstr[1] "%s tiện ích phù hợp"
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "RSS feed của dữ liệu tóm tắt"
-
diff --git a/site/app/locale/vi/pages/about.thtml b/site/app/locale/vi/pages/about.thtml
index 8937c8c..0fbd02d 100644
--- a/site/app/locale/vi/pages/about.thtml
+++ b/site/app/locale/vi/pages/about.thtml
@@ -38,7 +38,7 @@
     lượng lớn ngư�i dùng.
   </li>
   <li>
-    Hãy nói cho bạn bè cùng biết!  <a href="http://spreadfirefox.com/">Lan truy�n Firefox</a>
+    Hãy nói cho bạn bè cùng biết!  <a href="http://spreadfirefox.com/">Phát tán Firefox</a>
     và cho m�i ngư�i biết những tiện ích mà bạn dùng.
   </li>
   <li>
diff --git a/site/app/locale/vi/pages/faq.thtml b/site/app/locale/vi/pages/faq.thtml
index 6a89e30..d91ed36 100644
--- a/site/app/locale/vi/pages/faq.thtml
+++ b/site/app/locale/vi/pages/faq.thtml
@@ -54,7 +54,7 @@
 <dt id="experimental-addons">Tiện ích thử nghiệm là gì?</dt> 
 <dd>Tiện ích Thử nghiệm thư�ng là các tiện ích mới nhất được lưu trữ trên AMO. Những tiện ích này chưa trải qua việc đánh giá của biên tập viên (vốn cần để trở thành công cộng) và thư�ng chỉ mới ở một mức độ chất lượng thuộc dạng phát hành thử. Vì chúng chưa được đánh giá, nhi�u khả năng sẽ có lỗi nào đó khi bạn cài đặt.</dd>
 
-<dt id="recommended-addons">Các tiện ích được Khuyến nghị và Khuyên dùng là gì?</dt>
+<dt>Các tiện ích được Khuyến nghị và Khuyên dùng là gì?</dt>
 <dd>Nhóm AMO khuyên dùng một bộ tiện ích đại diện cho một số các tiện ích tốt nhất theo cả ý nghĩa tiện lợi và trải nghiệm nói chung.  Các tiện ích được Khuyên dùng này xuất hiện trên các trang phân mục riêng lẻ.  Một số các tiện ích này cũng được xếp xoay vòng ở trang đầu của AMO dưới dạng các tiện ích được Khuyến nghị.  �ây không phải là một danh sách toàn diện, và chúng tôi cập nhật danh sách này hàng tháng để liên tục cho ngư�i dùng thấy một bộ mới.  Vài đi�u chúng tôi luôn cân nhắc khi khuyên dùng các tiện ích này: chất lượng, mức độ phổ biến, tính độc đáo, và tiện ích đã được giới thiệu hay chưa.</dd>
 
 </dl>
diff --git a/site/app/locale/vi/pages/statistics_help.thtml b/site/app/locale/vi/pages/statistics_help.thtml
index a8961ad..53fa5d3 100644
--- a/site/app/locale/vi/pages/statistics_help.thtml
+++ b/site/app/locale/vi/pages/statistics_help.thtml
@@ -4,4 +4,4 @@
 <p>Số lần tải được cập nhật mỗi ngày và chỉ tính việc tải tiện ích gốc, không tính việc tải bản cập nhật.</p>
 
 <h4>Ping cập nhật</h4>
-<p>Các tiện ích được tải sẽ kiểm tra cập nhật một lần mỗi ngày, và tổng số các ping cập nhật này được g�i là Ngư�i dùng Hoạt động Mỗi ngày. Ngư�i dùng Hoạt động Mỗi ngày (Active Daily Users - ADU) có thể được xem theo phiên bản tiện ích, hệ đi�u hành, trạng thái tiện ích, và chương trình.</p>
\ No newline at end of file
+<p>Các tiện ích được tải sẽ kiểm tra cập nhật một lần mỗi ngày, và tổng số các ping cập nhật này được g�i là Ngư�i dùng Hoạt động Mỗi ngày. Ngư�i dùng Hoạt động Mỗi ngày (Active Daily Users - ADU) có thể được xem theo phiên bản tiện ích, hệ đi�u hành, trạng thái tiện ích, và chương trình. Dữ liệu này hiện được ghi lại vào mỗi thứ Tư hàng tuần.</p>
\ No newline at end of file
diff --git a/site/app/locale/zh_CN/LC_MESSAGES/messages.po b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
index 0522e6d..5af8e8d 100644
--- a/site/app/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
@@ -16,173 +16,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "放弃安装"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "现在下载 %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "��并下载"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "��并安装"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "公开"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "沙盒"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "已更新 %s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "版本 %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "次下载"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "总下载�"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "周下载�"
 
 # %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s \"%2$s\" 个附加组件"
 msgstr[1] "%1$s \"%2$s\" 个附加组件"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "个结果�页"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "排���:"
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "试验性的"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "推�的"
 
 # %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s 无法在 %2$s 上使用。"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "返回 %1$s..."
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "返回��列表..."
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "评分:"
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "��:"
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "�交你的��"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "�交对 %s 的��"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "标题/摘�:"
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "删除"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "回�"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "你确定�删除该��？"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "�"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "是"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "删除��"
 
@@ -191,7 +182,7 @@ msgid "addon_review_deleted_successfully"
 msgstr "���功删除。"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "编辑对 %s 的��"
@@ -204,17 +195,17 @@ msgstr ""
 "标记��有问题: 标记��内容应该在10至100个字符之间；你输入了 %1$s 个字符。"
 
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "请注�：你的����过编辑审核以��能显示在公开网站上。"
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "开�者回�:"
 
 # %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
@@ -233,32 +224,45 @@ msgstr "对 %s 的��"
 
 # %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "%1$s 于 %2$s 回�"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "开�者回�:"
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "你的��已��功�存。谢谢�"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "由 %1$s �表于 %2$s"
 
 # %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "日期：%2$s（打 %3$s 分）"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "下一个附加组件"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "�一个附加组件"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "该版本的永久链接"
@@ -267,29 +271,28 @@ msgstr "该版本的永久链接"
 # %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
 #, fuzzy
 msgid "addon_versions_getlatestversion"
 msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�交"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "查看作者介�"
 
 # %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 #, fuzzy
 msgid "addons_browse_all_themes_title"
 msgstr "Browse all Themes :: %1$s Add-ons"
 
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "�览 %s"
@@ -298,115 +301,63 @@ msgstr "�览 %s"
 # %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 #, fuzzy
 msgid "addons_browse_categories_header_theme"
 msgstr "Browse %1$s Themes :: %2$s Add-ons"
 
-#: views/addons/display.thtml:249
-#, fuzzy
-msgid "addons_display_a_license_what"
-msgstr "What's this?"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "新增��"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "更多详情"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "分类"
 
-#: views/addons/display.thtml:482
-#, fuzzy
-msgid "addons_display_collection_add"
-msgstr "Add to a collection:"
-
-#: views/addons/display.thtml:491
-#, fuzzy
-msgid "addons_display_collection_add_new"
-msgstr "New Collection..."
-
-#: views/addons/display.thtml:487
-#, fuzzy
-msgid "addons_display_collection_add_select_one"
-msgstr "Select a collection..."
-
-#: views/addons/display.thtml:493
-#, fuzzy
-msgid "addons_display_collection_add_submit"
-msgstr "Publish"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-#, fuzzy
-msgid "addons_display_collection_publish_success"
-msgstr "%1$s has been added to the %2$s collection."
-
-#: views/addons/display.thtml:483
-#, fuzzy
-msgid "addons_display_collection_whatsthis"
-msgstr "What's this?"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-#, fuzzy
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "and %1$s more collection"
-msgstr[1] "and %1$s more collections"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "��详情"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�喜欢"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "编辑你的��"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "该附加组件有自己的��策略。"
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "很�喜欢"
 
-#: views/addons/display.thtml:462
-#, fuzzy
-msgid "addons_display_header_collections"
-msgstr "Related Collections"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "开�者留言"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "主页"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-#, fuzzy
-msgid "addons_display_header_license"
-msgstr "Source Code License"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "��"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "技术支�"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "喜欢"
 
@@ -414,26 +365,22 @@ msgstr "喜欢"
 msgid "addons_display_long_description"
 msgstr "详细�述"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "太喜欢了"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "更多图片"
 
-#: views/addons/display.thtml:465
-#, fuzzy
-msgid "addons_display_nocollections"
-msgstr "This add-on is not yet in any collections."
-
 # %1$s is either an author's name or a comma separated list of authors. Using
 # the list doesn't make sense in the English plural form so we ignore the
 # variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 #, fuzzy
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
@@ -443,14 +390,14 @@ msgstr[1] "Other add-ons by these authors"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr ""
@@ -462,7 +409,7 @@ msgstr ""
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr ""
@@ -473,7 +420,7 @@ msgstr ""
 "版本中修�缺陷的时候也无法通知你。"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr ""
@@ -483,15 +430,16 @@ msgstr ""
 "件地�，所以他们也就无法�系你获�更进一步的信�，在未�版本中修�缺陷的时候"
 "也无法通知你。"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "评分"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "很喜欢"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "��在评论中�交缺陷报告。我们并��许附加组件的开�者看到你的邮件地�，而他"
@@ -499,47 +447,52 @@ msgstr ""
 
 # %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">审查指�</a>"
 
 # %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
 msgstr ""
 "查阅 <a href=\"%1$s\">支�相关的章节</a> 以了解从何处获�有关该附加组件的帮"
 "助。"
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "�存"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "查阅所有 %1$s "
 
 # %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "查阅所有�� (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "查看所有版本"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "完整的版本历�"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "查看�代�"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "查看统计"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "你觉得怎样？"
 
@@ -547,356 +500,230 @@ msgstr "你觉得怎样？"
 msgid "addons_display_workswith"
 msgstr "兼容于:"
 
-#: views/addons/home.thtml:112
-#, fuzzy
-msgid "addons_home_browse_new"
-msgstr "Just Added"
-
-#: views/addons/home.thtml:110
-#, fuzzy
-msgid "addons_home_browse_popular"
-msgstr "Popular"
-
-#: views/addons/home.thtml:108
-#, fuzzy
-msgid "addons_home_browse_recommended"
-msgstr "Recommended"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-#, fuzzy
-msgid "addons_home_browse_subscribe"
-msgstr "Subscribe"
-
-#: views/addons/home.thtml:101
-#, fuzzy
-msgid "addons_home_browse_title"
-msgstr "Browse Add-ons"
-
-#: views/addons/home.thtml:114
-#, fuzzy
-msgid "addons_home_browse_updated"
-msgstr "Updated"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "作者"
 
-#: views/addons/home.thtml:169
-#, fuzzy
-msgid "addons_home_collection_popular_title"
-msgstr "Popular Collections"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-#, fuzzy
-msgid "addons_home_collections"
-msgstr "Collections"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-#, fuzzy
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> add-on"
-msgstr[1] "<strong>%1$s</strong> add-ons"
-
-#: views/addons/home.thtml:196
-#, fuzzy
-msgid "addons_home_collections_all"
-msgstr "View All Collections"
-
-#: views/addons/home.thtml:162
-#, fuzzy
-msgid "addons_home_collections_intro"
-msgstr ""
-"Collections are a way for you to categorize, mix, match and mingle add-ons.  "
-"Subscribe to collections created by other users or create your own."
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-#, fuzzy
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> subscriber"
-msgstr[1] "<strong>%1$s</strong> subscribers"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "推�"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871
-#: controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
 "通过附加组件扩展 %1$s，建立个性化的�览体验。�览以下内容打造属于你自己的 %1"
 "$s 。"
 
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-#, fuzzy
-msgid "addons_home_introduction_collection_link"
-msgstr "Like these? Find more add-ons in %1$s."
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "最新的:"
 
-#: views/elements/amo2009/teaser_collections.thtml:60
-#, fuzzy
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>Over 5000 free extras</strong> that let you customize and extend "
-"Firefox to meet your needs."
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-#, fuzzy
-msgid "addons_home_introduction_header"
-msgstr "What are Add-ons?"
-
-#: views/elements/amo2009/teaser_collections.thtml:72
-#, fuzzy
-msgid "addons_home_introduction_install"
-msgstr ""
-"<strong>Easy to install</strong>, get notified when updates are available."
-
-#: views/elements/amo2009/teaser_collections.thtml:45
-#, fuzzy
-msgid "addons_home_introduction_name"
-msgstr "Introduction"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-#, fuzzy
-msgid "addons_home_introduction_themes"
-msgstr ""
-"Toolbars, themes and search providers that <strong>help you perform common "
-"tasks.</strong>"
-
-#: views/addons/home.thtml:161
-#, fuzzy
-msgid "addons_home_new_indicator"
-msgstr "NEW!"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "其他应用程�"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
 #: controllers/reviews_controller.php:425
-#: controllers/search_controller.php:185 controllers/search_controller.php:297
-#: controllers/search_controller.php:301 controllers/addons_controller.php:147
-#: controllers/addons_controller.php:280 controllers/addons_controller.php:370
-#: controllers/addons_controller.php:667 controllers/addons_controller.php:874
-#: controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543
-#: controllers/editors_controller.php:64 controllers/pages_controller.php:132
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
 #: controllers/groups_controller.php:65 controllers/groups_controller.php:71
 #: controllers/groups_controller.php:89 controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s 附加组件"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, fuzzy, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>add-on downloaded</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons downloaded</span>"
-
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, fuzzy, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>add-on in use</span>"
-msgstr[1] "<strong>%1$s</strong> <span>add-ons in use</span>"
-
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "最热门的："
+
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "推�："
+
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "最近更新:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "查看全部"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "查看全部新建立的附加组件"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "查看全部热门的附加组件"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "查看全部推�的附加组件"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "查看所有近期更新的附加组件"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
 "<ol><li>点击下�的链接�存文件。</li><li>在 Mozilla Sunbird 中，从 工具 ��"
 "打开 附加组件。</li><li>点击 安装 按钮，然�找到/选择你下载的文件并点击 \"确"
 "定\".</li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "如何在 Sunbird 中安装"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
 "<ol><li>�键点击以下链接，选择 \"链接�存为...\" 将文件下载并�存到你的硬盘"
 "上。</li><li>在 Mozilla Thunderbird 中，从工具��打开附加组件。</li><li>点击"
 "安装按钮，定�/选择你下载的文件，并点击\"确定\"。</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "如何在 Thunderbird 中安装"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "显示试验性的附加组件"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "�交"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "作者"
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linux 平�"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X 平�"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windows 平�"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
 "本页仅列出了一些最常用和最热门的�件。�查找基于Mozilla�览器的其他�用�件信"
 "�，请访问 %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "�查找的�件未在这里列出？"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
 "�件能帮助�览器实现特定的功能，诸如显示特殊格�的图片或者播放多媒体文件。这"
 "与扩展有所��，�者是用于改�或者加强现有的功能。"
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 常用�件"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "�件"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "说明文档: "
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
 msgstr "安装 %s 之�，你必须接�以下《最终用户许��议》。"
 
 # %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 的预览图"
 
-#: views/addons/category_landing.thtml:135
-#, fuzzy
-msgid "addons_recently_added"
-msgstr "Recently Added"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
 "这里有数�众多的附加组件，其中一些适�大多数人。下�列出了一些最热门的，你�"
 "以开始用用看�"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "推�的附加组件"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "推�的附加组件"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "附加资�"
 
 # link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 开�者中心"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr "抱歉，你需�基于Mozilla的�览器（例如Firefox）�安装�索�件。"
 
@@ -910,44 +737,45 @@ msgstr ""
 # %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "访问 %2$s 学习如何 %1$s 。"
 
 # link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr "/cn/docs/为Firefox编写开放�索�件"
 
 # link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "建立自己的�索�件"
 
 # %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "访问 %1$s �览更多的�索引擎"
 
 # link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "�索引擎"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "特别感谢Mycroft项目团队在Firefox �索引擎方�的贡献"
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
 #, fuzzy
 msgid "addons_share_button_text"
 msgstr "Share this"
@@ -989,17 +817,17 @@ msgstr "未完�版本"
 msgid "addons_status_nominated"
 msgstr "在沙盒中; �交公开�布"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "在沙盒中; 正在审查中"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "公开�布"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "在沙盒中"
@@ -1008,37 +836,25 @@ msgstr "在沙盒中"
 msgid "addons_status_unknown"
 msgstr "未知"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "查看有关该附加组件的更多信�"
 
-#: views/addons/category_landing.thtml:151
-#, fuzzy
-msgid "addons_top_downloads"
-msgstr "Top Downloads"
-
-#: views/addons/category_landing.thtml:165
-#, fuzzy
-msgid "addons_top_rated"
-msgstr "Top Rated"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "�心，这里都是旧版本"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "显示这些版本是为了�考和测试目的，如果是正常使用，请安装最新版本的附加组件。"
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "版本历�记录"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 版本历�"
@@ -1073,463 +889,149 @@ msgstr "组管�员"
 msgid "admin_group_saved"
 msgstr "组已�存"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "高级�索"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "任何时间"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "任�"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "任�"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "应用程�"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "关键字匹�"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "上次更新"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "�字"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "最新的"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "过去3个月"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "过去6个月"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "昨天"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "上个月"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "上周"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "去年"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "�页"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "系统平�"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "热门的"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "评分"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "排���"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "到"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "切�高级�索模�"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "类别"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "版本"
 
-#: views/elements/amo2009/pagination.thtml:42
-#, fuzzy
-msgid "amo2009_pagination_next_page"
-msgstr "Next"
-
-#: views/elements/amo2009/pagination.thtml:41
-#, fuzzy
-msgid "amo2009_pagination_previous_page"
-msgstr "Prev"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "忽略版本检查"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "这是一个针对旧版本Firefox的附加组件"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
 "你�以 <a href=\"%1$s\">�试更早的版本</a> 或者 <a href=\"#\" onclick=\"%2$s"
 "\">忽略这个检查</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "<a href=\"%1$s\">旧版本</a> 下�以使用"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr "这个附加组件需�尚未�布的 <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">�级 Firefox</a> 以便使用该附加组件"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-#, fuzzy
-msgid "audit_addon_status"
-msgstr "%1$s changed the status of %2$s to %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-#, fuzzy
-msgid "audit_admin_default"
-msgstr "%1$s committed unknown admin action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-#, fuzzy
-msgid "audit_admin_feature_remove"
-msgstr "%1$s removed feature %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-#, fuzzy
-msgid "audit_application_create"
-msgstr "%1$s created application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-#, fuzzy
-msgid "audit_application_edit"
-msgstr "%1$s edited application %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-#, fuzzy
-msgid "audit_appversion_create"
-msgstr "%1$s created version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-#, fuzzy
-msgid "audit_appversion_delete"
-msgstr "%1$s deleted version %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-#, fuzzy
-msgid "audit_config"
-msgstr "%1$s changed config '%2$s' from '%3$s' to '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-#, fuzzy
-msgid "audit_editor_default"
-msgstr "%1$s committed unknown editor action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-#, fuzzy
-msgid "audit_editor_feature_remove"
-msgstr "%1$s removed addon %2$s from feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-#, fuzzy
-msgid "audit_feature_add"
-msgstr "%1$s added addon %2$s to feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-#, fuzzy
-msgid "audit_feature_edit"
-msgstr "%1$s changed a feature for %2$s locale"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-#, fuzzy
-msgid "audit_feature_locale_change"
-msgstr "%1$s changed locales for addon %2$s on feature list"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-#, fuzzy
-msgid "audit_file_recalchash"
-msgstr "%1$s recalculated the hash for file %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-#, fuzzy
-msgid "audit_group_addmember"
-msgstr "%1$s added %2$s to group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-#, fuzzy
-msgid "audit_group_associated"
-msgstr "%1$s associated themselves with %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-#, fuzzy
-msgid "audit_group_create"
-msgstr "%1s created group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-#, fuzzy
-msgid "audit_group_delete"
-msgstr "%1$s deleted group %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-#, fuzzy
-msgid "audit_group_edit"
-msgstr "%1$s edited group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-#, fuzzy
-msgid "audit_group_removemember"
-msgstr "%1$s removed %2$s from group %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-#, fuzzy
-msgid "audit_l10n_default"
-msgstr "%1$s committed unknown action %2$s for %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-#, fuzzy
-msgid "audit_modify_locked_group"
-msgstr "%1$s attempted to modify locked group %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-#, fuzzy
-msgid "audit_modify_other_locale"
-msgstr "%1$s attempted to modify translations in %2$s without permission"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-#, fuzzy
-msgid "audit_platform_create"
-msgstr "%1$s created platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-#, fuzzy
-msgid "audit_platform_delete"
-msgstr "%1$s deleted platform %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-#, fuzzy
-msgid "audit_platform_edit"
-msgstr "%1$s edited platform %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-#, fuzzy
-msgid "audit_reauthentication_failure"
-msgstr "%1$s failed to re-authenticate to access %2$s."
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-#, fuzzy
-msgid "audit_response_create"
-msgstr "%1$s created response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-#, fuzzy
-msgid "audit_response_delete"
-msgstr "%1$s deleted response %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-#, fuzzy
-msgid "audit_response_edit"
-msgstr "%1$s edited response %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-#, fuzzy
-msgid "audit_review_approve"
-msgstr "%1$s approved review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-#, fuzzy
-msgid "audit_review_delete"
-msgstr "%1$s deleted review %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-#, fuzzy
-msgid "audit_security_default"
-msgstr "%1$s committed unknown security action %2$s to ID %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-#, fuzzy
-msgid "audit_tag_create"
-msgstr "%1$s created tag %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-#, fuzzy
-msgid "audit_tag_delete"
-msgstr "%1$s deleted category %2$s (ID %3$s)"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-#, fuzzy
-msgid "audit_tag_edit"
-msgstr "%1$s edited category %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-#, fuzzy
-msgid "audit_update_applications"
-msgstr "%1$s updated application translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-#, fuzzy
-msgid "audit_update_blog"
-msgstr "%1$s updated blog post translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-#, fuzzy
-msgid "audit_update_platforms"
-msgstr "%1$s updated platform translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-#, fuzzy
-msgid "audit_update_tags"
-msgstr "%1$s updated category translations for %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-#, fuzzy
-msgid "audit_user_edit"
-msgstr "%1$s edited %2$s's user information"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "按�称排�"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "最新附加组件"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "热门附加组件"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "按评分排�"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "最近更新的附加组件"
 
@@ -1538,920 +1040,105 @@ msgid "categories_current_title"
 msgstr "当�分类"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "分类"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "选择一个分类"
 
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "查看所有推�的附加组件"
+
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "评分最高的在�"
+
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "最近更新的在�"
+
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "最热门的在�"
+
 # %1 is the category name
 #. %1$s is the category name
-#: views/addons/searchengines.thtml:129
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
 #, php-format
 msgid "category_extra_see_all"
 msgstr "查看所有的 %1$s"
 
-#. %1$s is a number.
-#: models/collection.php:130
-#, fuzzy
-msgid "collection_description_limit"
-msgstr "The description should be less than %1$s characters."
-
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-#, fuzzy
-msgid "collection_detail_rss_title"
-msgstr "%s Collection"
-
-#: controllers/collections_controller.php:1065
-#, fuzzy
-msgid "collection_error_deleting_addon"
-msgstr "Error deleting add-on!"
-
-#: controllers/collections_controller.php:1051
-#, fuzzy
-msgid "collection_error_saving_addon"
-msgstr "Error saving add-on!"
-
-#: controllers/collections_controller.php:1080
-#, fuzzy
-msgid "collection_error_saving_comment"
-msgstr "Error saving comment!"
-
-#. %1$s is a number.
-#: models/collection.php:122
-#, fuzzy
-msgid "collection_name_limit"
-msgstr "The name should be less than %1$s characters."
-
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
 msgstr "未找到收��"
 
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-#, fuzzy
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"If you already know which add-ons you want to add to your collection, just "
-"start typing their names below. If you'd rather wait and do this later, just "
-"click %1$s now."
-
-#: views/collections/add.thtml:90
-#, fuzzy
-msgid "collections_add_formfield_firstaddons"
-msgstr "Choose your first add-ons"
-
-#: views/collections/add.thtml:48
-#, fuzzy
-msgid "collections_add_header"
-msgstr "Create a Collection"
-
-#: views/collections/add.thtml:97
-#, fuzzy
-msgid "collections_add_header_selectedaddons"
-msgstr "Selected Add-ons"
-
-#: views/collections/add.thtml:50
-#, fuzzy
-msgid "collections_add_intro"
-msgstr ""
-"It's easy to create your own collection of add-ons by filling in a few "
-"fields below."
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-#, fuzzy
-msgid "collections_add_submit"
-msgstr "Create Collection"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-#, fuzzy
-msgid "collections_breadcrumb"
-msgstr "Collections"
-
-#: views/collections/detail.thtml:185
-#, fuzzy
-msgid "collections_detail_a_learn"
-msgstr "Learn More"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-#, fuzzy
-msgid "collections_detail_button_add"
-msgstr "Add to Favorites"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-#, fuzzy
-msgid "collections_detail_button_remove"
-msgstr "Remove from Favorites"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-#, fuzzy
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>You can view your new collection below. If you'd like to set a collection "
-"nickname, upload an icon, or change additional settings, please visit the <a "
-"href='%1$s'>Manage Collections</a> page.</p><p>Your collection can be "
-"accessed at this location: %2$s</p>"
-
-#: views/collections/detail.thtml:61
-#, fuzzy
-msgid "collections_detail_created_msg"
-msgstr "Your collection is now ready!"
-
-#: views/collections/detail.thtml:109
-#, fuzzy
-msgid "collections_detail_header_about"
-msgstr "About This Collection"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-#, fuzzy
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "%1$s Add-on in this Collection"
-msgstr[1] "%1$s Add-ons in this Collection"
-
-#: views/collections/detail.thtml:113
-#, fuzzy
-msgid "collections_detail_info_created"
-msgstr "<strong>Created by:</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-#, fuzzy
-msgid "collections_detail_info_updated"
-msgstr "<strong>Updated:</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-#, fuzzy
-msgid "collections_detail_js_adding"
-msgstr "Adding to Favorites&hellip;"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-#, fuzzy
-msgid "collections_detail_js_removing"
-msgstr "Removing Favorite&hellip;"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-#, fuzzy
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">Log in</a> to add this collection to your favorites."
-
-#: views/collections/detail.thtml:104
-#, fuzzy
-msgid "collections_detail_manage"
-msgstr "Manage Collection"
-
-#: controllers/collections_controller.php:298
-#, fuzzy
-msgid "collections_detail_sort_date"
-msgstr "Date Added"
-
-#: controllers/collections_controller.php:299
-#, fuzzy
-msgid "collections_detail_sort_name"
-msgstr "Name"
-
-#: controllers/collections_controller.php:300
-#, fuzzy
-msgid "collections_detail_sort_popularity"
-msgstr "Popularity"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-#, fuzzy
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "%1$s download this week"
-msgstr[1] "%1$s downloads this week"
-
-#: views/collections/edit.thtml:255
-#, fuzzy
-msgid "collections_edit_addons_delete_noscript"
-msgstr "Selected add-ons will be removed upon Save"
-
-#: views/collections/edit.thtml:247
-#, fuzzy
-msgid "collections_edit_addons_description"
-msgstr ""
-"To publish new add-ons to this collection, start typing their names below."
-
-#: views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_noscript"
-msgstr ""
-"To publish new add-ons to this collection, enter a comma-separated list of "
-"Add-on IDs below."
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-#, fuzzy
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "You can also publish an add-on from its normal listing page."
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-#, fuzzy
-msgid "collections_edit_addons_listitem_added"
-msgstr "Added %1$s by %2$s"
-
-#: views/collections/edit.thtml:263
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "Add publisher comment"
-
-#: views/collections/edit.thtml:266
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "Delete publisher comment"
-
-#: views/collections/edit.thtml:265
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "Edit publisher comment"
-
-#: views/collections/edit.thtml:271
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr ""
-"Note: Comment will appear as though written by original publisher on the "
-"original publication date"
-
-#: views/collections/edit.thtml:270
-#, fuzzy
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "Save Comment"
-
-#: views/collections/edit.thtml:261
-#, fuzzy
-msgid "collections_edit_addons_listitem_remove"
-msgstr "Remove"
-
-#: views/collections/edit.thtml:250
-#, fuzzy
-msgid "collections_edit_addons_submit"
-msgstr "Add to Collection"
-
-#: views/collections/edit.thtml:153
-#, fuzzy
-msgid "collections_edit_check_nickname"
-msgstr "Check Availability"
-
-#: views/collections/edit.thtml:299
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection"
-msgstr "Yes, I would like to delete this collection."
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-#, fuzzy
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "Check the box, then click on \"%1$s\" to delete this collection."
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-#, fuzzy
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"Upon clicking \"%1$s\" below, your collection will be deleted. If you do not "
-"want to delete your collection, uncheck the confirmation box in the \"%2$s\" "
-"tab and continue editing your collection. If you leave this page without "
-"saving, your collection will also not be deleted."
-
-#: views/collections/edit.thtml:94
-#, fuzzy
-msgid "collections_edit_delete_warning"
-msgstr "Your collection is about to be deleted!"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-#, fuzzy
-msgid "collections_edit_form_error_description"
-msgstr "You must provide a description of your collection."
-
-#: views/collections/edit.thtml:181
-#, fuzzy
-msgid "collections_edit_form_error_icon"
-msgstr "There was an error uploading your icon."
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-#, fuzzy
-msgid "collections_edit_form_error_name"
-msgstr "You must give your collection a name."
-
-#: views/collections/edit.thtml:158
-#, fuzzy
-msgid "collections_edit_form_error_nickname"
-msgstr "If you choose a nickname, it must be unique."
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-#, fuzzy
-msgid "collections_edit_formfield_addons"
-msgstr "Add-on name:"
-
-#: views/collections/edit.thtml:281
-#, fuzzy
-msgid "collections_edit_formfield_application"
-msgstr "Associated Application"
-
-#: views/collections/edit.thtml:282
-#, fuzzy
-msgid "collections_edit_formfield_application_description"
-msgstr "Select the application that your collection supports."
-
-#: views/collections/edit.thtml:288
-#, fuzzy
-msgid "collections_edit_formfield_collectiontype"
-msgstr "Collection Type"
-
-#: views/collections/edit.thtml:295
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:296
-#, fuzzy
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "Deleting your collection will permanently erase it."
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-#, fuzzy
-msgid "collections_edit_formfield_description"
-msgstr "Collection Description"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-#, fuzzy
-msgid "collections_edit_formfield_description_description"
-msgstr "Briefly describe your collection and the kind of add-ons in it"
-
-#: views/collections/edit.thtml:162
-#, fuzzy
-msgid "collections_edit_formfield_icon"
-msgstr "Icon"
-
-#: views/collections/edit.thtml:163
-#, fuzzy
-msgid "collections_edit_formfield_icon_description"
-msgstr ""
-"You can upload a JPG, GIF or PNG icon that will be resized to 32x32 pixels."
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-#, fuzzy
-msgid "collections_edit_formfield_listed"
-msgstr "Who can view your collection?"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-#, fuzzy
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"By default, collections appear in the public Collection Directory and are "
-"discoverable by anyone. If you want to restrict your collection to be "
-"viewable only by people who are given a special link, choose that option "
-"below."
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-#, fuzzy
-msgid "collections_edit_formfield_listed_false"
-msgstr "Only people I invite can view my collection"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-#, fuzzy
-msgid "collections_edit_formfield_listed_true"
-msgstr "Everyone can view my collection in the directory"
-
-#: views/collections/edit.thtml:223
-#, fuzzy
-msgid "collections_edit_formfield_managers"
-msgstr "Who can manage my collection?"
-
-#: views/collections/edit.thtml:224
-#, fuzzy
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"These users can publish add-ons to your collection, manage all add-ons and "
-"settings, and grant other users permission."
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-#, fuzzy
-msgid "collections_edit_formfield_name"
-msgstr "Collection Name"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-#, fuzzy
-msgid "collections_edit_formfield_name_description"
-msgstr ""
-"Give your collection a descriptive name, such as \"Dave's Favorite Travel "
-"Add-ons\""
-
-#: views/collections/edit.thtml:148
-#, fuzzy
-msgid "collections_edit_formfield_nickname"
-msgstr "Collection Nickname"
-
-#: views/collections/edit.thtml:149
-#, fuzzy
-msgid "collections_edit_formfield_nickname_description"
-msgstr "Optionally, give your collection a unique nickname for quick access:"
-
-#: views/collections/edit.thtml:201
-#, fuzzy
-msgid "collections_edit_formfield_publishers"
-msgstr "Who can publish add-ons to your collection?"
-
-#: views/collections/edit.thtml:202
-#, fuzzy
-msgid "collections_edit_formfield_publishers_description"
-msgstr ""
-"These users can publish add-ons to your collection and remove add-ons that "
-"they publish."
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-#, fuzzy
-msgid "collections_edit_formfield_users_add"
-msgstr "Enter the e-mail address of a Firefox Add-ons account:"
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-#, fuzzy
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "Selected accounts will be removed upon Save"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-#, fuzzy
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr ""
-"Enter a comma-separated list of e-mail addresses of Firefox Add-ons accounts"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-#, fuzzy
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "Only me"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-#, fuzzy
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "Myself and these users:"
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-#, fuzzy
-msgid "collections_edit_formfield_users_submit"
-msgstr "Add"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-#, fuzzy
-msgid "collections_edit_header"
-msgstr "Manage %1$s"
-
-#: views/collections/edit.thtml:246
-#, fuzzy
-msgid "collections_edit_header_addons"
-msgstr "Manage Collection Contents"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-#, fuzzy
-msgid "collections_edit_header_addons_current"
-msgstr "Current Add-ons:"
-
-#: views/collections/edit.thtml:279
-#, fuzzy
-msgid "collections_edit_header_advanced"
-msgstr "Advanced Settings"
-
-#: views/collections/edit.thtml:186
-#, fuzzy
-msgid "collections_edit_header_permissions"
-msgstr "Manage Collection Permissions"
-
-#: views/collections/edit.thtml:170
-#, fuzzy
-msgid "collections_edit_icon_cancel"
-msgstr "Cancel"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-#, fuzzy
-msgid "collections_edit_icon_delete"
-msgstr "Delete Icon"
-
-#: views/collections/edit.thtml:178
-#, fuzzy
-msgid "collections_edit_icon_replace"
-msgstr "Replace Icon"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-#, fuzzy
-msgid "collections_edit_icon_toberemoved"
-msgstr "Icon will be removed when \"%1$s\" is clicked below"
-
-#: views/collections/edit.thtml:155
-#, fuzzy
-msgid "collections_edit_nickname_available"
-msgstr "Nickname Available"
-
-#: controllers/collections_controller.php:943
-#, fuzzy
-msgid "collections_edit_nickname_error"
-msgstr ""
-"Your nickname contained invalid characters and was corrected. Please try "
-"again."
-
-#: views/collections/edit.thtml:156
-#, fuzzy
-msgid "collections_edit_nickname_taken"
-msgstr "Nickname Taken"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-#, fuzzy
-msgid "collections_edit_saved_nextstep"
-msgstr "Your collection can be accessed at this location:"
-
-#: views/collections/edit.thtml:74
-#, fuzzy
-msgid "collections_edit_saved_success"
-msgstr "Your collection was successfully saved!"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-#, fuzzy
-msgid "collections_edit_submit"
-msgstr "Update Collection"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-#, fuzzy
-msgid "collections_edit_submit_deletecollection"
-msgstr "Delete Collection"
-
-#: views/collections/edit.thtml:111
-#, fuzzy
-msgid "collections_edit_tabheader_addons"
-msgstr "Add-ons"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-#, fuzzy
-msgid "collections_edit_tabheader_advanced"
-msgstr "Advanced"
-
-#: views/collections/edit.thtml:108
-#, fuzzy
-msgid "collections_edit_tabheader_details"
-msgstr "Name &amp; Details"
-
-#: views/collections/edit.thtml:109
-#, fuzzy
-msgid "collections_edit_tabheader_permissions"
-msgstr "Permissions"
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_tagline"
-msgstr "Add-ons can keep an eye on your kids and your calendar."
-
-#: models/collection_promo.php:53
-#, fuzzy
-msgid "collections_family_title"
-msgstr "Family Organizer"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-#, fuzzy
-msgid "collections_index_a_check_out"
-msgstr "Check out Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-#, fuzzy
-msgid "collections_index_a_create"
-msgstr "Create a Collection"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-#, fuzzy
-msgid "collections_index_button_go"
-msgstr "Go"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-#, fuzzy
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>You don't have any favorite collections yet.</strong></p> "
-"<p>Collections you mark as favorites can be quickly accessed from this page, "
-"and will appear in the <a href='%1$s'>Add-on Collector</a> if you've "
-"installed it.</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-#, fuzzy
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>You haven't created any collections yet. Collections are easy to create "
-"and fill with your favorite add-ons.  <a href='%1$s'>Try it out</a>!</p>"
-
-#: views/collections/listing.thtml:51
-#, fuzzy
-msgid "collections_index_header_collections"
-msgstr "Collections"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-#, fuzzy
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-#, fuzzy
-msgid "collections_index_header_created"
-msgstr "created by %1$s"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-#, fuzzy
-msgid "collections_index_header_what"
-msgstr "What are Collections?"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-#, fuzzy
-msgid "collections_index_label_sortby"
-msgstr "Sort by"
-
-#: controllers/collections_controller.php:130
-#, fuzzy
-msgid "collections_index_li_editors"
-msgstr "Editor's Picks"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-#, fuzzy
-msgid "collections_index_li_favorites"
-msgstr "My Favorites"
-
-#: controllers/collections_controller.php:138
-#, fuzzy
-msgid "collections_index_li_mine"
-msgstr "My Collections"
-
-#: controllers/collections_controller.php:132
-#, fuzzy
-msgid "collections_index_li_popular"
-msgstr "Popular"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-#, fuzzy
-msgid "collections_index_option_all"
-msgstr "Most popular all time"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-#, fuzzy
-msgid "collections_index_option_month"
-msgstr "Most popular this month"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-#, fuzzy
-msgid "collections_index_option_newest"
-msgstr "Newest"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-#, fuzzy
-msgid "collections_index_option_week"
-msgstr "Most popular this week"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-#, fuzzy
-msgid "collections_index_p_collector"
-msgstr ""
-"There's a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-#, fuzzy
-msgid "collections_index_p_what_are"
-msgstr "Collections are groups of related add-ons assembled for easy sharing."
-
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "collections_interactive_addon_added"
 msgstr "已添加 %s"
 
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_tagline"
-msgstr "Add-ons can do better research online."
-
-#: models/collection_promo.php:55
-#, fuzzy
-msgid "collections_reference_title"
-msgstr "Reference Desk"
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_tagline"
-msgstr "Add-ons can manage your social network."
-
-#: models/collection_promo.php:52
-#, fuzzy
-msgid "collections_social_title"
-msgstr "Social Circuit"
-
-#: views/collections/subscribe.thtml:91
-#, fuzzy
-msgid "collections_subscribe_button_close"
-msgstr "Close"
-
-#: views/collections/subscribe.thtml:70
-#, fuzzy
-msgid "collections_subscribe_error"
-msgstr ""
-"An error occurred trying to add a favorite collection. Is this collection "
-"already a favorite?"
-
-#: views/collections/subscribe.thtml:96
-#, fuzzy
-msgid "collections_subscribe_label_bothersome"
-msgstr "Don't show me this message again."
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-#, fuzzy
-msgid "collections_subscribe_success"
-msgstr "%1$s has been added to your favorite collections."
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-#, fuzzy
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"You can now quickly find this collection from the <a href=\"%1$s\">%2$s</a> "
-"tab in the directory. For an even easier way to keep track of your favorite "
-"collections, try out our <a href=\"%3$s\">Add-on Collector</a> extension for "
-"Firefox."
-
-#: views/collections/listing.thtml:55
-#, fuzzy
-msgid "collections_success_delete"
-msgstr "The collection has been deleted."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_tagline"
-msgstr "Add-ons can turn you into a travel agent."
-
-#: models/collection_promo.php:54
-#, fuzzy
-msgid "collections_travel_title"
-msgstr "The Traveler's Pack"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-#, fuzzy
-msgid "collections_type_autopublisher"
-msgstr "Auto-publisher"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-#, fuzzy
-msgid "collections_type_editorspick"
-msgstr "Editor's Pick"
-
-#: controllers/collections_controller.php:580
-#, fuzzy
-msgid "collections_type_normal"
-msgstr "Normal"
-
-#: views/collections/subscribe.thtml:84
-#, fuzzy
-msgid "collections_unsubscribe_error"
-msgstr ""
-"An error occurred trying to remove a favorite collection. Was this "
-"collection not a favorite?"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-#, fuzzy
-msgid "collections_unsubscribe_success"
-msgstr "%1$s has been removed from your favorite collections."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_tagline"
-msgstr "Add-ons make it easier to build the perfect website."
-
-#: models/collection_promo.php:56
-#, fuzzy
-msgid "collections_webdev_title"
-msgstr "Web Developer's Toolbox"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-#, fuzzy
-msgid "collections_whatare_header"
-msgstr "What are Collections?"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-#, fuzzy
-msgid "collections_whatare_learnmore"
-msgstr "Read the FAQ"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-#, fuzzy
-msgid "collections_whatare_text"
-msgstr ""
-"There’s a new way to manage and find favorite add-ons. Comment, share and "
-"sync collections, all from your browser."
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-#, fuzzy
-msgid "collector_features_a_home"
-msgstr "Add-on Collector Home"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-#, fuzzy
-msgid "collector_features_heading_download"
-msgstr "Download the Add-on Collector:"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-#, fuzzy
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "附加组件兼容性中心"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr "为 %1$s 的�布准备了以下工具和信�供 %2$s 社区使用。"
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
 msgstr "正在读�数�..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "返回主页"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "附加组件兼容性汇报"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "供附加组件开�者查看的信�"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "�上传校正最大版本�"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "检查我的附加组件状�"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
 "如果你在 Mozilla 附加组件上�布了附加组件，<a href=\"%1$s\">请登录</a>以便分"
 "�你的 %2$s 附加组件的状�。"
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla 开�者中心图标"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "在 Mozilla 附加组件网站上你没有任何附加组件。"
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "附加组件状�检查结果"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
 msgstr "正在接收附加组件状�..."
 
@@ -2459,122 +1146,122 @@ msgstr "正在接收附加组件状�..."
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s 用户 ( �用户总数的 %3$s&#37; )"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
 msgstr ""
 "以下附加组件构�了Mozilla已知的95%的附加组件使用�，按�自使用�多少排�。"
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "查看详细报告"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
 "%1$s 附加组件构�了Mozilla已知的 95&#37; 的附加组件使用�，目�<b>%2$s&#37;</"
 "b>被认为兼容最新版本的 %3$s 。"
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha 版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "兼容 %1$s alpha 版本的附加组件"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Beta 版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "兼容 %1$s 的 beta 版本或预览版的附加组件"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "最新版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "最新支� %1$s 最新版本的附加组件"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "其他版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "该附加组件�兼容 %1$s 的任何版本"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "附加组件兼容性报告"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "供附加组件用户查看的信�"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "查看兼容性报告"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "有关贡献的更多信�，请查阅我们的 %s 。"
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "维基页�"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr "Mozilla �感谢以下人员在过去的几年中对 addons.mozilla.org 项目的贡献："
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "开�者"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "编辑"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "本地化人员"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "其他贡献者"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "曾�的开�者"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "软件和图片"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "用到的一些图标�自 <a href=\"http://www.famfamfam.com/lab/icons/silk/"
 "\">famfamfam Silk Icon Set</a>, 许��议为 <a href=\"http://creativecommons."
 "org/licenses/by/2.5/\">Creative Commons Attribution 2.5 License</a>."
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
 #, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
@@ -2587,20 +1274,17 @@ msgstr ""
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Y 年 %m 月 %e 日"
 
@@ -2636,25 +1320,25 @@ msgstr "统计信�"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
 #, fuzzy
 msgid "devcp_add_previews_extension_error"
 msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
 #, fuzzy
 msgid "devcp_add_previews_save_error"
 msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
 #, fuzzy
 msgid "devcp_add_previews_success_replace"
 msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
 #, fuzzy
 msgid "devcp_add_previews_success_upload"
 msgstr "File %s was uploaded successfully. You can add a caption below."
@@ -2663,6 +1347,17 @@ msgstr "File %s was uploaded successfully. You can add a caption below."
 msgid "devcp_additem_addontype_autodetect"
 msgstr "(自动检测)"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"你的这个版本的附加组件未生命与Firefox %1$s 兼容。Mozilla的下一个Firefox版本很"
+"快就��布，所以请您在新版本中测试您的附加组件并更新兼容性信�。你�以在 <a "
+"href=\"%2$s\">这里</a> 找到更多信�。这仅仅是一个�醒，你�以继续� addons."
+"mozilla.org �交该版本。"
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "在新窗�打开"
@@ -2699,76 +1394,141 @@ msgstr "第五步：�功"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "上传说明"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "�功�用附加组件"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "编辑附加组件"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "�功�用附加组件"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "附加组件�述"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "许��议"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "附加组件主页"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "附加组件�称"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "预览图片说明"
 
-#: views/developers/addon_status.thtml:177
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "��策略"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "附加组件摘�"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "技术支�邮箱"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "技术支�网站"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "版本信�"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "�请批准附加组件"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "附加组件�请批准�功�"
+
+#: views/developers/addon_status.thtml:178
 #, fuzzy
 msgid "devcp_addon_status_action_activate"
 msgstr "Make Active"
 
-#: views/developers/addon_status.thtml:178
+#: views/developers/addon_status.thtml:179
 #, fuzzy
 msgid "devcp_addon_status_action_activate_description"
 msgstr ""
 "Make your add-on active for it to show up in public listings and enable the "
 "update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
 #, fuzzy
 msgid "devcp_addon_status_action_complete"
 msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
 #, fuzzy
 msgid "devcp_addon_status_action_complete_description"
 msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate"
 msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
 #, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
 msgstr ""
 "Make your add-on inactive to hide it from all public listings and disable "
 "the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
 #, fuzzy
 msgid "devcp_addon_status_action_move"
 msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
 #, fuzzy
 msgid "devcp_addon_status_action_move_description"
 msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
 #, fuzzy
 msgid "devcp_addon_status_action_nominate"
 msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
 #, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
 msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
 #, fuzzy
 msgid "devcp_addon_status_action_public"
 msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
 #, fuzzy
 msgid "devcp_addon_status_action_public_description"
 msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
 #, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
@@ -2804,7 +1564,7 @@ msgstr "Add-on Description required"
 msgid "devcp_addon_status_criteria_name"
 msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
 #, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
 msgstr "Add-on is not marked as pre-release."
@@ -2814,6 +1574,11 @@ msgstr "Add-on is not marked as pre-release."
 msgid "devcp_addon_status_criteria_preview"
 msgstr "At least one preview image required for extensions and themes."
 
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
+
 #: views/developers/addon_status.thtml:100
 #, fuzzy
 msgid "devcp_addon_status_criteria_summary"
@@ -2825,13 +1590,13 @@ msgstr "Add-on Summary required"
 msgid "devcp_addon_status_header"
 msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
 #, fuzzy
 msgid "devcp_addon_status_header_actions"
 msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
 #, fuzzy
 msgid "devcp_addon_status_header_active"
 msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
@@ -2841,7 +1606,7 @@ msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 msgid "devcp_addon_status_header_criteria"
 msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
 #, fuzzy
 msgid "devcp_addon_status_header_inactive"
 msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
@@ -2851,12 +1616,12 @@ msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 msgid "devcp_addon_status_header_nomination"
 msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
 #, fuzzy
 msgid "devcp_addon_status_header_trusted"
 msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
 #, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
@@ -2865,14 +1630,14 @@ msgstr ""
 "Updates are <b>not</b> being provided to your add-on through the update "
 "check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
 #, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
 "Please fulfill the criteria above before nominating your add-on to become "
 "<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
 #, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
@@ -2951,13 +1716,122 @@ msgstr ""
 msgid "devcp_addon_status_title"
 msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
 #, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
 "Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
 "submit updates to your add-on without editor review."
 
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr "访问 %1$s 页�对你上传的内容进行修改，或者点击 %2$s 返回开�者工具。"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "点击这里"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "编辑附加组件"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"这个版本已�放入沙盒，供沙盒测试者和Mozilla附加组件编辑审查。通过以�会以电�"
+"邮件通知你。"
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "你�以查看 %s 获�有关沙盒审查系统的更多信�。"
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "这里"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"这个版本已�放入沙盒供专业用户使用。为了使其能够显示在公开网站，你必须%s 你的"
+"附加组件并通过这个审查�程。"
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "�请批准"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "你的上传已��功进行完毕。"
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "因为你的附加组件是被信任的，该版本已�自动获得核准�布到公开网站。"
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "上传附加组件"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "附加组件更新�功"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "%s �以��使用者对你的附加组件的兴趣。"
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "上传预览图片"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "未找到作者 [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "删除"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "放弃"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "你确信�放弃上传？"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "下一步"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "更改附加组件类型："
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "开�者评论已更新。"
+
 #: views/developers/dashboard.thtml:68
 #, fuzzy
 msgid "devcp_dashboard_active"
@@ -3034,37 +1908,178 @@ msgid "devcp_dashboard_versions_new"
 msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
 #, fuzzy
 msgid "devcp_delete_previews_error"
 msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
 #, fuzzy
 msgid "devcp_delete_previews_success"
 msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
 #, fuzzy
 msgid "devcp_delete_version_priv_error"
 msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
 #, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
 msgstr[0] "%1$s %2$s file"
 msgstr[1] "%1$s %2$s files"
 
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "添加预览图"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "æ— "
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "分类"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "分类"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "�述"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "�用"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "详情"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "开�者评论"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "预览图"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "版本"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "主页"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "æ— "
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "无说明"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "未找到预览图。"
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "技术支�邮件"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "开�者未�供技术支�邮箱"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "技术支�网站"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "开�者未�供技术支�网站"
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "�信任的"
+
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "版本 %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "未找到版本。"
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "放弃并返回"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "好的，�用它。"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "你确认��用这个附加组件？"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"�用这个附加组件将会导致他从�索结果和列表中消失，将�能从公开网站下载到，也"
+"�能为客户端�供更新检测。附加组件将会处于一�被删除的效果，尽管你�以很方便"
+"地回到这里�新�用它。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "�用 %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "好的，�用它。"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "你确认��用这个附加组件？"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr ""
+"�用这个附加组件将会使其�次显示在�索结果和列表中，将能够从网站下载到并从客"
+"户端进行更新检测。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "�用 %s"
+
 #: views/developers/discuss.thtml:68
 #, fuzzy
 msgid "devcp_discuss_addreply_header"
@@ -3118,62 +2133,74 @@ msgstr ""
 msgid "devcp_discuss_writtenby"
 msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
+msgstr "增加作者"
+
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "作者的电�邮件："
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "删除"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
 #, fuzzy
 msgid "devcp_edit_authors_add_author"
 msgstr "Add New Author"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/addon_edit_authors.thtml:94
 #, fuzzy
 msgid "devcp_edit_authors_add_author_button"
 msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
 #, fuzzy
 msgid "devcp_edit_authors_add_email"
 msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
 #, fuzzy
 msgid "devcp_edit_authors_add_loading"
 msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_edit_authors_click_save"
 msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
 #, fuzzy
 msgid "devcp_edit_authors_header_current"
 msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
 #, fuzzy
 msgid "devcp_edit_authors_header_manage"
 msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
 #, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
 msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
 #, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
 "<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
 "except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
 #, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
 "<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
 "including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
 #, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
@@ -3186,30 +2213,30 @@ msgstr ""
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
 #, fuzzy
 msgid "devcp_edit_authors_select_role"
 msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
 #, fuzzy
 msgid "devcp_edit_authors_th_author"
 msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
 #, fuzzy
 msgid "devcp_edit_authors_th_listed"
 msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
 #, fuzzy
 msgid "devcp_edit_authors_th_role"
 msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
 #, fuzzy
 msgid "devcp_edit_authors_update_author"
 msgstr "Update authors"
@@ -3288,22 +2315,22 @@ msgstr ""
 msgid "devcp_edit_dd_manage_properties"
 msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
 #, fuzzy
 msgid "devcp_edit_description_button_update"
 msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
 #, fuzzy
 msgid "devcp_edit_description_correct_error"
 msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
 #, fuzzy
 msgid "devcp_edit_descriptions_header"
 msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
@@ -3312,12 +2339,12 @@ msgstr ""
 "major bugs, information on how to report bugs, anticipated release date of a "
 "new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
 msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
@@ -3325,12 +2352,12 @@ msgstr ""
 "functionality, and other relevant information. It is displayed under the "
 "summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
 msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
@@ -3339,24 +2366,24 @@ msgstr ""
 "installing your add-on. Please note that a EULA is not the same as a code "
 "license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
 msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
 "If your add-on has a privacy policy, enter its text here. Your add-on's "
 "display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
 msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
@@ -3364,7 +2391,7 @@ msgstr ""
 "is displayed in search and browse listings, as well as at the top of your "
 "add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
 #, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
 msgstr "Add-on Summary"
@@ -3389,42 +2416,107 @@ msgstr "Manage Add-on Descriptions"
 msgid "devcp_edit_dt_manage_properties"
 msgstr "Manage Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "这�附加组件没有�用的分类。"
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "作者"
+
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "增加图标"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "更改图标"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "�许用户在线查看�文件。"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "类别"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "默认语言"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "这个附加组件需�外部软件支�。"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "仅清除已有图标。"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "新图标文件"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "图标"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "附加本地化信�"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
 msgstr "这是一个预�布版本"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "这是一个针对特定网站的附加组件"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "本地化目标"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "简短的附加信�（例如本地语言�称）"
+
+#: views/developers/addon_edit_properties.thtml:211
 #, fuzzy
 msgid "devcp_edit_properties_button_update"
 msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
 #, fuzzy
 msgid "devcp_edit_properties_change_guid"
 msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
 #, fuzzy
 msgid "devcp_edit_properties_current_icon"
 msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
 #, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
@@ -3432,12 +2524,12 @@ msgstr ""
 "present. If translations for your add-on's descriptions are unavailable in a "
 "user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
 #, fuzzy
 msgid "devcp_edit_properties_flags"
 msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
 #, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
@@ -3445,60 +2537,60 @@ msgstr ""
 "identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
 "ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
 #, fuzzy
 msgid "devcp_edit_properties_header"
 msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
 #, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
 msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
 #, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
 msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
 #, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
 msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
 #, fuzzy
 msgid "devcp_edit_properties_header_flags"
 msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
 #, fuzzy
 msgid "devcp_edit_properties_header_guid"
 msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
 #, fuzzy
 msgid "devcp_edit_properties_header_icon"
 msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
 #, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
 msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
 #, fuzzy
 msgid "devcp_edit_properties_header_trusted"
 msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
 #, fuzzy
 msgid "devcp_edit_properties_header_view_source"
 msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
 #, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
@@ -3507,32 +2599,32 @@ msgstr ""
 "installation dialog. The image will automatically be resized to 32 x 32 "
 "pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
 #, fuzzy
 msgid "devcp_edit_properties_label_binary"
 msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
 #, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
 msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
 #, fuzzy
 msgid "devcp_edit_properties_label_trusted"
 msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
 #, fuzzy
 msgid "devcp_edit_properties_new_icon"
 msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
 #, fuzzy
 msgid "devcp_edit_properties_remove_icon"
 msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
@@ -3540,22 +2632,22 @@ msgstr ""
 "translations is not necessary unless your website is localized into other "
 "languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
 #, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
 msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
 msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
 #, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
 msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
@@ -3563,12 +2655,12 @@ msgstr ""
 "other translations is not necessary unless you have different email "
 "addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
 msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
@@ -3576,39 +2668,49 @@ msgstr ""
 "Adding other translations is not necessary unless your website is localized "
 "into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
 #, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
 msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
 #, fuzzy
 msgid "devcp_edit_properties_trusted"
 msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
 #, fuzzy
 msgid "devcp_edit_properties_undelete"
 msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
 #, fuzzy
 msgid "devcp_edit_properties_view_source"
 msgstr ""
 "The source of your add-on files can be viewed online by any logged in user "
 "if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
 #, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
 msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
 #, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
 msgstr "Do not allow online source viewing"
 
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">本地化语言简称</"
+"a>, 例如 'zh-CN'"
+
 #: views/elements/developers/editbox.thtml:46
 #, fuzzy
 msgid "devcp_editbox_authors"
@@ -3698,14 +2800,67 @@ msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "待审查更新 (%s)"
 msgstr[1] "待审查更新 (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "选中的文件将被删除。"
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "文件"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "目标应用程�"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "没有文件。"
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "建议者说明"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "æ›´æ–°"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "无�访问该附加组件。"
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr "摘��制在250字符以内。（你输入了 %s 个字符）"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"你的扩展�称在数�库中已�存在。请确认：<br /><li>你的GUID是�匹�。该错误最"
+"常�的原因是GUID�匹�。</li><li>数�库中�能有��的记录。如果你�这么�你应"
+"该更新那个项目或者删除以��试。</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3719,10 +2874,9 @@ msgstr "相关说明请查阅 %s 。"
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "本页"
 
-#: views/developers/addon_edit_authors.thtml:76
-#, fuzzy
-msgid "devcp_error_empty_authors"
-msgstr "Your add-on must have at least one owner."
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "请�述该附加组件更新的更改详情。"
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
@@ -3739,6 +2893,10 @@ msgstr ""
 msgid "devcp_error_file_extension"
 msgstr "选定的附加组件�类��许这个文件扩展�(%s)，请使用下列扩展�之一：%s"
 
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "文件GUID�完全匹�。"
+
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
 msgstr "请��选择多于五个分类。"
@@ -3771,7 +2929,14 @@ msgstr "未上传文件"
 msgid "devcp_error_icon_extension"
 msgstr "图标�能使用这个文件扩展�(%s)。请选用下列扩展�之一：%s"
 
-#: controllers/developers_controller.php:504
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "该附加组件在该平�下已有相�的版本(%s)。"
+
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "install.rdf 文件�存在。"
 
@@ -3779,7 +2944,7 @@ msgstr "install.rdf 文件�存在。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf 中�现以下错误："
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
 msgstr "请选择一个有效的附加组件类型。"
 
@@ -3848,6 +3013,18 @@ msgstr "install.rdf 中未找到这个附加组件的ID。"
 msgid "devcp_error_no_platform"
 msgstr "未选择系统平�。"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "你必须�供推�时所�求的细节。"
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "你�能推�预�行版本的附加组件。"
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "你�能推�当�在沙盒中的附加组件。"
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "请至少选择一个分类。"
@@ -3863,6 +3040,16 @@ msgstr "这个附加组件至少�有一个作者。"
 msgid "devcp_error_preview_extension"
 msgstr "该文件类型 (%s) �能作为预览图片。请使用以下格�之一： %s"
 
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "�存数�时�生错误。"
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "你没有更新这个附加组件的�利。"
+
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
 msgstr "附加组件无法使用一个 updateKey。请从 install.rdf 中删除它并�次�试。"
@@ -3872,98 +3059,291 @@ msgid "devcp_error_updateurl"
 msgstr ""
 "附加组件�能使用一个外部的更新地�，请从 install.rdf 中删除它并�次�试。"
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "请上传一个文件。"
 
-#: views/developers/uploader.thtml:135
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "增加�一平�的文件"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "增加作者"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "移走"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "新的附加组件分类在下一步中�用。"
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "这个附加组件的类型没有有效的分类。"
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "请输入你附加组件的�述。"
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "请输入你附加组件的�称。"
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "请选择你�交的附加组件的类型。"
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "请输入你附加组件的摘�。"
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "附加组件文件"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "附加组件文件 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "附加组件文件 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "附加组件类型"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "�许用户在线�览�文件"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "作者邮件地�"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "作者"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "分类"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "默认语�"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "�述"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "最终用户许��议(EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "这个附加组件需�外部软件"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "文件"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "主页"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "图标文件"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "�称"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "支�平�"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "这是预�行版"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "��策略"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "这是一个特定站点附加组件"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "摘�"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "技术支�邮箱"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "技术支�网站"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "目标应用程�"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "版本"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "版本记录"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "æ— "
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "给审阅者消�"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "因为你的附加组件�信任，请选择这个版本去�："
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "公共"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "沙盒"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "开�者�议"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "步骤 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
+msgstr "上传文件"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "步骤 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "附加组件细节"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "步骤 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "版本细节"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "步骤 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "本地化"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "步骤 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "完�"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "我的附加组件"
+
+#: views/developers/uploader.thtml:101
 #, fuzzy
 msgid "devcp_input_upload_file"
 msgstr "Upload File"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/pages/js_constants.js.thtml:80
 #, fuzzy
 msgid "devcp_js_a_cancel"
 msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
 #, fuzzy
 msgid "devcp_js_add_email"
 msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
 #, fuzzy
 msgid "devcp_js_img_move_down"
 msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
 #, fuzzy
 msgid "devcp_js_img_move_up"
 msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
 #, fuzzy
 msgid "devcp_js_img_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
 #, fuzzy
 msgid "devcp_js_input_list_author"
 msgstr "List as author in public listings"
 
-#: views/pages/js_constants.js.thtml:92
-#, fuzzy
-msgid "devcp_js_license_select"
-msgstr "Please select a license."
-
-#: views/pages/js_constants.js.thtml:93
-#, fuzzy
-msgid "devcp_js_license_text"
-msgstr "Please enter text for your license."
-
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
 #, fuzzy
 msgid "devcp_js_option_developer"
 msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
 #, fuzzy
 msgid "devcp_js_option_owner"
 msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
 #, fuzzy
 msgid "devcp_js_option_viewer"
 msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
 #, fuzzy
 msgid "devcp_js_remove_author"
 msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
 #, fuzzy
 msgid "devcp_js_sure_remove"
 msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
 #, fuzzy
 msgid "devcp_js_upload_alert"
 msgstr "You must select a file to upload."
 
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-#, fuzzy
-msgid "devcp_license_existing"
-msgstr "Custom license for add-on %1$s v%2$s"
-
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "本地化字段"
@@ -3979,12 +3359,12 @@ msgstr ""
 "s)。"
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "管�工具"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "编辑工具"
 
@@ -3993,28 +3373,28 @@ msgid "devcp_myaddons_link"
 msgstr "我的附加组件"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "返回主界�"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "统计信�"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "�交附加组件"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "开�者工具"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
 #, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
@@ -4026,27 +3406,39 @@ msgstr ""
 msgid "devcp_nominate_cancel"
 msgstr "Cancel and return"
 
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "返回附加组件详情"
+
 # %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "�请审核 %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "自动检测附加组件类型: %s."
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
 #, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
 "<span>One or more of your changes couldn't be saved.</span><br />Please look "
 "for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
 #, fuzzy
 msgid "devcp_notice_changes_saved"
@@ -4058,19 +3450,34 @@ msgstr ""
 msgid "devcp_notice_cleardefault"
 msgstr "删除该预览图片将会使其他预览图片自动��默认的。"
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"该附加组件的默认语言设置(%1$s [%2$s])与你当�选择的语言(%3$s [%4$s])�一致。"
+"下�的字段应该在 %1$s 完�。"
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
 msgstr "这样�默认的预览图片将会去掉默认状�。"
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
 #, fuzzy
 msgid "devcp_notice_unsaved_changes"
 msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -4099,46 +3506,46 @@ msgstr "编辑预览图片。"
 msgid "devcp_preview_updated_successfully"
 msgstr "预览图片更新�功。"
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
 #, fuzzy
 msgid "devcp_previews_a_another"
 msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
 #, fuzzy
 msgid "devcp_previews_a_delete"
 msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
 #, fuzzy
 msgid "devcp_previews_a_replace"
 msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
 #, fuzzy
 msgid "devcp_previews_a_update"
 msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
 #, fuzzy
 msgid "devcp_previews_add_new"
 msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
 #, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
 "Select an image to upload below. Images larger than the maximum size of 700 "
 "pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
 #, fuzzy
 msgid "devcp_previews_click_below"
 msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
 #, fuzzy
 msgid "devcp_previews_click_update"
 msgstr ""
@@ -4146,7 +3553,7 @@ msgstr ""
 "a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
 #, fuzzy
 msgid "devcp_previews_error_message"
 msgstr ""
@@ -4163,7 +3570,7 @@ msgstr ""
 msgid "devcp_previews_header_add"
 msgstr "增加预览图片"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
 #, fuzzy
 msgid "devcp_previews_header_caption"
 msgstr "Preview Caption"
@@ -4172,7 +3579,7 @@ msgstr "Preview Caption"
 msgid "devcp_previews_header_edit"
 msgstr "编辑预览图片"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
 #, fuzzy
 msgid "devcp_previews_label_default"
 msgstr "Default Preview"
@@ -4185,27 +3592,27 @@ msgstr "预览图片文件"
 msgid "devcp_previews_label_makedefault"
 msgstr "设置为默认预览图片"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
 #, fuzzy
 msgid "devcp_previews_label_new"
 msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
 #, fuzzy
 msgid "devcp_previews_label_upload"
 msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
 #, fuzzy
 msgid "devcp_previews_notice_error"
 msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
 #, fuzzy
 msgid "devcp_previews_notice_success"
 msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
 #, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
@@ -4229,18 +3636,26 @@ msgstr "编辑预览图片"
 msgid "devcp_previews_submit_upload"
 msgstr "上传预览图片"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
 #, fuzzy
 msgid "devcp_previews_thumbnail"
 msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
 #, fuzzy
 msgid "devcp_previews_title"
 msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "�正确？"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "你确认�删除这个文件？"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "处��请审阅并接�以下的开�者许��议。"
 
@@ -4251,7 +3666,7 @@ msgstr ""
 "<span>You do not have sufficient privileges to make changes on this page.</"
 "span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
 #, fuzzy
 msgid "devcp_several_hours"
 msgstr ""
@@ -4263,6 +3678,10 @@ msgstr ""
 msgid "devcp_sidebar_a_dashboard"
 msgstr "Dashboard"
 
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "�更新我当�的附加组件信�"
+
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:79
@@ -4366,17 +3785,63 @@ msgstr ""
 msgid "devcp_status_nominate_header"
 msgstr "Add-on Nomination"
 
-#: views/developers/dashboard.thtml:85
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "目��能�交附加组件，请���试。"
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "我接�"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "我�接�"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "该附加组件被管�员�用。"
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "�用"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "�信任的"
+
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "最新版本："
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "你没有任何附加组件，点击 %s �交。"
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "这里"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "请确认该主题已� %s 。"
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "上传预览图片"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
 #, fuzzy
@@ -4384,44 +3849,44 @@ msgid "devcp_title_edit_addon"
 msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_a_title_help"
 msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
 #, fuzzy
 msgid "devcp_transbox_alt_help"
 msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
 #, fuzzy
 msgid "devcp_transbox_chars_used"
 msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
 #, fuzzy
 msgid "devcp_transbox_delete_sure"
 msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
 #, fuzzy
 msgid "devcp_transbox_help_header_tabs"
 msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
 #, fuzzy
 msgid "devcp_transbox_help_header_what"
 msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
 #, fuzzy
 msgid "devcp_transbox_help_hide"
 msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
 #, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
@@ -4431,7 +3896,7 @@ msgstr ""
 "enter what you can into your Default Locale, which should be a language you "
 "speak."
 
-#: views/elements/translationbox.thtml:144
+#: views/elements/developers/translationbox.thtml:144
 #, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
@@ -4439,64 +3904,64 @@ msgstr ""
 "into any other languages for which you might have a translation. You can "
 "add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
 #, fuzzy
 msgid "devcp_transbox_img_add_trans"
 msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
 #, fuzzy
 msgid "devcp_transbox_img_remove_trans"
 msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
 #, fuzzy
 msgid "devcp_transbox_input_add_all"
 msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
 #, fuzzy
 msgid "devcp_transbox_input_add_locale"
 msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
 #, fuzzy
 msgid "devcp_transbox_input_cancel"
 msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
 #, fuzzy
 msgid "devcp_transbox_input_delete"
 msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
 #, fuzzy
 msgid "devcp_transbox_select_locale"
 msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
 #, fuzzy
 msgid "devcp_update_addon_guid_error"
 msgstr ""
 "The add-on GUID used in this file (%1$s) does not match the existing GUID "
 "for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
 #, fuzzy
 msgid "devcp_update_addon_priv_error"
 msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
 #, fuzzy
 msgid "devcp_update_addon_version_belong_error"
 msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
 #, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
@@ -4505,7 +3970,7 @@ msgstr ""
 "a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
 #, fuzzy
 msgid "devcp_update_addon_version_match_error"
 msgstr ""
@@ -4517,33 +3982,28 @@ msgstr ""
 msgid "devcp_uploader_a_start"
 msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
 #, fuzzy
 msgid "devcp_uploader_ajax_loading"
 msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-#, fuzzy
-msgid "devcp_uploader_button_agree"
-msgstr "Agree and continue"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
 #, fuzzy
 msgid "devcp_uploader_button_edit"
 msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
 #, fuzzy
 msgid "devcp_uploader_button_later"
 msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
 #, fuzzy
 msgid "devcp_uploader_button_release"
 msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
 #, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
@@ -4556,29 +4016,29 @@ msgstr ""
 "using the link below and check the status of your add-on at any time on the "
 "<a %s>status page</a>."
 
-#: views/developers/uploader.thtml:143
+#: views/developers/uploader.thtml:109
 #, fuzzy
 msgid "devcp_uploader_error_correct"
 msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
 #, fuzzy
 msgid "devcp_uploader_file_created"
 msgstr ""
 "Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
 #, fuzzy
 msgid "devcp_uploader_header_created"
 msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
 #, fuzzy
 msgid "devcp_uploader_header_error"
 msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
 #, fuzzy
 msgid "devcp_uploader_header_file_added"
 msgstr "File Added!"
@@ -4589,12 +4049,12 @@ msgid "devcp_uploader_header_how"
 msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
 #, fuzzy
 msgid "devcp_uploader_header_update_created"
 msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
 #, fuzzy
 msgid "devcp_uploader_header_upload"
 msgstr "Upload Your File"
@@ -4618,23 +4078,18 @@ msgstr ""
 "the features listed above. If you're ready to start the process and have "
 "your add-on package ready for upload, just click on Get Started below!</p>"
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_label_platformtype"
 msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
 #, fuzzy
 msgid "devcp_uploader_label_upload_field"
 msgstr "Add-on File: "
 
-#: controllers/components/developers.php:1221
-#, fuzzy
-msgid "devcp_uploader_option_other"
-msgstr "Other"
-
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
 #, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
@@ -4643,7 +4098,7 @@ msgstr ""
 "reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
 #, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
@@ -4652,14 +4107,14 @@ msgstr ""
 "be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
 #, fuzzy
 msgid "devcp_uploader_p_update_created"
 msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
 #, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
@@ -4669,7 +4124,7 @@ msgstr ""
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
 #, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
@@ -4677,7 +4132,7 @@ msgstr ""
 "your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
 "clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
 #, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
@@ -4685,22 +4140,16 @@ msgstr ""
 "specific files to upload, choose a single file and then upload the others "
 "using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
 #, fuzzy
 msgid "devcp_uploader_platformtype_all"
 msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
 #, fuzzy
 msgid "devcp_uploader_platformtype_specific"
 msgstr "Specific:"
 
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-#, fuzzy
-msgid "devcp_uploader_please_choose"
-msgstr "Please Choose..."
-
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
 #, fuzzy
@@ -4719,29 +4168,32 @@ msgid "devcp_uploader_title_update"
 msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "请查阅 %s 获�说明。"
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "本页"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
 #, fuzzy
 msgid "devcp_verify_author_error"
 msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-#, fuzzy
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"Either the XML is invalid or required fields are missing.  Please <a href="
-"\"https://developer.mozilla.org/en/Creating_OpenSearch_plugins_for_Firefox"
-"\">read the documentation</a>, verify your add-on, and try again."
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "编辑版本"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "版本更新�功。"
 
 #: views/developers/versions.thtml:75
 #, fuzzy
@@ -4810,34 +4262,34 @@ msgstr[1] "%s reviews"
 msgid "devcp_versions_delete_sure"
 msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
 #, fuzzy
 msgid "devcp_versions_edit_a_cancel"
 msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
 #, fuzzy
 msgid "devcp_versions_edit_a_delete"
 msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
 #, fuzzy
 msgid "devcp_versions_edit_a_new_app"
 msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
 #, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
 msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
 #, fuzzy
 msgid "devcp_versions_edit_add"
 msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
 #, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
@@ -4845,49 +4297,44 @@ msgstr ""
 "on even if the install.rdf in the package indicates that the add-on is "
 "incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
 #, fuzzy
 msgid "devcp_versions_edit_compat_sure"
 msgstr ""
 "Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
 #, fuzzy
 msgid "devcp_versions_edit_delete_sure"
 msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
 #, fuzzy
 msgid "devcp_versions_edit_header_approval"
 msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
 #, fuzzy
 msgid "devcp_versions_edit_header_compat"
 msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
 #, fuzzy
 msgid "devcp_versions_edit_header_file"
 msgstr "File Information"
 
-#: views/developers/versions_edit.thtml:189
-#, fuzzy
-msgid "devcp_versions_edit_header_license"
-msgstr "License"
-
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
 #, fuzzy
 msgid "devcp_versions_edit_header_manage"
 msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
 #, fuzzy
 msgid "devcp_versions_edit_header_notes"
 msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
 #, fuzzy
 msgid "devcp_versions_edit_img_delete"
 msgstr "Delete File"
@@ -4897,59 +4344,52 @@ msgstr "Delete File"
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
+#: views/developers/versions_edit.thtml:190
 #, fuzzy
 msgid "devcp_versions_edit_li_file"
 msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:190
-#, fuzzy
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"Please select the appropriate license for your add-on. This license "
-"specifies the rights you grant on your source code."
-
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
 #, fuzzy
 msgid "devcp_versions_edit_no_files"
 msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
 #, fuzzy
 msgid "devcp_versions_edit_optional"
 msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
 #, fuzzy
 msgid "devcp_versions_edit_remove_compat"
 msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
 #, fuzzy
 msgid "devcp_versions_edit_select_app"
 msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
 #, fuzzy
 msgid "devcp_versions_edit_th_file"
 msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
 #, fuzzy
 msgid "devcp_versions_edit_th_platform"
 msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
 #, fuzzy
 msgid "devcp_versions_edit_th_size"
 msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
 #, fuzzy
 msgid "devcp_versions_edit_th_status"
 msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
@@ -4958,26 +4398,26 @@ msgstr ""
 "will also be available to users updating the add-on in the Firefox 3 Add-ons "
 "Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
 #, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
 msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
 "until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
 #, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
 "<strong>You have unsaved changes.</strong> Files will not be deleted until "
 "you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
 #, fuzzy
 msgid "devcp_versions_edit_update"
 msgstr "Update Versions"
@@ -5020,7 +4460,7 @@ msgstr "Status"
 msgid "devcp_versions_th_version"
 msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "附加组件已�用。"
 
@@ -5071,7 +4511,7 @@ msgstr "过滤器"
 msgid "editorcp_logs_filter_by"
 msgstr "以类型/�作过滤"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "事件日志"
 
@@ -5133,7 +4573,7 @@ msgstr "显示 %s 到 %s 之间的记录"
 msgid "editorcp_reviewlog_none_found"
 msgstr "这段时间未找到评论。"
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "审查日志"
 
@@ -5157,24 +4597,24 @@ msgstr "最近编辑活动"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "��汇总"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "审查附加组件。"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "请完整填写以下字段："
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "请至少选择一个文件审查。"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "��许自审查。"
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部软件"
 
@@ -5186,39 +4626,39 @@ msgstr "增加特性"
 msgid "editors_featured_add_feature_submit"
 msgstr "增加"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "增加特性失败"
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "增加特性�功。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "编辑特性失败。"
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "编辑特性�功。"
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "一个或者多个语言无效。"
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "删除特性失败。"
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "删除特性�功。"
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "特定的附加组件"
 
@@ -5230,170 +4670,107 @@ msgstr "�交"
 msgid "editors_featured_remove_feature"
 msgstr "删除特性"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "过滤器队列"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "有用的链接"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "编辑�导"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "附加组件策略"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "这些过滤器将�留在适当的�置直到本次会�结�或者被清除。"
 
 # %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "目�没有�审查的附加组件。"
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "一天"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "一�时"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "一分钟"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "编辑工具"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "�适用 %s"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
 msgstr "预�布"
 
 # %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "兼容 %s"
 
-#: views/editors/queue.thtml:51
-#, fuzzy
-msgid "editors_queue_filter_label_addon"
-msgstr "Add-on or Author Email"
-
-#: views/editors/queue.thtml:72
-#, fuzzy
-msgid "editors_queue_filter_label_addontypes"
-msgstr "Add-on Types"
-
-#: views/editors/queue.thtml:56
-#, fuzzy
-msgid "editors_queue_filter_label_application"
-msgstr "Application"
-
-#: views/editors/queue.thtml:61
-#, fuzzy
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-#, fuzzy
-msgid "editors_queue_filter_label_platforms"
-msgstr "Platforms"
-
-#: views/editors/queue.thtml:66
-#, fuzzy
-msgid "editors_queue_filter_label_submissionage"
-msgstr "Age of Submission (days)"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-#, fuzzy
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "Results of your filtered search: <strong>%1$s</strong> Add-on"
-msgstr[1] "Results of your filtered search: <strong>%1$s</strong> Add-ons"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "清除"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "过滤器"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr ""
 "All review queues are currently disabled. Please check back at a later time."
 "目�所有审查队列都�用。请���试。"
 
-#: views/editors/review.thtml:149
-#, fuzzy
-msgid "editors_review_a_edit_item"
-msgstr "Edit Item"
-
-#: views/editors/review.thtml:146
-#, fuzzy
-msgid "editors_review_a_item_history"
-msgstr "Item History"
-
-#: views/editors/review.thtml:148
-#, fuzzy
-msgid "editors_review_a_item_homepage"
-msgstr "Item Homepage"
-
-#: views/editors/review.thtml:145
-#, fuzzy
-msgid "editors_review_a_item_overview"
-msgstr "Item Overview"
-
-#: views/editors/review.thtml:147
-#, fuzzy
-msgid "editors_review_a_previews"
-msgstr "Previews"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "进行审查"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
 #, fuzzy
 msgid "editors_review_action_info"
 msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�布到公共网站"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�求特别审查"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "�留在沙盒中"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "审查评论"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
 #, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
@@ -5401,99 +4778,99 @@ msgstr ""
 "an email and be able to answer here. You will be notified by email when they "
 "reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
 "这会将该附加组件和他的最新版本�文件�布到公共网站。其�续版本将会进入沙盒知"
 "�有编辑对其进行审查。"
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "这会将附加组件�留在沙盒中。"
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "这会将附加组件的沙盒版本放到公开区域。"
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "这会将附加组件的沙盒版本�留在沙盒中。"
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
 "如果你觉得这个附加组件有安全�版�或者其他方�的问题需�管�员处�，在下�输"
 "入你的评论。内容将会��给管�员而�是作者。"
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 #, fuzzy
 msgid "editors_review_file_diff_link"
 msgstr "Compare with public version"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "查看内容"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "作者:"
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "分类:"
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "兼容性:"
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "�述"
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "开�者评论"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "许��议"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "文件:"
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "项目历�"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "�交说明"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "预览图片"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "��策略"
 
 # %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "审查 %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "给审查者的说明"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "摘�"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "版本说明"
 
@@ -5523,7 +4900,7 @@ msgstr "已通过审查/公开区域"
 msgid "editors_review_history_nominated_denied"
 msgstr "拒�通过/沙盒区域"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "未找到更早的审查记录。"
 
@@ -5551,94 +4928,81 @@ msgid_plural "editors_review_history_show_hide_replies"
 msgstr[0] "Show/Hide Replies (%1$s)"
 msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "应用程�:"
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "或者选择预定的回�信�:"
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "评论:"
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "�作系统:"
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "回顶端"
 
-#: views/editors/review.thtml:141
-#, fuzzy
-msgid "editors_review_mulitple_notice"
-msgstr ""
-"Notice: Only review more than one file if you have tested EVERY file you "
-"select."
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "下一� &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "未找到预览图片。"
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; 上一�"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "��队列"
 
 # %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "队列中 <strong># %1$s</strong> of %2$s"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-#, fuzzy
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "<strong># %1$s</strong> of %2$s in queue (filtered)"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "处�动作"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "动作"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "评论"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日期"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "建议者"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "版本/文件"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
 #, fuzzy
 msgid "editors_review_update_notify_once"
 msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "��已�功处�。"
 
@@ -5662,7 +5026,7 @@ msgstr "动作"
 msgid "editors_reviews_in_reply_to"
 msgstr "回�:"
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "审查�功完��"
 
@@ -5674,82 +5038,87 @@ msgstr "目�没有需�审查的项目。"
 msgid "editors_reviews_submit_process_reviews"
 msgstr "进行审查"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "针对特定网站"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "新组件"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "已更新"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "已测试的应用程�"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "�过测试的�作系统环境"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "附加信�"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "附加组件"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "类别"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "附加组件类别"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "历�的时间"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "应用程�"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "�制语言？"
 
-#: views/editors/queue.thtml:148
-#, fuzzy
-msgid "editors_th_nomination_age"
-msgstr "Time in Queue"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-#, fuzzy
-msgid "editors_th_sort_ascending"
-msgstr "Ascending sort"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "平�"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-#, fuzzy
-msgid "editors_th_sort_descending"
-msgstr "Descending sort"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "�交的类别"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s 天"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s �时"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分钟"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "�止访问"
 
@@ -5757,19 +5126,17 @@ msgstr "�止访问"
 msgid "error_access_denied_message"
 msgstr "你无�查看此页。"
 
-#: controllers/collections_controller.php:1039
-#, fuzzy
-msgid "error_addon_exists"
-msgstr "Add-on already exists!"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
@@ -5778,14 +5145,11 @@ msgstr "Add-on already exists!"
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197
-#: controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "附加组件未找到�"
 
@@ -5797,99 +5161,91 @@ msgstr "此附加组件在这里无法查看。"
 msgid "error_addon_selfreview"
 msgstr "你�能审查自己的附加组件"
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "本类无附加组件。"
 
 #: controllers/api_controller.php:424
-#, fuzzy
 msgid "error_collection_feed_notfound"
-msgstr "Add-on feed not found."
+msgstr ""
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "这�是一个有效的电�邮件地�。"
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "该项目�能为空。"
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "文件未找到�"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "文件错误: %s �存在。"
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "表�有错误，请更正��新�交。"
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "验��无效�请�试。"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr "URL格�无效。有效的URL类似于 http://example.com/ 。"
 
 #. %s is a string representing what's missing.  Example:  file_id
 #: controllers/downloads_controller.php:65
-#: controllers/users_controller.php:185 controllers/users_controller.php:264
-#: controllers/users_controller.php:559 controllers/users_controller.php:653
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
 #: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
 #: controllers/reviews_controller.php:475
-#: controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "缺少�数: %s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "没有文件"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "注�"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "Preview not found!"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "你必须选择一个评分。"
 
@@ -5897,46 +5253,37 @@ msgstr "你必须选择一个评分。"
 msgid "error_user_already_confirmed"
 msgstr "这个用户�户已�确认。"
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "无效的确认��"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "密��匹�。"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "这个邮件地�已�被其他用户使用。"
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "更改邮件已�过期。请在用户设置中�次修改你的邮件地�并在收到确认邮件以�尽快"
 "点击其中的链接。"
 
-#: controllers/collections_controller.php:985
-#, fuzzy
-msgid "error_user_exists"
-msgstr ""
-"Users can only have one role at a time.  Please remove the user from any "
-"existing roles before continuing."
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "这个昵称已�被使用。"
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "用户未找到�"
 
@@ -5944,43 +5291,40 @@ msgstr "用户未找到�"
 msgid "error_user_unconfirmed"
 msgstr "请根�你的邮件中收到的代�先确认你的用户��。"
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "错误的用户�或密��"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "版本未找到�"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "输入密�错误�"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "了解更多"
 
 # %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "了解有关 %1$s 的更多内容"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s ���"
 msgstr[1] "%1$s ���"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "查看更多"
 
@@ -6024,147 +5368,139 @@ msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
 #, fuzzy
 msgid "footer_a_about"
 msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
 #, fuzzy
 msgid "footer_a_blog"
 msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_a_faq"
 msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
 #, fuzzy
 msgid "footer_abbr_faq"
 msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "所有�利�留"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "版�所有"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "贡献者"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
 "Mozilla出于好��供这些应用程�，并�表明和这些应用程�或者任何相关的信�有关"
 "�。任何有关这些应用程�的问题�抱怨或者�求应该直接�相应的软件厂商�出。"
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "转到"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "法律声明"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "其他语言:"
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "��策略"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "�存"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "å­—å…¸"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "å­—å…¸"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "扩展"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "扩展"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "语言包（附加组件）"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "语言包（附加组件）"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "语言包（应用程�）"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "语言包（应用程�）"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "�件"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "�件"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "�索引擎"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "�索引擎"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "主题"
 
 # Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "主题"
 
-#: config/language.php:367
-#, fuzzy
-msgid "general_languages_all_locales"
-msgstr "All Locales"
-
-#: views/layouts/amo2009.thtml:249
-#, fuzzy
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "返回附加组件 %1$s 的主页"
@@ -6173,95 +5509,37 @@ msgstr "返回附加组件 %1$s 的主页"
 msgid "header_main_firefox_header"
 msgstr "Firefox 附加组件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-#, fuzzy
-msgid "header_main_firefox_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</"
-"strong>"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "附加组件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-#, fuzzy
-msgid "header_main_header_with_logo"
-msgstr "Add-ons <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
 msgstr "Seamonkey 附加组件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-#, fuzzy
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"seamonkey\" src=\"%1$s\" /> "
-"<strong>SeaMonkey</strong>"
-
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird 附加组件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-#, fuzzy
-msgid "header_main_sunbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</"
-"strong>"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird 附加组件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-#, fuzzy
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"Add-ons <em>for</em> <img alt=\"thunderbird\" src=\"%1$s\" /> "
-"<strong>Thunderbird</strong>"
-
-#: views/layouts/amo2009.thtml:205
-#, fuzzy
-msgid "header_navaccess_applications_menu"
-msgstr "Skip to other applications menu"
-
-#: views/layouts/amo2009.thtml:204
-#, fuzzy
-msgid "header_navaccess_categories_menu"
-msgstr "Skip to categories menu"
-
-#: views/layouts/amo2009.thtml:202
-#, fuzzy
-msgid "header_navaccess_main_content"
-msgstr "Skip to main content"
-
-#: views/layouts/amo2009.thtml:203
-#, fuzzy
-msgid "header_navaccess_search_form"
-msgstr "Skip to search form"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "附加组件"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "登录"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "注销"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "我的�户"
 
@@ -6269,24 +5547,12 @@ msgstr "我的�户"
 msgid "header_navlink_register"
 msgstr "注册"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-#, fuzzy
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">Register</a> or <a href=\"%2$s\">Log in</a>"
-
-#: views/layouts/amo2009.thtml:285
-#, fuzzy
-msgid "header_navlink_tools"
-msgstr "Tools"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s 的预览图"
@@ -6294,47 +5560,36 @@ msgstr "%s 的预览图"
 # %1 is the login URL for the link tag
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
 msgstr "<a href=\"%1$s\">登录</a>以便安装这个附加组件"
 
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-#, fuzzy
-msgid "install_button_confirm_exp_install"
-msgstr ""
-"Let me install this experimental add-on. <a href=\"%1$s\">What's this?</a>"
-
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
 msgstr "安装到 %s %s"
 
 # %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "安装 %1$s 到 %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "下载 %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "该附加组件��用。"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "语言包和字典列表"
 
@@ -6346,8 +5601,8 @@ msgstr "下载字典"
 msgid "langtools_download_langpack"
 msgstr "下载语言包"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "字典和语言包"
 
@@ -6359,80 +5614,36 @@ msgstr "安装字典"
 msgid "langtools_install_langpack"
 msgstr "安装语言包"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "å­—å…¸"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "语言包"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "语言"
 
-#: models/license.php:65
-#, fuzzy
-msgid "license_custom"
-msgstr "Custom License"
-
-#: config/bootstrap.php:303
-#, fuzzy
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-#, fuzzy
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License, version 2.0"
-
-#: config/bootstrap.php:299
-#, fuzzy
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License, version 3.0"
-
-#: config/bootstrap.php:300
-#, fuzzy
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License, version 2.1"
-
-#: config/bootstrap.php:301
-#, fuzzy
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License, version 3.0"
-
-#: config/bootstrap.php:302
-#, fuzzy
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-#, fuzzy
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License, version 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "点击这里返回开始的页�。"
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "日期"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "下载次数"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "附加组件�称"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "评分"
@@ -6457,21 +5668,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "语言包"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "�件"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "主题"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "查找其他应用程�的附加组件"
 
 # In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "其他"
 
@@ -6479,34 +5697,12 @@ msgstr "其他"
 msgid "page_title_appversions"
 msgstr "应用程�版本"
 
-#: controllers/pages_controller.php:115
-#, fuzzy
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-#, fuzzy
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector FAQ"
-
-#: controllers/pages_controller.php:119
-#, fuzzy
-msgid "page_title_collector_features"
-msgstr "Add-on Collector Features"
-
-#: controllers/pages_controller.php:122
-#, fuzzy
-msgid "page_title_collector_firstrun"
-msgstr "Welcome to the Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "贡献者"
 
-#: controllers/pages_controller.php:113
-#, fuzzy
-msgid "page_title_developer_faq"
-msgstr "Developer FAQ"
+msgid "page_title_experimental_addons"
+msgstr "试验性的"
 
 #: controllers/pages_controller.php:111
 #, fuzzy
@@ -6537,22 +5733,22 @@ msgstr "沙盒评论系统"
 msgid "page_title_submissionhelp"
 msgstr "�交说明"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "正确的应用程�版本"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
 "�交到Mozilla Add-ons的附加组件必须带有 install.rdf 文件，其中至少�支�以下"
 "应用之一。对于这些应用，�有以下列出的版本是�以使用的。"
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -6561,15 +5757,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "这里"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "版本"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "返回�一页"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "沙盒信�页�"
 
@@ -6577,6 +5776,13 @@ msgstr "沙盒信�页�"
 msgid "pagination_next_page"
 msgstr "下一页"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "这是第 %1$s 页 共 %2$s 页"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "�一页"
@@ -6613,15 +5819,15 @@ msgstr ""
 "如果觉得难以辨识，你�以 <a href=\"%1$s\">�试其他字符</a> 或者改为<a href="
 "\"%2$s\">收�验��</a> 。"
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "你是人类?"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "这是什么?"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "该评论标记错误!"
 
@@ -6629,7 +5835,7 @@ msgstr "该评论标记错误!"
 msgid "review_flag_reason_bug_support"
 msgstr "错误的缺陷报告或支�请求"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "举报该评论 (选择一个原因)"
 
@@ -6645,8 +5851,8 @@ msgstr "其他 (请说明)"
 msgid "review_flag_reason_spam"
 msgstr "�水或其他�评论内容"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "谢谢；该评论以被编辑标记为批准。"
 
@@ -6660,7 +5866,7 @@ msgstr "该评论�适当��准确或者是垃圾信�？点击这里将其
 
 # %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>记�这些�示：</p><ul><li>撰写时就�告诉你的朋�你对这个附加组件的使用体"
@@ -6673,131 +5879,101 @@ msgstr ""
 "</a>获�有关评价附加组件的更多介�。</p>"
 
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "对 %s 的��"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "特别推�"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "最新附加组件"
 
-#: controllers/addons_controller.php:434
-#, fuzzy
-msgid "rss_popularaddons"
-msgstr "Popular Add-ons"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "更新的附加组件"
 
-#: views/elements/search_mini.thtml:70
-#, fuzzy
-msgid "search"
-msgstr "Search"
-
-#: views/search/collections.thtml:51
-#, fuzzy
-msgid "search_collections_header"
-msgstr "Collection Search Results"
-
-#: controllers/search_controller.php:297
-#, fuzzy
-msgid "search_collections_pagetitle"
-msgstr "Collection Search Results"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "现在�止�索，请�候�试。"
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "所有附加组件"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-#, fuzzy
-msgid "search_form_all_collections"
-msgstr "all collections"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "�索附加组件"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-#, fuzzy
-msgid "search_form_default_text_collections"
-msgstr "search for collections"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "�索附加组件"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "点击输入�索内容"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "范围"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "所有�索引擎"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "�览�索引擎"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s 个符��件的附加组件"
+msgstr[1] "%s 个符��件的附加组件"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "未找到结果。"
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "�索附加组件"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "�索结果收�点"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "�索结果: %s"
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�员工具"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "开�者工具"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "编辑工具"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "欢迎"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "欢迎你, %s"
@@ -6806,7 +5982,7 @@ msgstr "欢迎你, %s"
 msgid "sidebar_pitch_dictionary"
 msgstr "å­—å…¸"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "特别的附加组件"
 
@@ -6814,7 +5990,7 @@ msgstr "特别的附加组件"
 msgid "sidebar_pitch_looking_for"
 msgstr "我�寻找一个："
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "最新附加组件"
 
@@ -6822,7 +5998,7 @@ msgstr "最新附加组件"
 msgid "sidebar_pitch_search"
 msgstr "�索引擎"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "订阅到"
 
@@ -6830,24 +6006,25 @@ msgstr "订阅到"
 msgid "sidebar_pitch_theme"
 msgstr "主题"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "更新的附加组件"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "尚未评分"
 
 # %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "评分 %s 超过了 5 星"
@@ -6884,13 +6061,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%m 月 %e 日 (%a)"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s 已建立"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s 已�布"
@@ -6903,184 +6080,184 @@ msgstr "关闭"
 msgid "statistics_help_link"
 msgstr "帮助"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "或者，选择其他附加组件"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "或者，选择一个已公开�布的附加组件"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "选择你的一个附加组件查看统计信�"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "选择一个附加组件查看统计信�"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "选择一个公开统计的附加组件"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "统计信�"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "显示统计"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 #, fuzzy
 msgid "statistics_js_download_csv"
 msgstr "View this table in CSV format"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "æ— "
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "删除此图"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 #, fuzzy
 msgid "statistics_js_groupby_selector_date"
 msgstr "Group by: Day"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 #, fuzzy
 msgid "statistics_js_groupby_selector_month"
 msgstr "Group by: Month"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 #, fuzzy
 msgid "statistics_js_groupby_selector_week"
 msgstr "Group by: Week"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
 #, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
 msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "范围内找到 %s 个"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "新增图"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "为该图表增加图"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "��总计"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "显示总计"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "图表中图的数�"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "查看数�（CSV）"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "获�此数�的逗�分隔文件"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "�� %s 事件"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "显示 %s 事件"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "�置此图的附加组件�布日期"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "��Firefox事件"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "显示Firefox事件"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "�置此图的Firefox�布日期"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "折�图表"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "展开图表"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "调整图表尺寸"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "日访问用户"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "应用程�"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "自定义"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "下载"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "�作系统"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "附加组件状�"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "汇总"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "附加组件版本"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "应用程�"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "�作系统"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "附加组件状�"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "未知"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "附加组件版本"
 
@@ -7113,7 +6290,7 @@ msgstr "你的设置已更新。"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "统计信�"
 
@@ -7141,104 +6318,108 @@ msgstr "放大"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "放大到一个月"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s 的�日统计汇总"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "统计数�收�点"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "Y 年 %m 月 %e 日 (%a)"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "%1$s 的统计"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "默认情况下，�有你和Mozilla�以访问你的��上的信�。你�以对公众开放以便任何"
 "人都能查阅你的附加组件的数�。"
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "统计��访问��"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "�有"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "�有你和Mozilla�以查阅这个附加组件的统计"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "公开"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "任何人都�以查阅这个附加组件的统计"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "更改设置"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "请将这些信��密。"
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "本��目�处于<b>�有</b>状�。"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "本��目�处于<b>公开</b>状�。"
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "�定"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "返回��"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "�存设置"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s 的统计��设置"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "解�"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "应用程�"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "�作系统"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "状�"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "未知"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "版本"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "平�日下载�"
 
@@ -7250,7 +6431,7 @@ msgstr "下载�"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "最近一天"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "最近七天"
 
@@ -7268,7 +6449,7 @@ msgstr "从 %1$s 以�"
 msgid "statistics_summary_nodata"
 msgstr "尚无数�"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "平�日活跃用户"
 
@@ -7294,72 +6475,55 @@ msgstr "日活跃用户"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "在 %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "Average Daily Users this Week"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-#, fuzzy
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "%s from last week"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 统计"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "所有主题"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "�览主题"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "更改邮件地�"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "更改密�"
 
-#: views/users/edit.thtml:96
-#, fuzzy
-msgid "user_change_password_or_email"
-msgstr "Change Password or Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "确认�已�新���"
 
 # %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "你的�户 %1$s 已��功删除。如果日�你还希望回�，需�到 <a href=\"%2$s\"> 用"
 "户注册页� </a> �新注册。"
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "对于你的离开，Mozilla 附加组件社区感到很难过。"
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "确认密�"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "现在删除我的用户��"
 
 # %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "如果你列于 <a href=\"%1$s\"> 任何附加组件的作者列表 </a> 中，就�能删除你的�"
@@ -7368,77 +6532,77 @@ msgstr ""
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "如果你有其他问题，请�系 %1$s 获得帮助。"
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "删除你的�户之�，你需�选中�选框\"我已明白...\""
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "请准确输入你的密�以便执行当�步骤。"
 
 # %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
 "删除你的�户时�生了未知错误，请�系 %1$s 说明该问题，我们会为您删除�户。由"
 "此带�的�便，我们表示歉�。"
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "确认�户删除"
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "删除用户�户 %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "�会!"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "你将�也�能登录到 Mozilla 附加组件网站。"
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr "点击 \"删除\" �你的�户将会被 <strong>永久删除</strong>。这�味�："
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr "你的评论和评分将�会被删除，但是将��和你有关�。"
 
 # %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
 "如果你有我们�以帮助解决的问题，请��现在删除你的�户，而是通过 %1$s �系我"
 "们，我们会尽力为你�供帮助以解决问题。"
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "我明白这个�作��撤销。"
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "已删除用户"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
 "一�邮件已���到 %1$s 以确认你的新邮件地�。�让你的更改生效，你需�点击这"
 "�邮件中�供的链接。在此之�，你�然�以通过现有的邮件地�继续登录。"
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "删除用户�户"
 
@@ -7467,7 +6631,9 @@ msgstr ""
 
 # %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "你请求更改 %2$s 附加组件中你的电�邮件地�。\n"
@@ -7507,111 +6673,90 @@ msgstr ""
 "谢谢,\n"
 "-- %2$s 附加组件团队"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "�置你的 %s 附加组件密�"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "错误!"
 
 # %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "请确认更改 %1$s 附加组件中你的邮件地�"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "�功�"
 
 # %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr "你的电�邮件地�已�修改�功。从现在开始，请使用%1$s 登录。"
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-#, fuzzy
-msgid "user_form_bio"
-msgstr "About me"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-#, fuzzy
-msgid "user_form_bio_description"
-msgstr ""
-"Introduce yourself to the community, if you like! This text will appear "
-"publicly on your user info page. Line breaks will be preserved, but no HTML "
-"is allowed."
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "确认密�"
 
-#: views/users/edit.thtml:145
-#, fuzzy
-msgid "user_form_display_collections"
-msgstr "Display the collections I have created in my user profile"
-
-#: views/users/edit.thtml:149
-#, fuzzy
-msgid "user_form_display_collections_fav"
-msgstr "Display my favorite collections in my user profile"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "编辑 %s 的用户�置文件"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "邮件地�"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "姓�"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "��邮件地�"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "网站 URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "�字"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "用户登录"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "新密�"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "昵称"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "旧密�"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "其他�作"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "密�"
 
@@ -7619,64 +6764,64 @@ msgstr "密�"
 msgid "user_form_registration"
 msgstr "新用户注册"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "记�我的登录状�"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "显示沙盒？"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "�存"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "登录"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "注册"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s 附加组件注册日期"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "建立新��"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "附加组件兼容性 (强烈建议)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "�将�生的事件和争论"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "根�你的�置，目�没有通知信�。"
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
 "有时，Mozilla 会��邮件说明�将�布的版本和附加组件信�。请在下�选择你感兴"
 "趣的�题："
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "对于你�布的附加组件，为了沟通一些特别关心的问题，Mozilla�留�独�系你的�"
 "力。"
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "你�的更改有错误，请确认��新�交。"
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "�置文件已更新。"
 
@@ -7689,15 +6834,15 @@ msgstr "为 %s �置密�。"
 msgid "user_pwreset_header"
 msgstr "密��置"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "忘记密�？"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "密��置链接已���到你的邮件地�。"
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "密��置�功。"
 
@@ -7709,7 +6854,7 @@ msgstr "�交更改密�"
 msgid "user_pwreset_submit_sendlink"
 msgstr "���置密�链接"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s 附加组件"
@@ -7725,7 +6870,7 @@ msgstr ""
 
 # %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -7736,24 +6881,10 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "�新��确认消�。"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "�贺你�你的用户��已��功建立。"
 
-#: views/users/register.thtml:50
-#, fuzzy
-msgid "user_register_details"
-msgstr ""
-"<p>Registration on AMO is <strong>not required</strong> if you simply want "
-"to download and install public add-ons.</p><p>You only need to register if:</"
-"p><ul><li>You want to submit reviews for add-ons</li><li>You are an add-on "
-"developer and want to upload your add-on for hosting on AMO</li></ul><p>Upon "
-"successful registration, you will be sent a confirmation email to the "
-"address you provided. Please follow the instructions there to confirm your "
-"account.</p><p>If you like, you can read our <a href='%1$s' title='Legal "
-"Notices'>Legal Notices</a> and <a href='%2$s' title='Privacy Policy'>Privacy "
-"Policy</a>.</p>"
-
 # %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
@@ -7765,30 +6896,20 @@ msgstr ""
 
 # %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "感谢注册并欢迎�到 %1$s �"
 
-#: views/users/register.thtml:49
-#, fuzzy
-msgid "user_register_welcome_header"
-msgstr "Welcome to addons.mozilla.org (AMO)!"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "�称, 姓�或昵称是必��少的。"
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-#, fuzzy
-msgid "user_tab_collections"
-msgstr "Collections"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "通知"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "用户�置"
 
@@ -7796,67 +6917,51 @@ msgstr "用户�置"
 msgid "user_verified_okay"
 msgstr "验��功�"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "删除用户�户"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "正在编辑用户�户"
 
-#: views/users/info.thtml:71
-#, fuzzy
-msgid "users_info_aboutme"
-msgstr "About Me"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s 的附加组件"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "�字"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "用户档案"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-#, fuzzy
-msgid "users_info_collections_by_user"
-msgstr "Collections by %s"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "电�邮件"
 
-#: views/users/info.thtml:155
-#, fuzzy
-msgid "users_info_fav_collections_by_user"
-msgstr "Favorite Collections"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "主页"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "昵称"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s 的用户信�"
 
 # %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "%s �布"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "用户登录"
 
@@ -7890,695 +6995,5 @@ msgstr "用户密��置"
 msgid "users_register_pagetitle"
 msgstr "新用户注册"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-#, fuzzy
-msgid "versions_license_header_source"
-msgstr "Source code license for %1$s %2$s"
-
-#: views/addons/category_landing.thtml:147
-#, fuzzy
-msgid "view_recently_added"
-msgstr "View all recently added"
-
-#: views/addons/category_landing.thtml:161
-#, fuzzy
-msgid "view_top_downloads"
-msgstr "View all top downloads"
-
-#: views/addons/category_landing.thtml:175
-#, fuzzy
-msgid "view_top_rated"
-msgstr "View all top rated"
-
-#~ msgid "addon_slider_tooltip_next"
-#~ msgstr "下一个附加组件"
-
-#~ msgid "addon_slider_tooltip_previous"
-#~ msgstr "�一个附加组件"
-
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "兼容的最新版本"
-
-#~ msgid "addons_display_version_history"
-#~ msgstr "完整的版本历�"
-
-#~ msgid "addons_home_newest_header"
-#~ msgstr "最新的:"
-
-#~ msgid "addons_home_popular_header"
-#~ msgstr "最热门的："
-
-#~ msgid "addons_home_recommended_header"
-#~ msgstr "推�："
-
-#~ msgid "addons_home_updated_header"
-#~ msgstr "最近更新:"
-
-#~ msgid "addons_home_view_all"
-#~ msgstr "查看全部"
-
-#~ msgid "category_extra_allrecommended"
-#~ msgstr "查看所有推�的附加组件"
-
-#~ msgid "category_extra_highestrated"
-#~ msgstr "评分最高的在�"
-
-#~ msgid "category_extra_lastupdated"
-#~ msgstr "最近更新的在�"
-
-#~ msgid "category_extra_mostpopular"
-#~ msgstr "最热门的在�"
-
-#, fuzzy
-#~ msgid "collections_detail_js_loading"
-#~ msgstr "Loading"
-
-#, fuzzy
-#~ msgid "collections_detail_more_info"
-#~ msgstr "Show More Info"
-
-#~ msgid "devcp_additem_firefox_notice"
-#~ msgstr ""
-#~ "你的这个版本的附加组件未生命与Firefox %1$s 兼容。Mozilla的下一个Firefox版"
-#~ "本很快就��布，所以请您在新版本中测试您的附加组件并更新兼容性信�。你�以"
-#~ "在 <a href=\"%2$s\">这里</a> 找到更多信�。这仅仅是一个�醒，你�以继续� "
-#~ "addons.mozilla.org �交该版本。"
-
-#~ msgid "devcp_addon_disabled_successfully"
-#~ msgstr "�功�用附加组件"
-
-#~ msgid "devcp_addon_edit_pagetitle"
-#~ msgstr "编辑附加组件"
-
-#~ msgid "devcp_addon_enabled_successfully"
-#~ msgstr "�功�用附加组件"
-
-#~ msgid "devcp_addon_field_description_displaytitle"
-#~ msgstr "附加组件�述"
-
-#~ msgid "devcp_addon_field_eula_displaytitle"
-#~ msgstr "许��议"
-
-#~ msgid "devcp_addon_field_homepage_displaytitle"
-#~ msgstr "附加组件主页"
-
-#~ msgid "devcp_addon_field_name_displaytitle"
-#~ msgstr "附加组件�称"
-
-#~ msgid "devcp_addon_field_privacy_displaytitle"
-#~ msgstr "��策略"
-
-#~ msgid "devcp_addon_field_summary_displaytitle"
-#~ msgstr "附加组件摘�"
-
-#~ msgid "devcp_addon_field_supportemail_displaytitle"
-#~ msgstr "技术支�邮箱"
-
-#~ msgid "devcp_addon_field_supporturl_displaytitle"
-#~ msgstr "技术支�网站"
-
-#~ msgid "devcp_addon_field_versionnotes_displaytitle"
-#~ msgstr "版本信�"
-
-#~ msgid "devcp_addon_nominate_pagetitle"
-#~ msgstr "�请批准附加组件"
-
-#~ msgid "devcp_addon_nominated_successfully"
-#~ msgstr "附加组件�请批准�功�"
-
-#, fuzzy
-#~ msgid "devcp_addon_status_criteria_review"
-#~ msgstr "Several user reviews of the add-on (may be external reviews)."
-
-# %1 is the addon edit link
-# %2 is the main dev CP link
-#~ msgid "devcp_addon_submission_makechanges"
-#~ msgstr ""
-#~ "访问 %1$s 页�对你上传的内容进行修改，或者点击 %2$s 返回开�者工具。"
-
-#~ msgid "devcp_addon_submission_makechanges_devcp_link"
-#~ msgstr "点击这里"
-
-#~ msgid "devcp_addon_submission_makechanges_link"
-#~ msgstr "编辑附加组件"
-
-#~ msgid "devcp_addon_submission_pending"
-#~ msgstr ""
-#~ "这个版本已�放入沙盒，供沙盒测试者和Mozilla附加组件编辑审查。通过以�会以"
-#~ "电�邮件通知你。"
-
-# %1 is the link to the sandbox information page
-#~ msgid "devcp_addon_submission_sandbox_readmore"
-#~ msgstr "你�以查看 %s 获�有关沙盒审查系统的更多信�。"
-
-#~ msgid "devcp_addon_submission_sandbox_readmore_link"
-#~ msgstr "这里"
-
-# %1 is the "nominate" link
-#~ msgid "devcp_addon_submission_sandboxed"
-#~ msgstr ""
-#~ "这个版本已�放入沙盒供专业用户使用。为了使其能够显示在公开网站，你必须%s "
-#~ "你的附加组件并通过这个审查�程。"
-
-#~ msgid "devcp_addon_submission_sandboxed_nominate_link"
-#~ msgstr "�请批准"
-
-#~ msgid "devcp_addon_submission_success"
-#~ msgstr "你的上传已��功进行完毕。"
-
-#~ msgid "devcp_addon_submission_trusted_public"
-#~ msgstr "因为你的附加组件是被信任的，该版本已�自动获得核准�布到公开网站。"
-
-#~ msgid "devcp_addon_submit_pagetitle"
-#~ msgstr "上传附加组件"
-
-#~ msgid "devcp_addon_updated_successfully"
-#~ msgstr "附加组件更新�功"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_addon_upload_preview"
-#~ msgstr "%s �以��使用者对你的附加组件的兴趣。"
-
-#~ msgid "devcp_addon_upload_preview_link"
-#~ msgstr "上传预览图片"
-
-# #1 is the author email
-#~ msgid "devcp_author_lookup_none_found"
-#~ msgstr "未找到作者 [%s]"
-
-#~ msgid "devcp_author_lookup_remove"
-#~ msgstr "删除"
-
-#~ msgid "devcp_button_cancel"
-#~ msgstr "放弃"
-
-#~ msgid "devcp_button_cancel_confirm"
-#~ msgstr "你确信�放弃上传？"
-
-#~ msgid "devcp_button_next"
-#~ msgstr "下一步"
-
-#~ msgid "devcp_change_addontype"
-#~ msgstr "更改附加组件类型："
-
-#~ msgid "devcp_comments_updated"
-#~ msgstr "开�者评论已更新。"
-
-#~ msgid "devcp_details_addpreview_link"
-#~ msgstr "添加预览图"
-
-#~ msgid "devcp_details_author"
-#~ msgstr "作者"
-
-#~ msgid "devcp_details_authors"
-#~ msgstr "作者"
-
-#~ msgid "devcp_details_authors_none"
-#~ msgstr "æ— "
-
-#~ msgid "devcp_details_categories"
-#~ msgstr "分类"
-
-#~ msgid "devcp_details_category"
-#~ msgstr "分类"
-
-#~ msgid "devcp_details_description"
-#~ msgstr "�述"
-
-#~ msgid "devcp_details_disabled"
-#~ msgstr "�用"
-
-#~ msgid "devcp_details_guid"
-#~ msgstr "GUID"
-
-#~ msgid "devcp_details_header_details"
-#~ msgstr "详情"
-
-#~ msgid "devcp_details_header_devcomments"
-#~ msgstr "开�者评论"
-
-#~ msgid "devcp_details_header_previews"
-#~ msgstr "预览图"
-
-#~ msgid "devcp_details_header_versions"
-#~ msgstr "版本"
-
-#~ msgid "devcp_details_homepage"
-#~ msgstr "主页"
-
-#~ msgid "devcp_details_homepage_none"
-#~ msgstr "æ— "
-
-#~ msgid "devcp_details_preview_nocaption"
-#~ msgstr "无说明"
-
-#~ msgid "devcp_details_previews_nonefound"
-#~ msgstr "未找到预览图。"
-
-#~ msgid "devcp_details_submit_update"
-#~ msgstr "æ›´æ–°"
-
-#~ msgid "devcp_details_supportemail"
-#~ msgstr "技术支�邮件"
-
-#~ msgid "devcp_details_supportemail_none"
-#~ msgstr "开�者未�供技术支�邮箱"
-
-#~ msgid "devcp_details_supporturl"
-#~ msgstr "技术支�网站"
-
-#~ msgid "devcp_details_supporturl_none"
-#~ msgstr "开�者未�供技术支�网站"
-
-#~ msgid "devcp_details_trusted"
-#~ msgstr "�信任的"
-
-#~ msgid "devcp_details_versions_none_found"
-#~ msgstr "未找到版本。"
-
-#~ msgid "devcp_disable_cancel"
-#~ msgstr "放弃并返回"
-
-#~ msgid "devcp_disable_disable_button"
-#~ msgstr "好的，�用它。"
-
-#~ msgid "devcp_disable_disable_confirm"
-#~ msgstr "你确认��用这个附加组件？"
-
-#~ msgid "devcp_disable_disable_description"
-#~ msgstr ""
-#~ "�用这个附加组件将会导致他从�索结果和列表中消失，将�能从公开网站下载到，"
-#~ "也�能为客户端�供更新检测。附加组件将会处于一�被删除的效果，尽管你�以很"
-#~ "方便地回到这里�新�用它。"
-
-#~ msgid "devcp_disable_disable_title"
-#~ msgstr "�用 %s"
-
-#~ msgid "devcp_disable_enable_button"
-#~ msgstr "好的，�用它。"
-
-#~ msgid "devcp_disable_enable_confirm"
-#~ msgstr "你确认��用这个附加组件？"
-
-#~ msgid "devcp_disable_enable_description"
-#~ msgstr ""
-#~ "�用这个附加组件将会使其�次显示在�索结果和列表中，将能够从网站下载到并从"
-#~ "客户端进行更新检测。"
-
-#~ msgid "devcp_disable_enable_title"
-#~ msgstr "�用 %s"
-
-#~ msgid "devcp_edit_author_add"
-#~ msgstr "增加作者"
-
-#~ msgid "devcp_edit_author_email"
-#~ msgstr "作者的电�邮件："
-
-#~ msgid "devcp_edit_author_remove"
-#~ msgstr "删除"
-
-#~ msgid "devcp_edit_error_categories_unavailable"
-#~ msgstr "这�附加组件没有�用的分类。"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_incomplete"
-#~ msgstr "Incomplete transfer"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_no"
-#~ msgstr "No file uploaded"
-
-#, fuzzy
-#~ msgid "devcp_edit_file_error_size"
-#~ msgstr "Exceeds maximum upload size"
-
-#~ msgid "devcp_edit_header_authors"
-#~ msgstr "作者"
-
-#~ msgid "devcp_edit_icon_add_link"
-#~ msgstr "增加图标"
-
-#~ msgid "devcp_edit_icon_change_link"
-#~ msgstr "更改图标"
-
-#~ msgid "devcp_edit_label_allow_viewsource"
-#~ msgstr "�许用户在线查看�文件。"
-
-#~ msgid "devcp_edit_label_categories"
-#~ msgstr "类别"
-
-#~ msgid "devcp_edit_label_defaultlocale"
-#~ msgstr "默认语言"
-
-#~ msgid "devcp_edit_label_icon_delete"
-#~ msgstr "仅清除已有图标。"
-
-#~ msgid "devcp_edit_label_icon_new"
-#~ msgstr "新图标文件"
-
-#~ msgid "devcp_edit_label_info"
-#~ msgstr "图标"
-
-#~ msgid "devcp_edit_locale_disambiguation_explanation"
-#~ msgstr "简短的附加信�（例如本地语言�称）"
-
-#~ msgid "devcp_edit_submit_update"
-#~ msgstr "æ›´æ–°"
-
-#~ msgid "devcp_edit_target_locale_explanation"
-#~ msgstr ""
-#~ "<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">本地化语言简"
-#~ "称</a>, 例如 'zh-CN'"
-
-#~ msgid "devcp_editversion_checkedfiles_delete"
-#~ msgstr "选中的文件将被删除。"
-
-# %1 is the file name
-# %2 is the file size (150 KB)
-#~ msgid "devcp_editversion_filename_size"
-#~ msgstr "%1$s (%2$s)"
-
-#~ msgid "devcp_editversion_label_files"
-#~ msgstr "文件"
-
-#~ msgid "devcp_editversion_label_targetapps"
-#~ msgstr "目标应用程�"
-
-#~ msgid "devcp_editversion_nofiles"
-#~ msgstr "没有文件。"
-
-#~ msgid "devcp_editversion_reviewernotes"
-#~ msgstr "建议者说明"
-
-#~ msgid "devcp_editversion_submit_update"
-#~ msgstr "æ›´æ–°"
-
-#~ msgid "devcp_error_addon_field_summary_toolong"
-#~ msgstr "摘��制在250字符以内。（你输入了 %s 个字符）"
-
-#~ msgid "devcp_error_addonname_not_unique"
-#~ msgstr ""
-#~ "你的扩展�称在数�库中已�存在。请确认：<br /><li>你的GUID是�匹�。该错误"
-#~ "最常�的原因是GUID�匹�。</li><li>数�库中�能有��的记录。如果你�这么"
-#~ "�你应该更新那个项目或者删除以��试。</li>"
-
-#~ msgid "devcp_error_describe_changes"
-#~ msgstr "请�述该附加组件更新的更改详情。"
-
-#~ msgid "devcp_error_file_guids_dont_match"
-#~ msgstr "文件GUID�完全匹�。"
-
-#~ msgid "devcp_error_identical_version_exists"
-#~ msgstr "该附加组件在该平�下已有相�的版本(%s)。"
-
-#~ msgid "devcp_error_nominate_message"
-#~ msgstr "你必须�供推�时所�求的细节。"
-
-#~ msgid "devcp_error_nominate_no_prerelease"
-#~ msgstr "你�能推�预�行版本的附加组件。"
-
-#~ msgid "devcp_error_nominate_sandbox_only"
-#~ msgstr "你�能推�当�在沙盒中的附加组件。"
-
-#~ msgid "devcp_error_saving"
-#~ msgstr "�存数�时�生错误。"
-
-#~ msgid "devcp_error_update_access_denied"
-#~ msgstr "你没有更新这个附加组件的�利。"
-
-#~ msgid "devcp_file_addanother"
-#~ msgstr "增加�一平�的文件"
-
-#~ msgid "devcp_form_author_add"
-#~ msgstr "增加作者"
-
-#~ msgid "devcp_form_author_remove"
-#~ msgstr "移走"
-
-#~ msgid "devcp_form_categories_nextstep"
-#~ msgstr "新的附加组件分类在下一步中�用。"
-
-#~ msgid "devcp_form_error_categories_unavailable"
-#~ msgstr "这个附加组件的类型没有有效的分类。"
-
-#~ msgid "devcp_form_error_description_notempty"
-#~ msgstr "请输入你附加组件的�述。"
-
-#~ msgid "devcp_form_error_name_required"
-#~ msgstr "请输入你附加组件的�称。"
-
-#~ msgid "devcp_form_error_select_addontype"
-#~ msgstr "请选择你�交的附加组件的类型。"
-
-#~ msgid "devcp_form_error_summary_notempty"
-#~ msgstr "请输入你附加组件的摘�。"
-
-#~ msgid "devcp_form_label_addonfile"
-#~ msgstr "附加组件文件"
-
-#~ msgid "devcp_form_label_addonfile2"
-#~ msgstr "附加组件文件 2"
-
-#~ msgid "devcp_form_label_addonfile3"
-#~ msgstr "附加组件文件 3"
-
-#~ msgid "devcp_form_label_addontype"
-#~ msgstr "附加组件类型"
-
-#~ msgid "devcp_form_label_allow_viewsource"
-#~ msgstr "�许用户在线�览�文件"
-
-#~ msgid "devcp_form_label_author_email"
-#~ msgstr "作者邮件地�"
-
-#~ msgid "devcp_form_label_authors"
-#~ msgstr "作者"
-
-#~ msgid "devcp_form_label_categories"
-#~ msgstr "分类"
-
-#~ msgid "devcp_form_label_defaultlocale"
-#~ msgstr "默认语�"
-
-#~ msgid "devcp_form_label_description"
-#~ msgstr "�述"
-
-#~ msgid "devcp_form_label_eula"
-#~ msgstr "最终用户许��议(EULA)"
-
-#~ msgid "devcp_form_label_externalsoftware"
-#~ msgstr "这个附加组件需�外部软件"
-
-#~ msgid "devcp_form_label_files"
-#~ msgstr "文件"
-
-#~ msgid "devcp_form_label_homepage"
-#~ msgstr "主页"
-
-#~ msgid "devcp_form_label_iconfile"
-#~ msgstr "图标文件"
-
-#~ msgid "devcp_form_label_name"
-#~ msgstr "�称"
-
-#~ msgid "devcp_form_label_platforms"
-#~ msgstr "支�平�"
-
-#~ msgid "devcp_form_label_prerelease"
-#~ msgstr "这是预�行版"
-
-#~ msgid "devcp_form_label_privacy"
-#~ msgstr "��策略"
-
-#~ msgid "devcp_form_label_sitespecific"
-#~ msgstr "这是一个特定站点附加组件"
-
-#~ msgid "devcp_form_label_summary"
-#~ msgstr "摘�"
-
-#~ msgid "devcp_form_label_supportemail"
-#~ msgstr "技术支�邮箱"
-
-#~ msgid "devcp_form_label_supporturl"
-#~ msgstr "技术支�网站"
-
-#~ msgid "devcp_form_label_target_applications"
-#~ msgstr "目标应用程�"
-
-#~ msgid "devcp_form_label_version"
-#~ msgstr "版本"
-
-#~ msgid "devcp_form_label_versionnotes"
-#~ msgstr "版本记录"
-
-#~ msgid "devcp_form_no_target_apps"
-#~ msgstr "æ— "
-
-#~ msgid "devcp_form_reviewernotes"
-#~ msgstr "给审阅者消�"
-
-#~ msgid "devcp_form_trustedaddon_destination"
-#~ msgstr "因为你的附加组件�信任，请选择这个版本去�："
-
-#~ msgid "devcp_form_trustedaddon_destination_public"
-#~ msgstr "公共"
-
-#~ msgid "devcp_form_trustedaddon_destination_sandbox"
-#~ msgstr "沙盒"
-
-#~ msgid "devcp_header_developer_agreement"
-#~ msgstr "开�者�议"
-
-#~ msgid "devcp_header_step1"
-#~ msgstr "步骤 1"
-
-#~ msgid "devcp_header_step1_upload"
-#~ msgstr "上传文件"
-
-#~ msgid "devcp_header_step2"
-#~ msgstr "步骤 2"
-
-#~ msgid "devcp_header_step2_addondetails"
-#~ msgstr "附加组件细节"
-
-#~ msgid "devcp_header_step3"
-#~ msgstr "步骤 3"
-
-#~ msgid "devcp_header_step3_versiondetails"
-#~ msgstr "版本细节"
-
-#~ msgid "devcp_header_step4"
-#~ msgstr "步骤 4"
-
-#~ msgid "devcp_header_step4_localization"
-#~ msgstr "本地化"
-
-#~ msgid "devcp_header_step5"
-#~ msgstr "步骤 5"
-
-#~ msgid "devcp_header_step5_success"
-#~ msgstr "完�"
-
-#~ msgid "devcp_index_header_myaddons"
-#~ msgstr "我的附加组件"
-
-#~ msgid "devcp_nominate_link_returnto_details"
-#~ msgstr "返回附加组件详情"
-
-# %1 is the autodetected addon type
-#~ msgid "devcp_notice_autodetected_addontype"
-#~ msgstr "自动检测附加组件类型: %s."
-
-# %1 is the default locale name (English (US))
-# %2 is the default locale code (en-US)
-# %3 is the current page locale name (Deutsch)
-# %4 is the current page locale code (de)
-#~ msgid "devcp_notice_different_defaultlocale"
-#~ msgstr ""
-#~ "该附加组件的默认语言设置(%1$s [%2$s])与你当�选择的语言(%3$s [%4$s])�一"
-#~ "致。下�的字段应该在 %1$s 完�。"
-
-#~ msgid "devcp_question_addontype_incorrect"
-#~ msgstr "�正确？"
-
-#~ msgid "devcp_question_delete_file"
-#~ msgstr "你确认�删除这个文件？"
-
-#~ msgid "devcp_skip_reviewing_addon_info"
-#~ msgstr "�更新我当�的附加组件信�"
-
-#~ msgid "devcp_submissions_disabled"
-#~ msgstr "目��能�交附加组件，请���试。"
-
-#~ msgid "devcp_submit_accept_dev_agreement"
-#~ msgstr "我接�"
-
-#~ msgid "devcp_submit_decline_dev_agreement"
-#~ msgstr "我�接�"
-
-#~ msgid "devcp_summary_admin_disabled"
-#~ msgstr "该附加组件被管�员�用。"
-
-#~ msgid "devcp_summary_header_disabled"
-#~ msgstr "�用"
-
-#~ msgid "devcp_summary_header_trusted"
-#~ msgstr "�信任的"
-
-# %1 is a link to the addon submit page
-#~ msgid "devcp_summary_noaddons_submit_one"
-#~ msgstr "你没有任何附加组件，点击 %s �交。"
-
-#~ msgid "devcp_summary_noaddons_submit_one_link"
-#~ msgstr "这里"
-
-# %1 is the link to the preview upload page
-#~ msgid "devcp_theme_upload_preview"
-#~ msgstr "请确认该主题已� %s 。"
-
-#~ msgid "devcp_theme_upload_preview_link"
-#~ msgstr "上传预览图片"
-
-#~ msgid "devcp_version_edit_pagetitle"
-#~ msgstr "编辑版本"
-
-#~ msgid "devcp_version_updated_successfully"
-#~ msgstr "版本更新�功。"
-
-#~ msgid "editors_submissiontype_new"
-#~ msgstr "新组件"
-
-#~ msgid "editors_submissiontype_updated"
-#~ msgstr "已更新"
-
-#, fuzzy
-#~ msgid "editors_th_addon_age"
-#~ msgstr "Addon Age"
-
-#~ msgid "editors_th_addontypes"
-#~ msgstr "附加组件类别"
-
-#~ msgid "editors_th_age"
-#~ msgstr "历�的时间"
-
-#~ msgid "editors_th_applications"
-#~ msgstr "应用程�"
-
-#~ msgid "editors_th_platforms"
-#~ msgstr "平�"
-
-#~ msgid "editors_th_submissiontypes"
-#~ msgstr "�交的类别"
-
-#~ msgid "error_notice"
-#~ msgstr "注�"
-
-#~ msgid "forum_save"
-#~ msgstr "�存"
-
-#, fuzzy
-#~ msgid "home"
-#~ msgstr "home"
-
-#~ msgid "nav_category_plugins"
-#~ msgstr "�件"
-
-#~ msgid "page_title_experimental_addons"
-#~ msgstr "试验性的"
-
-#~ msgid "pages_experimental_addons_backbutton"
-#~ msgstr "返回�一页"
-
-# %1 is page number, %2 is total page count
-#~ msgid "pagination_page_number_title"
-#~ msgstr "这是第 %1$s 页 共 %2$s 页"
-
-#~ msgid "search_matching_addons_number"
-#~ msgid_plural "search_matching_addons_number"
-#~ msgstr[0] "%s 个符��件的附加组件"
-#~ msgstr[1] "%s 个符��件的附加组件"
-
-#~ msgid "statistics_rss_icon_title"
-#~ msgstr "统计数�收�点"
diff --git a/site/app/locale/zh_TW/LC_MESSAGES/messages.po b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
index fa11c5d..76900de 100644
--- a/site/app/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: svn: Mozilla Addons\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 11:45-0800\n"
-"PO-Revision-Date: 2009-06-04 23:25+0800\n"
+"PO-Revision-Date: 2009-02-15 16:05+0800\n"
 "Last-Translator: timdream <timdream+narro@gmail.com>\n"
 "Language-Team: Chinese Traditional, Taiwan <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -12,168 +12,163 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Narro 0.9.2 on http://translate.moztw.org\n"
 
-#: views/addons/policy.thtml:98
+#: views/addons/policy.thtml:100
 msgid "a_cancel_installation"
 msgstr "�消安�"
 
 #. This is the text that appears on buttons to download add-ons.
 #. %$1s is an optional string that only appears if the add-on is only available for
 #. a certain platform.  Examples:  (Windows)  or  (Linux)
-#. Note that the parentheses are included in the string. :(
-#: views/elements/amo2009/install.thtml:126
-#: views/elements/amo2009/install.thtml:227
-#: views/elements/amo2009/install.thtml:257
-#: views/elements/amo2009/install.thtml:300
-#: views/elements/amo2009/install.thtml:312 views/elements/install.thtml:73
-#: views/elements/install.thtml:181 views/elements/install.thtml:205
-#: views/elements/install.thtml:248 views/elements/install.thtml:260
-#: views/addons/plugins.thtml:66 views/addons/plugins.thtml:76
-#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:96
-#: views/addons/plugins.thtml:119
+#. Note that the parenthesis are included in the string. :(
+#: views/elements/install.thtml:69 views/elements/install.thtml:185
+#: views/elements/install.thtml:199 views/elements/install.thtml:222
+#: views/elements/install.thtml:234 views/addons/plugins.thtml:61
+#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
+#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
 #, php-format
 msgid "a_download"
 msgstr "立刻下載 %s"
 
-#: views/addons/policy.thtml:72
+#: views/addons/policy.thtml:78 views/addons/policy.thtml:79
 msgid "a_eula_download"
 msgstr "接�並下載"
 
-#: views/addons/policy.thtml:74
+#: views/addons/policy.thtml:81 views/addons/policy.thtml:83
 msgid "a_eula_install"
 msgstr "接�並安�"
 
 #: views/elements/header.thtml:76 views/elements/header.thtml:82
 #: views/api/api_addon.thtml:55 views/api/collections_feed.thtml:75
-#: views/sharing_api/addon.thtml:64
 msgid "a_header_public"
 msgstr "公開"
 
 #: views/elements/header.thtml:58 views/elements/header.thtml:75
 #: views/elements/header.thtml:80 views/api/api_addon.thtml:57
-#: views/api/collections_feed.thtml:77 views/sharing_api/addon.thtml:66
+#: views/api/collections_feed.thtml:77
 msgid "a_header_sandbox"
 msgstr "沙箱"
 
 #. %s is a date in the _('date') format
-#: views/elements/amo2009/homepage_addon.thtml:115
-#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:106
-#: views/addons/display.thtml:104 views/addons/browse_thumbs.thtml:73
+#: views/elements/addon_listitem.thtml:138 views/elements/feature.thtml:111
+#: views/addons/display.thtml:127 views/addons/browse_thumbs.thtml:87
 msgid "addon_detail_last_updated"
 msgstr "更新時間：%s"
 
 #. %s is the version of the add-on.  Example:  3.2a1
-#: views/elements/amo2009/addon_version_detail.thtml:51
 #: views/elements/addon_version_detail.thtml:51
 #, php-format
 msgid "addon_display_header_version"
 msgstr "版本 %s"
 
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:139 views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads"
 msgstr "次下載"
 
-#: views/addons/display.thtml:147
+#: views/addons/display.thtml:143
 msgid "addon_downloads_total"
 msgstr "總下載次數"
 
-#: views/elements/amo2009/homepage_addon.thtml:106
-#: views/elements/addon_listitem.thtml:115 views/elements/feature.thtml:101
-#: views/addons/category_landing.thtml:157 views/addons/display.thtml:146
-#: views/addons/browse_thumbs.thtml:80
+#: views/elements/addon_listitem.thtml:129 views/elements/feature.thtml:103
+#: views/addons/display.thtml:138 views/addons/display.thtml:142
+#: views/addons/browse_thumbs.thtml:94
 msgid "addon_downloads_weekly"
 msgstr "本週下載次數"
 
+# %1 is the add-on count, %2 the category name
 #. %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:104 views/addons/browse.thtml:60
+#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s 個元件"
 
-#: views/elements/amo2009/addon_list_options.thtml:103
 #: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
 msgid "addon_list_perpage"
 msgstr "��顯示"
 
-#: views/elements/amo2009/addon_list_options.thtml:84
 #: views/elements/addon_list_options.thtml:98
 msgid "addon_list_sortby"
 msgstr "排��照："
 
-#: views/helpers/addons_html.php:568 views/elements/amo2009/install.thtml:321
-#: views/elements/feature.thtml:89
+#: views/elements/addon_listitem.thtml:68 views/elements/feature.thtml:89
+#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
+#: views/addons/versions.thtml:72
 msgid "addon_listitem_flag_experimental"
 msgstr "實驗中"
 
-#: views/helpers/addons_html.php:570
+#: views/elements/addon_listitem.thtml:71 views/addons/browse_thumbs.thtml:70
 msgid "addon_listitem_flag_recommended"
 msgstr "推薦"
 
+# %1 is the addon name, %2 is the platform
 #. %1 is the add-on name, %2 is the platform
-#: views/pages/js_constants.js.thtml:66
+#: views/pages/js_constants.js.thtml:57
 msgid "addon_not_available_for_platform"
 msgstr "%1$s 無法在 %2$s 上使用。"
 
+# %1 is the addon name
 #. %1 is the add-on name
-#: views/addons/policy.thtml:101 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:130 views/reviews/flag.thtml:61
-#: views/reviews/add.thtml:114 views/reviews/display.thtml:216
-#: views/reviews/review_added.thtml:57
+#: views/addons/policy.thtml:108 views/addons/previews.thtml:60
+#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
+#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "回到 %1$s…"
 
+# %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:60 views/reviews/add.thtml:113
-#: views/reviews/review_added.thtml:56
+#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
 msgstr "回到�見列表…"
 
-#: views/reviews/add.thtml:85
+#: views/reviews/add.thtml:99
 msgid "addon_review_add_rating_field"
 msgstr "評分："
 
-#: views/reviews/add.thtml:102
+#: views/reviews/add.thtml:116
 msgid "addon_review_add_review_field"
 msgstr "�見："
 
-#: views/reviews/add.thtml:107
+#: views/reviews/add.thtml:121
 msgid "addon_review_add_submit"
 msgstr "�出�見"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_add_title"
 msgstr "新增� %s 的�見"
 
-#: views/reviews/add.thtml:78
+#: views/reviews/add.thtml:92
 msgid "addon_review_add_title_field"
 msgstr "主旨�摘�："
 
-#: views/reviews/display.thtml:77 views/reviews/display.thtml:161
+#: views/reviews/display.thtml:81 views/reviews/display.thtml:165
 msgid "addon_review_admin_delete"
 msgstr "刪除"
 
-#: views/reviews/display.thtml:76
+#: views/reviews/display.thtml:80
 msgid "addon_review_author_reply_link"
 msgstr "回覆"
 
-#: views/reviews/delete.thtml:62
+#: views/reviews/delete.thtml:55
 msgid "addon_review_confirm_delete"
 msgstr "您確定�刪除此�見？"
 
-#: views/reviews/delete.thtml:63
+#: views/reviews/delete.thtml:56
 msgid "addon_review_confirm_no"
 msgstr "�"
 
-#: views/reviews/delete.thtml:64
+#: views/reviews/delete.thtml:57
 msgid "addon_review_confirm_yes"
 msgstr "是"
 
-#: views/reviews/delete.thtml:48
+#: views/reviews/delete.thtml:44
 msgid "addon_review_delete_header"
 msgstr "刪除�見"
 
@@ -182,11 +177,12 @@ msgid "addon_review_deleted_successfully"
 msgstr "�見已�功刪除。"
 
 #. %s is the name of the add-on
-#: views/reviews/add.thtml:51
+#: views/reviews/add.thtml:46
 #, php-format
 msgid "addon_review_edit_title"
 msgstr "編輯� %s 的�見"
 
+# %1 is the count of characters entered as notes for the review flag reason.
 #. %1 is the count of characters entered as notes for the review flag reason.
 #: controllers/reviews_controller.php:539
 msgid "addon_review_flag_error_other_length"
@@ -194,22 +190,25 @@ msgstr ""
 "回報此�見時發生錯誤：回報�見的註記文字長度�制在 10 至 100 個字元；您的文字"
 "長度為 %1$s。"
 
+# Removing an extra comma
 #. Removing an extra comma
-#: views/reviews/review_added.thtml:53
+#: views/reviews/review_added.thtml:49
 msgid "addon_review_in_moderation"
 msgstr "請注�：您的�見會先經審核通�後�會顯示在網站上公開。"
 
-#: views/reviews/add.thtml:57
+#: views/reviews/add.thtml:71
 msgid "addon_review_in_reply_to"
 msgstr "開發者回覆："
 
+# %1 is the review count, %2 is the nickname or full name of the user.
 #. %1 is the review count, %2 is the nickname or full name of the user.
-#: views/reviews/display.thtml:131
+#: views/reviews/display.thtml:135
 #, php-format
 msgid "addon_review_others_by_user"
 msgid_plural "addon_review_others_by_user"
 msgstr[0] "顯示由 %2$s �此附加元件發出的 %1$s 篇�見。"
 
+# %1 is the addon name
 #. %1 is the add-on name
 #: controllers/reviews_controller.php:201
 #: controllers/reviews_controller.php:250
@@ -219,161 +218,141 @@ msgstr[0] "顯示由 %2$s �此附加元件發出的 %1$s 篇�見。"
 msgid "addon_review_pagetitle"
 msgstr "� %s 的�見"
 
+# %1 is the user, %2 is the (localized) date
 #. %1 is the user, %2 is the (localized) date
-#: views/reviews/display.thtml:160
+#: views/reviews/display.thtml:164
 #, php-format
 msgid "addon_review_reply_on_x_by_y"
 msgstr "回覆者：%1$s 日期：%2$s"
 
-#: views/reviews/display.thtml:157
+#: views/reviews/display.thtml:161
 msgid "addon_review_reply_prefix"
 msgstr "開發者回覆："
 
-#: views/reviews/review_added.thtml:51
+#: views/reviews/review_added.thtml:48
 msgid "addon_review_saved_successfully"
 msgstr "您的�見已�功儲存，感��"
 
-#: views/addons/display.thtml:354 views/reviews/display.thtml:72
+#: views/addons/display.thtml:309 views/addons/display.thtml:312
+#: views/reviews/display.thtml:72 views/reviews/display.thtml:75
+#, php-format
 msgid "addon_reviewed_by_u_on_d"
 msgstr "作者：%1$s 日期：%2$s"
 
+# %1 is the user, %2 is the (localized) date, %3 is the rating
 #. %1 is the user, %2 is the (localized) date, %3 is the rating
 #: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
-#: views/reviews/add.thtml:63 views/reviews/delete.thtml:54
+#: views/reviews/add.thtml:77 views/reviews/delete.thtml:49
 #, php-format
 msgid "addon_reviewed_on_x_rated_y"
 msgstr "作者：%1$s 日期：%2$s（給 %3$s 分）"
 
-#: views/elements/amo2009/addon_version_detail.thtml:52
+#: views/addons/category_landing.thtml:138
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
+msgid "addon_slider_tooltip_next"
+msgstr "下一個附加元件"
+
+#: views/addons/category_landing.thtml:128
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
+msgid "addon_slider_tooltip_previous"
+msgstr "上一個附加元件"
+
 #: views/elements/addon_version_detail.thtml:52
 msgid "addon_version_permalink"
 msgstr "到此版本的固定��"
 
+# %1 is the current Application name (e.g. Firefox)
+# %2 is the Application's version number
 #. %1 is the current Application name (e.g. Firefox)
 #. %2 is the Application's version number
-#: views/addons/versions.thtml:140
+#: views/addons/versions.thtml:118
+#, fuzzy
 msgid "addon_versions_getlatestversion"
-msgstr "此附加元件的最新版本與 %1$s %2$s 相容"
+msgstr "The most recent version compatible with %1$s %2$s"
 
-#: views/addons/display.thtml:447
+#: views/addons/display.thtml:455
 msgid "addons_author_addons_submit"
 msgstr "�"
 
-#: views/elements/amo2009/homepage_addon.thtml:100
-#: views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51 views/elements/feature.thtml:95
 msgid "addons_author_tooltip"
 msgstr "檢視作者個人檔案"
 
+# %1 is the name of the Application (eg. Firefox)
 #. %1 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:1296
+#: controllers/addons_controller.php:1053
 msgid "addons_browse_all_themes_title"
 msgstr "�覽所有佈景主題 :: %1$s 附加元件"
 
+# %s is the name of the category
 #. %s is the name of the category
-#: controllers/addons_controller.php:1016
+#: controllers/addons_controller.php:773
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "�覽%s"
 
+# %1 is the name of the theme category (eg. Modern)
+# %2 is the name of the Application (eg. Firefox)
 #. %1 is the name of the theme category (eg. Modern)
 #. %2 is the name of the Application (eg. Firefox)
-#: controllers/addons_controller.php:664
+#: controllers/addons_controller.php:486
 msgid "addons_browse_categories_header_theme"
 msgstr "�覽%1$s佈景主題 :: %2$s 附加元件"
 
-#: views/addons/display.thtml:249
-msgid "addons_display_a_license_what"
-msgstr "這是什麼？"
-
-#: views/reviews/display.thtml:222
+#: views/reviews/display.thtml:227
 msgid "addons_display_add_review"
 msgstr "新增�見"
 
-#: views/addons/display.thtml:294
+#: views/addons/display.thtml:336
 msgid "addons_display_advanced_details"
 msgstr "詳細資訊"
 
-#: views/addons/display.thtml:98
+#: views/addons/display.thtml:93
 msgid "addons_display_categories"
 msgstr "分類"
 
-#: views/addons/display.thtml:482
-msgid "addons_display_collection_add"
-msgstr "加入到收�集："
-
-#: views/addons/display.thtml:491
-msgid "addons_display_collection_add_new"
-msgstr "新收�集…"
-
-#: views/addons/display.thtml:487
-msgid "addons_display_collection_add_select_one"
-msgstr "�擇一個收�集…"
-
-#: views/addons/display.thtml:493
-msgid "addons_display_collection_add_submit"
-msgstr "發表"
-
-#. %1$s is the add-on name
-#. %2$s is the collection name, linked to the collection's page
-#: views/pages/js_constants.js.thtml:103 views/addons/display.thtml:61
-msgid "addons_display_collection_publish_success"
-msgstr "已將 %1$s 加入 %2$s 收�集。"
-
-#: views/addons/display.thtml:483
-msgid "addons_display_collection_whatsthis"
-msgstr "這是什麼？"
-
-#. %1$s is a number
-#: views/addons/display.thtml:473
-msgid "addons_display_collections_more"
-msgid_plural "addons_display_collections_more"
-msgstr[0] "與其他 %1$s 個收�集"
-
-#: views/addons/display.thtml:403
+#: views/addons/display.thtml:407
 msgid "addons_display_detailed_review"
 msgstr "填寫詳細�見"
 
-#: views/reviews/add.thtml:89 views/reviews/add.thtml:90
+#: views/addons/display.thtml:392 views/reviews/add.thtml:103
+#: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "�喜歡"
 
-#: views/reviews/display.thtml:220
+#: views/reviews/display.thtml:225
 msgid "addons_display_edit_review"
 msgstr "編輯您的�見"
 
-#: views/addons/display.thtml:132
+#: views/addons/display.thtml:167
 msgid "addons_display_has_privacy"
 msgstr "本元件有自己的隱�政策。"
 
-#: views/reviews/add.thtml:87 views/reviews/add.thtml:88
+#: views/addons/display.thtml:391 views/reviews/add.thtml:101
+#: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "討厭"
 
-#: views/addons/display.thtml:462
-msgid "addons_display_header_collections"
-msgstr "相關收�集"
-
-#: views/addons/display.thtml:297
+#: views/addons/display.thtml:339
 msgid "addons_display_header_developer_comments"
 msgstr "開發者留言"
 
-#: views/addons/display.thtml:230
+#: views/addons/display.thtml:232 views/addons/display.thtml:235
 msgid "addons_display_header_homepage"
 msgstr "網站首�"
 
-#: views/addons/display.thtml:247 views/addons/versions.thtml:110
-msgid "addons_display_header_license"
-msgstr "原始碼授權�款"
-
-#: views/addons/display.thtml:337
+#: views/addons/display.thtml:288
 msgid "addons_display_header_reviews"
 msgstr "�見"
 
-#: views/addons/display.thtml:261
+#: views/addons/display.thtml:249 views/addons/display.thtml:252
 msgid "addons_display_header_support"
 msgstr "技術支�"
 
-#: views/reviews/add.thtml:91 views/reviews/add.thtml:92
+#: views/addons/display.thtml:393 views/reviews/add.thtml:105
+#: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "喜歡"
 
@@ -381,22 +360,22 @@ msgstr "喜歡"
 msgid "addons_display_long_description"
 msgstr "完整敘述"
 
-#: views/reviews/add.thtml:95 views/reviews/add.thtml:96
+#: views/addons/display.thtml:395 views/reviews/add.thtml:109
+#: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "喜愛"
 
-#: views/addons/display.thtml:178
+#: views/addons/display.thtml:180
 msgid "addons_display_more_images"
 msgstr "更多圖片"
 
-#: views/addons/display.thtml:465
-msgid "addons_display_nocollections"
-msgstr "這個元件尚�屬於任何收�集。"
-
+# %1$s is either an author's name or a comma separated list of authors. Using
+# the list doesn't make sense in the English plural form so we ignore the
+# variable.
 #. %1$s is either an author's name or a comma separated list of authors. Using
 #. the list doesn't make sense in the English plural form so we ignore the
 #. variable.
-#: views/addons/display.thtml:436
+#: views/addons/display.thtml:445
 msgid "addons_display_other_addons_by"
 msgid_plural "addons_display_other_addons_by"
 msgstr[0] "%1$s 的其他作�"
@@ -404,83 +383,93 @@ msgstr[0] "%1$s 的其他作�"
 #. %s is the name of the add-on and the add-on section.  Example:
 #.   Some Add-on :: Firefox Add-ons
 #. This should not be concatenated in the code and should be fixed.
-#: controllers/addons_controller.php:141 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:1442
+#: controllers/addons_controller.php:141 controllers/addons_controller.php:256
+#: controllers/addons_controller.php:1188
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
 #. %s is an email address
-#: views/addons/display.thtml:286
+#: views/addons/display.thtml:279
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "此套件由作者於 %s �供 Email 技術支�"
 
 #. %$1s is a URL
 #. %$2s is an email address
-#: views/addons/display.thtml:269
+#: views/addons/display.thtml:262
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
-msgstr "此元件的技術支���開發者在 %1$s ，或寄� Email 至 %2$s �供"
+msgstr "此套件由作者於 %s 與 %s �供技術支�"
 
 #. %s is a URL
-#: views/addons/display.thtml:278
+#: views/addons/display.thtml:271
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "此套件由作者於 %s �供技術支�"
 
-#: views/addons/display.thtml:383
+#: views/addons/display.thtml:389
 msgid "addons_display_rate_it"
 msgstr "評分"
 
-#: views/reviews/add.thtml:93 views/reviews/add.thtml:94
+#: views/addons/display.thtml:394 views/reviews/add.thtml:107
+#: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "�常喜歡"
 
-#: views/addons/display.thtml:410
+#: views/addons/display.thtml:411 views/addons/display.thtml:414
 msgid "addons_display_review_etiquette"
 msgstr ""
 "請勿在此回報程�錯誤。因為我們並�會記錄您的 Email 地�，若開發者想得知進一步"
 "的細節以解決�題時就無法與您�絡了。"
 
+# %1 is the review guidelines link
 #. %1 is the review guidelines link
-#: views/addons/display.thtml:417
+#: views/addons/display.thtml:429
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">�見撰寫指�</a>"
 
+# %1 is the support section link
 #. %1 is the support section link
-#: views/addons/display.thtml:414
+#: views/addons/display.thtml:420 views/addons/display.thtml:424
+#, php-format
 msgid "addons_display_review_see_support"
-msgstr "請見 <a href=\"%1$s\">技術支�</a> 一節了解如何�得此元件的進一步�助。"
+msgstr ""
+"請見 <a href=\"%1$s\">技術支�</a> 一節了解如何�得此元件的進一步�助。"
 
-#: views/addons/display.thtml:404
+#: views/addons/display.thtml:403
 msgid "addons_display_review_submit"
 msgstr "儲存"
 
-#: views/addons/display.thtml:430
+#: views/addons/display.thtml:439
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "查看所有 %1$s 類元件"
 
+# %1 is the number of reviews
 #. %1 is the number of reviews
-#: views/addons/display.thtml:364
+#: views/addons/display.thtml:326
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "查看所有�見 (%1$s)"
 
-#: views/addons/display.thtml:219
+#: views/addons/display.thtml:219 views/addons/display.thtml:221
 msgid "addons_display_see_all_versions"
 msgstr "看看所有版本"
 
-#: views/addons/display.thtml:321 views/addons/versions.thtml:117
+#: views/addons/display.thtml:220
+msgid "addons_display_version_history"
+msgstr "所有版本歷�記錄"
+
+#: views/addons/display.thtml:359 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "檢視原始碼"
 
-#: views/addons/display.thtml:324
+#: views/addons/display.thtml:362
 msgid "addons_display_view_stats"
 msgstr "檢視統計資訊"
 
-#: views/addons/display.thtml:376
+#: views/addons/display.thtml:382
 msgid "addons_display_what_do_you_think"
 msgstr "留下您的�見？"
 
@@ -488,325 +477,230 @@ msgstr "留下您的�見？"
 msgid "addons_display_workswith"
 msgstr "相容於："
 
-#: views/addons/home.thtml:112
-msgid "addons_home_browse_new"
-msgstr "新加入"
-
-#: views/addons/home.thtml:110
-msgid "addons_home_browse_popular"
-msgstr "熱門"
-
-#: views/addons/home.thtml:108
-msgid "addons_home_browse_recommended"
-msgstr "推薦元件"
-
-#: views/addons/home.thtml:127 views/addons/home.thtml:134
-#: views/addons/home.thtml:141 views/addons/home.thtml:148
-msgid "addons_home_browse_subscribe"
-msgstr "訂閱"
-
-#: views/addons/home.thtml:101
-msgid "addons_home_browse_title"
-msgstr "�覽附加元件"
-
-#: views/addons/home.thtml:114
-msgid "addons_home_browse_updated"
-msgstr "已更新"
-
-#: views/elements/amo2009/homepage_addon.thtml:100
+#: views/elements/fyf_promotion.thtml:51
 #: views/elements/addon_discussionheader.thtml:83
-#: views/elements/addon_listitem.thtml:109 views/elements/feature.thtml:95
-#: views/addons/category_landing.thtml:66 views/addons/policy.thtml:57
-#: views/addons/display.thtml:70 views/addons/home.thtml:178
+#: views/elements/addon_listitem.thtml:122 views/elements/feature.thtml:95
+#: views/addons/policy.thtml:62 views/addons/display.thtml:68
 msgid "addons_home_by"
 msgstr "作者："
 
-#: views/addons/home.thtml:169
-msgid "addons_home_collection_popular_title"
-msgstr "熱門收�集"
-
-#: views/elements/amo2009/categories.thtml:69 views/addons/home.thtml:160
-msgid "addons_home_collections"
-msgstr "收�集"
-
-#. %1$s is the count of addons in a collection
-#: views/elements/amo2009/collection_listing_item.thtml:51
-#: views/addons/home.thtml:185
-msgid "addons_home_collections_addon_count"
-msgid_plural "addons_home_collections_addon_count"
-msgstr[0] "<strong>%1$s</strong> 個附加元件"
-
-#: views/addons/home.thtml:196
-msgid "addons_home_collections_all"
-msgstr "檢視所有收�集"
-
-#: views/addons/home.thtml:162
-msgid "addons_home_collections_intro"
-msgstr ""
-"收�集是讓您分類�組����與攪和附加元件的方�。您�以訂閱其他使用者建立的收"
-"�集，或自己建立一個。"
-
-#. %1$s is the count of subscribers for a collection
-#: views/elements/amo2009/collection_listing_item.thtml:58
-#: views/collections/detail.thtml:96 views/addons/home.thtml:189
-msgid "addons_home_collections_subscribers"
-msgid_plural "addons_home_collections_subscribers"
-msgstr[0] "<strong>%1$s</strong> �訂閱者"
-
-#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
+#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151
+#: views/addons/themes_landing.thtml:49 views/addons/home.thtml:48
 msgid "addons_home_feature_head"
 msgstr "推薦元件"
 
-#: controllers/search_controller.php:218 controllers/addons_controller.php:176
-#: controllers/addons_controller.php:428 controllers/addons_controller.php:671
-#: controllers/addons_controller.php:871 controllers/addons_controller.php:1103
-#: controllers/addons_controller.php:1242
-#: controllers/addons_controller.php:1298
+#: controllers/search_controller.php:211 controllers/addons_controller.php:171
+#: controllers/addons_controller.php:356 controllers/addons_controller.php:493
+#: controllers/addons_controller.php:630 controllers/addons_controller.php:860
+#: controllers/addons_controller.php:999
+#: controllers/addons_controller.php:1055
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
-"附加元件能擴充 %1$s 功能，打造您�樹一格的�覽體驗。在這網站四處看看，來親手打"
-"造您專屬的 %1$s ��"
-
-#. %1$s is the HTML collection name link.
-#: views/elements/amo2009/teaser_collections.thtml:107
-msgid "addons_home_introduction_collection_link"
-msgstr "喜歡嗎？在 %1$s 收�集尋找更多相關的附加元件�。"
-
-#: views/elements/amo2009/teaser_collections.thtml:60
-msgid "addons_home_introduction_extras"
-msgstr ""
-"<strong>超�五�個�費的�工具</strong>，讓您自訂並擴充 Firefox 來滿足您的需"
-"求。"
-
-#: views/elements/amo2009/teaser_collections.thtml:55
-msgid "addons_home_introduction_header"
-msgstr "什麼是附加元件？"
+"附加元件能擴充 %1$s 功能，打造您�樹一格的�覽體驗。在這網站四處看看，來親手"
+"打造您專屬的 %1$s ��"
 
-#: views/elements/amo2009/teaser_collections.thtml:72
-msgid "addons_home_introduction_install"
-msgstr "<strong>安��分簡單</strong>並隨時��最新狀態。"
+#: views/addons/home.thtml:201
+msgid "addons_home_newest_header"
+msgstr "最新元件:"
 
-#: views/elements/amo2009/teaser_collections.thtml:45
-msgid "addons_home_introduction_name"
-msgstr "介紹"
-
-#: views/elements/amo2009/teaser_collections.thtml:66
-msgid "addons_home_introduction_themes"
-msgstr "<strong>�助您進行常見工作</strong>的工具列�佈景主題和�尋�供者。"
-
-#: views/addons/home.thtml:161
-msgid "addons_home_new_indicator"
-msgstr "新登場�"
-
-#: views/elements/app_chooser.thtml:48 views/layouts/amo2009.thtml:257
+#: views/elements/app_chooser.thtml:48
 msgid "addons_home_other_applications"
 msgstr "其他應用程�"
 
 #. %1$s is the application the user is browsing.  Examples:  Thunderbird, Firefox,
 #. Sunbird
-#: views/pages/collector_faq.thtml:49 views/pages/collector_firstrun.thtml:42
-#: views/pages/collector.thtml:46 views/pages/collector_features.thtml:54
-#: controllers/developers_controller.php:87
+#: controllers/developers_controller.php:67
 #: controllers/compatibility_controller.php:72
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:607
+#: controllers/components/simple_acl.php:81 controllers/components/amo.php:606
 #: controllers/statistics_controller.php:60
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 #: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:330
-#: controllers/users_controller.php:414 controllers/users_controller.php:708
-#: controllers/users_controller.php:723 controllers/reviews_controller.php:204
+#: controllers/users_controller.php:223 controllers/users_controller.php:319
+#: controllers/users_controller.php:403 controllers/users_controller.php:683
+#: controllers/users_controller.php:698 controllers/reviews_controller.php:204
 #: controllers/reviews_controller.php:251
 #: controllers/reviews_controller.php:346
-#: controllers/reviews_controller.php:425 controllers/search_controller.php:185
-#: controllers/search_controller.php:297 controllers/search_controller.php:301
-#: controllers/addons_controller.php:147 controllers/addons_controller.php:280
-#: controllers/addons_controller.php:370 controllers/addons_controller.php:667
-#: controllers/addons_controller.php:874 controllers/addons_controller.php:1019
-#: controllers/addons_controller.php:1034
-#: controllers/addons_controller.php:1101
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1240
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
-#: controllers/addons_controller.php:1442
-#: controllers/addons_controller.php:1477
-#: controllers/addons_controller.php:1538
-#: controllers/addons_controller.php:1543 controllers/editors_controller.php:64
-#: controllers/pages_controller.php:132 controllers/groups_controller.php:65
-#: controllers/groups_controller.php:71 controllers/groups_controller.php:89
-#: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:57
-#: controllers/collections_controller.php:121
-#: controllers/collections_controller.php:205
-#: controllers/collections_controller.php:365
-#: controllers/collections_controller.php:404
-#: controllers/collections_controller.php:466
-#: controllers/collections_controller.php:538
-#: controllers/collections_controller.php:828
+#: controllers/reviews_controller.php:425
+#: controllers/search_controller.php:178 controllers/addons_controller.php:147
+#: controllers/addons_controller.php:256 controllers/addons_controller.php:316
+#: controllers/addons_controller.php:489 controllers/addons_controller.php:632
+#: controllers/addons_controller.php:776 controllers/addons_controller.php:791
+#: controllers/addons_controller.php:858 controllers/addons_controller.php:878
+#: controllers/addons_controller.php:997
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
+#: controllers/addons_controller.php:1188
+#: controllers/addons_controller.php:1223
+#: controllers/addons_controller.php:1278
+#: controllers/editors_controller.php:61 controllers/pages_controller.php:121
+#: controllers/groups_controller.php:65 controllers/groups_controller.php:71
+#: controllers/groups_controller.php:89 controllers/groups_controller.php:111
+#: controllers/collections_controller.php:59
+#: controllers/collections_controller.php:101
+#: controllers/collections_controller.php:179
 #: controllers/localizers_controller.php:72
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s 附加元件"
 
-#. %1$s is the number of addons downloaded
-#: views/addons/home.thtml:57
-#, php-format
-msgid "addons_home_stats_downloaded"
-msgid_plural "addons_home_stats_downloaded"
-msgstr[0] "<strong>%1$s</strong> <span>個元件已被下載</span>"
+#: views/addons/home.thtml:191
+msgid "addons_home_popular_header"
+msgstr "熱門元件："
 
-#. %1$s is the number of addons in use
-#: views/addons/home.thtml:63
-#, php-format
-msgid "addons_home_stats_inuse"
-msgid_plural "addons_home_stats_inuse"
-msgstr[0] "<strong>%1$s</strong> <span>個元件使用中</span>"
+#: views/addons/home.thtml:181
+msgid "addons_home_recommended_header"
+msgstr "推薦元件："
 
-#: views/addons/home.thtml:136
+#: views/addons/home.thtml:211
+msgid "addons_home_updated_header"
+msgstr "最近更新:"
+
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:209 views/addons/home.thtml:219
+msgid "addons_home_view_all"
+msgstr "全部元件"
+
+#: views/addons/home.thtml:209
 msgid "addons_home_view_all_newest_title"
 msgstr "檢視所有最新上傳元件"
 
-#: views/addons/home.thtml:129
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "檢視所有熱門元件"
 
-#: views/addons/home.thtml:150
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "檢視所有推薦元件"
 
-#: views/addons/home.thtml:143
+#: views/addons/home.thtml:219
 msgid "addons_home_view_all_updated_title"
 msgstr "檢視所有最近更新元件"
 
-#: views/elements/amo2009/install.thtml:334 views/elements/install.thtml:112
+#: views/elements/install.thtml:108
 msgid "addons_install_in_sunbird"
 msgstr ""
-"<ol><li>下載並儲存檔案到您的硬碟裡。</li><li>於 Mozilla Sunbird 中�擇「工具＞"
-"附加元件�。</li><li>按「安��鈕，找到您剛剛下載回來的檔案後按「確定���。"
-"</li></ol>"
+"<ol><li>按下�的��以儲存檔案。</li><li>於 Mozilla Sunbird 中�擇「工具＞附"
+"加元件�</li><li>視窗開啟後，按「安��鈕，找到您剛剛下載回來的檔案後按「確"
+"定���。< /li></ol>"
 
-#: views/elements/amo2009/install.thtml:333 views/elements/install.thtml:111
+#: views/elements/install.thtml:107
 msgid "addons_install_in_sunbird_title"
 msgstr "如何於 Sunbird 安�附加元件"
 
-#: views/elements/amo2009/install.thtml:331 views/elements/install.thtml:106
+#: views/elements/install.thtml:102
 msgid "addons_install_in_thunderbird"
 msgstr ""
-"<ol><li>下載並儲存檔案到您的硬碟裡。</li><li>於 Mozilla Thunderbird 中�擇「工"
-"具＞附加元件�。</li><li>按「安��鈕，找到您剛剛下載回來的檔案後按「確定��"
-"�。</li></ol>"
+"<ol><li>在下�的��按��後�擇「���存新檔…�就�以下載並儲存檔案到硬碟"
+"裡。</li><li>於 Mozilla Thunderbird 中�擇「工具＞附加元件�</li><li>視窗開啟"
+"後，按「安��鈕，找到您剛剛下載回來的檔案後按「確定���。</li></ol>"
 
-#: views/elements/amo2009/install.thtml:330 views/elements/install.thtml:105
+#: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
 msgstr "如何於 Thunderbird 安�附加元件"
 
-#: views/elements/amo2009/addon_list_options.thtml:108
 #: views/elements/addon_list_options.thtml:105
 msgid "addons_options_show_experimental"
 msgstr "顯示實驗中元件"
 
-#: views/elements/amo2009/addon_list_options.thtml:113
 #: views/elements/addon_list_options.thtml:109
 msgid "addons_options_submit"
 msgstr "�"
 
-#: views/addons/plugins.thtml:63 views/addons/plugins.thtml:73
-#: views/addons/plugins.thtml:83 views/addons/plugins.thtml:93
-#: views/addons/plugins.thtml:103 views/addons/plugins.thtml:116
-#: views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:58 views/addons/plugins.thtml:70
+#: views/addons/plugins.thtml:82 views/addons/plugins.thtml:94
+#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:126
+#: views/addons/plugins.thtml:138
 msgid "addons_plugins_by"
 msgstr "作者："
 
-#: views/addons/plugins.thtml:107
+#: views/addons/plugins.thtml:111
 msgid "addons_plugins_for_linux"
 msgstr "Linux 作業系統"
 
-#: views/addons/plugins.thtml:108 views/addons/plugins.thtml:131
+#: views/addons/plugins.thtml:113 views/addons/plugins.thtml:145
 msgid "addons_plugins_for_macosx"
 msgstr "Mac OS X 作業系統"
 
-#: views/addons/plugins.thtml:106 views/addons/plugins.thtml:129
-#: views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:109 views/addons/plugins.thtml:141
 msgid "addons_plugins_for_windows"
 msgstr "Windows 作業系統"
 
 #. %1$s is a URL
-#: views/addons/plugins.thtml:139
+#: views/addons/plugins.thtml:154
 #, php-format
 msgid "addons_plugins_looking_for_more"
 msgstr ""
 "本���列出最常見和最�行的外掛程�。若您想找其他 Mozilla 系列�覽器�用的外"
 "掛程�，請�往 %1$s"
 
-#: views/addons/plugins.thtml:137
+#: views/addons/plugins.thtml:152
 msgid "addons_plugins_looking_for_plugin"
 msgstr "想找的外掛程��在這裡？"
 
-#: views/addons/plugins.thtml:58
+#: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
-"外掛程�能讓�覽器�到顯示特殊圖片格��播放多媒體檔案等功能。和擴充套件改變或"
-"加強已有的功能��，外掛程��讓�覽器支�全新的格�。"
+"外掛程�能讓�覽器�到顯示特殊圖片格��播放多媒體檔案等功能。和擴充套件改變"
+"或加強已有的功能��，外掛程��讓�覽器支�全新的格�。"
 
 #. %1$s is the application name.  Example: Firefox, Thunderbird, Sunbird
-#: controllers/addons_controller.php:1122
+#: controllers/addons_controller.php:879
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 常用外掛程�"
 
-#: controllers/components/amo.php:698 controllers/addons_controller.php:1121
+#: controllers/components/amo.php:720 controllers/addons_controller.php:878
 msgid "addons_plugins_pagetitle"
 msgstr "外掛程�"
 
-#: views/addons/plugins.thtml:68 views/addons/plugins.thtml:78
-#: views/addons/plugins.thtml:88 views/addons/plugins.thtml:98
-#: views/addons/plugins.thtml:110 views/addons/plugins.thtml:121
-#: views/addons/plugins.thtml:133
+#: views/addons/plugins.thtml:62 views/addons/plugins.thtml:74
+#: views/addons/plugins.thtml:86 views/addons/plugins.thtml:98
+#: views/addons/plugins.thtml:116 views/addons/plugins.thtml:130
+#: views/addons/plugins.thtml:147
 msgid "addons_plugins_support_documentation"
 msgstr "說明文件："
 
 #. %s is the name of the add-on
-#: views/addons/policy.thtml:61
+#: views/addons/policy.thtml:68
 #, php-format
 msgid "addons_policy_eula_require"
-msgstr "%s 需�你在安��接�下�的「使用者授權�約��能繼續："
+msgstr "%s 需�您在安��接�下�的「終端使用者授權�約��能繼續："
 
+# %1 is the addon name
 #. %1 is the add-on name
-#: controllers/addons_controller.php:1476
+#: controllers/addons_controller.php:1222
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 的�覽圖片"
 
-#: views/addons/category_landing.thtml:135
-msgid "addons_recently_added"
-msgstr "最近新增"
-
-#: views/addons/recommended.thtml:51 controllers/addons_controller.php:1365
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1120
 msgid "addons_recommended_introduction"
 msgstr ""
-"這裡有�堆的附加元件，其中有些大家都該試試。您�以從下列我們推薦的附加元件開始"
-"玩玩看�"
+"這裡有�堆的附加元件，其中有些大家都該試試。您�以從下列我們推薦的附加元件開"
+"始玩玩看�"
 
-#: controllers/addons_controller.php:1357
-#: controllers/addons_controller.php:1364
+#: controllers/addons_controller.php:1112
+#: controllers/addons_controller.php:1119
 msgid "addons_recommended_pagetitle"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:1360
+#: controllers/addons_controller.php:1115
 msgid "addons_recommended_title"
 msgstr "推薦附加元件"
 
-#: views/addons/searchengines.thtml:136
+#: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164
 msgid "addons_searchengines_additional_resources"
 msgstr "其他資�"
 
+# link text devmo
 #. link text devmo
-#: views/addons/searchengines.thtml:141
+#: views/addons/searchengines.thtml:153 views/addons/searchengines.thtml:169
 msgid "addons_searchengines_devmo_link"
 msgstr "Mozilla 開發者中心網站"
 
-#: views/pages/js_constants.js.thtml:67
+#: views/pages/js_constants.js.thtml:58
 msgid "addons_searchengines_error_mozilla_browser_required"
 msgstr "抱歉，您需� Mozilla 系列的�覽器（� Firefox）�能安�此�尋引擎。"
 
@@ -816,65 +710,78 @@ msgstr ""
 "安�本�尋引擎需�使用 Javascript，但看起來您把它關掉了。請在安�下列�尋引擎"
 "之�先啟用 Javascript。"
 
+# %1 is "make your own" link
+# %2 is MDC link
 #. %1 is "make your own" link
 #. %2 is MDC link
-#: views/addons/searchengines.thtml:139
+#: views/addons/searchengines.thtml:150 views/addons/searchengines.thtml:167
+#, php-format
 msgid "addons_searchengines_learn_howto"
 msgstr "到 %2$s 學習如何 %1$s。"
 
+# link path to search plugins instructions, relative to devmo
 #. link path to search plugins instructions, relative to devmo
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:152 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_href"
 msgstr ""
 "/zhtw/%E8%A3%BD%E4%BD%9C__OpenSearch_%E6%90%9C%E5%B0%8B%E6%A8%A1%E7%B5%84"
 
+# link text for "make your own" (opensearch engine)
 #. link text for "make your own" (opensearch engine)
-#: views/addons/searchengines.thtml:140
+#: views/addons/searchengines.thtml:151 views/addons/searchengines.thtml:168
 msgid "addons_searchengines_makeyourown_link"
 msgstr "製作�尋引擎"
 
+# %1 is the link to mycroft.mozdev.org
 #. %1 is the link to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:148 views/addons/searchengines.thtml:166
+#, php-format
 msgid "addons_searchengines_more"
 msgstr "到 %1$s 尋找更多�尋引擎"
 
+# link text to mycroft.mozdev.org
 #. link text to mycroft.mozdev.org
-#: views/addons/searchengines.thtml:138
+#: views/addons/searchengines.thtml:149 views/addons/searchengines.thtml:166
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:1100
-#: controllers/addons_controller.php:1110
+#: controllers/addons_controller.php:857 controllers/addons_controller.php:867
 msgid "addons_searchengines_pagetitle"
 msgstr "�尋引擎"
 
-#: views/addons/searchengines.thtml:143
+#: views/addons/searchengines.thtml:154 views/addons/searchengines.thtml:171
 msgid "addons_searchengines_thanks"
 msgstr "特別感� Mycroft 專案於 Firefox �尋引擎所努力的�果。"
 
-#: views/addons/display.thtml:154
+#: views/addons/display.thtml:104
+#, fuzzy
 msgid "addons_share_button_text"
-msgstr "分享元件"
+msgstr "Share this"
 
 #: controllers/addons_controller.php:89
+#, fuzzy
 msgid "addons_share_label_delicious"
-msgstr "加到 Delicious"
+msgstr "Add to Delicious"
 
 #: controllers/addons_controller.php:77
+#, fuzzy
 msgid "addons_share_label_digg"
-msgstr "Digg 這個�"
+msgstr "Digg this!"
 
 #: controllers/addons_controller.php:83
+#, fuzzy
 msgid "addons_share_label_facebook"
-msgstr "發佈到 Facebook"
+msgstr "Post to Facebook"
 
 #: controllers/addons_controller.php:101
+#, fuzzy
 msgid "addons_share_label_friendfeed"
-msgstr "在 FriendFeed 分享"
+msgstr "Share on FriendFeed"
 
 #: controllers/addons_controller.php:95
+#, fuzzy
 msgid "addons_share_label_myspace"
-msgstr "發佈到 MySpace"
+msgstr "Post to MySpace"
 
 #: controllers/components/amo.php:201 controllers/components/amo.php:229
 msgid "addons_status_disabled"
@@ -888,17 +795,17 @@ msgstr "未完�版本"
 msgid "addons_status_nominated"
 msgstr "在「沙箱�；已被��"
 
-#: views/pages/js_constants.js.thtml:80 controllers/components/amo.php:195
+#: views/pages/js_constants.js.thtml:71 controllers/components/amo.php:195
 #: controllers/components/amo.php:226
 msgid "addons_status_pending"
 msgstr "在「沙箱�；等待審核"
 
-#: views/pages/js_constants.js.thtml:78 controllers/components/amo.php:199
+#: views/pages/js_constants.js.thtml:69 controllers/components/amo.php:199
 #: controllers/components/amo.php:228
 msgid "addons_status_public"
 msgstr "公開"
 
-#: views/pages/js_constants.js.thtml:79 controllers/components/amo.php:193
+#: views/pages/js_constants.js.thtml:70 controllers/components/amo.php:193
 #: controllers/components/amo.php:225
 msgid "addons_status_sandbox"
 msgstr "在「沙箱�"
@@ -907,35 +814,25 @@ msgstr "在「沙箱�"
 msgid "addons_status_unknown"
 msgstr "�明"
 
-#: views/elements/amo2009/teaser_collections.thtml:91
-#: views/elements/amo2009/homepage_addon.thtml:99
-#: views/elements/feature.thtml:94
+#: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94
 msgid "addons_title_tooltip"
 msgstr "了解關於此元件的更多資訊"
 
-#: views/addons/category_landing.thtml:151
-msgid "addons_top_downloads"
-msgstr "下載排行"
-
-#: views/addons/category_landing.thtml:165
-msgid "addons_top_rated"
-msgstr "評分排行"
-
-#: views/addons/versions.thtml:62
+#: views/addons/versions.thtml:53
 msgid "addons_versions_careful"
 msgstr "�心�這裡都是舊版本"
 
-#: views/addons/versions.thtml:63
+#: views/addons/versions.thtml:54
 msgid "addons_versions_careful_introduction"
 msgstr ""
 "這裡列出的舊版本僅供�考�測試之用。若無特別需求，請安�最新版的附加元件。"
 
-#: controllers/addons_controller.php:1549
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1286
 msgid "addons_versions_history"
 msgstr "版本歷�記錄"
 
 #. %1$s is the add-on name
-#: controllers/addons_controller.php:1535
+#: controllers/addons_controller.php:1275
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 版本記錄"
@@ -970,420 +867,149 @@ msgstr "群組管�員"
 msgid "admin_group_saved"
 msgstr "群組已儲存"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:239
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "進階�尋"
 
-#: views/elements/amo2009/search.thtml:126 views/elements/search.thtml:125
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "任�時間"
 
-#: views/elements/amo2009/search.thtml:97
-#: views/elements/amo2009/search.thtml:110 views/elements/search.thtml:96
-#: views/elements/search.thtml:109
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "所有種類"
 
-#: views/elements/amo2009/search.thtml:275 views/elements/search.thtml:254
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "所有版本"
 
-#: views/elements/amo2009/search.thtml:217 views/elements/search.thtml:212
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "應用程�"
 
-#: views/elements/amo2009/search.thtml:143 views/elements/search.thtml:142
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "關�字"
 
-#: views/elements/amo2009/search.thtml:251 views/elements/search.thtml:225
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "更新時間"
 
-#: views/elements/amo2009/search.thtml:145 views/elements/search.thtml:144
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "�稱"
 
-#: views/elements/amo2009/search.thtml:144 views/elements/search.thtml:143
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "新舊"
 
-#: views/elements/amo2009/search.thtml:130 views/elements/search.thtml:129
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "最近 3 個月"
 
-#: views/elements/amo2009/search.thtml:131 views/elements/search.thtml:130
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "最近 6 個月"
 
-#: views/elements/amo2009/search.thtml:127 views/elements/search.thtml:126
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "昨天"
 
-#: views/elements/amo2009/search.thtml:129 views/elements/search.thtml:128
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "最近 1 個月"
 
-#: views/elements/amo2009/search.thtml:128 views/elements/search.thtml:127
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "最近 1 星期"
 
-#: views/elements/amo2009/search.thtml:132 views/elements/search.thtml:131
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "最近 1 年"
 
-#: views/elements/amo2009/search.thtml:239 views/elements/search.thtml:230
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "��顯示數�"
 
-#: views/elements/amo2009/search.thtml:243 views/elements/search.thtml:224
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "作業系統"
 
-#: views/elements/amo2009/search.thtml:147 views/elements/search.thtml:146
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "熱門程度"
 
-#: views/elements/amo2009/search.thtml:146 views/elements/search.thtml:145
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "評分"
 
-#: views/elements/amo2009/search.thtml:247 views/elements/search.thtml:231
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "排�方�"
 
-#: views/elements/amo2009/search.thtml:227 views/elements/search.thtml:216
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "到"
 
-#: views/elements/amo2009/search.thtml:257 views/elements/search.thtml:237
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "切�進階�尋功能"
 
-#: views/elements/amo2009/search.thtml:235 views/elements/search.thtml:223
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "種類"
 
-#: views/elements/amo2009/search.thtml:222 views/elements/search.thtml:214
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "版本從"
 
-#: views/elements/amo2009/pagination.thtml:42
-msgid "amo2009_pagination_next_page"
-msgstr "下一�"
-
-#: views/elements/amo2009/pagination.thtml:41
-msgid "amo2009_pagination_previous_page"
-msgstr "上一�"
-
-#: views/pages/js_constants.js.thtml:96
+#: views/pages/js_constants.js.thtml:85
 msgid "app_compat_ignore_check"
 msgstr "忽略版本檢查"
 
-#: views/pages/js_constants.js.thtml:72
+#: views/pages/js_constants.js.thtml:63
 msgid "app_compat_older_firefox_only"
 msgstr "此元件僅�用於舊版的 Firefox"
 
 #. %1$s and %2$s are URLs
-#: views/pages/js_constants.js.thtml:74
+#: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
-"您�以<a href=\"%1$s\">安�舊版本</a>或是<a href=\"#\" onclick=\"%2$s\">忽略此"
-"檢查</a>"
+"您�以<a href=\"%1$s\">安�舊版本</a>或是<a href=\"#\" onclick=\"%2$s\">忽略"
+"此檢查</a>"
 
 #. %1$s is a URL
-#: views/pages/js_constants.js.thtml:71
+#: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
 msgstr "或安�此元件的 <a href=\"%1$s\">舊版本</a>"
 
 #. %1$s is a URL
 #. %2$s is a version number.  Example: 3.1
-#: views/pages/js_constants.js.thtml:73
+#: views/pages/js_constants.js.thtml:64
 msgid "app_compat_unreleased_version"
 msgstr "這個附加元件需�尚未發行的 <a href=\"%1$s\">Firefox %2$s</a>"
 
-#: views/pages/js_constants.js.thtml:70
+#: views/pages/js_constants.js.thtml:61
 msgid "app_compat_update_firefox"
 msgstr "<a href=\"http://getfirefox.com\">�級 Firefox</a> �能使用此元件"
 
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#. %3$s is a status, like Public.
-#: controllers/components/audit.php:79
-msgid "audit_addon_status"
-msgstr "%1$s 將 %2$s 的狀態改為「%3$s�"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:221
-msgid "audit_admin_default"
-msgstr "%1$s � ID %3$s �交了未知的管�行動 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:153
-msgid "audit_admin_feature_remove"
-msgstr "%1$s 移除了推薦 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:92
-msgid "audit_application_create"
-msgstr "%1$s 新增了應用程� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is an application, like Firefox.
-#: controllers/components/audit.php:95
-msgid "audit_application_edit"
-msgstr "%1$s 編輯了應用程� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:105
-msgid "audit_appversion_create"
-msgstr "%1$s 新增了 %3$s 的版本 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a version number, like 3.5.
-#. %3$s is an application, like Firefox.
-#: controllers/components/audit.php:108
-msgid "audit_appversion_delete"
-msgstr "%1$s 刪除了 %3$s 的版本 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a config field, like "awesomeness".
-#. %3$s is a config value, like "off".
-#. %4$s is a config value, like "on".
-#: controllers/components/audit.php:210
-msgid "audit_config"
-msgstr "%1$s 將設定 '%2$s' 由 '%3$s' 改為 '%4$s'"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:258
-msgid "audit_editor_default"
-msgstr "%1$s � ID %3$s �交了未知的審核行動 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:236
-msgid "audit_editor_feature_remove"
-msgstr "%1$s 將附加元件 %2$s 由推薦清單中移除了"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:231
-msgid "audit_feature_add"
-msgstr "%1$s 將附加元件 %2$s 加入了推薦清單"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:149
-msgid "audit_feature_edit"
-msgstr "%1$s 修改了一個 %2$s 語言的推薦元件"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>addon name</a>
-#: controllers/components/audit.php:241
-msgid "audit_feature_locale_change"
-msgstr "%1$s 修改了推薦元件 %2$s 的語言"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:83
-msgid "audit_file_recalchash"
-msgstr "%1$s �新計算了檔案 %2$s 的雜湊值"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:182
-msgid "audit_group_addmember"
-msgstr "%1$s 將 %2$s 加入了群組 %3$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:313
-msgid "audit_group_associated"
-msgstr "%1$s 將自己關�到群組 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:162
-msgid "audit_group_create"
-msgstr "%1s 建立了群組 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:170
-msgid "audit_group_delete"
-msgstr "%1$s 刪除了群組 %2$s（ID %3$s）"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:165
-msgid "audit_group_edit"
-msgstr "%1$s 編輯了群組 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#. %3$s is <a>group name</a>
-#: controllers/components/audit.php:188
-msgid "audit_group_removemember"
-msgstr "%1$s 將 %2$s 由群組 %3$s 中移除了"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:280
-msgid "audit_l10n_default"
-msgstr "%1$s � %3$s �交了未知的行動 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>group name</a>
-#: controllers/components/audit.php:295
-msgid "audit_modify_locked_group"
-msgstr "%1$s 想�修改已鎖定的群組 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:299
-msgid "audit_modify_other_locale"
-msgstr "%1$s 想�修改 %2$s 的翻譯，但沒有權�"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:135
-msgid "audit_platform_create"
-msgstr "%1$s 新增了作業系統 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:143
-msgid "audit_platform_delete"
-msgstr "%1$s 刪除了作業系統 %2$s（ID %3$s）"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a platform, like <a>Windows</a>
-#: controllers/components/audit.php:138
-msgid "audit_platform_edit"
-msgstr "%1$s 編輯了作業系統 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a part of the admin, like 'Site Config'
-#: controllers/components/audit.php:288
-msgid "audit_reauthentication_failure"
-msgstr "%1$s 於存� %2$s 時，�新�證失敗。"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:198
-msgid "audit_response_create"
-msgstr "%1$s 新增了回覆訊� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:206
-msgid "audit_response_delete"
-msgstr "%1$s 刪除了回覆訊� %2$s（ID %3$s）"
-
-#. %1$s is <a>user name</a>
-#. %2$s is the name of a canned response, like 'Ready for the public'
-#: controllers/components/audit.php:201
-msgid "audit_response_edit"
-msgstr "%1$s 編輯了回覆訊� %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:245
-msgid "audit_review_approve"
-msgstr "%1$s 批准了審核 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a numeric id.
-#: controllers/components/audit.php:250 controllers/components/audit.php:253
-msgid "audit_review_delete"
-msgstr "%1$s 刪除了審核 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s an action string, but we don't know what it could be.
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:303
-msgid "audit_security_default"
-msgstr "%1$s � ID %3$s �交了未知的安全性行動 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:118
-msgid "audit_tag_create"
-msgstr "%1$s 新增了分類 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#. %3$s is a numeric id.
-#: controllers/components/audit.php:126
-msgid "audit_tag_delete"
-msgstr "%1$s 刪除了分類 %2$s（ID %3$s）"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a category name, like <a>Search Tools</a>
-#: controllers/components/audit.php:121
-msgid "audit_tag_edit"
-msgstr "%1$s 編輯了分類 %2$s"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:266
-msgid "audit_update_applications"
-msgstr "%1$s 更新了 %2$s 語言的應用程�翻譯"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:277
-msgid "audit_update_blog"
-msgstr "%1$s 更新了 %2$s 語言的部�格文章翻譯"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:274
-msgid "audit_update_platforms"
-msgstr "%1$s 更新了 %2$s 語言的作業系統翻譯"
-
-#. %1$s is <a>user name</a>
-#. %2$s is a locale, like en-US.
-#: controllers/components/audit.php:270
-msgid "audit_update_tags"
-msgstr "%1$s 更新了 %2$s 語言的分類翻譯"
-
-#. %1$s is <a>user name</a>
-#. %2$s is <a>user name</a>
-#: controllers/components/audit.php:217
-msgid "audit_user_edit"
-msgstr "%1$s 編輯了 %2$s 的使用者資訊"
-
-#: controllers/addons_controller.php:1012
+#: controllers/addons_controller.php:769
 msgid "browse_addons_name"
 msgstr "��稱排�"
 
-#: controllers/addons_controller.php:1010
+#: controllers/addons_controller.php:767
 msgid "browse_addons_newest"
 msgstr "最新元件"
 
-#: controllers/addons_controller.php:1008
+#: controllers/addons_controller.php:765
 msgid "browse_addons_popular"
 msgstr "熱門元件"
 
-#: controllers/addons_controller.php:1011
+#: controllers/addons_controller.php:768
 msgid "browse_addons_rated"
 msgstr "�評分排�"
 
-#: controllers/addons_controller.php:1009
+#: controllers/addons_controller.php:766
 msgid "browse_addons_updated"
 msgstr "最近更新元件"
 
@@ -1392,566 +1018,39 @@ msgid "categories_current_title"
 msgstr "目�分類"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:43
-#: views/elements/amo2009/categories.thtml:45
 msgid "categories_header"
 msgstr "分類"
 
 #: views/elements/categories.thtml:50
-#: views/elements/amo2009/categories.thtml:41
 msgid "categories_header_title"
 msgstr "請�擇分類"
 
-#. %1$s is the category name
-#: views/addons/searchengines.thtml:129
-#, php-format
-msgid "category_extra_see_all"
-msgstr "看看所有 %1$s 類元件"
-
-#. %1$s is a number.
-#: models/collection.php:130
-msgid "collection_description_limit"
-msgstr "敘述應少於 %1$s 個字元。"
+#: views/addons/category_landing.thtml:68
+msgid "category_extra_allrecommended"
+msgstr "看看所有推薦元件"
 
-#. %1$s is the name of the collection
-#: controllers/collections_controller.php:392
-msgid "collection_detail_rss_title"
-msgstr "%s 收�集"
+#: views/addons/category_landing.thtml:59
+msgid "category_extra_highestrated"
+msgstr "評分越高優先"
 
-#: controllers/collections_controller.php:1065
-msgid "collection_error_deleting_addon"
-msgstr "元件刪除失敗�"
+#: views/addons/category_landing.thtml:60
+msgid "category_extra_lastupdated"
+msgstr "套件越新優先"
 
-#: controllers/collections_controller.php:1051
-msgid "collection_error_saving_addon"
-msgstr "元件儲存失敗�"
+#: views/addons/category_landing.thtml:58
+msgid "category_extra_mostpopular"
+msgstr "下載越多優先"
 
-#: controllers/collections_controller.php:1080
-msgid "collection_error_saving_comment"
-msgstr "�見儲存失敗�"
-
-#. %1$s is a number.
-#: models/collection.php:122
-msgid "collection_name_limit"
-msgstr "�稱應少於 %1$s 個字元。"
+# %1 is the category name
+#. %1$s is the category name
+#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#, php-format
+msgid "category_extra_see_all"
+msgstr "看看所有 %1$s 類元件"
 
-#: controllers/collections_controller.php:352
-#: controllers/collections_controller.php:487
+#: controllers/collections_controller.php:84
 msgid "collection_not_found"
-msgstr "找�到收�集�"
-
-#. %1$s is the text on the "create collection" button
-#: views/collections/add.thtml:91
-msgid "collections_add_formfield_addons_description"
-msgstr ""
-"如果您已經有一些想加入收�集的元件，請在下�輸入它們的�稱。如果您想�後進行，"
-"�在請按 %1$s。"
-
-#: views/collections/add.thtml:90
-msgid "collections_add_formfield_firstaddons"
-msgstr "�擇您的第一個元件"
-
-#: views/collections/add.thtml:48
-msgid "collections_add_header"
-msgstr "建立收�集"
-
-#: views/collections/add.thtml:97
-msgid "collections_add_header_selectedaddons"
-msgstr "�擇附加元件"
-
-#: views/collections/add.thtml:50
-msgid "collections_add_intro"
-msgstr "填寫下列欄�，��簡單地建立屬於您的收�集。"
-
-#: views/collections/add.thtml:92 views/collections/add.thtml:103
-msgid "collections_add_submit"
-msgstr "建立收�集"
-
-#: views/pages/collector_faq.thtml:50 views/pages/collector_firstrun.thtml:43
-#: views/pages/collector.thtml:47 views/pages/collector_features.thtml:55
-#: controllers/search_controller.php:302
-#: controllers/collections_controller.php:206
-#: controllers/collections_controller.php:405
-#: controllers/collections_controller.php:467
-#: controllers/collections_controller.php:539
-msgid "collections_breadcrumb"
-msgstr "收�集"
-
-#: views/collections/detail.thtml:185
-msgid "collections_detail_a_learn"
-msgstr "更多資訊"
-
-#: views/elements/amo2009/collection_add_form.thtml:53
-#: views/elements/amo2009/collections_js_init.thtml:68
-#: views/pages/collector_firstrun.thtml:64
-msgid "collections_detail_button_add"
-msgstr "加入到最愛"
-
-#: views/elements/amo2009/collection_add_form.thtml:50
-#: views/elements/amo2009/collections_js_init.thtml:71
-msgid "collections_detail_button_remove"
-msgstr "從最愛移除"
-
-#. %1$s is a URL.
-#. %2$s is a full <a href>.
-#: views/collections/detail.thtml:62
-msgid "collections_detail_created_desc"
-msgstr ""
-"<p>您�以在下方檢視您的收�集。如果�設置收�集暱稱�上傳圖示，或修改更多設"
-"定，請造訪<a href='%1$s'>管�收�集</a>��。</p><p>您�以在這個網�存�您的收"
-"�集：%2$s</p>"
-
-#: views/collections/detail.thtml:61
-msgid "collections_detail_created_msg"
-msgstr "您的收�集已經準備就緒�"
-
-#: views/collections/detail.thtml:109
-msgid "collections_detail_header_about"
-msgstr "關於這個收�集"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:126
-msgid "collections_detail_header_count"
-msgid_plural "collections_detail_header_count"
-msgstr[0] "這個收�集有 %1$s 個元件"
-
-#: views/collections/detail.thtml:113
-msgid "collections_detail_info_created"
-msgstr "<strong>建立者：</strong> %1$s"
-
-#: views/collections/detail.thtml:117
-msgid "collections_detail_info_updated"
-msgstr "<strong>更新時間：</strong>"
-
-#: views/elements/amo2009/collections_js_init.thtml:62
-msgid "collections_detail_js_adding"
-msgstr "加入到最愛中…"
-
-#: views/elements/amo2009/collections_js_init.thtml:65
-msgid "collections_detail_js_removing"
-msgstr "從最愛移除中…"
-
-#. %1$s is a URL
-#: views/collections/detail.thtml:90
-msgid "collections_detail_login"
-msgstr "<a href=\"%1$s\">登入</a>後方�加入這個收�集到最愛。"
-
-#: views/collections/detail.thtml:104
-msgid "collections_detail_manage"
-msgstr "管�收�集"
-
-#: controllers/collections_controller.php:298
-msgid "collections_detail_sort_date"
-msgstr "新增日期"
-
-#: controllers/collections_controller.php:299
-msgid "collections_detail_sort_name"
-msgstr "�稱"
-
-#: controllers/collections_controller.php:300
-msgid "collections_detail_sort_popularity"
-msgstr "熱門程度"
-
-#. %1$s is a number.
-#: views/collections/detail.thtml:166
-msgid "collections_detail_weekly_downloads"
-msgid_plural "collections_detail_weekly_downloads"
-msgstr[0] "本週有 %1$s 次下載"
-
-#: views/collections/edit.thtml:255
-msgid "collections_edit_addons_delete_noscript"
-msgstr "�擇的元件將在儲存時被移除"
-
-#: views/collections/edit.thtml:247
-msgid "collections_edit_addons_description"
-msgstr "�在收�集發表新的元件，請在下�輸入它們的�稱。"
-
-#: views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_noscript"
-msgstr "�在收�集發表新的元件，請在下�輸入它們的元件 ID，以逗號分隔�個項目。"
-
-#: views/collections/edit.thtml:247 views/collections/edit.thtml:248
-msgid "collections_edit_addons_description_publish_detailspage"
-msgstr "您也�以在�元件的顯示��發表它們。"
-
-#. %1$s is the date the add-on was added to the collection
-#. %1$s is the name of the user who added the add-on to the collection
-#: views/collections/edit.thtml:260
-msgid "collections_edit_addons_listitem_added"
-msgstr "%2$s 於 %1$s 新增"
-
-#: views/collections/edit.thtml:263
-msgid "collections_edit_addons_listitem_comment_add"
-msgstr "新增發佈者�見"
-
-#: views/collections/edit.thtml:266
-msgid "collections_edit_addons_listitem_comment_delete"
-msgstr "刪除發佈者�見"
-
-#: views/collections/edit.thtml:265
-msgid "collections_edit_addons_listitem_comment_edit"
-msgstr "編輯發佈者�見"
-
-#: views/collections/edit.thtml:271
-msgid "collections_edit_addons_listitem_comment_note"
-msgstr "注�：�見顯示將包�原發表者與原發表日期"
-
-#: views/collections/edit.thtml:270
-msgid "collections_edit_addons_listitem_comment_submit"
-msgstr "儲存�見"
-
-#: views/collections/edit.thtml:261
-msgid "collections_edit_addons_listitem_remove"
-msgstr "移除"
-
-#: views/collections/edit.thtml:250
-msgid "collections_edit_addons_submit"
-msgstr "加入收�集"
-
-#: views/collections/edit.thtml:153
-msgid "collections_edit_check_nickname"
-msgstr "檢查是��用"
-
-#: views/collections/edit.thtml:299
-msgid "collections_edit_confirm_deletecollection"
-msgstr "是的，我�刪除這個收�集。"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:300
-msgid "collections_edit_confirm_deletecollection_description"
-msgstr "勾�此方塊，然後按下「%1$s�刪除這個收�集。"
-
-#. %1$s is the "delete" submit button text
-#. %2$s is the title of the "advanced" tab
-#: views/collections/edit.thtml:95
-msgid "collections_edit_delete_upon_submit"
-msgstr ""
-"由於勾�了下�的「%1$s�，您的收�集將被刪除。如果您�想刪除它，請�消勾�「%2"
-"$s��籤中的確�方塊，然後繼續編輯收�集。如果您未儲存就離開此��，收�集亦�"
-"會被刪除。"
-
-#: views/collections/edit.thtml:94
-msgid "collections_edit_delete_warning"
-msgstr "您的收�集將被刪除�"
-
-#: views/collections/add.thtml:76 views/collections/edit.thtml:144
-msgid "collections_edit_form_error_description"
-msgstr "您必須為收�集�供敘述。"
-
-#: views/collections/edit.thtml:181
-msgid "collections_edit_form_error_icon"
-msgstr "上傳圖示時發生錯誤。"
-
-#: views/collections/add.thtml:69 views/collections/edit.thtml:130
-msgid "collections_edit_form_error_name"
-msgstr "您必須給收�集一個�字。"
-
-#: views/collections/edit.thtml:158
-msgid "collections_edit_form_error_nickname"
-msgstr "您�擇的暱稱必須是沒有被用�的。"
-
-#: views/collections/add.thtml:93 views/collections/edit.thtml:249
-msgid "collections_edit_formfield_addons"
-msgstr "元件�稱："
-
-#: views/collections/edit.thtml:281
-msgid "collections_edit_formfield_application"
-msgstr "關�應用程�"
-
-#: views/collections/edit.thtml:282
-msgid "collections_edit_formfield_application_description"
-msgstr "�擇您收�集支�的應用程�。"
-
-#: views/collections/edit.thtml:288
-msgid "collections_edit_formfield_collectiontype"
-msgstr "收�集類型"
-
-#: views/collections/edit.thtml:295
-msgid "collections_edit_formfield_deletecollection"
-msgstr "刪除收�集"
-
-#: views/collections/edit.thtml:296
-msgid "collections_edit_formfield_deletecollection_description"
-msgstr "刪除您的收�集將會永久地消除它。"
-
-#: views/collections/add.thtml:73 views/collections/edit.thtml:140
-msgid "collections_edit_formfield_description"
-msgstr "收�集敘述"
-
-#: views/collections/add.thtml:74 views/collections/edit.thtml:141
-msgid "collections_edit_formfield_description_description"
-msgstr "簡短�述您的收�集，以�它收�哪種類型的元件"
-
-#: views/collections/edit.thtml:162
-msgid "collections_edit_formfield_icon"
-msgstr "圖示"
-
-#: views/collections/edit.thtml:163
-msgid "collections_edit_formfield_icon_description"
-msgstr "您�以上傳 JPG�GIF 或 PNG 圖示，圖示會被縮放為 32x32 �素。"
-
-#: views/collections/add.thtml:80 views/collections/edit.thtml:189
-msgid "collections_edit_formfield_listed"
-msgstr "誰�以檢視您的收�集？"
-
-#: views/collections/add.thtml:81 views/collections/edit.thtml:190
-msgid "collections_edit_formfield_listed_description"
-msgstr ""
-"�設情形下，收�集會出�在公開且�個人都能找到的「收�集目錄�中。如果您想�制"
-"�讓知�特殊��的人看見您的收�集，請在下方�擇該�項。"
-
-#: views/collections/add.thtml:84 views/collections/edit.thtml:193
-msgid "collections_edit_formfield_listed_false"
-msgstr "�有我邀請的人能檢視我的收�集"
-
-#: views/collections/add.thtml:83 views/collections/edit.thtml:192
-msgid "collections_edit_formfield_listed_true"
-msgstr "所有人��在目錄檢視我的收�集"
-
-#: views/collections/edit.thtml:223
-msgid "collections_edit_formfield_managers"
-msgstr "誰�以管�我的收�集？"
-
-#: views/collections/edit.thtml:224
-msgid "collections_edit_formfield_managers_description"
-msgstr ""
-"這些使用者�以發表附加元件至您的收�集�管�所有元件和設定�以�給予其他使用者"
-"權�。"
-
-#: views/collections/add.thtml:66 views/collections/edit.thtml:126
-msgid "collections_edit_formfield_name"
-msgstr "收�集�稱"
-
-#: views/collections/add.thtml:67 views/collections/edit.thtml:127
-msgid "collections_edit_formfield_name_description"
-msgstr "請替您的收�集�一個敘述性的�稱，例如「�明最愛的旅行相關元件�。"
-
-#: views/collections/edit.thtml:148
-msgid "collections_edit_formfield_nickname"
-msgstr "收�庫暱稱"
-
-#: views/collections/edit.thtml:149
-msgid "collections_edit_formfield_nickname_description"
-msgstr "給收�集一個�特的暱稱，方便快速存�（���供）："
-
-#: views/collections/edit.thtml:201
-msgid "collections_edit_formfield_publishers"
-msgstr "誰�以發表附加元件至您的收�集？"
-
-#: views/collections/edit.thtml:202
-msgid "collections_edit_formfield_publishers_description"
-msgstr "這些使用者�以發表附加元件至您的收�集，或移除他們所發表的元件。"
-
-#: views/collections/edit.thtml:210 views/collections/edit.thtml:232
-msgid "collections_edit_formfield_users_add"
-msgstr "輸入 Firefox 附加元件網站帳號的 Email 地�："
-
-#: views/collections/edit.thtml:216 views/collections/edit.thtml:238
-msgid "collections_edit_formfield_users_delete_noscript"
-msgstr "�擇的帳號將在儲存時被移除"
-
-#: views/collections/edit.thtml:215 views/collections/edit.thtml:237
-msgid "collections_edit_formfield_users_new_noscript"
-msgstr "輸入 Firefox 附加元件網站帳號的 Email 地�，以逗號分隔�個項目"
-
-#: views/collections/edit.thtml:204 views/collections/edit.thtml:226
-msgid "collections_edit_formfield_users_onlyme"
-msgstr "�有我"
-
-#: views/collections/edit.thtml:205 views/collections/edit.thtml:227
-msgid "collections_edit_formfield_users_otherusers"
-msgstr "我自己和這些使用者："
-
-#: views/collections/edit.thtml:211 views/collections/edit.thtml:233
-msgid "collections_edit_formfield_users_submit"
-msgstr "新增"
-
-#. %1$s is the name of the collection
-#: views/collections/edit.thtml:68
-msgid "collections_edit_header"
-msgstr "管� %1$s"
-
-#: views/collections/edit.thtml:246
-msgid "collections_edit_header_addons"
-msgstr "管�收�集內容"
-
-#: views/collections/edit.thtml:253 views/collections/edit.thtml:258
-msgid "collections_edit_header_addons_current"
-msgstr "目�的附加元件："
-
-#: views/collections/edit.thtml:279
-msgid "collections_edit_header_advanced"
-msgstr "進階設定"
-
-#: views/collections/edit.thtml:186
-msgid "collections_edit_header_permissions"
-msgstr "管�收�集權�"
-
-#: views/collections/edit.thtml:170
-msgid "collections_edit_icon_cancel"
-msgstr "�消"
-
-#: views/collections/edit.thtml:174 views/collections/edit.thtml:179
-msgid "collections_edit_icon_delete"
-msgstr "刪除圖示"
-
-#: views/collections/edit.thtml:178
-msgid "collections_edit_icon_replace"
-msgstr "�代圖示"
-
-#. %1$s is the label of the edit form's submit button
-#: views/collections/edit.thtml:169
-msgid "collections_edit_icon_toberemoved"
-msgstr "點�下�的「%1$s�後，圖示將被移除"
-
-#: views/collections/edit.thtml:155
-msgid "collections_edit_nickname_available"
-msgstr "�用的暱稱"
-
-#: controllers/collections_controller.php:943
-msgid "collections_edit_nickname_error"
-msgstr "您的暱稱包�無效字元，已被修正。請�試一次。"
-
-#: views/collections/edit.thtml:156
-msgid "collections_edit_nickname_taken"
-msgstr "已�用暱稱"
-
-#. This string is followed by a URL pointing to the collection's view page
-#: views/collections/edit.thtml:75
-msgid "collections_edit_saved_nextstep"
-msgstr "�以在這個網�存�您的收�集："
-
-#: views/collections/edit.thtml:74
-msgid "collections_edit_saved_success"
-msgstr "已�功儲存您的收�集�"
-
-#: views/collections/edit.thtml:169 views/collections/edit.thtml:300
-#: views/collections/edit.thtml:308 views/pages/js_constants.js.thtml:99
-msgid "collections_edit_submit"
-msgstr "更新收�集"
-
-#: views/collections/edit.thtml:96 views/collections/edit.thtml:297
-#: views/pages/js_constants.js.thtml:100
-msgid "collections_edit_submit_deletecollection"
-msgstr "刪除收�集"
-
-#: views/collections/edit.thtml:111
-msgid "collections_edit_tabheader_addons"
-msgstr "附加元件"
-
-#: views/collections/edit.thtml:97 views/collections/edit.thtml:113
-msgid "collections_edit_tabheader_advanced"
-msgstr "進階"
-
-#: views/collections/edit.thtml:108
-msgid "collections_edit_tabheader_details"
-msgstr "�稱 &amp; 細節"
-
-#: views/collections/edit.thtml:109
-msgid "collections_edit_tabheader_permissions"
-msgstr "權�"
-
-#: models/collection_promo.php:53
-msgid "collections_family_tagline"
-msgstr "關照您的�孩和您的行事曆"
-
-#: models/collection_promo.php:53
-msgid "collections_family_title"
-msgstr "家庭"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:70
-msgid "collections_index_a_check_out"
-msgstr "試試 Add-on Collector"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:52
-msgid "collections_index_a_create"
-msgstr "建立收�集"
-
-#: views/collections/detail.thtml:139 views/collections/listing.thtml:85
-#: views/search/collections.thtml:84
-msgid "collections_index_button_go"
-msgstr "�"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:182
-msgid "collections_index_filler_favorites"
-msgstr ""
-"<p><strong>您還沒有最愛的收�集。</strong></p> <p>這個���以快速存�您標記為"
-"最愛的收�集，若您安�了 <a href='%1$s'>Add-on Collector</a>，它們也會出�在那"
-"裡。</p>"
-
-#. %1$s is a URL.
-#: controllers/collections_controller.php:167
-msgid "collections_index_filler_mine"
-msgstr ""
-"<p>您尚未建立任何收�集。簡單地將喜愛的附加元件新增並加入收�集��，<a "
-"href='%1$s'>試試看�</a>�</p>"
-
-#: views/collections/listing.thtml:51
-msgid "collections_index_header_collections"
-msgstr "收�集"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:60
-msgid "collections_index_header_collector"
-msgstr "Add-on Collector"
-
-#. %1$s is a comma-separated list of author names
-#: views/elements/amo2009/collection_listing_item.thtml:84
-#: views/collections/detail.thtml:151
-msgid "collections_index_header_created"
-msgstr "由 %1$s 建立"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:47
-msgid "collections_index_header_what"
-msgstr "什麼是收�集？"
-
-#: views/collections/detail.thtml:132 views/collections/listing.thtml:78
-#: views/search/collections.thtml:66
-msgid "collections_index_label_sortby"
-msgstr "排�方�"
-
-#: controllers/collections_controller.php:130
-msgid "collections_index_li_editors"
-msgstr "編輯精�"
-
-#: views/collections/subscribe.thtml:64
-#: controllers/collections_controller.php:140
-msgid "collections_index_li_favorites"
-msgstr "我的最愛"
-
-#: controllers/collections_controller.php:138
-msgid "collections_index_li_mine"
-msgstr "我的收�集"
-
-#: controllers/collections_controller.php:132
-msgid "collections_index_li_popular"
-msgstr "熱門"
-
-#: views/search/collections.thtml:74 controllers/collections_controller.php:81
-msgid "collections_index_option_all"
-msgstr "所有時間最熱門"
-
-#: views/search/collections.thtml:72 controllers/collections_controller.php:78
-msgid "collections_index_option_month"
-msgstr "本月最熱門"
-
-#: views/search/collections.thtml:76 controllers/collections_controller.php:84
-msgid "collections_index_option_newest"
-msgstr "新舊"
-
-#: views/search/collections.thtml:70 controllers/collections_controller.php:75
-msgid "collections_index_option_week"
-msgstr "本週最熱門"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:67
-msgid "collections_index_p_collector"
-msgstr ""
-"�在有全新的方��以管�和尋找您喜愛的附加元件：在您的�覽器裡頭直接評論�分享"
-"和�步收�集"
-
-#: views/elements/amo2009/collector_info_secondary.thtml:48
-msgid "collections_index_p_what_are"
-msgstr "收�集是將相關的附加元件集�起來，以方便分享的群集。"
+msgstr "沒有找到收��"
 
 #. %s is a date in the _('date') format
 #: views/elements/collections_interactive_addon.thtml:85
@@ -1959,326 +1058,216 @@ msgstr "收�集是將相關的附加元件集�起來，以方便分享的群
 msgid "collections_interactive_addon_added"
 msgstr "已新增 %s"
 
-#: models/collection_promo.php:55
-msgid "collections_reference_tagline"
-msgstr "在線上研究任何�西"
-
-#: models/collection_promo.php:55
-msgid "collections_reference_title"
-msgstr "�考資�"
-
-#: models/collection_promo.php:52
-msgid "collections_social_tagline"
-msgstr "管�您的社交網路"
-
-#: models/collection_promo.php:52
-msgid "collections_social_title"
-msgstr "社交"
-
-#: views/collections/subscribe.thtml:91
-msgid "collections_subscribe_button_close"
-msgstr "關閉"
-
-#: views/collections/subscribe.thtml:70
-msgid "collections_subscribe_error"
-msgstr "嘗試加入到最愛收�集時發生錯誤。這個收�集已經是您的最愛嗎？"
-
-#: views/collections/subscribe.thtml:96
-msgid "collections_subscribe_label_bothersome"
-msgstr "��顯示此訊�。"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:60
-msgid "collections_subscribe_success"
-msgstr "已將 %1$s 加入您的最愛收�集。"
-
-#. %1$s is the link to the "My Favorites" tab on the main collections page
-#. %2$s is the localized title of the "My Favorites" tab
-#. %3$s is the link URL to the collector add-on
-#: views/collections/subscribe.thtml:62
-msgid "collections_subscribe_success_desc"
-msgstr ""
-"您�在�以從目錄下的<a href=\"%1$s\">%2$s</a>�籤快速找到這個收�集。��我們"
-"用於 Firefox 的擴充套件 <a href=\"%3$s\">Add-on Collector</a>，以更簡單的方�"
-"追蹤您最愛的收�集。"
-
-#: views/collections/listing.thtml:55
-msgid "collections_success_delete"
-msgstr "收�集已經被刪除。"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_tagline"
-msgstr "計劃商業旅行和難忘�期"
-
-#: models/collection_promo.php:54
-msgid "collections_travel_title"
-msgstr "旅�"
-
-#. A collection of add-ons that is automatically built for a user.  They are "automatically published" to this collection.
-#: controllers/collections_controller.php:581
-msgid "collections_type_autopublisher"
-msgstr "自動發表"
-
-#. A collection that has been chosen by an Editor as notable or exceptional
-#: controllers/collections_controller.php:582
-msgid "collections_type_editorspick"
-msgstr "編輯精�"
-
-#: controllers/collections_controller.php:580
-msgid "collections_type_normal"
-msgstr "標準"
-
-#: views/collections/subscribe.thtml:84
-msgid "collections_unsubscribe_error"
-msgstr "嘗試移除最愛收�集時發生錯誤。這個收�集�曾是您的最愛嗎？"
-
-#. %1$s is the collection name
-#: views/collections/subscribe.thtml:78
-msgid "collections_unsubscribe_success"
-msgstr "%1$s 已經從您的最愛收�集中移除。"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_tagline"
-msgstr "建立完美的網站"
-
-#: models/collection_promo.php:56
-msgid "collections_webdev_title"
-msgstr "網�開發"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:40
-msgid "collections_whatare_header"
-msgstr "什麼是收�集？"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:45
-msgid "collections_whatare_learnmore"
-msgstr "閱讀常見�題集"
-
-#: views/elements/amo2009/collections_sidebar_whatare.thtml:44
-msgid "collections_whatare_text"
-msgstr ""
-"�在有全新的方��以管�和尋找您喜愛的附加元件：在您的�覽器裡頭直接評論�分享"
-"和�步收�集。"
-
-#: views/pages/collector_faq.thtml:61 views/pages/collector_features.thtml:67
-msgid "collector_features_a_home"
-msgstr "Add-on Collector 首�"
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:46
-msgid "collector_features_heading_download"
-msgstr "下載 Add-on Collector："
-
-#: views/elements/amo2009/collector_sidebar_download.thtml:43
-#: views/pages/collector_firstrun.thtml:116 views/pages/collector.thtml:69
-msgid "collector_features_img_logo"
-msgstr "Add-on Collector Logo"
-
-#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:45
 #: controllers/compatibility_controller.php:72
 msgid "compatibility_dashboard_center_header"
 msgstr "附加元件相容性中心"
 
 #. %1$s is the name of an application and a version.  Example: Firefox 3.0
 #. %2$s is the name of an application.  Example: Firefox
-#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:46
 msgid "compatibility_dashboard_intro"
 msgstr ""
-"使用以下�供給 %2$s 附加元件開發社群的工具與資訊，�先準備版本 %1$s 的推出。"
+"使用以下�供於 %2$ 附加元件開發社群的工具與資訊，�先準備版本 %1$s 的推出。"
 
-#: views/compatibility/dashboard.thtml:103
+#: views/compatibility/dashboard.thtml:107
 msgid "compatibility_dashboard_loading"
-msgstr "資料載入中…"
+msgstr "載入資料..."
 
-#: views/compatibility/dashboard.thtml:45
+#: views/compatibility/dashboard.thtml:41
 msgid "compatibility_dashboard_main_link"
 msgstr "回到主��"
 
-#: views/compatibility/dashboard.thtml:100 views/compatibility/report.thtml:43
+#: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41
 msgid "compatibility_dashboard_report"
 msgstr "附加元件相容性報告"
 
-#: views/compatibility/dashboard.thtml:53
-#: views/compatibility/dashboard.thtml:110
-#: views/compatibility/developers.thtml:43
+#: views/compatibility/dashboard.thtml:49
+#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/developers.thtml:41
 msgid "compatibility_developer_info"
 msgstr "给附加元件開發者的資訊"
 
-#: views/compatibility/developers.thtml:66
+#: views/compatibility/developers.thtml:64
 msgid "compatibility_developers_adjust_maxversion"
 msgstr "調整 maxVersion 而��新上傳"
 
-#: views/compatibility/dashboard.thtml:124
+#: views/compatibility/dashboard.thtml:128
 msgid "compatibility_developers_check_status"
 msgstr "檢查我的附加元件的狀態"
 
 #. %1$s is a URL
 #. %2$s is an application and version.  Example:  Firefox 3.0
-#: views/compatibility/dashboard.thtml:126
+#: views/compatibility/dashboard.thtml:130
 msgid "compatibility_developers_login_first"
 msgstr ""
-"如果您有放在 Mozilla 附加元件網站上的元件，<a href=\"%1$s\">請登入</a>以分�元"
-"件在 %2$s 上的狀態。"
+"若您有放在 Mozilla 附加元件網站的附加元件，請<a href=\"%1$s\">登入</a>已分�"
+"您的附加元件與版本 %2$s 的相容性。"
 
-#: views/compatibility/dashboard.thtml:114
+#: views/compatibility/dashboard.thtml:118
 msgid "compatibility_developers_mdclogo_alt"
 msgstr "Mozilla Developer Center Logo"
 
-#: views/compatibility/developers.thtml:73
+#: views/compatibility/developers.thtml:71
 msgid "compatibility_developers_no_addons"
 msgstr "您沒有任何放在 Mozilla 附加元件網站的附加元件。"
 
-#: views/compatibility/dashboard.thtml:133
-#: views/compatibility/developers.thtml:55
+#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/developers.thtml:53
 msgid "compatibility_developers_results"
 msgstr "附加元件狀態檢查�果"
 
-#: views/compatibility/dashboard.thtml:137
+#: views/compatibility/dashboard.thtml:141
 msgid "compatibility_developers_retrieving"
-msgstr "正在接收您的附加元件狀態…"
+msgstr "接收您的附加元件的狀態..."
 
 #. %1$s is a number
 #. %2$s is an application name  
 #. %3$s is a number.
 #. Full example:   50 Firefox users (10% of total)
-#: views/compatibility/developers.thtml:65
+#: views/compatibility/developers.thtml:63
 msgid "compatibility_developers_user_count"
 msgstr "%1$s %2$s 使用者 (佔總數的 %3$s&#37;)"
 
-#: views/compatibility/report.thtml:45
+#: views/compatibility/report.thtml:43
 msgid "compatibility_report_detail_intro"
-msgstr "以下是 Mozilla 在以使用率大�排�後，所知總計�到 95% 使用率的元件。"
+msgstr ""
+"以下的附加元件代表 Mozilla 知�的附加元件使用的 95%，以他們的使用大�排列。"
 
-#: views/compatibility/dashboard.thtml:94
+#: views/compatibility/dashboard.thtml:98
 msgid "compatibility_report_detailed_link"
 msgstr "檢視詳細報告"
 
 #. %1$s and %2$s are numbers
 #. %3$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:65
+#: views/compatibility/dashboard.thtml:69
 msgid "compatibility_report_intro"
 msgstr ""
-"Mozilla 所知總計�到 95&#37; 使用率的 %1$s 個元件中，目�共有 <b>%2$s&#37;</"
-"b> 與 %3$s 最新版本相容。"
+"%1$s 個附加元件，代表 95&#37; Mozilla 已知附加元件使用�，目�共有 <b>%2"
+"$s&#37;</b> 與 %3$s 最新版本相容。"
 
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha"
 msgstr "Alpha 版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:81
+#: views/compatibility/dashboard.thtml:85
 msgid "compatibility_report_legend_alpha_description"
 msgstr "和 %1$s 的 Alpha 版本相容的附加元件"
 
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta"
 msgstr "Beta 版本 (測試版)"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:85
+#: views/compatibility/dashboard.thtml:89
 msgid "compatibility_report_legend_beta_description"
 msgstr "與 %1$s 的測試版或是 RC 版相容的附加元件"
 
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest"
 msgstr "最新版"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:89
+#: views/compatibility/dashboard.thtml:93
 msgid "compatibility_report_legend_latest_description"
 msgstr "已經更新到與 %1$s 最新版相容的附加元件"
 
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other"
 msgstr "其它版本"
 
 #. %1$s is an application name and version.  Example: Firefox 3.1
-#: views/compatibility/dashboard.thtml:77
+#: views/compatibility/dashboard.thtml:81
 msgid "compatibility_report_legend_other_description"
 msgstr "與任何版本的 %1$s 皆�相容的附加元件"
 
-#: views/compatibility/dashboard.thtml:62
+#: views/compatibility/dashboard.thtml:66
 msgid "compatibility_report_title"
 msgstr "附加元件相容性報告"
 
-#: views/compatibility/dashboard.thtml:54
-#: views/compatibility/dashboard.thtml:144 views/compatibility/users.thtml:42
+#: views/compatibility/dashboard.thtml:50
+#: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40
 msgid "compatibility_user_info"
 msgstr "給附加元件使用者的資訊"
 
-#: views/compatibility/dashboard.thtml:52
+#: views/compatibility/dashboard.thtml:48
 msgid "compatibility_view_report"
 msgstr "顯示相容性報告"
 
 #. %s is a URL
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 #, php-format
 msgid "credits_contributing"
 msgstr "想瞭解他們的貢�，您�以�考 Mozilla 上的 %s。"
 
-#: views/pages/credits.thtml:142
+#: views/pages/credits.thtml:140
 msgid "credits_contributing_wikipage"
 msgstr "Wiki ��"
 
-#: views/pages/credits.thtml:99
+#: views/pages/credits.thtml:97
 msgid "credits_intro"
 msgstr "Mozilla 謹此感�以下長期來為 addons.mozilla.org 貢�良多的人："
 
-#: views/pages/credits.thtml:103
+#: views/pages/credits.thtml:101
 msgid "credits_section_developers"
 msgstr "開發者"
 
-#: views/pages/credits.thtml:115
+#: views/pages/credits.thtml:113
 msgid "credits_section_editors"
 msgstr "審核者"
 
-#: views/pages/credits.thtml:109
+#: views/pages/credits.thtml:107
 msgid "credits_section_localizers"
 msgstr "在地化"
 
-#: views/pages/credits.thtml:121
+#: views/pages/credits.thtml:119
 msgid "credits_section_other_contributors"
 msgstr "其他貢�"
 
-#: views/pages/credits.thtml:127
+#: views/pages/credits.thtml:125
 msgid "credits_section_past_developers"
 msgstr "�任開發者"
 
-#: views/pages/credits.thtml:133
+#: views/pages/credits.thtml:131
 msgid "credits_section_software"
 msgstr "軟體�圖片"
 
-#: views/pages/credits.thtml:136
+#: views/pages/credits.thtml:134
 msgid "credits_software_famfamfam"
 msgstr ""
 "部分圖示是來自於 <a href=\"http://www.famfamfam.com/lab/icons/silk/"
 "\">famfamfam Silk 圖示集</a>，以 <a href=\"http://creativecommons.org/"
 "licenses/by/2.5/\">創用 CC 姓�標示 2.5 通用版</a> 授權�款發佈。"
 
-#: views/pages/credits.thtml:137
+#: views/pages/credits.thtml:135
+#, fuzzy
 msgid "credits_software_timeplot"
 msgstr ""
-"部分��使用 <a href=\"http://www.simile-widgets.org/timeplot/\">Timeplot</a> "
-"元素，以 <a href=\"http://simile.mit.edu/license.html\">BSD</a> 授權�款發佈。"
+"Some pages use elements of <a href=\"http://www.simile-widgets.org/timeplot/"
+"\">Timeplot</a>, licensed under a <a href=\"http://simile.mit.edu/license."
+"html\">BSD License</a>."
 
+# date format string as used in PHP's strftime():
+# http://php.net/strftime
 #. date format string as used in PHP's strftime():
 #. http://php.net/strftime
 #: views/elements/collections_interactive_addon.thtml:85
-#: views/elements/amo2009/addon_version_detail.thtml:53
-#: views/elements/amo2009/homepage_addon.thtml:115
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:124 views/elements/feature.thtml:106
-#: views/collections/detail.thtml:118 views/collections/edit.thtml:325
-#: views/users/info.thtml:76 views/editors/reviews_queue.thtml:57
+#: views/elements/addon_listitem.thtml:140 views/elements/feature.thtml:112
+#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
 #: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:208 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
 #: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:104 views/addons/display.thtml:356
-#: views/addons/browse_thumbs.thtml:75 views/reviews/add.thtml:63
-#: views/reviews/display.thtml:74 views/reviews/display.thtml:160
-#: views/reviews/delete.thtml:54 controllers/statistics_controller.php:244
-#: controllers/collections_controller.php:1047
+#: views/addons/display.thtml:128 views/addons/display.thtml:310
+#: views/addons/display.thtml:314 views/addons/browse_thumbs.thtml:89
+#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/reviews/display.thtml:77 views/reviews/display.thtml:164
+#: views/reviews/delete.thtml:49 controllers/statistics_controller.php:220
 msgid "date"
 msgstr "%Y 年 %m 月 %e 日"
 
+# date and time format string (strftime)
 #. date and time format string (strftime)
 #. http://php.net/strftime
 #: views/elements/addon_version_detail.thtml:53
@@ -2310,29 +1299,44 @@ msgstr "統計資訊顯示�"
 #. %1$s is a filename, e.g. "foo.txt"
 #. %2$s is the extension, e.g. ".txt"
 #. %3$s is a list of valid extensions, like ".png, .jpg, .gif"
-#: controllers/developers_controller.php:1361
+#: controllers/developers_controller.php:1288
+#, fuzzy
 msgid "devcp_add_previews_extension_error"
-msgstr "檔案 %1$s 包�無效的副檔�（%2$s）。�許的副檔�： %3$s"
+msgstr "File %1$s has an invalid extension (%2$s). Allowed extensions: %3$s"
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1394
+#: controllers/developers_controller.php:1321
+#, fuzzy
 msgid "devcp_add_previews_save_error"
-msgstr "檔案 %s �能儲存到資料庫。請�試一次。"
+msgstr "File %s could not be saved to the database. Please try again."
 
 #. %1$s is the preview ID number, %2$s is the filename.
-#: controllers/developers_controller.php:1389
+#: controllers/developers_controller.php:1316
+#, fuzzy
 msgid "devcp_add_previews_success_replace"
-msgstr "已�功使用 %2$s �代�覽圖片 %1$s。"
+msgstr "Preview %1$s was replaced with file %2$s successfully."
 
 #. %s is the filename.
-#: controllers/developers_controller.php:1391
+#: controllers/developers_controller.php:1318
+#, fuzzy
 msgid "devcp_add_previews_success_upload"
-msgstr "檔案 %s 上傳�功。您�以在下�加入說明。"
+msgstr "File %s was uploaded successfully. You can add a caption below."
 
 #: controllers/components/developers.php:1163
 msgid "devcp_additem_addontype_autodetect"
 msgstr "（自動�測）"
 
+#. %1$s is a version.  Example:  3.0
+#. %2$s is a URL
+#: views/developers/add_step3.thtml:60
+#, php-format
+msgid "devcp_additem_firefox_notice"
+msgstr ""
+"此附加元件版本指出與 Firefox %1$s �相容。Mozilla 備�期待的 Firefox 下個新版"
+"本很快就�發行，所以請測試一下您的元件在新版 Firefox 上��正常�作，並更新相"
+"容性資訊。您�以連到 <a href=\"%2$s\">這裡</a> 找到更多資訊。這�是一份通知，"
+"您還是�以繼續上傳此版本到 addons.mozilla.org 上。"
+
 #: views/elements/developers/additem.thtml:76
 msgid "devcp_additem_linktitle_opensin_newwindow"
 msgstr "用新視窗開啟"
@@ -2369,777 +1373,1380 @@ msgstr "步驟 5：完�"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "上傳說明"
 
+#: controllers/developers_controller.php:2746
+msgid "devcp_addon_disabled_successfully"
+msgstr "�用附加元件�功"
+
+#: controllers/developers_controller.php:2368
+#: controllers/developers_controller.php:2369
+msgid "devcp_addon_edit_pagetitle"
+msgstr "編輯附加元件"
+
+#: controllers/developers_controller.php:2741
+msgid "devcp_addon_enabled_successfully"
+msgstr "啟用附加元件�功"
+
+#: controllers/developers_controller.php:2281
+#: controllers/developers_controller.php:2569
+msgid "devcp_addon_field_description_displaytitle"
+msgstr "附加元件敘述"
+
+#: controllers/developers_controller.php:2291
+#: controllers/developers_controller.php:2579
+msgid "devcp_addon_field_eula_displaytitle"
+msgstr "授權�約"
+
+#: controllers/developers_controller.php:2261
+#: controllers/developers_controller.php:2531
+msgid "devcp_addon_field_homepage_displaytitle"
+msgstr "附加元件首�"
+
+#: controllers/developers_controller.php:2254
+#: controllers/developers_controller.php:2524
+msgid "devcp_addon_field_name_displaytitle"
+msgstr "附加元件�稱"
+
 #: controllers/previews_controller.php:168
 #: controllers/previews_controller.php:277
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "�覽圖片說明"
 
-#: views/developers/addon_status.thtml:177
-msgid "devcp_addon_status_action_activate"
-msgstr "設為「活動中�"
+#: controllers/developers_controller.php:2301
+#: controllers/developers_controller.php:2589
+msgid "devcp_addon_field_privacy_displaytitle"
+msgstr "隱�政策"
+
+#: controllers/developers_controller.php:2270
+#: controllers/developers_controller.php:2558
+msgid "devcp_addon_field_summary_displaytitle"
+msgstr "附加元件摘�"
+
+#: controllers/developers_controller.php:2540
+msgid "devcp_addon_field_supportemail_displaytitle"
+msgstr "技術支� Email ��"
+
+#: controllers/developers_controller.php:2549
+msgid "devcp_addon_field_supporturl_displaytitle"
+msgstr "技術支�網�"
+
+#: controllers/developers_controller.php:2311
+#: controllers/developers_controller.php:2696
+msgid "devcp_addon_field_versionnotes_displaytitle"
+msgstr "版本資訊"
+
+#: controllers/developers_controller.php:2768
+#: controllers/developers_controller.php:2769
+msgid "devcp_addon_nominate_pagetitle"
+msgstr "�交批准附加元件"
+
+#: controllers/developers_controller.php:2814
+msgid "devcp_addon_nominated_successfully"
+msgstr "附加元件�交批准�功�"
 
 #: views/developers/addon_status.thtml:178
+#, fuzzy
+msgid "devcp_addon_status_action_activate"
+msgstr "Make Active"
+
+#: views/developers/addon_status.thtml:179
+#, fuzzy
 msgid "devcp_addon_status_action_activate_description"
-msgstr "將您的附加元件設為活動中，以顯示在公開列表，並啟動更新檢查�務。"
+msgstr ""
+"Make your add-on active for it to show up in public listings and enable the "
+"update check service."
 
-#: views/developers/addon_status.thtml:135
+#: views/developers/addon_status.thtml:136
+#, fuzzy
 msgid "devcp_addon_status_action_complete"
-msgstr "完�元件"
+msgstr "Complete Add-on"
 
-#: views/developers/addon_status.thtml:136
+#: views/developers/addon_status.thtml:137
+#, fuzzy
 msgid "devcp_addon_status_action_complete_description"
-msgstr "完�您的元件並移到「沙箱��"
+msgstr "Complete your add-on and move to the Sandbox"
 
-#: views/developers/addon_status.thtml:181
+#: views/developers/addon_status.thtml:182
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate"
-msgstr "設為「�活動中�"
+msgstr "Make Inactive"
 
-#: views/developers/addon_status.thtml:182
+#: views/developers/addon_status.thtml:183
+#, fuzzy
 msgid "devcp_addon_status_action_deactivate_description"
-msgstr "將您的附加元件設為�活動中，以從公開列表裡隱�，並�消更新檢查�務。"
+msgstr ""
+"Make your add-on inactive to hide it from all public listings and disable "
+"the update check service."
 
-#: views/developers/addon_status.thtml:143
+#: views/developers/addon_status.thtml:144
+#, fuzzy
 msgid "devcp_addon_status_action_move"
-msgstr "移至「沙箱��"
+msgstr "Move to Sandbox"
 
-#: views/developers/addon_status.thtml:144
+#: views/developers/addon_status.thtml:145
+#, fuzzy
 msgid "devcp_addon_status_action_move_description"
-msgstr "將您的元件移回「沙箱��。這個動作是�以撤銷的。"
+msgstr "Move your add-on back to the Sandbox. This is reversible."
 
-#: views/developers/addon_status.thtml:139
+#: views/developers/addon_status.thtml:140
+#, fuzzy
 msgid "devcp_addon_status_action_nominate"
-msgstr "�交批准"
+msgstr "Nominate for Public"
 
-#: views/developers/addon_status.thtml:140
+#: views/developers/addon_status.thtml:141
+#, fuzzy
 msgid "devcp_addon_status_action_nominate_description"
-msgstr "將你的元件�交批准至「公開��"
+msgstr "Nominate your add-on to become Public"
 
-#: views/developers/addon_status.thtml:147
+#: views/developers/addon_status.thtml:148
+#, fuzzy
 msgid "devcp_addon_status_action_public"
-msgstr "設為「公開�"
+msgstr "Make Public"
 
-#: views/developers/addon_status.thtml:148
+#: views/developers/addon_status.thtml:149
+#, fuzzy
 msgid "devcp_addon_status_action_public_description"
-msgstr "�次公開您的元件。"
+msgstr "Make your add-on Public again."
 
-#: views/developers/addon_status.thtml:169
+#: views/developers/addon_status.thtml:170
+#, fuzzy
 msgid "devcp_addon_status_active"
 msgstr ""
-"您的元件目�為「<span class=\"inactive-0\">活動中</span>�。這表示元件會出�在"
-"所有與以上狀態相符的列表中。"
+"Your add-on is <span class=\"inactive-0\">Active</span>. This means your add-"
+"on is showing up in all available listings appropriate for its status above."
 
 #: views/developers/addon_status.thtml:111
+#, fuzzy
 msgid "devcp_addon_status_completion_disabled"
 msgstr ""
-"在完�您的附加元件並將其移至「<span class=\"status-1\">沙箱</span>���，請先"
-"��上述標準。"
+"Please fulfill the criteria above before you can complete your add-on and "
+"move it to the <span class=\"status-1\">Sandbox</span>."
 
 #: views/developers/addon_status.thtml:108
+#, fuzzy
 msgid "devcp_addon_status_completion_enabled"
 msgstr ""
-"您�在�以按下�的按鈕，完�您的元件並將其�至「<span class=\"status-1\">沙箱"
-"</span>��。"
+"You may now complete your add-on and move it to the <span class=\"status-1"
+"\">Sandbox</span> by clicking the button below."
 
 #: views/developers/addon_status.thtml:102
+#, fuzzy
 msgid "devcp_addon_status_criteria_category"
-msgstr "至少��擇一個分類"
+msgstr "At least one category selected"
 
 #: views/developers/addon_status.thtml:101
+#, fuzzy
 msgid "devcp_addon_status_criteria_description"
-msgstr "需�附加元件敘述"
+msgstr "Add-on Description required"
 
 #: views/developers/addon_status.thtml:99
+#, fuzzy
 msgid "devcp_addon_status_criteria_name"
-msgstr "需�元件�稱"
+msgstr "Add-on Name required"
 
-#: views/developers/addon_status.thtml:120
+#: views/developers/addon_status.thtml:121
+#, fuzzy
 msgid "devcp_addon_status_criteria_prerelease"
-msgstr "元件�得被標示為發行�版本（Pre-release）。"
+msgstr "Add-on is not marked as pre-release."
 
 #: views/developers/addon_status.thtml:119
+#, fuzzy
 msgid "devcp_addon_status_criteria_preview"
-msgstr "擴充套件和佈景主題至少�有一張�覽圖片。"
+msgstr "At least one preview image required for extensions and themes."
+
+#: views/developers/addon_status.thtml:120
+#, fuzzy
+msgid "devcp_addon_status_criteria_review"
+msgstr "Several user reviews of the add-on (may be external reviews)."
 
 #: views/developers/addon_status.thtml:100
+#, fuzzy
 msgid "devcp_addon_status_criteria_summary"
-msgstr "需�附加元件摘�"
+msgstr "Add-on Summary required"
 
 #. %s is the status in a span, e.g. "<span>_('Public')</span>".
 #: views/developers/addon_status.thtml:58
+#, fuzzy
 msgid "devcp_addon_status_header"
-msgstr "元件狀態： %s"
+msgstr "Add-on Status: %s"
 
-#: views/developers/addon_status.thtml:152
-#: views/developers/addon_status.thtml:173
+#: views/developers/addon_status.thtml:153
+#: views/developers/addon_status.thtml:174
+#, fuzzy
 msgid "devcp_addon_status_header_actions"
-msgstr "�進行的�作"
+msgstr "Available Actions"
 
-#: views/developers/addon_status.thtml:168
+#: views/developers/addon_status.thtml:169
+#, fuzzy
 msgid "devcp_addon_status_header_active"
-msgstr "活動狀態: <span class=\"inactive-0\">活動中</span>"
+msgstr "Active Status: <span class=\"inactive-0\">Active</span>"
 
 #: views/developers/addon_status.thtml:97
+#, fuzzy
 msgid "devcp_addon_status_header_criteria"
-msgstr "元件完�標準"
+msgstr "Add-on Completion Criteria"
 
-#: views/developers/addon_status.thtml:164
+#: views/developers/addon_status.thtml:165
+#, fuzzy
 msgid "devcp_addon_status_header_inactive"
-msgstr "活動狀態: <span class=\"inactive-1\">�活動中</span>"
+msgstr "Active Status: <span class=\"inactive-1\">Inactive</span>"
 
 #: views/developers/addon_status.thtml:117
+#, fuzzy
 msgid "devcp_addon_status_header_nomination"
-msgstr "公開批准標準"
+msgstr "Public Nomination Criteria"
 
-#: views/developers/addon_status.thtml:190
+#: views/developers/addon_status.thtml:191
+#, fuzzy
 msgid "devcp_addon_status_header_trusted"
-msgstr "信任狀態: <span class=\"status-4\">�信任的</span>"
+msgstr "Trusted Status: <span class=\"status-4\">Trusted</span>"
 
-#: views/developers/addon_status.thtml:165
+#: views/developers/addon_status.thtml:166
+#, fuzzy
 msgid "devcp_addon_status_inactive"
 msgstr ""
-"您的元件目�為「<span class=\"inactive-1\">�活動中</span>�。這表示無論以上狀"
-"態為何，元件都�會出�在任何列表中。更新檢查�務將<b>�會</b>�您的元件�供更"
-"新。"
+"Your add-on is <span class=\"inactive-1\">Inactive</span>. This means your "
+"add-on will not show up in any listing, regardless of its status above. "
+"Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
-#: views/developers/addon_status.thtml:128
+#: views/developers/addon_status.thtml:129
+#, fuzzy
 msgid "devcp_addon_status_nominate_disabled"
 msgstr ""
-"在將您的附加元件��至「<span class=\"status-4\">公開</span>��，請先��上述"
-"標準。"
+"Please fulfill the criteria above before nominating your add-on to become "
+"<span class=\"status-4\">Public</span>."
 
-#: views/developers/addon_status.thtml:125
+#: views/developers/addon_status.thtml:126
+#, fuzzy
 msgid "devcp_addon_status_nominate_enabled"
 msgstr ""
-"您�在�以按下�的按鈕，將元件�交批准至「<span class=\"status-4\">公開</"
-"span>��。"
+"You may now nominate your add-on for <span class=\"status-4\">Public</span> "
+"by clicking the button below."
 
 #: views/developers/addon_status.thtml:64
+#, fuzzy
 msgid "devcp_addon_status_public"
-msgstr "「公開��"
+msgstr "Public"
 
 #: views/developers/addon_status.thtml:63
+#, fuzzy
 msgid "devcp_addon_status_sandbox"
-msgstr "「沙箱��"
+msgstr "Sandbox"
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:89
+#, fuzzy
 msgid "devcp_addon_status_switch_disabled"
 msgstr ""
-"您的附加元件被管�員<span class=\"status-5\">�用</span>而無法使用。如果您有任"
-"何�題，請寄� Email 到 %s。"
+"Your add-on was <span class=\"status-5\">Disabled</span> by an administrator "
+"and cannot be used. If you have any questions, please e-mail %s."
 
 #: views/developers/addon_status.thtml:67
+#, fuzzy
 msgid "devcp_addon_status_switch_incomplete"
 msgstr ""
-"您的元件目�為「<span class=\"status-0\">未完�</span>�。這表示元件將�會出�"
-"於網站的任何�置或更新檢查�務中。當您的元件��以下標準，而�以完�並移至"
-"「<span class=\"status-1\">沙箱</span>��時，您�以�造訪這個��以完�元件。"
+"Your add-on is currently <span class=\"status-0\">Incomplete</span>. This "
+"means your add-on is not showing up on any portion of the site or update "
+"check service. You may come to this page to complete your add-on after it "
+"meets the criteria below for completion and transfer to the <span class="
+"\"status-1\">Sandbox</span>."
 
 #. %s is a number, perhaps 42.
 #: views/developers/addon_status.thtml:77
+#, fuzzy
 msgid "devcp_addon_status_switch_nominated"
 msgstr ""
-"您的元件目�已�交批准以�往「<span class=\"status-4\">公開</span>��，正在等"
-"待審核者批准。目�有 %s 個其他元件正在排隊。"
+"Your add-on is currently nominated to become <span class=\"status-4"
+"\">Public</span> and is awaiting editor review. There are currently %s other "
+"add-ons in the nomination queue."
 
 #. %s is an email address.
 #: views/developers/addon_status.thtml:81
+#, fuzzy
 msgid "devcp_addon_status_switch_pending"
 msgstr ""
-"您的附加元件目�被擱置，這�是正常�象。請寄� Email 到 %s ，附上您的元件 ID "
-"並��這個錯誤。"
+"Your add-on is pending. This shouldn't have happened. Please e-mail %s with "
+"your add-on ID and state this error."
 
 #: views/developers/addon_status.thtml:85
+#, fuzzy
 msgid "devcp_addon_status_switch_public"
 msgstr ""
-"您的元件目�為「<span class=\"status-4\">公開</span>�。這表示元件會出�在所有"
-"列表和�尋中，且�以���制地被下載。更新檢查�務會�您的元件�供更新。"
+"Your add-on is <span class=\"status-4\">Public</span>, which means it will "
+"show up in all listings and searches and can be downloaded without "
+"restriction. Updates are being provided to your add-on through the update "
+"check service."
 
 #: views/developers/addon_status.thtml:71
 #: views/developers/addon_status.thtml:75
+#, fuzzy
 msgid "devcp_addon_status_switch_sandbox"
 msgstr ""
-"您的元件在「<span class=\"status-1\">沙箱</span>��，這表示它會出�在列表和�"
-"尋中，但使用者必須先登入�能下載。更新檢查�務將<b>�會</b>�您的元件�供更"
-"新。"
+"Your add-on is in the <span class=\"status-1\">Sandbox</span>, which means "
+"it will show up in listings and searches, but users must log in to download "
+"it. Updates are <b>not</b> being provided to your add-on through the update "
+"check service."
 
 #. %s is the add-on name.
 #: views/developers/addon_status_nominate.thtml:43
 #: views/developers/addon_status_confirm.thtml:43
 #: views/developers/addon_status.thtml:43
+#, fuzzy
 msgid "devcp_addon_status_title"
-msgstr "%s 狀態"
+msgstr "%s Status"
 
-#: views/developers/addon_status.thtml:191
+#: views/developers/addon_status.thtml:192
+#, fuzzy
 msgid "devcp_addon_status_trusted"
 msgstr ""
-"您的附加元件目�為「<span class=\"status-4\">�信任的</span>�。這表示您�需�"
-"編輯者的審核就�以上傳更新。"
+"Your add-on is <span class=\"status-4\">Trusted</span>. This means you can "
+"submit updates to your add-on without editor review."
+
+# %1 is the addon edit link
+# %2 is the main dev CP link
+#. %1 is the add-on edit link
+#. %2 is the main dev CP link
+#: views/developers/add_step5.thtml:76
+#, php-format
+msgid "devcp_addon_submission_makechanges"
+msgstr "請到 %1$s ��變更您的上傳資訊，或 %2$s 回到開發者工具首�。"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_devcp_link"
+msgstr "按這裡"
+
+#: views/developers/add_step5.thtml:76
+msgid "devcp_addon_submission_makechanges_link"
+msgstr "編輯附加元件"
+
+#: views/developers/add_step5.thtml:57
+msgid "devcp_addon_submission_pending"
+msgstr ""
+"這個版本會暫時放在「沙箱��等待測試者� Mozilla 附加元件的審核者審核，當審核"
+"通�時您會收到 Email 通知。"
+
+# %1 is the link to the sandbox information page
+#. %1 is the link to the sandbox information page
+#: views/developers/add_step5.thtml:63
+#, php-format
+msgid "devcp_addon_submission_sandbox_readmore"
+msgstr "請連到 %s 了解更多沙箱審核系統的說明。"
+
+#: views/developers/add_step5.thtml:63
+msgid "devcp_addon_submission_sandbox_readmore_link"
+msgstr "這裡"
+
+# %1 is the "nominate" link
+#. %1 is the "nominate" link
+#: views/developers/add_step5.thtml:60
+#, php-format
+msgid "devcp_addon_submission_sandboxed"
+msgstr ""
+"這個版本會放在「沙箱��供進階使用者使用，如果您�將它放上「公開��則必須先 "
+"%s 以通�審核�程。"
+
+#: views/developers/add_step5.thtml:60
+msgid "devcp_addon_submission_sandboxed_nominate_link"
+msgstr "�交批准"
+
+#: views/developers/add_step5.thtml:51
+msgid "devcp_addon_submission_success"
+msgstr "您的附加元件上傳已完�。"
+
+#: views/developers/add_step5.thtml:54
+msgid "devcp_addon_submission_trusted_public"
+msgstr "因為您的附加元件已�信任，此版本將自動��並�到「公開��。"
+
+#: controllers/developers_controller.php:1560
+#: controllers/developers_controller.php:1561
+msgid "devcp_addon_submit_pagetitle"
+msgstr "上傳附加元件"
+
+#: controllers/developers_controller.php:2460
+msgid "devcp_addon_updated_successfully"
+msgstr "附加元件更新�功"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:71
+#, php-format
+msgid "devcp_addon_upload_preview"
+msgstr "%s 能讓使用者�此附加元件更有興趣。"
+
+#: views/developers/add_step5.thtml:71
+msgid "devcp_addon_upload_preview_link"
+msgstr "上傳�覽圖片"
+
+# #1 is the author email
+#. #1 is the author email
+#: views/developers/author_lookup.thtml:41
+#, php-format
+msgid "devcp_author_lookup_none_found"
+msgstr "找�到作者 [%s]"
+
+#: views/developers/author_lookup.thtml:44
+msgid "devcp_author_lookup_remove"
+msgstr "移除"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel"
+msgstr "�消"
+
+#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
+#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+msgid "devcp_button_cancel_confirm"
+msgstr "您確定��消上傳嗎？"
+
+#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
+#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+msgid "devcp_button_next"
+msgstr "下一步"
+
+#: views/developers/add_step2.thtml:66
+msgid "devcp_change_addontype"
+msgstr "變更附加元件種類："
+
+#: controllers/developers_controller.php:1487
+msgid "devcp_comments_updated"
+msgstr "開發者留言已更新。"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_active"
-msgstr "活動中"
+msgstr "Active"
 
 #. %1$s is the add-on type string
 #. %2$s is Inactive or Active in a <span>
 #. %3$s is the addon's public status (Public, In Sandbox, ...) in a <span>
 #: views/developers/dashboard.thtml:69
+#, fuzzy
 msgid "devcp_dashboard_addontype_status"
-msgstr "%1$s目�%2$s且%3$s"
+msgstr "%1$s currenty %2$s and %3$s"
 
 #: views/developers/dashboard.thtml:67
+#, fuzzy
 msgid "devcp_dashboard_change_status"
-msgstr "變更狀態"
+msgstr "Change Status"
 
 #. %s is the addons email address.
 #: views/developers/dashboard.thtml:99
+#, fuzzy
 msgid "devcp_dashboard_disabled_questions"
 msgstr ""
-"您的附加元件被管�員�用而無法使用。如果您有任何�題，請寄� Email 到 %s。"
+"Your add-on was disabled by an administrator and cannot be used.  If you "
+"have any questions, please email %s."
 
 #. %s is the (localized) add-on status string in a span, e.g. "Disabled"
 #: views/developers/dashboard.thtml:98
+#, fuzzy
 msgid "devcp_dashboard_disabled_status"
-msgstr "元件狀態： %s"
+msgstr "Add-on Status: %s"
 
 #: views/developers/dashboard.thtml:43
+#, fuzzy
 msgid "devcp_dashboard_header_main"
-msgstr "開發者資訊顯示�"
+msgstr "Developer Dashboard"
 
 #: views/developers/dashboard.thtml:110
+#, fuzzy
 msgid "devcp_dashboard_header_welcome"
-msgstr "歡迎來到開發者資訊顯示�"
+msgstr "Welcome to the Developer Dashboard"
 
 #: views/developers/dashboard.thtml:68
+#, fuzzy
 msgid "devcp_dashboard_inactive"
-msgstr "�活動中"
+msgstr "Inactive"
 
 #. %s is a date in the _('date') format
 #: views/developers/dashboard.thtml:65
+#, fuzzy
 msgid "devcp_dashboard_last_edited"
-msgstr "最後一次編輯於 %s"
+msgstr "Last edited on %s"
 
 #: views/developers/dashboard.thtml:111
+#, fuzzy
 msgid "devcp_dashboard_learn"
 msgstr ""
-"您目�沒有任何放在 Mozilla 附加元件網站的元件。按下�的「開始�以瞭解這個�程"
-"並�出您的第一個元件。"
+"You don't currently have any add-ons hosted on Mozilla Add-ons. To learn how "
+"the process works and submit your first add-on, click Get Started below."
 
 #: views/developers/dashboard.thtml:112
+#, fuzzy
 msgid "devcp_dashboard_start"
-msgstr "開始"
+msgstr "Get Started"
 
 #: views/developers/dashboard.thtml:82
+#, fuzzy
 msgid "devcp_dashboard_versions"
-msgstr "版本與檔案"
+msgstr "Versions and Files"
 
 #: views/developers/dashboard.thtml:91
+#, fuzzy
 msgid "devcp_dashboard_versions_new"
-msgstr "上傳新版本"
+msgstr "Upload a new version"
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1415
+#: controllers/developers_controller.php:1342
+#, fuzzy
 msgid "devcp_delete_previews_error"
-msgstr "無法從資料庫刪除�覽圖片 %s，請�試一次。"
+msgstr "Preview %s could not be deleted from the database. Please try again."
 
 #. %s is the preview ID number.
-#: controllers/developers_controller.php:1413
+#: controllers/developers_controller.php:1340
+#, fuzzy
 msgid "devcp_delete_previews_success"
-msgstr "已�功刪除�覽圖片 %s。"
+msgstr "Preview %s has been deleted successfully."
 
-#: controllers/developers_controller.php:1089
+#: controllers/developers_controller.php:1032
+#, fuzzy
 msgid "devcp_delete_version_priv_error"
-msgstr "您沒有刪除版本或檔案的權�。"
+msgstr "You do not have privileges to delete versions or files."
 
 #. %1$s is the count of files, a number
 #. %2$s is a status string like _('Public') or _('Incomplete')
-#: controllers/components/amo.php:549
+#: controllers/components/amo.php:548
+#, fuzzy
 msgid "devcp_describe_version_status"
 msgid_plural "devcp_describe_version_status"
-msgstr[0] "%1$s 個%2$s的檔案"
+msgstr[0] "%1$s %2$s file"
+msgstr[1] "%1$s %2$s files"
+
+#: views/developers/details.thtml:120
+msgid "devcp_details_addpreview_link"
+msgstr "新增�覽圖片"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_author"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors"
+msgstr "作者"
+
+#: views/developers/details.thtml:68
+msgid "devcp_details_authors_none"
+msgstr "ç„¡"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_categories"
+msgstr "分類"
+
+#: views/developers/details.thtml:73
+msgid "devcp_details_category"
+msgstr "分類"
+
+#: views/developers/details.thtml:74
+msgid "devcp_details_description"
+msgstr "敘述"
+
+#: views/developers/details.thtml:67
+msgid "devcp_details_disabled"
+msgstr "已�用"
+
+#: views/developers/details.thtml:69
+msgid "devcp_details_guid"
+msgstr "GUID"
+
+#: views/developers/details.thtml:63
+msgid "devcp_details_header_details"
+msgstr "詳細資訊"
+
+#: views/developers/details.thtml:125
+msgid "devcp_details_header_devcomments"
+msgstr "開發者留言"
+
+#: views/developers/details.thtml:102
+msgid "devcp_details_header_previews"
+msgstr "�覽圖片"
+
+#: views/developers/details.thtml:79
+msgid "devcp_details_header_versions"
+msgstr "版本"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage"
+msgstr "首�"
+
+#: views/developers/details.thtml:70
+msgid "devcp_details_homepage_none"
+msgstr "ç„¡"
+
+#: views/developers/details.thtml:109
+msgid "devcp_details_preview_nocaption"
+msgstr "無說明"
+
+#: views/developers/details.thtml:117
+msgid "devcp_details_previews_nonefound"
+msgstr "找�到�覽圖片。"
+
+#: views/developers/details.thtml:151
+msgid "devcp_details_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail"
+msgstr "技術支� Email"
+
+#: views/developers/details.thtml:71
+msgid "devcp_details_supportemail_none"
+msgstr "開發者沒有�供技術支� Email。"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl"
+msgstr "技術支�網�"
+
+#: views/developers/details.thtml:72
+msgid "devcp_details_supporturl_none"
+msgstr "開發者沒有�供技術支�網�。"
+
+#: views/developers/details.thtml:66
+msgid "devcp_details_trusted"
+msgstr "已�信任"
 
 #. %s is a version number.  Example:  3.0
-#: views/developers/versions.thtml:65
+#: views/developers/details.thtml:84 views/developers/versions.thtml:65
 #, php-format
 msgid "devcp_details_version"
 msgstr "版本 %s"
 
+#: views/developers/details.thtml:98
+msgid "devcp_details_versions_none_found"
+msgstr "找�到版本。"
+
+#: views/developers/disable.thtml:64
+msgid "devcp_disable_cancel"
+msgstr "�消並回上一�"
+
+#: views/developers/disable.thtml:60
+msgid "devcp_disable_disable_button"
+msgstr "是，�用此元件"
+
+#: views/developers/disable.thtml:58
+msgid "devcp_disable_disable_confirm"
+msgstr "您確定��用此附加元件嗎？"
+
+#: views/developers/disable.thtml:56
+msgid "devcp_disable_disable_description"
+msgstr ""
+"此元件被�用後，就無法被�尋或列在元件清單中，也無法被使用者下載或更新。事實"
+"上�用元件很�被刪除，但是您�以隨時回到這一��新啟用此元件。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:55
+#, php-format
+msgid "devcp_disable_disable_title"
+msgstr "�用 %s"
+
+#: views/developers/disable.thtml:53
+msgid "devcp_disable_enable_button"
+msgstr "是，啟用此元件"
+
+#: views/developers/disable.thtml:51
+msgid "devcp_disable_enable_confirm"
+msgstr "您確定�啟用此附加元件嗎？"
+
+#: views/developers/disable.thtml:49
+msgid "devcp_disable_enable_description"
+msgstr "啟用此元件就能�次被�尋或列在元件清單中，也能被使用者下載或更新。"
+
+#. %s is the name of an add-on
+#: views/developers/disable.thtml:48
+#, php-format
+msgid "devcp_disable_enable_title"
+msgstr "啟用 %s"
+
 #: views/developers/discuss.thtml:68
+#, fuzzy
 msgid "devcp_discuss_addreply_header"
-msgstr "新增回覆"
+msgstr "Add Reply"
 
 #: views/developers/discuss.thtml:57
+#, fuzzy
 msgid "devcp_discuss_allreplies_header"
-msgstr "回覆"
+msgstr "Replies"
 
 #. notice when an error occurs saving a discussion reply
 #. %1 is the email address (linked) for the amo-editors list
 #: views/developers/discuss.thtml:70
+#, fuzzy
 msgid "devcp_discuss_error_notice"
-msgstr "儲存您的回覆時發生了錯誤。關於此�題，請�繫 %1$s。"
+msgstr ""
+"There was an error saving your reply. Please contact %1$s about the issue."
 
 #. %1 is the add-on name, %2 is the add-on's version number currently being reviewed by an editor
 #: views/developers/discuss.thtml:46
+#, fuzzy
 msgid "devcp_discuss_intro"
-msgstr "一� Mozilla 元件審核者請求您的元件 %1$s 之 %2$s 版本的更多資訊。"
+msgstr ""
+"A Mozilla Add-ons Editor requested further information from you regarding "
+"version %2$s of your add-on %1$s."
 
 #. %1 is the add-on name
 #: views/developers/discuss.thtml:43
+#, fuzzy
 msgid "devcp_discuss_pagetitle"
-msgstr "�供�元件 %1$s 之�見的更多資訊"
+msgstr "Provide More Information For the Add-on Review of %1$s"
 
 #. submit button text
 #: views/developers/discuss.thtml:79
+#, fuzzy
 msgid "devcp_discuss_submit_reply"
-msgstr "�出回覆"
+msgstr "Submit Reply"
 
 #: views/developers/discuss.thtml:72
+#, fuzzy
 msgid "devcp_discuss_success_message"
-msgstr "已�功儲存您的回覆。此討論的其他�與者將收到 Email 通知。"
+msgstr ""
+"Your reply was successfully saved. The other participants of the discussion "
+"will be notified by email."
 
 #. in an author/editor discussion about an add-on to be reviewed:
 #. %1 is the commenter's user name (linked).
 #. %2 is the full date the comment was made.
 #: views/developers/discuss.thtml:52 views/developers/discuss.thtml:62
+#, fuzzy
 msgid "devcp_discuss_writtenby"
-msgstr "由 %1$s 撰寫於 %2$s"
+msgstr "written by %1$s on %2$s"
 
-#: views/developers/addon_edit_authors.thtml:72
-#: views/developers/addon_edit_authors.thtml:81
-msgid "devcp_edit_authors_add_author"
+#: views/developers/edit.thtml:65 views/developers/edit.thtml:71
+msgid "devcp_edit_author_add"
 msgstr "新增作者"
 
-#: views/developers/addon_edit_authors.thtml:96
+#: views/developers/edit.thtml:69
+msgid "devcp_edit_author_email"
+msgstr "作者 Email 地�"
+
+#: views/developers/edit.thtml:56
+msgid "devcp_edit_author_remove"
+msgstr "移除"
+
+#: views/developers/addon_edit_authors.thtml:71
+#: views/developers/addon_edit_authors.thtml:79
+#, fuzzy
+msgid "devcp_edit_authors_add_author"
+msgstr "Add New Author"
+
+#: views/developers/addon_edit_authors.thtml:94
+#, fuzzy
 msgid "devcp_edit_authors_add_author_button"
-msgstr "新增作者"
+msgstr "Add Author"
 
-#: views/developers/addon_edit_authors.thtml:83
+#: views/developers/addon_edit_authors.thtml:81
+#, fuzzy
 msgid "devcp_edit_authors_add_email"
-msgstr "作者帳號 Email："
+msgstr "Author Account Email:"
 
-#: views/developers/addon_edit_authors.thtml:98
+#: views/developers/addon_edit_authors.thtml:96
+#, fuzzy
 msgid "devcp_edit_authors_add_loading"
-msgstr "正在檢查帳號 Email…"
+msgstr "Checking account email..."
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_click_save"
-msgstr "按下�的「更新作者�按鈕以儲存。"
+msgstr "Click the Update Authors button below to save."
 
-#: views/developers/addon_edit_authors.thtml:58
+#: views/developers/addon_edit_authors.thtml:57
+#, fuzzy
 msgid "devcp_edit_authors_header_current"
-msgstr "目�作者"
+msgstr "Current Authors"
 
-#: views/developers/addon_edit_authors.thtml:50
+#: views/developers/addon_edit_authors.thtml:49
+#, fuzzy
 msgid "devcp_edit_authors_header_manage"
-msgstr "管�元件作者"
+msgstr "Manage Add-on Authors"
 
-#: views/developers/addon_edit_authors.thtml:93
+#: views/developers/addon_edit_authors.thtml:91
+#, fuzzy
 msgid "devcp_edit_authors_label_add_listed"
-msgstr "列為公開��上的作者"
+msgstr "List as author in pubilc display pages"
 
-#: views/developers/addon_edit_authors.thtml:89
+#: views/developers/addon_edit_authors.thtml:87
+#, fuzzy
 msgid "devcp_edit_authors_label_developer"
 msgstr ""
-"<strong>開發者</strong> - �以全�管�元件清單，新增和刪除其他作者除外。"
+"<strong>Developer</strong> - Can manage all aspects of the add-on listing, "
+"except for adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:88
+#: views/developers/addon_edit_authors.thtml:86
+#, fuzzy
 msgid "devcp_edit_authors_label_owner"
 msgstr ""
-"<strong>�有者</strong> - �以全�管�元件清單，包括新增和刪除其他作者。"
+"<strong>Owner</strong> - Can manage all aspects of the add-on listing, "
+"including adding and removing other authors."
 
-#: views/developers/addon_edit_authors.thtml:90
+#: views/developers/addon_edit_authors.thtml:88
+#, fuzzy
 msgid "devcp_edit_authors_label_viewer"
 msgstr ""
-"<strong>檢視者</strong> - �以檢視元件的開發者清單和統計資訊，但�能�任何更"
-"動。"
+"<strong>Viewer</strong> - Can view add-on developer listing and statistics, "
+"but can't make any changes."
 
 #. Placeholder for the empty option in a <select>.
 #: views/developers/addon_edit_categories.thtml:69
+#, fuzzy
 msgid "devcp_edit_authors_option_empty"
 msgstr "----------------"
 
-#: views/developers/addon_edit_authors.thtml:86
+#: views/developers/addon_edit_authors.thtml:84
+#, fuzzy
 msgid "devcp_edit_authors_select_role"
-msgstr "�擇作者的角色："
+msgstr "Select a role for the author:"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:62
+#: views/developers/addon_edit_authors.thtml:61
+#, fuzzy
 msgid "devcp_edit_authors_th_author"
-msgstr "作者"
+msgstr "Author"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:64
+#: views/developers/addon_edit_authors.thtml:63
+#, fuzzy
 msgid "devcp_edit_authors_th_listed"
-msgstr "列出"
+msgstr "Listed"
 
 #. Column name in a table.
-#: views/developers/addon_edit_authors.thtml:63
+#: views/developers/addon_edit_authors.thtml:62
+#, fuzzy
 msgid "devcp_edit_authors_th_role"
-msgstr "角色"
+msgstr "Role"
 
-#: views/developers/addon_edit_authors.thtml:77
+#: views/developers/addon_edit_authors.thtml:75
+#, fuzzy
 msgid "devcp_edit_authors_update_author"
-msgstr "更新作者"
+msgstr "Update authors"
 
 #: views/developers/addon_edit_categories.thtml:99
+#, fuzzy
 msgid "devcp_edit_categories_button_update"
-msgstr "更新分類"
+msgstr "Update Categories"
 
 #: views/developers/addon_edit_categories.thtml:88
+#, fuzzy
 msgid "devcp_edit_categories_does_not_fit"
-msgstr "沒有��我的元件的分類。"
+msgstr "My add-on doesn't fit into any available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:61
+#, fuzzy
 msgid "devcp_edit_categories_header_application"
-msgstr "%s 分類"
+msgstr "%s Categories"
 
 #: views/developers/addon_edit_categories.thtml:49
+#, fuzzy
 msgid "devcp_edit_categories_header_manage"
-msgstr "管�元件分類"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit_categories.thtml:91
+#, fuzzy
 msgid "devcp_edit_categories_hover"
-msgstr "將滑鼠游標移至分類上以觀看敘述。"
+msgstr "Hover over a category to see its description."
 
 #. %s is the category number (1, 2, 3).
 #: views/developers/addon_edit_categories.thtml:67
+#, fuzzy
 msgid "devcp_edit_categories_label_category_num"
-msgstr "分類 %s"
+msgstr "Category %s"
 
 #: views/developers/addon_edit_categories.thtml:94
 #: views/developers/addon_edit_categories.thtml:103
+#, fuzzy
 msgid "devcp_edit_categories_none_available"
-msgstr "沒有�用於此元件類型與應用程�的分類。"
+msgstr "No categories are available for this add-on type and application."
 
 #: views/developers/addon_edit_categories.thtml:86
+#, fuzzy
 msgid "devcp_edit_categories_other"
-msgstr "�有當您的元件�符�任何其他分類時，�將它放在這個分類。"
+msgstr ""
+"Place your add-on into this category only if it does not fit into any other "
+"available categories."
 
 #. %s is the application name (Firefox, Thunderbird).
 #: views/developers/addon_edit_categories.thtml:63
+#, fuzzy
 msgid "devcp_edit_categories_select_application_categories"
-msgstr "為您的元件�擇至多三個 %s 分類"
+msgstr "Select up to three %s categories for your add-on"
 
 #: views/developers/addon_edit.thtml:47
+#, fuzzy
 msgid "devcp_edit_dd_manage_authors"
-msgstr "新增或移除�以管�這個元件的使用者。"
+msgstr "Add or remove users that can manage this add-on."
 
 #: views/developers/addon_edit.thtml:49
+#, fuzzy
 msgid "devcp_edit_dd_manage_categories"
-msgstr "為元件支�的�個應用程��擇相關分類。"
+msgstr ""
+"Select the relevant categories for each application your add-on supports."
 
 #: views/developers/addon_edit.thtml:51
+#, fuzzy
 msgid "devcp_edit_dd_manage_description"
-msgstr "新增與修改您元件的摘��敘述�使用者授權�約與隱�政策之翻譯。"
+msgstr ""
+"Add and modify translations for your add-on's summary, description, end-user "
+"license, and privacy policy."
 
 #: views/developers/addon_edit.thtml:53
+#, fuzzy
 msgid "devcp_edit_dd_manage_properties"
-msgstr "變更您元件的�稱�首��圖示與其他註記。"
+msgstr "Change your add-on's name, homepage, icon, and other flags."
 
-#: views/developers/addon_edit_descriptions.thtml:116
+#: views/developers/addon_edit_descriptions.thtml:115
+#, fuzzy
 msgid "devcp_edit_description_button_update"
-msgstr "更新敘述"
+msgstr "Update Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:115
+#: views/developers/addon_edit_descriptions.thtml:114
+#, fuzzy
 msgid "devcp_edit_description_correct_error"
-msgstr "請修正上述以紅色標記的錯誤。"
+msgstr "Please correct the errors above indicated in red."
 
-#: views/developers/addon_edit_descriptions.thtml:51
+#: views/developers/addon_edit_descriptions.thtml:50
+#, fuzzy
 msgid "devcp_edit_descriptions_header"
-msgstr "編輯元件敘述"
+msgstr "Edit Add-on Descriptions"
 
-#: views/developers/addon_edit_descriptions.thtml:94
+#: views/developers/addon_edit_descriptions.thtml:93
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_description"
 msgstr ""
-"任何並���在元件摘�或敘述中��，但�能使用者會想知�的資訊。一般而言會包�"
-"已知的主�臭蟲清單�關於如何回報臭蟲的資訊�新版本�定釋出的日期等等。"
+"Any information end users may want to know that isn't necessarily applicable "
+"to the add-on summary or description. Common uses include listing known "
+"major bugs, information on how to report bugs, anticipated release date of a "
+"new version, etc."
 
-#: views/developers/addon_edit_descriptions.thtml:93
+#: views/developers/addon_edit_descriptions.thtml:92
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_comments_name"
-msgstr "開發者留言"
+msgstr "Developer Comments"
 
-#: views/developers/addon_edit_descriptions.thtml:86
+#: views/developers/addon_edit_descriptions.thtml:85
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_description"
 msgstr ""
-"您元件的敘述是�其特色�功能與其他相關資訊的較長說明。這會在元件��中摘�的下"
-"方顯示。"
+"The description of your add-on is a longer explanation of features, "
+"functionality, and other relevant information. It is displayed under the "
+"summary on the add-on's display page."
 
-#: views/developers/addon_edit_descriptions.thtml:85
+#: views/developers/addon_edit_descriptions.thtml:84
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_description_name"
-msgstr "附加元件敘述"
+msgstr "Add-on Description"
 
-#: views/developers/addon_edit_descriptions.thtml:103
+#: views/developers/addon_edit_descriptions.thtml:102
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_description"
 msgstr ""
-"如果您的元件具有「使用者授權�約�（EULA），請將其內文輸入於下方。如此一來，使"
-"用者必須��該內容後�能安�您的元件。請注� EULA 和 GPL 或 MPL 等程�碼授權是"
-"�一樣的。"
+"If your add-on has an End-User License Agreement (EULA), please enter its "
+"text below. If set below, users will be required to agree to this before "
+"installing your add-on. Please note that a EULA is not the same as a code "
+"license such as GPL or MPL."
 
-#: views/developers/addon_edit_descriptions.thtml:102
+#: views/developers/addon_edit_descriptions.thtml:101
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_eula_name"
-msgstr "使用者授權�約"
+msgstr "End-User License Agreement"
 
-#: views/developers/addon_edit_descriptions.thtml:112
+#: views/developers/addon_edit_descriptions.thtml:111
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_description"
 msgstr ""
-"如果您的元件有自己的隱�政策，請在此輸入其文字。您元件的顯示��將顯示該隱�政"
-"策的��。"
+"If your add-on has a privacy policy, enter its text here. Your add-on's "
+"display page will display a link to the policy."
 
-#: views/developers/addon_edit_descriptions.thtml:111
+#: views/developers/addon_edit_descriptions.thtml:110
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_privacy_name"
-msgstr "隱�政策"
+msgstr "Privacy Policy"
 
-#: views/developers/addon_edit_descriptions.thtml:78
+#: views/developers/addon_edit_descriptions.thtml:77
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_description"
 msgstr ""
-"摘�是�您元件基本功能的簡短說明，會顯示於�尋與�覽的清單，以�元件顯示��的"
-"頂端。 <strong>長度以 250 個字元為�。</strong>"
+"The summary is a short explanation of your add-on's basic functionality that "
+"is displayed in search and browse listings, as well as at the top of your "
+"add-on's display page. <strong>Limit of 250 characters.</strong>"
 
-#: views/developers/addon_edit_descriptions.thtml:77
+#: views/developers/addon_edit_descriptions.thtml:76
+#, fuzzy
 msgid "devcp_edit_descriptions_transbox_summary_name"
-msgstr "附加元件摘�"
+msgstr "Add-on Summary"
 
 #: views/developers/addon_edit.thtml:46
+#, fuzzy
 msgid "devcp_edit_dt_manage_authors"
-msgstr "管�元件作者"
+msgstr "Manage Add-on Authors"
 
 #: views/developers/addon_edit.thtml:48
+#, fuzzy
 msgid "devcp_edit_dt_manage_categories"
-msgstr "管�元件分類"
+msgstr "Manage Add-on Categories"
 
 #: views/developers/addon_edit.thtml:50
+#, fuzzy
 msgid "devcp_edit_dt_manage_descriptions"
-msgstr "管�元件敘述"
+msgstr "Manage Add-on Descriptions"
 
 #: views/developers/addon_edit.thtml:52
+#, fuzzy
 msgid "devcp_edit_dt_manage_properties"
-msgstr "管�元件屬性"
+msgstr "Manage Add-on Properties"
+
+#: views/developers/edit.thtml:77
+msgid "devcp_edit_error_categories_unavailable"
+msgstr "沒有此種類能用的分類。"
+
+#: controllers/developers_controller.php:2419
+#, fuzzy
+msgid "devcp_edit_file_error_incomplete"
+msgstr "Incomplete transfer"
+
+#: controllers/developers_controller.php:2420
+#, fuzzy
+msgid "devcp_edit_file_error_no"
+msgstr "No file uploaded"
+
+#: controllers/developers_controller.php:2417
+#: controllers/developers_controller.php:2418
+#, fuzzy
+msgid "devcp_edit_file_error_size"
+msgstr "Exceeds maximum upload size"
+
+#: views/developers/edit.thtml:51
+msgid "devcp_edit_header_authors"
+msgstr "作者"
 
-#: views/developers/addon_edit_properties.thtml:170
+#: views/developers/edit.thtml:99
+msgid "devcp_edit_icon_add_link"
+msgstr "新增圖示"
+
+#: views/developers/edit.thtml:96
+msgid "devcp_edit_icon_change_link"
+msgstr "變更圖示"
+
+#: views/developers/edit.thtml:131
+msgid "devcp_edit_label_allow_viewsource"
+msgstr "�許使用者線上檢視原始碼"
+
+#: views/developers/edit.thtml:75
+msgid "devcp_edit_label_categories"
+msgstr "分類"
+
+#: views/developers/edit.thtml:81
+msgid "devcp_edit_label_defaultlocale"
+msgstr "�設語言"
+
+#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/edit.thtml:143
 msgid "devcp_edit_label_externalsoftware"
 msgstr "需�外部軟體支�"
 
-#: views/developers/addon_edit_properties.thtml:205
+#: views/developers/edit.thtml:110
+msgid "devcp_edit_label_icon_delete"
+msgstr "�清除�存的圖示"
+
+#: views/developers/edit.thtml:104
+msgid "devcp_edit_label_icon_new"
+msgstr "新圖示檔案"
+
+#: views/developers/edit.thtml:92
+msgid "devcp_edit_label_info"
+msgstr "圖示"
+
+#: views/developers/addon_edit_properties.thtml:204
+#: views/developers/edit.thtml:124
 msgid "devcp_edit_label_locale_disambiguation"
 msgstr "�外語言資訊"
 
-#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/edit.thtml:135
 msgid "devcp_edit_label_prerelease"
-msgstr "這是一個發行�版本（Pre-release）"
+msgstr "發行�版本 (Pre-Release)"
 
-#: views/developers/addon_edit_properties.thtml:169
+#: views/developers/addon_edit_properties.thtml:168
+#: views/developers/edit.thtml:139
 msgid "devcp_edit_label_sitespecific"
 msgstr "專為特定網站設計"
 
-#: views/developers/addon_edit_properties.thtml:202
+#: views/developers/addon_edit_properties.thtml:201
+#: views/developers/edit.thtml:119
 msgid "devcp_edit_label_target_locale"
 msgstr "目標語言"
 
-#: views/developers/addon_edit_properties.thtml:212
+#: views/developers/edit.thtml:126
+msgid "devcp_edit_locale_disambiguation_explanation"
+msgstr "簡短�外資訊（�輸入語言的當地�稱等）"
+
+#: views/developers/addon_edit_properties.thtml:211
+#, fuzzy
 msgid "devcp_edit_properties_button_update"
-msgstr "更新屬性"
+msgstr "Update Properties"
 
-#: views/developers/addon_edit_properties.thtml:198
+#: views/developers/addon_edit_properties.thtml:197
+#, fuzzy
 msgid "devcp_edit_properties_change_guid"
-msgstr "唯有在您瞭解所有後果時，�進行變更。"
+msgstr "Only change if you understand all of the consequences."
 
-#: views/developers/addon_edit_properties.thtml:109
+#: views/developers/addon_edit_properties.thtml:108
+#, fuzzy
 msgid "devcp_edit_properties_current_icon"
-msgstr "目�圖示"
+msgstr "Current Icon"
 
-#: views/developers/addon_edit_properties.thtml:85
+#: views/developers/addon_edit_properties.thtml:84
+#, fuzzy
 msgid "devcp_edit_properties_default_locale"
 msgstr ""
-"元件的�設語言是�個翻譯中必須�供的主�語言。如果您的元件未�供使用者當��擇"
-"語言的敘述，便會自動使用�設語言。"
+"An add-on's default locale is the main locale in which translations must be "
+"present. If translations for your add-on's descriptions are unavailable in a "
+"user's selected language, they will fall back to this default locale."
 
-#: views/developers/addon_edit_properties.thtml:167
+#: views/developers/addon_edit_properties.thtml:166
+#, fuzzy
 msgid "devcp_edit_properties_flags"
-msgstr "這些註記是用來�濾和分類元件的。"
+msgstr "These flags are used to filter and classify add-ons."
 
-#: views/developers/addon_edit_properties.thtml:174
+#: views/developers/addon_edit_properties.thtml:173
+#, fuzzy
 msgid "devcp_edit_properties_guid"
 msgstr ""
-"您元件的 GUID 是由其 install.rdf 指定的唯一識別。您的元件加入 Mozilla 附加元件"
-"網站後便無法變更其 GUID。"
+"The GUID of your add-on is specified in its install.rdf and uniquely "
+"identifies it. You cannot change your GUID once it is listed on Mozilla Add-"
+"ons."
 
-#: views/developers/addon_edit_properties.thtml:53
+#: views/developers/addon_edit_properties.thtml:52
+#, fuzzy
 msgid "devcp_edit_properties_header"
-msgstr "編輯元件屬性"
+msgstr "Edit Add-on Properties"
 
-#: views/developers/addon_edit_properties.thtml:186
+#: views/developers/addon_edit_properties.thtml:185
+#, fuzzy
 msgid "devcp_edit_properties_header_addon_type"
-msgstr "附加元件種類"
+msgstr "Add-on Type"
 
-#: views/developers/addon_edit_properties.thtml:181
+#: views/developers/addon_edit_properties.thtml:180
+#, fuzzy
 msgid "devcp_edit_properties_header_admin_settings"
-msgstr "管�員設定"
+msgstr "Admin Settings"
 
-#: views/developers/addon_edit_properties.thtml:84
+#: views/developers/addon_edit_properties.thtml:83
+#, fuzzy
 msgid "devcp_edit_properties_header_default_locale"
-msgstr "�設語言"
+msgstr "Default Locale"
 
-#: views/developers/addon_edit_properties.thtml:166
+#: views/developers/addon_edit_properties.thtml:165
+#, fuzzy
 msgid "devcp_edit_properties_header_flags"
-msgstr "元件註記"
+msgstr "Add-on Flags"
 
-#: views/developers/addon_edit_properties.thtml:173
-#: views/developers/addon_edit_properties.thtml:197
+#: views/developers/addon_edit_properties.thtml:172
+#: views/developers/addon_edit_properties.thtml:196
+#, fuzzy
 msgid "devcp_edit_properties_header_guid"
-msgstr "元件 GUID"
+msgstr "Add-on GUID"
 
-#: views/developers/addon_edit_properties.thtml:104
+#: views/developers/addon_edit_properties.thtml:103
+#, fuzzy
 msgid "devcp_edit_properties_header_icon"
-msgstr "元件圖示"
+msgstr "Add-on Icon"
 
-#: views/developers/addon_edit_properties.thtml:159
+#: views/developers/addon_edit_properties.thtml:158
+#, fuzzy
 msgid "devcp_edit_properties_header_other_settings"
-msgstr "其他設定"
+msgstr "Other Settings"
 
 #. A header on the admin page to toggle trusted status.
-#: views/developers/addon_edit_properties.thtml:182
+#: views/developers/addon_edit_properties.thtml:181
+#, fuzzy
 msgid "devcp_edit_properties_header_trusted"
-msgstr "�信任的元件？"
+msgstr "Trusted Add-on?"
 
-#: views/developers/addon_edit_properties.thtml:160
+#: views/developers/addon_edit_properties.thtml:159
+#, fuzzy
 msgid "devcp_edit_properties_header_view_source"
-msgstr "線上檢視原始碼"
+msgstr "View Source Online"
 
 #. %s is a comma-separated list of image extensions ".png, .jpg"
-#: views/developers/addon_edit_properties.thtml:106
+#: views/developers/addon_edit_properties.thtml:105
+#, fuzzy
 msgid "devcp_edit_properties_icon"
 msgstr ""
-"元件圖示是顯示於元件�稱�的�圖片，會出�在�覽�尋�果�顯示��，與安�元件"
-"的�話框中。圖片會自動縮放為 32 x 32 �素，請使用下列圖片類型：%s"
+"The add-on icon is a small image that is displayed next to your add-on's "
+"name in browse and search results, display pages, and in the add-on "
+"installation dialog. The image will automatically be resized to 32 x 32 "
+"pixels.  Please use one of the following image types: %s"
 
-#: views/developers/addon_edit_properties.thtml:171
+#: views/developers/addon_edit_properties.thtml:170
+#, fuzzy
 msgid "devcp_edit_properties_label_binary"
-msgstr "這個元件包�二元碼元件（Binary component）"
+msgstr "This add-on contains binary components"
 
-#: views/developers/addon_edit_properties.thtml:185
+#: views/developers/addon_edit_properties.thtml:184
+#, fuzzy
 msgid "devcp_edit_properties_label_not_trusted"
-msgstr "��信任的"
+msgstr "Not Trusted"
 
-#: views/developers/addon_edit_properties.thtml:184
+#: views/developers/addon_edit_properties.thtml:183
+#, fuzzy
 msgid "devcp_edit_properties_label_trusted"
-msgstr "�信任的"
+msgstr "Trusted"
 
-#: views/developers/addon_edit_properties.thtml:110
+#: views/developers/addon_edit_properties.thtml:109
+#, fuzzy
 msgid "devcp_edit_properties_new_icon"
-msgstr "新增圖示"
+msgstr "New Icon"
 
-#: views/developers/addon_edit_properties.thtml:118
+#: views/developers/addon_edit_properties.thtml:117
+#, fuzzy
 msgid "devcp_edit_properties_remove_icon"
-msgstr "移除圖示"
+msgstr "Remove Icon"
 
-#: views/developers/addon_edit_properties.thtml:136
+#: views/developers/addon_edit_properties.thtml:135
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_description"
 msgstr ""
-"如果您的元件有�外的首�，請在此輸入網�。除�您的網站�供了其他語言，�則您�"
-"需�增加其他翻譯。"
+"If your add-on has another homepage, enter its address here. Adding other "
+"translations is not necessary unless your website is localized into other "
+"languages."
 
-#: views/developers/addon_edit_properties.thtml:135
+#: views/developers/addon_edit_properties.thtml:134
+#, fuzzy
 msgid "devcp_edit_properties_transbox_homepage_name"
-msgstr "元件首�"
+msgstr "Add-on Homepage"
 
-#: views/developers/addon_edit_properties.thtml:79
+#: views/developers/addon_edit_properties.thtml:78
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_description"
-msgstr "您的元件�稱會在所有列出您元件的地方出�。"
+msgstr "The name of your add-on is displayed everywhere your add-on is listed."
 
-#: views/developers/addon_edit_properties.thtml:78
+#: views/developers/addon_edit_properties.thtml:77
+#, fuzzy
 msgid "devcp_edit_properties_transbox_name_name"
-msgstr "元件�稱"
+msgstr "Add-on Name"
 
-#: views/developers/addon_edit_properties.thtml:145
+#: views/developers/addon_edit_properties.thtml:144
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_description"
 msgstr ""
-"如果您有�供支�諮詢的 Email 地�，請輸入於此。除�您為��語言�供了��的 "
-"Email 地�，�則您�需�增加其他翻譯。"
+"If you have an email address for support inquiries, enter it here. Adding "
+"other translations is not necessary unless you have different email "
+"addresses for different languages."
 
-#: views/developers/addon_edit_properties.thtml:144
+#: views/developers/addon_edit_properties.thtml:143
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supportemail_name"
-msgstr "技術支� Email 地�"
+msgstr "Support Email Address"
 
-#: views/developers/addon_edit_properties.thtml:154
+#: views/developers/addon_edit_properties.thtml:153
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_description"
 msgstr ""
-"如果您的元件有技術支�網站或論壇，請在此輸入其網�。除�您的網站�供了其他語"
-"言，�則您�需�增加其他翻譯。"
+"If your add-on has a support website or forum, enter its address here. "
+"Adding other translations is not necessary unless your website is localized "
+"into other languages."
 
-#: views/developers/addon_edit_properties.thtml:153
+#: views/developers/addon_edit_properties.thtml:152
+#, fuzzy
 msgid "devcp_edit_properties_transbox_supporturl_name"
-msgstr "技術支�網站"
+msgstr "Support Website"
 
-#: views/developers/addon_edit_properties.thtml:183
+#: views/developers/addon_edit_properties.thtml:182
+#, fuzzy
 msgid "devcp_edit_properties_trusted"
-msgstr "�信任的元件�以�經審核者批准就公開。"
+msgstr "Trusted add-ons can become public without Editor review."
 
 #. %s is href="..." and should stay in the <a> tag.
-#: views/developers/addon_edit_properties.thtml:119
+#: views/developers/addon_edit_properties.thtml:118
+#, fuzzy
 msgid "devcp_edit_properties_undelete"
-msgstr "圖示將在儲存時刪除，<a %s>�消？</a>"
+msgstr "Icon will be deleted on save. <a %s>Cancel?</a>"
 
-#: views/developers/addon_edit_properties.thtml:161
+#: views/developers/addon_edit_properties.thtml:160
+#, fuzzy
 msgid "devcp_edit_properties_view_source"
-msgstr "如果您願�，任何已登入的使用者都能在線上檢視您元件的原始碼。"
+msgstr ""
+"The source of your add-on files can be viewed online by any logged in user "
+"if you wish."
 
-#: views/developers/addon_edit_properties.thtml:162
+#: views/developers/addon_edit_properties.thtml:161
+#, fuzzy
 msgid "devcp_edit_properties_view_source_allow"
-msgstr "�許線上檢視原始碼"
+msgstr "Allow online source viewing"
 
-#: views/developers/addon_edit_properties.thtml:163
+#: views/developers/addon_edit_properties.thtml:162
+#, fuzzy
 msgid "devcp_edit_properties_view_source_do_not_allow"
-msgstr "��許線上檢視原始碼"
+msgstr "Do not allow online source viewing"
+
+#: views/developers/edit.thtml:153
+msgid "devcp_edit_submit_update"
+msgstr "æ›´æ–°"
+
+#: views/developers/edit.thtml:121
+msgid "devcp_edit_target_locale_explanation"
+msgstr ""
+"<a href=\"http://wiki.mozilla.org/L10n:Simple_locale_names\">簡短語言�稱</"
+"a>，例如「en-US�"
 
 #: views/elements/developers/editbox.thtml:46
+#, fuzzy
 msgid "devcp_editbox_authors"
-msgstr "作者"
+msgstr "Authors"
 
 #: views/elements/developers/editbox.thtml:47
+#, fuzzy
 msgid "devcp_editbox_categories"
-msgstr "分類"
+msgstr "Categories"
 
 #: views/elements/developers/editbox.thtml:52
+#, fuzzy
 msgid "devcp_editbox_change_status"
-msgstr "變更狀態"
+msgstr "Change Status"
 
 #: views/elements/developers/editbox.thtml:48
+#, fuzzy
 msgid "devcp_editbox_descriptions"
-msgstr "敘述"
+msgstr "Descriptions"
 
 #: views/elements/developers/editbox.thtml:43
+#, fuzzy
 msgid "devcp_editbox_edit_addon"
-msgstr "編輯附加元件"
+msgstr "Edit Add-on"
 
 #: views/elements/developers/editbox.thtml:57
+#, fuzzy
 msgid "devcp_editbox_new_version"
-msgstr "新版本"
+msgstr "New Version"
 
 #: views/elements/developers/editbox.thtml:49
+#, fuzzy
 msgid "devcp_editbox_properties"
-msgstr "屬性"
+msgstr "Properties"
 
 #: views/elements/developers/editbox.thtml:60
+#, fuzzy
 msgid "devcp_editbox_screenshots"
-msgstr "�覽擷圖"
+msgstr "Preview Screenshots"
 
 #: views/elements/developers/editbox.thtml:53
+#, fuzzy
 msgid "devcp_editbox_statistics_dashboard"
-msgstr "統計資訊顯示�"
+msgstr "Statistics Dashboard"
 
 #: views/elements/developers/editbox.thtml:54
+#, fuzzy
 msgid "devcp_editbox_versions"
-msgstr "版本與檔案"
+msgstr "Versions and Files"
 
 #: views/elements/developers/editbox.thtml:42
+#, fuzzy
 msgid "devcp_editbox_view_listing"
-msgstr "檢視清單"
+msgstr "View Listing"
 
 #: views/elements/developers/editorsmenu.thtml:59
 msgid "devcp_editorsqueue_featured"
 msgstr "精�元件"
 
+# %1 is the review count
 #. %1 is the review count
 #: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
@@ -3148,6 +2755,7 @@ msgid "devcp_editorsqueue_moderatedreviews"
 msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "待審核�見 (%s)"
 
+# %1 is the nominated addons count
 #. %1 is the nominated addons count
 #: views/elements/developers/editorsqueue.thtml:44
 #: views/elements/developers/editorsmenu.thtml:58
@@ -3156,6 +2764,7 @@ msgid "devcp_editorsqueue_nominated"
 msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "待批准元件 (%s)"
 
+# %1 is the update count
 #. %1 is the update count
 #: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
@@ -3164,14 +2773,69 @@ msgid "devcp_editorsqueue_pendingupdates"
 msgid_plural "devcp_editorsqueue_pendingupdates"
 msgstr[0] "待審核更新 (%s)"
 
-#: controllers/statistics_controller.php:147
-#: controllers/statistics_controller.php:361
+#: views/developers/editversion.thtml:66
+msgid "devcp_editversion_checkedfiles_delete"
+msgstr "勾�的檔案將被刪除。"
+
+# %1 is the file name
+# %2 is the file size (150 KB)
+#. %1 is the file name
+#. %2 is the file size (150 KB)
+#: views/developers/editversion.thtml:58
+#, php-format
+msgid "devcp_editversion_filename_size"
+msgstr "%1$s (%2$s)"
+
+#: views/developers/editversion.thtml:48
+msgid "devcp_editversion_label_files"
+msgstr "檔案"
+
+#: views/developers/editversion.thtml:75
+msgid "devcp_editversion_label_targetapps"
+msgstr "目標應用程�"
+
+#: views/developers/editversion.thtml:69
+msgid "devcp_editversion_nofiles"
+msgstr "無檔案。"
+
+#: views/developers/editversion.thtml:117
+msgid "devcp_editversion_reviewernotes"
+msgstr "給審核者的說明"
+
+#: views/developers/editversion.thtml:122
+msgid "devcp_editversion_submit_update"
+msgstr "æ›´æ–°"
+
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:2347
+#: controllers/developers_controller.php:2373
+#: controllers/developers_controller.php:2629
+#: controllers/developers_controller.php:2733
+#: controllers/developers_controller.php:2783
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:337
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
 msgid "devcp_error_addon_access_denied"
 msgstr "您並無此附加元件的權�。"
 
+#. %s is a number
+#: views/developers/add_step2.thtml:126
+#: controllers/developers_controller.php:2276
+#: controllers/developers_controller.php:2564
+msgid "devcp_error_addon_field_summary_toolong"
+msgstr ""
+"摘�的最大長度為 250 個字元。\n"
+"（已輸入 %s 個字元）"
+
+#: controllers/developers_controller.php:1992
+msgid "devcp_error_addonname_not_unique"
+msgstr ""
+"這個附加元件�稱已在我們的資料庫中，請確定：<br /><li>您的 GUID 正確，最常見"
+"的錯誤就是 GUID ��心寫錯。</li><li>您沒有在資料庫中上傳了�複的項目。如果�"
+"複了，您應該更新舊的項目或刪除該項目�新上傳。</li>"
+
 #. %s is a complete URL with the text from devcp_error_appversion_reference_link_text
 #. in the <a> tag.  This should be fixed.
 #: controllers/components/developers.php:591
@@ -3185,21 +2849,29 @@ msgstr "請�考 %s。"
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "此��"
 
-#: views/developers/addon_edit_authors.thtml:76
-msgid "devcp_error_empty_authors"
-msgstr "您的元件至少�有一��有者。"
+#: controllers/developers_controller.php:2098
+msgid "devcp_error_describe_changes"
+msgstr "請輸入此附加元件的變更敘述。"
 
 #. %1$s is the name of the file
 #: controllers/components/developers.php:658
+#, fuzzy
 msgid "devcp_error_file_exists"
-msgstr "元件的這個版本已經存在，若��代它，您必須先刪除檔案 %1$s。"
+msgstr ""
+"A version of that addon already exists. To replace it, you must delete the "
+"file %1$s first."
 
 #. %1$s is a file extension.  Example:  .exe
 #. %2$s is a comma separated list of extensions.  Example:  .xpi, .jar
 #: controllers/components/developers.php:355
 #, php-format
 msgid "devcp_error_file_extension"
-msgstr "�擇的元件類型�接�這個副檔�（%1$s）。請使用下列中的一個：%2$s"
+msgstr ""
+"所�的元件類型�接�此類副檔� (%s) 上傳。�有下�列出的副檔���許上傳: %s"
+
+#: controllers/developers_controller.php:1739
+msgid "devcp_error_file_guids_dont_match"
+msgstr "�些檔案的 GUID �符"
 
 #: controllers/components/developers.php:64
 msgid "devcp_error_five_categories"
@@ -3231,9 +2903,16 @@ msgstr "無檔案已上傳"
 #: controllers/components/developers.php:401
 #, php-format
 msgid "devcp_error_icon_extension"
-msgstr "�接�這個副檔�（%1$s）的圖示。請使用下列中的一個：%2$s"
+msgstr "圖示檔案�接�此類副檔� (%s) 上傳。�有下�列出的副檔���許上傳: %s"
+
+#. %s is a version number.  Example:  3.1.1
+#: controllers/developers_controller.php:1808
+#, php-format
+msgid "devcp_error_identical_version_exists"
+msgstr "此元件�作業系統已存在相�的版本 (%s)。"
 
-#: controllers/developers_controller.php:504
+#: controllers/developers_controller.php:455
+#: controllers/developers_controller.php:1749
 msgid "devcp_error_index_rdf_notfound"
 msgstr "找�到 install.rdf 檔案。"
 
@@ -3241,9 +2920,9 @@ msgstr "找�到 install.rdf 檔案。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf 中�有下列錯誤："
 
-#: controllers/developers_controller.php:1463
+#: controllers/developers_controller.php:1692
 msgid "devcp_error_invalid_addontype"
-msgstr ""
+msgstr "請�擇有效的附加元件種類。"
 
 #. %$1s is a version.  Example: 3.1.1
 #. %$2s is an add-on name.
@@ -3251,7 +2930,7 @@ msgstr ""
 #: controllers/components/developers.php:581
 #, php-format
 msgid "devcp_error_invalid_appversion"
-msgstr "%1$s �是有效的 %2$s 版本"
+msgstr "%s 是無效的 %s 版本號"
 
 #. %s is a string
 #: controllers/components/developers.php:521
@@ -3264,7 +2943,7 @@ msgstr "此附加元件的 ID 無效：%s"
 #: controllers/components/developers.php:572
 #, php-format
 msgid "devcp_error_invalid_minversion"
-msgstr "%1$s �是有效的 %2$s 版本：最低版本�能包� *"
+msgstr "%s 是無效的 %s 版本號：最�版本號�能�有 *"
 
 #: controllers/components/developers.php:536
 msgid "devcp_error_invalid_version"
@@ -3309,6 +2988,18 @@ msgstr "此附加元件的 install.rdf 中找�到 ID。"
 msgid "devcp_error_no_platform"
 msgstr "未�擇作業系統"
 
+#: controllers/developers_controller.php:2803
+msgid "devcp_error_nominate_message"
+msgstr "您必須填寫�交批准所�求的詳細訊�。"
+
+#: controllers/developers_controller.php:2797
+msgid "devcp_error_nominate_no_prerelease"
+msgstr "您無法將發行�版本 (Pre-release) 的附加元件�交批准。"
+
+#: controllers/developers_controller.php:2789
+msgid "devcp_error_nominate_sandbox_only"
+msgstr "您�能將「沙箱��的附加元件�交批准。"
+
 #: controllers/components/developers.php:59
 msgid "devcp_error_one_category"
 msgstr "請至少�一項分類。"
@@ -3322,7 +3013,17 @@ msgstr "此附加元件至少�有一�作者。"
 #: controllers/components/developers.php:1081
 #, php-format
 msgid "devcp_error_preview_extension"
-msgstr "�接�這個副檔�（%1$s）的�覽圖片。請使用下列中的一個：%2$s"
+msgstr "�覽圖片�接�此類副檔� (%s) 上傳。�有下�列出的副檔���許上傳: %s"
+
+#: controllers/developers_controller.php:1984
+#: controllers/developers_controller.php:1999
+#: controllers/developers_controller.php:2464
+msgid "devcp_error_saving"
+msgstr "嘗試儲存您的資料時發生錯誤。"
+
+#: controllers/developers_controller.php:1781
+msgid "devcp_error_update_access_denied"
+msgstr "您沒有權�更新此附加元件。"
 
 #: controllers/components/developers.php:511
 msgid "devcp_error_updatekey"
@@ -3333,101 +3034,311 @@ msgid "devcp_error_updateurl"
 msgstr ""
 "附加元件�能使用外部的 updateURL，請將其從 install.rdf 中移除後�試一次。"
 
-#: controllers/developers_controller.php:465
+#: controllers/developers_controller.php:416
 #: controllers/components/developers.php:271
 msgid "devcp_error_upload_file"
 msgstr "請上傳檔案。"
 
-#: views/developers/uploader.thtml:135
-msgid "devcp_input_upload_file"
+#: views/developers/add_step1.thtml:97
+msgid "devcp_file_addanother"
+msgstr "新增其他作業系統的檔案"
+
+#: views/developers/add_step2.thtml:93 views/developers/add_step2.thtml:99
+msgid "devcp_form_author_add"
+msgstr "新增作者"
+
+#: views/developers/add_step2.thtml:84
+msgid "devcp_form_author_remove"
+msgstr "移除"
+
+#: views/developers/add_step2.thtml:107
+msgid "devcp_form_categories_nextstep"
+msgstr "請於下個步驟為您的新附加元件�一個��的分類。"
+
+#: views/developers/add_step2.thtml:105
+msgid "devcp_form_error_categories_unavailable"
+msgstr "沒有此種類能用的分類。"
+
+#: views/developers/add_step2.thtml:132
+msgid "devcp_form_error_description_notempty"
+msgstr "請為附加元件輸入��的敘述。"
+
+#: views/developers/add_step2.thtml:76
+msgid "devcp_form_error_name_required"
+msgstr "請為附加元件輸入�稱。"
+
+#: views/developers/add_step1.thtml:63
+msgid "devcp_form_error_select_addontype"
+msgstr "請為您上傳的附加元件�一種類別。"
+
+#: views/developers/add_step2.thtml:127
+msgid "devcp_form_error_summary_notempty"
+msgstr "請為附加元件輸入摘�。"
+
+#: views/developers/add_step1.thtml:72
+msgid "devcp_form_label_addonfile"
+msgstr "附加元件檔案"
+
+#: views/developers/add_step1.thtml:80
+msgid "devcp_form_label_addonfile2"
+msgstr "附加元件檔案 2"
+
+#: views/developers/add_step1.thtml:89
+msgid "devcp_form_label_addonfile3"
+msgstr "附加元件檔案 3"
+
+#: views/developers/add_step1.thtml:59
+msgid "devcp_form_label_addontype"
+msgstr "附加元件種類"
+
+#: views/developers/add_step2.thtml:145
+msgid "devcp_form_label_allow_viewsource"
+msgstr "�許使用者線上檢視原始碼"
+
+#: views/developers/add_step2.thtml:97
+msgid "devcp_form_label_author_email"
+msgstr "作者 Email 地�"
+
+#: views/developers/add_step2.thtml:79
+msgid "devcp_form_label_authors"
+msgstr "作者"
+
+#: views/developers/add_step2.thtml:103 views/developers/add_step3.thtml:107
+msgid "devcp_form_label_categories"
+msgstr "分類"
+
+#: views/developers/add_step1.thtml:108
+msgid "devcp_form_label_defaultlocale"
+msgstr "�設語言"
+
+#: views/developers/add_step2.thtml:130
+msgid "devcp_form_label_description"
+msgstr "敘述"
+
+#: views/developers/add_step2.thtml:136
+msgid "devcp_form_label_eula"
+msgstr "終端使用者授權�約 (EULA)"
+
+#: views/developers/add_step2.thtml:157
+msgid "devcp_form_label_externalsoftware"
+msgstr "需�外部軟體支�"
+
+#: views/developers/add_step3.thtml:70
+msgid "devcp_form_label_files"
+msgstr "檔案"
+
+#: views/developers/add_step2.thtml:110
+msgid "devcp_form_label_homepage"
+msgstr "首�"
+
+#: views/developers/add_step1.thtml:102
+msgid "devcp_form_label_iconfile"
+msgstr "圖示檔案"
+
+#: views/developers/add_step2.thtml:74
+msgid "devcp_form_label_name"
+msgstr "�稱"
+
+#: views/developers/add_step1.thtml:75 views/developers/add_step1.thtml:83
+#: views/developers/add_step1.thtml:92
+msgid "devcp_form_label_platforms"
+msgstr "已支�作業系統"
+
+#: views/developers/add_step2.thtml:149
+msgid "devcp_form_label_prerelease"
+msgstr "發行�版本 (Pre-Release)"
+
+#: views/developers/add_step2.thtml:140
+msgid "devcp_form_label_privacy"
+msgstr "隱�政策"
+
+#: views/developers/add_step2.thtml:153
+msgid "devcp_form_label_sitespecific"
+msgstr "專為特定網站設計"
+
+#: views/developers/add_step2.thtml:125
+msgid "devcp_form_label_summary"
+msgstr "摘�"
+
+#: views/developers/add_step2.thtml:115
+msgid "devcp_form_label_supportemail"
+msgstr "技術支� Email"
+
+#: views/developers/add_step2.thtml:120
+msgid "devcp_form_label_supporturl"
+msgstr "技術支�網�"
+
+#: views/developers/add_step3.thtml:80
+msgid "devcp_form_label_target_applications"
+msgstr "目標應用程�"
+
+#: views/developers/add_step3.thtml:66
+msgid "devcp_form_label_version"
+msgstr "版本"
+
+#: views/developers/add_step3.thtml:95
+msgid "devcp_form_label_versionnotes"
+msgstr "版本說明"
+
+#: views/developers/add_step3.thtml:89
+msgid "devcp_form_no_target_apps"
+msgstr "ç„¡"
+
+#: views/developers/add_step3.thtml:100
+msgid "devcp_form_reviewernotes"
+msgstr "給審核者的說明"
+
+#: views/developers/add_step3.thtml:114
+msgid "devcp_form_trustedaddon_destination"
+msgstr "因為您的附加元件已�信任，請直接�擇�發佈於："
+
+#: views/developers/add_step3.thtml:119
+msgid "devcp_form_trustedaddon_destination_public"
+msgstr "「公開��"
+
+#: views/developers/add_step3.thtml:117
+msgid "devcp_form_trustedaddon_destination_sandbox"
+msgstr "「沙箱��"
+
+#: views/developers/add_step0.thtml:44
+#, php-format
+msgid "devcp_header_developer_agreement"
+msgstr "開發者授權�約"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1"
+msgstr "步驟 1"
+
+#: views/developers/add_step1.thtml:44
+msgid "devcp_header_step1_upload"
 msgstr "上傳檔案"
 
-#: views/pages/js_constants.js.thtml:89
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2"
+msgstr "步驟 2"
+
+#: views/developers/add_step2.thtml:43
+msgid "devcp_header_step2_addondetails"
+msgstr "元件詳細資訊"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3"
+msgstr "步驟 3"
+
+#: views/developers/add_step3.thtml:43
+msgid "devcp_header_step3_versiondetails"
+msgstr "版本詳細資訊"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4"
+msgstr "步驟 4"
+
+#: views/developers/add_step4.thtml:43
+msgid "devcp_header_step4_localization"
+msgstr "在地化"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5"
+msgstr "步驟 5"
+
+#: views/developers/add_step5.thtml:43
+msgid "devcp_header_step5_success"
+msgstr "完�"
+
+#: views/developers/index.thtml:48
+msgid "devcp_index_header_myaddons"
+msgstr "我的附加元件"
+
+#: views/developers/uploader.thtml:101
+#, fuzzy
+msgid "devcp_input_upload_file"
+msgstr "Upload File"
+
+#: views/pages/js_constants.js.thtml:80
+#, fuzzy
 msgid "devcp_js_a_cancel"
-msgstr "�消"
+msgstr "Cancel"
 
-#: views/pages/js_constants.js.thtml:90
+#: views/pages/js_constants.js.thtml:81
+#, fuzzy
 msgid "devcp_js_add_email"
-msgstr "請輸入您想新增的作者的帳號 Email。"
+msgstr "Please enter the account email of the author you wish to add."
 
 #. alt text for a down-arrow image.
-#: views/pages/js_constants.js.thtml:81
+#: views/pages/js_constants.js.thtml:72
+#, fuzzy
 msgid "devcp_js_img_move_down"
-msgstr "�下移"
+msgstr "Move Down"
 
 #. alt text for an up-arrow image.
-#: views/pages/js_constants.js.thtml:82
+#: views/pages/js_constants.js.thtml:73
+#, fuzzy
 msgid "devcp_js_img_move_up"
-msgstr "�上移"
+msgstr "Move Up"
 
-#: views/pages/js_constants.js.thtml:91
+#: views/pages/js_constants.js.thtml:82
+#, fuzzy
 msgid "devcp_js_img_remove_compat"
-msgstr "移除應用程�相容性"
+msgstr "Remove Application Compatibility"
 
-#: views/pages/js_constants.js.thtml:86
+#: views/pages/js_constants.js.thtml:77
+#, fuzzy
 msgid "devcp_js_input_list_author"
-msgstr "列為公開的作者"
-
-#: views/pages/js_constants.js.thtml:92
-msgid "devcp_js_license_select"
-msgstr "請�擇一個授權�款。"
-
-#: views/pages/js_constants.js.thtml:93
-msgid "devcp_js_license_text"
-msgstr "請輸入您授權�款的內文。"
+msgstr "List as author in public listings"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:84
+#: views/pages/js_constants.js.thtml:75
+#, fuzzy
 msgid "devcp_js_option_developer"
-msgstr "開發者"
+msgstr "Developer"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:83
+#: views/pages/js_constants.js.thtml:74
+#, fuzzy
 msgid "devcp_js_option_owner"
-msgstr "�有者"
+msgstr "Owner"
 
 #. <option> text in a <select> for Author role in an add-on.
-#: views/pages/js_constants.js.thtml:85
+#: views/pages/js_constants.js.thtml:76
+#, fuzzy
 msgid "devcp_js_option_viewer"
-msgstr "檢視者"
+msgstr "Viewer"
 
-#: views/pages/js_constants.js.thtml:88
+#: views/pages/js_constants.js.thtml:79
+#, fuzzy
 msgid "devcp_js_remove_author"
-msgstr "移除作者"
+msgstr "Remove Author"
 
-#: views/pages/js_constants.js.thtml:87
+#: views/pages/js_constants.js.thtml:78
+#, fuzzy
 msgid "devcp_js_sure_remove"
-msgstr "您<strong>確定</strong>�移除這�作者嗎？"
+msgstr "Are you <strong>sure</strong> you wish to remove this author?"
 
-#: views/pages/js_constants.js.thtml:77
+#: views/pages/js_constants.js.thtml:68
+#, fuzzy
 msgid "devcp_js_upload_alert"
-msgstr "您必須�擇�上傳的檔案。"
-
-#. %1$s is an addon id, like 32.
-#. %2$s is a version number, like 3.5.
-#: controllers/components/developers.php:1212
-msgid "devcp_license_existing"
-msgstr "附加元件 %1$s 版本 %2$s 使用的自訂授權�款"
+msgstr "You must select a file to upload."
 
 #: views/elements/developers/localebox.thtml:44
 msgid "devcp_localebox_header_localizedfields"
 msgstr "在地化欄�"
 
+# %1 is the default locale
 #. %1 is the default locale
 #: views/elements/developers/localebox.thtml:48
 #, php-format
 msgid "devcp_localebox_intro"
 msgstr ""
-"本�的�些欄��用使用者熟悉的語言顯示。請從下�的語言中�擇您�編輯的元件詳細"
-"資訊，如果使用者�的語言沒有內容就會用�設語言 (%s) 顯示。"
+"本�的�些欄��用使用者熟悉的語言顯示。請從下�的語言中�擇您�編輯的元件詳"
+"細資訊，如果使用者�的語言沒有內容就會用�設語言 (%s) 顯示。"
 
 #: views/elements/developers/sidebar.thtml:68
-#: views/elements/developers/myaddons.thtml:75
+#: views/elements/developers/myaddons.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "管�員工具"
 
 #: views/elements/developers/sidebar.thtml:65
-#: views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/myaddons.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "審核者工具"
 
@@ -3436,78 +3347,111 @@ msgid "devcp_myaddons_link"
 msgstr "我的附加元件"
 
 #: views/elements/developers/sidebar.thtml:70
-#: views/elements/developers/myaddons.thtml:77
+#: views/elements/developers/myaddons.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "回到主��"
 
 #: views/elements/developers/sidebar.thtml:63
-#: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/myaddons.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "統計資訊顯示�"
 
 #: views/elements/developers/sidebar.thtml:62
-#: views/elements/developers/myaddons.thtml:69
+#: views/elements/developers/myaddons.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "上傳附加元件"
 
 #: views/elements/developers/sidebar.thtml:48
-#: views/elements/developers/myaddons.thtml:67
+#: views/elements/developers/myaddons.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "開發者工具"
 
 #. %1$s is an add-on ID, perhaps 167.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:256
+#: controllers/developers_controller.php:232
+#, fuzzy
 msgid "devcp_new_addon_error"
 msgstr ""
-"資料庫中已經有這個元件 ID（%1$s）了。如果這是您的元件，您�以<a href=\"%2$s\">"
-"上傳新版本</a>。"
+"This add-on ID (%1$s) already exists in the database. If this is your add-"
+"on, you can <a href=\"%2$s\">upload a new version</a>."
 
 #: views/developers/addon_status_nominate.thtml:62
+#, fuzzy
 msgid "devcp_nominate_cancel"
-msgstr "�消並返回"
+msgstr "Cancel and return"
+
+#: views/developers/nominate.thtml:53
+msgid "devcp_nominate_link_returnto_details"
+msgstr "回到元件詳細資訊"
 
+# %1 is the addon name
 #. %1 is the add-on name
 #: views/developers/addon_status_nominate.thtml:61
+#: views/developers/nominate.thtml:52
 #, php-format
 msgid "devcp_nominate_submit_nominate"
 msgstr "�交批准 %s"
 
-#: views/developers/addon_edit_properties.thtml:50
+# %1 is the autodetected addon type
+#. %1 is the autodetected add-on type
+#: views/developers/add_step2.thtml:63
+#, php-format
+msgid "devcp_notice_autodetected_addontype"
+msgstr "自動�測附加元件種類為：%s。"
+
+#: views/developers/addon_edit_properties.thtml:49
 #: views/developers/addon_status.thtml:49
-#: views/developers/versions_edit.thtml:50
+#: views/developers/versions_edit.thtml:49
+#, fuzzy
 msgid "devcp_notice_changes_error"
 msgstr ""
-"<span>您有至少一個變更無法儲存。</span><br />請見下述錯誤，其餘變更已�功儲"
-"存。"
+"<span>One or more of your changes couldn't be saved.</span><br />Please look "
+"for the errors below. The rest of your changes were successfully saved."
 
-#: views/developers/addon_edit_authors.thtml:47
-#: views/developers/addon_edit_properties.thtml:47
+#: views/developers/addon_edit_authors.thtml:46
+#: views/developers/addon_edit_properties.thtml:46
 #: views/developers/addon_status.thtml:46
-#: views/developers/addon_edit_descriptions.thtml:47
-#: views/developers/versions_edit.thtml:47
+#: views/developers/addon_edit_descriptions.thtml:46
+#: views/developers/versions_edit.thtml:46
 #: views/developers/addon_edit_categories.thtml:46
+#, fuzzy
 msgid "devcp_notice_changes_saved"
 msgstr ""
-"<span>已�功儲存您的變更。</span><br />請注�有些變更也許��幾個�時�會出�"
-"在網站的所有�域上。"
+"<span>Your changes have been saved.</span><br />Please note that some "
+"changes may take several hours to appear in all areas of the website."
 
 #: controllers/previews_controller.php:252
 msgid "devcp_notice_cleardefault"
 msgstr "移除�設�覽圖片將會使其他�覽圖片自動�為�設圖片。"
 
+# %1 is the default locale name (English (US))
+# %2 is the default locale code (en-US)
+# %3 is the current page locale name (Deutsch)
+# %4 is the current page locale code (de)
+#. %1 is the default locale name (English (US))
+#. %2 is the default locale code (en-US)
+#. %3 is the current page locale name (Deutsch)
+#. %4 is the current page locale code (de)
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+#, php-format
+msgid "devcp_notice_different_defaultlocale"
+msgstr ""
+"此附加元件的�設語言 (%1$s [%2$s]) 和您目�所�的語言 (%3$s [%4$s]) ��。下"
+"�的欄�將會填入 %1$s 的欄�中。"
+
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
 msgid "devcp_notice_makedefault"
 msgstr "將此圖片設為�設�覽圖片將會�消先�的�設圖片設定。"
 
-#: views/developers/addon_edit_authors.thtml:70
+#: views/developers/addon_edit_authors.thtml:69
+#, fuzzy
 msgid "devcp_notice_unsaved_changes"
-msgstr "您有未儲存的變更。"
+msgstr "You have unsaved changes."
 
-#: controllers/developers_controller.php:87
-#: controllers/developers_controller.php:97
-#: controllers/developers_controller.php:100
+#: controllers/developers_controller.php:67
+#: controllers/developers_controller.php:77
+#: controllers/developers_controller.php:80
 #: controllers/previews_controller.php:67
 #: controllers/previews_controller.php:79
 #: controllers/previews_controller.php:82
@@ -3536,68 +3480,83 @@ msgstr "編輯�覽圖片"
 msgid "devcp_preview_updated_successfully"
 msgstr "�覽圖片更新�功。"
 
-#: views/developers/previews.thtml:120
+#: views/developers/previews.thtml:121
+#, fuzzy
 msgid "devcp_previews_a_another"
-msgstr "新增其他�覽圖片"
+msgstr "Add Another Preview"
 
-#: views/developers/previews.thtml:96
+#: views/developers/previews.thtml:97
+#, fuzzy
 msgid "devcp_previews_a_delete"
-msgstr "刪除�覽圖片"
+msgstr "Delete Preview"
 
-#: views/developers/previews.thtml:95
+#: views/developers/previews.thtml:96
+#, fuzzy
 msgid "devcp_previews_a_replace"
-msgstr "�代�覽圖片"
+msgstr "Replace Preview"
 
-#: views/developers/previews.thtml:126
+#: views/developers/previews.thtml:127
+#, fuzzy
 msgid "devcp_previews_a_update"
-msgstr "更新�覽圖片"
+msgstr "Update Previews"
 
-#: views/developers/previews.thtml:115 views/developers/previews.thtml:124
+#: views/developers/previews.thtml:116 views/developers/previews.thtml:125
+#, fuzzy
 msgid "devcp_previews_add_new"
-msgstr "新增�覽圖片"
+msgstr "Add New Preview"
 
 #. %s is a list of file extensions, e.g. ".png, .gif"
-#: views/developers/previews.thtml:116
+#: views/developers/previews.thtml:117
+#, fuzzy
 msgid "devcp_previews_add_select"
 msgstr ""
-"在下��擇一張圖片上傳。超�寬 700 �素�高 525 �素的圖片將被�新縮放。�許的"
-"檔案類型：%s"
+"Select an image to upload below. Images larger than the maximum size of 700 "
+"pixels wide by 525 pixels tall will be resized. Allowed file types: %s"
 
-#: views/developers/previews.thtml:121
+#: views/developers/previews.thtml:122
+#, fuzzy
 msgid "devcp_previews_click_below"
-msgstr "按下�的「更新�覽圖片�進行上傳。"
+msgstr "Click Update Previews below to upload."
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:102
+#: views/developers/previews.thtml:103
+#, fuzzy
 msgid "devcp_previews_click_update"
-msgstr "按下�的「更新�覽圖片�按鈕以儲存這張圖片。（<a %s>�消？</a>）"
+msgstr ""
+"Click the Update Previews button below to save this image. (<a %s>Cancel?</"
+"a>)"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/previews.thtml:107
+#: views/developers/previews.thtml:108
+#, fuzzy
 msgid "devcp_previews_error_message"
-msgstr "按下「更新�覽圖片�後，這張�覽圖片將被刪除。（<a %s>�消？</a>）"
+msgstr ""
+"This preview will be deleted when Update Previews is clicked below. (<a %"
+"s>Cancel?</a>)"
 
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
 msgstr ""
-"請用下�的表單上傳格�為 PNG, JPG 或 GIF 的附加元件�覽圖片。大於 700 x 525 �"
-"素的圖片會自動縮�。"
+"請用下�的表單上傳格�為 PNG, JPG 或 GIF 的附加元件�覽圖片。大於 700 x 525 "
+"�素的圖片會自動縮�。"
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
 msgstr "新增�覽圖片"
 
-#: views/developers/previews.thtml:80
+#: views/developers/previews.thtml:79
+#, fuzzy
 msgid "devcp_previews_header_caption"
-msgstr "�覽圖片說明"
+msgstr "Preview Caption"
 
 #: views/previews/edit.thtml:43
 msgid "devcp_previews_header_edit"
 msgstr "編輯�覽圖片"
 
-#: views/developers/previews.thtml:93
+#: views/developers/previews.thtml:94
+#, fuzzy
 msgid "devcp_previews_label_default"
-msgstr "�設�覽圖片"
+msgstr "Default Preview"
 
 #: views/previews/add.thtml:54
 msgid "devcp_previews_label_file"
@@ -3607,27 +3566,33 @@ msgstr "�覽圖片檔案"
 msgid "devcp_previews_label_makedefault"
 msgstr "設為�設�覽圖片"
 
-#: views/developers/previews.thtml:100
+#: views/developers/previews.thtml:101
+#, fuzzy
 msgid "devcp_previews_label_new"
-msgstr "新增圖片："
+msgstr "New image:"
 
-#: views/developers/previews.thtml:118
+#: views/developers/previews.thtml:119
+#, fuzzy
 msgid "devcp_previews_label_upload"
-msgstr "上傳�覽圖片："
+msgstr "Upload Preview: "
 
-#: views/developers/previews.thtml:50
+#: views/developers/previews.thtml:49
+#, fuzzy
 msgid "devcp_previews_notice_error"
-msgstr "您有至少一張新的�覽圖片無法儲存。"
+msgstr "One or more of your new previews could not be saved."
 
-#: views/developers/previews.thtml:47
+#: views/developers/previews.thtml:46
+#, fuzzy
 msgid "devcp_previews_notice_success"
-msgstr "已�功更新您的�覽圖片。"
+msgstr "Your previews have been updated successfully."
 
-#: views/developers/previews.thtml:59
+#: views/developers/previews.thtml:58
+#, fuzzy
 msgid "devcp_previews_p_screenshots"
 msgstr ""
-"下�顯示的是您元件的�覽擷圖，您�以�說明或圖片進行修改。�尋和�覽清單時，"
-"「�設�覽圖片�會出�在您的元件�邊。"
+"The preview screenshots for your add-on are shown below. You can make "
+"changes to captions or images below. The Default Preview is the preview that "
+"is displayed next to your add-on in search and browse listings."
 
 #: views/previews/edit.thtml:55
 msgid "devcp_previews_submit_delete"
@@ -3645,32 +3610,51 @@ msgstr "編輯�覽圖片"
 msgid "devcp_previews_submit_upload"
 msgstr "上傳�覽圖片"
 
-#: views/developers/previews.thtml:78
+#: views/developers/previews.thtml:77
+#, fuzzy
 msgid "devcp_previews_thumbnail"
-msgstr "縮圖"
+msgstr "Thumbnail"
 
 #. %s is the add-on name.
-#: views/developers/previews.thtml:44
+#: views/developers/previews.thtml:43
+#, fuzzy
 msgid "devcp_previews_title"
-msgstr "%s �覽圖片管�員"
+msgstr "%s Preview Manager"
 
-#: views/developers/uploader.thtml:74
+#: views/developers/add_step2.thtml:64
+msgid "devcp_question_addontype_incorrect"
+msgstr "��？"
+
+#: controllers/developers_controller.php:2717
+msgid "devcp_question_delete_file"
+msgstr "您確定�刪除此檔案嗎？"
+
+#: views/developers/uploader.thtml:71 views/developers/add_step0.thtml:52
 msgid "devcp_review_agreement_please"
 msgstr "繼續使用�請先�覽並接�下�的開發者授權�約。"
 
 #: views/elements/developers/rolecheck.thtml:42
+#, fuzzy
 msgid "devcp_rolecheck_no_privs"
 msgstr ""
-"<span>您沒有足夠的權�變更這個��。</span><br />如果您需�修改，請�繫元件�"
-"有者。"
+"<span>You do not have sufficient privileges to make changes on this page.</"
+"span><br />Contact the Add-on Owner if you need to make changes."
 
-#: controllers/developers_controller.php:1315
+#: controllers/developers_controller.php:1243
+#, fuzzy
 msgid "devcp_several_hours"
-msgstr "請注�有些變更也許��幾個�時�會出�在網站的所有�域上。"
+msgstr ""
+"Please note that some changes may take several hours to appear in all areas "
+"of the website."
 
 #: views/elements/developers/sidebar.thtml:52
+#, fuzzy
 msgid "devcp_sidebar_a_dashboard"
-msgstr "資訊顯示�"
+msgstr "Dashboard"
+
+#: views/developers/add_step1.thtml:123
+msgid "devcp_skip_reviewing_addon_info"
+msgstr "略�更新已存的附加元件資訊"
 
 #. %s is a number
 #: views/elements/developers/statsbar.thtml:45
@@ -3694,617 +3678,804 @@ msgid "devcp_statsbar_weekly_downloads"
 msgstr "本週下載數：<em>%s</em>"
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active"
 msgstr ""
-"將這個元件設為「活動中�會使它出�在狀態相符的公開�域，包括�尋與�覽清單。根"
-"據元件的狀態，網站將�供下載，並在客戶端檢查更新時傳�元件。您需�的時候，也�"
-"以�回到這裡�用它。"
+"Marking this add-on active will cause it to show up in public areas "
+"appropriate for its status, including search and browse listings. It will be "
+"downloadable from the website and could be returned in client update checks, "
+"depending on its status. You will be able to return here and disable it "
+"again at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:59
+#, fuzzy
 msgid "devcp_status_confirm_active_sure"
-msgstr "您確定�將這個元件設為「活動中�嗎？"
+msgstr "Are you sure you wish to mark this add-on active?"
 
 #: views/developers/addon_status_confirm.thtml:50
+#, fuzzy
 msgid "devcp_status_confirm_header_sure"
-msgstr "您確定嗎？"
+msgstr "Are you sure?"
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive"
 msgstr ""
-"將這個元件設為「�活動中�會讓它��出�於任何公開�域，包括�尋與�覽清單。網"
-"站將��供下載，也�會在客戶端檢查更新時傳�元件。您需�的時候，也�以�回到這"
-"裡啟用它。"
+"Marking this add-on inactive will prevent it from showing up in any public "
+"areas, including search and browse listings. It will not be downloadable "
+"from the website and will not be returned in client update checks. You will "
+"be able to return here and re-enable it at your convenience."
 
 #: views/developers/addon_status_confirm.thtml:55
+#, fuzzy
 msgid "devcp_status_confirm_inactive_sure"
-msgstr "您確定�將這個元件設為「�活動中�嗎？"
+msgstr "Are you sure you wish to mark this add-on inactive?'"
 
 #: views/developers/addon_status_confirm.thtml:74
+#, fuzzy
 msgid "devcp_status_confirm_no"
-msgstr "�，算了"
+msgstr "No, cancel"
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public"
-msgstr "公開這個元件將讓所有人都能下載，並�既有的使用者�供更新。"
+msgstr ""
+"Making this add-on public will make it available for anyone to download and "
+"will begin offering updates to existing users."
 
 #: views/developers/addon_status_confirm.thtml:67
+#, fuzzy
 msgid "devcp_status_confirm_public_sure"
-msgstr "您確定�「公開�這個元件嗎？"
+msgstr "Are you sure you wish to make this add-on public?"
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox"
 msgstr ""
-"將這個元件移回「沙箱��會�求使用者先登入�能下載，也將�止�供�既有使用者的"
-"更新。由於您的元件目�是公開的，您�以隨時回來這裡�度公開它。"
+"Moving this add-on back to the sandbox will require users to login before "
+"downloading and updates will no longer be offered to existing users. Because "
+"your add-on is currently public, you will be able to return here at any time "
+"to make it public again."
 
 #: views/developers/addon_status_confirm.thtml:63
+#, fuzzy
 msgid "devcp_status_confirm_sandbox_sure"
-msgstr "您確定�將這個元件移至「沙箱��嗎？"
+msgstr "Are you sure you wish to move this add-on to the sandbox?"
 
 #: views/developers/addon_status_confirm.thtml:73
+#, fuzzy
 msgid "devcp_status_confirm_yes"
-msgstr "是的，我確定"
+msgstr "Yes, I'm Sure"
 
 #: views/developers/addon_status_nominate.thtml:46
+#, fuzzy
 msgid "devcp_status_nominate_error_notice"
 msgstr ""
-"<span>需��交批准訊�。</span><br />請在文字欄�內填寫需�的資訊後�試。"
+"<span>A nomination message is required.</span><br />Please fill in the text "
+"box with the requested information and try again."
 
 #: views/developers/addon_status_nominate.thtml:55
+#, fuzzy
 msgid "devcp_status_nominate_header"
-msgstr "元件批准"
+msgstr "Add-on Nomination"
+
+#: controllers/developers_controller.php:1566
+msgid "devcp_submissions_disabled"
+msgstr "附加元件的上傳已暫時�用，請�後�試試看。"
+
+#: views/developers/uploader.thtml:76 views/developers/add_step0.thtml:59
+msgid "devcp_submit_accept_dev_agreement"
+msgstr "我接�"
+
+#: views/developers/uploader.thtml:75 views/developers/add_step0.thtml:58
+msgid "devcp_submit_decline_dev_agreement"
+msgstr "我拒絕"
+
+#: views/developers/index.thtml:91
+msgid "devcp_summary_admin_disabled"
+msgstr "此附加元件已被管�員�用。"
+
+#: views/developers/index.thtml:75
+msgid "devcp_summary_header_disabled"
+msgstr "已�用"
+
+#: views/developers/index.thtml:74
+msgid "devcp_summary_header_trusted"
+msgstr "已�信任"
 
-#: views/developers/dashboard.thtml:85
+#: views/developers/dashboard.thtml:85 views/developers/index.thtml:82
 msgid "devcp_summary_lastversion"
 msgstr "最新版本："
 
+# %1 is a link to the addon submit page
+#. %1 is a link to the add-on submit page
+#: views/developers/index.thtml:101
+#, php-format
+msgid "devcp_summary_noaddons_submit_one"
+msgstr "您還沒有上傳任何附加元件，請按 %s 開始上傳。"
+
+#: views/developers/index.thtml:102
+msgid "devcp_summary_noaddons_submit_one_link"
+msgstr "這裡"
+
+# %1 is the link to the preview upload page
+#. %1 is the link to the preview upload page
+#: views/developers/add_step5.thtml:68
+#, php-format
+msgid "devcp_theme_upload_preview"
+msgstr "請確定您已為此佈景主題 %s。"
+
+#: views/developers/add_step5.thtml:68
+msgid "devcp_theme_upload_preview_link"
+msgstr "上傳�覽圖片"
+
 #. %s is the add-on name.
 #: views/developers/addon_edit.thtml:43
-#: views/developers/addon_edit_authors.thtml:44
+#: views/developers/addon_edit_authors.thtml:43
 #: views/developers/versions_delete.thtml:43
-#: views/developers/addon_edit_properties.thtml:44
-#: views/developers/addon_edit_descriptions.thtml:44
-#: views/developers/versions_edit.thtml:44
+#: views/developers/addon_edit_properties.thtml:43
+#: views/developers/addon_edit_descriptions.thtml:43
+#: views/developers/versions_edit.thtml:43
 #: views/developers/addon_edit_categories.thtml:43
 #: views/developers/versions.thtml:43
+#, fuzzy
 msgid "devcp_title_edit_addon"
-msgstr "編輯 %s"
+msgstr "Edit %s"
 
 #. title attribute for a javascript link that pops up a help dialog.
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_a_title_help"
-msgstr "說明（�離開��）"
+msgstr "Help (does not leave page)"
 
-#: views/elements/translationbox.thtml:68
+#: views/elements/developers/translationbox.thtml:64
+#, fuzzy
 msgid "devcp_transbox_alt_help"
-msgstr "說明"
+msgstr "Help"
 
 #. %1$s is <span>17</span>, %2$s is 42.
-#: views/elements/translationbox.thtml:101
+#: views/elements/developers/translationbox.thtml:97
+#, fuzzy
 msgid "devcp_transbox_chars_used"
-msgstr "已使用字元數：%1$s / %2$s"
+msgstr "Characters used: %1$s / %2$s"
 
-#: views/elements/translationbox.thtml:132
+#: views/elements/developers/translationbox.thtml:132
+#, fuzzy
 msgid "devcp_transbox_delete_sure"
-msgstr "您確定�刪除這個翻譯嗎？"
+msgstr "Are you sure you wish to delete this translation?"
 
 #. %s is a locale, like en-US.
-#: views/elements/translationbox.thtml:143
+#: views/elements/developers/translationbox.thtml:143
+#, fuzzy
 msgid "devcp_transbox_help_header_tabs"
-msgstr "這些 %s �籤是什麼？"
+msgstr "What are these %s tabs?"
 
-#: views/elements/translationbox.thtml:145
+#: views/elements/developers/translationbox.thtml:145
+#, fuzzy
 msgid "devcp_transbox_help_header_what"
-msgstr "如果我沒有任何翻譯的話呢？"
+msgstr "What if I don't have any translations?"
 
-#: views/elements/translationbox.thtml:147
+#: views/elements/developers/translationbox.thtml:147
+#, fuzzy
 msgid "devcp_transbox_help_hide"
-msgstr "隱�說明"
+msgstr "Hide Help"
 
-#: views/elements/translationbox.thtml:146
+#: views/elements/developers/translationbox.thtml:146
+#, fuzzy
 msgid "devcp_transbox_help_if"
 msgstr ""
-"如果使用者�覽網站時沒有�用的翻譯，就會變回您在「編輯元件屬性��指定的�設語"
-"言。如果您沒有任何翻譯，就輸入您會的�設語言��，它應該是您平時說的語言。"
-
-#: views/elements/translationbox.thtml:144
+"If a user browses the site and a translation isn't available in their own "
+"language, it will fall back to your add-on's Default Locale, specified in "
+"the Edit Add-on Properties area. If you don't have any translations, just "
+"enter what you can into your Default Locale, which should be a language you "
+"speak."
+
+#: views/elements/developers/translationbox.thtml:144
+#, fuzzy
 msgid "devcp_transbox_help_transbox"
 msgstr ""
-"這個是<i>翻譯方塊</i>，讓您使用手上的翻譯將特定欄�本地化。您�以用這些語言�"
-"籤新增�編輯和移除翻譯。"
+"This is a <i>Translation Box</i>. It allows you to localize a specific field "
+"into any other languages for which you might have a translation. You can "
+"add, edit, and remove translations using the locale tabs."
 
-#: views/elements/translationbox.thtml:85
+#: views/elements/developers/translationbox.thtml:81
+#, fuzzy
 msgid "devcp_transbox_img_add_trans"
-msgstr "新增翻譯"
+msgstr "Add Translation"
 
-#: views/elements/translationbox.thtml:86
+#: views/elements/developers/translationbox.thtml:82
+#, fuzzy
 msgid "devcp_transbox_img_remove_trans"
-msgstr "移除翻譯"
+msgstr "Remove Translation"
 
-#: views/elements/translationbox.thtml:123
+#: views/elements/developers/translationbox.thtml:123
+#, fuzzy
 msgid "devcp_transbox_input_add_all"
-msgstr "新增語言至全部"
+msgstr "Add Locale to All"
 
-#: views/elements/translationbox.thtml:122
+#: views/elements/developers/translationbox.thtml:122
+#, fuzzy
 msgid "devcp_transbox_input_add_locale"
-msgstr "新增語言"
+msgstr "Add Locale"
 
-#: views/elements/translationbox.thtml:124
-#: views/elements/translationbox.thtml:135
+#: views/elements/developers/translationbox.thtml:124
+#: views/elements/developers/translationbox.thtml:135
+#, fuzzy
 msgid "devcp_transbox_input_cancel"
-msgstr "�消"
+msgstr "Cancel"
 
-#: views/elements/translationbox.thtml:134
+#: views/elements/developers/translationbox.thtml:134
+#, fuzzy
 msgid "devcp_transbox_input_delete"
-msgstr "刪除"
+msgstr "Delete It"
 
-#: views/elements/translationbox.thtml:113
+#: views/elements/developers/translationbox.thtml:113
+#, fuzzy
 msgid "devcp_transbox_select_locale"
-msgstr "�擇�新增翻譯的語言："
+msgstr "Select the locale of the translation to add:"
 
 #. %1$s and %2$s are GUIDs.
-#: controllers/developers_controller.php:343
+#: controllers/developers_controller.php:311
+#, fuzzy
 msgid "devcp_update_addon_guid_error"
-msgstr "這個檔案（%1$s）的元件 GUID 與既有元件（%2$s）的 GUID �符。"
+msgstr ""
+"The add-on GUID used in this file (%1$s) does not match the existing GUID "
+"for this add-on (%2$s)."
 
-#: controllers/developers_controller.php:334
+#: controllers/developers_controller.php:302
+#, fuzzy
 msgid "devcp_update_addon_priv_error"
-msgstr "您沒有足夠的權�更新這個元件。"
+msgstr "You do not have sufficient privileges to update this add-on."
 
 #. %1$s is a version number, %2$s is an add-on ID.
-#: controllers/developers_controller.php:399
+#: controllers/developers_controller.php:350
+#, fuzzy
 msgid "devcp_update_addon_version_belong_error"
-msgstr "指定的版本（%1$s）�屬於這個元件（%2$s）。"
+msgstr "The specified version (%1$s) does not belong to this add-on (%2$s)."
 
 #. %1$s is a version number, maybe 1.1.
 #. %2$s is a URL.
-#: controllers/developers_controller.php:351
+#: controllers/developers_controller.php:319
+#, fuzzy
 msgid "devcp_update_addon_version_exists_error"
 msgstr ""
-"元件的這個版本（%1$s）已經存在了，如果您�為這個版本新增�一個檔案，<a href="
-"\"%2$s\">按一下這裡</a>。"
+"The version number uploaded (%1$s) already exists for this add-on. If you "
+"are trying to add another file to this version, <a href=\"%2$s\">click here</"
+"a>."
 
 #. %1$s and %2$s are version numbers.
-#: controllers/developers_controller.php:405
+#: controllers/developers_controller.php:356
+#, fuzzy
 msgid "devcp_update_addon_version_match_error"
-msgstr "上傳檔案的版本號（%1$s）與既有的版本號（%2$s）�符。"
+msgstr ""
+"The uploaded version number (%1$s) does not match the existing version "
+"number (%2$s)."
 
 #: views/developers/uploader.thtml:68
+#, fuzzy
 msgid "devcp_uploader_a_start"
-msgstr "開始"
+msgstr "Get Started"
 
-#: views/developers/uploader.thtml:137
+#: views/developers/uploader.thtml:103
+#, fuzzy
 msgid "devcp_uploader_ajax_loading"
-msgstr "正在上傳檔案…"
+msgstr "Uploading file..."
 
-#: views/developers/uploader.thtml:82
-msgid "devcp_uploader_button_agree"
-msgstr "��並繼續"
-
-#: views/developers/uploader.thtml:157
+#: views/developers/uploader.thtml:123
+#, fuzzy
 msgid "devcp_uploader_button_edit"
-msgstr "編輯我的元件"
+msgstr "Edit My Add-on"
 
-#: views/developers/uploader.thtml:158
+#: views/developers/uploader.thtml:124
+#, fuzzy
 msgid "devcp_uploader_button_later"
-msgstr "我會�後完�我的元件。"
+msgstr "I'll complete my add-on later."
 
-#: views/developers/uploader.thtml:168
+#: views/developers/uploader.thtml:134
+#, fuzzy
 msgid "devcp_uploader_button_release"
-msgstr "新增版本資訊"
+msgstr "Add Release Notes"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/uploader.thtml:156
+#: views/developers/uploader.thtml:122
+#, fuzzy
 msgid "devcp_uploader_created_results"
 msgstr ""
-"<p>已�功建立您元件的清單。由您的上傳檔案中�得的基本資訊已被儲存，但�有許多"
-"資訊是�自訂的。</p><p>元件目�被標記為「<strong>未完�</strong>�，�完�您的"
-"元件，您需�確�它有明確的�稱�摘��敘述，且至少�擇一個分類。您�以用以下�"
-"�編輯元件資訊，且隨時都�以在<a %s>狀態��</a>檢查元件狀態。"
-
-#: views/developers/uploader.thtml:143
+"<p>Your add-on listing has been successfully created. The basic information "
+"obtained from your uploaded file has been stored, but there's a lot more to "
+"your listing that can be customized.</p><p>Your add-on is currently marked "
+"as <strong>Incomplete</strong>. In order to complete your add-on, you'll "
+"need to make sure it has an accurate name, summary, and description, as well "
+"as at least one selected category. You can edit your add-on's information "
+"using the link below and check the status of your add-on at any time on the "
+"<a %s>status page</a>."
+
+#: views/developers/uploader.thtml:109
+#, fuzzy
 msgid "devcp_uploader_error_correct"
-msgstr "請修正這個�題後�上傳檔案。"
+msgstr "Please correct this problem and upload your file again."
 
 #. %1$s is a version number, %2$s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:175
+#: views/developers/uploader.thtml:141
+#, fuzzy
 msgid "devcp_uploader_file_created"
-msgstr "您的新檔案已加入版本 %1$s，目�被標記為%2$s。"
+msgstr ""
+"Your new file has been added to version %1$s and is currently marked as %2$s."
 
-#: views/developers/uploader.thtml:154
+#: views/developers/uploader.thtml:120
+#, fuzzy
 msgid "devcp_uploader_header_created"
-msgstr "元件已建立�"
+msgstr "Add-on Created!"
 
-#: views/developers/uploader.thtml:141
+#: views/developers/uploader.thtml:107
+#, fuzzy
 msgid "devcp_uploader_header_error"
-msgstr "哎呀�這個檔案似乎有些�題…"
+msgstr "Oops! There seems to be a problem with this file..."
 
-#: views/developers/uploader.thtml:173
+#: views/developers/uploader.thtml:139
+#, fuzzy
 msgid "devcp_uploader_header_file_added"
-msgstr "檔案已新增�"
+msgstr "File Added!"
 
 #: views/developers/uploader.thtml:66
+#, fuzzy
 msgid "devcp_uploader_header_how"
-msgstr "這是如何�作的？"
+msgstr "How does it all work?"
 
 #. %s is the version number, e.g. 3.2.
-#: views/developers/uploader.thtml:163
+#: views/developers/uploader.thtml:129
+#, fuzzy
 msgid "devcp_uploader_header_update_created"
-msgstr "已建立版本 %s"
+msgstr "Version %s Created"
 
-#: views/developers/uploader.thtml:117
+#: views/developers/uploader.thtml:83
+#, fuzzy
 msgid "devcp_uploader_header_upload"
-msgstr "上傳您的檔案"
+msgstr "Upload Your File"
 
 #: views/developers/uploader.thtml:67
+#, fuzzy
 msgid "devcp_uploader_how"
 msgstr ""
-"<p>感�您希望將上傳元件到 Mozilla 附加元件網站。將元件放在 Mozilla 附加元件是"
-"發佈元件最簡單的方�。您將得到以下的功能：</p><ul><li>�個元件將有�自的公開顯"
-"示��，內容包�元件功能的簡短摘����用的較長敘述��覽擷圖的展示等您�供的"
-"資訊。</li><li>您的元件會出�在網站的�尋與�覽清單，甚至於 Firefox 3 的附加元"
-"件管�員。</li><li>我們會用心地�供下載�務，並在您上傳新版本時�供自動更新。"
-"</li><li>您�以存�統計資訊顯示�，瞭解關於使用者的詳細資訊。</li></ul><p>放在"
-"網站的元件必須經� Mozilla 附加元件網站審核者的批准，�能�有上述全部功能。如"
-"果您已經準備好進行這個�程，並且已經準備好了�上傳的元件檔案，就按下�的「開"
-"始���</p>"
-
-#: views/developers/uploader.thtml:125
+"<p>Thanks for your interest in submitting your add-on to Mozilla Add-ons. "
+"Hosting your add-on on Mozilla Add-ons is the easiest way to handle "
+"distribution of your add-on. Here's what you'll get:</p><ul><li>Each add-on "
+"will have a public display page with information you provide, such as a "
+"brief summary of the add-on's functionality, an optional longer description, "
+"and a showcase of preview screenshots of your add-on.</li><li>Your add-on "
+"will appear in search and browse listings across the site, and even in the "
+"Add-ons Manager of Firefox 3.</li><li>We'll take care of hosting all of your "
+"downloads and providing automatic updates to users when you upload a new "
+"version.</li><li>You'll have access to a statistics dashboard with detailed "
+"information about your user base.</li></ul><p>Add-ons hosted on the site "
+"must be reviewed by a Mozilla Add-ons Editor before they will have all of "
+"the features listed above. If you're ready to start the process and have "
+"your add-on package ready for upload, just click on Get Started below!</p>"
+
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_label_platformtype"
-msgstr "支�的作業系統："
+msgstr "Supported Platforms:"
 
-#: views/developers/uploader.thtml:124
+#: views/developers/uploader.thtml:90
+#, fuzzy
 msgid "devcp_uploader_label_upload_field"
-msgstr "元件檔案："
-
-#: controllers/components/developers.php:1221
-msgid "devcp_uploader_option_other"
-msgstr "其它"
+msgstr "Add-on File: "
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:176
+#: views/developers/uploader.thtml:142
+#, fuzzy
 msgid "devcp_uploader_p_pending_file"
 msgstr ""
-"一當審核者�以進行審核時，就會公開這個新檔案。目�有 %1$s 個其他元件正在排隊。"
-"希望審核快一點嗎？�如<a %2$s>�為審核者</a>�。"
+"The new file will be available to the public as soon as an editor is able to "
+"review it. There are currently %1$s other add-ons in the queue. Want to be "
+"reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %1$s is a number, %2$s is href="..." and should stay in the <a> tag.
-#: views/developers/uploader.thtml:166
+#: views/developers/uploader.thtml:132
+#, fuzzy
 msgid "devcp_uploader_p_pending_version"
 msgstr ""
-"一當審核者�以進行審核時，就會公開這個新版本。目�有 %1$s 個其他元件正在排隊。"
-"希望審核快一點嗎？�如<a %2$s>�為審核者</a>�。"
+"The new version will be available to the public as soon as an editor is able "
+"to review it. There are currently %1$s other add-ons in the queue. Want to "
+"be reviewed faster? Consider <a %2$s>becoming an editor</a>."
 
 #. %s is a status, e.g Public or Incomplete.
-#: views/developers/uploader.thtml:165
+#: views/developers/uploader.thtml:131
+#, fuzzy
 msgid "devcp_uploader_p_update_created"
-msgstr "已建立您的新版本，目�被標記為%s。"
+msgstr "Your new version has been created and is currently marked as %s."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:177
+#: views/developers/uploader.thtml:143
+#, fuzzy
 msgid "devcp_uploader_p_update_file"
 msgstr ""
-"在<a %1$s>「版本與檔案���</a>檢視您的新檔案�檢查您元件的<a %2$s>目�狀態</"
-"a>，或按下�的按鈕<b>新增版本資訊</b>（相當建議）。"
+"View your new file in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
 #. %1$s is href="..." and should stay in the 'Versions and Files' <a> tag.
 #. %2$s is href="..." and should stay in the 'current status' <a> tag.
-#: views/developers/uploader.thtml:167
+#: views/developers/uploader.thtml:133
+#, fuzzy
 msgid "devcp_uploader_p_update_version"
 msgstr ""
-"在<a %1$s>「版本與檔案���</a>檢視您的新版本�檢查您元件的<a %2$s>目�狀態</"
-"a>，或按下�的按鈕<b>新增版本資訊</b>（相當建議）。"
+"View your new version in the <a %1$s>Versions and Files page</a>, check out "
+"your add-on's <a %2$s>current status</a>, or <b>add release notes</b> by "
+"clicking the button below (highly recommended)."
 
-#: views/developers/uploader.thtml:118
+#: views/developers/uploader.thtml:84
+#, fuzzy
 msgid "devcp_uploader_p_upload"
 msgstr ""
-"使用下�的表單上傳您的元件。如果您有多個�為特定作業系統設計的檔案，先�擇其中"
-"之一，�使用「版本與檔案管�員�上傳其他的。"
+"Upload your add-on file using the form below. If you have multiple, platform-"
+"specific files to upload, choose a single file and then upload the others "
+"using the Versions and Files Manager."
 
-#: views/developers/uploader.thtml:125
+#: views/developers/uploader.thtml:91
+#, fuzzy
 msgid "devcp_uploader_platformtype_all"
-msgstr "全部"
+msgstr "All"
 
-#: views/developers/uploader.thtml:126
+#: views/developers/uploader.thtml:92
+#, fuzzy
 msgid "devcp_uploader_platformtype_specific"
-msgstr "�用於："
-
-#. Used as first item in a <select>.
-#: controllers/components/developers.php:1185
-msgid "devcp_uploader_please_choose"
-msgstr "請�擇…"
+msgstr "Specific:"
 
 #. %1$s is the add-on name, %2$s is the version number.
 #: views/developers/uploader.thtml:57
+#, fuzzy
 msgid "devcp_uploader_title_file"
-msgstr "新增檔案至 %1$s %2$s"
+msgstr "Add File to %1$s %2$s"
 
 #: views/developers/uploader.thtml:50
+#, fuzzy
 msgid "devcp_uploader_title_submit"
-msgstr "�出新元件"
+msgstr "Submit New Add-on"
 
 #. %s is the add-on name.
 #: views/developers/uploader.thtml:54
+#, fuzzy
 msgid "devcp_uploader_title_update"
-msgstr "æ›´æ–° %s"
+msgstr "Update %s"
 
 #. %s is a full <a> tag
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "請�覽 %s 閱讀�考資訊。"
 
 #. This is the text in the <a> tag for devcp_valid_app_reference.  This should be
 #. fixed.
-#: controllers/developers_controller.php:503
+#: controllers/developers_controller.php:454
+#: controllers/developers_controller.php:1748
 msgid "devcp_valid_app_reference_linktext"
 msgstr "此��"
 
-#: controllers/developers_controller.php:581
+#: controllers/developers_controller.php:527
+#, fuzzy
 msgid "devcp_verify_author_error"
-msgstr "找�到符�這個 Email 地�的帳號。"
+msgstr "No account found for that email address."
 
-#: controllers/developers_controller.php:553
-msgid "devcp_verify_search_engine_error"
-msgstr ""
-"XML 無效或�失必�的欄�。請<a href=\"https://developer.mozilla.org/en/"
-"Creating_OpenSearch_plugins_for_Firefox\">閱讀文件</a>並檢查您的附加元件後，�"
-"�新嘗試。"
+#: controllers/developers_controller.php:2612
+#: controllers/developers_controller.php:2613
+msgid "devcp_version_edit_pagetitle"
+msgstr "編輯版本"
+
+#: controllers/developers_controller.php:2657
+msgid "devcp_version_updated_successfully"
+msgstr "版本更新�功。"
 
 #: views/developers/versions.thtml:75
+#, fuzzy
 msgid "devcp_versions_a_cancel"
-msgstr "�消"
+msgstr "Cancel"
 
 #: views/developers/versions.thtml:79
+#, fuzzy
 msgid "devcp_versions_a_delete"
-msgstr "刪除版本"
+msgstr "Delete Version"
 
 #: views/developers/versions.thtml:74
+#, fuzzy
 msgid "devcp_versions_a_empty"
-msgstr "移除空的版本"
+msgstr "Remove Empty Version"
 
 #: views/developers/versions.thtml:71
+#, fuzzy
 msgid "devcp_versions_a_remove"
-msgstr "移除？"
+msgstr "Remove?"
 
 #: views/developers/versions.thtml:91
+#, fuzzy
 msgid "devcp_versions_add"
-msgstr "新增版本"
+msgstr "Add New Version"
 
 #: views/developers/versions_delete.thtml:58
+#, fuzzy
 msgid "devcp_versions_delete_a_cancel"
-msgstr "�消"
+msgstr "Cancel"
 
 #: views/developers/versions_delete.thtml:56
+#, fuzzy
 msgid "devcp_versions_delete_a_delete"
-msgstr "刪除版本"
+msgstr "Delete Version"
 
 #. Followed by a list of reviews and files that will be removed.
 #: views/developers/versions_delete.thtml:50
+#, fuzzy
 msgid "devcp_versions_delete_also"
-msgstr "將一併刪除："
+msgstr "This will also delete:"
 
 #: views/developers/versions_delete.thtml:53
+#, fuzzy
 msgid "devcp_versions_delete_files"
 msgid_plural "devcp_versions_delete_files"
-msgstr[0] "%s 個檔案"
+msgstr[0] "%s file"
+msgstr[1] "%s files"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:48
+#, fuzzy
 msgid "devcp_versions_delete_header"
-msgstr "刪除版本 %s？"
+msgstr "Delete Version %s?"
 
 #: views/developers/versions_delete.thtml:52
+#, fuzzy
 msgid "devcp_versions_delete_reviews"
 msgid_plural "devcp_versions_delete_reviews"
-msgstr[0] "%s 則�見"
+msgstr[0] "%s review"
+msgstr[1] "%s reviews"
 
 #. %s is the version number.
 #: views/developers/versions_delete.thtml:49
+#, fuzzy
 msgid "devcp_versions_delete_sure"
-msgstr "您確定�永久刪除版本 %s 嗎？"
+msgstr "Are you sure you want to permanently delete version %s?"
 
-#: views/developers/versions_edit.thtml:102
-#: views/developers/versions_edit.thtml:155
+#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:154
+#, fuzzy
 msgid "devcp_versions_edit_a_cancel"
-msgstr "�消"
+msgstr "Cancel"
 
-#: views/developers/versions_edit.thtml:101
+#: views/developers/versions_edit.thtml:100
+#, fuzzy
 msgid "devcp_versions_edit_a_delete"
-msgstr "刪除檔案"
+msgstr "Delete File"
 
-#: views/developers/versions_edit.thtml:165
+#: views/developers/versions_edit.thtml:164
+#, fuzzy
 msgid "devcp_versions_edit_a_new_app"
-msgstr "新增應用程�"
+msgstr "Add New Application"
 
-#: views/developers/versions_edit.thtml:154
+#: views/developers/versions_edit.thtml:153
+#, fuzzy
 msgid "devcp_versions_edit_a_remove_app"
-msgstr "移除應用程�"
+msgstr "Remove Application"
 
-#: views/developers/versions_edit.thtml:114
+#: views/developers/versions_edit.thtml:113
+#, fuzzy
 msgid "devcp_versions_edit_add"
-msgstr "新增檔案"
+msgstr "Add New File"
 
 #. %s is href=... and should stay in the <a> tag.
-#: views/developers/versions_edit.thtml:121
+#: views/developers/versions_edit.thtml:120
+#, fuzzy
 msgid "devcp_versions_edit_adjust"
 msgstr ""
-"調整這裡的應用程�資訊會�許使用者安�您的元件，�使檔案中的 install.rdf 指出"
-"元件是�相容的。 <a %s>支�的應用程�列表</a>"
+"Adjusting application information here will allow users to install your add-"
+"on even if the install.rdf in the package indicates that the add-on is "
+"incompatible. <a %s>List of supported applications</a>"
 
-#: views/developers/versions_edit.thtml:153
+#: views/developers/versions_edit.thtml:152
+#, fuzzy
 msgid "devcp_versions_edit_compat_sure"
-msgstr "您<b>確定</b>�移除�這個應用程�的相容性嗎？"
+msgstr ""
+"Are you <b>sure</b> you wish to remove compatibility with this application?"
 
-#: views/developers/versions_edit.thtml:100
+#: views/developers/versions_edit.thtml:99
+#, fuzzy
 msgid "devcp_versions_edit_delete_sure"
-msgstr "您<b>確定</b>�永久刪除這個檔案嗎？"
+msgstr "Are you <b>sure</b> you wish to permanently delete this file?"
 
-#: views/developers/versions_edit.thtml:203
+#: views/developers/versions_edit.thtml:186
+#, fuzzy
 msgid "devcp_versions_edit_header_approval"
-msgstr "審核資訊"
+msgstr "Approval Information"
 
-#: views/developers/versions_edit.thtml:120
+#: views/developers/versions_edit.thtml:119
+#, fuzzy
 msgid "devcp_versions_edit_header_compat"
-msgstr "相容的應用程�"
+msgstr "Compatible Applications"
 
-#: views/developers/versions_edit.thtml:74
+#: views/developers/versions_edit.thtml:73
+#, fuzzy
 msgid "devcp_versions_edit_header_file"
-msgstr "檔案資訊"
-
-#: views/developers/versions_edit.thtml:189
-msgid "devcp_versions_edit_header_license"
-msgstr "授權�款"
+msgstr "File Information"
 
 #. %s is the version number.
-#: views/developers/versions_edit.thtml:53
+#: views/developers/versions_edit.thtml:52
+#, fuzzy
 msgid "devcp_versions_edit_header_manage"
-msgstr "管�版本 %s"
+msgstr "Manage Version %s"
 
-#: views/developers/versions_edit.thtml:212
+#: views/developers/versions_edit.thtml:194
+#, fuzzy
 msgid "devcp_versions_edit_header_notes"
-msgstr "審核註解"
+msgstr "Approval Notes"
 
-#: views/developers/versions_edit.thtml:98
+#: views/developers/versions_edit.thtml:97
+#, fuzzy
 msgid "devcp_versions_edit_img_delete"
-msgstr "刪除檔案"
+msgstr "Delete File"
 
 #. %1$s is the file id, e.g. 18723.
 #. %2$s is the platform name, e.g. ALL or Windows.
 #. %3$s is the _('date) created.
 #. %4$s is the status, e.g. "In Sandbox" or "Public".
 #. %5$s is the _('date') status was changed.
-#: views/developers/versions_edit.thtml:208
-msgid "devcp_versions_edit_li_file"
-msgstr "檔案 %1$s（%2$s）建立於 %3$s，於 %5$s 變更為%4$s"
-
 #: views/developers/versions_edit.thtml:190
-msgid "devcp_versions_edit_license_description"
-msgstr ""
-"請為您的附加元件�擇一個�當的授權�款。該授權�款�定了您在原始碼方�所給予的"
-"權利。"
+#, fuzzy
+msgid "devcp_versions_edit_li_file"
+msgstr "File %1$s (%2$s) created on %3$s and changed to %4$s on %5$s"
 
-#: views/developers/versions_edit.thtml:111
+#: views/developers/versions_edit.thtml:110
+#, fuzzy
 msgid "devcp_versions_edit_no_files"
-msgstr "找�到檔案。"
+msgstr "No files found."
 
-#: views/developers/versions_edit.thtml:213
+#: views/developers/versions_edit.thtml:195
+#, fuzzy
 msgid "devcp_versions_edit_optional"
-msgstr "�供給此版本審核者的資訊（���供）。"
+msgstr "Optional information for the Editor that reviews this version."
 
-#: views/developers/versions_edit.thtml:151
+#: views/developers/versions_edit.thtml:150
+#, fuzzy
 msgid "devcp_versions_edit_remove_compat"
-msgstr "移除應用程�相容性"
+msgstr "Remove Application Compatibility"
 
-#: views/developers/versions_edit.thtml:167
+#: views/developers/versions_edit.thtml:166
+#, fuzzy
 msgid "devcp_versions_edit_select_app"
-msgstr "請�擇一個應用程�"
+msgstr "Please Select an Application"
 
-#: views/developers/versions_edit.thtml:78
+#: views/developers/versions_edit.thtml:77
+#, fuzzy
 msgid "devcp_versions_edit_th_file"
-msgstr "檔案"
+msgstr "File"
 
-#: views/developers/versions_edit.thtml:79
+#: views/developers/versions_edit.thtml:78
+#, fuzzy
 msgid "devcp_versions_edit_th_platform"
-msgstr "作業系統"
+msgstr "Platform"
 
-#: views/developers/versions_edit.thtml:80
+#: views/developers/versions_edit.thtml:79
+#, fuzzy
 msgid "devcp_versions_edit_th_size"
-msgstr "大�"
+msgstr "Size"
 
-#: views/developers/versions_edit.thtml:81
+#: views/developers/versions_edit.thtml:80
+#, fuzzy
 msgid "devcp_versions_edit_th_status"
-msgstr "狀態"
+msgstr "Status"
 
-#: views/developers/versions_edit.thtml:183
+#: views/developers/versions_edit.thtml:182
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_description"
 msgstr ""
-"關於這個版本的新功能�已知�題�其他有用資訊。使用 Firefox 3 附加元件管�員更"
-"新的使用者也能看到這個資訊。"
+"Information about changes in this release, new features, known bugs, and "
+"other useful information specific to this release/version. This information "
+"will also be available to users updating the add-on in the Firefox 3 Add-ons "
+"Manager interface."
 
-#: views/developers/versions_edit.thtml:182
+#: views/developers/versions_edit.thtml:181
+#, fuzzy
 msgid "devcp_versions_edit_transbox_releasenotes_name"
-msgstr "版本資訊"
+msgstr "Release Notes"
 
-#: views/developers/versions_edit.thtml:164
+#: views/developers/versions_edit.thtml:163
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_compat"
 msgstr ""
-"<strong>您有未儲存的變更。</strong>除�您按下�的「更新版本�，�則相容性�會"
-"被刪除。"
+"<strong>You have unsaved changes.</strong> Compatibility will not be deleted "
+"until you click Update Version below."
 
-#: views/developers/versions_edit.thtml:113
+#: views/developers/versions_edit.thtml:112
+#, fuzzy
 msgid "devcp_versions_edit_unsaved_files"
 msgstr ""
-"<strong>您有未儲存的變更。</strong>除�您按下�的「更新版本�，�則檔案�會被"
-"刪除。"
+"<strong>You have unsaved changes.</strong> Files will not be deleted until "
+"you click Update Version below."
 
-#: views/developers/versions_edit.thtml:218
+#: views/developers/versions_edit.thtml:200
+#, fuzzy
 msgid "devcp_versions_edit_update"
-msgstr "更新版本"
+msgstr "Update Versions"
 
 #: views/developers/versions.thtml:49
+#, fuzzy
 msgid "devcp_versions_header_manage"
-msgstr "管�版本與檔案"
+msgstr "Manage Versions and Files"
 
 #: views/developers/versions.thtml:87
+#, fuzzy
 msgid "devcp_versions_no_versions"
-msgstr "沒有版本。"
+msgstr "No versions."
 
 #. %s is a version number, base 10.
 #: views/developers/versions.thtml:46
+#, fuzzy
 msgid "devcp_versions_notice_success"
-msgstr "已�功刪除版本 %s。"
+msgstr "Version %s deleted successfully."
 
 #: views/developers/versions.thtml:73
+#, fuzzy
 msgid "devcp_versions_p_remove"
-msgstr "這個版本沒有相關的檔案，�以被移除。您�移除這個版本嗎？"
+msgstr ""
+"This version has no files associated with it and can be removed. Would you "
+"like to remove this version?"
 
 #: views/developers/versions.thtml:58
+#, fuzzy
 msgid "devcp_versions_th_created"
-msgstr "已建立"
+msgstr "Created"
 
 #: views/developers/versions.thtml:57
+#, fuzzy
 msgid "devcp_versions_th_status"
-msgstr "狀態"
+msgstr "Status"
 
 #: views/developers/versions.thtml:56
+#, fuzzy
 msgid "devcp_versions_th_version"
-msgstr "版本"
+msgstr "Version"
 
-#: controllers/downloads_controller.php:91
+#: controllers/downloads_controller.php:90
 msgid "downloads_disable_warning"
 msgstr "此附加元件已�用"
 
 #: controllers/components/editors.php:57
+#, fuzzy
 msgid "editor_review_error_addon_not_nominated"
-msgstr "這個元件還沒有被�交批准。"
+msgstr "This add-on has not been nominated."
 
 #: controllers/components/editors.php:213
+#, fuzzy
 msgid "editor_review_error_file_not_pending"
-msgstr "這個元件並未等待審核。"
+msgstr "This file is not pending review."
 
 #. Actions are, for example: approving or rejecting
-#: controllers/components/editors.php:79 controllers/components/editors.php:182
+#: controllers/components/editors.php:79
+#: controllers/components/editors.php:182
+#, fuzzy
 msgid "editor_review_error_no_action"
-msgstr "請�擇一個審核行動。"
+msgstr "Please select a review action."
 
 #: controllers/components/editors.php:192
+#, fuzzy
 msgid "editor_review_error_no_applications"
-msgstr "請輸入您測試用的應用程�。"
+msgstr "Please enter the applications you tested."
 
 #. Comments are required when an editor approves or rejects an add-on.
-#: controllers/components/editors.php:84 controllers/components/editors.php:187
+#: controllers/components/editors.php:84
+#: controllers/components/editors.php:187
+#, fuzzy
 msgid "editor_review_error_no_comments"
-msgstr "請輸入審核�見。"
+msgstr "Please enter review comments."
 
 #: controllers/components/editors.php:161
+#, fuzzy
 msgid "editor_review_error_no_files"
-msgstr "請至少�一個檔案審核。"
+msgstr "Please select at least one file to review."
 
 #: controllers/components/editors.php:197
+#, fuzzy
 msgid "editor_review_error_no_operating_system"
-msgstr "請輸入您測試用的作業系統。"
+msgstr "Please enter the operating systems you tested."
 
 #: views/editors/logs.thtml:51
 msgid "editorcp_logs_button_filter"
@@ -4314,7 +4485,7 @@ msgstr "�濾�件"
 msgid "editorcp_logs_filter_by"
 msgstr "�類型╱動作�濾"
 
-#: views/editors/logs.thtml:42 controllers/editors_controller.php:964
+#: views/editors/logs.thtml:42 controllers/editors_controller.php:807
 msgid "editorcp_logs_page_heading"
 msgstr "事件記錄"
 
@@ -4370,13 +4541,13 @@ msgstr "顯示留言"
 #: views/editors/reviewlog.thtml:45
 #, php-format
 msgid "editorcp_reviewlog_entries_between"
-msgstr "檢視從 %1$s 到 %2$s 的項目"
+msgstr "檢視 %s 到 %s 間的記錄"
 
 #: views/editors/reviewlog.thtml:104
 msgid "editorcp_reviewlog_none_found"
 msgstr "此日期間無審核記錄。"
 
-#: views/editors/reviewlog.thtml:42
+#: views/editors/reviewlog.thtml:42 controllers/editors_controller.php:833
 msgid "editorcp_reviewlog_page_heading"
 msgstr "審核記錄"
 
@@ -4400,24 +4571,24 @@ msgstr "最近審核者動態"
 msgid "editorcp_summary_totalreviews_heading"
 msgstr "所有審核"
 
-#: controllers/editors_controller.php:248
-#: controllers/editors_controller.php:249
+#: controllers/editors_controller.php:372
+#: controllers/editors_controller.php:373
 msgid "editors_addon_review_pagetitle"
 msgstr "審核附加元件"
 
-#: controllers/editors_controller.php:349
+#: controllers/editors_controller.php:471
 msgid "editors_error_js-formerror"
 msgstr "請完�下�的欄�："
 
-#: controllers/editors_controller.php:350
+#: controllers/editors_controller.php:472
 msgid "editors_error_review_one_file"
 msgstr "請至少�一個檔案審核。"
 
-#: controllers/editors_controller.php:274
+#: controllers/editors_controller.php:398
 msgid "editors_error_self_reviews_forbidden"
 msgstr "��許自己審核自己。"
 
-#: controllers/editors_controller.php:699
+#: controllers/editors_controller.php:308
 msgid "editors_external_software"
 msgstr "外部軟體支�"
 
@@ -4429,39 +4600,39 @@ msgstr "新增精�元件"
 msgid "editors_featured_add_feature_submit"
 msgstr "新增"
 
-#: views/editors/featured.thtml:49 controllers/editors_controller.php:832
-#: controllers/editors_controller.php:848
+#: views/editors/featured.thtml:49 controllers/editors_controller.php:675
+#: controllers/editors_controller.php:691
 msgid "editors_featured_addon_add_failure"
 msgstr "新增精�元件失敗。"
 
-#: controllers/editors_controller.php:851
+#: controllers/editors_controller.php:694
 msgid "editors_featured_addon_add_success"
 msgstr "新增精�元件�功。"
 
-#: views/editors/featured.thtml:50 controllers/editors_controller.php:839
-#: controllers/editors_controller.php:868
-#: controllers/editors_controller.php:886
+#: views/editors/featured.thtml:50 controllers/editors_controller.php:682
+#: controllers/editors_controller.php:711
+#: controllers/editors_controller.php:729
 msgid "editors_featured_addon_edit_failure"
 msgstr "編輯精�元件失敗。"
 
-#: views/editors/featured.thtml:51 controllers/editors_controller.php:888
+#: views/editors/featured.thtml:51 controllers/editors_controller.php:731
 msgid "editors_featured_addon_edit_success"
 msgstr "編輯精�元件�功。"
 
-#: views/editors/featured.thtml:53 controllers/editors_controller.php:861
+#: views/editors/featured.thtml:53 controllers/editors_controller.php:704
 msgid "editors_featured_addon_invalid_locale"
 msgstr "一個以上的語言無效。"
 
-#: views/editors/featured.thtml:52 controllers/editors_controller.php:906
+#: views/editors/featured.thtml:52 controllers/editors_controller.php:749
 msgid "editors_featured_addon_remove_failure"
 msgstr "移除精�元件失敗。"
 
-#: controllers/editors_controller.php:901
+#: controllers/editors_controller.php:744
 msgid "editors_featured_addon_remove_success"
 msgstr "移除精�元件�功。"
 
-#: controllers/editors_controller.php:915
-#: controllers/editors_controller.php:917
+#: controllers/editors_controller.php:758
+#: controllers/editors_controller.php:760
 msgid "editors_featured_addons_pagetitle"
 msgstr "精�附加元件"
 
@@ -4473,259 +4644,217 @@ msgstr "�"
 msgid "editors_featured_remove_feature"
 msgstr "移除精�元件"
 
-#: views/editors/queue.thtml:46
+#: views/editors/queue.thtml:47
 msgid "editors_filter_queue"
 msgstr "佇列�濾�件"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_helpful_links"
 msgstr "一些有幫助的��"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_guide"
 msgstr "審核者指�"
 
-#: views/editors/queue.thtml:182
+#: views/editors/queue.thtml:113
 msgid "editors_link_policy"
 msgstr "附加元件政策"
 
-#: views/editors/queue.thtml:47
+#: views/editors/queue.thtml:49
 msgid "editors_notice_filter_session"
 msgstr "這些�濾�件會�留到關閉�覽器或手動清除。"
 
+# %1 is the queue mode
 #. %1 is the queue mode
-#: views/editors/queue.thtml:177 views/admin/flagged_queue.thtml:89
+#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
 msgid "editors_notice_none_found"
 msgstr "目�沒有 %s 附加元件待審核。"
 
-#: controllers/editors_controller.php:1040
+#: controllers/editors_controller.php:261
 msgid "editors_one_day"
 msgstr "1 天"
 
-#: controllers/editors_controller.php:1048
+#: controllers/editors_controller.php:269
 msgid "editors_one_hour"
 msgstr "1 �時"
 
-#: controllers/editors_controller.php:1056
+#: controllers/editors_controller.php:277
 msgid "editors_one_minute"
 msgstr "1 分"
 
-#: controllers/editors_controller.php:64 controllers/editors_controller.php:73
-#: controllers/editors_controller.php:77
+#: controllers/editors_controller.php:61 controllers/editors_controller.php:70
+#: controllers/editors_controller.php:74
 msgid "editors_pagetitle"
 msgstr "審核者工具"
 
 #. %s is a comma separated list of platforms.  Example:  Windows, OS X
-#: controllers/editors_controller.php:680
-#: controllers/editors_controller.php:683
+#: controllers/editors_controller.php:289
+#: controllers/editors_controller.php:292
 #, php-format
 msgid "editors_platform_x_only"
 msgstr "%s 專用"
 
-#: controllers/editors_controller.php:695
+#: controllers/editors_controller.php:304
 msgid "editors_pre-release"
-msgstr "發行�版本（Pre-release）"
+msgstr "發行�版本 (Pre-release)"
 
+# %1 is the app name
 #. %1 is the app name
-#: views/editors/queue.thtml:131
+#: views/editors/queue.thtml:78
 #, php-format
 msgid "editors_queue_app_compatibility"
 msgstr "相容於 %s"
 
-#: views/editors/queue.thtml:51
-msgid "editors_queue_filter_label_addon"
-msgstr "附加元件或作者 Email"
-
-#: views/editors/queue.thtml:72
-msgid "editors_queue_filter_label_addontypes"
-msgstr "附加元件種類"
-
-#: views/editors/queue.thtml:56
-msgid "editors_queue_filter_label_application"
-msgstr "應用程�"
-
-#: views/editors/queue.thtml:61
-msgid "editors_queue_filter_label_maxversion"
-msgstr "Max. Version"
-
-#: views/editors/queue.thtml:78
-msgid "editors_queue_filter_label_platforms"
-msgstr "作業系統"
-
-#: views/editors/queue.thtml:66
-msgid "editors_queue_filter_label_submissionage"
-msgstr "傳�時間（日）"
-
-#. %1$s is a number
-#: views/editors/queue.thtml:90
-msgid "editors_queue_filter_result_count"
-msgid_plural "editors_queue_filter_result_count"
-msgstr[0] "�濾後的�尋�果： <strong>%1$s</strong> 個附加元件"
-
-#: views/editors/queue.thtml:84
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_clean"
 msgstr "清除"
 
-#: views/editors/queue.thtml:83
+#: views/editors/queue.thtml:65
 msgid "editors_queue_submit_filter"
 msgstr "�濾�件"
 
-#: controllers/editors_controller.php:133
+#: controllers/editors_controller.php:136
 msgid "editors_queues_disabled"
 msgstr "所有審核佇列目�已�用，請�後�回來查看。"
 
-#: views/editors/review.thtml:149
-msgid "editors_review_a_edit_item"
-msgstr "編輯項目"
-
-#: views/editors/review.thtml:146
-msgid "editors_review_a_item_history"
-msgstr "項目歷�"
-
-#: views/editors/review.thtml:148
-msgid "editors_review_a_item_homepage"
-msgstr "項目首�"
-
-#: views/editors/review.thtml:145
-msgid "editors_review_a_item_overview"
-msgstr "項目概觀"
-
-#: views/editors/review.thtml:147
-msgid "editors_review_a_previews"
-msgstr "�覽圖片"
-
-#: controllers/editors_controller.php:345
+#: controllers/editors_controller.php:467
 msgid "editors_review_action"
 msgstr "審核動作"
 
-#: views/editors/review.thtml:159
+#: views/editors/review.thtml:153
+#, fuzzy
 msgid "editors_review_action_info"
-msgstr "請求更多資訊"
+msgstr "Request More Information"
 
-#: views/editors/review.thtml:157
+#: views/editors/review.thtml:151
 msgid "editors_review_action_public"
 msgstr "�至「公開��"
 
-#: views/editors/review.thtml:160
+#: views/editors/review.thtml:154
 msgid "editors_review_action_request_superreview"
 msgstr "�交管�員審核"
 
-#: views/editors/review.thtml:158
+#: views/editors/review.thtml:152
 msgid "editors_review_action_sandbox"
 msgstr "退回「沙箱��"
 
-#: controllers/editors_controller.php:346
+#: controllers/editors_controller.php:468
 msgid "editors_review_comments"
 msgstr "審核者留言"
 
-#: views/editors/review.thtml:182
+#: views/editors/review.thtml:176
+#, fuzzy
 msgid "editors_review_details_info_request"
 msgstr ""
-"使用這個表單�作者請求更多資訊，他們會收到一� Email 並能在此答覆。當他們回應"
-"時，您將收到 Email 通知。"
+"Use this form to request more information from the author. They will receive "
+"an email and be able to answer here. You will be notified by email when they "
+"reply."
 
-#: views/editors/review.thtml:174
+#: views/editors/review.thtml:168
 msgid "editors_review_details_nominated_public"
 msgstr ""
-"這個�項會讓附加元件最新版本和其檔案放上「公開��，但後續更新版本還是會先�到"
-"「沙箱��等待審核者批准。"
+"這個�項會讓附加元件最新版本和其檔案放上「公開��，但後續更新版本還是會先�"
+"到「沙箱��等待審核者批准。"
 
-#: views/editors/review.thtml:177
+#: views/editors/review.thtml:171
 msgid "editors_review_details_nominated_sandbox"
 msgstr "這個�項會將附加元件留在「沙箱��。"
 
-#: views/editors/review.thtml:166
+#: views/editors/review.thtml:160
 msgid "editors_review_details_pending_public"
 msgstr "這個�項會附加元件在「沙箱��的待審核版本放上「公開��。"
 
-#: views/editors/review.thtml:169
+#: views/editors/review.thtml:163
 msgid "editors_review_details_pending_sandbox"
 msgstr "這個�項會讓附加元件在「沙箱��的待審核版本留在「沙箱��。"
 
-#: views/editors/review.thtml:185
+#: views/editors/review.thtml:181
 msgid "editors_review_details_superreview"
 msgstr ""
-"如果您覺得此附加元件有安全上�版權上的疑慮或其他需�管�員處�的�題，請在下�"
-"輸入您的留言。這會直接�交給管�員處�。"
+"如果您覺得此附加元件有安全上�版權上的疑慮或其他需�管�員處�的�題，請在下"
+"�輸入您的留言。這會直接�交給管�員處�。"
 
-#: views/editors/review.thtml:134
+#: views/editors/review.thtml:128
 msgid "editors_review_file_diff_link"
 msgstr "與公開版本比較"
 
-#: views/editors/review.thtml:131
+#: views/editors/review.thtml:125
 msgid "editors_review_file_viewcontents_link"
 msgstr "檢視內容"
 
-#: views/editors/review.thtml:65
+#: views/editors/review.thtml:59
 msgid "editors_review_header_authors"
 msgstr "作者："
 
-#: views/editors/review.thtml:79
+#: views/editors/review.thtml:73
 msgid "editors_review_header_categories"
 msgstr "分類："
 
-#: views/editors/review.thtml:92
+#: views/editors/review.thtml:86
 msgid "editors_review_header_compatibility"
 msgstr "相容於："
 
-#: views/editors/review.thtml:251
+#: views/editors/review.thtml:247
 msgid "editors_review_header_description"
 msgstr "敘述："
 
-#: views/editors/review.thtml:275
+#: views/editors/review.thtml:271
 msgid "editors_review_header_devcomments"
 msgstr "開發者留言"
 
-#: views/editors/review.thtml:263
+#: views/editors/review.thtml:259
 msgid "editors_review_header_eula"
 msgstr "授權�約"
 
-#: views/editors/review.thtml:115
+#: views/editors/review.thtml:109
 msgid "editors_review_header_files"
 msgstr "檔案："
 
-#: views/editors/review.thtml:284
+#: views/editors/review.thtml:280
 msgid "editors_review_header_itemhistory"
 msgstr "項目歷�"
 
-#: views/editors/review.thtml:232
+#: views/editors/review.thtml:228
 msgid "editors_review_header_nominationmessage"
 msgstr "�交批准訊�"
 
-#: views/editors/review.thtml:311
+#: views/editors/review.thtml:307
 msgid "editors_review_header_previews"
 msgstr "�覽圖片"
 
-#: views/editors/review.thtml:269
+#: views/editors/review.thtml:265
 msgid "editors_review_header_privacy"
 msgstr "隱�政策"
 
+# %1 is the addon name and version
 #. %1 is the add-on name and version
-#: views/editors/review.thtml:56
+#: views/editors/review.thtml:50
 #, php-format
 msgid "editors_review_header_review"
 msgstr "審核 %s"
 
-#: views/editors/review.thtml:239
+#: views/editors/review.thtml:235
 msgid "editors_review_header_reviewernotes"
 msgstr "給審核者的留言"
 
-#: views/editors/review.thtml:245
+#: views/editors/review.thtml:241
 msgid "editors_review_header_summary"
 msgstr "摘�"
 
-#: views/editors/review.thtml:257
+#: views/editors/review.thtml:253
 msgid "editors_review_header_versionnotes"
 msgstr "版本資訊"
 
 #. a noun: shown in an add-on's editor review history
 #: views/elements/developers/editors_review_history_item.thtml:80
+#, fuzzy
 msgid "editors_review_history_info_reply"
-msgstr "回覆"
+msgstr "Reply"
 
 #: views/elements/developers/editors_review_history_item.thtml:78
+#, fuzzy
 msgid "editors_review_history_info_request"
-msgstr "資訊請求"
+msgstr "Information Request"
 
 #: views/elements/developers/editors_review_history_item.thtml:62
 #: views/editors/reviewlog.thtml:77
@@ -4742,7 +4871,7 @@ msgstr "批准通��公開�"
 msgid "editors_review_history_nominated_denied"
 msgstr "批准失敗�沙箱�"
 
-#: views/editors/review.thtml:303
+#: views/editors/review.thtml:299
 msgid "editors_review_history_nonefound"
 msgstr "找�到先�的審核記錄。"
 
@@ -4764,90 +4893,87 @@ msgstr "已拒絕�沙箱�"
 #. link text in an add-on's editor review history, allowing to hide and show an information request's replies
 #. %1 is the number of replies
 #: views/elements/developers/editors_review_history_item.thtml:90
+#, fuzzy
 msgid "editors_review_history_show_hide_replies"
 msgid_plural "editors_review_history_show_hide_replies"
-msgstr[0] "顯示�隱�回覆（%1$s）"
+msgstr[0] "Show/Hide Replies (%1$s)"
+msgstr[1] "Show/Hide Replies (%1$s)"
 
-#: views/editors/review.thtml:208
+#: views/editors/review.thtml:204
 msgid "editors_review_label_applications"
 msgstr "應用程�："
 
-#: views/editors/review.thtml:196
+#: views/editors/review.thtml:192
 msgid "editors_review_label_cannedresponse"
 msgstr "或�一個回覆訊�："
 
-#: views/editors/review.thtml:190
+#: views/editors/review.thtml:186
 msgid "editors_review_label_comments"
 msgstr "留言："
 
-#: views/editors/review.thtml:204
+#: views/editors/review.thtml:200
 msgid "editors_review_label_operating_systems"
 msgstr "作業系統："
 
-#: views/editors/review.thtml:285 views/editors/review.thtml:312
+#: views/editors/review.thtml:281 views/editors/review.thtml:308
 msgid "editors_review_link_pagetop"
 msgstr "回頂端"
 
-#: views/editors/review.thtml:141
-msgid "editors_review_mulitple_notice"
-msgstr "注�：唯有當您已測試「�一個�所�擇的檔案時，�審核多於一個檔案。"
-
-#: views/editors/review.thtml:51
+#: views/editors/review.thtml:45
 msgid "editors_review_next_link"
 msgstr "下一� &raquo;"
 
-#: views/editors/review.thtml:322
+#: views/editors/review.thtml:318
 msgid "editors_review_previews_notfound"
 msgstr "無�覽圖片。"
 
-#: views/editors/review.thtml:50
+#: views/editors/review.thtml:44
 msgid "editors_review_previous_link"
 msgstr "&laquo; 上一�"
 
-#: controllers/editors_controller.php:144
-#: controllers/editors_controller.php:146
+#: controllers/editors_controller.php:149
+#: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
 msgstr "審核佇列"
 
+# %1 is the add-ons rank in the queue, %2 is the total queue length
 #. %1 is the add-ons rank in the queue, %2 is the total queue length
-#: views/editors/review.thtml:47
+#: views/editors/review.thtml:43
 msgid "editors_review_rank_in_queue"
 msgstr "在 %2$s 篇中排行 <strong># %1$s</strong>"
 
-#. %1 is the add-ons rank in the queue, %2 is the total queue length.  Both numbers
-#: views/editors/review.thtml:45
-msgid "editors_review_rank_in_queue_filtered"
-msgstr "在 %2$s 篇中排行 <strong># %1$s</strong> （�濾後）"
-
-#: views/editors/review.thtml:223
+#: views/editors/review.thtml:219
 msgid "editors_review_submit_process_action"
 msgstr "處�動作"
 
-#: views/editors/review.thtml:293
+#: views/editors/review.thtml:289
 msgid "editors_review_th_action"
 msgstr "動作"
 
-#: views/editors/review.thtml:294
+#: views/editors/review.thtml:290
 msgid "editors_review_th_comments"
 msgstr "留言"
 
-#: views/editors/review.thtml:291
+#: views/editors/review.thtml:287
 msgid "editors_review_th_date"
 msgstr "日期"
 
-#: views/editors/review.thtml:292
+#: views/editors/review.thtml:288
 msgid "editors_review_th_reviewer"
 msgstr "審核者"
 
-#: views/editors/review.thtml:290
+#: views/editors/review.thtml:286
 msgid "editors_review_th_version_file"
 msgstr "版本�檔案"
 
-#: views/editors/review.thtml:217
+#: views/editors/review.thtml:213
+#, fuzzy
 msgid "editors_review_update_notify_once"
-msgstr "這個元件下次更新時通知我。（之後的更新將�會寄� Email）"
+msgstr ""
+"Notify me the next time this add-on is updated. (Subsequent updates will not "
+"generate an email)"
 
-#: controllers/editors_controller.php:298
+#: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "審核已�功。"
 
@@ -4871,7 +4997,7 @@ msgstr "動作"
 msgid "editors_reviews_in_reply_to"
 msgstr "回覆："
 
-#: controllers/editors_controller.php:748
+#: controllers/editors_controller.php:591
 msgid "editors_reviews_processed"
 msgstr "審核已�功處��"
 
@@ -4883,79 +5009,87 @@ msgstr "目�沒有待審核項目。"
 msgid "editors_reviews_submit_process_reviews"
 msgstr "處�審核"
 
-#: controllers/editors_controller.php:691
+#: controllers/editors_controller.php:300
 msgid "editors_site_specific"
 msgstr "為特定網站設計"
 
-#: controllers/editors_controller.php:348
+#: controllers/editors_controller.php:231
+msgid "editors_submissiontype_new"
+msgstr "新進元件"
+
+#: controllers/editors_controller.php:232
+msgid "editors_submissiontype_updated"
+msgstr "後續更新"
+
+#: controllers/editors_controller.php:470
 msgid "editors_tested_app"
 msgstr "已測試應用程�"
 
-#: controllers/editors_controller.php:347
+#: controllers/editors_controller.php:469
 msgid "editors_tested_os"
 msgstr "已測試作業系統"
 
-#: views/editors/queue.thtml:151
+#: views/editors/queue.thtml:82
 msgid "editors_th_additional_info"
 msgstr "附加資訊"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:109
+#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
 #: views/admin/flagged_queue.thtml:53
 msgid "editors_th_addon"
 msgstr "附加元件"
 
-#: views/editors/queue.thtml:125
+#: views/editors/queue.thtml:74
 msgid "editors_th_addontype"
 msgstr "種類"
 
+#: views/editors/queue.thtml:54
+msgid "editors_th_addontypes"
+msgstr "附加元件種類"
+
+#: views/editors/queue.thtml:81
+msgid "editors_th_age"
+msgstr "經�時間"
+
+#: views/editors/queue.thtml:56
+msgid "editors_th_applications"
+msgstr "應用程�"
+
 #: views/editors/featured.thtml:64
 msgid "editors_th_locales"
 msgstr "�制語言？"
 
-#: views/editors/queue.thtml:148
-msgid "editors_th_nomination_age"
-msgstr "排隊時間"
-
-#: views/editors/queue.thtml:101 views/editors/queue.thtml:117
-#: views/editors/queue.thtml:144
-msgid "editors_th_sort_ascending"
-msgstr "�冪排�"
+#: views/editors/queue.thtml:55
+msgid "editors_th_platforms"
+msgstr "作業系統"
 
-#: views/editors/queue.thtml:105 views/editors/queue.thtml:121
-#: views/editors/queue.thtml:140
-msgid "editors_th_sort_descending"
-msgstr "�冪排�"
+#: views/editors/queue.thtml:57
+msgid "editors_th_submissiontypes"
+msgstr "上傳種類"
 
 #. %s is a number
-#: controllers/editors_controller.php:1036
+#: controllers/editors_controller.php:257
 #, php-format
 msgid "editors_x_days"
 msgstr "%s 天"
 
 #. %s is a number
-#: controllers/editors_controller.php:1044
+#: controllers/editors_controller.php:265
 #, php-format
 msgid "editors_x_hours"
 msgstr "%s �時"
 
 #. %s is a number
-#: controllers/editors_controller.php:1052
+#: controllers/editors_controller.php:273
 #, php-format
 msgid "editors_x_minutes"
 msgstr "%s 分"
 
 #: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
 #: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:607
-#: controllers/components/amo.php:608 controllers/components/amo.php:609
+#: controllers/components/simple_acl.php:83 controllers/components/amo.php:606
+#: controllers/components/amo.php:607 controllers/components/amo.php:608
 #: controllers/reviews_controller.php:353
 #: controllers/reviews_controller.php:485
-#: controllers/collections_controller.php:438
-#: controllers/collections_controller.php:496
-#: controllers/collections_controller.php:504
-#: controllers/collections_controller.php:971
-#: controllers/collections_controller.php:1034
-#: controllers/collections_controller.php:1077
 msgid "error_access_denied"
 msgstr "存�被拒絕"
 
@@ -4963,32 +5097,30 @@ msgstr "存�被拒絕"
 msgid "error_access_denied_message"
 msgstr "您未經授權檢視此��。"
 
-#: controllers/collections_controller.php:1039
-msgid "error_addon_exists"
-msgstr "附加元件已經存在�"
-
-#: controllers/developers_controller.php:200
-#: controllers/developers_controller.php:593
-#: controllers/developers_controller.php:1016
-#: controllers/developers_controller.php:1429
-#: controllers/downloads_controller.php:95
-#: controllers/downloads_controller.php:102
-#: controllers/downloads_controller.php:164
-#: controllers/statistics_controller.php:135
+#: controllers/developers_controller.php:177
+#: controllers/developers_controller.php:539
+#: controllers/developers_controller.php:962
+#: controllers/developers_controller.php:1356
+#: controllers/developers_controller.php:1492
+#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2777
+#: controllers/downloads_controller.php:94
+#: controllers/downloads_controller.php:101
+#: controllers/downloads_controller.php:153
+#: controllers/statistics_controller.php:127
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
-#: controllers/reviews_controller.php:77 controllers/reviews_controller.php:240
+#: controllers/reviews_controller.php:77
+#: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:332
 #: controllers/reviews_controller.php:340 controllers/api_controller.php:123
 #: controllers/api_controller.php:759 controllers/addons_controller.php:131
-#: controllers/addons_controller.php:197 controllers/addons_controller.php:1407
-#: controllers/addons_controller.php:1465
-#: controllers/addons_controller.php:1469
-#: controllers/addons_controller.php:1503
-#: controllers/editors_controller.php:265
-#: controllers/collections_controller.php:1041
-#: controllers/collections_controller.php:1074
+#: controllers/addons_controller.php:192
+#: controllers/addons_controller.php:1161
+#: controllers/addons_controller.php:1211
+#: controllers/addons_controller.php:1215
+#: controllers/editors_controller.php:389
 msgid "error_addon_notfound"
 msgstr "找�到附加元件�"
 
@@ -5000,7 +5132,7 @@ msgstr "此附加元件無法在此�覽。"
 msgid "error_addon_selfreview"
 msgstr "您無法�您自己的附加元件發表�見。"
 
-#: controllers/addons_controller.php:970
+#: controllers/addons_controller.php:726
 msgid "error_browse_no_addons"
 msgstr "此分類無附加元件�"
 
@@ -5008,88 +5140,83 @@ msgstr "此分類無附加元件�"
 msgid "error_collection_feed_notfound"
 msgstr "沒有找到附加元件的消�來�。"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:194
+#: views/users/register.thtml:60 views/users/edit.thtml:176
+#: views/developers/add_step2.thtml:117
 msgid "error_email_invalid"
 msgstr "Email 地�無效。"
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:70
-#: views/users/register.thtml:80 views/users/register.thtml:86
-#: views/users/edit.thtml:105 views/users/edit.thtml:111
-#: views/users/edit.thtml:192 views/admin/users_edit.thtml:78
-#: views/admin/users_edit.thtml:83 views/reviews/add.thtml:80
-#: views/reviews/add.thtml:104
+#: views/users/pwreset.thtml:74 views/users/register.thtml:65
+#: views/users/register.thtml:75 views/users/register.thtml:81
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/admin/users_edit.thtml:63
+#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
+#: views/reviews/add.thtml:118
 msgid "error_field_required"
 msgstr "此欄��能留空。"
 
 #: controllers/files_controller.php:75 controllers/files_controller.php:93
 #: controllers/files_controller.php:96 controllers/files_controller.php:163
 #: controllers/files_controller.php:176 controllers/files_controller.php:185
-#: controllers/files_controller.php:204 controllers/editors_controller.php:412
+#: controllers/files_controller.php:204 controllers/editors_controller.php:528
 msgid "error_file_notfound"
 msgstr "找�到檔案�"
 
 #. %s is a filename
-#: controllers/editors_controller.php:430
+#: controllers/editors_controller.php:546
 #, php-format
 msgid "error_file_x_notfound"
 msgstr "檔案錯誤：%s �存在。"
 
-#: views/collections/add.thtml:55 views/collections/edit.thtml:89
-#: views/users/register.thtml:54 views/users/edit.thtml:81
-#: views/reviews/add.thtml:70 controllers/groups_controller.php:80
-#: controllers/groups_controller.php:102
+#: views/users/register.thtml:49 views/users/edit.thtml:84
+#: views/reviews/add.thtml:84 controllers/developers_controller.php:1679
+#: controllers/developers_controller.php:1954
+#: controllers/developers_controller.php:2093
+#: controllers/developers_controller.php:2101
+#: controllers/developers_controller.php:2392
+#: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "此表單中有錯誤，請更正後��出一次。"
 
-#: views/users/register.thtml:109
+#: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "錯誤的圖形檢核碼，請�試一次�"
 
-#: views/users/register.thtml:100 views/users/edit.thtml:125
-#: views/admin/users_edit.thtml:101
+#: views/users/register.thtml:95 views/users/edit.thtml:128
+#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
+#: views/admin/users_edit.thtml:86
 msgid "error_invalid_url"
 msgstr "URL 格�無效，有效的 URL �這樣： htt_p://example.com/mypage。"
 
 #. %s is a string representing what's missing.  Example:  file_id
-#: controllers/downloads_controller.php:65 controllers/users_controller.php:185
-#: controllers/users_controller.php:264 controllers/users_controller.php:559
-#: controllers/users_controller.php:653 controllers/reviews_controller.php:71
+#: controllers/downloads_controller.php:65
+#: controllers/users_controller.php:185 controllers/users_controller.php:254
+#: controllers/users_controller.php:542 controllers/users_controller.php:642
+#: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:325
 #: controllers/reviews_controller.php:473
-#: controllers/reviews_controller.php:475 controllers/addons_controller.php:182
-#: controllers/addons_controller.php:1381
-#: controllers/addons_controller.php:1455
-#: controllers/collections_controller.php:266
-#: controllers/collections_controller.php:285
-#: controllers/collections_controller.php:346
-#: controllers/collections_controller.php:443
-#: controllers/collections_controller.php:482
-#: controllers/collections_controller.php:936
-#: controllers/collections_controller.php:959
-#: controllers/collections_controller.php:960
-#: controllers/collections_controller.php:975
-#: controllers/collections_controller.php:977
-#: controllers/collections_controller.php:994
-#: controllers/collections_controller.php:1003
-#: controllers/collections_controller.php:1016
-#: controllers/collections_controller.php:1017
-#: controllers/collections_controller.php:1024
-#: controllers/collections_controller.php:1070
-#: controllers/collections_controller.php:1090
+#: controllers/reviews_controller.php:475
+#: controllers/addons_controller.php:179
+#: controllers/addons_controller.php:1135
+#: controllers/addons_controller.php:1201
+#: controllers/collections_controller.php:71
 #, php-format
 msgid "error_missing_argument"
 msgstr "缺少�數：%s"
 
-#: controllers/components/amo.php:507 controllers/components/amo.php:532
+#: controllers/components/amo.php:506 controllers/components/amo.php:531
 msgid "error_no_files_in_addon"
 msgstr "沒有檔案"
 
+#: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
+msgid "error_notice"
+msgstr "注�"
+
 #: controllers/previews_controller.php:200
 msgid "error_preview_notfound"
 msgstr "找�到�覽圖片�"
 
-#: views/addons/display.thtml:400 views/reviews/add.thtml:98
+#: views/addons/display.thtml:397 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "您必須�一個評分。"
 
@@ -5097,43 +5224,37 @@ msgstr "您必須�一個評分。"
 msgid "error_user_already_confirmed"
 msgstr "此使用者帳號已確�。"
 
-#: controllers/users_controller.php:202 controllers/users_controller.php:276
-#: controllers/users_controller.php:569 controllers/users_controller.php:581
-#: controllers/users_controller.php:587 controllers/users_controller.php:610
-#: controllers/users_controller.php:627
+#: controllers/users_controller.php:202 controllers/users_controller.php:265
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "確�碼無效�"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:75
-#: views/users/edit.thtml:183
+#: views/users/pwreset.thtml:79 views/users/register.thtml:70
+#: views/users/edit.thtml:162
 msgid "error_user_confirmpw_nomatch"
 msgstr "密碼�符。"
 
-#: views/users/register.thtml:65 views/users/edit.thtml:190
-#: controllers/users_controller.php:617
+#: views/users/register.thtml:60 views/users/edit.thtml:172
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "此 Email 地�已被其他使用者使用。"
 
-#: controllers/users_controller.php:596
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Email 變更��已�期。請到使用者帳號���變更一次 Email 地�後，我們會寄給您"
 "一�確�信，請儘快按下信中的��變更�算生效。"
 
-#: controllers/collections_controller.php:985
-msgid "error_user_exists"
-msgstr "使用者一次�能扮演一個角色。請在繼續�將使用者從任何既存的角色中移除。"
-
-#: views/users/register.thtml:91 views/users/edit.thtml:116
-#: views/admin/users_edit.thtml:88
+#: views/users/register.thtml:86 views/users/edit.thtml:119
+#: views/admin/users_edit.thtml:73
 msgid "error_user_nickname_notunique"
 msgstr "此暱稱已被使用。"
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:270 controllers/users_controller.php:603
-#: controllers/users_controller.php:659
-#: controllers/collections_controller.php:988
-#: controllers/collections_controller.php:998
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "找�到使用者�"
 
@@ -5141,207 +5262,216 @@ msgstr "找�到使用者�"
 msgid "error_user_unconfirmed"
 msgstr "請先用您收到的確�碼確�您的使用者帳號。"
 
-#: views/users/login.thtml:67
+#: views/users/login.thtml:68
 msgid "error_username_or_pw_wrong"
 msgstr "使用者�稱或密碼錯誤�"
 
-#: controllers/editors_controller.php:260
+#: controllers/developers_controller.php:2624
+#: controllers/editors_controller.php:384
 msgid "error_version_notfound"
 msgstr "找�到版本�"
 
-#: views/users/delete.thtml:125 views/users/edit.thtml:173
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "輸入的密碼錯誤�"
 
-#: views/elements/amo2009/homepage_addon.thtml:122
-#: views/elements/feature.thtml:122
+#: views/elements/feature.thtml:129
 msgid "feature_learnmore"
 msgstr "詳細資訊"
 
+# %1 is the add-on name
 #. %1 is the add-on name
-#: views/elements/amo2009/homepage_addon.thtml:123
-#: views/elements/feature.thtml:123
+#: views/elements/feature.thtml:130
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s 的詳細資訊"
 
 #. %1$s is a number
-#: views/elements/amo2009/reviews.thtml:52
-#: views/elements/addon_listitem.thtml:112 views/elements/feature.thtml:99
-#: views/addons/browse_thumbs.thtml:86
+#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:99
+#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s 篇�見"
 
-#: views/elements/amo2009/homepage_addon.thtml:127
-#: views/elements/feature.thtml:127
+#: views/elements/feature.thtml:134
 msgid "feature_view_more_from_category"
 msgstr "更多�類元件："
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's main page
 #: views/files/browse.thtml:65
+#, fuzzy
 msgid "file_browser_link_addon"
-msgstr "回到附加元件"
+msgstr "Back to add-on"
 
 #. There is a list of directories and files on the page.  Clicking this will show the
 #. contents of all the directories (normally you would click on each one to see the
 #. contents)
 #: views/files/browse.thtml:67
+#, fuzzy
 msgid "file_browser_link_expand_all"
-msgstr "全部展開"
+msgstr "Expand all"
 
 #. This appears on a page that views the source of an add-on.  This link will return
 #. the user to the add-on's review page (it only appears if the add-on is being
 #. reviewed)
 #: views/files/browse.thtml:64
+#, fuzzy
 msgid "file_browser_link_review"
-msgstr "回到審核"
+msgstr "Back to review"
 
 #. The title of the page for viewing an add-on's source.
 #. %1$s is the name of the add-on
 #. %2$s is the name of the current application (e.g. Firefox or Thunderbird)
 #: views/files/browse.thtml:46
+#, fuzzy
 msgid "file_browser_title"
-msgstr "%1$s :: 檔案�覽器 :: %2$s 附加元件"
+msgstr "%1$s :: File Browser :: %2$s Add-ons"
 
 #. This appears on a page that views the source of an add-on.  There is a list of
 #. directories and files on the page.  Clicking this link will toggle between an
 #. expanded or a collapsed list.  This string should be kept short.
 #: views/files/browse.thtml:68
+#, fuzzy
 msgid "file_browser_toggle_expand_collapse"
 msgstr "+/-"
 
 #. Link text for the AMO About page.
-#: views/elements/footer.thtml:72 views/layouts/amo2009.thtml:341
+#: views/elements/footer.thtml:72
+#, fuzzy
 msgid "footer_a_about"
-msgstr "關於"
+msgstr "About"
 
 #. Link text to the AMO blog.
-#: views/elements/footer.thtml:74 views/layouts/amo2009.thtml:343
+#: views/elements/footer.thtml:74
+#, fuzzy
 msgid "footer_a_blog"
-msgstr "部�格"
+msgstr "Blog"
 
 #. Link text to the Frequently Asked Questions page.
-#: views/elements/footer.thtml:73 views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_a_faq"
-msgstr "常見�題集"
+msgstr "FAQ"
 
 #. Full text for the FAQ abbreviation.
-#: views/elements/footer.thtml:73 views/pages/collector_features.thtml:72
-#: views/layouts/amo2009.thtml:342
+#: views/elements/footer.thtml:73
+#, fuzzy
 msgid "footer_abbr_faq"
-msgstr "常見�題集"
+msgstr "Frequently Asked Questions"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "�留所有權利。"
 
-#: views/elements/footer.thtml:67 views/layouts/amo2009.thtml:336
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "版權所有"
 
-#: views/elements/footer.thtml:71 views/layouts/amo2009.thtml:340
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "感�"
 
-#: views/elements/footer.thtml:76 views/layouts/amo2009.thtml:346
+#: views/elements/footer.thtml:76
 msgid "footer_disclaimer"
 msgstr ""
-"Mozilla 出於善��供以上程���，然而我們並�代表以上程�或相關資訊的作者。使"
-"用以上程�時若有任何疑�或�滿，或需�進一步的�務，還請直接與軟體供應者�繫。"
+"Mozilla 出於善��供以上程���，然而我們並�代表以上程�或相關資訊的作者。"
+"使用以上程�時若有任何疑�或�滿，或需�進一步的�務，還請直接與軟體供應者�"
+"繫。"
 
-#: views/elements/footer.thtml:61 views/layouts/amo2009.thtml:332
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "�"
 
-#: views/elements/footer.thtml:70 views/layouts/amo2009.thtml:339
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "法律�明"
 
-#: views/elements/footer.thtml:50 views/layouts/amo2009.thtml:321
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "其他語言："
 
-#: views/elements/footer.thtml:69 views/layouts/amo2009.thtml:338
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "隱�政策"
 
-#: models/addontype.php:79
+#: views/addons/display.thtml:403
+msgid "forum_save"
+msgstr "儲存"
+
+#: models/addontype.php:89
 msgid "general_addontype_dict"
 msgstr "字典套件"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:100
+#: models/addontype.php:110
 msgid "general_addontype_dict_plural"
 msgstr "å­—å…¸"
 
-#: models/addontype.php:75
+#: models/addontype.php:85
 msgid "general_addontype_extension"
 msgstr "擴充套件"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:98
+#: models/addontype.php:108
 msgid "general_addontype_extension_plural"
 msgstr "擴充套件"
 
-#: models/addontype.php:85
+#: models/addontype.php:95
 msgid "general_addontype_lpaddon"
 msgstr "語言套件 (附加元件)"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:103
+#: models/addontype.php:113
 msgid "general_addontype_lpaddon_plural"
 msgstr "語言套件 (附加元件)"
 
-#: models/addontype.php:83
+#: models/addontype.php:93
 msgid "general_addontype_lpapp"
 msgstr "語言套件 (應用程�)"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:102
+#: models/addontype.php:112
 msgid "general_addontype_lpapp_plural"
 msgstr "語言套件 (應用程�)"
 
-#: models/addontype.php:87
+#: models/addontype.php:97
 msgid "general_addontype_plugin"
 msgstr "外掛程�"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:104
+#: models/addontype.php:114
 msgid "general_addontype_plugin_plural"
 msgstr "外掛程�"
 
-#: models/addontype.php:81
+#: models/addontype.php:91
 msgid "general_addontype_search"
 msgstr "�尋引擎"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:101
+#: models/addontype.php:111
 msgid "general_addontype_search_plural"
 msgstr "�尋引擎"
 
-#: models/addontype.php:77
+#: models/addontype.php:87
 msgid "general_addontype_theme"
 msgstr "佈景主題"
 
+# Plural in this context means many of the add-on type
 #. Plural in this context means many of the add-on type
-#: models/addontype.php:99
+#: models/addontype.php:109
 msgid "general_addontype_theme_plural"
 msgstr "佈景主題"
 
-#: config/language.php:367
-msgid "general_languages_all_locales"
-msgstr "所有語言"
-
-#: views/layouts/amo2009.thtml:249
-msgid "header_brand_name"
-msgstr "Mozilla"
-
 #. %1$s is the application name.  Example:  Firefox
 #: views/elements/header.thtml:111 views/elements/header.thtml:122
-#: views/layouts/amo2009.thtml:248
 #, php-format
 msgid "header_home_tooltip"
 msgstr "回到 %1$s 附加元件首�"
@@ -5350,80 +5480,37 @@ msgstr "回到 %1$s 附加元件首�"
 msgid "header_main_firefox_header"
 msgstr "Firefox 附加元件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:218
-msgid "header_main_firefox_header_with_logo"
-msgstr "<img alt=\"Firefox\" src=\"%1$s\" /> <strong>Firefox</strong> 附加元件"
-
 #: views/elements/header.thtml:99
 msgid "header_main_header"
 msgstr "附加元件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:242
-msgid "header_main_header_with_logo"
-msgstr "附加元件 <img alt=\"Add-ons\" src=\"%1$s\" />"
-
 #: views/elements/header.thtml:90
 msgid "header_main_seamonkey_header"
-msgstr "SeaMonkey 附加元件"
-
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:224
-msgid "header_main_seamonkey_header_with_logo"
-msgstr ""
-"<img alt=\"seamonkey\" src=\"%1$s\" /> <strong>SeaMonkey</strong> 附加元件"
+msgstr "Seamonkey 附加元件"
 
 #: views/elements/header.thtml:93
 msgid "header_main_sunbird_header"
 msgstr "Sunbird 附加元件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:230
-msgid "header_main_sunbird_header_with_logo"
-msgstr "<img alt=\"sunbird\" src=\"%1$s\" /> <strong>Sunbird</strong> 附加元件"
-
 #: views/elements/header.thtml:96
 msgid "header_main_thunderbird_header"
 msgstr "Thunderbird 附加元件"
 
-#. %1$s is the URL to the logo image
-#: views/layouts/amo2009.thtml:236
-msgid "header_main_thunderbird_header_with_logo"
-msgstr ""
-"<img alt=\"thunderbird\" src=\"%1$s\" /> <strong>Thunderbird</strong> 附加元件"
-
-#: views/layouts/amo2009.thtml:205
-msgid "header_navaccess_applications_menu"
-msgstr "跳至其他應用程�功能表"
-
-#: views/layouts/amo2009.thtml:204
-msgid "header_navaccess_categories_menu"
-msgstr "跳至分類功能表"
-
-#: views/layouts/amo2009.thtml:202
-msgid "header_navaccess_main_content"
-msgstr "跳至主內容"
-
-#: views/layouts/amo2009.thtml:203
-msgid "header_navaccess_search_form"
-msgstr "跳至�尋表單"
-
 #: views/elements/header.thtml:62
 msgid "header_navlink_addons"
 msgstr "附加元件"
 
 #: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:50 views/elements/header.thtml:159
-#: views/addons/display.thtml:378
+#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159
+#: views/addons/display.thtml:384
 msgid "header_navlink_login"
 msgstr "登入"
 
-#: views/elements/header.thtml:156 views/layouts/amo2009.thtml:304
+#: views/elements/header.thtml:156
 msgid "header_navlink_logout"
 msgstr "登出"
 
-#: views/elements/header.thtml:145 views/layouts/amo2009.thtml:303
+#: views/elements/header.thtml:145
 msgid "header_navlink_myaccount"
 msgstr "我的帳號"
 
@@ -5431,66 +5518,51 @@ msgstr "我的帳號"
 msgid "header_navlink_register"
 msgstr "註冊"
 
-#. %1 is the URL to the registration page
-#. %2 is the URL to the login page
-#: views/layouts/amo2009.thtml:278
-msgid "header_navlink_register_or_login"
-msgstr "<a href=\"%1$s\">註冊</a> 或 <a href=\"%2$s\">登入</a>"
-
-#: views/layouts/amo2009.thtml:285
-msgid "header_navlink_tools"
-msgstr "工具"
-
 #. %s is the add-on name
 #: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/amo2009/homepage_addon.thtml:77
+#: views/elements/fyf_promotion.thtml:46
 #: views/elements/addon_discussionheader.thtml:62
-#: views/elements/addon_listitem.thtml:67 views/elements/feature.thtml:84
-#: views/addons/category_landing.thtml:87 views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_listitem.thtml:80 views/elements/feature.thtml:84
+#: views/addons/browse_thumbs.thtml:60
 #, php-format
 msgid "img_preview_of"
 msgstr "%s 的�覽圖片"
 
+# %1 is the login URL for the link tag
+# %2 is the link to an explanatory page.
 #. %1 is the login URL for the link tag
 #. %2 is the link to an explanatory page.
-#: views/elements/amo2009/install.thtml:307 views/elements/install.thtml:255
+#: views/elements/install.thtml:229
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">登入</a> �能安�此元件。<a href=\"%2$s\">為什麼</a>？"
-
-#. %1 is the URL for the Experimental Add-ons section of the FAQ page
-#: views/elements/amo2009/install.thtml:283 views/elements/install.thtml:232
-msgid "install_button_confirm_exp_install"
-msgstr "讓我安�此實驗中附加元件。<a href=\"%1$s\">這是什麼？</a>"
+msgstr ""
+"<a href=\"%1$s\">登入</a> �能安�此元件。<a href=\"%2$s\">為什麼</a>？"
 
 #. %1$s is the application name.  Example:  Firefox
 #. %2$s is an optional string used to specify a platform.  Example:  (Windows)
-#: views/elements/amo2009/install.thtml:128 views/elements/install.thtml:75
+#: views/elements/install.thtml:71
 #, php-format
 msgid "install_button_text"
-msgstr "安�到 %1$s %2$s"
+msgstr "安�到 %s %s"
 
+# %1 is the add-on name, %2 is the app name
 #. %1 is the add-on name, %2 is the app name
-#: views/elements/amo2009/install.thtml:191
-#: views/elements/amo2009/install.thtml:206
-#: views/elements/amo2009/install.thtml:249
-#: views/elements/amo2009/install.thtml:298 views/elements/install.thtml:150
-#: views/elements/install.thtml:165 views/elements/install.thtml:202
-#: views/elements/install.thtml:246
+#: views/elements/install.thtml:146 views/elements/install.thtml:164
+#: views/elements/install.thtml:197 views/elements/install.thtml:220
 #, php-format
 msgid "install_button_title"
 msgstr "安� %1$s 到 %2$s"
 
 #. %1$s is the add-on name
-#: views/elements/amo2009/install.thtml:200 views/elements/install.thtml:159
+#: views/elements/install.thtml:158
 #, php-format
 msgid "install_download"
 msgstr "下載 %1$s"
 
-#: views/elements/amo2009/install.thtml:147 views/elements/install.thtml:94
+#: views/elements/install.thtml:90
 msgid "install_error_addon_not_found"
 msgstr "找�到此附加元件。"
 
-#: views/addons/dictionaries.thtml:65
+#: views/addons/dictionaries.thtml:61
 msgid "langtools_a11y_tablesummary"
 msgstr "所有語言套件�字典套件的清單。"
 
@@ -5502,8 +5574,8 @@ msgstr "下載字典套件"
 msgid "langtools_download_langpack"
 msgstr "下載語言套件"
 
-#: views/addons/dictionaries.thtml:63 controllers/components/amo.php:685
-#: controllers/addons_controller.php:1239
+#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
+#: controllers/components/amo.php:697 controllers/addons_controller.php:996
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "字典�語言套件"
 
@@ -5515,72 +5587,36 @@ msgstr "安�字典套件"
 msgid "langtools_install_langpack"
 msgstr "安�語言套件"
 
-#: views/addons/dictionaries.thtml:69
+#: views/addons/dictionaries.thtml:65
 msgid "langtools_tableheader_dictionary"
 msgstr "字典套件"
 
-#: views/addons/dictionaries.thtml:70
+#: views/addons/dictionaries.thtml:66
 msgid "langtools_tableheader_langpack"
 msgstr "語言套件"
 
-#: views/addons/dictionaries.thtml:68
+#: views/addons/dictionaries.thtml:64
 msgid "langtools_tableheader_language"
 msgstr "語言套件"
 
-#: models/license.php:65
-msgid "license_custom"
-msgstr "自訂授權�款"
-
-#: config/bootstrap.php:303
-msgid "licenses_bsd"
-msgstr "BSD License"
-
-#: config/bootstrap.php:298
-msgid "licenses_gpl_2.0"
-msgstr "GNU General Public License，版本 2.0"
-
-#: config/bootstrap.php:299
-msgid "licenses_gpl_3.0"
-msgstr "GNU General Public License，版本 3.0"
-
-#: config/bootstrap.php:300
-msgid "licenses_lgpl_2.1"
-msgstr "GNU Lesser General Public License，版本 2.1"
-
-#: config/bootstrap.php:301
-msgid "licenses_lgpl_3.0"
-msgstr "GNU Lesser General Public License，版本 3.0"
-
-#: config/bootstrap.php:302
-msgid "licenses_mit"
-msgstr "MIT/X11 License"
-
-#: config/bootstrap.php:297
-msgid "licenses_mpl_1.1"
-msgstr "Mozilla Public License，版本 1.1"
-
-#: views/users/emailchange.thtml:51 views/users/delete.thtml:55
-#: views/users/delete.thtml:137 views/users/edit.thtml:74
-#: views/reviews/flag.thtml:54
+#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/users/delete.thtml:130 views/users/edit.thtml:72
+#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
 msgid "link_return_to_front_page"
 msgstr "按這裡回到網站首�。"
 
-#: views/elements/amo2009/addon_list_options.thtml:46
 #: views/elements/addon_list_options.thtml:46
 msgid "list_sortby_date"
 msgstr "日期"
 
-#: views/elements/amo2009/addon_list_options.thtml:47
 #: views/elements/addon_list_options.thtml:47
 msgid "list_sortby_downloads"
 msgstr "下載次數"
 
-#: views/elements/amo2009/addon_list_options.thtml:45
 #: views/elements/addon_list_options.thtml:45
 msgid "list_sortby_name"
 msgstr "元件�稱"
 
-#: views/elements/amo2009/addon_list_options.thtml:48
 #: views/elements/addon_list_options.thtml:48
 msgid "list_sortby_rating"
 msgstr "評分"
@@ -5605,20 +5641,28 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
-#: views/elements/addon_categories.thtml:52
+#: views/elements/addon_categories.thtml:53
+#: views/elements/addon_categories.thtml:54 controllers/components/amo.php:676
+#: controllers/components/amo.php:678
 msgid "nav_category_dicts_langpacks"
 msgstr "字典套件�語言套件"
 
-#: views/elements/addon_categories.thtml:55
+#: controllers/components/amo.php:711 controllers/components/amo.php:713
+msgid "nav_category_plugins"
+msgstr "外掛程�"
+
+#: views/elements/addon_categories.thtml:57
+#: views/elements/addon_categories.thtml:58 controllers/components/amo.php:682
 msgid "nav_category_themes"
 msgstr "佈景主題"
 
-#: views/elements/app_chooser.thtml:47 views/layouts/amo2009.thtml:255
+#: views/elements/app_chooser.thtml:47
 msgid "other_apps_tooltip"
 msgstr "尋找其他應用程�使用的附加元件"
 
+# In a user list: user 1, user 2, "others"
 #. In a user list: user 1, user 2, "others"
-#: views/helpers/addons_html.php:222
+#: views/helpers/addons_html.php:214
 msgid "other_users"
 msgstr "其他使用者"
 
@@ -5626,33 +5670,16 @@ msgstr "其他使用者"
 msgid "page_title_appversions"
 msgstr "應用程�版本"
 
-#: controllers/pages_controller.php:115
-msgid "page_title_collector"
-msgstr "Add-on Collector"
-
-#: controllers/pages_controller.php:117
-msgid "page_title_collector_faq"
-msgstr "Add-on Collector 常見�題集"
-
-#: controllers/pages_controller.php:119
-msgid "page_title_collector_features"
-msgstr "Add-on Collector 功能"
-
-#: controllers/pages_controller.php:122
-msgid "page_title_collector_firstrun"
-msgstr "歡迎來到 Add-on Collector"
-
 #: controllers/pages_controller.php:92
 msgid "page_title_credits"
 msgstr "感�"
 
-#: controllers/pages_controller.php:113
-msgid "page_title_developer_faq"
-msgstr "開發者常見�題集"
+msgid "page_title_experimental_addons"
+msgstr "實驗中附加元件"
 
 #: controllers/pages_controller.php:111
 msgid "page_title_faq"
-msgstr "常見�題集"
+msgstr "常見�題集 (FAQ)"
 
 #: controllers/pages_controller.php:94
 msgid "page_title_fashionyourfirefox_faq"
@@ -5678,22 +5705,22 @@ msgstr "沙箱審核系統"
 msgid "page_title_submissionhelp"
 msgstr "上傳說明"
 
-#: views/pages/appversions.thtml:87
+#: views/pages/appversions.thtml:86
 msgid "pages_appversions_guid"
 msgstr "GUID"
 
-#: views/pages/appversions.thtml:79 controllers/pages_controller.php:90
+#: views/pages/appversions.thtml:78 controllers/pages_controller.php:90
 msgid "pages_appversions_header"
 msgstr "有效應用程�版本"
 
-#: views/pages/appversions.thtml:80
+#: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
-"上傳到 Mozilla 附加元件的元件必須�有 install.rdf 檔案，並至少支�下�其中之一"
-"的應用程�。�有下�列出的應用程�版本�許上傳。"
+"上傳到 Mozilla 附加元件的元件必須�有 install.rdf 檔案，並至少支�下�其中之"
+"一的應用程�。�有下�列出的應用程�版本�許上傳。"
 
 #. %s is a full <a> tag
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 #, php-format
 msgid "pages_appversions_required_files"
 msgstr ""
@@ -5701,15 +5728,18 @@ msgstr ""
 
 #. this is the text inside of an <a> tag for pages_appversions_required_files.  This
 #. should be fixed.
-#: views/pages/appversions.thtml:93
+#: views/pages/appversions.thtml:92
 msgid "pages_appversions_required_files_link"
 msgstr "這裡"
 
-#: views/pages/appversions.thtml:88
+#: views/pages/appversions.thtml:87
 msgid "pages_appversions_versions"
 msgstr "版本"
 
-#: views/pages/policy.thtml:51
+msgid "pages_experimental_addons_backbutton"
+msgstr "回到上一�"
+
+#: views/pages/policy.thtml:50
 msgid "pages_policy_sandbox_link"
 msgstr "「沙箱��資訊�"
 
@@ -5717,6 +5747,13 @@ msgstr "「沙箱��資訊�"
 msgid "pagination_next_page"
 msgstr "下一�"
 
+# %1 is page number, %2 is total page count
+#. %1 is page number, %2 is total page count
+#: views/helpers/pagination.php:199
+#, php-format
+msgid "pagination_page_number_title"
+msgstr "這是 %1$s / %2$s �"
+
 #: views/elements/pagination.thtml:52
 msgid "pagination_previous_page"
 msgstr "上一�"
@@ -5724,7 +5761,8 @@ msgstr "上一�"
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
 msgstr ""
-"請輸入下�<strong>兩個英文單字</strong>，<strong>中間用�形空白分開</strong>。"
+"請輸入下�<strong>兩個英文單字</strong>，<strong>中間用�形空白分開</"
+"strong>。"
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
@@ -5734,14 +5772,18 @@ msgstr "輸入您的答案："
 msgid "recaptcha_enter_whatyouhear"
 msgstr "請輸入您所�到的數字。"
 
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
 msgid "recaptcha_hardtohear_text"
 msgstr ""
-"若這�您來說難以了解，您�以<a href=\"%1$s\">��看看其他的</a>或是<a href=\"%"
-"2$s\">切�回輸入單字</a>。"
+"若這�您來說難以了解，您�以<a href=\"%1$s\">��看看其他的</a>或是<a href="
+"\"%2$s\">切�回輸入單字</a>。"
 
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
 #. %1 is the link switching refreshing the captcha
 #. %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
@@ -5750,15 +5792,15 @@ msgstr ""
 "若這�您來說難以了解，您�以<a href=\"%1$s\">試其他單字</a>或是改<a href=\"%2"
 "$s\">用�的</a>。"
 
-#: views/users/register.thtml:105
+#: views/users/register.thtml:100
 msgid "recaptcha_label"
 msgstr "您是人類嗎？"
 
-#: views/users/register.thtml:106
+#: views/users/register.thtml:101
 msgid "recaptcha_whatsthis"
 msgstr "這是什麼？"
 
-#: controllers/reviews_controller.php:559
+#: controllers/reviews_controller.php:561
 msgid "review_flag_error"
 msgstr "回報此�見發生錯誤�"
 
@@ -5766,7 +5808,7 @@ msgstr "回報此�見發生錯誤�"
 msgid "review_flag_reason_bug_support"
 msgstr "誤置的臭蟲回報或是技術支��求"
 
-#: views/reviews/display.thtml:103 views/reviews/display.thtml:186
+#: views/reviews/display.thtml:107 views/reviews/display.thtml:190
 msgid "review_flag_reason_instructions"
 msgstr "回報這個�見（�擇一個原因）"
 
@@ -5782,8 +5824,8 @@ msgstr "其他（請詳述）"
 msgid "review_flag_reason_spam"
 msgstr "廣告訊�或是其他無關的內容"
 
-#: views/reviews/display.thtml:91 views/reviews/display.thtml:175
-#: controllers/reviews_controller.php:555
+#: views/reviews/display.thtml:95 views/reviews/display.thtml:179
+#: controllers/reviews_controller.php:556
 msgid "review_flag_success"
 msgstr "��您，此�見已經標記為需�審核。"
 
@@ -5795,139 +5837,116 @@ msgstr "回報此�見"
 msgid "review_flag_this_titletip"
 msgstr "這篇�見����有錯誤或是廣告留言？按這裡將其標記為需�審核"
 
+# %1 is the URL of the support section, %2 for the review guidelines
 #. %1 is the URL of the support section, %2 for the review guidelines
-#: views/reviews/add.thtml:53
+#: views/reviews/add.thtml:48
 msgid "review_guidelines_short"
 msgstr ""
 "<p>請將這些話記在心裡：</p><ul><li>用寫給朋�的方�告訴大家您�此附加元件的使"
-"用經驗。請寫出特定且有幫助的細節，�是您喜歡或是�喜歡的功能，此附加元件是�容"
-"易使用，和它的缺點在哪等等。��一般的形容�是「好棒�或是「真難用�，除�您解"
-"釋了為何您這樣�為。</li><li>請勿在�見處回報程�臭蟲。我們�會將您的 e-mail "
-"顯示給擴充套件作者，而他們或許需�和您�絡�能解決該�題。請至<a href=\"%1$s"
-"\">技術支��節</a>�考如何尋求使用上的�助。</li><li>請勿使用髒話，或是洩�個"
-"人資訊。</li></ul><p>更多關於使用者�見的資訊，請�考<a href=\"%2$s\">�見撰寫"
-"指�</a>。</p>"
-
+"用經驗。請寫出特定且有幫助的細節，�是您喜歡或是�喜歡的功能，此附加元件是�"
+"容易使用，和它的缺點在哪等等。��一般的形容�是「好棒�或是「真難用�，除�"
+"您解釋了為何您這樣�為。</li><li>請勿在�見處回報程�臭蟲。我們�會將您的 e-"
+"mail 顯示給擴充套件作者，而他們或許需�和您�絡�能解決該�題。請至<a href="
+"\"%1$s\">技術支��節</a>�考如何尋求使用上的�助。</li><li>請勿使用髒話，或"
+"是洩�個人資訊。</li></ul><p>更多關於使用者�見的資訊，請�考<a href=\"%2$s"
+"\">�見撰寫指�</a>。</p>"
+
+# %1 is the addon name
 #. %1 is the add-on name
-#: views/reviews/flag.thtml:56 views/reviews/display.thtml:55
-#: views/reviews/review_added.thtml:50
+#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "� %s 的�見"
 
-#: controllers/addons_controller.php:435
+#: controllers/addons_controller.php:363
 msgid "rss_featuredaddons"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:432
+#: controllers/addons_controller.php:361
 msgid "rss_newestaddons"
 msgstr "最新附加元件"
 
-#: controllers/addons_controller.php:434
-msgid "rss_popularaddons"
-msgstr "熱門元件"
-
-#: controllers/addons_controller.php:433
+#: controllers/addons_controller.php:362
 msgid "rss_updatedaddons"
 msgstr "最近更新元件"
 
-#: views/elements/search_mini.thtml:70
-msgid "search"
-msgstr "�尋"
-
-#: views/search/collections.thtml:51
-msgid "search_collections_header"
-msgstr "收�集�尋�果"
-
-#: controllers/search_controller.php:297
-msgid "search_collections_pagetitle"
-msgstr "收�集�尋�果"
-
 #: controllers/search_controller.php:99
 msgid "search_disabled"
 msgstr "�尋功能目�暫�使用，請�後�試試看。"
 
-#: views/elements/amo2009/search.thtml:188 views/elements/search.thtml:187
-#: views/elements/search_mini.thtml:54
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "所有元件"
 
-#. This string is in the main category dropdown when searching
-#: views/elements/amo2009/search.thtml:204
-msgid "search_form_all_collections"
-msgstr "所有收�集"
-
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:385
-#: views/elements/amo2009/search.thtml:408 views/elements/search.thtml:171
-#: views/elements/search.thtml:183 views/elements/search_mini.thtml:43
-#: views/elements/search_mini.thtml:49 views/layouts/mozilla.thtml:188
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "�尋附加元件"
 
-#: views/elements/amo2009/search.thtml:184
-#: views/elements/amo2009/search.thtml:404
-msgid "search_form_default_text_collections"
-msgstr "�尋收�集"
-
-#: views/elements/amo2009/search.thtml:206 views/elements/search.thtml:202
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "�尋附加元件"
 
-#: views/elements/amo2009/search.thtml:184 views/elements/search.thtml:183
-#: views/elements/search_mini.thtml:49
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "按此處輸入�尋關�字"
 
-#: views/elements/amo2009/search.thtml:186 views/elements/search.thtml:185
-#: views/elements/search_mini.thtml:52
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "範�"
 
-#: views/addons/searchengines.thtml:118
+#: views/addons/searchengines.thtml:124
 msgid "search_landing_all_search_engines"
 msgstr "所有�尋引擎"
 
-#: views/addons/searchengines.thtml:114
+#: views/addons/searchengines.thtml:120
 msgid "search_landing_browse_search_engines"
 msgstr "�覽�尋引擎"
 
-#: views/search/collections.thtml:58 views/search/index.thtml:59
+#. %s is a number
+#: views/search/index.thtml:70
+#, php-format
+msgid "search_matching_addons_number"
+msgid_plural "search_matching_addons_number"
+msgstr[0] "%s 個符�的元件"
+
+#: views/search/index.thtml:49
 msgid "search_nothing_found"
 msgstr "找�到�果。"
 
-#: controllers/search_controller.php:185
+#: controllers/search_controller.php:178
 msgid "search_pagetitle"
 msgstr "�尋附加元件"
 
-#: controllers/search_controller.php:242
+#: controllers/search_controller.php:235
 msgid "search_rss_description"
 msgstr "�尋�果消�來�"
 
 #. %s is the terms the user is searching for (a string)
-#: controllers/search_controller.php:241
+#: controllers/search_controller.php:234
 #, php-format
 msgid "search_rss_results_for"
 msgstr "�尋�果：%s "
 
-#: views/elements/header.thtml:154 views/layouts/amo2009.thtml:296
+#: views/elements/header.thtml:154 views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管�員工具"
 
-#: views/elements/header.thtml:146 views/layouts/amo2009.thtml:288
+#: views/elements/header.thtml:146 views/addons/home.thtml:164
 msgid "sidebar_navlink_developer_tools"
 msgstr "開發者工具"
 
-#: views/elements/header.thtml:148 views/layouts/amo2009.thtml:290
+#: views/elements/header.thtml:148 views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "審核者工具"
 
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "æ­¡è¿Ž"
 
 #. %s is the user's name
-#: views/layouts/amo2009.thtml:302
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "歡迎您，%s"
@@ -5936,7 +5955,7 @@ msgstr "歡迎您，%s"
 msgid "sidebar_pitch_dictionary"
 msgstr "字典套件"
 
-#: views/elements/pitch.thtml:72
+#: views/elements/pitch.thtml:73
 msgid "sidebar_pitch_featured_addons"
 msgstr "推薦元件"
 
@@ -5944,7 +5963,7 @@ msgstr "推薦元件"
 msgid "sidebar_pitch_looking_for"
 msgstr "我想找的是："
 
-#: views/elements/pitch.thtml:70
+#: views/elements/pitch.thtml:71
 msgid "sidebar_pitch_newest_addons"
 msgstr "最新元件"
 
@@ -5952,7 +5971,7 @@ msgstr "最新元件"
 msgid "sidebar_pitch_search"
 msgstr "�尋引擎"
 
-#: views/elements/pitch.thtml:69
+#: views/elements/pitch.thtml:70
 msgid "sidebar_pitch_subscribe_to"
 msgstr "訂閱消�來�"
 
@@ -5960,23 +5979,25 @@ msgstr "訂閱消�來�"
 msgid "sidebar_pitch_theme"
 msgstr "佈景主題"
 
-#: views/elements/pitch.thtml:71
+#: views/elements/pitch.thtml:72
 msgid "sidebar_pitch_updated_addons"
 msgstr "最近更新元件"
 
 #. %1$s is a number
-#: views/helpers/localization.php:65 views/developers/versions_edit.thtml:95
-#: views/addons/dictionaries.thtml:92
+#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
+#: views/addons/dictionaries.thtml:88
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
 
-#: views/elements/amo2009/stars.thtml:57 views/elements/stars.thtml:63
+#: views/elements/stars.thtml:63
 msgid "stars_not_yet_rated"
 msgstr "尚未評分"
 
+# %1 is the number of stars this add-on has
 #. %1 is the number of stars this add-on has
-#: views/elements/amo2009/stars.thtml:49 views/elements/stars.thtml:54
+#: views/elements/stars.thtml:54
 #, php-format
 msgid "stars_rated_x_outof_5"
 msgstr "評分：%s / 5 顆星"
@@ -6013,13 +6034,13 @@ msgid "statistics_date_weekdayshortmonth"
 msgstr "%m 月 %e 日 (%a)"
 
 #. %1$s is an add-on name and version.  Example:  Add-on 3.5
-#: controllers/components/stats.php:519
+#: controllers/components/stats.php:517
 #, php-format
 msgid "statistics_events_addon_created"
 msgstr "%1$s 發佈"
 
 #. %1$s is an application name and version.  Example:  Firefox 3.5
-#: controllers/components/stats.php:500
+#: controllers/components/stats.php:498
 #, php-format
 msgid "statistics_events_app_released"
 msgstr "%1$s 發行"
@@ -6032,179 +6053,180 @@ msgstr "關閉"
 msgid "statistics_help_link"
 msgstr "說明"
 
-#: views/statistics/index.thtml:83
+#: views/statistics/index.thtml:57
 msgid "statistics_index_anotheraddon"
 msgstr "或�擇其他元件"
 
-#: views/statistics/index.thtml:85
+#: views/statistics/index.thtml:59
 msgid "statistics_index_anotheraddon_public"
 msgstr "或�擇元件的公開資訊"
 
-#: views/statistics/index.thtml:71
+#: views/statistics/index.thtml:45
 msgid "statistics_index_myaddons"
 msgstr "請�擇任一元件檢視其統計資訊"
 
-#: views/statistics/index.thtml:89
+#: views/statistics/index.thtml:63
 msgid "statistics_index_selectaddon"
 msgstr "請�擇元件檢視其統計資訊"
 
-#: views/statistics/index.thtml:91
+#: views/statistics/index.thtml:65
 msgid "statistics_index_selectaddon_public"
 msgstr "請�擇元件檢視其公開資訊"
 
-#: views/statistics/index.thtml:39
+#: views/statistics/index.thtml:43
 msgid "statistics_index_title"
 msgstr "統計資訊顯示�"
 
-#: views/statistics/index.thtml:97
+#: views/statistics/index.thtml:71
 msgid "statistics_index_view_button"
 msgstr "檢視統計資訊"
 
-#: views/statistics/addon.thtml:222 controllers/statistics_controller.php:247
+#: views/statistics/addon.thtml:224 controllers/statistics_controller.php:223
 msgid "statistics_js_download_csv"
 msgstr "下載此表格 (CSV 格�)"
 
-#: controllers/statistics_controller.php:246
+#: controllers/statistics_controller.php:222
 msgid "statistics_js_dropdowns_none"
 msgstr "ç„¡"
 
-#: controllers/statistics_controller.php:245
+#: controllers/statistics_controller.php:221
 msgid "statistics_js_dropdowns_removeplot"
 msgstr "移除這一點"
 
-#: controllers/statistics_controller.php:248
+#: controllers/statistics_controller.php:224
 msgid "statistics_js_groupby_selector_date"
 msgstr "分類�據: 日期"
 
-#: controllers/statistics_controller.php:251
+#: controllers/statistics_controller.php:227
 msgid "statistics_js_groupby_selector_month"
 msgstr "分類�據: 月份"
 
-#: controllers/statistics_controller.php:249
+#: controllers/statistics_controller.php:225
 msgid "statistics_js_groupby_selector_week"
 msgstr "分類�據: 星期"
 
-#: controllers/statistics_controller.php:250
+#: controllers/statistics_controller.php:226
+#, fuzzy
 msgid "statistics_js_groupby_selector_week_over_week"
-msgstr "分類�據: 星期"
+msgstr "Compare by: Week"
 
-#: controllers/statistics_controller.php:260
+#: controllers/statistics_controller.php:236
 msgid "statistics_js_plotselection_foundinrange"
 msgstr "在此範�找到%s"
 
-#: controllers/statistics_controller.php:270
+#: controllers/statistics_controller.php:246
 msgid "statistics_js_plotselection_options_addplot_name"
 msgstr "新增座標點"
 
-#: controllers/statistics_controller.php:271
+#: controllers/statistics_controller.php:247
 msgid "statistics_js_plotselection_options_addplot_tooltip"
 msgstr "新增此圖表的其他座標點"
 
-#: controllers/statistics_controller.php:261
+#: controllers/statistics_controller.php:237
 msgid "statistics_js_plotselection_options_count_name_checked"
 msgstr "隱�總計數"
 
-#: controllers/statistics_controller.php:262
+#: controllers/statistics_controller.php:238
 msgid "statistics_js_plotselection_options_count_name_unchecked"
 msgstr "顯示總計數"
 
-#: controllers/statistics_controller.php:263
+#: controllers/statistics_controller.php:239
 msgid "statistics_js_plotselection_options_count_tooltip"
 msgstr "在此圖形�繪總數"
 
-#: controllers/statistics_controller.php:275
+#: controllers/statistics_controller.php:251
 msgid "statistics_js_plotselection_options_csv_name"
 msgstr "檢視資料 (CSV)"
 
-#: controllers/statistics_controller.php:276
+#: controllers/statistics_controller.php:252
 msgid "statistics_js_plotselection_options_csv_tooltip"
 msgstr "�得此資料的逗點分隔檔案"
 
-#: controllers/statistics_controller.php:267
+#: controllers/statistics_controller.php:243
 msgid "statistics_js_plotselection_options_events_addon_name_checked"
 msgstr "隱� %s 事件"
 
-#: controllers/statistics_controller.php:268
+#: controllers/statistics_controller.php:244
 msgid "statistics_js_plotselection_options_events_addon_name_unchecked"
 msgstr "顯示 %s 事件"
 
-#: controllers/statistics_controller.php:269
+#: controllers/statistics_controller.php:245
 msgid "statistics_js_plotselection_options_events_addon_tooltip"
 msgstr "於座標點上顯示元件發行日期"
 
-#: controllers/statistics_controller.php:264
+#: controllers/statistics_controller.php:240
 msgid "statistics_js_plotselection_options_events_firefox_name_checked"
 msgstr "隱� Firefox 事件"
 
-#: controllers/statistics_controller.php:265
+#: controllers/statistics_controller.php:241
 msgid "statistics_js_plotselection_options_events_firefox_name_unchecked"
 msgstr "顯示 Firefox 事件"
 
-#: controllers/statistics_controller.php:266
+#: controllers/statistics_controller.php:242
 msgid "statistics_js_plotselection_options_events_firefox_tooltip"
 msgstr "於座標點上顯示 Firefox 發行日期"
 
-#: controllers/statistics_controller.php:272
+#: controllers/statistics_controller.php:248
 msgid "statistics_js_plotselection_options_resize_name_checked"
 msgstr "收起圖表"
 
-#: controllers/statistics_controller.php:273
+#: controllers/statistics_controller.php:249
 msgid "statistics_js_plotselection_options_resize_name_unchecked"
 msgstr "展開圖表"
 
-#: controllers/statistics_controller.php:274
+#: controllers/statistics_controller.php:250
 msgid "statistics_js_plotselection_options_resize_tooltip"
 msgstr "縮放圖表"
 
-#: controllers/statistics_controller.php:254
+#: controllers/statistics_controller.php:230
 msgid "statistics_js_plotselection_selector_adu"
 msgstr "�日有效使用者"
 
-#: controllers/statistics_controller.php:256
+#: controllers/statistics_controller.php:232
 msgid "statistics_js_plotselection_selector_application"
 msgstr "應用程�"
 
-#: controllers/statistics_controller.php:259
+#: controllers/statistics_controller.php:235
 msgid "statistics_js_plotselection_selector_custom"
 msgstr "自訂"
 
-#: controllers/statistics_controller.php:253
+#: controllers/statistics_controller.php:229
 msgid "statistics_js_plotselection_selector_downloads"
 msgstr "下載"
 
-#: controllers/statistics_controller.php:258
+#: controllers/statistics_controller.php:234
 msgid "statistics_js_plotselection_selector_os"
 msgstr "作業系統"
 
-#: controllers/statistics_controller.php:257
+#: controllers/statistics_controller.php:233
 msgid "statistics_js_plotselection_selector_status"
 msgstr "元件狀態"
 
-#: controllers/statistics_controller.php:252
+#: controllers/statistics_controller.php:228
 msgid "statistics_js_plotselection_selector_summary"
 msgstr "摘�"
 
-#: controllers/statistics_controller.php:255
+#: controllers/statistics_controller.php:231
 msgid "statistics_js_plotselection_selector_version"
 msgstr "元件版本"
 
-#: controllers/components/stats.php:398
+#: controllers/components/stats.php:396
 msgid "statistics_longnames_application"
 msgstr "應用程�"
 
-#: controllers/components/stats.php:400
+#: controllers/components/stats.php:398
 msgid "statistics_longnames_os"
 msgstr "作業系統"
 
-#: controllers/components/stats.php:399
+#: controllers/components/stats.php:397
 msgid "statistics_longnames_status"
 msgstr "元件狀態"
 
-#: controllers/components/stats.php:401
+#: controllers/components/stats.php:399
 msgid "statistics_longnames_unknown"
 msgstr "未知"
 
-#: controllers/components/stats.php:397
+#: controllers/components/stats.php:395
 msgid "statistics_longnames_version"
 msgstr "元件版本"
 
@@ -6219,8 +6241,8 @@ msgstr "我們還沒有任何關於此附加元件的資料，請�幾天後�
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
 msgstr ""
-"附加元件統計資訊正在更新中，因程�碼正在更新相關資訊的緣故，最近的資料�能會�"
-"完整。請�幾分�後�回來檢查。"
+"附加元件統計資訊正在更新中，因程�碼正在更新相關資訊的緣故，最近的資料�能會"
+"�完整。請�幾分�後�回來檢查。"
 
 #: views/statistics/addon.thtml:136
 msgid "statistics_notice_disabled"
@@ -6237,7 +6259,7 @@ msgstr "您的設定已更新�"
 #: controllers/statistics_controller.php:60
 #: controllers/statistics_controller.php:71
 #: controllers/statistics_controller.php:74
-#: controllers/statistics_controller.php:240
+#: controllers/statistics_controller.php:216
 msgid "statistics_pagetitle"
 msgstr "統計資訊顯示�"
 
@@ -6265,104 +6287,108 @@ msgstr "縮�"
 msgid "statistics_plot_options_zoomout_title"
 msgstr "縮�到一個月"
 
-#: controllers/statistics_controller.php:283
+#: controllers/statistics_controller.php:259
 #, php-format
 msgid "statistics_rss_description"
 msgstr "%1$s 的�日統計資訊摘�"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/addon.thtml:214
+msgid "statistics_rss_icon_title"
+msgstr "摘�資料的 RSS 消�來�"
+
+#: views/statistics/rss/summary.thtml:75
 msgid "statistics_rss_title_fulldate"
 msgstr "%Y 年 %m 月 %e 日 (%a)"
 
-#: views/statistics/rss/summary.thtml:68
+#: views/statistics/rss/summary.thtml:75
 #, php-format
 msgid "statistics_rss_title_statsfordate"
 msgstr "%1$s 的統計資訊"
 
-#: views/statistics/settings.thtml:49
+#: views/statistics/settings.thtml:46
 msgid "statistics_settings_access_description"
 msgstr ""
 "在�設情�下，�有您自己� Mozilla 能看到您元件的統計資訊。但您�以公開統計資"
 "訊，讓所有人看到您的元件統計資訊。"
 
-#: views/statistics/settings.thtml:48
+#: views/statistics/settings.thtml:45
 msgid "statistics_settings_access_heading"
 msgstr "顯示�存�權�"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private"
 msgstr "�人"
 
-#: views/statistics/settings.thtml:51
+#: views/statistics/settings.thtml:48
 msgid "statistics_settings_access_private_description"
 msgstr "�有您自己和 Mozilla 看得到統計資訊"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public"
 msgstr "公開"
 
-#: views/statistics/settings.thtml:52
+#: views/statistics/settings.thtml:49
 msgid "statistics_settings_access_public_description"
 msgstr "任何人都�以看到統計資訊"
 
-#: views/statistics/addon.thtml:251
+#: views/statistics/addon.thtml:253
 msgid "statistics_settings_change_link"
 msgstr "變更設定"
 
-#: views/statistics/addon.thtml:253
+#: views/statistics/addon.thtml:255
 msgid "statistics_settings_confidential"
 msgstr "請將此資訊視為機密資料。"
 
-#: views/statistics/addon.thtml:245
+#: views/statistics/addon.thtml:247
 msgid "statistics_settings_currently_private"
 msgstr "顯示�目�設為 <b>�人</b>。"
 
-#: views/statistics/addon.thtml:241
+#: views/statistics/addon.thtml:243
 msgid "statistics_settings_currently_public"
 msgstr "顯示�目�設為 <b>公開</b>。"
 
-#: views/statistics/addon.thtml:246
+#: views/statistics/addon.thtml:248
 msgid "statistics_settings_locked_alt"
 msgstr "已上鎖"
 
-#: views/statistics/settings.thtml:57
+#: views/statistics/settings.thtml:54
 msgid "statistics_settings_return_link"
 msgstr "回到顯示�"
 
-#: views/statistics/settings.thtml:56
+#: views/statistics/settings.thtml:53
 msgid "statistics_settings_save_button"
 msgstr "儲存設定"
 
-#: views/statistics/settings.thtml:46
+#: views/statistics/settings.thtml:43
 #, php-format
 msgid "statistics_settings_title"
 msgstr "%1$s 的統計資訊顯示�設定"
 
-#: views/statistics/addon.thtml:242
+#: views/statistics/addon.thtml:244
 msgid "statistics_settings_unlocked_alt"
 msgstr "已解鎖"
 
-#: controllers/components/stats.php:405
+#: controllers/components/stats.php:403
 msgid "statistics_shortnames_application"
 msgstr "程�"
 
-#: controllers/components/stats.php:407
+#: controllers/components/stats.php:405
 msgid "statistics_shortnames_os"
 msgstr "作業系統"
 
-#: controllers/components/stats.php:406
+#: controllers/components/stats.php:404
 msgid "statistics_shortnames_status"
 msgstr "狀態"
 
-#: controllers/components/stats.php:408
+#: controllers/components/stats.php:406
 msgid "statistics_shortnames_unknown"
 msgstr "未知"
 
-#: controllers/components/stats.php:404
+#: controllers/components/stats.php:402
 msgid "statistics_shortnames_version"
 msgstr "版本"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:192
+#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:204
 msgid "statistics_summary_downloads_average"
 msgstr "�日平�下載數"
 
@@ -6374,7 +6400,7 @@ msgstr "下載"
 msgid "statistics_summary_downloads_lastcount"
 msgstr "昨日下載次數"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:199
+#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:211
 msgid "statistics_summary_downloads_lastweek"
 msgstr "最近七日下載次數"
 
@@ -6392,7 +6418,7 @@ msgstr "從 %1$s 開始"
 msgid "statistics_summary_nodata"
 msgstr "尚無資料"
 
-#: views/statistics/rss/summary.thtml:60 views/statistics/addon.thtml:195
+#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:207
 msgid "statistics_summary_updatepings_average"
 msgstr "�日平�有效使用者"
 
@@ -6418,144 +6444,141 @@ msgstr "�日有效使用者"
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "æ–¼ %1$s"
 
-#: views/statistics/rss/summary.thtml:61 views/statistics/addon.thtml:203
-msgid "statistics_summary_updatepings_weekly_average"
-msgstr "本週平�有效使用者"
-
-#. %s is a percentage, like '+22.33%'.  It sits next to another number, so
-#. the implied meaning is 'percentage change' from the previous stat point.
-#: views/statistics/rss/summary.thtml:62 views/statistics/addon.thtml:205
-msgid "statistics_summary_updatepings_weekly_change"
-msgstr "和上週相比 %s"
-
-#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:184
-#: controllers/statistics_controller.php:282
+#: views/statistics/addon.thtml:65 controllers/statistics_controller.php:177
+#: controllers/statistics_controller.php:258
 #, php-format
 msgid "statistics_title_addon_stats"
 msgstr "%1$s 統計資訊"
 
-#: views/addons/themes_landing.thtml:113
+#: views/addons/themes_landing.thtml:119
 msgid "themes_landing_all_themes"
 msgstr "所有佈景主題"
 
-#: views/addons/themes_landing.thtml:109
+#: views/addons/themes_landing.thtml:115
 msgid "themes_landing_browse_themes"
 msgstr "�覽佈景主題"
 
-#: views/users/edit.thtml:185
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "變更 Email 地�"
 
-#: views/users/edit.thtml:169
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "變更密碼"
 
-#: views/users/edit.thtml:96
-msgid "user_change_password_or_email"
-msgstr "變更密碼或 Email"
-
 #: controllers/users_controller.php:197
 msgid "user_confirmationcode_resent"
 msgstr "確�碼已�寄�"
 
+# %1 is the email address, %2 is the URL of the user registration page
 #. %1 is the email address, %2 is the URL of the user registration page
-#: views/users/delete.thtml:51
+#: views/users/delete.thtml:49
 msgid "user_del_account_deleted"
 msgstr ""
 "您的使用者帳號 %1$s 已經刪除�功。若您回心轉�，請到<a href=\"%2$s\">新使用者"
 "註冊</a>���新註冊。"
 
-#: views/users/delete.thtml:102
+#: views/users/delete.thtml:95
 msgid "user_del_community_sad"
 msgstr "Mozilla 附加網站社群很�憾您的離開。"
 
-#: views/users/delete.thtml:123
+#: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
 msgstr "請�次輸入密碼"
 
-#: views/users/delete.thtml:134
+#: views/users/delete.thtml:127
 msgid "user_del_deletenow"
 msgstr "立刻刪掉我的帳號"
 
+# %1 is the URL of the user's info page
 #. %1 is the URL of the user's info page
-#: views/users/delete.thtml:64
+#: views/users/delete.thtml:62
 msgid "user_del_error_addons"
 msgstr ""
 "您�能刪除您的帳號，因為您目�的角色是<a href=\"%1$s\">附加元件作者</a>。�刪"
-"除您的帳號，請通知其他附加元件共�作者請他們將您從作者清單中移除。之後您就能刪"
-"除帳號了。"
+"除您的帳號，請通知其他附加元件共�作者請他們將您從作者清單中移除。之後您就能"
+"刪除帳號了。"
 
+# %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:71
+#: views/users/delete.thtml:69
 msgid "user_del_error_addons_more_questions"
 msgstr "如果您有其他，請�絡 %1$s 尋求�助。"
 
-#: views/users/delete.thtml:78
+#: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr "您必須�勾�「我了解…�我們�能將您的帳號移除。"
 
-#: views/users/delete.thtml:84
+#: views/users/delete.thtml:78
 msgid "user_del_error_password"
 msgstr "請輸入正確的密碼以完�這個步驟。"
 
+# %1 is a link to the amo-admins mailing list
 #. %1 is a link to the amo-admins mailing list
-#: views/users/delete.thtml:91
+#: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
-"在刪除帳號時發生�明的錯誤。請� %1$s 通知這個�題，我們會幫您手動移除帳號。我"
-"們�造�的�便感到抱歉。"
+"在刪除帳號時發生�明的錯誤。請� %1$s 通知這個�題，我們會幫您手動移除帳號。"
+"我們�造�的�便感到抱歉。"
 
-#: views/users/delete.thtml:110
+#: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
 msgstr "確�刪除帳號"
 
+# %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/delete.thtml:100
+#: views/users/delete.thtml:93
 msgid "user_del_header_delete_account"
 msgstr "刪除使用者帳號 %1$s"
 
-#: views/users/delete.thtml:50
+#: views/users/delete.thtml:48
 msgid "user_del_header_farewell"
 msgstr "�會了�"
 
-#: views/users/delete.thtml:115
+#: views/users/delete.thtml:108
 msgid "user_del_nologin"
 msgstr "您以後將無法登入 Mozilla 附加元件網站。"
 
-#: views/users/delete.thtml:112
+#: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
 msgstr "按下「刪除�將會將您帳號<strong>永久刪除</strong>。這代表："
 
-#: views/users/delete.thtml:116
+#: views/users/delete.thtml:109
 msgid "user_del_reviews_anonymized"
 msgstr "您的�見和評分�會被刪除，但那些資料與帳號的連�會被切斷。"
 
+# %1 is a link to the amo-editors mailing list
 #. %1 is a link to the amo-editors mailing list
-#: views/users/delete.thtml:104
+#: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
-"若您有任何我們�能能幫上忙的�題，請別刪掉您的帳號，而是到 %1$s �絡我們，我們"
-"會竭盡所能的幫助您解決�題。"
+"若您有任何我們�能能幫上忙的�題，請別刪掉您的帳號，而是到 %1$s �絡我們，我"
+"們會竭盡所能的幫助您解決�題。"
 
-#: views/users/delete.thtml:130
+#: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
 msgstr "我了解這個動作無法復原。"
 
-#: views/helpers/addons_html.php:192
+#: views/helpers/addons_html.php:184
 msgid "user_deleted_nickname"
 msgstr "刪除使用者帳號"
 
+# %1 is the new email address
 #. %1 is the new email address
-#: views/users/edit.thtml:71
+#: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
-"我們已寄出一�信到 %1$s 以確�您的新 Email 地�。您必須按下信中的���算完� "
-"Email 變更的程�。在完�變更程�以�，您還是�以用�在的 Email 地�登入網站。"
+"我們已寄出一�信到 %1$s 以確�您的新 Email 地�。您必須按下信中的���算完"
+"� Email 變更的程�。在完�變更程�以�，您還是�以用�在的 Email 地�登入網"
+"站。"
 
-#: views/users/edit.thtml:201
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "刪除使用者帳號"
 
+# This contains the email sent to users when they signed up for a new
+# account:
+# %1 is the confirmation URL, %2 is the current app
 #. This contains the email sent to users when they signed up for a new
 #. account:
 #. %1 is the confirmation URL, %2 is the current app
@@ -6563,21 +6586,24 @@ msgstr "刪除使用者帳號"
 #, php-format
 msgid "user_email_confirm_account_nopass"
 msgstr ""
-"歡迎來到 %2$s 附加元件網站。\n"
+"歡迎來到 %2$s 附加元件。\n"
 "\n"
-"您需�在使用新的帳號之�先啟動它——這能確�您使用的 Email 地�是有效且確實為您"
-"所有。\n"
-"若�啟動您的帳號，請點�以下的��，或將以下內容複製到您�覽器的��列：\n"
+"在您使用新帳號登入之�必須先啟用帳號 – 這能確定您寫的 Email 地�屬於您並真的"
+"有在用。\n"
+"請按下�的��或複製整串網�到�覽器的��列後貼上以啟用您的帳號：\n"
 "\n"
 "%1$s\n"
 "\n"
-"當您�功地啟動您的帳號後，您�以將這� Email �之高閣。\n"
+"一旦您�功啟用帳號就能丟掉這�信。\n"
 "\n"
-"感�您加入 %2$s 附加元件網站\n"
-"-- %2$s 附加元件網站工作人員"
+"感�您加入 %2$s 附加元件\n"
+"-- %2$s 附加元件開發�組"
 
+# %1 is the confirmation url, %2 is the application name
 #. %1 is the confirmation url, %2 is the application name
-#: views/users/email/emailchange_plain.thtml:5
+#: views/users/email/emailchange_plain.thtml:6
+#: views/users/email/emailchange_plain.thtml:8
+#, php-format
 msgid "user_email_confirm_emailchange"
 msgstr ""
 "您已�求變更 %2$s 附加元件網站上的 Email 地�。\n"
@@ -6587,8 +6613,8 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"您有 48 �時的時間�確�新 Email 地�。若您中途�悔，�想變更 Email 地�的話，"
-"請���會這�信��。\n"
+"您有 48 �時的時間�確�新 Email 地�。若您中途�悔，�想變更 Email 地�的"
+"話，請���會這�信��。\n"
 "\n"
 "感�您�\n"
 "-- %2$s 附加元件開發�組"
@@ -6598,6 +6624,8 @@ msgstr ""
 msgid "user_email_confirm_subject"
 msgstr "感�您加入 %s 附加元件"
 
+# This is the password reset email
+# %1 is the pw reset URL, %2 is the application
 #. This is the password reset email
 #. %1 is the pw reset URL, %2 is the application
 #: views/users/email/pwreset_plain.thtml:5
@@ -6606,8 +6634,8 @@ msgid "user_email_pwreset"
 msgstr ""
 "%2$s 附加元件密碼�設\n"
 "\n"
-"我們已收到您�求�設 addons.mozilla.org 上的密碼。請按下�的��或複製整串網�"
-"到�覽器的��列後貼上以變更密碼：\n"
+"我們已收到您�求�設 addons.mozilla.org 上的密碼。請按下�的��或複製整串網"
+"�到�覽器的��列後貼上以變更密碼：\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -6616,104 +6644,90 @@ msgstr ""
 "�常感�。\n"
 "-- %2$s 附加元件開發�組"
 
-#: controllers/users_controller.php:245
+#: controllers/users_controller.php:244
 #, php-format
 msgid "user_email_pwreset_subject"
 msgstr "�設 %s 附加元件密碼"
 
-#: views/users/emailchange.thtml:50
+#: views/users/emailchange.thtml:53
 msgid "user_emailchange_error"
 msgstr "錯誤�"
 
+# %1 is the application name
 #. %1 is the application name
-#: controllers/users_controller.php:533
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
+#, php-format
 msgid "user_emailchange_subject"
 msgstr "請確�您在 %1$s 附加元件網站變更的 Email 地�"
 
-#: views/users/emailchange.thtml:48
+#: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50
 msgid "user_emailchange_success"
 msgstr "�功�"
 
+# %1 is the new email address
 #. %1 is the new email address
-#: views/users/emailchange.thtml:49
+#: views/users/emailchange.thtml:52
+#, php-format
 msgid "user_emailchange_successful_description"
 msgstr "您的 Email 地�已變更�功，從�在起請用 %1$s 來登入網站。"
 
-#: views/users/edit.thtml:134 views/admin/users_edit.thtml:111
-msgid "user_form_bio"
-msgstr "有關我"
-
-#: views/users/edit.thtml:135 views/admin/users_edit.thtml:112
-msgid "user_form_bio_description"
-msgstr ""
-"如果您願�，�社群介紹您自己��這段文字將會在您的使用者資訊��公開。斷行將會"
-"被�留，但��許輸入 HTML 語法。"
-
-#: views/users/pwreset.thtml:77 views/users/register.thtml:73
-#: views/users/edit.thtml:181
+#: views/users/pwreset.thtml:77 views/users/register.thtml:68
+#: views/users/edit.thtml:160
 msgid "user_form_confirmpassword"
 msgstr "請�次輸入密碼"
 
-#: views/users/edit.thtml:145
-msgid "user_form_display_collections"
-msgstr "在我的使用者檔案顯示我所建立的收�集"
-
-#: views/users/edit.thtml:149
-msgid "user_form_display_collections_fav"
-msgstr "在我的使用者檔案顯示我最愛的收�集"
-
-#: views/users/edit.thtml:86
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "編輯 %s 的使用者檔案"
 
 #: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:63 views/users/edit.thtml:187
+#: views/users/register.thtml:58 views/users/edit.thtml:169
 msgid "user_form_email"
 msgstr "Email 地�"
 
-#: views/users/register.thtml:78 views/users/edit.thtml:103
-#: views/admin/users_edit.thtml:76
+#: views/users/register.thtml:73 views/users/edit.thtml:106
+#: views/admin/users_edit.thtml:61
 msgid "user_form_firstname"
 msgstr "�字"
 
-#: views/users/register.thtml:94 views/users/edit.thtml:119
-#: views/admin/users_edit.thtml:91
+#: views/users/register.thtml:89 views/users/edit.thtml:122
+#: views/admin/users_edit.thtml:76
 msgid "user_form_hideemail"
 msgstr "我�隱� Email 地�"
 
-#: views/users/register.thtml:98 views/users/edit.thtml:123
-#: views/admin/users_edit.thtml:99
+#: views/users/register.thtml:93 views/users/edit.thtml:126
+#: views/admin/users_edit.thtml:84
 msgid "user_form_homepage"
 msgstr "網站 URL"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:81
+#: views/users/register.thtml:79 views/users/edit.thtml:112
+#: views/admin/users_edit.thtml:66
 msgid "user_form_lastname"
 msgstr "姓�"
 
-#: controllers/users_controller.php:333
+#: controllers/users_controller.php:322
 msgid "user_form_login"
 msgstr "使用者登入"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:176
+#: views/users/pwreset.thtml:72 views/users/edit.thtml:155
 msgid "user_form_newpassword"
 msgstr "新密碼"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:114
-#: views/admin/users_edit.thtml:86
+#: views/users/register.thtml:84 views/users/edit.thtml:117
+#: views/admin/users_edit.thtml:71
 msgid "user_form_nickname"
 msgstr "暱稱"
 
-#: views/users/edit.thtml:171
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "舊密碼"
 
-#: views/users/edit.thtml:97 views/users/edit.thtml:200
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "其他動作"
 
-#: views/users/login.thtml:85 views/users/register.thtml:68
+#: views/users/login.thtml:85 views/users/register.thtml:63
 msgid "user_form_password"
 msgstr "密碼"
 
@@ -6721,63 +6735,63 @@ msgstr "密碼"
 msgid "user_form_registration"
 msgstr "新使用者註冊"
 
-#: views/users/login.thtml:90
+#: views/users/login.thtml:92
 msgid "user_form_remember_me"
 msgstr "在此電腦上記�我"
 
-#: views/admin/users_edit.thtml:95
+#: views/admin/users_edit.thtml:80
 msgid "user_form_showsandbox"
 msgstr "我�顯示「沙箱��？"
 
-#: views/users/edit.thtml:205
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "儲存"
 
-#: views/users/login.thtml:93
+#: views/users/login.thtml:96
 msgid "user_form_submit_login"
 msgstr "登入"
 
-#: views/users/register.thtml:113
+#: views/users/register.thtml:108
 msgid "user_form_submit_register"
 msgstr "註冊"
 
-#: views/users/info.thtml:75
+#: views/users/info.thtml:69
 #, php-format
 msgid "user_info_usersince"
 msgstr "%s 附加元件註冊日期"
 
-#: views/users/login.thtml:102
+#: views/users/login.thtml:107
 msgid "user_login_register_link"
 msgstr "建立新帳號"
 
-#: views/users/edit.thtml:160
+#: views/users/edit.thtml:139
 msgid "user_notifications_item_compat"
 msgstr "附加元件相容性 (強烈建議開啟)"
 
-#: views/users/edit.thtml:161
+#: views/users/edit.thtml:140
 msgid "user_notifications_item_events"
 msgstr "近期活動與競賽"
 
-#: views/users/edit.thtml:156
+#: views/users/edit.thtml:135
 msgid "user_notifications_none_available"
 msgstr "目�沒有��的通知供您使用。"
 
-#: views/users/edit.thtml:158
+#: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
-"Mozilla 將�時寄� E-mail �您通知最新活動與新版本發行。請在下��擇您有興趣的"
-"主題："
+"Mozilla 將�時寄� E-mail �您通知最新活動與新版本發行。請在下��擇您有興趣"
+"的主題："
 
-#: views/users/edit.thtml:164
+#: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
 "Mozilla �留使用此資訊與您�絡，詢�關於您放上網的附加元件相關�題的權利。"
 
-#: controllers/users_controller.php:543
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "您所作的變更中有錯誤，請更正後��新�出一次.."
 
-#: controllers/users_controller.php:540
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "使用者檔案已更新。"
 
@@ -6790,15 +6804,15 @@ msgstr "�設 %s 的密碼"
 msgid "user_pwreset_header"
 msgstr "�設密碼"
 
-#: views/users/login.thtml:103
+#: views/users/login.thtml:108
 msgid "user_pwreset_link"
 msgstr "忘記密碼？"
 
-#: controllers/users_controller.php:248
+#: controllers/users_controller.php:247
 msgid "user_pwreset_link_sent"
 msgstr "�設密碼的��會寄到您的 Email 地�。"
 
-#: controllers/users_controller.php:304
+#: controllers/users_controller.php:293
 msgid "user_pwreset_okay"
 msgstr "�設密碼�功。"
 
@@ -6810,21 +6824,23 @@ msgstr "�出密碼變更"
 msgid "user_pwreset_submit_sendlink"
 msgstr "寄出�設密碼��"
 
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_amo_link"
 msgstr "%s 附加元件"
 
+# %1 is the user's email address, %2 is the current app
 #. %1 is the user's email address, %2 is the current app
 #: views/users/activatefirst.thtml:49
 #, php-format
 msgid "user_register_click_confirm_link"
 msgstr ""
-"啟動您帳號的��已寄到您的 Email 地� %1$s，在您登入 %2$s 附加元件之�必須先按"
-"下該��以啟動帳號。"
+"啟動您帳號的��已寄到您的 Email 地� %1$s，在您登入 %2$s 附加元件之�必須先"
+"按下該��以啟動帳號。"
 
+# %1 is the user's email address
 #. %1 is the user's email address
-#: views/users/register_complete.thtml:49
+#: views/users/register_complete.thtml:50
 #, php-format
 msgid "user_register_confirm_email_sent"
 msgstr ""
@@ -6835,20 +6851,11 @@ msgstr ""
 msgid "user_register_confirmation_link_text"
 msgstr "�寄確�信"
 
-#: views/users/register_complete.thtml:47
+#: views/users/register_complete.thtml:48
 msgid "user_register_congratulations"
 msgstr "�喜您�您的使用者帳號已�功建立。"
 
-#: views/users/register.thtml:50
-msgid "user_register_details"
-msgstr ""
-"<p>如果您�是�下載並安�公開的附加元件，您<strong>�需�</strong>在 AMO 註"
-"冊。</p><p>您什麼時候需�註冊：</p><ul><li>您�發表�附加元件的�見</li><li>您"
-"是附加元件的開發者，想�上傳您的附加元件並放在 AMO</li></ul><p>註冊�功後，您"
-"將在所�供的 email 地�中收到一�確�信。請�照信中指示的步驟確�您的帳號。</"
-"p><p>如果您有興趣，�以閱讀我們的<a href='%1$s' title='法律�明'>法律�明</a>"
-"和<a href='%2$s' title='隱�政策'>隱�政策</a>。</p>"
-
+# %1 is the link to the "resend confirmation code" page
 #. %1 is the link to the "resend confirmation code" page
 #: views/users/activatefirst.thtml:51
 #, php-format
@@ -6857,29 +6864,22 @@ msgstr ""
 "如果您還沒收到信，請確定您的 Email �務沒有將它標示為「垃圾郵件�或「廣告�。"
 "如果您需�的話，�以%1$s到您的 Email 地�。"
 
+# %1 is the link to the Mozilla Add-ons front page
 #. %1 is the link to the Mozilla Add-ons front page
-#: views/users/register_complete.thtml:51
+#: views/users/register_complete.thtml:52
 #, php-format
 msgid "user_register_welcome"
 msgstr "感�您註冊並歡迎加入 %1$s�"
 
-#: views/users/register.thtml:49
-msgid "user_register_welcome_header"
-msgstr "歡迎來到 addons.mozilla.org（AMO）�"
-
-#: views/users/register.thtml:81 views/users/edit.thtml:106
+#: views/users/register.thtml:76 views/users/edit.thtml:109
 msgid "user_required_firstlast_or_nickname"
 msgstr "需�姓���稱或是暱稱之一。"
 
-#: views/users/edit.thtml:94 views/users/edit.thtml:142
-msgid "user_tab_collections"
-msgstr "收�集"
-
-#: views/users/edit.thtml:95 views/users/edit.thtml:154
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
 msgid "user_tab_notifications"
 msgstr "通知"
 
-#: views/users/edit.thtml:93 views/users/edit.thtml:101
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
 msgid "user_tab_profile"
 msgstr "使用者檔案"
 
@@ -6887,66 +6887,56 @@ msgstr "使用者檔案"
 msgid "user_verified_okay"
 msgstr "驗證�功�"
 
-#: controllers/users_controller.php:723
+#: controllers/users_controller.php:698
 msgid "users_delete_pagetitle"
 msgstr "刪除使用者帳號"
 
-#: controllers/users_controller.php:414
+#: controllers/users_controller.php:403
 msgid "users_edit_pagetitle"
 msgstr "編輯使用者帳號"
 
-#: views/users/info.thtml:71
-msgid "users_info_aboutme"
-msgstr "有關我"
-
-#: views/users/info.thtml:96
+#: views/users/info.thtml:90
 #, php-format
 msgid "users_info_addons_by_user"
 msgstr "%1$s 的附加元件"
 
-#: views/users/info.thtml:51
+#: views/users/info.thtml:50
 msgid "users_info_author_name"
 msgstr "�稱"
 
-#: views/users/info.thtml:48
+#: views/users/info.thtml:47
 msgid "users_info_author_profile"
 msgstr "使用者檔案"
 
-#. %s is the user name
-#: views/users/info.thtml:137
-msgid "users_info_collections_by_user"
-msgstr "%s 所作的收�集"
-
-#: views/users/info.thtml:66
+#: views/users/info.thtml:65
 msgid "users_info_email"
 msgstr "Email 地�"
 
-#: views/users/info.thtml:155
-msgid "users_info_fav_collections_by_user"
-msgstr "最愛的收�集"
-
-#: views/users/info.thtml:61
+#: views/users/info.thtml:60
 msgid "users_info_homepage"
 msgstr "個人首�"
 
-#: views/users/info.thtml:56
+#: views/users/info.thtml:55
 msgid "users_info_nickname"
 msgstr "暱稱"
 
-#: controllers/users_controller.php:707
+#: controllers/users_controller.php:682
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s 的使用者資訊"
 
+# %1 is the user's name
 #. %1 is the user's name
-#: views/users/info.thtml:116
+#: views/users/info.thtml:110
 msgid "users_info_reviews_by_user"
 msgstr "%s 撰寫的�見"
 
-#: controllers/users_controller.php:330 controllers/users_controller.php:332
+#: controllers/users_controller.php:319 controllers/users_controller.php:321
 msgid "users_login_pagetitle"
 msgstr "使用者登入"
 
+# %1 is the link to the sandbox/policy explanation page
+# This message is for a specific add-on not found
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for a specific add-on not found
 #: views/users/login.thtml:53
@@ -6956,6 +6946,8 @@ msgstr ""
 "您正在�覽的附加元件放在「沙箱��中，如果您有 Mozilla 附加元件的帳號，請先登"
 "入或<a href=\"%1$s\">了解什麼是「沙箱��</a>。"
 
+# %1 is the link to the sandbox/policy explanation page
+# This message is for any given sandbox-related page not found
 #. %1 is the link to the sandbox/policy explanation page
 #. This message is for any given sandbox-related page not found
 #: views/users/login.thtml:56
@@ -6973,20 +6965,5 @@ msgstr "使用者密碼�設"
 msgid "users_register_pagetitle"
 msgstr "新使用者註冊"
 
-#. %1$s is an addon name, like <a>Firebug</a>
-#. %2$s is a version number, like <a>1.2</a>
-#: views/versions/license.thtml:52
-msgid "versions_license_header_source"
-msgstr "%1$s %2$s 的原始碼授權�款"
-
-#: views/addons/category_landing.thtml:147
-msgid "view_recently_added"
-msgstr "檢視所有最近新增"
-
-#: views/addons/category_landing.thtml:161
-msgid "view_top_downloads"
-msgstr "檢視所有下載排行"
-
-#: views/addons/category_landing.thtml:175
-msgid "view_top_rated"
-msgstr "檢視所有評分排行"
+#~ msgid "addon_versions_getlatesttext"
+#~ msgstr "此元件最新版本相容於"
diff --git a/site/app/locale/zh_TW/pages/policy.thtml b/site/app/locale/zh_TW/pages/policy.thtml
index f1ce002..ce8af4e 100644
--- a/site/app/locale/zh_TW/pages/policy.thtml
+++ b/site/app/locale/zh_TW/pages/policy.thtml
@@ -103,7 +103,7 @@
 <li>此元件如何增進使用者的�覽體驗？</li>
 <li>此元件��大多數的 Firefox 使用者嗎？</li>
 <li>此元件哪一點符� Mozilla 計畫中的核心價值，特別是在讓使用者有�擇的機會��護其隱�權�安全性�使網際網路更能方便人們存���符�開放標準�資訊等目標。</li>
-<li>和其他類似功能的元件相比有何��（列出互相比較的優缺點）</li>
+<li>和其他類似功能的元件相比有何��（列出互相比較的優缺點）/li>
 <li>�種��領域使用者（一般使用者�審核者�部�客�太空人或是你家寵物等等）的使用心得，最好列出正�兩種�見</li>
 </ul>
 
diff --git a/site/app/models/addon.php b/site/app/models/addon.php
index 6c09124..e651d34 100644
--- a/site/app/models/addon.php
+++ b/site/app/models/addon.php
@@ -119,19 +119,19 @@ class Addon extends AppModel
                          )
                     );
 
-
+    
     var $translated_fields = array(
-                'description',
+                'description', 
                 'developercomments',
                 'eula',
                 'supportemail',
                 'supporturl',
                 'homepage',
-                'name',
+                'name', 
                 'privacypolicy',
                 'summary'
-            );
-
+            );    
+    
     var $validate = array(
         'guid' => VALID_NOT_EMPTY,
         'name' => VALID_NOT_EMPTY,
@@ -149,9 +149,9 @@ class Addon extends AppModel
         'averagerating', 'weeklydownloads', 'totaldownloads', 'totalreviews',
         'developercomments', 'inactive', 'trusted', 'viewsource', 'publicstats',
         'prerelease', 'adminreview', 'sitespecific', 'externalsoftware', 'binary',
-        'eula', 'privacypolicy', 'nominationmessage', 'target_locale', 'locale_disambiguation',
+        'eula', 'privacypolicy', 'nominationmessage', 'target_locale', 'locale_disambiguation', 
         'created', 'modified');
-
+    
     /**
      * Get a single add-on, along with the desired associations
      * (uses the object-invalidation framework)
@@ -163,22 +163,22 @@ class Addon extends AppModel
      */
     function getAddon($id, $associations = array()) {
         global $valid_status;
-
+        
         // if this object is cached, grab it from memcache
         $identifier = array("addon:$id", $associations);
         if (QUERY_CACHE && $cached = $this->Cache->readCacheObject($identifier)) {
             if (DEBUG >= 2) debug("addon $id was cached");
             return $cached;
         }
-
+        
         // deactivate query caching
         $caching_was = $this->caching;
         $this->caching = false;
-
+        
         // start with very basic fields and association list, then add more as desired
         $this->unbindFully();
         $fields = array('id', 'name', 'status');
-
+        
         foreach ($associations as $association) {
             switch ($association) {
             case 'all_tags':
@@ -189,7 +189,7 @@ class Addon extends AppModel
                              'foreignKey' => 'addon_id'
                         ))));
                 break;
-
+            
             case 'authors':
                 // addon authors
                 $this->bindModel(array('hasAndBelongsToMany' =>
@@ -202,28 +202,28 @@ class Addon extends AppModel
                               'order' => 'addons_users.position'
                         ))));
                 break;
-
+            
             case 'compatible_apps':
                 // list of applications this add-on is compatible with
                 break;
-
+            
             case 'files':
                 // list of files for all versions returned (depends on lastversion
                 // or allversions);
                 loadModel('File');
                 break;
-
+            
             case 'latest_version':
                 // latest public version for public add-ons, latest valid
                 // version otherwise
                 break;
-
+            
             case 'list_details':
                 // add-on details needed for a list item
                 $fields = array_merge($fields, array('summary', 'eula',
                     'weeklydownloads', 'addontype_id', 'averagerating', 'totalreviews'));
                 break;
-
+            
             case 'single_tag':
                 // the first category this add-on is associated with
                 $this->bindModel(array('hasMany' =>
@@ -233,16 +233,16 @@ class Addon extends AppModel
                              'limit' => 1
                         ))));
                 break;
-
+            
             default:
                 debug("Association $association not declared!");
                 break;
             }
         }
-
+        
         // get desired add-on from DB
         $addon = $this->findById($id, $fields);
-
+        
         // add additional data
         if (in_array('latest_version', $associations)) {
             // pull in last version
@@ -255,23 +255,23 @@ class Addon extends AppModel
                 array('Version.id', 'Version.version', 'Version.created'));
             if (!empty($buf[0]['Version'])) {
                 $addon['Version'][0] = $buf[0]['Version'];
-
+                
                 if (in_array('compatible_apps', $associations)) {
                     /* get add-on app compatibility info for that version */
                     $addon['compatible_apps'] = $this->Version->getCompatibleApps($buf[0]['Version']['id']);
                 }
             }
         }
-
+        
         if (in_array('list_details', $associations)) {
             // is the addon recommended?
             $addon['Addon']['recommended'] = $this->is_recommended($id);
         }
-
+        
         // files
         if (in_array('files', $associations) && in_array('latest_version', $associations)
             && !empty($addon['Version'])) {
-
+            
             loadModel('File');
             $this->File =& new File();
             $this->File->unbindfully();
@@ -279,7 +279,7 @@ class Addon extends AppModel
             $_files = $this->File->findAll("File.version_id = '{$addon['Version'][0]['id']}'");
             foreach ($_files as $_file)
                 $addon['File'][] = $_file['File'];
-
+            
             // date of addon status change
             if (!empty($addon['File'])) {
                 if ($addon['Addon']['status'] == STATUS_PUBLIC && $addon['File'][0]['datestatuschanged'] > 0)
@@ -290,11 +290,11 @@ class Addon extends AppModel
                 $addon['Addon']['datestatuschanged'] = $addon['Version'][0]['created'];
             }
         }
-
+        
         // add addon tags
         if ((in_array('all_tags', $associations) || in_array('single_tag', $associations))
             && !empty($addon['AddonTag'])) {
-
+            
             $_tag_ids = array();
             foreach ($addon['AddonTag'] as $_tag)
                 $_tag_ids[] = $_tag['tag_id'];
@@ -303,18 +303,18 @@ class Addon extends AppModel
                 $tags = $this->Tag->findAll(array('Tag.id' => $_tag_ids, 'Tag.application_id' => APP_ID));
             $addon['Tag'] = $tags;
         }
-
+        
         // cache this object...
         if (QUERY_CACHE)
             $this->Cache->writeCacheObject($identifier, $addon, "addon:$id");
-
+        
         // re-enable query caching
         $this->caching = $caching_was;
-
+        
         // ... then hand it back to the caller
         return $addon;
     }
-
+    
     /**
      * Get a list of add-ons by id, each with the given associations
      * uses the object invalidation framework
@@ -326,7 +326,7 @@ class Addon extends AppModel
         }
         return $result;
     }
-
+    
     /**
      * Get addons in a category, sorted by name, popularity (weekly downloads)
      * or "recently updated" (last file approval timestamp).
@@ -334,18 +334,18 @@ class Addon extends AppModel
      * @return array list of matching add-on ids
      */
     function getAddonsFromCategory($status = array(STATUS_PUBLIC),
-        $addontypes = ADDON_EXTENSION, $category = 'all', $sort_by = 'name',
+        $addontypes = ADDON_ACTIVITY, $category = 'all', $sort_by = 'name',
         $direction = 'ASC', $limit = '5', $page = '1', $friends = '') {
-
+        
         $this->unbindFully();
-
+        
         $select_field = 'DISTINCT Addon.id';
-
+        
         // make input data uniform
         if (!is_array($addontypes)) $addontypes = array($addontypes);
         if (!is_array($status)) $status = array($status);
         if ($page <= 0) $page = 1;
-
+        
         // additional joins for sort order etc.
         $add_joins = $orderby = $limitclause = $groupby = $where = '';
         if ($category != 'all') {
@@ -354,13 +354,13 @@ class Addon extends AppModel
         }
         // only select add-ons that have any files to offer
         $add_joins .= "INNER JOIN files AS File ON (Version.id = File.version_id AND File.status IN (".implode(',',$status).")) ";
-
+        
         // Facebook friends
         if (!empty($friends)) {
             $add_joins .= "INNER JOIN facebook_favorites AS ff ON ff.addon_id = Addon.id ";
             $where .= "AND ff.fb_user IN ({$friends}) ";
         }
-
+        
         // additional joins etc per list type
         switch ($sort_by) {
         case 'name':
@@ -376,7 +376,7 @@ class Addon extends AppModel
             $groupby = 'GROUP BY Addon.id';
             break;
         }
-
+            
         // translate sort_by into SQL ORDER BY
         if (!empty($sort_by)) {
             $orderby = 'ORDER BY ';
@@ -401,12 +401,12 @@ class Addon extends AppModel
         } else {
             $orderby = '';
         }
-
+        
         if (!empty($page) && !empty($limit))
             $limitclause = "LIMIT ".(($page-1)*$limit).", {$limit}";
         else
             $limitclause = '';
-
+        
         // If the search engine type is the only add-on we're looking for, we remove
         // the restriction on applications.  If the search engine type is in the list
         // with other types, it _won't work_ because there is no application
@@ -429,107 +429,52 @@ class Addon extends AppModel
                 ."AND Addon.inactive = 0 "
                 ."{$where} {$groupby} {$orderby} {$limitclause}";
         }
-
+        
         $addon_list = $this->query($sql,true);
-
+        
         // if there are no results, we are done.
         if (empty($addon_list)) return $addon_list;
-
+        
         // otherwise return the ids
         $addon_ids = array();
         foreach($addon_list as $id) $addon_ids[] = $id['Addon']['id'];
         return $addon_ids;
     }
-
-    /**
-     * Sort and optionally paginate the addons in $addon_ids.
-     */
-    function sorted($addon_ids, $field, $limit=null, $page=null, $extra='') {
-        // Bail early if there isn't anything to sort.
-        if (empty($addon_ids)) {
-            return $addon_ids;
-        }
-
-        $join = $orderby = $direction = $limit_clause = '';
-
-        $select = "SELECT DISTINCT Addon.id FROM addons AS Addon";
-
-        $ids = implode(',', $addon_ids);
-        $where = "WHERE Addon.id IN ({$ids})";
-
-        if (strstr($field, ' ')) {
-            list($field, $direction) = explode(' ', $field);
-        }
-
-        if (in_array($field, $this->translated_fields)) {
-            $join = "LEFT JOIN translations AS tr_l
-                       ON (tr_l.id = Addon.{$field} AND tr_l.locale = '".LANG."')
-                     LEFT JOIN translations AS tr_en
-                       ON (tr_en.id = Addon.{$field} AND tr_en.locale = `Addon`.`defaultlocale`) ";
-            $orderby = "ORDER BY IFNULL(tr_l.localized_string, tr_en.localized_string)";
-        } else if (!empty($extra)) {
-            $join = $extra;
-            $orderby = "ORDER BY {$field}";
-        } else {
-            $orderby = "ORDER BY Addon.{$field}";
-        }
-
-        if (isset($limit) && isset($page)) {
-            $offset = ($page - 1) * $limit;
-            $limit_clause .= "LIMIT {$limit} OFFSET {$offset}";
-        }
-
-        $sql = implode(' ', array($select, $join, $where, $orderby, $direction, $limit_clause));
-
-        foreach($this->query($sql) as $a) $sorted[] = $a['Addon']['id'];
-
-        return $sorted;
-    }
-
+    
     /**
      * Get a list of addon IDs from a collection
      * @param int $collectionId ID of the collection
      * @param string $orderBy field name to sort the list by
      * @param int $cat_id sub-category ID, null for all
      */
-    function getAddonsFromCollection($collectionId = null, $orderBy = null, $cat_id = null, $limit = null) {
-        global $valid_status;
-
+    function getAddonsFromCollection($collectionId = null, $orderBy = 'name', $cat_id = null) {
         $this->unbindFully();
-
+        
         $query = "SELECT DISTINCT(Addon.id) FROM addons AS Addon INNER JOIN versions AS Version ON (Addon.id = Version.addon_id) "
-        ."INNER JOIN files AS File ON (Version.id = File.version_id AND File.status IN (".join(",",$valid_status).")) "
+        ."INNER JOIN applications_versions AS av ON (av.version_id = Version.id AND av.application_id = ".APP_ID.") "
+        ."INNER JOIN files AS File ON (Version.id = File.version_id AND File.status = ".STATUS_PUBLIC.") "
         ."INNER JOIN addons_collections AS ac ON (ac.addon_id = Addon.id AND ac.collection_id = $collectionId AND "
         .((is_null($cat_id))?'1':"ac.category='{$cat_id}'").") WHERE "
-        ."Addon.status IN (".join(",",$valid_status).") AND Addon.inactive = 0";
-
-        if (!is_null($orderBy)) {
-            $query .= " ORDER BY {$orderBy}";
-        }
-
-        if (!is_null($limit)) {
-            $query .= " LIMIT {$limit}";
-        }
-
-
+        ."Addon.status = ".STATUS_PUBLIC." AND Addon.inactive = 0";
+        
         $addon_list = $this->query($query, true);
-        $addons_ids = array();
+        $addon_ids = array();
         if(!empty($addon_list)) {
             foreach($addon_list as $id) {
                 $addons_ids[] = $id['Addon']['id'];
             }
         }
-
+        
         return $addons_ids;
     }
-
+    
     /**
      * Get a list of addon IDs from a category, divided into subcategories
      */
     function getCategorizedAddonsFromCollection($collectionId = null) {
         $subcatlist = $this->query('SELECT DISTINCT(ac.category) FROM addons_collections AS ac '
             ."WHERE ac.collection_id='{$collectionId}' ORDER BY ac.category");
-
+        
         $result = array();
         if (empty($subcatlist)) return $result;
         foreach ($subcatlist as $cat) {
@@ -538,13 +483,13 @@ class Addon extends AppModel
         }
         return $result;
     }
-
+    
     /**
      * Get the number of addons in a specific category
      */
     function countAddonsInCategory($status = array(STATUS_PUBLIC),
-        $addontypes = ADDON_EXTENSION, $category = 'all', $friends = '') {
-
+        $addontypes = ADDON_ACTIVITY, $category = 'all', $friends = '') {
+        
         $rowcount = $this->getAddonsFromCategory($status, $addontypes, $category,
             null, null, null, null, $friends);
         return count($rowcount);
@@ -555,9 +500,9 @@ class Addon extends AppModel
      */
     function countAddonsInAllCategories($status = array(STATUS_PUBLIC), $addontypes = array(ADDON_THEME)) {
 
-        if (!is_array($status))
+        if (!is_array($status)) 
             $status = array($status);
-        if (!is_array($addontypes))
+        if (!is_array($addontypes)) 
             $addontypes = array($addontypes);
 
         // Construct the SQL query, stolen from getAddonsByCategory
@@ -582,7 +527,7 @@ class Addon extends AppModel
 
         return $addon_counts;
     }
-
+    
    /**
     * Returns the name of the add-on with given id
     */
@@ -593,7 +538,7 @@ class Addon extends AppModel
         else
             return false;
     }
-
+    
    /**
     * Returns the name and ids of all add-ons by the user
     */
@@ -605,9 +550,9 @@ class Addon extends AppModel
                 $addons[$addon_id['addons_users']['addon_id']] = $this->getAddonName($addon_id['addons_users']['addon_id']);
             }
         }
-
+        
         asort($addons);
-
+        
         return $addons;
     }
 
@@ -628,7 +573,7 @@ class Addon extends AppModel
         $_addon_ids = array();
         foreach ($featAddons as $_addon)
             $_addon_ids[] = $_addon['Feature']['addon_id'];
-
+        
         return $_addon_ids;
     }
 
@@ -643,12 +588,12 @@ class Addon extends AppModel
             ."Feature.start < NOW() AND Feature.end > NOW() AND "
             ."Feature.application_id ='" . APP_ID . "' AND "
             ."(Feature.locale = '" . LANG . "' OR Feature.locale IS NULL)";
-
+            
         $_rec = $this->Feature->findCount($criteria);
-
+        
         return ($_rec >= 1);
     }
-
+    
     /**
      * Get the most recent update ping count
      * This is temporary until we can store this in addons and update
@@ -656,42 +601,42 @@ class Addon extends AppModel
      */
     function getMostRecentUpdatePingCount($addon_id) {
         $count = $this->query("SELECT `count` FROM update_counts WHERE addon_id={$addon_id} ORDER BY `date` DESC LIMIT 1");
-
+        
         return !empty($count) ? $count[0]['update_counts']['count'] : 0;
     }
-
+    
     /**
      * Retrieves all details from addons_users for a particular add-on
      */
     function getAuthors($addon_id, $onlyListed = true) {
         $listedQry = $onlyListed ? 'AND addons_users.listed=1 ' : '';
-
+        
         $authors = $this->query("SELECT addons_users.*, User.id, User.email, User.firstname, User.lastname, User.nickname FROM addons_users INNER JOIN users AS User ON addons_users.user_id = User.id WHERE addons_users.addon_id={$addon_id} {$listedQry}ORDER BY addons_users.position");
-
+        
         return $authors;
     }
-
+    
     /**
      * Removes all authors from an add-on
      */
     function clearAuthors($addon_id) {
         return $this->execute("DELETE FROM addons_users WHERE addon_id={$addon_id}");
     }
-
+    
     /**
      * Saves an add-on author
      */
     function saveAuthor($addon_id, $user_id, $role = AUTHOR_ROLE_OWNER, $listed = 1, $position = 0) {
         return $this->execute("INSERT INTO addons_users (addon_id, user_id, role, listed, position) VALUES({$addon_id}, {$user_id}, {$role}, {$listed}, {$position})");
     }
-
+    
     /**
      * Gets all applications ever supported by the add-on
      */
     function getApplicationsEverSupported($addon_id) {
         return $this->query("SELECT DISTINCT Application.* FROM addons AS Addon INNER JOIN versions AS Version on Version.addon_id=Addon.id INNER JOIN applications_versions AS av ON av.version_id=Version.id INNER JOIN applications AS Application ON Application.id=av.application_id WHERE Addon.id={$addon_id}");
     }
-
+    
     /**
      * afterSave callback. Mark cached objects for flush.
      */
@@ -699,29 +644,16 @@ class Addon extends AppModel
         if (QUERY_CACHE) $this->Cache->markListForFlush("addon:{$this->id}");
         return parent::afterSave();
     }
-
+    
     /**
      * Get the date the addon was added to a specific collection
      */
-    function getCollectionPublishDetails($addon_id, $collectionId) {
+    function getDateAddedToCollection($addon_id, $collectionId) {
         $this->unbindFully();
         
-        // comments are en-US only
-        $sql = "SELECT addons_collections.added, translations.localized_string as comment, users.id, users.firstname, users.lastname, users.nickname
-                FROM addons_collections
-                LEFT JOIN translations
-                ON translations.id = addons_collections.comments AND translations.locale='en-US'
-                INNER JOIN users
-                ON users.id = addons_collections.user_id
-                WHERE collection_id = {$collectionId} AND addon_id = {$addon_id}";
-        $data = $this->query($sql);
-        
-        $details = array(
-            'dateadded' => $data[0]['addons_collections']['added'],
-            'publisher' => $data[0]['users'],
-            'comment' => $data[0]['translations']['comment']
-        );
-        return $details;
+        $sql = "SELECT added FROM addons_collections WHERE collection_id = {$collectionId} AND addon_id = {$addon_id}";
+        $date = $this->query($sql);
+        return $date['0']['addons_collections']['added'];
     }
 
     /**
@@ -738,17 +670,6 @@ class Addon extends AppModel
         return $addon_ids;
     }
 
-    /**
-     * When an add-on was shared with others by email, increase the counter
-     * accordingly.
-     * @param int $addonid Add-on ID
-     * @param int $number times shared
-     * @return boolean success
-     */
-    function increaseShareCount($addonid, $number) {
-        $sql = "UPDATE addons SET sharecount = sharecount + {$number} WHERE id = {$addonid};";
-        return $this->execute($sql);
-    }
 
     /* * * * * * deprecated functions * * * * * */
     /**
@@ -794,7 +715,7 @@ class Addon extends AppModel
         );
 
         $this->useDbConfig = 'shadow';
-
+       
         $_fields = array('id', 'guid', 'name', 'defaultlocale', 'addontype_id', 'status',
         'icontype', 'icondata',  'supportemail', 'supporturl', 'homepage', 'description', 'summary',
         'averagerating', 'weeklydownloads', 'totaldownloads', 'totalreviews',
@@ -802,16 +723,16 @@ class Addon extends AppModel
         'prerelease', 'adminreview', 'sitespecific', 'externalsoftware',
         'eula', 'privacypolicy', 'target_locale', 'locale_disambiguation',
         'nominationmessage', 'created', 'modified');
-
+        
         $addons = $this->findAllById($id, $_fields, $order);
-
+        
         if (!empty($addons) && is_array($addons)) {
             // we need to File model to pull in the files if requested
             if ($includeFiles) {
                 loadModel('File');
                 $this->File =& new File();
             }
-
+            
             foreach ($addons as $key=>$addon) {
                 /* pull in last version */
                 $this->Version->unbindFully();
@@ -822,14 +743,14 @@ class Addon extends AppModel
                     array('Version.id', 'Version.version', 'Version.created'));
                 if (!empty($buf[0]['Version'])) {
                     $addons[$key]['Version'][0] = $buf[0]['Version'];
-
+                    
                     /* get add-on app compatibility info for that version */
                     $addons[$key]['compatible_apps'] = $this->Version->getCompatibleApps($buf[0]['Version']['id']);
                 }
-
+                
                 // is the addon recommended?
                 $addons[$key]['Addon']['recommended'] = $this->is_recommended($addon['Addon']['id']);
-
+                
                 // add addon tags
                 if (!empty($addon['AddonTag'])) {
                     $_tag_ids = array();
@@ -840,7 +761,7 @@ class Addon extends AppModel
                         $tags = $this->Tag->findAll(array('Tag.id' => $_tag_ids, 'Tag.application_id' => APP_ID));
                     $addons[$key]['Tag'] = $tags;
                 }
-
+                
                 /* add files for last version, if requested */
                 if ($includeFiles && !empty($addons[$key]['Version'])) {
                     $this->File->unbindfully();
@@ -860,9 +781,9 @@ class Addon extends AppModel
      * @deprecated since 4.0.1, use getAddonsFromCategory along with getAddonList instead
      */
     function getAddonsByCategory($fields = null, $status = array(STATUS_PUBLIC),
-        $addontypes = ADDON_EXTENSION, $category = 'all', $sort_by = 'name',
+        $addontypes = ADDON_ACTIVITY, $category = 'all', $sort_by = 'name',
         $direction = 'ASC', $limit = '5', $page = '1', $friends = '', $includeFiles = false) {
-
+        
         $associations = array('all_tags', 'authors', 'compatible_apps',
             'latest_version', 'list_details');
         if ($includeFiles) {
diff --git a/site/app/models/addon_collection.php b/site/app/models/addon_collection.php
index 00d2b0a..75c07d0 100644
--- a/site/app/models/addon_collection.php
+++ b/site/app/models/addon_collection.php
@@ -16,12 +16,11 @@
  *
  * The Initial Developer of the Original Code is
  * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009
+ * Portions created by the Initial Developer are Copyright (C) 2006
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Ryan Doherty <rdoherty@mozilla.com>
- *   Frederic Wenzel <fwenzel@mozilla.com>
+ *   Ryan Doherty <rdoherty@mozilla.com>    
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -46,177 +45,4 @@ class AddonCollection extends AppModel
     var $translated_fields = array(
         'comments'
     );
-
-    /**
-     * Delete any addon/collection associations by addon_id and collection_id
-     *
-     * @param int $addon_id
-     * @param int $collection_id
-     * @param int $user_id optional: only delete the association if $user_id was the publisher.
-     * @return bool success (false on error or when nothing was deleted)
-     */
-    function deleteByAddonIdAndCollectionId($addon_id, $collection_id, $user_id = null) {
-        if (!is_numeric($addon_id)) return false;
-        if (!is_numeric($collection_id)) return false;
-        if (!empty($user_id) && !is_numeric($user_id)) return false;
-
-        $sql = "DELETE FROM addons_collections WHERE addon_id={$addon_id} AND collection_id={$collection_id}";
-        if (!empty($user_id)) $sql .= " AND user_id = {$user_id}";
-
-        $res = $this->query($sql);
-        return (!($res === false || $this->getAffectedRows() == 0));
-    }
-
-    /**
-     * Get a list of add-ons belonging to this collection
-     *
-     * @param int $collection_id Collection ID
-     * @return array list of add-ons
-     */
-    function getAddonsFromCollection($collection_id) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $collection_id = $db->value($collection_id);
-        $this->unbindFully();
-        $res = $this->findAll(array('collection_id' => $collection_id));
-        if (!empty($res)) {
-            loadModel('Addon');
-            loadModel('User');
-            if (empty($this->Addon)) $this->Addon =& new Addon();
-            if (empty($this->User)) $this->User =& new User();
-            foreach ($res as &$row) {
-                $row['Addon'] = $this->Addon->getAddon($row['AddonCollection']['addon_id']);
-                $user = $this->User->findById($row['AddonCollection']['user_id']);
-                $row['User'] = $user['User'];
-            }
-        }
-        return $res;
-    }
-
-    /**
-     * set the publisher comment for a specific add-on in a collection (for now,
-     * en-US only)
-     *
-     * @param int $collection_id
-     * @param int $addon_id
-     * @param string $comment comment to be saved
-     * @return bool success
-     */
-    function setComment($collection_id, $addon_id, $comment) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $collection_id = $db->value($collection_id);
-        $addon_id = $db->value($addon_id);
-        $comment = $db->value($comment);
-
-        $row = $this->query("SELECT comments FROM addons_collections "
-            ."WHERE collection_id = {$collection_id} AND addon_id = {$addon_id}");
-        if (empty($row)) return false; // not found or access denied
-
-        $this->begin(); // transactions are our friends
-
-        if (!empty($row[0]['addons_collections']['comments'])) {
-            $id = $row[0]['addons_collections']['comments'];
-        } else {
-            // generate a new primary key id
-            $db->execute('UPDATE translations_seq SET id=LAST_INSERT_ID(id+1);');
-            $_res = $db->execute('SELECT LAST_INSERT_ID() AS id FROM translations_seq;');
-            if ($_row = $db->fetchRow()) {
-                $id = $_row[0]['id'];
-            } else {
-                $this->rollback();
-                return false;
-            }
-        }
-        // delete all existing comments
-        $db->execute("UPDATE translations SET localized_string = NULL WHERE id = {$id}");
-
-        // insert the new one, if applicable (en-US only)
-        if (!empty($comment)) {
-            $db->execute("INSERT INTO translations (id, locale, localized_string, created) "
-                ."VALUES ({$id}, 'en-US', {$comment}, NOW()) "
-                ."ON DUPLICATE KEY UPDATE localized_string=VALUES(localized_string), modified=VALUES(created);");
-        }
-        // link comments field to translations
-        $res = $db->execute("UPDATE addons_collections SET comments = {$id} "
-            ."WHERE collection_id = {$collection_id} AND addon_id = {$addon_id}");
-        if (false !== $res) {
-            $this->commit();
-            return true;
-        } else {
-            $this->rollback();
-            return false;
-        }
-    }
-
-    /**
-     * is an add-on part of a given collection?
-     *
-     * @param int addon_id
-     * @param int collection_id
-     * @return bool true if addon is in collection, false otherwise
-     */
-    function isAddonInCollection($addon_id, $collection_id) {
-        if (!is_numeric($collection_id) || !is_numeric($addon_id)) return null;
-        $res = $this->query("SELECT addon_id FROM addons_collections WHERE addon_id = {$addon_id} AND collection_id = {$collection_id};");
-        return (!empty($res));
-    }
-
-    /**
-     * get most popular collections that a given add-on is part of
-     * @param int $addon_id
-     * @param int $limit (optional) max. amount of collections returned, default 3
-     * @param string $app (optional) application ID to restrict search to, default all
-     * @return array collection ids
-     */
-    function getPopularCollectionsForAddon($addon_id, $limit = 3, $app = null) {
-        if (!is_numeric($addon_id)) return false;
-
-        if (is_numeric($limit) && $limit > 0)
-            $_lim = " LIMIT {$limit}";
-        else
-            $_lim = '';
-
-        if (is_numeric($app) && $app > 0) {
-            $_where = " AND c.application_id = {$app}";
-        } else {
-            $_where = '';
-        }
-
-        $colls = array();
-        $res = $this->query(
-            "SELECT collection_id "
-            ."FROM addons_collections AS ac "
-            ."INNER JOIN collections AS c ON (c.id = ac.collection_id) "
-            ."WHERE addon_id = {$addon_id}{$_where} "
-            ."ORDER BY c.subscribers DESC"
-            .$_lim.";");
-        foreach ($res as &$row) {
-            $colls[] = $row['ac']['collection_id'];
-        }
-        return $colls;
-    }
-
-    /**
-     * count amount of collections that a given add-on is in
-     * @param int $addon_id
-     * @return int collection count >= 0, false in case of error
-     * @param string $app (optional) application ID to restrict search to, default all
-     */
-    function getCollectionCountForAddon($addon_id, $app = null) {
-        if (!is_numeric($addon_id)) return false;
-
-        if (is_numeric($app) && $app > 0) {
-            $_join = " INNER JOIN collections AS c ON (c.id = ac.collection_id AND c.application_id = {$app})";
-        } else {
-            $_join = '';
-        }
-
-        $res = $this->query(
-            "SELECT COUNT(ac.collection_id) AS cnt "
-            ."FROM addons_collections AS ac "
-            . $_join
-            ."WHERE ac.addon_id = {$addon_id};");
-        if (!$res) return false;
-        return $res[0][0]['cnt'];
-    }
-
 }
diff --git a/site/app/models/addon_tag.php b/site/app/models/addon_tag.php
index da2ec18..67044db 100644
--- a/site/app/models/addon_tag.php
+++ b/site/app/models/addon_tag.php
@@ -66,16 +66,17 @@ class AddonTag extends AppModel
         if (is_null($order))
             $order = 'RAND()';
         if (!is_array($tag))
-            $tag = (strtolower($tag) == 'all') ? array() : array($tag);
+           $tag = (strtolower($tag) == 'all') ? array() : array($tag);
         if (!is_null($addontype) && !is_array($addontype)) $addontype = array($addontype);
         
         $raw_addons = $this->query(
             "SELECT DISTINCT Addon.id "
             ."FROM addons_tags AS AddonTag "
             ."INNER JOIN addons AS Addon ON (AddonTag.addon_id = Addon.id)"
+            ."LEFT JOIN features ON (features.addon_id = Addon.id)"
             ."WHERE "
                 .(!empty($tag) ? "AddonTag.tag_id IN (".implode(',', $tag).') AND ' : '')
-                ."AddonTag.feature = ".($recommended ? '1' : '0')." AND "
+                .'features.id IS '.($recommended ? 'NOT' : '').' NULL AND '
                 ."Addon.status IN (".implode(',', $valid_status).') AND '
                 .'Addon.inactive = 0 '
                 .(!empty($addontype) ? ' AND Addon.addontype_id IN ('.implode(',', $addontype).') ' : '')
diff --git a/site/app/models/addontype.php b/site/app/models/addontype.php
index 8353724..ab65b82 100644
--- a/site/app/models/addontype.php
+++ b/site/app/models/addontype.php
@@ -60,6 +60,16 @@ class Addontype extends AppModel
                                     'dependent'   => false,
                                     'exclusive'   => false,
                                     'finderSql'   => ''
+                              ),
+                              'Collection' =>
+                              array('className'   => 'Collection',
+                                      'conditions'  => '',
+                                      'order'       => '',
+                                      'limit'       => '',
+                                      'foreignKey'  => 'addontype_id',
+                                      'dependent'   => false,
+                                      'exclusive'   => false,
+                                      'finderSql'   => ''
                               )
                   );
 
@@ -71,6 +81,10 @@ class Addontype extends AppModel
      */
     function getName($id) {
         switch($id) {
+            case ADDON_ACTIVITY:
+                return ___('general_addontype_activity');
+            case ADDON_CONTENT:
+                return ___('general_addontype_content');
             case ADDON_EXTENSION:
                 return ___('general_addontype_extension');
             case ADDON_THEME: 
@@ -94,6 +108,14 @@ class Addontype extends AppModel
      * @return array
      */
     function getNames() {
+        // we are sugar
+        $addontypes = array();
+        global $app_listedtypes;
+        foreach ($app_listedtypes[APP_SUGAR] as $type) {
+            $addontypes[$type] = $this->getName($type);
+        }
+        return $addontypes;
+
         $addontypes = array(
             ADDON_EXTENSION => ___('general_addontype_extension_plural'),
             ADDON_THEME => ___('general_addontype_theme_plural'),
diff --git a/site/app/models/collection.php b/site/app/models/collection.php
index 59e0d13..1723564 100644
--- a/site/app/models/collection.php
+++ b/site/app/models/collection.php
@@ -20,10 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Ryan Doherty <rdoherty@mozilla.com>
- *   l.m.orchard <lorchard@mozilla.com>
- *   Frederic Wenzel <fwenzel@mozilla.com>
- *   Wil Clouser <wclouser@mozilla.com>
+ *   Ryan Doherty <rdoherty@mozilla.com>    
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -42,589 +39,25 @@
 class Collection extends AppModel
 {
     var $name = "Collection";
-
-    var $hasAndBelongsToMany = array(
-        'Addon' => array(
-            'className' => 'Addon',
-            'joinTable' => 'addons_collections',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'addon_id'
-        ),
-        'Subscriptions' => array(
-            'className' => 'User',
-            'joinTable' => 'collection_subscriptions',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'user_id'
-        ),
-        'Users' => array(
-            'className' => 'User',
-            'joinTable' => 'collections_users',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'user_id'
-        )
-    );
+    var $belongsTo = array('Addontype');
+    var $hasAndBelongsToMany = array('Addon' =>
+                                    array('className' => 'Addon',
+                                        'joinTable' => 'addons_collections',
+                                        'foreignKey' => 'collection_id',
+                                        'associationForeignKey' => 'addon_id'
+                                    )
+                                );
     
-    var $hasAndBelongsToMany_full = array(
-        'Tag' => array(
-            'className'  => 'Tag',
-            'joinTable'  => 'collections_tags',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey'=> 'tag_id'
-        ),
-        'Addon' => array(
-            'className' => 'Addon',
-            'joinTable' => 'addons_collections',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'addon_id'
-        ),
-        'Subscriptions' => array(
-            'className' => 'User',
-            'joinTable' => 'collection_subscriptions',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'user_id'
-        ),
-        'Users' => array(
-            'className' => 'User',
-            'joinTable' => 'collections_users',
-            'foreignKey' => 'collection_id',
-            'associationForeignKey' => 'user_id'
-        )
-    );
-
-    var $hasMany_full = array(
-                         'Promo' =>
-                         array('className'   => 'CollectionPromo',
-                               'conditions'  => '',
-                               'order'       => '',
-                               'limit'       => '',
-                               'foreignKey'  => 'collection_id',
-                               'dependent'   => true,
-                               'exclusive'   => false,
-                               'finderSql'   => ''
-                         )
-                    );
-
+    var $hasAndBelongsToMany_full = array('Tag' =>
+                                        array('className'  => 'Tag',
+                                            'joinTable'  => 'collections_tags',
+                                            'foreignKey' => 'collection_id',
+                                            'associationForeignKey'=> 'tag_id'
+                                        )
+                                    );
 
-    var $validate = array(
-        'name'        => VALID_NOT_EMPTY,
-        'description' => VALID_NOT_EMPTY
-    );
-    
     var $translated_fields = array(
         'name',
-        'description',
+        'description'
     );
-
-    /**
-     * validate name field
-     */
-    function clean_name($input) {
-        $msg = sprintf(___('collection_name_limit'), Collection::MAX_NAME_LENGTH);
-        $this->maxLength('name', $input, Collection::MAX_NAME_LENGTH, $msg);
-    }
-
-    /**
-     * validate description field
-     */
-    function clean_description($input) {
-        $msg = sprintf(___('collection_description_limit'), Collection::MAX_DESC_LENGTH);
-        $this->maxLength('description', $input, Collection::MAX_DESC_LENGTH, $msg);
-    }
-
-    /**
-     * validate nickname field
-     */
-    function clean_nickname($input) {
-        if (preg_match(INVALID_COLLECTION_NICKNAME_CHARS, $input)
-            || $this->isNicknameTaken($input)) {
-            $this->invalidate('nickname');
-        }
-    }
-
-    const COLLECTION_TYPE_NORMAL = 0;
-    const COLLECTION_TYPE_AUTOPUBLISHER = 1;
-    const COLLECTION_TYPE_EDITORSPICK = 2;
-
-    const MAX_NAME_LENGTH = 50;
-    const MAX_DESC_LENGTH = 200;
-
-    /**
-     * Generates a pseudo-random UUID.
-     * Slightly modified version of a function submitted to php.net:
-     * http://us2.php.net/manual/en/function.com-create-guid.php#52354
-     *
-     * @access public
-     */
-    function uuid() {
-        mt_srand((double)microtime()*10000);
-        $charid = md5(uniqid(rand(), true));
-        $hyphen = chr(45);// "-"
-        $uuid = substr($charid, 0, 8).$hyphen
-              . substr($charid, 8, 4).$hyphen
-              . substr($charid,12, 4).$hyphen
-              . substr($charid,16, 4).$hyphen
-              . substr($charid,20,12);
-
-        return $uuid;
-    } 
-
-    /**
-     * Verifies a UUID's structure (not that it actually exists in our database).
-     *
-     * @param string uuid
-     * @return boolean
-     */
-    function isValidUUID($uuid) {
-        if (preg_match(VALID_UUID_REQ, $uuid) > 0) {
-            return true;
-        }
-        return false;
-    } 
-
-    /**
-     * Before saving, set a UUID if none yet set.
-     */
-    function beforeSave() {
-        if (empty($this->id) && empty($this->data[$this->name]['id'])) {
-            // If no ID set yet, assume this is a new record and give it a UUID
-            $this->data[$this->name]['uuid'] = $this->uuid();
-        }
-
-        // if nickname is set, make sure it's unique
-        if (!empty($this->data[$this->name]['nickname'])) {
-            if ($this->isNicknameTaken($this->data[$this->name]['nickname'])) {
-                $this->invalidate('nickname');
-                return false;
-            }
-        } else {
-            $this->data[$this->name]['nickname'] = null;
-        }
-
-        return parent::beforeSave();
-    }
-
-    /**
-     * Subscribes a user to a collection
-     *
-     * @param int $id - the id of the collection
-     * @param int $userId - the id of the user
-     * @return bool success
-     */
-    function subscribe($id, $userId) {
-        // Perform SQL escaping.
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $e_id     = $db->value($id); 
-        $e_userId = $db->value($userId);
-
-        $this->execute("
-            INSERT IGNORE INTO collection_subscriptions
-            (collection_id, user_id, created, modified)
-            VALUES 
-            ({$e_id}, {$e_userId}, NOW(), NOW())
-        ");
-        return ($this->getAffectedRows() > 0);
-    }
-    
-    /**
-     * Unsubscribe a user to a collection
-     *
-     * @param int $id - id of the collection
-     * @param int $userId - id of user
-     * @return bool success
-     */
-    function unsubscribe($id, $userId) {
-        // Perform SQL escaping.
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $e_id     = $db->value($id); 
-        $e_userId = $db->value($userId);
-
-        $this->execute("
-            DELETE FROM collection_subscriptions 
-            WHERE 
-                user_id = {$e_userId} AND
-                collection_id = {$e_id}
-        ");
-        return ($this->getAffectedRows() > 0);
-    }
-    
-    /**
-     * Update the subscribers count for a collection.
-     *
-     * @param int $id - id of the collection
-     */
-    function _updateSubscribersCount($e_id) {
-        return $this->execute("
-            UPDATE collections 
-            SET subscribers=(
-                SELECT count(collection_id) 
-                FROM collection_subscriptions 
-                WHERE collection_id={$e_id}
-            ) 
-            WHERE id={$e_id}
-        ");
-    }
-    
-    /**
-     * Add an add-on to a collection
-     *
-     * @param int $collectionId - collection id
-     * @param int $addonId - add-on id
-     */
-    function addAddonToCollection($collection_id, $user_id, $addon_id) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        
-        $collection_id = $db->value($collection_id);
-        $user_id = $db->value($user_id);
-        $addon_id = $db->value($addon_id);
-
-        $ret = $this->execute("
-            INSERT INTO addons_collections 
-            (addon_id, user_id, collection_id, added) 
-            VALUES 
-            ({$addon_id}, {$user_id}, {$collection_id}, NOW())
-        ");
-        return $ret;
-    }
-
-    /* Update the addon count for collection $id. */
-    function _updateAddonCount($id) {
-        return $this->execute("
-            UPDATE collections
-            SET addonCount=(SELECT COUNT(*)
-                            FROM addons_collections
-                            WHERE collection_id={$id})
-            WHERE id=${id}");
-    }
-
-    /**
-     * Adds a user to a collection so they can edit it
-     *
-     * @param int $collectionId - id of the collection
-     * @param int $userId - id of the user
-     * @param int $role - role type
-     */
-    function addUser($collectionId, $userId, $role) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-
-        $collectionId = $db->value($collectionId);
-        $userId = $db->value($userId);
-        $role = $db->value($role);
-
-        return $this->execute("INSERT INTO collections_users (collection_id, user_id, role) VALUES ({$collectionId}, {$userId}, {$role})");
-    }
-    
-    /**
-     * Remove a user
-     *
-     * @param int $collectionId - id of the collection
-     * @param int $userId - id of the user
-     */
-    function removeUser($collectionId, $userId) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-
-        $collectionId = $db->value($collectionId);
-        $userId = $db->value($userId);
-
-        return $this->execute("DELETE FROM collections_users WHERE user_id = {$userId} AND collection_id={$collectionId}");
-    }
-
-    /**
-     * Remove all user rights from a collection, by role
-     * Warning: do not do this with OWNER unless you know what you are doing.
-     *
-     * @param int $collection_id
-     * @param int $role user role to remove, for example COLLECTION_ROLE_ADMIN
-     */
-    function removeAllUsersByRole($collection_id, $role) {
-        return $this->execute("DELETE FROM collections_users WHERE collection_id={$collection_id} AND role={$role};");
-    }
-
-    /**
-     * Deletes a collection
-     *
-     * @param int $id - collection id
-     */
-    function delete($id) {
-        $this->execute("DELETE FROM collections_users WHERE collection_id = {$id}");
-        $this->execute("DELETE FROM addons_collections WHERE collection_id = {$id}");
-        $this->execute("DELETE FROM collections_tags WHERE collection_id = {$id}");
-        $this->execute("DELETE FROM collection_subscriptions WHERE collection_id = {$id}");
-        $this->execute("DELETE FROM collection_promos WHERE collection_id = {$id}");
-        $this->execute("DELETE FROM collections WHERE id = {$id}");
-        return true;
-    }
-
-    /**
-     * returns the ids of all collections owned or managed by a given user
-     * @param int $userid
-     * @param mixed $roles (optional) array of allowed roles, defaults to "any role"
-     * @return array collection ids, false on error
-     */
-    function getCollectionsByUser($userid, $roles = null) {
-        if (!is_numeric($userid)) return false;
-
-        $role_sql = '';
-        if (!empty($role)) {
-            if (is_scalar($roles)) $roles = array($roles);
-            foreach ($roles as &$role) if (!is_numeric($role)) return false;
-            $role_sql = ' AND role IN ('.implode(',', $roles).')';
-        }
-
-        $res = $this->query("SELECT collection_id FROM collections_users WHERE user_id = {$userid}{$role_sql}");
-        if (empty($res)) return array();
-
-        $ids = array();
-        foreach ($res as &$row) $ids[] = $row['collections_users']['collection_id'];
-        return $ids;
-    }
-
-    /**
-     * returns the ids of all collections subscribed to by a given user
-     * @param int $userid
-     * @return array collection ids, false on error
-     */
-    function getSubscriptionsByUser($userid) {
-        if (!is_numeric($userid)) return false;
-
-        $res = $this->query("SELECT collection_id FROM collection_subscriptions WHERE user_id = {$userid}");
-        if (empty($res)) return array();
-
-        $ids = array();
-        foreach ($res as &$row) $ids[] = $row['collection_subscriptions']['collection_id'];
-        return $ids;
-    }
-
-    /**
-     * Get a list of users and roles
-     * 
-     * @param int id of the collection
-     * @param array (optional) list of roles for which users should be fetched
-     */
-    function getUsers($collectionId, $roles=null) {
-        if (!is_numeric($collectionId)) return null;
-        
-        // Build SQL to look up user IDs and roles for collection
-        $sql = "
-            SELECT user_id, role 
-            FROM collections_users 
-            WHERE collection_id={$collectionId}
-        ";
-
-        // Add an IN clause if roles supplied.
-        if (null !== $roles && is_array($roles)) {
-            $s_roles = array();
-            foreach ($roles as $role) if (is_numeric($role)) 
-                $s_roles[] = $role;
-            $sql .= " AND role IN ( ". join(',', $s_roles) . " )";
-        }
-
-        // Fetch the rows and map them to user IDs.
-        $rows = $this->execute($sql);
-        $user_map = array();
-        foreach ($rows as $row) {
-            $user_map[$row['collections_users']['user_id']] = 
-                $row['collections_users'];
-        }
-
-        // Look up users with user IDs, merge the role info into each found.
-        $users = $this->User->findAllById(array_keys($user_map));
-        for ($i=0; $i<count($users); $i++) {
-            // HACK: CollectionUser used in lieu of an actual model class.
-            $users[$i]['CollectionUser'] =
-                $user_map[$users[$i]['User']['id']];
-        }
-
-        return $users;
-    }
-
-    /**
-     * Decide whether or not a given collection is writable by a user.
-     * 
-     * @param int id of the collection
-     * @param int id of the user
-     */
-    function isWritableByUser($collection_id, $user_id) {
-        if (!is_numeric($collection_id)) return null;
-        if (!is_numeric($user_id)) return null;
-
-        $role = $this->getUserRole($collection_id, $user_id);
-        if ($role === false) return false; // no access rights
-        return in_array($role, array(
-            COLLECTION_ROLE_OWNER, 
-            COLLECTION_ROLE_ADMIN, 
-            COLLECTION_ROLE_PUBLISHER 
-        ));
-    }
-
-    /**
-     * Determine a user's role for a collection (admin, owner, subscriber...).
-     *
-     * @param int $collection_id
-     * @param int $user_id
-     * @return role ID, false if none
-     */
-    function getUserRole($collection_id, $user_id) {
-        if (!is_numeric($collection_id)) return null;
-        if (!is_numeric($user_id)) return null;
-
-        $rows = $this->execute("
-            SELECT role
-            FROM collections_users 
-            WHERE 
-                collection_id={$collection_id} AND
-                user_id={$user_id}
-        ");
-        if (empty($rows)) return false;
-        return (int)$rows[0]['collections_users']['role'];
-    }
-
-    /**
-     * Look up the ID for a collection by UUID, less expensive than a full 
-     * fetch.
-     *
-     * @param   string Collection UUID
-     * @return  string Collection ID
-     */
-    function getIdForUuid($uuid) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $uuid = $db->value($uuid);
-        $rows = $this->execute("
-            SELECT id
-            FROM collections
-            WHERE uuid={$uuid}
-        ");
-        $id = null;
-        if (!empty($rows[0])) {
-            $id = $rows[0]['Collection']['id'];
-        }
-        return $id;
-    }
-
-    /**
-     * Look up ID for a UUID or nickname.
-     *
-     * @param string UUID or nickname
-     * @return int collection ID
-     */
-    function getIdForUuidOrNickname($uuid_or_nickname) {
-        $id = null;
-        if (strlen($uuid_or_nickname) == 36) { // possibly a UUID
-            $id = $this->getIdForUuid($uuid_or_nickname);
-        }
-        if (is_null($id)) { // try nickname
-            $db =& ConnectionManager::getDataSource($this->useDbConfig);
-            $uuid_or_nickname = $db->value($uuid_or_nickname);
-            $rows = $this->execute("
-                SELECT id
-                FROM collections
-                WHERE nickname={$uuid_or_nickname}
-            ");
-            if (!empty($rows[0])) {
-                $id = $rows[0]['Collection']['id'];
-            }
-        }
-        return $id;
-    }
-
-    /**
-     * Determine the last modified time for a collection, found either by
-     * ID or UUID.  If a UUID is supplied, it's converted to an ID via 
-     * query first.
-     *
-     * @param   string Collection ID
-     * @param   string Collection UUID, replaces ID if supplied
-     * @return  string Last modified date for collection and addons
-     */
-    function getLastModifiedForCollection($id=null, $uuid=null) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-
-        if (null !== $uuid) {
-            $id = $this->getIdForUUID($uuid);
-        }
-
-        $id = $db->value($id);
-
-        $dates = array();
-
-        $rows = $this->execute("
-            SELECT added, modified
-            FROM addons_collections
-            WHERE collection_id={$id}
-            ORDER BY added DESC
-            LIMIT 1
-        ");
-        foreach ($rows as $row) {
-            $dates[] = $row['addons_collections']['added'];
-            $dates[] = $row['addons_collections']['modified'];
-        }
-            
-        $rows = $this->execute("
-            SELECT modified
-            FROM collections
-            WHERE id={$id} 
-        ");
-        foreach ($rows as $row) {
-            $dates[] = $row['Collection']['modified'];
-        }
-
-        if (empty($dates)) return null;
-        rsort($dates);
-        return strtotime($dates[0]);
-    }
-
-    /**
-     * is collection nickname taken yet?
-     * @param string $nickname proposed nickname
-     * @return bool true if nickname is occupied already, false otherwise
-     */
-    function isNicknameTaken($nickname) {
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        $nickname = $db->value($nickname);
-        $res = $this->query("SELECT id FROM collections WHERE nickname = {$nickname}");
-        if (empty($res)) return false;
-        if (empty($this->id))
-            return (!empty($res));
-        else
-            return ($this->id != $res[0]['collections']['id']);
-    }
-
-    function isSubscribed($collection_id, $user_id) {
-        $res = $this->execute("SELECT user_id FROM collection_subscriptions
-                               WHERE user_id={$user_id}
-                                 AND collection_id={$collection_id}");
-        return !empty($res);
-    }
-
-    function getNickname($collection) {
-        $c = $collection['Collection'];
-        return isset($c['nickname']) ? $c['nickname'] : $c['uuid'];
-    }
-
-    function getDetailUrl($collection) {
-        return '/collection/' .  $this->getNickname($collection);
-    }
-
-    function getSubscribeUrl($ajax=false) {
-        return '/collections/subscribe/' . ($ajax === true ? 'ajax' : '');
-    }
-
-    function getUnsubscribeUrl($ajax=false) {
-        return '/collections/unsubscribe/' . ($ajax === true ? 'ajax' : '');
-    }
-
-    /**
-     * Get editor's picks for the current application.
-     *
-     * @param limit the number you want
-     * @return array of collections
-     */
-    function getEditorPicks($limit=null) {
-        $conditions = array(
-            'Collection.collection_type' => Collection::COLLECTION_TYPE_EDITORSPICK,
-            'Collection.application_id'  => APP_ID
-        );
-        $this->unbindFully();
-        $collections = $this->findAll($conditions,null,'Collection.downloads DESC',$limit);
-        return $collections;
-    }
-}
+}
\ No newline at end of file
diff --git a/site/app/models/platform.php b/site/app/models/platform.php
index ff0649d..073e0c6 100644
--- a/site/app/models/platform.php
+++ b/site/app/models/platform.php
@@ -68,7 +68,6 @@ class Platform extends AppModel
             foreach ($_platforms as $platform) {
                 $platforms[$platform['Platform']['id']] = $platform['Translation']['name']['string'];
             }
-            asort($platforms);
         }
         return $platforms;
     }
@@ -85,7 +84,6 @@ class Platform extends AppModel
             foreach ($_platforms as $platform) {
                 $platforms[$platform['Platform']['id']] = $platform['Translation']['shortname']['string'];
             }
-            asort($platforms);
         }
         return $platforms;
     }
diff --git a/site/app/models/user.php b/site/app/models/user.php
index 6a92c7b..ded13d3 100644
--- a/site/app/models/user.php
+++ b/site/app/models/user.php
@@ -53,18 +53,7 @@ class User extends AppModel
                                                 'joinTable'             => 'addons_users',
                                                 'foreignKey'            => 'user_id',
                                                 'associationForeignKey' => 'addon_id'
-                                          ),
-                                      'CollectionSubscriptions' =>
-                                          array('className'             => 'Collection',
-                                                'joinTable'             => 'collection_subscriptions',
-                                                'foreignKey'            => 'user_id',
-                                                'associationForeignKey' => 'collection_id'
-                                         ),
-                                      'Collections' => 
-                                          array('className'             => 'Collection',
-                                                'joinTable'             => 'collections_users',
-                                                'foreignKey'            => 'user_id',
-                                                'associationForeignKey' => 'collection_id')
+                                          )
                                     );
     var $hasMany_full = array('Approval' =>
                               array('className'   => 'Approval',
@@ -103,13 +92,11 @@ class User extends AppModel
                                     'limit'       => '',
                                     'foreignKey'  => 'user_id',
                                     'dependent'   => true,
-                                    'exclusive'   => false,
+                                    'exculsive'   => false,
                                     'finderSql'   => ''
-                              ),
+                              )
                          );
-
-    var $translated_fields = array('bio');
-
+    
     var $validate = array(
         'email'     => VALID_EMAIL,
         'password'  => VALID_NOT_EMPTY,
@@ -167,150 +154,5 @@ class User extends AppModel
         
         return parent::beforeValidate();
     }
-
-    /* Password handling inspired by Django. */
-
-    /**
-     * Check a raw password against the User's stored password.
-     * If the User has an old-style md5 password it will be updated
-     * to the new hashing scheme if the $rawPassword checks.
-     *
-     * $self must be an assoc array containing 'password' and 'id'.
-     */
-    function checkPassword($self, $rawPassword) {
-        $storedPassword = $self['password'];
-        if (strpos($storedPassword, '$') === false) {
-            // Old-style password.
-            $hashedPassword = md5($rawPassword);
-            $valid = !empty($storedPassword) && $storedPassword == $hashedPassword;
-            // Update to the new scheme.
-            if ($valid) {
-                // Using SQL so we don't upset $this->User.
-                $newPassword = $this->createPassword($rawPassword);
-                $this->execute("UPDATE users
-                                SET `password`='{$newPassword}'
-                                WHERE `id`={$self['id']}");
-            }
-            return $valid;
-        }
-        return $this->_checkPassword($rawPassword, $storedPassword);
-    }
-
-    /**
-     * Validate a new-style password.
-     */
-    function _checkPassword($rawPassword, $encPassword) {
-        if (empty($encPassword)) {
-            return false;
-        }
-        list($algo, $salt, $storedPassword) = split('\$', $encPassword);
-        $hashedPassword = $this->getHexDigest($algo, $salt, $rawPassword);
-        // Check isset to make sure the split worked.
-        return isset($storedPassword) && $storedPassword == $hashedPassword;
-    }
-
-    /**
-     * Create a password that looks like '$algorithm$salt$encrypted'.
-     */
-    function createPassword($rawPassword, $algo='sha512') {
-        // 64 chars ought to be enough salt for anybody.
-        $salt = $this->getHexDigest($algo, uniqid(rand(), true), uniqid(rand(), true));
-        $salt = substr($salt, 0, 64);
-
-        $hashedPassword = $this->getHexDigest($algo, $salt, $rawPassword);
-        $password = $algo.'$'.$salt.'$'.$hashedPassword;
-        return $password;
-    }
-
-    /**
-     * Returns a string of the hexdigest of the given plaintext password and
-     * salt using the given algorithm.
-     */
-    function getHexDigest($algo, $salt, $rawPassword) {
-        return hash($algo, $salt.$rawPassword);
-    }
-
-    function setResetCode($user_id) {
-        $code = md5(mt_rand());
-        $expires = strtotime(PASSWORD_RESET_EXPIRES.' days');
-        $this->save(array('id' => $user_id,
-                          'resetcode' => $code,
-                          'resetcode_expires' => date('Y-m-d H:i:s', $expires)));
-        return $code;
-    }
-
-    function checkResetCode($user_id, $code) {
-        $user = $this->find(array("User.id = {$user_id}",
-                                  "User.resetcode_expires > NOW()"));
-        return $user && $code == $user['User']['resetcode'];
-    }
-    
-    /**
-     * Get subscriptions
-     *
-     * @param int $userId user id
-     */
-    function getSubscriptions($userId) {
-
-        // Just bind to the collection subscriptions relation.
-        $this->bindModel(array(
-            'hasAndBelongsToMany' => array(
-                'CollectionSubscriptions' => 
-                    $this->hasAndBelongsToMany_full['CollectionSubscriptions']
-            )
-        ));
-        $user = $this->findById($userId);
-
-        $collectionIds = array();
-        //Fetch collections to get translations
-        foreach($user['CollectionSubscriptions'] as $collection) {
-           $collectionIds[] = $collection['id'];
-        }
-
-        $criteria = array('Collection.id' => $collectionIds);
-        $subscriptions = $this->Collection->findAll($criteria);
-        return $subscriptions;
-    }
-    
-    /**
-     * Get IDs of collections this user has write access to
-     * 
-     * @param int $userId user id
-     * @param int $app (optional) only show collections with this app ID, defaults to all
-     * @param array $filterAddons (optional) list of add-ons to exclude:
-     *     collections containing these will not be returned
-     * @return array unsorted list of IDs this user has write access to
-     */
-    function getCollections($userId, $app = null, $filterAddons = array()) {
-        if (!is_numeric($userId)) return false;
-
-        $db =& ConnectionManager::getDataSource($this->useDbConfig);
-        if (!empty($filterAddons)) {
-            $_join = ' LEFT JOIN addons_collections AS ac ON (ac.collection_id = c.id '
-                .'AND ac.addon_id IN ('.implode(',', array_map(array($db, 'value'), $filterAddons)).'))';
-            $_where = ' AND ac.addon_id IS NULL';
-        } else {
-            $_join = '';
-            $_where = '';
-        }
-
-        if (!empty($app) && is_numeric($app)) {
-            $_where .= " AND c.application_id = {$app}";
-        }
-
-        $res = $this->query(
-            "SELECT DISTINCT c.id "
-            ."FROM collections_users AS cu "
-            ."INNER JOIN collections AS c ON (cu.collection_id = c.id) "
-            .$_join
-            ."WHERE cu.user_id = {$userId} "
-            ."AND cu.role IN (".implode(',', array(COLLECTION_ROLE_OWNER,
-                COLLECTION_ROLE_ADMIN, COLLECTION_ROLE_PUBLISHER))."){$_where}");
-
-        $collectionIds = array();
-        foreach($res as &$_coll) $collectionIds[] = $_coll['c']['id'];
-
-        return $collectionIds;
-    }
 }
 ?>
diff --git a/site/app/models/version.php b/site/app/models/version.php
index e323ac2..cf459b9 100644
--- a/site/app/models/version.php
+++ b/site/app/models/version.php
@@ -43,13 +43,7 @@ class Version extends AppModel
 {
     var $name = 'Version';
     var $belongsTo_full = array('Addon' =>
-                                array('className' => 'Addon'),
-                                'License' =>
-                                array('className'  => 'License',
-                                      'conditions' => '',
-                                      'order'      => '',
-                                      'foreignKey' => 'license_id'
-                                )
+                                array('className' => 'Addon')
                           );
 
     var $hasMany = array('Review' =>
diff --git a/site/app/tests/controllers/api_controller.test.php b/site/app/tests/controllers/api_controller.test.php
index e3a6ef2..828032e 100644
--- a/site/app/tests/controllers/api_controller.test.php
+++ b/site/app/tests/controllers/api_controller.test.php
@@ -8,8 +8,6 @@ class ApiControllerTest extends WebTestHelper {
         $this->controller = $this->helper->getController('Api', $this);
         loadModel('Config');
         $this->Config =& new Config();
-        $this->Config->caching = False;
-        $this->Config->cacheQueries = False;
 
         // Store the old value so we can reset it in teardown.
         $this->_oldVal = $this->Config->getValue('api_disabled');
diff --git a/site/app/tests/controllers/downloads_controller.test.php b/site/app/tests/controllers/downloads_controller.test.php
index 94e889f..998eacc 100644
--- a/site/app/tests/controllers/downloads_controller.test.php
+++ b/site/app/tests/controllers/downloads_controller.test.php
@@ -49,29 +49,58 @@ class DownloadsTest extends WebTestHelper {
         $this->File->caching = false;
     }
 
+    function testDownloadCount() {
+        //This is really stupid because you can't easily change the active db, and of course gets on the
+        //main page get counted in the main db, not the test db, so we need to check that
+        $downloadcount = $this->Download->query("SELECT COUNT(id) FROM `" . DB_NAME . "`.downloads");
+        $previouscount = $downloadcount[0][0]['COUNT(id)'];
+        
+        //get the file twice, make sure it's only counted once!
+        $this->getAction("/downloads/file/9/");
+        $this->retry();
+        
+        $count = $this->Download->query("SELECT COUNT(file_id) FROM `" . DB_NAME . "`.downloads");
+        $downloadcount = $count[0][0]['COUNT(file_id)'];
+        $this->assertEqual($downloadcount-1, $previouscount);
+        $this->Download->query("DELETE FROM `" . DB_NAME . "`.downloads WHERE file_id='9' AND useragent='' AND userip='{$_SERVER['SERVER_ADDR']}'");
+    }
+    
     function testNoCacheHeaders() {
         $action = $this->actionURI("/downloads/file/9/");
         $this->get($action);
         $this->assertHeader('Cache-Control', 'no-store, must-revalidate, post-check=0, pre-check=0, private, max-age=0', "cache-control header for {$action}");
         $this->assertHeader('Pragma', 'private', "Pragma private header for {$action}");
+
     }
     
     function testNoSandboxForYou() {
         $this->getAction("/downloads/file/25982/");
         $this->assertWantedPattern("@Add-on not found@", "Sandbox Denied without Login?");
     }
+    function testDownloadMD5() {
+        $this->getAction("/downloads/file/9/");
+        $file_data = $this->File->findById('9');
 
-    function assertFileDownload($file_id, $action, $message) {
-        $this->getAction($action);
-        $file_data = $this->File->findById($file_id);
         $file_loc = REPO_PATH . '/' . $file_data['Version']['addon_id'] . '/' . $file_data['File']['filename'];
-        $this->assertEqual(md5_file($file_loc), md5($this->_browser->getContent()), $message);
+        
+        $this->assertEqual(md5_file($file_loc), md5($this->_browser->getContent()));
     }
+    function testSearchEngineMD5() {
+        $this->getAction("/downloads/file/8/a9.src");
+        $file_data = $this->File->findById('8');
 
-    function testDownloads() {
-        $this->assertFileDownload(9, '/downloads/file/9/', 'Extension download works.');
-        $this->assertFileDownload(8, '/downloads/file/8/a9.src', 'Search download works.');
-        $this->assertFileDownload(23559, '/downloads/file/23559', 'Dictionary download works.');
+        $file_loc = REPO_PATH . '/' . $file_data['Version']['addon_id'] . '/' . $file_data['File']['filename'];
+        
+        $this->assertEqual(md5_file($file_loc), md5($this->_browser->getContent()));
     }
+    function testDictionaryMD5() {
+        $file = $this->getAction("/downloads/file/23559");
+        $file_data = $this->File->findById('23559');
+        
+        $file_loc = REPO_PATH . '/' . $file_data['Version']['addon_id'] . '/' . $file_data['File']['filename'];
+        
+        $this->assertEqual(md5_file($file_loc), md5($this->_browser->getContent()));
+    }
+
 }
 ?>
diff --git a/site/app/tests/controllers/editors_controller.test.php b/site/app/tests/controllers/editors_controller.test.php
index 7f86245..2cd1853 100644
--- a/site/app/tests/controllers/editors_controller.test.php
+++ b/site/app/tests/controllers/editors_controller.test.php
@@ -43,18 +43,6 @@ class EditorsControllerTest extends WebTestHelper {
                             'feature_locales' => 'en-US,fr,de'
                         );
 
-    var $queuedata = array(
-                            'addonid' => 4022,
-                            'name' => 'Chrome List',
-                            'addontypeid' => 1,
-                            'platformid' => 2,
-                            'applicationid' => 1,
-                        );
-
-    var $performancedata = array(
-                            'userid' => 5,
-                        );
-
 	/**
 	* Setup the Editors Controller
 	*/
@@ -65,10 +53,6 @@ class EditorsControllerTest extends WebTestHelper {
         $this->Addon =& new Addon();
         $this->Addon->caching = false;
         $this->Addon->cacheQueries = false;
-
-        $this->helper = new UnitTestHelper();
-        $this->controller =& $this->helper->getController('Editors', $this);
-        $this->helper->mockComponents($this->controller, $this);
 	}
 
     function testAddFeature() {
@@ -149,156 +133,6 @@ class EditorsControllerTest extends WebTestHelper {
         $this->assertResponse(array('400'), "Invalid GET removal request gets appropriate response.");
     }
 
-    function testPendingQueueFilter() {
-        $addonName = $this->queuedata['name'];
-        $addonAppId = $this->queuedata['applicationid'];
-        $addonType = $this->queuedata['addontypeid'];
-        $addonPlatform = $this->queuedata['platformid'];
-        $nameSearch = substr($addonName, 0, -4);
-
-        $path = $this->actionURI('/editors/queue/pending');
-
-        // login
-        $this->login();
-
-        // test no filter
-        $this->get($path);
-        $this->clickSubmitByName('clear');
-        $this->assertText($addonName, "'$addonName' in unfiltered queue.");
-
-        // filters that include add-on
-        $this->clickSubmitByName('filter', array('data[Filter][AddonOrAuthor]' => $nameSearch));
-        $this->assertText($addonName, "'$addonName' in queue with Addon filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Application]' => $addonAppId));
-        $this->assertText($addonName, "'$addonName' in queue with Application filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][SubmissionAge]' => '10+'));
-        $this->assertText($addonName, "'$addonName' in queue with Age filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Addontype][]' => $addonType));
-        $this->assertText($addonName, "'$addonName' in queue with Addontype filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Platform][]' => $addonPlatform));
-        $this->assertText($addonName, "'$addonName' in queue with Platform filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array(
-                                    'data[Filter][AddonOrAuthor]' => $nameSearch,
-                                    'data[Filter][Application]' => $addonAppId,
-                                    'data[Filter][SubmissionAge]' => '10+',
-                                    'data[Filter][Addontype][]' => $addonType,
-                                    'data[Filter][AddonPlatform][]' => $addonPlatform)
-                                );
-        $this->assertText($addonName, "'$addonName' in queue with multi-field filter.");
-
-        // filters that exclude add-on
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][AddonOrAuthor]' => "{$nameSearch}wolf!"));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Addon filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Application]' => $addonAppId+12345));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Application filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][SubmissionAge]' => 1));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Age filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Addontype][]' => $addonType+12345));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Addontype filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Platform][]' => $addonPlatform+12345));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Platform filter.");
-    }
-
-    function testNominatedQueueFilter() {
-        $addonName = $this->queuedata['name'];
-        $addonAppId = $this->queuedata['applicationid'];
-        $addonType = $this->queuedata['addontypeid'];
-        $nameSearch = substr($addonName, 0, -4);
-
-        $path = $this->actionURI('/editors/queue/nominated');
-
-        // login
-        $this->login();
-
-        // initially our test add-on should NOT be in the nominated queue
-        $this->get($path);
-        $this->clickSubmitByName('clear');
-        $this->assertNoText($addonName, "'$addonName' (status=PUBLIC) not in unfiltered queue.");
-
-        // now temporarily change the status (and nomination date)
-        $this->_setNominatedStatus();
-
-        // test no filter
-        $this->clickSubmitByName('clear');
-        $this->assertText($addonName, "'$addonName' in unfiltered queue.");
-
-        // filters that include add-on
-        $this->clickSubmitByName('filter', array('data[Filter][AddonOrAuthor]' => $nameSearch));
-        $this->assertText($addonName, "'$addonName' in queue with Addon filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Application]' => $addonAppId));
-        $this->assertText($addonName, "'$addonName' in queue with Application filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][SubmissionAge]' => '3'));
-        $this->assertText($addonName, "'$addonName' in queue with Age filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Addontype][]' => $addonType));
-        $this->assertText($addonName, "'$addonName' in queue with Addontype filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array(
-                                    'data[Filter][AddonOrAuthor]' => $nameSearch,
-                                    'data[Filter][Application]' => $addonAppId,
-                                    'data[Filter][SubmissionAge]' => 3,
-                                    'data[Filter][Addontype][]' => $addonType)
-                                );
-        $this->assertText($addonName, "'$addonName' in queue with multi-field filter.");
-
-        // filters that exclude add-on
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][AddonOrAuthor]' => "{$nameSearch}robot!"));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Addon filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Application]' => $addonAppId+12345));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Application filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][SubmissionAge]' => 1));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Age filter.");
-
-        $this->clickSubmitByName('clear');
-        $this->clickSubmitByName('filter', array('data[Filter][Addontype][]' => $addonType+12345));
-        $this->assertNoText($addonName, "'$addonName' not in queue with unmatching Addontype filter.");
-
-        // restore changed status
-        $this->_restoreStatus();
-    }
-
-    function testPerformanceByCategory() {
-        $summary = $this->controller->_performanceSummaryByCategory($this->performancedata['userid']);
-        $this->assertTrue(array_sum($summary['usercount']) > 0, 'user has approvals in category breakdown summary');
-        $this->assertTrue(array_sum($summary['teamcount']) > 0, 'team has approvals in category breakdown summary');
-    }
-
-    function testPerformanceByMonth() {
-        $summary = $this->controller->_performanceSummaryByMonth($this->performancedata['userid']);
-        $this->assertTrue(array_sum($summary['usercount']) > 0, 'user has approvals in monthly summary');
-        $this->assertTrue(array_sum($summary['teamcount']) > 0, 'team has approvals in monthly summary');
-    }
-
     /**
      * We've got to use direct queries here because cake 1.1 doesn't support getting data in join tables. :-/
      */
@@ -314,16 +148,4 @@ class EditorsControllerTest extends WebTestHelper {
     function _removeTestData() {
         $this->Addon->execute("DELETE FROM `addons_tags` WHERE addon_id={$this->testdata['addonid']} AND tag_id={$this->testdata['tagid']} LIMIT 1");
     }
-
-
-    /**
-     * Test data doesn't have any nominated addons. We'll use these methods to nominate temporarily
-     */
-    function _setNominatedStatus() {
-        $this->Addon->execute("UPDATE `addons` SET `status`=".STATUS_NOMINATED.", nominationdate=DATE_SUB(NOW(), INTERVAL 3 DAY) WHERE id={$this->queuedata['addonid']} LIMIT 1");
-    }
-
-    function _restoreStatus() {
-        $this->Addon->execute("UPDATE `addons` SET `status`=".STATUS_PUBLIC.", nominationdate=0 WHERE id={$this->queuedata['addonid']} LIMIT 1");
-    }
 }
diff --git a/site/app/tests/controllers/search_controller.test.php b/site/app/tests/controllers/search_controller.test.php
index 110be38..3ed6709 100644
--- a/site/app/tests/controllers/search_controller.test.php
+++ b/site/app/tests/controllers/search_controller.test.php
@@ -50,23 +50,14 @@ class SearchTest extends UnitTestCase {
     function testLoad()
     {
         $this->helper = new UnitTestHelper();
-        $this->controller =& $this->helper->getController('Search', $this);
+        $this->controller = $this->helper->getController('Search', $this);
         $this->helper->mockComponents($this->controller, $this);
-
-        // real SearchComponent for real (simple) searches
-        loadComponent('Search');
-        $this->controller->Search =& new SearchComponent();
-        $this->controller->Search->startup($this->controller);
     }
   
     function runSimpleSearch($terms) {
         return $this->controller->Search->search($terms);
     }
 
-    function runSimpleCollectionSearch($terms) {
-        return $this->controller->Search->searchCollections($terms);
-    }
-
     function testSearchHandlesInvalidInput() {        
         // a throwaway test - just making sure if we pass in an invalid
         // value, it comes back as an array anyway
@@ -121,20 +112,5 @@ class SearchTest extends UnitTestCase {
         $results_quoted = $this->runSimpleSearch('"MicroFormat Adds detection"');
         $this->assertTrue(!empty($results_unquoted) && empty($results_quoted), "quoted search returns nothing for query that matches when unquoted");
     }
-
-    function testUsesFile() {
-        $this->assertTrue(in_array('File', $this->controller->uses),
-                          'The File model is available on the controller');
-    }
-
-    function testSearchCollectionName() {
-        $results = $this->runSimpleCollectionSearch('name');
-        $this->assertTrue(!empty($results), "found results for collection name match");
-    }
-
-    function testSearchCollectionDescription() {
-        $results = $this->runSimpleCollectionSearch('description');
-        $this->assertTrue(!empty($results), "found results for collection description match");
-    }
 }
 ?>
diff --git a/site/app/tests/controllers/users_controller.test.php b/site/app/tests/controllers/users_controller.test.php
index e45e495..c81ebb6 100644
--- a/site/app/tests/controllers/users_controller.test.php
+++ b/site/app/tests/controllers/users_controller.test.php
@@ -109,10 +109,7 @@ class UsersTest extends UnitTestCase {
             if ($field == 'password' || $field == 'confirmpw') continue;
             $this->assertEqual($this->testdata[$field], $storeddata['User'][$field], "Data for $field stored");
         }
-
-        $validPassword = $this->controller->User->_checkPassword(
-            $this->testdata['password'], $storeddata['User']['password']);
-        $this->assertTrue($validPassword, "Data for password stored");
+        $this->assertEqual(md5($this->testdata['password']), $storeddata['User']['password'], "Data for password stored");
 
         $this->assertTrue(preg_match('/^[0-9a-f]{32}$/', strtolower($storeddata['User']['confirmationcode'])), 'Creating confirmation code');
         
@@ -214,17 +211,11 @@ class UsersTest extends UnitTestCase {
         $data['password'] = 'my_new_password';
         $data['confirmpw'] = 'my_new_password';
 
-        // Start the reset process so we can get a valid reset code.
-        $resetCode = $this->controller->User->setResetCode($bill['User']['id']);
-
         $this->controller->data['User'] = $data;
-        $this->helper->callControllerAction($this->controller, 'pwreset', $this, array($bill['User']['id'], $resetCode));
+        $this->helper->callControllerAction($this->controller, 'pwreset', $this, array($bill['User']['id'], md5($oldpw)));
 
         $newdata = $this->controller->User->find("User.email = 'bill@ms.com'");
-
-        $validPassword = $this->controller->User->_checkPassword(
-            'my_new_password' , $newdata['User']['password']);
-        $this->assertTrue($validPassword, 'Password reset');
+        $this->assertEqual($newdata['User']['password'], md5('my_new_password'), 'Password reset');
 
         // reset the pw
         $this->controller->User->id = $bill['User']['id'];
diff --git a/site/app/tests/data/remora-test-data.sql b/site/app/tests/data/remora-test-data.sql
index 03c2710..216071a 100644
--- a/site/app/tests/data/remora-test-data.sql
+++ b/site/app/tests/data/remora-test-data.sql
@@ -66,7 +66,7 @@ INSERT INTO `addons` (`id`, `guid`, `name`, `defaultlocale`, `addontype_id`, `st
 (3677, 'ar@dictionaries.addons.mozilla.org', 45239, 'en-US', 3, 4, 4, NULL, '', 45240, 45241, 45243, '5.00', 70, 1399, 45242, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
 (3684, 'eo-EO@dictionaries.addons.mozilla.org', 45274, 'en-US', 3, 4, 4, NULL, '', 45275, 45276, 45278, '2.50', 227, 3438, 45277, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
 (3703, 'ru@dictionaries.addons.mozilla.org', 45349, 'en-US', 3, 4, 4, NULL, '', 45350, 45351, 45353, '4.00', 1926, 26742, 45352, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
-(3716, 'lt@dictionaries.addons.mozilla.org', 45399, 'en-US', 3, 4, 4, NULL, '', 45400, 45401, 45403, '5.00', 267, 4075, 45402, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
+(3716, 'lt@dictionaries.addons.mozilla.org', 45399, 'en-US', 3, 4, 4, NULL, '', 45400, 45401, 45403, '5.00', 267, 4075, 45402, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
 (3737, 'cy-GB@dictionaries.addons.mozilla.org', 45504, 'en-US', 3, 4, 4, NULL, '', 45505, 45506, 45508, '2.50', 107, 1865, 45507, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:58', '0000-00-00 00:00:00'),
 (3786, 'lv-LV@dictionaries.addons.mozilla.org', 45704, 'en-US', 3, 4, 4, NULL, '', 45705, 45706, 45708, NULL, 236, 3839, 45707, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:59', '0000-00-00 00:00:00'),
 (3819, 'ro-ro@dictionaries.addons.mozilla.org', 45844, 'en-US', 3, 4, 4, NULL, '', 45845, 45846, 45848, '1.50', 0, 0, 45847, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, '2007-01-28 12:09:59', '0000-00-00 00:00:00'),
@@ -84,26 +84,26 @@ INSERT INTO `addons_collections` (`addon_id`, `collection_id`, `added`, `categor
 -- Dumping data for table `addons_tags`
 -- 
 
-INSERT INTO `addons_tags` (`addon_id`, `tag_id`, `feature`) VALUES 
-(4021, 1, 1),
-(4022, 1, 0),
-(2, 2, 0),
-(3, 2, 0),
-(4023, 2, 0),
-(5, 4, 0),
-(4, 7, 0),
-(1, 10, 0),
-(7, 12, 0),
-(8, 12, 0),
-(9, 12, 0),
-(4023, 12, 0),
-(7, 13, 0),
-(8, 13, 0),
-(9, 13, 0),
-(11, 14, 0),
-(10, 15, 0),
-(13, 15, 0),
-(12, 16, 0);
+INSERT INTO `addons_tags` (`addon_id`, `tag_id`) VALUES 
+(4021, 1),
+(4022, 1),
+(2, 2),
+(3, 2),
+(4023, 2),
+(5, 4),
+(4, 7),
+(1, 10),
+(7, 12),
+(8, 12),
+(9, 12),
+(4023, 12),
+(7, 13),
+(8, 13),
+(9, 13),
+(11, 14),
+(10, 15),
+(13, 15),
+(12, 16);
 
 -- 
 -- Dumping data for table `addons_users`
@@ -156,10 +156,10 @@ INSERT INTO `applications_versions` (`application_id`, `version_id`, `min`, `max
 -- Dumping data for table `approvals`
 -- 
 
-INSERT INTO `approvals` (`id`, `user_id`, `reviewtype`, `action`, `addon_id`, `file_id`, `os`, `applications`, `comments`, `created`) VALUES 
-(1, 5, 'nominated', 1, 4022, 25890, '', '', 'Test canned response', NOW()),
-(2, 5, 'nominated', 1, 4021, 25889, '', '', 'Foobar.', NOW()),
-(3, 5, 'nominated', 1, 4021, 25889, '', '', 'Wooo', NOW());
+INSERT INTO `approvals` (`id`, `user_id`, `reviewtype`, `action`, `addon_id`, `file_id`, `os`, `applications`, `comments`) VALUES 
+(1, 5, 'nominated', 1, 4022, 25890, '', '', 'Test canned response'),
+(2, 5, 'nominated', 1, 4021, 25889, '', '', 'Foobar.'),
+(3, 5, 'nominated', 1, 4021, 25889, '', '', 'Wooo');
 
 -- 
 -- Dumping data for table `appversions`
@@ -223,13 +223,9 @@ INSERT INTO `blplugins` (`id`, `name`, `guid`, `min`, `max`, `os`, `xpcomabi`, `
 INSERT INTO `cannedresponses` (`id`, `name`, `response`, `created`, `modified`) VALUES 
 (1, 110, 111, '2006-11-04 13:50:22', '2006-11-04 13:50:22');
 
--- 
--- Dumping data for table `collections`
--- 
 
-INSERT INTO `collections` (`id`, `uuid`, `name`, `nickname`, `description`, `created`, `application_id`) VALUES 
-(1,'6e073f02-242b-b10b-5457-c406857bfa92',165, 'testo nickname', 166, NOW(), 18),
-(2,'bd31fbdd-d6f2-4c72-bbef-b2854207908a',167, 'cannoli', 168, NOW(), 1);
+INSERT INTO `collections` (`id`, `name`, `description`, `access`, `listed`, `password`, `subscribers`, `created`, `modified`, `addontype_id`) VALUES 
+(1, 0, 0, 0, 0, '', 0, '2006-11-04 13:50:22', '2006-11-04 13:50:22', 1);
 
 -- 
 -- Dumping data for table `downloads`
@@ -391,8 +387,7 @@ INSERT INTO `platforms` (`id`, `name`, `shortname`, `icondata`, `icontype`, `cre
 -- 
 
 INSERT INTO `previews` (`id`, `addon_id`, `filedata`, `filetype`, `thumbdata`, `thumbtype`, `caption`, `highlight`, `created`, `modified`) VALUES 
-(1, 7, 0x89504e470d0a1a0a0000000d49484452000001900000012c080200000062d57295000000097048597300000b1300000b1301009a9c180000200049444154789cecbd69931c39722dea0e44e4bed55ec52aaebdceeda791ec8d4c92e9fe7ce9834ccfaecd1d6966bad5cd6e76732992c5da322bf78c80bf0f27e1895832595c469a996eb02c1889402022b01c1c77381c7c7a7a7a7676f6e4c993e9745aabd58888889c73cc2c22c61811c179f9d18961162236ec4488884498d949222c2464392247cc2ce2d8108930192744c8c110c9f25944063142ce182621663cdd8890315684b24f2711318645c8184394b95a7cf35c0c11adfbbaf7c8edad796e2ecf30feed65ee9ff54ef16f3d12512e070a4298860a61f3550db81a661ea62fbd1abe9ea629c6ebcbe35298b2f498cb2acc21f739ef57983fe3a3635e01c8071ed998d4c96038b2363e393efee49387d1d9d9d937df7cf32ffff22f83c1a0dbed32b3732ed710d736712672c4448e859984880940c34e52c78e882c1912666121472c44cc64445b0c004b7c2b21624344ceb71beb3b30b1b124cccc446c9888844884c418c3c4cc198841d056a800b4ee28014ce8b787319c05a3dcbdb9bb4ae3734fc9f50ddca56f9bbb9acb2df70eb99a7a6badadcb3300960c6aac4b531a594c2365402605c0ca01440e4d240b61c5044484769bbb84735c0a131443f8945c51977ef89f0134fc791e1d918838112d3d32e63d73b3919d2fd2d76f2ee2b8f69bfff7378d7a3dbabcbcfce1871ffef55ffff5fcfc7c7777d75a9ba669b17ad606902a166221222666622276e41c3b223162d8039678c0c27d42424c24c2424ccc86713f91301331335bdf7a0049c6b0615e0116b10296a6a41c60510022b7b9ba217e33f06dce6d734c0858eb727e2b60959e6f0e9bc1e8366942c808237309a400585280aaf0588a3b8a3ea570837845a530a55e0a7f16e33714c22f615dc8017a0eb034cdbb668b461e57e2e96cf1d3d3d34ab5114795fff5ab2fa2f97c3e994c0683c1f5f5751cc7511485155ffa242616023c11a1ef302d5148909e85448c13117686890d1961874f006011b3b0c812eb1487845888093f0143444bc062b6860d33313922324c64848d6121e28803b0c84152ee3c77d5da0cd869fc070216c25b0128775c973e7c67e75cf826b406c28adf5e5295b700accd419b4a98610e8f4a116d1d601591a8084cfadc2290a569aa5dc8391742d2e6a34258b1347265f80bae6d081eb03275fa818035beb91e8fe7a3d168be9847711cd7ebf56eb73b9fcf3b9d4e1cc7ce070a46feb22c6949748888890d09fe0911b1b090111122678047c4222ce2006accc60316b121c3a4f827c4648cf15d1458c8860db331864984c83193354c2cb4e45f11111bb356e8d3e3ed61e836f094e347c5bbb4b6c234efcabf72578bf0749b98d2f0d696f4d6ceb98e988470b3f9aeb70256313e8ca12c608588839f0a5b0a49a527bfb0adf708594862e672c07abf9c015895d9e2aa35aa561bad56b35aad4404f6628cb5d65aabfd0a27395165792481ae6ad92252e79c132790f7c82bd449083448449c88902323e208c84429118b9018b6c28c044c640c118b73b2a455860d5bc898442c20612c6c889d7f2d638d354294a60281593f5bbf42bf2ed4106d86a4b76abe7229c32722bc2b60ad130cd70d1b9bf9d486abda864ad3bc530b2beddbcc9ca33fcabc8a7785004405a42b05b2d2bb72a2621899a2651492dd8673698194161aafd1bf6cbefa5773d4e121002cfe888065adb5d6d928b2d6424f1d1191732e4992344d9d73699a2649526c6199bc48989899c5b9f96c369b4d13979221d56011b31074f2c69021200b3968db916499131191811a9e590c9331abc732b321366c201291e021640c3320534488c558b2b110877d833c1063c2a256ab359bcd4aa512ca2f61811641e1f6051da62cdeb5a1df521964accb3f97b2d87f4a7b14dd8e9317d3dce6aee2b336c773a050cf456eb8b1f8f9b9772be619de48eb8bfdade8acb896cbed3625f37308dab60b0c2ba3c37abf9c0188ceb9344d923475ce915054ac6c6d0deb9eb7e44e969dc8643e1d0cfb29a57135624b4e96cc4898444852a29418a0631c1947224b0d15d451448bb97389186b6b354b86d2c48938c8774c345fb83411268e2363d8182203da46c424cce484a7292d52c3368e2bb131ec84209782524da7d3344d5bad561cc7711caf538a87e136acaa98be34072dcc75acaa344fed12b9e13a5741b7cff3ad6fbee16473e0ecb472ee0d6f990379814e6f270f1621c64910342500252cae6202c4ab5ab6a8a82a650d616f5cdb177e911cff7b02138027e26ca0c25046c5b62b20534c4cd3c5ec663294d835ea35b694a42961ca8f5988d2344d67ceb0892b9161224e891c131b63e22832d69093c564319ba6b55a6ca36a1451922cc83963d85ac3428b59329d2686d856a328b6968969a9be374cc63009cf27e9cd84a26aa36d3bc658e79c38073e2922b3d96c32993073afd7238f059bc12814873703d65ba14dbbee6d660f4be37339d07ac0ba4d7c7648bc2d2a6d0e456ab68172864050fcd2304d0e77c2788d51980b3f2d7755e53bd50628446a63d0f4614c885f3950fe05a7c2f0515ad1a6fc6939efc686a35c2bb9550642040245e2c8394ec53aa9388a49d254dc521623224953b770c48e22e62ab375248e49acb151ccb1154ac54c539aa536b2d55a1ac7b45824e29c356c2d93a3649ece4d6a892b11d7628aac6312728e9c18e6c872e2ec905371cc6c2a954aa512d9740958954a8588e2389e4ea7393e7f7bc8c814dc3ba6b97dcec5f87705cae2c9baf4a5311b48c4bb861c76ac83b322c1c9e5f056c0520c0ad3e4d853eec652740be12944790a5a0b67b572e1cb176b3387c53f9b205e0c7c072cb95dc69abf44988f0baf163b403e04d1c6b08dad54996bcc319994c509331bc32c24a991940cb3ad5054251333111b22cb5489a41a892432ab7232b7952a576b52a9b828724bc0322c2925734ae7261253afda7a95622b4c8e9c9013c3125b93381a4e6ca51255aab57abd5eadc669ea30f11fc73118d662b1a8542a9010d1f86eaf7af79ff96e0af80dfca834ff0d6936e4509a5b913ddd2646e34b1fb12eac6b9545480a2fe5a06a1d84dd06b014b62800ac1c30418fa95751f52a45e6e60a73d8e40a4153debe947e091f2178ed77890eeb1d03b36132380a09118c4859c8c1c28a0c13c378941d193104e3776799c89235c44ccc8e3935263536151668b844c8b01826cb1459b6c619762c29339111c3640d1189356c8c316c311bb8248f7e421091455ca6db31a0d28e5d7a6f69cacd6c4e0a425c31e63dde7033f32a3d5907619b439838e8c304f9095737b72ef6daa51cc5db0c5812e8b67210864acf9d53010d73af11a6419585a8a7a1341f791785dd2fe1bd036a24caf5a8f7ca88965450c4911312434e44c4f9da1512272e756461456ac889a42919316498d06291492a940a898811583d888890b01171224e5c4ae218ac934998441ce6078b6d37a73d5514d3f69733dda0352ce996693633a9d2630813da4f3e1660e5ce3743d2fb01562e87e0a16fd761853121450a936d00ac5cb2cd412547e5531c28a7344602b306255ce26997922ff60cbd54bdf52165f84bd81050fe1fceb0888276e364394527446a444ac222ec20c75936c610acb72c196308b52bcbb9502722422c8e9969b9c69084247569eac45a212227021307e770cec8c0f9919d02056a0858a57c275728a5f19baf6ecee796477db77702ac2c4c94c8f2a5d02665a4201793fb55561eb9a06f922123e1e34adf361c66c2349c55c3d307001605b0a2f0a42fa6d8843613a6d49f9c0d120c87b936768b82fa25bc4f40217f38c312126134565e366c66e6e5fa1a60966166369619d60a860c31096445225a8a94ab65374bac21c430f9e58644d62cf1d00931131bd86621190814099131925d734301c3a2f570f07e56ef1b2cdd371fe58319562e87dcd5dbdc95a94b3fd66cc8a4905ecf4d903c034f216015fb76296015a18a3602166d042ff24c2a0497507b15b2ad9c71bcfe842e2cd46421b037172a2da25fc2c70a68e11fccb08448d8928d4d2446489c88b3640d1b2c6616724cc6181b4591895358be5b63e3c84696c93139c7642cc7918d229b922347125963992525364e58982313556c24c62e5884194a7736c6b058b6c2c64491ad542a711ca7a9831d179619c5711ceab04a3beaba02bae5b198fe5d7350c07aa76785e739c3d75b8257984c44fc0023b912f23f36a96c34271db814a472cfcdb5378d098faee09f843e00b024900a8bb787a521810088ab21b0869815569926d03c6fd3c07e09ef1644e4431816c3b78230a5c48931a9a554d2d43887fe67580c258e1222264a0d8b61312e49172e656b38b694523277c99c2461971a97462ee134494524254b865d2a499a2c1217b1755449c5512a2c8e8559e06ecb2cc4242ed59514699a2649ea9cb3c1148f364a6558089bd715ae3bdf7c7c27b6a52dfb9de61625e04761ca100872f017e6409b3456e2ff58642515868c697d6fc4d35780a5cf7aeb39157856a8d52ac2d37b0056085b12302c9d37543cd25945f1348a37ce1b2ac30aef2a2b9f5fc287850f66584cc2e2c82d9c73328b171ccbc2a54ec490a42424269dba74e65276924ab230261611c7220b230b2396294d64324ce75319335f5e888d5c922444628d18c32e91e9249d4e9ce5459a9a51e42c272c02499285ac7189f0609c4ea789e3e1f9b989639ba64efce4a0880c0683e9740a1307edc6b9be4d593858575c38c98dc9a5c7d29cc3db89289cb8cc3d7703dcdce6b99b73c8e506600a60880158442160ad8e22e125a695918cc6986221df3e84f7e6660fdf09b0688d239adcedc56cf56a883b1cc89261a4162382429826fe856a7dac8022fd001d96101347268a4d9cb84426240b66b28cb586c224cca9b1629898524ea7247362b6c49c8a4c85fc8a406bada4298f47c4864562f26b1549284d2d1339e1f99cd2c4588e99709d8c101b12474e6c1c33899b4cc6b3599e92cce773668ea208eb9f8b6ce8364c6a3303ba3dc30a5f6c5d9eeb72dbccb03073e553524e2e0b7340e5293c15004b81290f586f690eabce9c01acb0938748514c93830329cc1ede0671c2ac3603566e421081bde916ce550694601db5c29304765b087af517add6c70fccf4210c0bf557afd5b7b776d234319121839584e43d5661b9b231d6180bd6ede03a46b5e8c618598a0f620cdc2e18274ed2e5021fc0a2085bc3d69ac81812af262022162676c28e8dea1ec2566e8c49d3d418d36ab5eaf57ac868680d9fb2d6c229183e30071940bd501c5853b699781d6cd5284c024b45bd6503530bdf734dca250214eecdbc48983807493e868b38b5ee3325231ee6670937144b0eb05cc10e8b0218caf1350e745e7a291742dc29052f7d44ee5994559f95824ef815b9f8e22768e6bf50ad0f0c28c6f76158488fbaac37eab57a4d30bbc498f803c42c57145a637939fa2b172066b24ba7c68660f5b9ec1ea2d69e41b734e47d5d596662b65641449676abc68aefc939c0428ce696635592e54a783a7cae96b22d6d7cc6875cb1e46cbb74100e73509fae1b720863d6f1af1cc3625e6aa0e08823cc21fc59440de4e4d9d6929ae5c03497610e320a19521849eb8356533165115c8a58933b4a6086ae8943c052d80a4b2fb4355566a4471dbab4cc43ad564e9f4505259766bba1108a2187d1bf04f24df7fd19967645a88a489694092dd689183236b2c698f96c3e994de2386e349ad6c2df0bd9a506878996c48a88c6a3d16836a9562aed4e278a22d87519b8c812379d4ea74952a954aab55a14c7e29c9018364cc6580bbd4b0e9e142ce03ca77424d7104511330f0683e17058a954b6b7b7a3285a2c164414c73132994c26f3f9bc52a9b4db6de8c524eb333e57c4216e8a489224c3e1703c1e57abd5adadad5aad26c13211ca020a15e069f3511916ada4425c5deaa43499e756ab5b71d147e571aaf84a6b7e7e7c1a11c2eb06c092c0a74211b064fd2ca10e429a0917f82c65b123875c61a0a0c9218410f90b007d5010910f9b25642282ff2ce7dd9346518496315f2cc4b96ab51a45d1743a1d8d46b55aad5aa91a8e5dea88480c69e330ce701c3be7aefb83cbcbcb4ea753ab37ac8d160b301d21a2c562717979351a8ddaed7614c575b6f0ca668c303b138c60caaa72af1a9ab9e7f45668a9511411d17c3ebfbebe6eb55a3b3b3b699a0e06036b6db7db8591c4743a1d0e87f57abdd56aa9e4b881b529a6a3edce66b3cbcbcb376fde74bbdd6eb75bad56178b450879a56fbee198655e0026e59ae5ec8c0aec49effd4086551ac2be5a4c5c244ae1a5d298f0d121d65056ed551acc9a853b211592826516ea0e39e7660629a0545060b9b2805772d985d9bf84770bccfc7e0c2b6ca6699a2e168b344dadb5715c31c6c4719ca6e962349a4c264992743a9d6ab52a22206279bd0f243a63a0dd5c2c16d3e9b45eafe3f596bd878d884bd3743e9fcf66b35ab5b67a6121cfabcac7e11038f002ec15499a00f17a57bd5edfd9d981ffac8b8b8b972f5f361a8d4ea753a95444a4d168586b61db45010892b753a5accf130a481f5e0f4ef4c1ad149bb24c87280b49d92a5babcf0a745219c0ca1d69a950673df1f19acf32a214b036c4bf35bcdfd0f821b971b056d105f377e179d89ed5b2416f0f65cc5cce5cc6d6b92c50d02a6ed3dd6e3f1efc7c026aea831816b2489264b158786e554195cfe7f3d168c4ccdd6eb75eaf83bc2897d1d1062dc35a823705cce51111f24c93c45a6b0c13595c8de3388aa3288ac46b8222b3749a4a44203239f6c45e49016025a2288af0b6f89070188ca2a8e683885c5d5dbd7af5aad56aedefef379b4d634ca3d168341ae092a078aa90823e1e72253e01dc939961d18a34711ce3a7bead31c6189ba33ca5fc483b4929188988d6e4ba1cfcd50d0c8bc26e52c4d077ed45b28661157bafac675892e553c5188d0c4f24a05da5f48a0a16f07aae4ccdadb7c392820e8bd7302c66463bd12fdaacd57a570ef1730868a81f612d21b0603e9f0311e6f3799aa6e3f1783e9fe331b3d96c3c1ec3e12733cfe7f3e9749a24099a0566f1b6b7b7ebf53a7e0e87c38b8b0b309a5aadda6cb670231e8693e9743a180ca228ea743a90d444a4ea43d8b1f17ae3f178381c2e160b660660552a15a8a8e6f3f97c3e37c6349bcd56ab9524c96432a956ab711c0f87c3c160301e8f9f3d7be69cabd56a488c6d3bd234edf7fbc3e110c0144551b3d9ec743acd6693992793c97038840958b3d96c341ab55a8d03b615628a3f09ab878a31ece7f2d6d7685848ec496a9e6105e7acda2e9f3ebc5acead02807b3753a30d29252b814ad9245d9840a97a3159980905d090833ccda114e3288b989a5bc89b24bb2e3a37aee4e2117252e12f1ceaf6e143191682d61cd04a44e6f339181633572a1563cc6030383f3fef76bb0097d16834994c9c57588e4623e75ca552a9d7ebd815314dd3d168349bcd902d11b75a2d2476be89cc66b37ebf5fabd5aad5ea6c36bbbebe36c66c6d6d01ad4ce092015cafdfefdfdcdc40744500602990d5eb7568a92e2f2f9f3f7fde6c368f8e8ec8032eb45a40a8abab2bc88c8bc5e2ecececeaea0a42a5b576b158c4715cad5689e8e6e6e6f5ebd783c1a05aad76bbddadadadadad2ddde64302e154448cb144a26011b6fe22c3527ec4ac5a2745ab108656b59303ac620c85b7ad392ff6ae10b0d6b5a25b322c1d5d421029dabb6b7a9dc7903285bae29d48dec94c0e954213130497358008f914bd8d619960ed8ecef36853d7abcab68a50fb0b7ead0b28c38fe3adc1f86d69405e9c73305642ab52da4544800fe75cabd5aad56a49924ca7d3d96c063a06512b8e63ccc1cd66338097b5b656ab4186d2ceecfc9619c3e1f0eaeaaad56a55ab55b018bc00a44b70b1e9740ad284fcf5adc0b99acd66afd7dbd9d9a956abce39cce2351a8d2449c0fb767777bbddae31062f0c4d397276ceedeeee4284acd7eb483f9fcf87c3e1f9f9f9e5e565a552994c26699a562a9556ab65b29eb9f4835403956352ca7a7c7a0af068c5b68264acaa777d843e287c6eee24fca938988bf4f9e75e894be38b61736f34c1eaa2104db2ef500e7f1ca893f4dcf82d4836005678e20a26112e50b916bbc95b3b4ed85c8b3f956de9e3f4cd735ffd4ba08fc5b050b2200ed56ab55eaf57abd5244966b319843e6656f513d8ca643269341a3b3b3bdd6e773a9dcee7f32449547b1dc771a7d3393c3cac542ad8de75369bcd66330096eaa4aad52a242f20489aa6d56ab5dd6e371a0d64c8cc50752d168be170a8a0837d28168bc5cdcd0de84fabd5eaf57a7b7b7bdbdbdb49924081d5ed76f7f7f799b956abb5dbed4f3ef9646767a7dfef5f5e5e56abd54aa502eeb6582c5aadd6279f7cb2b5b535994cc0b3269349bfdf8730d86834600c311c0e279349b3d90caded4d108a0ccbd38d4c8bcfcd21866c0b89712a59098bb28095bbba2e3e7c1011c1cb55c8a7de43a2c971a8b0a36a7c480043c644d9ee4d01b2acbbb46ed230f7689d0194acad960b66096fc3b0d6851cbd429987448c6e017f3ff3f0711896de0e48aa542ad56a1544890afe6a89080aac46a3d16c36dbedb63106ea76cdcd79efc610d944045b906953439e00acc964321e8f9d73ed761be425376c8ac87c3e1f8fc7101e615a351a8daeafaf2121429955afd76bb51ab466e13be0858d31bd5eafd7eb8d46234de09c83fe2b8aa25eafd7ed76019d4992bc7cf9f2c58b17954ae5d1a34751145d5f5f5f5d5d4135860fc11771469f8512127f2e4aaf94280527995af4c996e9c3cad4ab011163649e63670a08b4042670340a4e42b55a29ac697a1259dd554cc759295582359ea5e94b73a0408a5c3e3e8b47a5c4aa0858b46ac342b4c9a3034ec2316373c7e120843f73094264cce5f90bbd0a03caff43edb0707bc8148032618c56952211e8c96432512216a6141168b2c4d337dd03556700ebf53a00623c1e5b6bc1d78848b955f84468c7903e8a221025d816404894a59b8724c4561181aa0b4262a3d100902d67f5ac053a33f3783c1691cbcb4be8c886c361bfdfdfdfdf3f3939e9f57aaf5fbf8ea208f65c5110b2df653d5e0873cedf7c48854ab45aa84dad8ad028a1d83dfc798e61adf4f4e4014b44b492c31cb260416580c512eca6c9598493405725657aab304d6ef829bdba0eb0f45211adc21b5da0b182c55fc8b3747a31a45412b0b0db33acf01c417fa2b587e01b76b1cdb0f8f30928b40fb27427222002ba22580cb815f453501b61135340c3f6f6363441575757c3e110e21233630eb1d168b4dbed7abd8e897fd0a84aa5d26c3681508bc502d36ded761be465b158b4dbedfdfdfd6eb7ebbc71033e0f27fbfbfbf57a7d3c1e4fa7d3e7cf9f23b2d56a359b4dbc2aa4423cd45adbe974b6b7b7a1113b3838f8e28b2f86c3e1e9e929b460bd5ecf39d7ed76dbed76a55201613c3d3d45b3031163668032661887c36114453b3b3bbbbbbb9d4e4744767777f1b8b026684585708e619c73221d3363df467f2b922dc18559d3af6e03ac04e3b9a6d4a7eb43894817f4e60732ff02a87df2e9734480fddf5a657c18af6a26ce4ef6e9dbe6869010e66e035822848f0e2e865c86d7dd484bbfdbba33856176222ef7027cbba05f146290fed450940d737db314d17e260105fe116609a194c151442093475154ad5631eb67ad859ce89c8311d3d5d595f291e9744a5e836ead6d341a303445e5619e112803d5bbda97a3892f160be755ec18a9546500b6d56834eaf5fac5c5c5e9e9e9e5e5a531666f6feff0f0104afd2449a0d5d2ace238ee76bb954a05faa9fbf7ef3f79f2e4f9f3e7d7d7d7f7efdf570c25a246a3b1b7b7f7fcf9f367cf9e254902c1b05aad9e9c9cb45aad67cf9e7df7dd77373737511475bbddbdbdbd46a34144c6184c38b0b79f56a3300ee8c672c11311151cd1309b5c1f9012ce55cec54432dc8a280432821e0d69cdd261ec4aec0a81a6549fe5cf4d56907c0bb7d2af2b15b572e7616eeb008bb2dc2a773597c63993bbe4ca660ce96dfe48370734306d9c1c10ae501651c1a2885cbf0494dbfb332c34384876500641cc419382225c44000a38a6695aabd5d234bdb9b9198d4640282cd6bbbcbc24225dac074bd4c56281bb6097008605ab887abd9ea6e9c5c5c5703824a2e7cf9f5f5e5ec2a222142dd99b56dcdcdc5c5e5e5e5f5f6bef8ae31873976acc09d970341a8dc76388abcd66d3397779797971717173730338c3da9d7ebf1fc7f16432b9b8b800f862eab0dfefd7ebf5f97c7e7676f6ead52b2c4b04144e261368d0e6f379afd783f5bc4e7dfadeb83ccf0de0c59ac3291179c593928e0c870a74554b051973c88f988359c8707230942bb585e45e2604ac200669f2565aa54099bb54dac6f4a764955685c424a2c467991c6973daba10ce8cc90196a3e5ee274bb6eb4f96e70185842dd8d28bb72af882bf55c8951533876e6ac2a290603588f6cd75e5f3f30a22f2210c4b070d689ad5c25b336766689a11033302ed57c0114d06dd398c2160685a24057a1c0e872020d3e914537ed013c17222ec06613b20224864b09fcae59feb452232180cd84fee801c5d5d5d6986979797fa2d584b4444002fcd01e40ed9c2108c9967b31911596b61b48172535d0905bd943dfb30819d51591f208539e544ba68d27ffb32256e5dfae6097a0aa04acaf857780ccb27773588316f4da30fcae1919e97a61129110683bb805090f89c5e09d1085f1a021620ded32511c1fe4ccaadc2dd71b04283f1578c314b57a54bea94a679bfef26f0686a028b2d55e01a6f0654e459bf6016dadffb30acb0c340c1049e124a2e4a71c53bffa460f4d0e578124c02eaba167d25ad481d0c75dd1f15802987bc1a831b311b084004b16266585a04ad5354a12e817bdc4a25ae54aa22b25824222b8fbaface984f14bf4c07f126580aaeb22a1101973b9d4ea3d128b642cd165396b82bece7feeb94252d1def0071a2c87a0e25ce85fd7f055be4314e9f18260bca2f47b8f2b4a8d82af07f2e263ce6e2b33afbccf5ecc7ae4448ffd329832b0096c6a09d942edfc165a551219f42d0c2810e0b791aff02e40b877285cccb9598ec5f3278b39291265305b9cf09a5d1f0eacf17b944e4bdfd61691bc2da3aad0c93f53aa0f564cad6f7858fe660d3407d90f18b96c398d263f844a4d4c5c9e113f5c3c398628f2a3e17ea790a5a8ce62c4bb182001c61fc3a180d674e7549367b3687f42a3284f3a72658d6533c42f1a4788e9bf4b91210d5b006834ec8949d100c8b2577924310f26027a222a1f6eab50c2b77cc3d3a1c997269727ddb7f9aa872dd33ac758055fe13c139832b54e6955439149e152aaa88284d570c2b5c5668bc3d3dced5af43eea8cd1269f0ed2ef0cff5b30eccfce17658e01160466a19a05880c9beb089e7a04a3b6dae2b8660a45a1ef26d5775a07afc900000200049444154f05406584809ee638c81a92a8456b0215833cc6633b538c58c247b2a87cf296897f02c81dac218cc451ae75266b6d6186321cc420107335a68f443184573843e0ec515764b9035986ec5717c7070006d1d789909cc2015d7dcd26aac92a6c9703882985cab551b8d26161ba9d103910a83a47d92bdd6890347c901ceb2d7ce94231765018b281c031407691df332869d5b1e013a39dc1411635881d15b782187bca888832fed156051007f01ee8852517f5542640c6ec72be955cc188a046312337b8ea63f5797c2f65f5a0e1a9f4b1642db87f4d3bf8680be992bc4b706ce06f15eae4504d0a032390ca02898f0d26e9f03acb09272cc85fcd812ea7730f8e43854ee5e75d4058bf6f97c0ecd3ad62dd76ab5f1783c180c602701e3753c0b699819b301d65a955ce0183564522abfcce7b2582430cd9f4c26711cb75aad6eb7ab1382e44545fd8ab01895fd01e066b3d9cb972febf5faeeee2e164b623100123bbfb52711c186be56ab6d6f6f13d1783c1a0c06d64644dd66b3e5fd70a541e9710822a804634ca8050bb555fedbf35d4b4a18d65ad18f9640b932e5f728503e6f587a24bfde28e8b77aba8c570b06654e21fadc12b0f0333c0f0816f44aaa4370ce65e60dc38944635697c27585d039a071e6b45aaac3d25601aaa539fcac318b993fdce3288a188b01a11bd2ae88e5d06a8d157a74d1341a135262c00d6a8b0a6418f1bee994074064bfdf0754211ff8de832105d621c3b5031c78212533b75a2d104309b49ebef540b705b37b8b0e13c711115d5f5fbf79733e9d4e014940c3f3f3f3ededed83830358e1e7be54c54c66c6e3d4a0bfd1681c1d1d81128a086630c90bb38acb986f7df6ec59abd56ab73bed766b3eef1091b551bdded0d59dcea500166b8d12101d35f492b591884b92c4b915230b2026c39574c4a13c60651a983fa28131ca803d1909730e8f9e6d15f917790a430a3e592073fa459b01cb04f318b97942fde91c8149313b632854c633434c4bb18bb973c02320a66376ccabfd80393708f89209c54375524459f508821a51bb9fb3b98388bc2bc30a4901f9921511884244047b2bad7b18971bbfcc45e10c25ae2a761d6d427f525aa9cedb1cabc32cb00c159400856a08c6cc6a9efeead52b63ccdede5eabd5c28264acd4815da8122b9829dcdcdce03d1b8d46689c95240966093ce62e1916be428ddd5fbc78212277eedcd9dada9a4ea7979797b06edfddddc5472549a2eb1cbd9386d5c2403c88fd3c06d64eea0af02449c803967ad79acd66e7e7e73ffef863abd5dadbdbef745a9d4e1755005b2db5262122ec651bc7b1b54ba763699a2c1609724681636a02996b64ee18c697a55936ae305e0af3bcdae56ecfb0c27c54400b9a138ee8d5e2d5e11965b63e5463347e4d58396ed7288d219234b5605b696a436d17f45ccc196f0d9ac078974a4ab814a134946a3075f63004afcdbdf5af0adade8361052d66d9f8d411a80b5cc484650a2871ce0d0603acc5035f80dac85a0b4b2ee87d6ab51a6428d828c06409f5648ce9743aed76db39a70e1e66b319e2b7b7b7f11409442de7dc6c365b2c16f0e2b0b5b5d5ed7667b319d458709205eb8a7ebfffead5abc16000e375e71d30cc6633601cc84ead566b361bcd66338a2c440f638cb5c6394992643c1e4d2653889c4747473b3b3bf0d8050f108bc5a2dfeff7fb7d586c844aaec56281459144d4ebf576777761ead5e974eedcb9331a8dbefbeebb7ebf0fa7cc44b4b5b5b5b7b7678c79f3e6cdd3a74f5fbe7c8985df49326b365bcc2ce28cb1711ce1bbc6e331164b56abb5adadadddddbd46a3b1582caeaeaedebc7983f7198d46a3d1687777f7abafbe3a383840b596eaf8c3dacfc5e8d88709b22cb3401a954c9dce7212653894569fe44542d5ac61f592035be4e5baa2159332060d756515a1c254e9b114aa3c1862b02c012c1151fec5bc52c66b20ca2cc7d11bb5713aef678602ee9ce304c5a043f86d3ae95f551091f7b6c3528ea0def8a22882d911a418f272194609f4c08b8b0bf63e4861694944c01de400abd19d9d9d4aa5029282eee49c83460c59e9b21e0016f4faa1a64cfc0c66afd7ebf7fb93c964329960c10df929bf376fdebc79f3c61853abd560c83a1e8f9324a9542ad0ca4f2693d168747575359bcd40916ab5dac1c141a3d18ca24a9a26ce4127c54452afd7b7b6b6d2f40246a7474747fbfbfb30258da2081eb55ebf7e7d797909ca09f6042a371c0eb1b6b1d1686029f5e9e9e97ffcc77fdcbb77eff0f0703a9dfeee77bf3b3b3b7bf8f061b7db85e92c9cd59c9f9fc399579aa6af5fbf8ee3a8dd6e1bc3699ac2ebfccb972ffff8c73f8e46a3c3c3c35aad46c4878747f57a238ee3c160f0e2c58b172f5ecc66b34aa5727a7afae4c993070f1e3c7cf8b0d96cc2854ece9f8f563dbd0db0720c4b45c222c3d27b7d8c72b1d5223e4879e225592f3c6618530edac4e30d652129f753f32904243322692ed2e34e9a032f570836d80eaea8c30a9764a82fa61cdbca9d2bd2850e1e24cb55dfb523ff2585f76058b9db255833acf29ae294ae4006ae4136c1d29676bb2d22f0b8c2cc70a0ee9cbbb9b981a578bbdd9ecd6617171793c9049c4b7d138fc76318b8572a15789842bc0483301859bbddbe7bf72e9cd8cc66b3d3d3d346a3d16ab5b6b6b680713040478be976bba051f0b4678cb9b8b8b8b8b8e8f7fb607f22827710a1288a9dc3d8b8d42f74bbdd478f3ed9d9d985c3afefbefbaed3e9f47a3d3cabdfefbf79f3a6dfef63dd62b86e693c1e8fc7e3344de188f9e8e8a8d3e92449727d7dbdb5b585120633dddddd3d3a3a42a1bd7efd1a0e2a0e0e0e0683411cc7c7c7c7dbdb3bb3d9743c9ea0abc7719c24295686dfbb77cf39777afab2dfefcf66b3d16804f434c61c1c1c743a9dd96cf6fdf7dfe34decd22db54ef3a9a0b7d25eadd15529932a07b542fa7c64f16a685c222542e28acd49c16c9d826efc5e8045c189781d16f9636699740ead7231266b26aa9c8b02cb89db00963146457809786258687fb5b02522efc4b0b4c828cbf6cdd2c07745bcc95b5186fc169e82b150193de4e6e666381c763a9d838303f8937af2e40984140a6c1a202742eba415cfcc90836081a97a680e14f940340016f8d47c3eef743a272727bbbbbb30ce04b3830face974cacc878787fbfbfb575757cf9e3dbbbaba1211589c625661b15818c35114a569e47b0881cd55abb5838383e974faecd9b39f7efa693e9f1f1e1e7efef9e7878787d82c274992bb77ef82ec60e1d1c5c5c5ebd7afebf53a0ae1fefdfb77eedc71ceb5dbed76bb0d500398eeeeeefeeddffeedc3870fcfcfcfbffefaeb172f5ec471fcc9279f341a0dec33f49bdffca6dd6e3d7efcddebd753cc871a639bcde6ddbbf78e8e8ebefaea7f5d5f5f0f8723f43aac289acd668787875f7ef9e5fefe7ebbdd3e3f3faf56ab711c19b39c13c831aca0d2f310462bc0e28025add55b858d4aa12704bb5cc3d346c5ccce893e25074c0a58da148d31488f687a1b606513a8a25d02c05ae64f192b2d49532792aa600838d339c49061a98aa308649b01cbf8e5b15aa4ae4c8d152a46ffaac23b31ac62c3c55d6046582da89eb0b40e20ad4089ab9ed4a1bb21bf72109d736f6f0f2a6aec09864e7b7c7cec9cab56abc3e1f0ececcc390702727474e49c833075767696240936b351ff30a860a8c01a8dc6f6f6366c175ebf7e0d49d31b28ad8ce955addeebf5b6b7b7e1308b99efddbb777070c0ccaf5ebd027ef9e2426930bc1b4f26a3d168dc6c36f7f6f6a032ffe1871f5ebd7a05ff13d085596b5badd6f1f171a3d18044767575b5582cc01fb7b6b67abd1e26077446556409d9f8eabb77ef4551f4c30f3f0c8743203894868d46e3e8e84ea351ffe9a79f50e0c618b816a856abd0f1a193a08866b3196645ebf5fac1c1c1f1f1f1c5c505b635f3b6f26c2d2ff7b7f5f50eda85fadf085814a60718414b55da96724016c688f73311c673c6437406b0c2fc45c4bf2a608888566ed7cae0a9340638b83af720658824589a03b99503c012e78c021617dccb843c2b100f9717fdfaf63c60850c00e015bef9ba9e7b9b0efe171044e4960c8bcb02e2d58f283459e160826586502b82a4a013ea3a15e017d452a3d1086e1b743d30dcbf38e7a6d3e9d9d9d99b376f98f9f0f0b0d7ebc169fa7c3e7ff3e6cde9e9699aa6c7c7c7954a458d836125301e8fcfcfcfe13a666b6b0b1e5d5ebf7e0d8d72086da872dc3e9d4e61680ae9f5e1c38777efde252278ce811e8d08d68cd61853a9c4cec968347afefc05dce01c1d1df57a3d630cf44700a07abd2e22ea21faecececa79f7ebababac28400a635e15b55fcec2134faecd75a0e0683ebebabc160001555ad5643210386fafd7e9a26900103435c49d364369b625a83998c59ae19c22640308cd0d9005d5114c7d162b19661a1f9d00a8c947423a578a8ca9071a503b707acd2781129c618c358252381268bb29a750ec4c97508450508cb05573663e89cb336140f53e7c4ff958884aade0a5d8ce0843931c6a4a941c57af39e12c0626f0c81acf4fd39e013c5defd170c5eccfc512cdd6124098cd0e5c1681910bb804a2a651011b4d1501589c8e9e9e9d9d919dee4e8e808f1f02405af09699ac2798ba2db783cc60c20a44213b855223fe30bc385d168f4c30f3f80828d4623630c2607144f1163adbdb9b9b9b9b979f1e2c5703864e6070f1e38e746a3d1f7df7f0f91106e02432a47de24328a62f8e7fae69b6f5ebe7c8909044c6b62bae0d34f3fbdbaba829777dd32bad3e9c0c905a43f7055668e22db6c369b4de8e6dc743abdb8b8f8ed6f7ffbf2e5cbd168349fcf1e3d7a74e7ce51a3d1984ea7878787c3e1cd6f7ffbdb76bbe55c0aacf4255fd59c31062c162933f77abdcf3efb0cdec47ef8e187376fdefce10f7ff8e9a79f7676765ce00ebf383e05c7fcaaa630a5675e44019059bbd2526553aae5faf22ee046d85029034fab9c156288d85a55dbebd20209f450ab95e13980a295864b44de025839a8c22facc809b45ac639d1c5cf12b8002c15034dd67014271874bcf370f884c807a48756cbfdd59b958ac847b17437c6603b1cd879ebec12f447d0c5607b7722d2ad719819fdfffcfcfcf5ebd7a3d1a8d16840afdce974e03ae6f5ebd7fd7edf5abbb5b5757878b8b3b363adedf7fb676767171717101befddbb07c7c7b096c25ba1fab189ceab57af5ebe7c092fc9b039d8dedededede06c99acd66e05fde47e0e2fcfc62381c3e78f0e0fefdfb83c1000054a9548e8e8e1e3d7a04a32a1798cf4033b2b5b545442f5ebc78fefcf9d75f7f1dc771afd73b3a3a3a3a3a8202aed7eb3d7bf6ecf1e3c7cf9f3f27a2bb77ef420305b38966b3a96eb644a4d56adeb97374707058ab2d4d222e2f2fbffffefb8b8b7363ccc9c9c9af7ef525e46266faecb34f1f3f7efcd34f4f9acde6679f7dbab5b50f3c851d43a3514739349bcdc3c3a3e9745eafd7f7f6f68e8f8f5fbd7af5fbdffffedb6fbf15911f7ef8e1f2f272676747674e42a65606582b90ca350c5a39f0d3019fbd38a96995a915f32c07ac8043e1aecc9c20afd62d860c4bbca12c7b3c2a356e502bf9db861ccf52600a8faab612bf885d258fe068955b05baad546d0cad4d315b650c1b93eaee07086a5fad467c0ac3b93e4b01e7a2bf509ef57e0c2b876e68a368dcd0c5a0109919e64ea057908974fb060cf891df20079e8ba1a941bf454ca3d110916ab5bab3b3b3bdbd0de3296606ee0092f6f7f7b1630da6b7c27743e65096e34d9acd26acb1a06eeb743a8bc502760c954aa5dd6eefeeeec39c1d284344dbdbdbd8bc6b6b6b4b77b14e033f36e2cd47a127025244510450e8f57a10722b95cacecece6834c22dfbfbfbf03b5aafd767b379b55a41b224593073a7d3c1b617d56a05fb09b5dbad3b770ef7f7f745687f7f1fa5319d4eeaf5fae1e1419224954a5cad56f7f6f6b6b6b6209bc7719ca62e499246a36e8ca9d56a272727f3f9a2dd6e031f61f0f1f4e95358811d1c1c3c7cf8107b0549c12c880258f1f26611c23838928a8d3e12cc88c34614b0a70c6031af3a95a60ef7dfc801960819a3aaf710a4149248bbb30738bd770558444b8b53a8d8c19b8a5065569b56903773cf011619a32085b902e75c8a91ce39e78f4eb557fa870e84bba0ccf20c2b2f18e68613d47baec396f6eebf48d81291b732ac70202d1d6c15e98908148682a91f9838a4de95682e9fc562618cc126a3e22db64404b37560672282311fc22011014ac4bb70511b167d61e53e88dfd9d9817d00f36af28b88a228827b2cfd844aa5727474b8b7b74b4490012b95ca975f7ef9d9679fb1d7ca3bef1e4785263dd66ab5e3e363101f1bb897c19b3373a3d1f8e28b2f3efbec33f16607f84c74365a4e69a5c62cbfbdd56ac571648cd9dfdf6b361ffcf33ffff3fdfbf72793c9629130d368341491388ea2a8f9d9679f7ef2c9230c12b917d3328fa2e8f0f008f297ae6583da5e44f6f6f64e4e4e7ef5ab5f6d6d6da5694244c84a2b4b963a6c550c2f2126548a17008b680558aa3ecf5f0d1a0c51005e1b7a1a07da28a20cb489f7dc4005ff331c90a82cd821863cb200b06081b5f4632379317089412292a62677d51f433b2c388f331a1ff22c63d83993a6c639ab4c2b4da1ed5aeab98c31d6a6d6bbf045d049430ec4430fbbab5565b701a6bf00f062e6f7d661e530ce055bdd04834fc60359d10a117c444ddea1c14105837c61b68bfda2045558aa0adf054674c537c43be0add08d0137ba83bc4ec639976285308cf5013149924491857a8e8830e399667d045250d3d65a504818a0a9bb5409bc80a92b77ecb8036863365e5a59d685bac977cef57abdbff99bffa7d56a83af351a8dd168b4582c207a031031074a44a1cf55c562f1663e51141b63209dcce7f36ab5faf0e1c366b30955e0d1d1d1fefe1eb47b00b5829697020ccc41552812e6b6025adee9a7fcd48310f897513308f1b6efe04aea6a2a6c6bb98697ab020556590989e580452b238955c766163fab289e58b10216889bba540e1eb7b4532fc29606ad0ef1e2a109cc1a8095a126cb1836c661d8656fa9a323716995e8989deb11a56db5b4bf6c4ef03f1fdecab0ca1b69418da5312202fd5f69322d0be32795d025442494c0b53e141ab49e3467dd268b3d77e060e0b5c126146891ba4b2b7b2f57412fd225dce4737648a338a5a67ac6af58d4373181c12a11c1f81e8b5a9cf7a9804bba300052adbe217918f5df2828002466e6fdfdbd9d9d6dc4604e436469acafc592fabd3c2868a0e10706fe6021ce3033c14df3975f7e292bbbdfa57217060da5755d6c0f618c312c520e583ea5099b9b093c0285af1d369862ccbac005ce4501cbe082ba9d03cf2dd9ab226254175f34e042003059bf16ad08580a5b3a6eb9824d96f336f1384f92d4b9344da3344de1e45d19969ee7948ccab65002457d96b68410acc3a6521afeecc08b99730ceb3d5e31842a188ea3027413e65cd3a1a0b0b4bc42f4d1783fcbcb2a585150c4dac973fd41c9851f333355a529cdcab1147917029af1eaf5c47b50c83d5d3f47bc6d847e48a8e3b081272f244e036f168a7d5a96e173c5d3524cb3027675915038cc8a67b25a4aebaa89889c2395bcc03d418a416fd3348110e4312be44d9a077316ca287b8d0b577245973bcfd56031bdaf1d7e6b0be5ac3048c10d521003f5e99ee6ac443f221231480ed8a10260d1d2c94c66a3b0d0a3439aea79de819f4298314b85469a3a6340fc8da75996283566b5c7b0c296090207c6a514f86e5258dc505c7f7690f49620b2816195b6aa62dbd2d28191811a58111164ba5c1ba76c7b3759afca5afa4484f534509c87da74cee25ac8bf28e839619e1c2cf45728a1405d42decad12c2dd743afa18668398ab2e780e1fb13858648143e45d3284869bcac5cd6e00dc1adc823e02a67110129cb9567093014804ccf7d392beeacdc87633d262d195f44ab2d0ecb1fa1c55bbcba219ed70056b1cab40073dd896fcdb034b7dc60cc05fea5e95db0346f3de7ca01d672d4cce9b664c5add2c0887415547ba5f149028615f961436709d3348dc0b9108f23b40139868573cc95eb062ea187c8b0e4b3d05c5eaafc67272432bfaf0e6ba53a451163264ebf1fe7d8264bd7cdb09780c2ae48815ca301ae1a86c3e1d5d555abd5ea743a711c83f15aef1b3ee884ab16af31e180a354c564179a65bbc98afdf1528762a2c8c2510991d115ddcc1c9edb6033ae50db6dbd577809dc31e3b978b762b15b6ba26839472105e28676a9c4305f8d592841c8293b00533966245ea5c2dee11792e17a36e7fc43ca808995be7d2060859fbfeec6d210e6a6859c832ac90a89ebd27b7bae0c4889f7d297fbcc00b6c8fb78201193032c11a8d8573a2f453d257a6821ce39282198970a5665585a4790ee736c4b5f8abda4b28e6785e5b911b6fe4c504be4363aacd2a014006805d370488210b3b1dc1f16d5ec2704156e2890e9b4dad026a06e17919b9b9bd7af5fcfe773ec84aa2975d21d2b69540d147a8cc28c9e8880f4b1177f142cfc57a8a74d27e2d23449d3a576bc52a9586bac35449ca6ab7d2bc8af31c2732108abe8aa2408c3a09a17a8e4856fc4d0874f8ea208b302ec1d66a95e03778593155a62d9bac81b1f14e3fd55d6b68e2a2e664e997e98b9a291c5e6e15563797191b2ac278cd14ca80cce7231efd4633800a030071da87247bda514d428ab52506e229e8b1579966fcc4cb45c7b180a68457d96094c49ad8dc0a73cc3729e61d9509f65ad5d2c8c5fe790615b61d3c0a7a9413c65b1271cffb457969628059ec5fee702f38759baafc836d612022630ad369d4ed55814cb03adb570bc89ceccccb042c25660ba56066c564446a3d1cdcd4d9224d8d259f538d0a01311dcb300cb66b359bfdfc7aa175857203d66d38808465e58a663b27a2ee49624e970381c8d46d85ab5d56a610f6a66331c8eaeafafb11119045e787420a2c160707373039481b128ac5b61d904a689f78435064a06ae506104d86834767676b7b7b7e6f3f9c5c5f9f5f5b51a1c6c6f6fefefef63facf65e77d72308468f43bde148cc2106585eb1cc414cfc3c8e26b14555ab406bcf4def0840b8095bbfaae80159068a62c60e92b699ee2c57cc98a81bc06b034c35cc9e47010ff63810e110394f45ecfad562b0a8318c34b1c34982b444ca8fd802c91a6aa4581b9c96afda6d632e444a5ed52a0e75a08ef51d4d9f0a786b3350c6b7da30cdf4ca0fdb1d660221f9d135ca35eafc38214fa72f54d8c9b6131806523cc0c570ad86414ab0bc997b2736e3c1e5f5e5ec2bbd3743abdbabac2d23c64beb5b5b5b3b3638c190c062f5fbe84bf145d6ca88321321c0c06070707980d90a5f1e7f2d39c93d96c767ddd3f3f3f1f8d463013dddbdbdbd9d9b136babebe7efaf4e9cdcd8dced1a4695aad56a7d3e9d3a74f0783811275d80aa469fae2c58b7ebfcf7ed6b2d56aedeeee1e1f1fb7dbedc160f0fdf7dfbf79f306b6b2bd5e0f4abac1a0fffdf7df9f9e9e8239b65a2d6beddede1ea862e8d33d572fb76758c6c07bd70aaac80bb6c56c793d78ad6b1b61ca0dc7d266567aaeac6db3f23817bc3c4521a628f1d1a7e43a30af87a73046f185b2b242518705b1d1794b77bdaa6c2be0592b7f01d626ceb9284a559f858e0086e5799649d308ed308a922449160b0b1127491228b58cb1605e0b1f389812d5935c5187b01e5cd5fa5d15f2ff04db622e655821ef2804c99ec034c1b6db6d2c8e61e67ebf3f9d4ec129e02e1dcc2b49929b9b1b088ff078055352887e49926c6d6d811c8134a90b6398bf2b2ac16cddf9a9143c0513945114b5dbed9d9d9dd96c76757565ad85ff0311b9b8b8004660937a9038f2ddc339994e67d7d7d7af5ebdbabebe8ea2783299309b6ab55aadd6b0749199b1728588b0973d1c6639e7eedcb9831dadf7f6f6daedf68b172fbefffefbf3f373bf529ab6b6b660fb9e24c99b376fbefdf6db7ebf7f7272b2b3b3d3e9743a9d76a552b9b8b8fcfaeb6f5ebf7e7572727272720c8b7ca01565553365caa99250065826074a94e5595480a175e79b7f961e43ca435960cab5cae255dc78fb4e529a3e54e4f3fb021605aad2b00971819a89006d1d519eb879c022afd5b26aed80abd61a6827f02cb7b4e333b083f7dc8a60131f6aafc22a2e3613a8f3f593df360cbc0728c99f92671518166707bad226150a1d2811634cb3d9a856ab100cb1a2103bbe405f0eb8190e87b8c4cced761b4640f02280c10118876537d65a10abededed070f1eececec5c5f5fc38516c425220a35416031ed76fbce9d3b7b7b7b2f5fbe54b77677efde75cefdfef7bf7ff3e60d3cc6c0af83f14ee24564341af5fbfdd1688c16389fcf87c3d1cdcdcd683406698fe3787b7bfbcb2fbf04d10325c1c0b5bdbdfdd5575fedeeeec213711cc73ffef8e3d9d9d9d5d5d5f1f131c01143a5aa3040127776760e0f0fdbed76a3d104dcc31969afd73b3c3cc24a2035c4cde1cb6d5855a9d23d387231256d04acdc6b145b4e69644e778e04b94171dd792ef377ed4021e8e462380b58fa56b454ab2f65b7904985f7e61856ee5cd996c684be1c8c59edea5cd46779b60586856d5c60536d9573854c1f3151946158910f3a810859073c2b7893d5e48f72c3a01c967fb729e7421cff09908bf9bdd61266da659aa6ce2d775580e6086eaae0d3324992bdbdbd5aad4644d3e914950d6b72448a48a7d3b97fff3e6e87b60b8b07c1ce700e490a6260a7d3b977ef1e110d0603ac04821a1ee264a7d3e9743a203ecc5cafd77bbd1e96dd2c160bf89e0ffb27acc92f2f2f9f3e7d6a8cf9fcf3cf9d73706e076b4c38f92322d882d76ab5972f5fc2090c3c49d4eb75f8fc3b3b3b5b2c1650514d2693adadad5ffffad7bbbbbb50ae31f36432d9d9d9b97fffbe884ca7d35eaf371a8d2e2ecee7f3f9a79f7e7a7c7cfc4ffff44fd3e964777777369b7df7dd77575757bffef5afb1e01133d9543690ac03a90f042c2a801779d40831940b5856fa338cdc0c4f1f2b6c00beb73ed704d627b91cf4fd437a45d94ecb6fd3f187782dc19477a0cf62556584f19cb5a481f7a1e06d1913c1c50a5531990ad618e167668b05e74b59ea9628c1bcc2b88db2da7b8402c3a26c3b2b6bf499c19c889c4b67b3799aba385efaedec743add6ef7f9f3e7979797588eabbe2b21b241c32522b3d98c88b6b7b7e13a6e341a9d9d9d0d0603f86257bb126cf32722b55a6d6767076b7421e5b9e512dfa58200ea7c7888c72780cea875984e53ea4cb09a505c5e5e1e1e1e7ef6d967f57afda79f7e7af5ea951f1badf52e7140124f4f4f9d73bae52211c1f1d6ab57af3031ea9cdbdada3a3e3efef5af7f7de7ce9df3f3f3e7cf9f4f2613228ae3f8e1c387474747979797af5ebd7afaf4e9c5c5f97cbe383939b97ffffecece161ef1db3164e8b30000200049444154dffedfafbffee3bd7bf7befcf24b7576b84e122ccc6767e2b3e7a1bc50925e02a50fad01acf018b2a7309978630e0afa40aea58519be6bcc6d0267053a3c7d1dc3caa5cf3d37c7b07293360839dd563190675e2658c4139e87f6eef05763ad752e458bf29aac15c342d3b5364953e55689f2ac523b78e3d71ba6c1feace449a57eb8ffde950133fec7f510a973a8ade19d38d0bb54e9c7d897308aa2249961a307a8d289c85a0be7c55ac7ca4bb1f382d637ac22c6e3312858afd7abd7ebceb976bb7d78789824c993274fa047c7d638cc7c71714144400d6c0003f302c877e8db50811111d45b9019f13e216347fb68b55a506f9f9d9d1963aeaeae207842cc1491d168747979f9bbdffd4e44e6f3391cb61c1c1c6002e1f7bfff3d3e04b384272727cc6cad850a1fce1edaed363c4c5c5f5f5f5e5e9e9e9ec265f3c1c1e1ddbb776bb5da70387cf5ead5e9e969bfdf1f8f47c7c7c7f7efdf87838a70107e5fc0529bfb72b4429dae9334e96d7a744d19f6f6f7039acdeded9dd2ebf9bbbe897e48f8519215304db0a888b3d01cc25348b5b8c0b05cd618226052d8288c9ccbf82665afa5b2566db20ce60afd006f43c062af4050cb67c4a8796a88a739bc16ef77ec4f833eef11ca1816c2fac8ccddbc34bfae10d170b8984c2698ad8fe3b8dbedc217b0091613b0dfde0aeb4b408e6e6e6e4e4f4f078341ad56dbdfdfc7541a1101a49e3d7b767a7a3a9d4e1f3c78b0bbbb6b8c393f3f3f3f3f37c6c09d56abd5d2d5337068035736dbdbdbba3c08baf9bdbd3d6885c206847ba1357ffdfaf5b7df7e8b094d6cb7054f0fb55a6d3e9f3f7dfaf4f1e3c7711cc3a1282ed5ebf51f7ffcf1c993278bc5626767078e5fb065ce0f3ffcf0f5d75fc369fd679f7d064ddc7038fcfefbefbff9e69bd3d3d35aadf6e9a79ffedddffddda3478f44e4bffeebbffecffff9ff1e3f7e5ca954bff8e2f3dffce63777efde8da2082a3335c8a202f3bdc5b9c1fc2073296b2e99f5db70356c0f14f45bbdaa5ddd142c3fa9801deba0e45d216673e002b7e28d0c4bd398aca5121780acb4c48a325718a3ac8a3d2343230c8f5eab65bc3e6bc9bf708ca215db8aa2244d139d374f92e5bc217458e013d090ea3916de63989760b9981e3d84653c557096b11679962f43fa93e9dd993fcc0e4b875683b97cf67a68dd6f42e5352d5f753e457e7881df2b226a369b3b3b3b10067567f9f1782c2220655048e9047fbbddc67e5cd65ab80984e92611351a8dc3c34318b2c26aaed3e9e027aad6bff9b225359b4dd858a0a69bcde6f6f636000ea6b0070707f01c1f45d1fefe3e68205e03daa5c562b1bbbb8b784c5c42c3052f865b5b5bed765b1d63f57a3d22ea76bb8f1e3d3a3939e976bb83c10d50f2e4e4a4d96c7efae9a78f1e3d82920bab9a15f1e92d8065d7c49b1c60690928ac84a09303ac30326c3ec51b8bc9de23bc2b997a6b26b76fe1c5e76ef8642a4379e051887461198628a915410576e33500e2f5596a3fa13e705673886058605b605ed6bbf160ef0a0933f8cab6f42b148942d84a0b2e49d65547a16043b5d7470f6b1856b10ec2d6ab3383f82d2244124571b7dbed76bbc815652481f5908e2d70c0048d3baec2f7b1788701bae619c5b7bfbfbfb7b7c7cc40228875784fd54941cc547f5bccac3f8d5fe30e653c334323a0354abe32409d0e0e0ea0ed32c6a86dbab5166c0ee00e3b297c69bd5e7ff4e8d183070f28b080c7eabc7bf7eeddb97307f13055c3d2c8478f1e3d7cf810ef808fbabcbc14a19393e3a3a3432cc280307b73734344b55a6db330189eaf03ac9ca23dac65539885a4b70196f637caf6c6b0fd149bdbed2337c47f48e0b7312ccaf6612acc0c729655852c2c5762aae72a4e5084cc4b1faa0f529dba2c1dda2c571d7a0d57a43ccbdae2bce1f21caefd4386a54b4d54276b8cc1220df5b6543a25aa75adc4aac8b6b480892045fe892652983fdca73b82b5b6528943b15917426b65c0393238515816ba6c85fd4681a81ed4139462126c670fe594b236c9ba4fd1f205a6909f5706ca84251e363e7d434507e4acf9833342f506d5beaae4b17b0d1a01545ae05cf051054842bc5a6fe876b3f045a39c14449288b0a9c77c3e8fe30aa095cb42915bad635e1b008b02ca16368d4c33d928c771015c6e4f91420e12fefcf036b9e171c563d878723d96d67c4e0eef10c2520dbf2b57f8b9afa6a0e7678b42440c2d4d048c3129b3c1869845ad963129e607898897abf799fc2ada10371513d9fb834fb31e7443004dfdded4e1378625f0df18d6302c7dad5c7117ef0f34b8cbad3bb404151470631445e05fcc6cbd8f504d09f310849c7610cb12432aab33801c0c65144c0218ef268dbd2652f97948a4295b7fecb7b627bf7499b28a18804ed8b191b3dea5f9606473ce018c72df0b6b09554801498d31ce09400aad2d8e2b5e827b0b18f9f3bcea7d1dccf1ad012b778b04737fda827231b91c36c7142f157bf2470cbcd1c24063941ce9b7e7ce4bf32ca6e42c36e5e25de02e4de50f8d57b95244ac450c7c3f609de96a7b2a6b13e7a0b75ad96725c9d21ade9895ed3b7bf110edcd7a2fbec6db6729bd082701a830e9a935958b0c8ecc6c88a0055b5bcbef55811f836189c87cbe1099e90743d88156481fa5dd581fa7350a145754e20026d478444147bc9b40a42c0e74b9f3b07d84cf2d4de3bc93d25c83c31ba6de775a78355dfa5d5bbe12bcc54b4197a9cf757ead865274edf37eee39b216ee95193729d83173169880356bf5565c08b4068cc292096b2d4c1016885ea542fbe30fe0472194fc29429143e5e2c30eb9ee586c3feb1e5784b075655eccc43f8e98b1e9211119b5cff20c4b88d839ebf917fb713a3146b55a9679b95f9c8a84a58d240758bada5f023357da389c00adf059fe28e477452a25aaef14320cabb4400be7f9642292248bd96cbe58ccf5838d31d84b221c7e5d76b17898ad0ddcce50b69f843a42ca7a0d0d752814b0a1b026721fac97424d81e6ac05aa00a131218ce67437b8341e8f6f6e6e607706d7ef6ee9feb864d59eb248935d5e1f02d3baf82c78e5db5ce979ae488bd59d2b76ce221467512c5798c556551ab921fe36797e94c06be60ab96039b939652e4d31bde6b381e422a4c1eee869e0dc517916055c8cfc7c22dcfe85ba2d3d7a7d5612454b7dd66201cbac08dc4a670f815c98b3521fb936b005e3028451415246281231ff13ffbbd094f4036bf0fd1816582ed1d229f07c3c9e2c1673eb9dbae832141bb87052215101088f560d3d7922c6810062bc0909051d3ed7a6918f09367dd08fd2f4da1a42466303b77cece183829156df4df3d74b0a1cd56ad539777d7dfde4c9132c39ea76bb50e1e99b1befc7993da0eb138b10b30e92de11b0f2ce0bb5dcf86d804501b894128ae2d5754d28bcf74fc79b6e1f6ec3a4d6c56f3e86215792b70961a30d8b57f3d4e11cc97cb11305eb8168e95f1b6b0c8d5fde9f115c74b4c6736de0c42df1fb1b72c10e96b3a28cbe4308a6fe6ad87e96c7b0b4f9fd072491b7eab00a21934064694a3e994c9d4ba063463af44f15b2484b6e39119ba681d7274525d507b107141b78c243b62a46e5980e744648000d77ce6b95f88541186498595d32626610d379e1cc0b0cbb146131a5a20bad31210015c09b376fbef9e69bededed7bf7eec1810452c2190e0464f596556482b76755c5941bfa80d659587f9ca500948530addcb0a273319be38b69728deead77bd5386ef746f0e5c7205b2995515395438126c4e537c56ae6a148f42cec5810e01575db0c8d12cddf9af36b3b0d63897b18337c6581b25cb9d0d977aab9c3e8b7dc704cfd279436332ae6f4284ca3129f62cccc32e39876ac247b131f94d5e398371b7afc05b30acb23156df78a9c4592c9622a13aabb3d6622dcb643211918a0fe8e1d80e1eb3638d46a3dd6eb7db6d661e0c06979797699a621ecd04666f807f5839b55a2dd87f92276544747d7d0d0b752c1b4cd314c69f4484d740b1c2e8bcd56a31339c9a8ec7e3344d6bb55ab3d9841f88c964a21b23c2f515fc7621fd68349a4ea7954a656b6b0bebfeaeafaf5fbc78f1ead5ab7ebf0f6f10d81cb0dfef63136966ae56abdd6e77676707be2828f0bc5a0a349b8f6f05a65ca3cf9deb71c390beb9e1bc6353cb34a7f7b8eb63855c1fa37767521ff7585a2f61cdea6b6bb9852088a09223f31229783957c322c49c7ab695d7a870d9d8a933e30a4f2a7e5250f569616b4eda389ce4528a37a37fd7eadb64e91ec66b04e29857fa60630c91807760632ee51d70c0c2ccdd6e17fb39635131fcb58304c1d11dd621f6fb7d6c447c707080fda6d86b7c506aba2e1a1bb22a6972cef5fbfdc78f1fcf66b34ea7a3af8dcddcb1f3335cdc586b0f0f0f21dc9d9d9d3d7ffe1c8eab3a9d4eceaf29e0f2f2f2f2d1a347c7c7c7b3d9ecd9b3675830389fcfadb5373737d3e9b4d96cc28d5f922483c1e0d9b367bbbbbbd6dac964f2e38f3ff6fb7d3cd718737c7c5cad5661fd2f7e779f902b853aafdbc3d62d012b54a551965098ac3690dee69eb8b4c1dcb2cdbd35e5edb37ad750fcf075c75cfae2d10433894a3d4a71274c1f86d0e2a7987fee768d2c322c3d3a6f19eff55058301845518af1dbf84d39d10b307f1deab3700e994041ca785f6fe1670642685e2e06b686ac30acd340f27d9f918b3f649650ab96fd821beb37cbf19b182798d7472f85dde66030180c06d65a189763e1f1f9f939ccd68165d56a153eb046a3d168349acfe7f03c339d4ee10b7032994052634f5544643e9fdfdcdca469bab3b3038736cd66334992f3f3f31f7ffc713c1e634f63630c36611691f1780c47a9bd5e6f7b7b7b341abd79f3268ee3c3c343c0ebebd7af9f3f7fde6ab5eedcb933994c9e3d7b361a8deedcb9d36c3667b3d9643279fefc390cdcf7f6f65ebc78017f5bdd6e6f3e9fbf78f1e2ebafbfbebebe6eb55a6a8a013f13263086be8daeea163ccb149b7aaed11787c1e225cd22ace8ff594ef47183ca329ce5297f6a2655fa26a56972b8a631b9b7cdd59abfba3c8243305b9104dd04a06382cd9c7278c7c178494489df284cd3e01121b1d2172b7e48f0ce78bdb525c0ef303e499e6185c514c66455b94b8c30c1141b04b77abd0e9ea29d4afdbddcb973677b7b7b3e9f434a8233036cddfef8f1e3b3b3b37ebfbfb7b787f5c6bbbbbb9f7cf249a3d1383f3f7ff9f2e5743addd9d9b973e7ce603078f1e2853a6028562a1cd73c78f0e0e0e000ef301c0e6f6e6e20668288a9d9272aa0d3e9b4dbed870f1feeecec7cfbedb7af5ebd6a341a9f7efae9679f7d369bcdfeeddffeed77bffb1d76039ccd66e7e7e7cd66f3abafbe7af8f0e1e5e5e56f7ffbdbc78f1f773a9d870f1f1a637efae9a7adadad7ff8877f383e3e7efaf4e9d9d9d9d9d919fccfc0d66c3e9f8b108632f29e1e8a0c2b3c5fa7b15a0f588697bb0f942bdaa930bb4a05554bae0d14c36d1ad9bb34c4ffa6907ba5d2c2e100c46f790c8dfb7250589a5b3106a1c8d18ac75cad5160b7a50c0bfb4b1b639c2363ac78336cbbf4e86042b6a50bcb42ce857943dd94578fb83d8cc92de8516e6582197f11c6ee6741cced4912fbbfe5bdb7d261d11a8ca460be008005dee482ad22aad56ad307224a92643c1ef77abd5eaf77787888c935b8f414bf3a47fd918ec763f4552880a0ea567731e1c78b9f5badd56a5b5b5bfbfbfb2050588c5dabd5baddeec3870f9324b9baba828b64b09e4aa5d26ab5767676f6f6f69e3d7b061cec76bb47474793c9a45aadc28d0400ebeaeaaad168dcb973e7f3cf3f7ff9f2e51ffef007b8be825a4d84daedf6c3870fb6b6b69e3c79329bcddaedd683070fbef8e28bd96c767a7ada6834ac5db551e559a53054e45394dd3d2c1b8457ae63caa5123d86239b7680b033fc3551aa5c58c77afe74ac6addd5b06ac298b7064db9816189404924dabb437aa1faacd263f808ec87100a80880f2707739fc64b8fa93678b715e210e55557b86f7d8585170b0cab586ad9e2a000ed322f81fbb0cd8cb5a0a399e7a67e171966c64cd97c3e8744265e256ffc2a769011a87e50108854a13aecd8e47504fa9e3a1ac07eb7d96c1e1d1d9d9c9c7cf1c51790d430c187718688e028753a9daaa51c9c7fc2db9f4e4a62c6d01833994caeafaf217e42fec5c48a319c24c96834aa562b44b4b5d56b34ea9f7efae9af7ffdebd168f45ffff55f2252af37748a13bab91c1bd7ef2aeab3c250d05b91072cacd260e6bc41502853d01a9e956b2dc59862b84d9a3f93c05980d0732e60fa3b1d8bdcaac8bf36a7dff0262155c97d0b624219cd18f65375a45bb4626c563a0fb6c5debe47d9961ec339446b2d7a017b5d676eeda1096612c97740ce8229118928c6215e1422946facabb40067983fdcd21d3815454b535a5a62ed12d4a1db367e9d0a66eef055cf9f3f7ff3e60d3ee3e4e4646f6f0f1962b121e086fcca61949488c0ce0daa7dcaa27b1445b55a0dfa7ee02311351a8ddddd5d40e4f9f9b90b1c631111c8202680c187f512f4655114c1cb8d736e6f6fefabafbe9a4ea77ff8c31f7efcf1474c1afcea57bf7af4e89131a6d1683c7cf8603299fcfbbffffbc9c949bd5efbf4d34f2e2e2ee6f3f9b367cf9c73b55aadd56a753aed6a35d6699a906df17a86a531da527378edcf9735c0ab2db932c3a056592ee6e7134222f0a760551f9da329f90ae12c57fb14a01b338b776d1c56b4f34b744d76c67003dbe2f5faacacb57d1eb028bbb428db0e33b581fff0ceb7acbe4dfb12664b2717b71440a228aa562bc6b0b5368a2c330a888db17008035306c5f5bdbdbd5eaf777e7e7e7676361a8deaf5fac1c1c19d3b77b6b6b6d2348de3189ee0611e52a954a08cc7c269fc141138bd0a5f8b999bcda67abc429161e611057d7676767a7a1a45d1dededefefe3e5cdfc0fd0b1e114551abd53a3a3a6a341a7a57b7dbbd7bf76eafd773ce1d1d1dfde33ffee3e3c78f9f3c79727171d16c363ffffcf3bff99bbf393a3a1271fbfbfb7ffff77fff9ffff99f7ffce31f67b3d9fffedfff7c7878f0c73ffef1db6fbffbeebbef1a8dc683070fe03ca75eaf1319b58347b0813f90db0056816195375fca8ecce1d55c2dbf35a6b46dbc35cd9f552816d17fc331e453ebb45448e30a0b5d8bfc2b540eb017f9c266800f25bff2598512655b3a6308da15da67810d60e4feffd97bd3e6388e244dd83d22b3ee0b55000a3740821425526a75b7d4d76876766dcddeb5fdbe7f76e6c3aecd768fa9a76da5115b6cf1a60810f751f79d47c4fbe1a90c44651540e8e81e7637dc68c9429e9191114f3ceee1e18edf66de10665f11cd18da56ad18cf0aa31c88b35078aca5e273e07f1459cc4a2d3cf30bfe5086859941d7758410aeeb448045b0b823638d613d4404f4f17d1f46ab6c368b90ca6055085700cd0b1e5508ea8230c1f8938810970a05309585885798a0343c594a99cfe7c3281322d66023ee0233cfcdcd799e87cc113a8a2e0f274f581c11e31451b41289c4f2f2f2683442061da0dbd2d2522e97eff5ba994c6663636330e83313a25f65b3d9d5d5d54e07f9abb38b8bd54aa5924aa5982fbc607896327885987639734fac27d8f2f7c9a7a6e55de04ddf6f1bfbe806aa6cb1299261917a32a6b39e8c7863bcae68ca92a52da5d5f45f8efc7e68d2b625c65eace3d00e31c08a56b9c44de156b3e4ab2c59d6f9df351e56bcab48295d77acf749294dae73bc0374377b58c0440322bb1b7f7104302022b83e8868898ced1a8ebb21f49d71cfe5c862857be272631bd2910bfbfcfc3c808f8890260337817e2aa25834c67f15a96e8410f01ac5a31134a25aad96cbe520ca814a44fd7e9f88110bebfefdfb77eedc01b564e68d8d8d6ab50ab7e34c260be08b6c4ce31666a8225f5b25240bef280e58e31d34095b7c099cf114b44dcb75cef9ab90e94af80b6fafb676d125ac0abfcdca369e646164350065adf037c62f7bac8a61906db1329ccbee5cb63d0b433ed4c318db62cb0c6f4aa22dbddb2ec0b4d078a99fb0f65cfa057f28c312629ccfdde8cfb0a118d089199bc05111d55346c9b28c7dca2ca6b16e7ea175c35f14f7b1bf8d8e6c58204a36baa36613890458150e197e0b5dd556d7e17467ee6f025ac1ea0f35b352a920c01e4cf541102412495c5e2c1633994c1806c3e108841189bcc230ec767bc3e190ac3ca657dba766722eb2e0c3de63be20860abb5aa6e1e6ef996dbd0b5ce93adbe9d242a69bc4652d842d5b12fa54ac5f98666628986972a6735d06a0f62ca1b2a23c9b72ca6815ad4d0f67765bfbd5a6774e7dbd59d11aae4638733e5d74066dc81e8f4dbf13d63e9a6404315d5a5b53fb06628da2645e72fa7d4434538bce4fd67cad3d86e0b6781c4d5a7662606df05444bebf768d439f272280948cd6c733b3e3602012862a72142275341a71b4e8324ac93b16d03a94645a31bc1ab0ec3d6232ce044d82d465bf677edc2b8efe0dc8747f7ea7b6d3fccb3e7ad97e9aea953a5215cd8bdb5a1ebc79789225d99e5951939e88eb60b818740be09df18037f799863c6de9ad36edb2a1134523222218da60bf27229e8c5dcafc9d189639cdd41a8d3b39acec86848ecb61cf9edae58eae0ae1ccc69331188c61d27e226e32180c1a8d0611c19900f1b68ce828828ff9f0e62df18e002cdb5aeffb3e3251e333c0650c4aa8b910f7c4742745f8eb791e78a215409588b452e3a8d0b07c31f3c1c1c1c9c9692693b975eb3634d0d8ea56c8b4023853622d75ba81fe3db3a7ebc8bbc09e7e2cfe35fd5ed3f86523578c6d89c9e51664f930d394cdc16c31d69af0706cf9beeb4905169dce266b344911ecdb4e924861de298658170ccbee009749ec9c085f50262da5865266680816e5e472399b0ad96f4e539ab6dd694d2dc084a49442527b662e97cb488a63eb8fa6360d3e4ef30ec39e50d148f3d3e974068301ecf18b8b8b668e320625f8c6983d69341aad562b9d4e2f2f2f6381911ac789bf58598a17ffeaabaffecffff9d7c5c5c59595d552a9d4ed7661d24279cc80166b25d32035b3f5d86d91a786df2bbedd5bf7ff4dca6515f8ce6e6d5bd565fe5cf61e1b0bcc9735bf6d50a3497b1618165a38c801d896bd3591b3ec7946117972d94ccdd6fb0c71313b0d96d18531dea856c21e88998dd325e244337f3f1b967dbeef079ee72915baae934aa5e1021a862192bf63b2cc188fc6858a142e836286bf982f61800cbfa17f8d46a36eb74b44d96c56476ef14a29b31ac04e77681c3e632e6d1475ef7ebf5fafd74f4f4f91eb01739783c1a05aad22c3b3b995b66c61994c462955afd79f3f7f3e3737b7b0b090482447a32133a7d329f38e523ad96c560839188cdebc79033a6922db2026bdb9ff3430bd15b0628dd226bfe6d3f095dafddfa7bc0bfce8cfbab547a0e95644165130f4caf60bd5b32601cc9d0de4d9111d629e5c388ade77991b476c69f4e5121f4df535a335b0650f3247230353e87923442f60167038504af5fb7dc469a0c8926dc28389c8da0dcc426736ef0f180253634beb46023183532026b085c31c6ecf6e181493516c2c6636f9100d076c341af57a3d0882b9b9b952a9d46ab54e4e4eb074b1582cc2037e341ae1fe7098705dd7f3bcb3b3b33ffde94f8b8b8b77efdead542aa8cca83001a24af87e904c3a580d4e44fd7e1feb28e1446a6201daadca20f5cca67619609916661f32fbed7175fa43ff5dc96595f98e6f2fe359d3cd4345211ccc8736d752b476d5fc6943468c6d990b0d0c89c91080c66f7e5a3d3498e54499a5ec44d3a6e43a6ec7e00b9a65c1eef81cfc2366163fc22c210a6d7cf6b1ae058ee622f294450c290322894422934967b339666eb59ab55a5d6b8d100b524ae434443f475268600112d923941533034ddaedb6c9029fcd66e7e6e6b2d96cbfdf6f341a6649a752aa50282c2e2e1ac0d25a23a9bdd6ba582c6e6f6f2f2e2e3e7efcf8f9f3e7b833c2d7743a9d76bbdded768510a9542a9fcfe3056bb5dae1e161b3d9fcfaebafe1ea45a4cfce868d4613b1b4128964abd55e5cac221c58b3d9fce69b6fdaedb6e779b95c6e737313b9a3651491d5b4bf18845d0158b6986b63fb6732afbf67f94f6740df7b7bd9bbd862f5ff0b95e2b25664e3117aa58e4c4e26ea2f4f461f328022ac3c2f06b0c87209303a930d2f7601ecc247ea170e5dda5475cc86650c4064f50afb85637bb4158b0ad1f84094b0e4586b8d15ce42885eaf57abd5e06fa9a398c8f97c2e9148a652c97abdfef4e95321e4caca32c2f2e572398a30bedd6e9f9e9e8222d56ab54ea78373c230ec743a8d46a356abc1434a29954c2611e60141205aad56269341f5c199debca68ea61153a954a954aa56abd56af5e0e0c0f058f35e070707f57a1d9c2e954a21d129a0b95eaf7ffbedb7d56a757d7dbddfef7dfbedb76767e7528ae170840fe9fb7eabd542b6fa172f5e00430b8582e779b76edd42782cb2e6196250650fad364bb7bf8eddaaec966188d54c80fbfb94cbd0ffaf686b1b2bed6663148bcb9a0d4d5a45a6c5740adbbb0ab384660ed1741f58af8c0dcb5c651896c12fe32420acb9459ac253a844cc8c8270ccb10b9f8f48fc103f2c0358ccdc683486c321ccd5581bac94829e2584e8743a676767bd5e0f2c31325aa94aa5924a2583c01f0c06d96c167144c1c510330b999f7bbd1e8cf750ee302b371c0e91f72108826c369b4ea7cfcfcf6bb51a02d1f8be0f6684db22ee8db170a1e4f04a0d82e0f4f4f4c99327a7a7a7b55a0d91adf052ccdcebf5f6f6f64e4e4ea00902b6eedfbf5f2e9711306b6969697979b9582c9e9c1cbf7efddaf7837bf7de4ba7b3beef2d2c2c148b457872a552a9e5e5e5e5e5e576bbdd6ab55ebd7a25a55c5c5c4470547b10b3b7570cadd34763dff18652cd9477812bfd6558986115b19de6104d4e7ce14ce3a90031d661db3b94886cfdc96658068c8c910b48649e6eca6317cc94475b32ebe35d6ec39a7ef399e770149e9823ff4f22c2e215f86ac23a3e180c5aad16e2f071940f22d26c299148168bc56ab57aebd62dd7754e4e4e5bad16eec051a88a4aa5b2bebede683460b1761c07f1f39452a552697575b5542a3d7ffefcd9b36750c1606c2a97cbb76edd5a5a5a42d09bd8dc1fcc64081ff8ead52b24945f5d5ddddadacae57230f0773a9d7ebf0f23dad9d9d97038bc77ef1e82f995cbe55c2ef7d9679ffdfad7bf1e0e874f9e3c69b73b8b8b8bbff9cd6fb6b66eb5dbed42a190c9645ebe7c99cbe5969696fedb7ffb6fefbffffedededee79f7fbeb3b393cbe560ea52519821d39e668297fd21626c8b2d3e65b7cbe9df7fe7f267e53e7ff9ade995b16d8c6d99436296975fac72cc706ee086a2e414d28af700abae21536c2564c56d8daf83712b35311e4cf1ec879a62d87388172c2c2a2c1b867505cf328766367d14229d4e239e67ad5643089fcc3f5c00002000494441542aa4f902318147389c00d2e9f46834eaf77b304b01bf13894426932d168b52ca76bb035b8fc9964c4458d8ec384ea3d140793ccf0360a552a9c5c5c54aa5727878188621a26168ad89743a9da9542a4b4b4b26005694f8ef22910fb44266cee572d56a756b6b6b7d7d3d9bcd1e1e1e6291f3dadada83070f84105f7ef9e5d3a74f61844aa55278c73b77ee6c6e6e9e9d9df9bedfe974d6d6d6b6b7ef6c6f6f1f1d1d01b85bad16d4c0f5f57544a448a552dd6eb7dd6edb41204d139cae677bfff4701adb33f39c1b31f22ef0a0bf24db327bc4252e7e348977b63d4b47de94b895e159142111ceb1e7164dcf3299eed81a5f8d37bc9e9c858cd1ae08cb88e26c495f8b614d8b7d09dea7502840f53b3c3cf47d3f93c9643219e324c5ccc9641219658ac562afd73d39391e0c8644e3d20701c2c9f85a5f4492367e091485ac0284e1d1f62423d443d054e3a7aa9436b58c30d51cad52342643ad75a9545a5b5bab56ab4b4b4b483a5f2c168510b55aedc58b178944e2d34f3ffde8a38f98d9f7fdf3f373f3d960ed02ffc28003d7f67ebfdf6c36f7f7f7a1aed6eb759c8fe2c1cc6f3bacd9ae58a655d95f34b6b5bf224f72ab9927df8891cb6ae9af746bdbb362b4c83ec7bcbb3d6368ee4353639bb60c0e986c373e0a4484a66e261c395a5d883df62ca159e2661e8d085478aeb167692b27d6148ce252018a85e7fdd059429014c053b7dbc5845a3a9d464018a8b2854261696929954af6fbbd2008c230c0f2e07c7e3cdf974c26859086714077435c877c3e0f8d1246f47abd8e59c242a1904c26bbddee68347af5ea552a95aad71be572796161c1715c5c8e2811c6a3c2f67b408d208273b55addd8d8585e5e4638537cad7c3e0f5b58bfdf3f3c3c6466a4b700b7aa56ab9f7cf249b3d9fce28b2f7abd1ed2f37cf0c107ccfc873ffce1e1c3879d4e07514c2b950a82348c21d9f753a954b95c069d3470338d327c890d8b2d0e659f60b7daeffd35ffe6e55de03e7fe1ed1543d71568687a8ae32864e2d1d15a1188cdb028a266c604e6baae012373ab3014c6a534b67687ac061c155e6b0d3556447ceb1a36ac18eccd14432e52a914fcb06005874316112d2c2ce472b946a3beb7f766381ca652e96ab58adc0de8c0954aa5582c00c811e88e99612f771cc7f7fd66b3b9bbbbdbe9748410b064cfcfcf3373ad563b3838d8dfdf0fc310ee02ebebeb707d5a5c5c4c2693a9d4385d98552fe3fa4da7d3a5d25c10f850188d2ee9fbbe10727b7b7b65657567e7f5b367cfbff9e61bc7717abd5eb95c9e9f9f17426c6f6fe7f3f97ffff77f7ffcf8f1f1f1f12f7ff9cbadadad7c3effe2c58bafbffebadbed2e2e2eaeadad6d6f6fc3dc864461524ac4fff27d7f717111aa285923a1dd5c8ce8a9f941b33ff6156cb67523d3724de6f2d7be8d8d7fb13dd33fecca9939da69ad8460a5285ace31e19365660c79d20fcbd03d33cf1804a1c120e3e34e5620408a67e22166c12c388aecfe23f86199ce2384c8e7f3781984c76366a542224e26938944c2f73d30ac6432994ea7d3e98c109228c8e5f2ae9b48a733b80f02b38828d93d2cee44043b7a3a9dae542ad0dd30c7078f8a20f0cbe5cacaca72a15010823399cccacab2e338a954426b6dbe1111318f59613a9d5e58a804418888a6d66c9d1682f3f9d2fc7c250c835aade6fb9ee338e572797ebeb2b9b985a8f31b1b1bb55aadd56a6145e1c2c202b00cfe16ababab4b4b4b982445b8e7542a851f6b6b6b854201af607bcc52641a30156b0f957685c7f69ba676c3adde2affe97ce72fb07deb9b1a3dd1480cc894423883b151055708a1c2709c1d396aa81a58a6f545c464224da47ddf0dc3718a62223bbeab14829875188e3353c41816452d19cd5908a0159cb02c86654a1c7b8de9b7b22199236a00ae885c0ccc8c6547e634e02bc2da69ad1c671c2566381c12513e9f2f168bc06b224a2693c6a312951b5d380e6e85007b50f452a9d4fafa7ab55a1582b036080b6972b94c2e971142b86ec2cc874869588c66e6743a95c9a4b466ac97420cc288063ba3d1200cfdb9b9e26f7ef3ab2008a41c2fa9492693e974a6dbed4a29b7b6b616171781d4c836f8e0c183ededed304acbaa94ca66b31f7ef8214cfb4110241289959595e5e565e0afc97e68be996d98b0ebdce6f676f3d29607d6f417bc115b7e742ef32e6fed4632eda565f688c9c004262ea6111d455b86ad495c8448d6521233f9bea428b158180642103305811f860191012ce33fa1619211620c64a66076801a5bdf64c1c442316b26a2ebd9b0de7a021e8980563652a2caa26856895c2e2fa56426639393d2c155b8822223346c4fb80f56f0c1cbc1bc0cf01b2a64a954725d84c70fc33014621c1b0bdf0b65b7bedfb8cc524ad775984d3c2fe02fc32e0faf0bd89b00a0f8724a854a6998ba1074141c0ad0033f7b2925a6027cdf47984066c61c25b442340bd0663d6565e0abc8f9ec9d37dcea9af22e30a0bf24cfba4e85f0a4d024f60921b426ad45a4cd8d97d686a1c33c0e0e03454a2985b8cc5a6b3839eab1417dcc1230c9c4ac23ce75b1c8772643d45a0bc1420a12589a2398f9fbcc124e8b6101f6543d33db06196dad2a221a674c33806dd797e981e6cf300c8111c27252076c2ba57cdf530aa97ac6da75f4f21cc1f9188c880853159897a371a843066c71140cc756d1cd0246a28b908466a2240a77359ed68473bc795f98cf8ccb8999f434eebf31b4c285b1f9638a9894198bf4ac39c41b79ab7c0f9ef2b7b49de659d3443eea9b4c0410611aaf40d65a0b785ed378f6301482b52629432292d267a62018f73ea4c8a2a86b234a6610001604422e47bf290c15f3c5ea451b078423580a1692781c48ee87dab0ec6b6d67b0693dd9ccd6459ad778b6ce78d3daf86df764387498e85a340edc434298a5d1da861b735bfbfd4d2d4c22232172985d5fb6101140564a87f922e6068e2aa50058d8af2d572f1989d6daa4ffc173b1eed2bc2f456605f3214c95c6069c9935ff3d06d5bf677917b8cfbbb39d2951efb0b7e86b63ba20a3087fcce3a60b6e653763c7b960583435ee72c43c88486b65c03156421da5f9a1b1779726fa8e7e58b1ce3f7dc886c9e9ab84b5f8db1c8fc1aa7d1f1bfbec3be0082a148f925218d081189614bbd6ec1156e81fc3aa0cc3329815ed81f218e75fd28a142aad2c38a61e682a31bd4dc269d66068359aef3084dec85be5bb56e9dfe4d66e5ad39c2baa28fb37fe87495a5b68a2a4bc98efc32c21b6ccec795e105cc47a8a7507b654252212020598616293d291520a66a54993d6443f94617d5731f515db79c5f9f685531ddb062f8a9d699f3f0d013132c5578aa184937bde2ef65b5cf19a462e6355df7bc0bc115bde055ef32eb0aa2bce99ee3b3441118c373cacd5643cdac3703c5788c931134089287e7fad2f466ead8939d49a8842bb24c66c22859452ea705cec6b31ac99e7c4faed65575ddd9967febefe99b1aabcec721b5c0c1b8a01d6250c0b7be08c1e3f932793744d3fe50a3e35bdc7dee29b5d7d0e7d171cbc117a07d8cdbbb39dec3e97feb67f101156ec98fa544a1009adb134054909c72a612291b0d3af5ab384e33284a1d98375888c73cc25663d8994d2910e314921e93286a5af7490fdcbcbcc6ab5fe7c0b60c56426a58af6c4899745c1ae4bc76695f0e2b7d9da720545fa8126891bb1e55de038efc2d6ae8d58cdc41ae774ebb54d2bb044c19e1586c8a81a2aa5304b88f80a4a5dac34d4176aa08127dc16ce9213e90e99590a396658cc4821782d4f77f37bfa1dcc3bcfecabd377bbac2ea677be150a9899c6e9c526ec5cb6d8dcc76c63f62961ad5bc45fc6ac2e044be9460ceb5a76abd873cd77b2b73c2bfe3a5f323f78cded8dbc55be5fc5fe0d6fc71d69aae3983da6de78126588286acc44a469ec87050726ad3581615164f40ac38920596c8573a0f1a4e4c442148e26dfc6362c2105b39042fc9059c2d855336f12bbf935e980b92a767e6cffb44ce1d55b24c6980c9f8a665ec700f59d2895fdd54da92e2bf0a4621fff10df6fd8bc912be45d6037efcef6ad756537639a8577529a794311f9bb878e133a8ee3b88e52a1d65a6978608dd546837dd1a20e78d55ba9bd005e5a874a09965073488d03258f19d677822d7372ac67c684a7c0dbec9feed23405f957ef9f42ff8b3f66b22a8a288c6da59ade3a8e83b3c4d45c61ec9e5758af66b2a758f9f5942f55ac4abfebf646de2adfaf62ff4eb6b15e36fda7fd83a2f0587481802aca2aa895d28944c20f7c2cbe21262c9a1653d3e551c7015313e8a3ccc42c486b0e43c152221fe8d88bfc6d9eeea6179185ca6f653a7f11b1806a56bdbf5526e9d505b1b266037f90ad4a4da606d1965cf64a760d7f8fed8dbc55de055ef36e6ea76b2926d3addd6c8560785212111c1591835529c4d552cca49589083891dd5e8f3da2b5d6a49426e393a51431c39788f8a2fb5c9a35e78aaf1e2b746ce7cc97b46f3bddc367eea729189ab5079842c692650e598a5edc73ca18ad6cbb55341be8f0a4bf7bccf78a2ff1b7d253b381b8ef3493fa336d6fe4adf297f9107fd55bc834d98f88cf440ba70bff70adb556ca11626c2f775cc7715ca53491a6687d0f8b5069c582c94a5ac1e35584e31b068118ffd68a8560211dc7134262891dcf8c8735adbbfe8803f85b7bd7b43e655f1bab59226d55650c01795ac40c313b2534412218b3665c7e854c57daf7931f6b90bc9199f22e709977793b595704cd0a7f91952530ea5fb379962159514487318762c14a2bc14c7abc4cc5a01ec26d6aad9931c693d68a5809e1388e23a4640e8998344d302c035e97753f1b2fe81ae833f3f2e9df979d43b35087268602fb1c32a8843f6d3b14473e1d530c8b015552c2dfdd61a6ab19d665d631bec40e15abba997b7ef8f646de2a3f6e85ff0d6f4df7222266f36f42c4d8331e17013994410f441f88bcd3c7444c29c944a1407e1d49c4113f0822c061212e82980b110a81e008ae7494c092209b614db3adeb4b0ce3de8a7d575c6befbfe24c3de995cb7ce121c21386f00b6f06be96d0f54fa6e8035fb3de502df647a63fcff0782333e55d6031effef6921a9b38647702ab23902159524aa924454147b5d6639f78624d1a365e2242ec2d0475883cb6c6162e66868f91e3bad20b85109a2c3fac2b1afd5bcfb90e2ac5de73f29d67ecb49f7b494d318f91e8e2374f5a9a84187b9e596c4bc27f3d625804ee656b88362fb36df3b1ad8d98d1807329938abdc275eaea7b9c7c2337f2c3c5ee5f5a73b4337688226b0c314b662d25402d544a39523a8ea3b4c2b0ac9422ad43939682b5104a690096026011d94b76c629765848c7715dc791d2112cf8fb31ac69f6c491724411a845f36e17fba76f72754f36606182ba7014600cfb1197d9dc6aa6c4d896c12f04e1721c072a21b3804a68a702bb42a60b2cac387c28921d00fb8788f922a6aa6ff8d48dfc5965ba8145ed3ad661197b6243b5bd3e848c1f839414455b515a0b5661a849dbf19127728b8d3d4b85701c092241cc9a69c62ce13494c4facc5b65ea96b3cfa1290e15fb1d0308f33b021f61ec82e690adcdd9162bb66c588e637ec06e05457abc73fa56b6158c2c17120394c2f2008e153ef66ac2f27437a74d43124dc1933d9698abec33635f8a6641db0dd8ddc8f525d6ffa61adbc5d1a8411acaa2a4231d476a2d750449da4ac84ae3f64c82c7fef1cc242542e98d670fb556112ff1a490c44cd30ceb6a99799ab6c4a65426a6558c77d8ef8cab62c0647e83a4986052aeeb22471622bbfbbed7eb755dd7c96673c0608a20c636844f297482883ccf1f0e3d66721c1780e5388eeb26714e229148a7d33648cd2ca1b022f331731004bd5eafdbedfabe8f9c66886a1f437f13b2ddfc19839b9841414f46e03659ce449400eeb2cf67eaf6ad5ff0466e64a644ad65627ed0086067cab035c3ce23c7e1ce496b05b72122ad14398e26cd5a692184264dc4911fd6d8639e48488928e72e91204dfc5d3ddd6d5e60f620ad2b11211d03484410f8e85dc96422914830cbc9179b18ea67421802fe8d4623842a26a26eb7dbebf58ac5622291ec743af57aa350c8e572d964326147011491039b85576346a5b5f2bca0dfef0d87a3300c1122d971643a9dc966b328432e9743ee1ffc39add8da438d1e0723a57ebf7f7070f0e6cd9b5eaf877cb1885b6fbfe6f46f9b6d99df766dd888834487c8e871d9c7329fd2be334db2b01bb991eb0bac543465c3327b88b4358d08d22005432d9436b628a595d24a8d014b2bcd24983854a12662020bc34d42a51473201d37910c1c37c1ec3009f13db2e6c4ced75a0741d0ed76910939954a2125d97038ecf5bacc9ccfe7a5445ef80b5ffe1804d83dd630238a921e1291945229351c0e7bbd5e3a9dd65a799ed7e9b45d771c8034a63189282c9fa95fc771847006837ea7d3edf5ba4a294c4020467b32a94c66535c883c1a50a44da40b13e22716f5586bdd6ab5f6f7f76bb59a49226b10cd44f611e3850b8a2c024816cf8a697fd8391c0edbedf6e9e969bbdd4ea5522b2b2be572d966587635dab79d86ad1bb991ef2a5a33458911f4c45c219aa8b66d32686b319e25a5c482426625a56426ad15b3564862a1352b0e958ae613492b224d600c8ee3388e2ba423c6be9162b6a7bbade8d19445c65655b4d6beeff77a3d040b9e9b9b13420441301a0d3b9d0e45b44b6b4c5e6a43850ca05014045958136de8f0308d8b285c3a47c18885a028529530f5a494f27d1f9194813e626cb037f8257d3f68b75b83c12093c964b3996c368777ca66b3c562114a9ce17750fac230b443b09b7ca848a203c33f323c9f9f9f2712890f3ef860737333954ae14293743ab2f15fe49b34908dd7a7082b63b4a8dbedbe7cf9f2e9d3a79d4e6779793997cbcdcdcdc5781945dc2a4aed710197484662dbe66ef0eb46be8b70a412c650421b60a0f12fc016dc11d891525f8cc4269782026009a19522568a34f1d8dd61dc9895224de484a1108474568e94423a2c1dbe225ac35bed23e637fab6943208824ea7138560c74a484208737475cff34d1055a4ea437266d8aa4cd7721c279148241209c0016c72d0dd1c4702a38ceddc7442cff3f068a48c965222d10e380756de1069dff7915e0cd59ac96433990c52049a170163eaf7fba3d108590891245108e179de6834f23c4f0891cbe57cdf775db7dbed2247613e9f2722bcd17038ec743add6e1775954aa50a8542a150d05a0f06836eb7ab94ca66b3f97cbed7ebd5eb75d77591fc35c6160dfe7a9e874c3cb1558a4600d9dd6eb7dfef67329972b9ec79def9f9b9d67a7e7e1e3aef0d5addc88f22d17c574c78a6603f4812c2886aada5d4cc04d77707b38717b95475180aa51c814933c7918ec342289a354b689549ebcb9d0fb435078954cf4110349bcd6eb79b4c261d47168b45645bc07d3c6fd4edf690ea0ac084a38944024c6430180008a4944852afb51e8d46beef673269a896b0f3a1c836ef532a1c0e87e8cf894402e911a594c964322265e31503aeeb2aa5d0ab0783c1d2d252b15824a27abd3e1a8da494b95c2e91489c9e9eeeeded8d46a3f9f9f9a5a52522c2f983c100e0cbcc9d4e075af07038ecf7fbc3e1d0f3bc6fbffd1659577bbdeee1e11132ad2aa5a494d56a15451a0e87c7c7279d4ebb542aadadadb5dbeddddd37d96c666e6e0e086ed6856aad0b85c2bd7bf792c9e4ab57afac150f17ad832cb35a1004676767878787c562d1719ce170b8b3b32384401a6d9a32f3dfc88dbc4d38c6ad386201cc4ce33856765f1c071010e37f0250416383afc38c9c83e03a4c5a2bc55a6b96ac590bc9c45a48d6a4c250313b8ee33a6e423a098470b88a615dfd1eda3212837d8c46a3e170381a8d882891c8673229684f6061380a1f28d0aee17088947f6043beef03b39088d0f094e170e8385247cb2369dc3fc793652883e7f9bd5eafd3e90c06834422e1791e54d16c360b65d0d4329e856bc1c5d2e9341eddebf54cfe1bdc4d0801e84ca7d38d46636f6fafdd6e1b9b773a9d2e954a0b0b0b28702a9524621cedf7fb8d46abdd6e13512e97ebf7fbed76db7164b95c761c474a914ea73ccfebf7fbfbfbfbbeef27126e2693612bf3b3f90408deb8bebede6eb7f15ef64062ab96d8092ae7fbfe9b376fc23094522255e20d54ddc8f792abe60a8dd175d639766f356e3dcc2cb486d1598c199660a53585e468c5a4957268ac57a9c8943236a790cdb0a6ed5657bf875d0e74332871beef73e4f4845ca1264f97d63a954acdcdcdc14e0ffb5722122094e779b95cae5c2e23b73b8dcdd5d2805484e517937f611882fd002ec330741c67301880cd458b04a5310f65329962b198cbe50a8542a954ca64329d4ec78d0467a6d3e9c5c5c562b178efdebdf9f9792965b3d93c3f3f6f369b854201298cc2304ca5928944627979b9d7eb1d1d1de572b9070f1ecccdcd9d9fd70683bee3380b0b0b1b1beb8d46e3f9f3e7806c3c3a93c9f4fbc3376f760f0e0eb3d9f4ddbb774ba5722a9534f30c317b13f450e8ad93c3d9c56712422493c9b5b5b59595959d9d9d172f5eb8ae7bfffe7d40aa6d25bc911bf981725943422f8de9401ccd15820d1091521aee0b5a6b311e80496bc5d1621dadc2502821dc4422e13ae895524ac78931a9eb00d6f42518c96184461e79c791c6e20b81e5c5719c4c26034392e77948b868accee9743a170933839dd90533c5030ca207f67afd7abd1686e1c2c202a81c59a91cedb9423d8ebb2af3f9fcfcfc3cd08a887abd1e5b0161b4d6aeeb160a85f9f9f9c5c5c5743a4d44502499797575b5542a8d46a34ea7834c21994c269bcd4a2932990cd041ebd3e170c04ca552b1549a83d51f4631664ea5d2440a9caedd6e26934e2e97cd663350365594a7db08aa02463ab65cc360b4c29b1ac31f337b9ee7795ea7d3817a0beb153cda6ee4467e1499692c224218f771379d1e59cd564ad6fac2e9215a57a888484a45046f21867bb71042477cedc2abd3fcd093165f9a34c0eb49076bfb108df3bfbb7a9c45c34ce15fdcdff43133bb6fb445b85c160a85743a6d000eb88b1f3c95ce0b6c6830e8b7dbed62b1b8b9b9994824eaf57abbdd06961b8dc97864595516add08cb430f350fb4fdff70d6025128942a170fffefda5a5a54ea7f3e6cd9b66b3198e0549547dcf1bb9aeabb522d24a859ee711a9e1708884afcce370b1f57a7d67e775bd5e03476b369b52ca64326d9068dac5548f538487608ed00d47a351bd5e87720d7db3d3e9ecefef9f9e9e160a854c2603737eb15804ccdd288637f2238aeda535e60434de853dc69760da11474769be0cba457b801e210b25a5ebb80e8ffd4e899035e7adc59a0958060ee0cb0e3d339148c081426b85611f36a3643289d5d84a29cc240a21e0b2944824a0098219a1df1b6313e6fbd2e9542a950c82b4effb994c269d4e673219989652a9542e979f9b9b83b727d4a25c2e974c26cd0944944c26a574b2d96cb15808430563793299c4ac5c369b1d0e8778974c26834bf0dbac58ac56abf7efdfb77dee4ba552a150989b9b43518bc5622e97751cc1cce572653018b4dbed5eafb3bbbbd3ebf53399f4fc7c65616121994c8c46c36eb7abb55a5aaae6f30521b8d7eb3a8eb3b292832fbe94177eb64aa976bbdd6c368159ad560bb809b33aec7166dd621886a3d1683018140a85adad2d66eef57aed763b9fcfc3b8a6ffbe3db34c1bbed9fe485b53b111d19952bf629f604c8374dc2bc2e83732caee4e963310d1d898e6c4c65b9bc599e75d31261b1f4b702be37e897981442241c489443291480821b5264cf603ad60ca91520e8743d775316d5fafd731a5954e675c3791c964138964269386e70111c1c32097cb856108909a9fafb8aed3e9744e4e4e7cdf9752c24a552c161389849921c4e463a934a7b50696251209d40ed00d3638b8929b12269349bce9eaea6ab1583c3e3eded9d969b7dbc96472797979737313fc2b9d4e2f2d5573b92c10a450286a1d4a294f4f4fcfcfcf85907373736b6b6b95ca4218facd663308fca5a5a552692e9dce361ab58383835eaf37b386fbfdfecececed1d11100ebfcfc7c30182c2c2c388e83170421cd64325aeb7ebf1f8661a552c966b3954aa5d7eb1d1c1c044160afc4b647b9bf37f9cfeede7fb35b661bb03491ad1b5e3436034f7afc5b30c7fda8b5d62c380c5da1949b4824129e741c33ef782d8635fdd54d41e14205c31054a368d24a6badc3102912c7e12330f80353a094816a8d46a3d1681404018c2fa3d1d0f77df8408561a035691dc263d32ca603236bb55a98ec0b82a0dfef371a0dcff360230318799e17e1a92384c48398b9d56a8d46a376bb0dfc86412d0802d7753195098311260de00901aad5eff70f0f0fcfcfcfb3d92c542d6044ad56d35a0f87dee1e191eb26a5948341afdfefb75aad76bb934c26d3e974afd7673e83d3561886a552299d1e85a16eb5daed76bbdbeda552e96432c551ca6f8069ad563b3838e8743aa04870ad80f51d8fee76bba83722c2b700b16db7db7004c37b55ab55cc997ed7cf7d2337f23601271a372d87c230089928108190e3d5fe760c86c8313304442845411068d28e74945241106aada49061180ae93a08b7ec8009719c615d7ff88566014f454ccc092b322745b3a14288e17000139ab16a69ad7bbdde7038344ba30d95d35a8f469ed6ed5eaf27251c3da4e308c771f1e69d4ea7d168a00c4208383ac1bd1eb8a994eaf57a6118d6ebf56432e938aeeb3acc324252168263a5350bca6d7b3645fcd14cdb31f3703804b393529e9f9ff7fb7d8a0c7348557476764ee3b54461100483c180883c2f383d3d6b365b98390d8240297d7676ee382ec071341a6a4ded761be106b5e53202e2a9b5c61c02e0acd96cf67abdfdfd7d8c19666e11d5689cce300600da9452dbdbdb3706ac1bf9f30b5a9f43cc52484de3c413642561d59a840060e1b724d28284520a0b09b5d601872ca4108eeb241c272184a3f59536acabc1cb1c42278f0ddd30701b9ac7cc440cdf741373cad895010ad80f5ac1cc441abe6772569a7840898e961fbaae0b87f568390e6166addfeffb7e001e6a664699391652da9e7ad36625c284ff8800db322b72b4d6707450e3d08870915761a822cf0372c6816c9c300c1a8d26263d4dc983200c82b10b08f6d46a3ea0475bb1386095a3285403101913ac36caeb68ed373e0d4acb7ce1178613cc0482984ce9fa3db6dfa7255bf2431e7db37d07b6e60b92525a88719405221586aadfeffbfe280c9594528d27a-(5, 7, 0x89504e470d0a1a0a0000000d49484452000001900000012c080200000062d57295000000097048597300000b1300000b1301009a9c180000200049444154789cecbd69931c39722dea0e44e4bed55ec52aaebdceeda791ec8d4c92e9fe7ce9834ccfaecd1d6966bad5cd6e76732992c5da322bf78c80bf0f27e1895832595c469a996eb02c1889402022b01c1c77381c7c7a7a7a7676f6e4c993e9745aabd58888889c73cc2c22c61811c179f9d18961162236ec4488884498d949222c2464392247cc2ce2d8108930192744c8c110c9f25944063142ce182621663cdd8890315684b24f2711318645c8184394b95a7cf35c0c11adfbbaf7c8edad796e2ecf30feed65ee9ff54ef16f3d12512e070a4298860a61f3550db81a661ea62fbd1abe9ea629c6ebcbe35298b2f498cb2acc21f739ef57983fe3a3635e01c8071ed998d4c96038b2363e393efee49387d1d9d9d937df7cf32ffff22f83c1a0dbed32b3732ed710d736712672c4448e859984880940c34e52c78e882c1912666121472c44cc64445b0c004b7c2b21624344ceb71beb3b30b1b124cccc446c9888844884c418c3c4cc198841d056a800b4ee28014ce8b787319c05a3dcbdb9bb4ae3734fc9f50ddca56f9bbb9acb2df70eb99a7a6badadcb3300960c6aac4b531a594c2365402605c0ca01440e4d240b61c5044484769bbb84735c0a131443f8945c51977ef89f0134fc791e1d918838112d3d32e63d73b3919d2fd2d76f2ee2b8f69bfff7378d7a3dbabcbcfce1871ffef55ffff5fcfc7c7777d75a9ba669b17ad606902a166221222666622276e41c3b223162d8039678c0c27d42424c24c2424ccc86713f91301331335bdf7a0049c6b0615e0116b10296a6a41c60510022b7b9ba217e33f06dce6d734c0858eb727e2b60959e6f0e9bc1e8366942c808237309a400585280aaf0588a3b8a3ea570837845a530a55e0a7f16e33714c22f615dc8017a0eb034cdbb668b461e57e2e96cf1d3d3d34ab5114795fff5ab2fa2f97c3e994c0683c1f5f5751cc7511485155ffa242616023c11a1ef302d5148909e85448c13117686890d1961874f006011b3b0c812eb1487845888093f0143444bc062b6860d33313922324c64848d6121e28803b0c84152ee3c77d5da0cd869fc070216c25b0128775c973e7c67e75cf826b406c28adf5e5295b700accd419b4a98610e8f4a116d1d601591a8084cfadc2290a569aa5dc8391742d2e6a34258b1347265f80bae6d081eb03275fa818035beb91e8fe7a3d168be9847711cd7ebf56eb73b9fcf3b9d4e1cc7ce070a46feb22c6949748888890d09fe0911b1b090111122678047c4222ce2006accc60316b121c3a4f827c4648cf15d1458c8860db331864984c83193354c2cb4e45f11111bb356e8d3e3ed61e836f094e347c5bbb4b6c234efcabf72578bf0749b98d2f0d696f4d6ceb98e988470b3f9aeb70256313e8ca12c608588839f0a5b0a49a527bfb0adf708594862e672c07abf9c015895d9e2aa35aa561bad56b35aad4404f6628cb5d65aabfd0a27395165792481ae6ad92252e79c132790f7c82bd449083448449c88902323e208c84429118b9018b6c28c044c640c118b73b2a455860d5bc898442c20612c6c889d7f2d638d354294a60281593f5bbf42bf2ed4106d86a4b76abe7229c32722bc2b60ad130cd70d1b9bf9d486abda864ad3bc530b2beddbcc9ca33fcabc8a7785004405a42b05b2d2bb72a2621899a2651492dd8673698194161aafd1bf6cbefa5773d4e121002cfe888065adb5d6d928b2d6424f1d1191732e4992344d9d73699a2649526c6199bc48989899c5b9f96c369b4d13979221d56011b31074f2c69021200b3968db916499131191811a9e590c9331abc732b321366c201291e021640c3320534488c558b2b110877d833c1063c2a256ab359bcd4aa512ca2f61811641e1f6051da62cdeb5a1df521964accb3f97b2d87f4a7b14dd8e9317d3dce6aee2b336c773a050cf456eb8b1f8f9b9772be619de48eb8bfdade8acb896cbed3625f37308dab60b0c2ba3c37abf9c0188ceb9344d923475ce915054ac6c6d0deb9eb7e44e969dc8643e1d0cfb29a57135624b4e96cc4898444852a29418a0631c1947224b0d15d451448bb97389186b6b354b86d2c48938c8774c345fb83411268e2363d8182203da46c424cce484a7292d52c3368e2bb131ec84209782524da7d3344d5bad561cc7711caf538a87e136acaa98be34072dcc75acaa344fed12b9e13a5741b7cff3ad6fbee16473e0ecb472ee0d6f990379814e6f270f1621c64910342500252cae6202c4ab5ab6a8a82a650d616f5cdb177e911cff7b02138027e26ca0c25046c5b62b20534c4cd3c5ec663294d835ea35b694a42961ca8f5988d2344d67ceb0892b9161224e891c131b63e22832d69093c564319ba6b55a6ca36a1451922cc83963d85ac3428b59329d2686d856a328b6968969a9be374cc63009cf27e9cd84a26aa36d3bc658e79c38073e2922b3d96c32993073afd7238f059bc12814873703d65ba14dbbee6d660f4be37339d07ac0ba4d7c7648bc2d2a6d0e456ab68172864050fcd2304d0e77c2788d51980b3f2d7755e53bd50628446a63d0f4614c885f3950fe05a7c2f0515ad1a6fc6939efc686a35c2bb9550642040245e2c8394ec53aa9388a49d254dc521623224953b770c48e22e62ab375248e49acb151ccb1154ac54c539aa536b2d55a1ac7b45824e29c356c2d93a3649ece4d6a892b11d7628aac6312728e9c18e6c872e2ec905371cc6c2a954aa512d9740958954a8588e2389e4ea7393e7f7bc8c814dc3ba6b97dcec5f87705cae2c9baf4a5311b48c4bb861c76ac83b322c1c9e5f056c0520c0ad3e4d853eec652740be12944790a5a0b67b572e1cb176b3387c53f9b205e0c7c072cb95dc69abf44988f0baf163b403e04d1c6b08dad54996bcc319994c509331bc32c24a991940cb3ad5054251333111b22cb5489a41a892432ab7232b7952a576b52a9b828724bc0322c2925734ae7261253afda7a95622b4c8e9c9013c3125b93381a4e6ca51255aab57abd5eadc669ea30f11fc73118d662b1a8542a9010d1f86eaf7af79ff96e0af80dfca834ff0d6936e4509a5b913ddd2646e34b1fb12eac6b9545480a2fe5a06a1d84dd06b014b62800ac1c30418fa95751f52a45e6e60a73d8e40a4153debe947e091f2178ed77890eeb1d03b36132380a09118c4859c8c1c28a0c13c378941d193104e3776799c89235c44ccc8e3935263536151668b844c8b01826cb1459b6c619762c29339111c3640d1189356c8c316c311bb8248f7e421091455ca6db31a0d28e5d7a6f69cacd6c4e0a425c31e63dde7033f32a3d5907619b439838e8c304f9095737b72ef6daa51cc5db0c5812e8b67210864acf9d53010d73af11a6419585a8a7a1341f791785dd2fe1bd036a24caf5a8f7ca88965450c4911312434e44c4f9da1512272e756461456ac889a42919316498d06291492a940a898811583d888890b01171224e5c4ae218ac934998441ce6078b6d37a73d5514d3f69733dda0352ce996693633a9d2630813da4f3e1660e5ce3743d2fb01562e87e0a16fd761853121450a936d00ac5cb2cd412547e5531c28a7344602b306255ce26997922ff60cbd54bdf52165f84bd81050fe1fceb0888276e364394527446a444ac222ec20c75936c610acb72c196308b52bcbb9502722422c8e9969b9c69084247569eac45a212227021307e770cec8c0f9919d02056a0858a57c275728a5f19baf6ecee796477db77702ac2c4c94c8f2a5d02665a4201793fb55561eb9a06f922123e1e34adf361c66c2349c55c3d307001605b0a2f0a42fa6d8843613a6d49f9c0d120c87b936768b82fa25bc4f40217f38c312126134565e366c66e6e5fa1a60966166369619d60a860c31096445225a8a94ab65374bac21c430f9e58644d62cf1d00931131bd86621190814099131925d734301c3a2f570f07e56ef1b2cdd371fe58319562e87dcd5dbdc95a94b3fd66cc8a4905ecf4d903c034f216015fb76296015a18a3602166d042ff24c2a0497507b15b2ad9c71bcfe842e2cd46421b037172a2da25fc2c70a68e11fccb08448d8928d4d2446489c88b3640d1b2c6616724cc6181b4591895358be5b63e3c84696c93139c7642cc7918d229b922347125963992525364e58982313556c24c62e5884194a7736c6b058b6c2c64491ad542a711ca7a9831d179619c5711ceab04a3beaba02bae5b198fe5d7350c07aa76785e739c3d75b8257984c44fc0023b912f23f36a96c34271db814a472cfcdb5378d098faee09f843e00b024900a8bb787a521810088ab21b0869815569926d03c6fd3c07e09ef1644e4431816c3b78230a5c48931a9a554d2d43887fe67580c258e1222264a0d8b61312e49172e656b38b694523277c99c2461971a97462ee134494524254b865d2a499a2c1217b1755449c5512a2c8e8559e06ecb2cc4242ed59514699a2649ea9cb3c1148f364a6558089bd715ae3bdf7c7c27b6a52dfb9de61625e04761ca100872f017e6409b3456e2ff58642515868c697d6fc4d35780a5cf7aeb39157856a8d52ac2d37b0056085b12302c9d37543cd25945f1348a37ce1b2ac30aef2a2b9f5fc287850f66584cc2e2c82d9c73328b171ccbc2a54ec490a42424269dba74e65276924ab230261611c7220b230b2396294d64324ce75319335f5e888d5c922444628d18c32e91e9249d4e9ce5459a9a51e42c272c02499285ac7189f0609c4ea789e3e1f9b989639ba64efce4a0880c0683e9740a1307edc6b9be4d593858575c38c98dc9a5c7d29cc3db89289cb8cc3d7703dcdce6b99b73c8e506600a60880158442160ad8e22e125a695918cc6986221df3e84f7e6660fdf09b0688d239adcedc56cf56a883b1cc89261a4162382429826fe856a7dac8022fd001d96101347268a4d9cb84426240b66b28cb586c224cca9b1629898524ea7247362b6c49c8a4c85fc8a406bada4298f47c4864562f26b1549284d2d1339e1f99cd2c4588e99709d8c101b12474e6c1c33899b4cc6b3599e92cce773668ea208eb9f8b6ce8364c6a3303ba3dc30a5f6c5d9eeb72dbccb03073e553524e2e0b7340e5293c15004b81290f586f690eabce9c01acb0938748514c93830329cc1ede0671c2ac3603566e421081bde916ce550694601db5c29304765b087af517add6c70fccf4210c0bf557afd5b7b776d234319121839584e43d5661b9b231d6180bd6ede03a46b5e8c618598a0f620cdc2e18274ed2e5021fc0a2085bc3d69ac81812af262022162676c28e8dea1ec2566e8c49d3d418d36ab5eaf57ac868680d9fb2d6c229183e30071940bd501c5853b699781d6cd5284c024b45bd6503530bdf734dca250214eecdbc48983807493e868b38b5ee3325231ee6670937144b0eb05cc10e8b0218caf1350e745e7a291742dc29052f7d44ee5994559f95824ef815b9f8e22768e6bf50ad0f0c28c6f76158488fbaac37eab57a4d30bbc498f803c42c57145a637939fa2b172066b24ba7c68660f5b9ec1ea2d69e41b734e47d5d596662b65641449676abc68aefc939c0428ce696635592e54a783a7cae96b22d6d7cc6875cb1e46cbb74100e73509fae1b720863d6f1af1cc3625e6aa0e08823cc21fc59440de4e4d9d6929ae5c03497610e320a19521849eb8356533165115c8a58933b4a6086ae8943c052d80a4b2fb4355566a4471dbab4cc43ad564e9f4505259766bba1108a2187d1bf04f24df7fd19967645a88a489694092dd689183236b2c698f96c3e994de2386e349ad6c2df0bd9a506878996c48a88c6a3d16836a9562aed4e278a22d87519b8c812379d4ea74952a954aab55a14c7e29c9018364cc6580bbd4b0e9e142ce03ca77424d7104511330f0683e17058a954b6b7b7a3285a2c164414c73132994c26f3f9bc52a9b4db6de8c524eb333e57c4216e8a489224c3e1703c1e57abd5adadad5aad26c13211ca020a15e069f3511916ada4425c5deaa43499e756ab5b71d147e571aaf84a6b7e7e7c1a11c2eb06c092c0a74211b064fd2ca10e429a0917f82c65b123875c61a0a0c9218410f90b007d5010910f9b25642282ff2ce7dd9346518496315f2cc4b96ab51a45d1743a1d8d46b55aad5aa91a8e5dea88480c69e330ce701c3be7aefb83cbcbcb4ea753ab37ac8d160b301d21a2c562717979351a8ddaed7614c575b6f0ca668c303b138c60caaa72af1a9ab9e7f45668a9511411d17c3ebfbebe6eb55a3b3b3b699a0e06036b6db7db8591c4743a1d0e87f57abdd56aa9e4b881b529a6a3edce66b3cbcbcb376fde74bbdd6eb75bad56178b450879a56fbee198655e0026e59ae5ec8c0aec49effd4086551ac2be5a4c5c244ae1a5d298f0d121d65056ed551acc9a853b211592826516ea0e39e7660629a0545060b9b2805772d985d9bf84770bccfc7e0c2b6ca6699a2e168b344dadb5715c31c6c4719ca6e962349a4c264992743a9d6ab52a22206279bd0f243a63a0dd5c2c16d3e9b45eafe3f596bd878d884bd3743e9fcf66b35ab5b67a6121cfabcac7e11038f002ec15499a00f17a57bd5edfd9d981ffac8b8b8b972f5f361a8d4ea753a95444a4d168586b61db45010892b753a5accf130a481f5e0f4ef4c1ad149bb24c87280b49d92a5babcf0a745219c0ca1d69a950673df1f19acf32a214b036c4bf35bcdfd0f821b971b056d105f377e179d89ed5b2416f0f65cc5cce5cc6d6b92c50d02a6ed3dd6e3f1efc7c026aea831816b2489264b158786e554195cfe7f3d168c4ccdd6eb75eaf83bc2897d1d1062dc35a823705cce51111f24c93c45a6b0c13595c8de3388aa3288ac46b8222b3749a4a44203239f6c45e49016025a2288af0b6f89070188ca2a8e683885c5d5dbd7af5aad56aedefef379b4d634ca3d168341ae092a078aa90823e1e72253e01dc939961d18a34711ce3a7bead31c6189ba33ca5fc483b4929188988d6e4ba1cfcd50d0c8bc26e52c4d077ed45b28661157bafac675892e553c5188d0c4f24a05da5f48a0a16f07aae4ccdadb7c392820e8bd7302c66463bd12fdaacd57a570ef1730868a81f612d21b0603e9f0311e6f3799aa6e3f1783e9fe331b3d96c3c1ec3e12733cfe7f3e9749a24099a0566f1b6b7b7ebf53a7e0e87c38b8b0b309a5aadda6cb670231e8693e9743a180ca228ea743a90d444a4ea43d8b1f17ae3f178381c2e160b660660552a15a8a8e6f3f97c3e37c6349bcd56ab9524c96432a956ab711c0f87c3c160301e8f9f3d7be69cabd56a488c6d3bd234edf7fbc3e110c0144551b3d9ec743acd6693992793c97038840958b3d96c341ab55a8d03b615628a3f09ab878a31ece7f2d6d7685848ec496a9e6105e7acda2e9f3ebc5acead02807b3753a30d29252b814ad9245d9840a97a3159980905d090833ccda114e3288b989a5bc89b24bb2e3a37aee4e2117252e12f1ceaf6e143191682d61cd04a44e6f339181633572a1563cc6030383f3fef76bb0097d16834994c9c57588e4623e75ca552a9d7ebd815314dd3d168349bcd902d11b75a2d2476be89cc66b37ebf5fabd5aad5ea6c36bbbebe36c66c6d6d01ad4ce092015cafdfefdfdcdc40744500602990d5eb7568a92e2f2f9f3f7fde6c368f8e8ec8032eb45a40a8abab2bc88c8bc5e2ecececeaea0a42a5b576b158c4715cad5689e8e6e6e6f5ebd783c1a05aad76bbddadadadadad2ddde64302e154448cb144a26011b6fe22c3527ec4ac5a2745ab108656b59303ac620c85b7ad392ff6ae10b0d6b5a25b322c1d5d421029dabb6b7a9dc7903285bae29d48dec94c0e954213130497358008f914bd8d619960ed8ecef36853d7abcab68a50fb0b7ead0b28c38fe3adc1f86d69405e9c73305642ab52da4544800fe75cabd5aad56a49924ca7d3d96c063a06512b8e63ccc1cd66338097b5b656ab4186d2ceecfc9619c3e1f0eaeaaad56a55ab55b018bc00a44b70b1e9740ad284fcf5adc0b99acd66afd7dbd9d9a956abce39cce2351a8d2449c0fb767777bbddae31062f0c4d397276ceedeeee4284acd7eb483f9fcf87c3e1f9f9f9e5e565a552994c26699a562a9556ab65b29eb9f4835403956352ca7a7c7a0af068c5b68264acaa777d843e287c6eee24fca938988bf4f9e75e894be38b61736f34c1eaa2104db2ef500e7f1ca893f4dcf82d4836005678e20a26112e50b916bbc95b3b4ed85c8b3f956de9e3f4cd735ffd4ba08fc5b050b2200ed56ab55eaf57abd5244966b319843e6656f513d8ca643269341a3b3b3bdd6e773a9dcee7f32449547b1dc771a7d3393c3cac542ad8de75369bcd66330096eaa4aad52a242f20489aa6d56ab5dd6e371a0d64c8cc50752d168be170a8a0837d28168bc5cdcd0de84fabd5eaf57a7b7b7bdbdbdb49924081d5ed76f7f7f799b956abb5dbed4f3ef9646767a7dfef5f5e5e56abd54aa502eeb6582c5aadd6279f7cb2b5b535994cc0b3269349bfdf8730d86834600c311c0e279349b3d90caded4d108a0ccbd38d4c8bcfcd21866c0b89712a59098bb28095bbba2e3e7c1011c1cb55c8a7de43a2c971a8b0a36a7c480043c644d9ee4d01b2acbbb46ed230f7689d0194acad960b66096fc3b0d6851cbd429987448c6e017f3ff3f0711896de0e48aa542ad56a1544890afe6a89080aac46a3d16c36dbedb63106ea76cdcd79efc610d944045b906953439e00acc964321e8f9d73ed761be425376c8ac87c3e1f8fc7101e615a351a8daeafaf2121429955afd76bb51ab466e13be0858d31bd5eafd7eb8d46234de09c83fe2b8aa25eafd7ed76019d4992bc7cf9f2c58b17954ae5d1a34751145d5f5f5f5d5d4135860fc11771469f8512127f2e4aaf94280527995af4c996e9c3cad4ab011163649e63670a08b4042670340a4e42b55a29ac697a1259dd554cc759295582359ea5e94b73a0408a5c3e3e8b47a5c4aa0858b46ac342b4c9a3034ec2316373c7e120843f73094264cce5f90bbd0a03caff43edb0707bc8148032618c56952211e8c96432512216a6141168b2c4d337dd03556700ebf53a00623c1e5b6bc1d78848b955f84468c7903e8a221025d816404894a59b8724c4561181aa0b4262a3d100902d67f5ac053a33f3783c1691cbcb4be8c886c361bfdfdfdfdf3f3939e9f57aaf5fbf8ea208f65c5110b2df653d5e0873cedf7c48854ab45aa84dad8ad028a1d83dfc798e61adf4f4e4014b44b492c31cb260416580c512eca6c9598493405725657aab304d6ef829bdba0eb0f45211adc21b5da0b182c55fc8b3747a31a45412b0b0db33acf01c417fa2b587e01b76b1cdb0f8f30928b40fb27427222002ba22580cb815f453501b61135340c3f6f6363441575757c3e110e21233630eb1d168b4dbed7abd8e897fd0a84aa5d26c3681508bc502d36ded761be465b158b4dbedfdfdfd6eb7ebbc71033e0f27fbfbfbf57a7d3c1e4fa7d3e7cf9f23b2d56a359b4dbc2aa4423cd45adbe974b6b7b7a1113b3838f8e28b2f86c3e1e9e929b460bd5ecf39d7ed76dbed76a55201613c3d3d45b3031163668032661887c36114453b3b3bbbbbbb9d4e4744767777f1b8b026684585708e619c73221d3363df467f2b922dc18559d3af6e03ac04e3b9a6d4a7eb43894817f4e60732ff02a87df2e9734480fddf5a657c18af6a26ce4ef6e9dbe6869010e66e035822848f0e2e865c86d7dd484bbfdbba33856176222ef7027cbba05f146290fed450940d737db314d17e260105fe116609a194c151442093475154ad5631eb67ad859ce89c8311d3d5d595f291e9744a5e836ead6d341a303445e5619e112803d5bbda97a3892f160be755ec18a9546500b6d56834eaf5fac5c5c5e9e9e9e5e5a531666f6feff0f0104afd2449a0d5d2ace238ee76bb954a05faa9fbf7ef3f79f2e4f9f3e7d7d7d7f7efdf570c25a246a3b1b7b7f7fcf9f367cf9e254902c1b05aad9e9c9cb45aad67cf9e7df7dd77373737511475bbddbdbdbd46a34144c6184c38b0b79f56a3300ee8c672c11311151cd1309b5c1f9012ce55cec54432dc8a280432821e0d69cdd261ec4aec0a81a6549fe5cf4d56907c0bb7d2af2b15b572e7616eeb008bb2dc2a773597c63993bbe4ca660ce96dfe48370734306d9c1c10ae501651c1a2885cbf0494dbfb332c34384876500641cc419382225c44000a38a6695aabd5d234bdb9b9198d4640282cd6bbbcbc24225dac074bd4c56281bb6097008605ab887abd9ea6e9c5c5c5703824a2e7cf9f5f5e5ec2a222142dd99b56dcdcdc5c5e5e5e5f5f6bef8ae31873976acc09d970341a8dc76388abcd66d3397779797971717173730338c3da9d7ebf1fc7f16432b9b8b800f862eab0dfefd7ebf5f97c7e7676f6ead52b2c4b04144e261368d0e6f379afd783f5bc4e7dfadeb83ccf0de0c59ac3291179c593928e0c870a74554b051973c88f988359c8707230942bb585e45e2604ac200669f2565aa54099bb54dac6f4a764955685c424a2c467991c6973daba10ce8cc90196a3e5ee274bb6eb4f96e70185842dd8d28bb72af882bf55c8951533876e6ac2a290603588f6cd75e5f3f30a22f2210c4b070d689ad5c25b336766689a11033302ed57c0114d06dd398c2160685a24057a1c0e872020d3e914537ed013c17222ec06613b20224864b09fcae59feb452232180cd84fee801c5d5d5d6986979797fa2d584b4444002fcd01e40ed9c2108c9967b31911596b61b48172535d0905bd943dfb30819d51591f208539e544ba68d27ffb32256e5dfae6097a0aa04acaf857780ccb27773588316f4da30fcae1919e97a61129110683bb805090f89c5e09d1085f1a021620ded32511c1fe4ccaadc2dd71b04283f1578c314b57a54bea94a679bfef26f0686a028b2d55e01a6f0654e459bf6016dadffb30acb0c340c1049e124a2e4a71c53bffa460f4d0e578124c02eaba167d25ad481d0c75dd1f15802987bc1a831b311b084004b16266585a04ad5354a12e817bdc4a25ae54aa22b25824222b8fbaface984f14bf4c07f126580aaeb22a1101973b9d4ea3d128b642cd165396b82bece7feeb94252d1def0071a2c87a0e25ce85fd7f055be4314e9f18260bca2f47b8f2b4a8d82af07f2e263ce6e2b33afbccf5ecc7ae4448ffd329832b0096c6a09d942edfc165a551219f42d0c2810e0b791aff02e40b877285cccb9598ec5f3278b39291265305b9cf09a5d1f0eacf17b944e4bdfd61691bc2da3aad0c93f53aa0f564cad6f7858fe660d3407d90f18b96c398d263f844a4d4c5c9e113f5c3c398628f2a3e17ea790a5a8ce62c4bb182001c61fc3a180d674e7549367b3687f42a3284f3a72658d6533c42f1a4788e9bf4b91210d5b006834ec8949d100c8b2577924310f26027a222a1f6eab50c2b77cc3d3a1c997269727ddb7f9aa872dd33ac758055fe13c139832b54e6955439149e152aaa88284d570c2b5c5668bc3d3dced5af43eea8cd1269f0ed2ef0cff5b30eccfce17658e01160466a19a05880c9beb089e7a04a3b6dae2b8660a45a1ef26d5775a07afc900000200049444154f05406584809ee638c81a92a8456b0215833cc6633b538c58c247b2a87cf296897f02c81dac218cc451ae75266b6d6186321cc420107335a68f443184573843e0ec515764b9035986ec5717c7070006d1d789909cc2015d7dcd26aac92a6c9703882985cab551b8d26161ba9d103910a83a47d92bdd6890347c901ceb2d7ce94231765018b281c031407691df332869d5b1e013a39dc1411635881d15b782187bca888832fed156051007f01ee8852517f5542640c6ec72be955cc188a046312337b8ea63f5797c2f65f5a0e1a9f4b1642db87f4d3bf8680be992bc4b706ce06f15eae4504d0a032390ca02898f0d26e9f03acb09272cc85fcd812ea7730f8e43854ee5e75d4058bf6f97c0ecd3ad62dd76ab5f1783c180c602701e3753c0b699819b301d65a955ce0183564522abfcce7b2582430cd9f4c26711cb75aad6eb7ab1382e44545fd8ab01895fd01e066b3d9cb972febf5faeeee2e164b623100123bbfb52711c186be56ab6d6f6f13d1783c1a0c06d64644dd66b3e5fd70a541e9710822a804634ca8050bb555fedbf35d4b4a18d65ad18f9640b932e5f728503e6f587a24bfde28e8b77aba8c570b06654e21fadc12b0f0333c0f0816f44aaa4370ce65e60dc38944635697c27585d039a071e6b45aaac3d25601aaa539fcac318b993fdce3288a188b01a11bd2ae88e5d06a8d157a74d1341a135262c00d6a8b0a6418f1bee994074064bfdf0754211ff8de832105d621c3b5031c78212533b75a2d104309b49ebef540b705b37b8b0e13c711115d5f5fbf79733e9d4e014940c3f3f3f3ededed83830358e1e7be54c54c66c6e3d4a0bfd1681c1d1d81128a086630c90bb38acb986f7df6ec59abd56ab73bed766b3eef1091b551bdded0d59dcea500166b8d12101d35f492b591884b92c4b915230b2026c39574c4a13c60651a983fa28131ca803d1909730e8f9e6d15f917790a430a3e592073fa459b01cb04f318b97942fde91c8149313b632854c633434c4bb18bb973c02320a66376ccabfd80393708f89209c54375524459f508821a51bb9fb3b98388bc2bc30a4901f9921511884244047b2bad7b18971bbfcc45e10c25ae2a761d6d427f525aa9cedb1cabc32cb00c159400856a08c6cc6a9efeead52b63ccdede5eabd5c28264acd4815da8122b9829dcdcdce03d1b8d46689c95240966093ce62e1916be428ddd5fbc78212277eedcd9dada9a4ea7979797b06edfddddc5472549a2eb1cbd9386d5c2403c88fd3c06d64eea0af02449c803967ad79acd66e7e7e73ffef863abd5dadbdbef745a9d4e1755005b2db5262122ec651bc7b1b54ba763699a2c1609724681636a02996b64ee18c697a55936ae305e0af3bcdae56ecfb0c27c54400b9a138ee8d5e2d5e11965b63e5463347e4d58396ed7288d219234b5605b696a436d17f45ccc196f0d9ac078974a4ab814a134946a3075f63004afcdbdf5af0adade8361052d66d9f8d411a80b5cc484650a2871ce0d0603acc5035f80dac85a0b4b2ee87d6ab51a6428d828c06409f5648ce9743aed76db39a70e1e66b319e2b7b7b7f11409442de7dc6c365b2c16f0e2b0b5b5d5ed7667b319d458709205eb8a7ebfffead5abc16000e375e71d30cc6633601cc84ead566b361bcd66338a2c440f638cb5c6394992643c1e4d2653889c4747473b3b3bf0d8050f108bc5a2dfeff7fb7d586c844aaec56281459144d4ebf576777761ead5e974eedcb9331a8dbefbeebb7ebf0fa7cc44b4b5b5b5b7b7678c79f3e6cdd3a74f5fbe7c8985df49326b365bcc2ce28cb1711ce1bbc6e331164b56abb5adadadddddbd46a3b1582caeaeaedebc7983f7198d46a3d1687777f7abafbe3a383840b596eaf8c3dacfc5e8d88709b22cb3401a954c9dce7212653894569fe44542d5ac61f592035be4e5baa2159332060d756515a1c254e9b114aa3c1862b02c012c1151fec5bc52c66b20ca2cc7d11bb5713aef678602ee9ce304c5a043f86d3ae95f551091f7b6c3528ea0def8a22882d911a418f272194609f4c08b8b0bf63e4861694944c01de400abd19d9d9d4aa5029282eee49c83460c59e9b21e0016f4faa1a64cfc0c66afd7ebf7fb93c964329960c10df929bf376fdebc79f3c61853abd560c83a1e8f9324a9542ad0ca4f2693d168747575359bcd40916ab5dac1c141a3d18ca24a9a26ce4127c54452afd7b7b6b6d2f40246a7474747fbfbfb30258da2081eb55ebf7e7d797909ca09f6042a371c0eb1b6b1d1686029f5e9e9e97ffcc77fdcbb77eff0f0703a9dfeee77bf3b3b3b7bf8f061b7db85e92c9cd59c9f9fc399579aa6af5fbf8ee3a8dd6e1bc3699ac2ebfccb972ffff8c73f8e46a3c3c3c35aad46c4878747f57a238ee3c160f0e2c58b172f5ecc66b34aa5727a7afae4c993070f1e3c7cf8b0d96cc2854ece9f8f563dbd0db0720c4b45c222c3d27b7d8c72b1d5223e4879e225592f3c6618530edac4e30d652129f753f32904243322692ed2e34e9a032f570836d80eaea8c30a9764a82fa61cdbca9d2bd2850e1e24cb55dfb523ff2585f76058b9db255833acf29ae294ae4006ae4136c1d29676bb2d22f0b8c2cc70a0ee9cbbb9b981a578bbdd9ecd6617171793c9049c4b7d138fc76318b8572a15789842bc0483301859bbddbe7bf72e9cd8cc66b3d3d3d346a3d16ab5b6b6b680713040478be976bba051f0b4678cb9b8b8b8b8b8e8f7fb607f22827710a1288a9dc3d8b8d42f74bbdd478f3ed9d9d985c3afefbefbaed3e9f47a3d3cabdfefbf79f3a6dfef63dd62b86e693c1e8fc7e3344de188f9e8e8a8d3e92449727d7dbdb5b585120633dddddd3d3a3a42a1bd7efd1a0e2a0e0e0e0683411cc7c7c7c7dbdb3bb3d9743c9ea0abc7719c24295686dfbb77cf39777afab2dfefcf66b3d16804f434c61c1c1c743a9dd96cf6fdf7dfe34decd22db54ef3a9a0b7d25eadd15529932a07b542fa7c64f16a685c222542e28acd49c16c9d826efc5e8045c189781d16f9636699740ead7231266b26aa9c8b02cb89db00963146457809786258687fb5b02522efc4b0b4c828cbf6cdd2c07745bcc95b5186fc169e82b150193de4e6e666381c763a9d838303f8937af2e40984140a6c1a202742eba415cfcc90836081a97a680e14f940340016f8d47c3eef743a272727bbbbbb30ce04b3830face974cacc878787fbfbfb575757cf9e3dbbbaba1211589c625661b15818c35114a569e47b0881cd55abb5838383e974faecd9b39f7efa693e9f1f1e1e7efef9e7878787d82c274992bb77ef82ec60e1d1c5c5c5ebd7afebf53a0ae1fefdfb77eedc71ceb5dbed76bb0d500398eeeeeefeeddffeedc3870fcfcfcfbffefaeb172f5ec471fcc9279f341a0dec33f49bdffca6dd6e3d7efcddebd753cc871a639bcde6ddbbf78e8e8ebefaea7f5d5f5f0f8723f43aac289acd668787875f7ef9e5fefe7ebbdd3e3f3faf56ab711c19b39c13c831aca0d2f310462bc0e28025add55b858d4aa12704bb5cc3d346c5ccce893e25074c0a58da148d31488f687a1b606513a8a25d02c05ae64f192b2d49532792aa600838d339c49061a98aa308649b01cbf8e5b15aa4ae4c8d152a46ffaac23b31ac62c3c55d6046582da89eb0b40e20ad4089ab9ed4a1bb21bf72109d736f6f0f2a6aec09864e7b7c7cec9cab56abc3e1f0ececcc390702727474e49c833075767696240936b351ff30a860a8c01a8dc6f6f6366c175ebf7e0d49d31b28ad8ce955addeebf5b6b7b7e1308b99efddbb777070c0ccaf5ebd027ef9e2426930bc1b4f26a3d168dc6c36f7f6f6a032ffe1871f5ebd7a05ff13d085596b5badd6f1f171a3d18044767575b5582cc01fb7b6b67abd1e26077446556409d9f8eabb77ef4551f4c30f3f0c8743203894868d46e3e8e84ea351ffe9a79f50e0c618b816a856abd0f1a193a08866b3196645ebf5fac1c1c1f1f1f1c5c505b635f3b6f26c2d2ff7b7f5f50eda85fadf085814a60718414b55da96724016c688f73311c673c6437406b0c2fc45c4bf2a608888566ed7cae0a9340638b83af720658824589a03b99503c012e78c021617dccb843c2b100f9717fdfaf63c60850c00e015bef9ba9e7b9b0efe171044e4960c8bcb02e2d58f283459e160826586502b82a4a013ea3a15e017d452a3d1086e1b743d30dcbf38e7a6d3e9d9d9d99b376f98f9f0f0b0d7ebc169fa7c3e7ff3e6cde9e9699aa6c7c7c7954a458d836125301e8fcfcfcfe13a666b6b0b1e5d5ebf7e0d8d72086da872dc3e9d4e61680ae9f5e1c38777efde252278ce811e8d08d68cd61853a9c4cec968347afefc05dce01c1d1df57a3d630cf44700a07abd2e22ea21faecececa79f7ebababac28400a635e15b55fcec2134faecd75a0e0683ebebabc160001555ad5643210386fafd7e9a26900103435c49d364369b625a83998c59ae19c22640308cd0d9005d5114c7d162b19661a1f9d00a8c947423a578a8ca9071a503b707acd2781129c618c358252381268bb29a750ec4c97508450508cb05573663e89cb336140f53e7c4ff958884aade0a5d8ce0843931c6a4a941c57af39e12c0626f0c81acf4fd39e013c5defd170c5eccfc512cdd6124098cd0e5c1681910bb804a2a651011b4d1501589c8e9e9e9d9d919dee4e8e808f1f02405af09699ac2798ba2db783cc60c20a44213b855223fe30bc385d168f4c30f3f80828d4623630c2607144f1163adbdb9b9b9b9b979f1e2c5703864e6070f1e38e746a3d1f7df7f0f91106e02432a47de24328a62f8e7fae69b6f5ebe7c8909044c6b62bae0d34f3fbdbaba829777dd32bad3e9c0c905a43f7055668e22db6c369b4de8e6dc743abdb8b8f8ed6f7ffbf2e5cbd168349fcf1e3d7a74e7ce51a3d1984ea7878787c3e1cd6f7ffbdb76bbe55c0aacf4255fd59c31062c162933f77abdcf3efb0cdec47ef8e187376fdefce10f7ff8e9a79f7676765ce00ebf383e05c7fcaaa630a5675e44019059bbd2526553aae5faf22ee046d85029034fab9c156288d85a55dbebd20209f450ab95e13980a295864b44de025839a8c22facc809b45ac639d1c5cf12b8002c15034dd67014271874bcf370f884c807a48756cbfdd59b958ac847b17437c6603b1cd879ebec12f447d0c5607b7722d2ad719819fdfffcfcfcf5ebd7a3d1a8d16840afdce974e03ae6f5ebd7fd7edf5abbb5b5757878b8b3b363adedf7fb676767171717101befddbb07c7c7b096c25ba1fab189ceab57af5ebe7c092fc9b039d8dedededede06c99acd66e05fde47e0e2fcfc62381c3e78f0e0fefdfb83c1000054a9548e8e8e1e3d7a04a32a1798cf4033b2b5b545442f5ebc78fefcf9d75f7f1dc771afd73b3a3a3a3a3a8202aed7eb3d7bf6ecf1e3c7cf9f3f27a2bb77ef420305b38966b3a96eb644a4d56adeb97374707058ab2d4d222e2f2fbffffefb8b8b7363ccc9c9c9af7ef525e46266faecb34f1f3f7efcd34f4f9acde6679f7dbab5b50f3c851d43a3514739349bcdc3c3a3e9745eafd7f7f6f68e8f8f5fbd7af5fbdffffedb6fbf15911f7ef8e1f2f272676747674e42a65606582b90ca350c5a39f0d3019fbd38a96995a915f32c07ac8043e1aecc9c20afd62d860c4bbca12c7b3c2a356e502bf9db861ccf52600a8faab612bf885d258fe068955b05baad546d0cad4d315b650c1b93eaee07086a5fad467c0ac3b93e4b01e7a2bf509ef57e0c2b876e68a368dcd0c5a0109919e64ea057908974fb060cf891df20079e8ba1a941bf454ca3d110916ab5bab3b3b3bdbd0de3296606ee0092f6f7f7b1630da6b7c27743e65096e34d9acd26acb1a06eeb743a8bc502760c954aa5dd6eefeeeec39c1d284344dbdbdbd8bc6b6b6b4b77b14e033f36e2cd47a127025244510450e8f57a10722b95cacecece6834c22dfbfbfbf03b5aafd767b379b55a41b224593073a7d3c1b617d56a05fb09b5dbad3b770ef7f7f745687f7f1fa5319d4eeaf5fae1e1419224954a5cad56f7f6f6b6b6b6209bc7719ca62e499246a36e8ca9d56a272727f3f9a2dd6e031f61f0f1f4e95358811d1c1c3c7cf8107b0549c12c880258f1f26611c23838928a8d3e12cc88c34614b0a70c6031af3a95a60ef7dfc801960819a3aaf710a4149248bbb30738bd770558444b8b53a8d8c19b8a5065569b56903773cf011619a32085b902e75c8a91ce39e78f4eb557fa870e84bba0ccf20c2b2f18e68613d47baec396f6eebf48d81291b732ac70202d1d6c15e98908148682a91f9838a4de95682e9fc562618cc126a3e22db64404b37560672282311fc22011014ac4bb70511b167d61e53e88dfd9d9817d00f36af28b88a228827b2cfd844aa5727474b8b7b74b4490012b95ca975f7ef9d9679fb1d7ca3bef1e4785263dd66ab5e3e363101f1bb897c19b3373a3d1f8e28b2f3efbec33f16607f84c74365a4e69a5c62cbfbdd56ac571648cd9dfdf6b361ffcf33ffff3fdfbf72793c9629130d368341491388ea2a8f9d9679f7ef2c9230c12b917d3328fa2e8f0f008f297ae6583da5e44f6f6f64e4e4e7ef5ab5f6d6d6da5694244c84a2b4b963a6c550c2f2126548a17008b680558aa3ecf5f0d1a0c51005e1b7a1a07da28a20cb489f7dc4005ff331c90a82cd821863cb200b06081b5f4632379317089412292a62677d51f433b2c388f331a1ff22c63d83993a6c639ab4c2b4da1ed5aeab98c31d6a6d6bbf045d049430ec4430fbbab5565b701a6bf00f062e6f7d661e530ce055bdd04834fc60359d10a117c444ddea1c14105837c61b68bfda2045558aa0adf054674c537c43be0add08d0137ba83bc4ec639976285308cf5013149924491857a8e8830e399667d045250d3d65a504818a0a9bb5409bc80a92b77ecb8036863365e5a59d685bac977cef57abdbff99bffa7d56a83af351a8dd168b4582c207a031031074a44a1cf55c562f1663e51141b63209dcce7f36ab5faf0e1c366b30955e0d1d1d1fefe1eb47b00b5829697020ccc41552812e6b6025adee9a7fcd48310f897513308f1b6efe04aea6a2a6c6bb98697ab020556590989e580452b238955c766163fab289e58b10216889bba540e1eb7b4532fc29606ad0ef1e2a109cc1a8095a126cb1836c661d8656fa9a323716995e8989deb11a56db5b4bf6c4ef03f1fdecab0ca1b69418da5312202fd5f69322d0be32795d025442494c0b53e141ab49e3467dd268b3d77e060e0b5c126146891ba4b2b7b2f57412fd225dce4737648a338a5a67ac6af58d4373181c12a11c1f81e8b5a9cf7a9804bba300052adbe217918f5df2828002466e6fdfdbd9d9d6dc4604e436469acafc592fabd3c2868a0e10706fe6021ce3033c14df3975f7e292bbbdfa57217060da5755d6c0f618c312c520e583ea5099b9b093c0285af1d369862ccbac005ce4501cbe082ba9d03cf2dd9ab226254175f34e042003059bf16ad08580a5b3a6eb9824d96f336f1384f92d4b9344da3344de1e45d19969ee7948ccab65002457d96b68410acc3a6521afeecc08b99730ceb3d5e31842a188ea3027413e65cd3a1a0b0b4bc42f4d1783fcbcb2a585150c4dac973fd41c9851f333355a529cdcab1147917029af1eaf5c47b50c83d5d3f47bc6d847e48a8e3b081272f244e036f168a7d5a96e173c5d3524cb3027675915038cc8a67b25a4aebaa89889c2395bcc03d418a416fd3348110e4312be44d9a077316ca287b8d0b577245973bcfd56031bdaf1d7e6b0be5ac3048c10d521003f5e99ee6ac443f221231480ed8a10260d1d2c94c66a3b0d0a3439aea79de819f4298314b85469a3a6340fc8da75996283566b5c7b0c296090207c6a514f86e5258dc505c7f7690f49620b2816195b6aa62dbd2d28191811a58111164ba5c1ba76c7b3759afca5afa4484f534509c87da74cee25ac8bf28e839619e1c2cf45728a1405d42decad12c2dd743afa18668398ab2e780e1fb13858648143e45d3284869bcac5cd6e00dc1adc823e02a67110129cb9567093014804ccf7d392beeacdc87633d262d195f44ab2d0ecb1fa1c55bbcba219ed70056b1cab40073dd896fcdb034b7dc60cc05fea5e95db0346f3de7ca01d672d4cce9b664c5add2c0887415547ba5f149028615f961436709d3348dc0b9108f23b40139868573cc95eb062ea187c8b0e4b3d05c5eaafc67272432bfaf0e6ba53a451163264ebf1fe7d8264bd7cdb09780c2ae48815ca301ae1a86c3e1d5d555abd5ea743a711c83f15aef1b3ee884ab16af31e180a354c564179a65bbc98afdf1528762a2c8c2510991d115ddcc1c9edb6033ae50db6dbd577809dc31e3b978b762b15b6ba26839472105e28676a9c4305f8d592841c8293b00533966245ea5c2dee11792e17a36e7fc43ca808995be7d2060859fbfeec6d210e6a6859c832ac90a89ebd27b7bae0c4889f7d297fbcc00b6c8fb78201193032c11a8d8573a2f453d257a6821ce39282198970a5665585a4790ee736c4b5f8abda4b28e6785e5b911b6fe4c504be4363aacd2a014006805d370488210b3b1dc1f16d5ec2704156e2890e9b4dad026a06e17919b9b9bd7af5fcfe773ec84aa2975d21d2b69540d147a8cc28c9e8880f4b1177f142cfc57a8a74d27e2d23449d3a576bc52a9586bac35449ca6ab7d2bc8af31c2732108abe8aa2408c3a09a17a8e4856fc4d0874f8ea208b302ec1d66a95e03778593155a62d9bac81b1f14e3fd55d6b68e2a2e664e997e98b9a291c5e6e15563797191b2ac278cd14ca80cce7231efd4633800a030071da87247bda514d428ab52506e229e8b1579966fcc4cb45c7b180a68457d96094c49ad8dc0a73cc3729e61d9509f65ad5d2c8c5fe790615b61d3c0a7a9413c65b1271cffb457969628059ec5fee702f38759baafc836d612022630ad369d4ed55814cb03adb570bc89ceccccb042c25660ba56066c564446a3d1cdcd4d9224d8d259f538d0a01311dcb300cb66b359bfdfc7aa175857203d66d38808465e58a663b27a2ee49624e970381c8d46d85ab5d56a610f6a66331c8eaeafafb11119045e787420a2c160707373039481b128ac5b61d904a689f78435064a06ae506104d86834767676b7b7b7e6f3f9c5c5f9f5f5b51a1c6c6f6fefefef63facf65e77d72308468f43bde148cc2106585eb1cc414cfc3c8e26b14555ab406bcf4def0840b8095bbfaae80159068a62c60e92b699ee2c57cc98a81bc06b034c35cc9e47010ff63810e110394f45ecfad562b0a8318c34b1c34982b444ca8fd802c91a6aa4581b9c96afda6d632e444a5ed52a0e75a08ef51d4d9f0a786b3350c6b7da30cdf4ca0fdb1d660221f9d135ca35eafc38214fa72f54d8c9b6131806523cc0c570ad86414ab0bc997b2736e3c1e5f5e5ec2bbd3743abdbabac2d23c64beb5b5b5b3b3638c190c062f5fbe84bf145d6ca88321321c0c06070707980d90a5f1e7f2d39c93d96c767ddd3f3f3f1f8d463013dddbdbdbd9d9b136babebe7efaf4e9cdcd8dced1a4695aad56a7d3e9d3a74f0783811275d80aa469fae2c58b7ebfcf7ed6b2d56aedeeee1e1f1fb7dbedc160f0fdf7dfbf79f306b6b2bd5e0f4abac1a0fffdf7df9f9e9e8239b65a2d6beddede1ea862e8d33d572fb76758c6c07bd70aaac80bb6c56c793d78ad6b1b61ca0dc7d266567aaeac6db3f23817bc3c4521a628f1d1a7e43a30af87a73046f185b2b242518705b1d1794b77bdaa6c2be0592b7f01d626ceb9284a559f858e0086e5799649d308ed308a922449160b0b1127491228b58cb1605e0b1f389812d5935c5187b01e5cd5fa5d15f2ff04db622e655821ef2804c99ec034c1b6db6d2c8e61e67ebf3f9d4ec129e02e1dcc2b49929b9b1b088ff078055352887e49926c6d6d811c8134a90b6398bf2b2ac16cddf9a9143c0513945114b5dbed9d9d9dd96c76757565ad85ff0311b9b8b8004660937a9038f2ddc339994e67d7d7d7af5ebdbabebe8ea2783299309b6ab55aadd6b0749199b1728588b0973d1c6639e7eedcb9831dadf7f6f6daedf68b172fbefffefbf3f373bf529ab6b6b660fb9e24c99b376fbefdf6db7ebf7f7272b2b3b3d3e9743a9d76a552b9b8b8fcfaeb6f5ebf7e7572727272720c8b7ca01565553365caa99250065826074a94e5595480a175e79b7f961e43ca435960cab5cae255dc78fb4e529a3e54e4f3fb021605aad2b00971819a89006d1d519eb879c022afd5b26aed80abd61a6827f02cb7b4e333b083f7dc8a60131f6aafc22a2e3613a8f3f593df360cbc0728c99f92671518166707bad226150a1d2811634cb3d9a856ab100cb1a2103bbe405f0eb8190e87b8c4cced761b4640f02280c10118876537d65a10abededed070f1eececec5c5f5fc38516c425220a35416031ed76fbce9d3b7b7b7b2f5fbe54b77677efde75cefdfef7bf7ff3e60d3cc6c0af83f14ee24564341af5fbfdd1688c16389fcf87c3d1cdcdcd683406698fe3787b7bfbcb2fbf04d10325c1c0b5bdbdfdd5575fedeeeec213711cc73ffef8e3d9d9d9d5d5d5f1f131c01143a5aa3040127776760e0f0fdbed76a3d104dcc31969afd73b3c3cc24a2035c4cde1cb6d5855a9d23d387231256d04acdc6b145b4e69644e778e04b94171dd792ef377ed4021e8e462380b58fa56b454ab2f65b7904985f7e61856ee5cd996c684be1c8c59edea5cd46779b60586856d5c60536d9573854c1f3151946158910f3a810859073c2b7893d5e48f72c3a01c967fb729e7421cff09908bf9bdd61266da659aa6ce2d775580e6086eaae0d3324992bdbdbd5aad4644d3e914950d6b72448a48a7d3b97fff3e6e87b60b8b07c1ce700e490a6260a7d3b977ef1e110d0603ac04821a1ee264a7d3e9743a203ecc5cafd77bbd1e96dd2c160bf89e0ffb27acc92f2f2f9f3e7d6a8cf9fcf3cf9d73706e076b4c38f92322d882d76ab5972f5fc2090c3c49d4eb75f8fc3b3b3b5b2c1650514d2693adadad5ffffad7bbbbbb50ae31f36432d9d9d9b97fffbe884ca7d35eaf371a8d2e2ecee7f3f9a79f7e7a7c7cfc4ffff44fd3e964777777369b7df7dd77575757bffef5afb1e01133d9543690ac03a90f042c2a801779d40831940b5856fa338cdc0c4f1f2b6c00beb73ed704d627b91cf4fd437a45d94ecb6fd3f187782dc19477a0cf62556584f19cb5a481f7a1e06d1913c1c50a5531990ad618e167668b05e74b59ea9628c1bcc2b88db2da7b8402c3a26c3b2b6bf499c19c889c4b67b3799aba385efaedec743add6ef7f9f3e7979797588eabbe2b21b241c32522b3d98c88b6b7b7e13a6e341a9d9d9d0d0603f86257bb126cf32722b55a6d6767076b7421e5b9e512dfa58200ea7c7888c72780cea875984e53ea4cb09a505c5e5e1e1e1e7ef6d967f57afda79f7e7af5ea951f1badf52e7140124f4f4f9d73bae52211c1f1d6ab57af3031ea9cdbdada3a3e3efef5af7f7de7ce9df3f3f3e7cf9f4f2613228ae3f8e1c387474747979797af5ebd7afaf4e9c5c5f97cbe383939b97ffffecece161ef1db3164e8b30000200049444154dffedfafbffee3bd7bf7befcf24b7576b84e122ccc6767e2b3e7a1bc50925e02a50fad01acf018b2a7309978630e0afa40aea58519be6bcc6d0267053a3c7d1dc3caa5cf3d37c7b07293360839dd563190675e2658c4139e87f6eef05763ad752e458bf29aac15c342d3b5364953e55689f2ac523b78e3d71ba6c1feace449a57eb8ffde950133fec7f510a973a8ade19d38d0bb54e9c7d897308aa2249961a307a8d289c85a0be7c55ac7ca4bb1f382d637ac22c6e3312858afd7abd7ebceb976bb7d78789824c993274fa047c7d638cc7c71714144400d6c0003f302c877e8db50811111d45b9019f13e216347fb68b55a506f9f9d9d1963aeaeae207842cc1491d168747979f9bbdffd4e44e6f3391cb61c1c1c6002e1f7bfff3d3e04b384272727cc6cad850a1fce1edaed363c4c5c5f5f5f5e5e9e9e9ec265f3c1c1e1ddbb776bb5da70387cf5ead5e9e969bfdf1f8f47c7c7c7f7efdf87838a70107e5fc0529bfb72b4429dae9334e96d7a744d19f6f6f7039acdeded9dd2ebf9bbbe897e48f8519215304db0a888b3d01cc25348b5b8c0b05cd618226052d8288c9ccbf82665afa5b2566db20ce60afd006f43c062af4050cb67c4a8796a88a739bc16ef77ec4f833eef11ca1816c2fac8ccddbc34bfae10d170b8984c2698ad8fe3b8dbedc217b0091613b0dfde0aeb4b408e6e6e6e4e4f4f078341ad56dbdfdfc7541a1101a49e3d7b767a7a3a9d4e1f3c78b0bbbb6b8c393f3f3f3f3f37c6c09d56abd5d2d5337068035736dbdbdbba3c08baf9bdbd3d6885c206847ba1357ffdfaf5b7df7e8b094d6cb7054f0fb55a6d3e9f3f7dfaf4f1e3c7711cc3a1282ed5ebf51f7ffcf1c993278bc5626767078e5fb065ce0f3ffcf0f5d75fc369fd679f7d064ddc7038fcfefbefbff9e69bd3d3d35aadf6e9a79ffedddffddda3478f44e4bffeebbffecffff9ff1e3f7e5ca954bff8e2f3dffce63777efde8da2082a3335c8a202f3bdc5b9c1fc2073296b2e99f5db70356c0f14f45bbdaa5ddd142c3fa9801deba0e45d216673e002b7e28d0c4bd398aca5121780acb4c48a325718a3ac8a3d2343230c8f5eab65bc3e6bc9bf708ca215db8aa2244d139d374f92e5bc217458e013d090ea3916de63989760b9981e3d84653c557096b11679962f43fa93e9dd993fcc0e4b875683b97cf67a68dd6f42e5352d5f753e457e7881df2b226a369b3b3b3b10067567f9f1782c2220655048e9047fbbddc67e5cd65ab80984e92611351a8dc3c34318b2c26aaed3e9e027aad6bff9b225359b4dd858a0a69bcde6f6f636000ea6b0070707f01c1f45d1fefe3e68205e03daa5c562b1bbbb8b784c5c42c3052f865b5b5bed765b1d63f57a3d22ea76bb8f1e3d3a3939e976bb83c10d50f2e4e4a4d96c7efae9a78f1e3d82920bab9a15f1e92d8065d7c49b1c60690928ac84a09303ac30326c3ec51b8bc9de23bc2b997a6b26b76fe1c5e76ef8642a4379e051887461198628a915410576e33500e2f5596a3fa13e705673886058605b605ed6bbf160ef0a0933f8cab6f42b148942d84a0b2e49d65547a16043b5d7470f6b1856b10ec2d6ab3383f82d2244124571b7dbed76bbc815652481f5908e2d70c0048d3baec2f7b1788701bae619c5b7bfbfbfb7b7c7cc40228875784fd54941cc547f5bccac3f8d5fe30e653c334323a0354abe32409d0e0e0ea0ed32c6a86dbab5166c0ee00e3b297c69bd5e7ff4e8d183070f28b080c7eabc7bf7eeddb97307f13055c3d2c8478f1e3d7cf810ef808fbabcbc14a19393e3a3a3432cc280307b73734344b55a6db330189eaf03ac9ca23dac65539885a4b70196f637caf6c6b0fd149bdbed2337c47f48e0b7312ccaf6612acc0c729655852c2c5762aae72a4e5084cc4b1faa0f529dba2c1dda2c571d7a0d57a43ccbdae2bce1f21caefd4386a54b4d54276b8cc1220df5b6543a25aa75adc4aac8b6b480892045fe892652983fdca73b82b5b6528943b15917426b65c0393238515816ba6c85fd4681a81ed4139462126c670fe594b236c9ba4fd1f205a6909f5706ca84251e363e7d434507e4acf9833342f506d5beaae4b17b0d1a01545ae05cf051054842bc5a6fe876b3f045a39c14449288b0a9c77c3e8fe30aa095cb42915bad635e1b008b02ca16368d4c33d928c771015c6e4f91420e12fefcf036b9e171c563d878723d96d67c4e0eef10c2520dbf2b57f8b9afa6a0e7678b42440c2d4d048c3129b3c1869845ad963129e607898897abf799fc2ada10371513d9fb834fb31e7443004dfdded4e1378625f0df18d6302c7dad5c7117ef0f34b8cbad3bb404151470631445e05fcc6cbd8f504d09f310849c7610cb12432aab33801c0c65144c0218ef268dbd2652f97948a4295b7fecb7b627bf7499b28a18804ed8b191b3dea5f9606473ce018c72df0b6b09554801498d31ce09400aad2d8e2b5e827b0b18f9f3bcea7d1dccf1ad012b778b04737fda827231b91c36c7142f157bf2470cbcd1c24063941ce9b7e7ce4bf32ca6e42c36e5e25de02e4de50f8d57b95244ac450c7c3f609de96a7b2a6b13e7a0b75ad96725c9d21ade9895ed3b7bf110edcd7a2fbec6db6729bd082701a830e9a935958b0c8ecc6c88a0055b5bcbef55811f836189c87cbe1099e90743d88156481fa5dd581fa7350a145754e20026d478444147bc9b40a42c0e74b9f3b07d84cf2d4de3bc93d25c83c31ba6de775a78355dfa5d5bbe12bcc54b4197a9cf757ead865274edf37eee39b216ee95193729d83173169880356bf5565c08b4068cc292096b2d4c1016885ea542fbe30fe0472194fc29429143e5e2c30eb9ee586c3feb1e5784b075655eccc43f8e98b1e9211119b5cff20c4b88d839ebf917fb713a3146b55a9679b95f9c8a84a58d240758bada5f023357da389c00adf059fe28e477452a25aaef14320cabb4400be7f9642292248bd96cbe58ccf5838d31d84b221c7e5d76b17898ad0ddcce50b69f843a42ca7a0d0d752814b0a1b026721fac97424d81e6ac05aa00a131218ce67437b8341e8f6f6e6e607706d7ef6ee9feb864d59eb248935d5e1f02d3baf82c78e5db5ce979ae488bd59d2b76ce221467512c5798c556551ab921fe36797e94c06be60ab96039b939652e4d31bde6b381e422a4c1eee869e0dc517916055c8cfc7c22dcfe85ba2d3d7a7d5612454b7dd66201cbac08dc4a670f815c98b3521fb936b005e3028451415246281231ff13ffbbd094f4036bf0fd1816582ed1d229f07c3c9e2c1673eb9dbae832141bb87052215101088f560d3d7922c6810062bc0909051d3ed7a6918f09367dd08fd2f4da1a42466303b77cece183829156df4df3d74b0a1cd56ad539777d7dfde4c9132c39ea76bb50e1e99b1befc7993da0eb138b10b30e92de11b0f2ce0bb5dcf86d804501b894128ae2d5754d28bcf74fc79b6e1f6ec3a4d6c56f3e86215792b70961a30d8b57f3d4e11cc97cb11305eb8168e95f1b6b0c8d5fde9f115c74b4c6736de0c42df1fb1b72c10e96b3a28cbe4308a6fe6ad87e96c7b0b4f9fd072491b7eab00a21934064694a3e994c9d4ba063463af44f15b2484b6e39119ba681d7274525d507b107141b78c243b62a46e5980e744648000d77ce6b95f88541186498595d32626610d379e1cc0b0cbb146131a5a20bad31210015c09b376fbef9e69bededed7bf7eec1810452c2190e0464f596556482b76755c5941bfa80d659587f9ca500948530addcb0a273319be38b69728deead77bd5386ef746f0e5c7205b2995515395438126c4e537c56ae6a148f42cec5810e01575db0c8d12cddf9af36b3b0d63897b18337c6581b25cb9d0d977aab9c3e8b7dc704cfd279436332ae6f4284ca3129f62cccc32e39876ac247b131f94d5e398371b7afc05b30acb23156df78a9c4592c9622a13aabb3d6622dcb643211918a0fe8e1d80e1eb3638d46a3dd6eb7db6d661e0c06979797699a621ecd04666f807f5839b55a2dd87f92276544747d7d0d0b752c1b4cd314c69f4484d740b1c2e8bcd56a31339c9a8ec7e3344d6bb55ab3d9841f88c964a21b23c2f515fc7621fd68349a4ea7954a656b6b0bebfeaeafaf5fbc78f1ead5ab7ebf0f6f10d81cb0dfef63136966ae56abdd6e77676707be2828f0bc5a0a349b8f6f05a65ca3cf9deb71c390beb9e1bc6353cb34a7f7b8eb63855c1fa37767521ff7585a2f61cdea6b6bb9852088a09223f31229783957c322c49c7ab695d7a870d9d8a933e30a4f2a7e5250f569616b4eda389ce4528a37a37fd7eadb64e91ec66b04e29857fa60630c91807760632ee51d70c0c2ccdd6e17fb39635131fcb58304c1d11dd621f6fb7d6c447c707080fda6d86b7c506aba2e1a1bb22a6972cef5fbfdc78f1fcf66b34ea7a3af8dcddcb1f3335cdc586b0f0f0f21dc9d9d9d3d7ffe1c8eab3a9d4eceaf29e0f2f2f2f2d1a347c7c7c7b3d9ecd9b3675830389fcfadb5373737d3e9b4d96cc28d5f922483c1e0d9b367bbbbbbd6dac964f2e38f3ff6fb7d3cd718737c7c5cad5661fd2f7e779f902b853aafdbc3d62d012b54a551965098ac3690dee69eb8b4c1dcb2cdbd35e5edb37ad750fcf075c75cfae2d10433894a3d4a71274c1f86d0e2a7987fee768d2c322c3d3a6f19eff55058301845518af1dbf84d39d10b307f1deab3700e994041ca785f6fe1670642685e2e06b686ac30acd340f27d9f918b3f649650ab96fd821beb37cbf19b182798d7472f85dde66030180c06d65a189763e1f1f9f939ccd68165d56a153eb046a3d168349acfe7f03c339d4ee10b7032994052634f5544643e9fdfdcdca469bab3b3038736cd66334992f3f3f31f7ffc713c1e634f63630c36611691f1780c47a9bd5e6f7b7b7b341abd79f3268ee3c3c343c0ebebd7af9f3f7fde6ab5eedcb933994c9e3d7b361a8deedcb9d36c3667b3d9643279fefc390cdcf7f6f65ebc78017f5bdd6e6f3e9fbf78f1e2ebafbfbebebe6eb55a6a8a013f13263086be8daeea163ccb149b7aaed11787c1e225cd22ace8ff594ef47183ca329ce5297f6a2655fa26a56972b8a631b9b7cdd59abfba3c8243305b9104dd04a06382cd9c7278c7c178494489df284cd3e01121b1d2172b7e48f0ce78bdb525c0ef303e499e6185c514c66455b94b8c30c1141b04b77abd0e9ea29d4afdbddcb973677b7b7b3e9f434a8233036cddfef8f1e3b3b3b37ebfbfb7b787f5c6bbbbbb9f7cf249a3d1383f3f7ff9f2e5743addd9d9b973e7ce603078f1e2853a6028562a1cd73c78f0e0e0e000ef301c0e6f6e6e20668288a9d9272aa0d3e9b4dbed870f1feeecec7cfbedb7af5ebd6a341a9f7efae9679f7d369bcdfeeddffeed77bffb1d76039ccd66e7e7e7cd66f3abafbe7af8f0e1e5e5e56f7ffbdbc78f1f773a9d870f1f1a637efae9a7adadad7ff8877f383e3e7efaf4e9d9d9d9d9d919fccfc0d66c3e9f8b108632f29e1e8a0c2b3c5fa7b15a0f588697bb0f942bdaa930bb4a05554bae0d14c36d1ad9bb34c4ffa6907ba5d2c2e100c46f790c8dfb7250589a5b3106a1c8d18ac75cad5160b7a50c0bfb4b1b639c2363ac78336cbbf4e86042b6a50bcb42ce857943dd94578fb83d8cc92de8516e6582197f11c6ee6741cced4912fbbfe5bdb7d261d11a8ca460be008005dee482ad22aad56ad307224a92643c1ef77abd5eaf77787888c935b8f414bf3a47fd918ec763f4552880a0ea567731e1c78b9f5badd56a5b5b5bfbfbfb2050588c5dabd5baddeec3870f9324b9baba828b64b09e4aa5d26ab5767676f6f6f69e3d7b061cec76bb47474793c9a45aadc28d0400ebeaeaaad168dcb973e7f3cf3f7ff9f2e51ffef007b8be825a4d84daedf6c3870fb6b6b69e3c79329bcddaedd683070fbef8e28bd96c767a7ada6834ac5db551e559a53054e45394dd3d2c1b8457ae63caa5123d86239b7680b033fc3551aa5c58c77afe74ac6addd5b06ac298b7064db9816189404924dabb437aa1faacd263f808ec87100a80880f2707739fc64b8fa93678b715e210e55557b86f7d8585170b0cab586ad9e2a000ed322f81fbb0cd8cb5a0a399e7a67e171966c64cd97c3e8744265e256ffc2a769011a87e50108854a13aecd8e47504fa9e3a1ac07eb7d96c1e1d1d9d9c9c7cf1c51790d430c187718688e028753a9daaa51c9c7fc2db9f4e4a62c6d01833994caeafaf217e42fec5c48a319c24c96834aa562b44b4b5d56b34ea9f7efae9af7ffdebd168f45ffff55f2252af37748a13bab91c1bd7ef2aeab3c250d05b91072cacd260e6bc41502853d01a9e956b2dc59862b84d9a3f93c05980d0732e60fa3b1d8bdcaac8bf36a7dff0262155c97d0b624219cd18f65375a45bb4626c563a0fb6c5debe47d9961ec339446b2d7a017b5d676eeda1096612c97740ce8229118928c6215e1422946facabb40067983fdcd21d3815454b535a5a62ed12d4a1db367e9d0a66eef055cf9f3f7ff3e60d3ee3e4e4646f6f0f1962b121e086fcca61949488c0ce0daa7dcaa27b1445b55a0dfa7ee02311351a8ddddd5d40e4f9f9b90b1c631111c8202680c187f512f4655114c1cb8d736e6f6fefabafbe9a4ea77ff8c31f7efcf1474c1afcea57bf7af4e89131a6d1683c7cf8603299fcfbbffffbc9c949bd5efbf4d34f2e2e2ee6f3f9b367cf9c73b55aadd56a753aed6a35d6699a906df17a86a531da527378edcf9735c0ab2db932c3a056592ee6e7134222f0a760551f9da329f90ae12c57fb14a01b338b776d1c56b4f34b744d76c67003dbe2f5faacacb57d1eb028bbb428db0e33b581fff0ceb7acbe4dfb12664b2717b71440a228aa562bc6b0b5368a2c330a888db17008035306c5f5bdbdbd5eaf777e7e7e7676361a8deaf5fac1c1c19d3b77b6b6b6d2348de3189ee0611e52a954a08cc7c269fc141138bd0a5f8b999bcda67abc429161e611057d7676767a7a1a45d1dededefefe3e5cdfc0fd0b1e114551abd53a3a3a6a341a7a57b7dbbd7bf76eafd773ce1d1d1dfde33ffee3e3c78f9f3c79727171d16c363ffffcf3bff99bbf393a3a1271fbfbfb7ffff77fff9ffff99f7ffce31f67b3d9fffedfff7c7878f0c73ffef1db6fbffbeebbef1a8dc683070fe03ca75eaf1319b58347b0813f90db0056816195375fca8ecce1d55c2dbf35a6b46dbc35cd9f552816d17fc331e453ebb45448e30a0b5d8bfc2b540eb017f9c266800f25bff2598512655b3a6308da15da67810d60e4feffd97bd3e6388e244dd83d22b3ee0b55000a3740821425526a75b7d4d76876766dcddeb5fdbe7f76e6c3aecd768fa9a76da5115b6cf1a60810f751f79d47c4fbe1a90c44651540e8e81e7637dc68c9429e9191114f3ceee1e18edf66de10665f11cd18da56ad18cf0aa31c88b35078aca5e273e07f1459cc4a2d3cf30bfe5086859941d7758410aeeb448045b0b823638d613d4404f4f17d1f46ab6c368b90ca6055085700cd0b1e5508ea8230c1f8938810970a05309585885798a0343c594a99cfe7c3281322d66023ee0233cfcdcd799e87cc113a8a2e0f274f581c11e31451b41289c4f2f2f2683442061da0dbd2d2522e97eff5ba994c6663636330e83313a25f65b3d9d5d5d54e07f9abb38b8bd54aa5924aa5982fbc607896327885987639734fac27d8f2f7c9a7a6e55de04ddf6f1bfbe806aa6cb1299261917a32a6b39e8c7863bcae68ca92a52da5d5f45f8efc7e68d2b625c65eace3d00e31c08a56b9c44de156b3e4ab2c59d6f9df351e56bcab48295d77acf749294dae73bc0374377b58c0440322bb1b7f7104302022b83e8868898ced1a8ebb21f49d71cfe5c862857be272631bd2910bfbfcfc3c808f8890260337817e2aa25834c67f15a96e8410f01ac5a31134a25aad96cbe520ca814a44fd7e9f88110bebfefdfb77eedc01b564e68d8d8d6ab50ab7e34c260be08b6c4ce31666a8225f5b25240bef280e58e31d34095b7c099cf114b44dcb75cef9ab90e94af80b6fafb676d125ac0abfcdca369e646164350065adf037c62f7bac8a61906db1329ccbee5cb63d0b433ed4c318db62cb0c6f4aa22dbddb2ec0b4d078a99fb0f65cfa057f28c312629ccfdde8cfb0a118d089199bc05111d55346c9b28c7dca2ca6b16e7ea175c35f14f7b1bf8d8e6c58204a36baa36613890458150e197e0b5dd556d7e17467ee6f025ac1ea0f35b352a920c01e4cf541102412495c5e2c1633994c1806c3e108841189bcc230ec767bc3e190ac3ca657dba766722eb2e0c3de63be20860abb5aa6e1e6ef996dbd0b5ce93adbe9d242a69bc4652d842d5b12fa54ac5f98666628986972a6735d06a0f62ca1b2a23c9b72ca6815ad4d0f67765bfbd5a6774e7dbd59d11aae4638733e5d74066dc81e8f4dbf13d63e9a6404315d5a5b53fb06628da2645e72fa7d4434538bce4fd67cad3d86e0b6781c4d5a7662606df05444bebf768d439f272280948cd6c733b3e3602012862a72142275341a71b4e8324ac93b16d03a94645a31bc1ab0ec3d6232ce044d82d465bf677edc2b8efe0dc8747f7ea7b6d3fccb3e7ad97e9aea953a5215cd8bdb5a1ebc79789225d99e5951939e88eb60b818740be09df18037f799863c6de9ad36edb2a1134523222218da60bf27229e8c5dcafc9d189639cdd41a8d3b39acec86848ecb61cf9edae58eae0ae1ccc69331188c61d27e226e32180c1a8d0611c19900f1b68ce828828ff9f0e62df18e002cdb5aeffb3e3251e333c0650c4aa8b910f7c4742745f8eb791e78a215409588b452e3a8d0b07c31f3c1c1c1c9c9692693b975eb3634d0d8ea56c8b4023853622d75ba81fe3db3a7ebc8bbc09e7e2cfe35fd5ed3f86523578c6d89c9e51664f930d394cdc16c31d69af0706cf9beeb4905169dce266b344911ecdb4e924861de298658170ccbee009749ec9c085f50262da5865266680816e5e472399b0ad96f4e539ab6dd694d2dc084a49442527b662e97cb488a63eb8fa6360d3e4ef30ec39e50d148f3d3e974068301ecf18b8b8b668e320625f8c6983d69341aad562b9d4e2f2f2f6381911ac789bf58598a17ffeaabaffecffff9d7c5c5c59595d552a9d4ed7661d24279cc80166b25d32035b3f5d86d91a786df2bbedd5bf7ff4dca6515f8ce6e6d5bd565fe5cf61e1b0bcc9735bf6d50a3497b1618165a38c801d896bd3591b3ec7946117972d94ccdd6fb0c71313b0d96d18531dea856c21e88998dd325e244337f3f1b967dbeef079ee72915baae934aa5e1021a862192bf63b2cc188fc6858a142e836286bf982f61800cbfa17f8d46a36eb74b44d96c56476ef14a29b31ac04e77681c3e632e6d1475ef7ebf5fafd74f4f4f91eb01739783c1a05aad22c3b3b995b66c61994c462955afd79f3f7f3e3737b7b0b090482447a32133a7d329f38e523ad96c560839188cdebc79033a6922db2026bdb9ff3430bd15b0628dd226bfe6d3f095dafddfa7bc0bfce8cfbab547a0e95644165130f4caf60bd5b32601cc9d0de4d9111d629e5c388ade77991b476c69f4e5121f4df535a335b0650f3247230353e87923442f60167038504af5fb7dc469a0c8926dc28389c8da0dcc426736ef0f180253634beb46023183532026b085c31c6ecf6e181493516c2c6636f9100d076c341af57a3d0882b9b9b952a9d46ab54e4e4eb074b1582cc2037e341ae1fe7098705dd7f3bcb3b3b33ffde94f8b8b8b77efdead542aa8cca83001a24af87e904c3a580d4e44fd7e1feb28e1446a6201daadca20f5cca67619609916661f32fbed7175fa43ff5dc96595f98e6f2fe359d3cd4345211ccc8736d752b476d5fc6943468c6d990b0d0c89c91080c66f7e5a3d3498e54499a5ec44d3a6e43a6ec7e00b9a65c1eef81cfc2366163fc22c210a6d7cf6b1ae058ee622f294450c290322894422934967b339666eb59ab55a5d6b8d100b524ae434443f475268600112d923941533034ddaedb6c9029fcd66e7e6e6b2d96cbfdf6f341a6649a752aa50282c2e2e1ac0d25a23a9bdd6ba582c6e6f6f2f2e2e3e7efcf8f9f3e7b833c2d7743a9d76bbdded768510a9542a9fcfe3056bb5dae1e161b3d9fcfaebafe1ea45a4cfce868d4613b1b4128964abd55e5cac221c58b3d9fce69b6fdaedb6e779b95c6e737313b9a3651491d5b4bf18845d0158b6986b63fb6732afbf67f94f6740df7b7bd9bbd862f5ff0b95e2b25664e3117aa58e4c4e26ea2f4f461f328022ac3c2f06b0c87209303a930d2f7601ecc247ea170e5dda5475cc86650c4064f50afb85637bb4158b0ad1f84094b0e4586b8d15ce42885eaf57abd5e06fa9a398c8f97c2e9148a652c97abdfef4e95321e4caca32c2f2e572398a30bedd6e9f9e9e8222d56ab54ea78373c230ec743a8d46a356abc1434a29954c2611e60141205aad56269341f5c199debca68ea61153a954a954aa56abd56af5e0e0c0f058f35e070707f57a1d9c2e954a21d129a0b95eaf7ffbedb7d56a757d7dbddfef7dfbedb76767e7528ae170840fe9fb7eabd542b6fa172f5e00430b8582e779b76edd42782cb2e6196250650fad364bb7bf8eddaaec966188d54c80fbfb94cbd0ffaf686b1b2bed6663148bcb9a0d4d5a45a6c5740adbbb0ab384660ed1741f58af8c0dcb5c651896c12fe32420acb9459ac253a844cc8c8270ccb10b9f8f48fc103f2c0358ccdc683486c321ccd5581bac94829e2584e8743a676767bd5e0f2c31325aa94aa5924a2583c01f0c06d96c167144c1c510330b999f7bbd1e8cf750ee302b371c0e91f72108826c369b4ea7cfcfcf6bb51a02d1f8be0f6684db22ee8db170a1e4f04a0d82e0f4f4f4c99327a7a7a7b55a0d91adf052ccdcebf5f6f6f64e4e4ea00902b6eedfbf5f2e9711306b6969697979b9582c9e9c1cbf7efddaf7837bf7de4ba7b3beef2d2c2c148b457872a552a9e5e5e5e5e5e576bbdd6ab55ebd7a25a55c5c5c4470547b10b3b7570cadd34763dff18652cd9477812bfd6558986115b19de6104d4e7ce14ce3a90031d661db3b94886cfdc96658068c8c910b48649e6eca6317cc94475b32ebe35d6ec39a7ef399e770149e9823ff4f22c2e215f86ac23a3e180c5aad16e2f071940f22d26c299148168bc56ab57aebd62dd7754e4e4e5bad16eec051a88a4aa5b2bebede683460b1761c07f1f39452a552697575b5542a3d7ffefcd9b36750c1606c2a97cbb76edd5a5a5a42d09bd8dc1fcc64081ff8ead52b24945f5d5ddddadacae57230f0773a9d7ebf0f23dad9d9d97038bc77ef1e82f995cbe55c2ef7d9679ffdfad7bf1e0e874f9e3c69b73b8b8b8bbff9cd6fb6b66eb5dbed42a190c9645ebe7c99cbe5969696fedb7ffb6fefbffffedededee79f7fbeb3b393cbe560ea52519821d39e668297fd21626c8b2d3e65b7cbe9df7fe7f267e53e7ff9ade995b16d8c6d99436296975fac72cc706ee086a2e414d28af700abae21536c2564c56d8daf83712b35311e4cf1ec879a62d87388172c2c2a2c1b867505cf328766367d14229d4e239e67ad5643089fcc3f5c00002000494441542aa4f902318147389c00d2e9f46834eaf77b304b01bf13894426932d168b52ca76bb035b8fc9964c4458d8ec384ea3d140793ccf0360a552a9c5c5c54aa5727878188621a26168ad89743a9da9542a4b4b4b26005694f8ef22910fb44266cee572d56a756b6b6b7d7d3d9bcd1e1e1e6291f3dadada83070f84105f7ef9e5d3a74f61844aa55278c73b77ee6c6e6e9e9d9df9bedfe974d6d6d6b6b7ef6c6f6f1f1d1d01b85bad16d4c0f5f57544a448a552dd6eb7dd6edb41204d139cae677bfff4701adb33f39c1b31f22ef0a0bf24db327bc4252e7e348977b63d4b47de94b895e159142111ceb1e7164dcf3299eed81a5f8d37bc9e9c858cd1ae08cb88e26c495f8b614d8b7d09dea7502840f53b3c3cf47d3f93c9643219e324c5ccc9641219658ac562afd73d39391e0c8644e3d20701c2c9f85a5f4492367e091485ac0284e1d1f62423d443d054e3a7aa9436b58c30d51cad52342643ad75a9545a5b5bab56ab4b4b4b483a5f2c168510b55aedc58b178944e2d34f3ffde8a38f98d9f7fdf3f373f3d960ed02ffc28003d7f67ebfdf6c36f7f7f7a1aed6eb759c8fe2c1cc6f3bacd9ae58a655d95f34b6b5bf224f72ab9927df8891cb6ae9af746bdbb362b4c83ec7bcbb3d6368ee4353639bb60c0e986c373e0a4484a66e261c395a5d883df62ca159e2661e8d085478aeb167692b27d6148ce252018a85e7fdd059429014c053b7dbc5845a3a9d464018a8b2854261696929954af6fbbd2008c230c0f2e07c7e3cdf974c26859086714077435c877c3e0f8d1246f47abd8e59c242a1904c26bbddee68347af5ea552a95aad71be572796161c1715c5c8e2811c6a3c2f67b408d208273b55addd8d8585e5e4638537cad7c3e0f5b58bfdf3f3c3c6466a4b700b7aa56ab9f7cf249b3d9fce28b2f7abd1ed2f37cf0c107ccfc873ffce1e1c3879d4e07514c2b950a82348c21d9f753a954b95c069d3470338d327c890d8b2d0e659f60b7daeffd35ffe6e55de03e7fe1ed1543d71568687a8ae32864e2d1d15a1188cdb028a266c604e6baae012373ab3014c6a534b67687ac061c155e6b0d3556447ceb1a36ac18eccd14432e52a914fcb06005874316112d2c2ce472b946a3beb7f766381ca652e96ab58adc0de8c0954aa5582c00c811e88e99612f771cc7f7fd66b3b9bbbbdbe9748410b064cfcfcf3373ad563b3838d8dfdf0fc310ee02ebebeb707d5a5c5c4c2693a9d4385d98552fe3fa4da7d3a5d25c10f850188d2ee9fbbe10727b7b7b65657567e7f5b367cfbff9e61bc7717abd5eb95c9e9f9f17426c6f6fe7f3f97ffff77f7ffcf8f1f1f1f12f7ff9cbadadad7c3effe2c58bafbffebadbed2e2e2eaeadad6d6f6fc3dc864461524ac4fff27d7f717111aa285923a1dd5c8ce8a9f941b33ff6156cb67523d3724de6f2d7be8d8d7fb13dd33fecca9939da69ad8460a5285ace31e19365660c79d20fcbd03d33cf1804a1c120e3e34e5620408a67e22166c12c388aecfe23f86199ce2384c8e7f3781984c76366a542224e26938944c2f73d30ac6432994ea7d3e98c109228c8e5f2ae9b48a733b80f02b38828d93d2cee44043b7a3a9dae542ad0dd30c7078f8a20f0cbe5cacaca72a15010823399cccacab2e338a954426b6dbe1111318f59613a9d5e58a804418888a6d66c9d1682f3f9d2fc7c250c835aade6fb9ee338e572797ebeb2b9b985a8f31b1b1bb55aadd56a6145e1c2c202b00cfe16ababab4b4b4b982445b8e7542a851f6b6b6b854201af607bcc52641a30156b0f957685c7f69ba676c3adde2affe97ce72fb07deb9b1a3dd1480cc894423883b151055708a1c2709c1d396aa81a58a6f545c464224da47ddf0dc3718a62223bbeab14829875188e3353c41816452d19cd5908a0159cb02c86654a1c7b8de9b7b22199236a00ae885c0ccc8c6547e634e02bc2da69ad1c671c2566381c12513e9f2f168bc06b224a2693c6a312951b5d380e6e85007b50f452a9d4fafa7ab55a1582b036080b6972b94c2e971142b86ec2cc874869588c66e6743a95c9a4b466ac97420cc288063ba3d1200cfdb9b9e26f7ef3ab2008a41c2fa9492693e974a6dbed4a29b7b6b616171781d4c836f8e0c183ededed304acbaa94ca66b31f7ef8214cfb4110241289959595e5e565e0afc97e68be996d98b0ebdce6f676f3d29607d6f417bc115b7e742ef32e6fed4632eda565f688c9c004262ea6111d455b86ad495c8448d6521233f9bea428b158180642103305811f860191012ce33fa1619211620c64a66076801a5bdf64c1c442316b26a2ebd9b0de7a021e8980563652a2caa26856895c2e2fa56426639393d2c155b8822223346c4fb80f56f0c1cbc1bc0cf01b2a64a954725d84c70fc33014621c1b0bdf0b65b7bedfb8cc524ad775984d3c2fe02fc32e0faf0bd89b00a0f8724a854a6998ba1074141c0ad0033f7b2925a6027cdf47984066c61c25b442340bd0663d6565e0abc8f9ec9d37dcea9af22e30a0bf24cfba4e85f0a4d024f60921b426ad45a4cd8d97d686a1c33c0e0e03454a2985b8cc5a6b3839eab1417dcc1230c9c4ac23ce75b1c8772643d45a0bc1420a12589a2398f9fbcc124e8b6101f6543d33db06196dad2a221a674c33806dd797e981e6cf300c8111c27252076c2ba57cdf530aa97ac6da75f4f21cc1f9188c880853159897a371a843066c71140cc756d1cd0246a28b908466a2240a77359ed68473bc795f98cf8ccb8999f434eebf31b4c285b1f9638a9894198bf4ac39c41b79ab7c0f9ef2b7b49de659d3443eea9b4c0410611aaf40d65a0b785ed378f6301482b52629432292d267a62018f73ea4c8a2a86b234a6610001604422e47bf290c15f3c5ea451b078423580a1692781c48ee87dab0ec6b6d67b0693dd9ccd6459ad778b6ce78d3daf86df764387498e85a340edc434298a5d1da861b735bfbfd4d2d4c22232172985d5fb6101140564a87f922e6068e2aa50058d8af2d572f1989d6daa4ffc173b1eed2bc2f456605f3214c95c6069c9935ff3d06d5bf677917b8cfbbb39d2951efb0b7e86b63ba20a3087fcce3a60b6e653763c7b960583435ee72c43c88486b65c03156421da5f9a1b1779726fa8e7e58b1ce3f7dc886c9e9ab84b5f8db1c8fc1aa7d1f1bfbec3be0082a148f925218d081189614bbd6ec1156e81fc3aa0cc3329815ed81f218e75fd28a142aad2c38a61e682a31bd4dc269d66068359aef3084dec85be5bb56e9dfe4d66e5ad39c2baa28fb37fe87495a5b68a2a4bc98efc32c21b6ccec795e105cc47a8a7507b654252212020598616293d291520a66a54993d6443f94617d5731f515db79c5f9f685531ddb062f8a9d699f3f0d013132c5578aa184937bde2ef65b5cf19a462e6355df7bc0bc115bde055ef32eb0aa2bce99ee3b3441118c373cacd5643cdac3703c5788c931134089287e7fad2f466ead8939d49a8842bb24c66c22859452ea705cec6b31ac99e7c4faed65575ddd9967febefe99b1aabcec721b5c0c1b8a01d6250c0b7be08c1e3f932793744d3fe50a3e35bdc7dee29b5d7d0e7d171cbc117a07d8cdbbb39dec3e97feb67f101156ec98fa544a1009adb134054909c72a612291b0d3af5ab384e33284a1d98375888c73cc25663d8994d2910e314921e93286a5af7490fdcbcbcc6ab5fe7c0b60c56426a58af6c4899745c1ae4bc76695f0e2b7d9da720545fa8126891bb1e55de038efc2d6ae8d58cdc41ae774ebb54d2bb044c19e1586c8a81a2aa5304b88f80a4a5dac34d4176aa08127dc16ce9213e90e99590a396658cc4821782d4f77f37bfa1dcc3bcfecabd377bbac2ea677be150a9899c6e9c526ec5cb6d8dcc76c63f62961ad5bc45fc6ac2e044be9460ceb5a76abd873cd77b2b73c2bfe3a5f323f78cded8dbc55be5fc5fe0d6fc71d69aae3983da6de78126588286acc44a469ec87050726ad3581615164f40ac38920596c8573a0f1a4e4c442148e26dfc6362c2105b39042fc9059c2d855336f12bbf935e980b92a767e6cffb44ce1d55b24c6980c9f8a665ec700f59d2895fdd54da92e2bf0a4621fff10df6fd8bc912be45d6037efcef6ad756537639a8577529a794311f9bb878e133a8ee3b88e52a1d65a6978608dd546837dd1a20e78d55ba9bd005e5a874a09965073488d03258f19d677822d7372ac67c684a7c0dbec9feed23405f957ef9f42ff8b3f66b22a8a288c6da59ade3a8e83b3c4d45c61ec9e5758af66b2a758f9f5942f55ac4abfebf646de2adfaf62ff4eb6b15e36fda7fd83a2f0587481802aca2aa895d28944c20f7c2cbe21262c9a1653d3e551c7015313e8a3ccc42c486b0e43c152221fe8d88bfc6d9eeea6179185ca6f653a7f11b1806a56bdbf5526e9d505b1b266037f90ad4a4da606d1965cf64a760d7f8fed8dbc55de055ef36e6ea76b2926d3addd6c8560785212111c1591835529c4d552cca49589083891dd5e8f3da2b5d6a49426e393a51431c39788f8a2fb5c9a35e78aaf1e2b746ce7cc97b46f3bddc367eea729189ab5079842c692650e598a5edc73ca18ad6cbb55341be8f0a4bf7bccf78a2ff1b7d253b381b8ef3493fa336d6fe4adf297f9107fd55bc834d98f88cf440ba70bff70adb556ca11626c2f775cc7715ca53491a6687d0f8b5069c582c94a5ac1e35584e31b068118ffd68a8560211dc7134262891dcf8c8735adbbfe8803f85b7bd7b43e655f1bab59226d55650c01795ac40c313b2534412218b3665c7e854c57daf7931f6b90bc9199f22e709977793b595704cd0a7f91952530ea5fb379962159514487318762c14a2bc14c7abc4cc5a01ec26d6aad9931c693d68a5809e1388e23a4640e8998344d302c035e97753f1b2fe81ae833f3f2e9df979d43b35087268602fb1c32a8843f6d3b14473e1d530c8b015552c2dfdd61a6ab19d665d631bec40e15abba997b7ef8f646de2a3f6e85ff0d6f4df7222266f36f42c4d8331e17013994410f441f88bcd3c7444c29c944a1407e1d49c4113f0822c061212e82980b110a81e008ae7494c092209b614db3adeb4b0ce3de8a7d575c6befbfe24c3de995cb7ce121c21386f00b6f06be96d0f54fa6e8035fb3de502df647a63fcff0782333e55d6031effef6921a9b38647702ab23902159524aa924454147b5d6639f78624d1a365e2242ec2d0475883cb6c6162e66868f91e3bad20b85109a2c3fac2b1afd5bcfb90e2ac5de73f29d67ecb49f7b494d318f91e8e2374f5a9a84187b9e596c4bc27f3d625804ee656b88362fb36df3b1ad8d98d1807329938abdc275eaea7b9c7c2337f2c3c5ee5f5a73b4337688226b0c314b662d25402d544a39523a8ea3b4c2b0ac9422ad43939682b5104a690096026011d94b76c629765848c7715dc791d2112cf8fb31ac69f6c491724411a845f36e17fba76f72754f36606182ba7014600cfb1197d9dc6aa6c4d896c12f04e1721c072a21b3804a68a702bb42a60b2cac387c28921d00fb8788f922a6aa6ff8d48dfc5965ba8145ed3ad661197b6243b5bd3e848c1f839414455b515a0b5661a849dbf19127728b8d3d4b85701c092241cc9a69c62ce13494c4facc5b65ea96b3cfa1290e15fb1d0308f33b021f61ec82e690adcdd9162bb66c588e637ec06e05457abc73fa56b6158c2c17120394c2f2008e153ef66ac2f27437a74d43124dc1933d9698abec33635f8a6641db0dd8ddc8f525d6ffa61adbc5d1a8411acaa2a4231d476a2d750449da4ac84ae3f64c82c7fef1cc242542e98d670fb556112ff1a490c44cd30ceb6a99799ab6c4a65426a6558c77d8ef8cab62c0647e83a4986052aeeb22471622bbfbbed7eb755dd7c96673c0608a20c636844f297482883ccf1f0e3d66721c1780e5388eeb26714e229148a7d33648cd2ca1b022f331731004bd5eafdbedfabe8f9c66886a1f437f13b2ddfc19839b9841414f46e03659ce449400eeb2cf67eaf6ad5ff0466e64a644ad65627ed0086067cab035c3ce23c7e1ce496b05b72122ad14398e26cd5a692184264dc4911fd6d8639e48488928e72e91204dfc5d3ddd6d5e60f620ad2b11211d03484410f8e85dc96422914830cbc9179b18ea67421802fe8d4623842a26a26eb7dbebf58ac5622291ec743af57aa350c8e572d964326147011491039b85576346a5b5f2bca0dfef0d87a3300c1122d971643a9dc966b328432e9743ee1ffc39add8da438d1e0723a57ebf7f7070f0e6cd9b5eaf877cb1885b6fbfe6f46f9b6d99df766dd888834487c8e871d9c7329fd2be334db2b01bb991eb0bac543465c3327b88b4358d08d22005432d9436b628a595d24a8d014b2bcd24983854a12662020bc34d42a51473201d37910c1c37c1ec3009f13db2e6c4ced75a0741d0ed76910939954a2125d97038ecf5bacc9ccfe7a5445ef80b5ffe1804d83dd630238a921e1291945229351c0e7bbd5e3a9dd65a799ed7e9b45d771c8034a63189282c9fa95fc771847006837ea7d3edf5ba4a294c4020467b32a94c66535c883c1a50a44da40b13e22716f5586bdd6ab5f6f7f76bb59a49226b10cd44f611e3850b8a2c024816cf8a697fd8391c0edbedf6e9e969bbdd4ea5522b2b2be572d966587635dab79d86ad1bb991ef2a5a33458911f4c45c219aa8b66d32686b319e25a5c482426625a56426ad15b3564862a1352b0e958ae613492b224d600c8ee3388e2ba423c6be9162b6a7bbade8d19445c65655b4d6beeff77a3d040b9e9b9b13420441301a0d3b9d0e45b44b6b4c5e6a43850ca05014045958136de8f0308d8b285c3a47c18885a028529530f5a494f27d1f9194813e626cb037f8257d3f68b75b83c12093c964b3996c368777ca66b3c562114a9ce17750fac230b443b09b7ca848a203c33f323c9f9f9f2712890f3ef860737333954ae14293743ab2f15fe49b34908dd7a7082b63b4a8dbedbe7cf9f2e9d3a79d4e6779793997cbcdcdcdc5781945dc2a4aed710197484662dbe66ef0eb46be8b70a412c650421b60a0f12fc016dc11d891525f8cc4269782026009a19522568a34f1d8dd61dc9895224de484a1108474568e94423a2c1dbe225ac35bed23e637fab6943208824ea7138560c74a484208737475cff34d1055a4ea437266d8aa4cd7721c279148241209c0016c72d0dd1c4702a38ceddc7442cff3f068a48c965222d10e380756de1069dff7915e0cd59ac96433990c52049a170163eaf7fba3d108590891245108e179de6834f23c4f0891cbe57cdf775db7dbed2247613e9f2722bcd17038ec743add6e1775954aa50a8542a150d05a0f06836eb7ab94ca66b3f97cbed7ebd5eb75d77591fc35c6160dfe7a9e874c3cb1558a4600d9dd6eb7dfef67329972b9ec79def9f9b9d67a7e7e1e3aef0d5addc88f22d17c574c78a6603f4812c2886aada5d4cc04d77707b38717b95475180aa51c814933c7918ec342289a354b689549ebcb9d0fb435078954cf4110349bcd6eb79b4c261d47168b45645bc07d3c6fd4edf690ea0ac084a38944024c6430180008a4944852afb51e8d46beef673269a896b0f3a1c836ef532a1c0e87e8cf894402e911a594c964322265e31503aeeb2aa5d0ab0783c1d2d252b15824a27abd3e1a8da494b95c2e91489c9e9eeeeded8d46a3f9f9f9a5a52522c2f983c100e0cbcc9d4e075af07038ecf7fbc3e1d0f3bc6fbffd1659577bbdeee1e11132ad2aa5a494d56a15451a0e87c7c7279d4ebb542aadadadb5dbeddddd37d96c666e6e0e086ed6856aad0b85c2bd7bf792c9e4ab57afac150f17ad832cb35a1004676767878787c562d1719ce170b8b3b32384401a6d9a32f3dfc88dbc4d38c6ad386201cc4ce33856765f1c071010e37f0250416383afc38c9c83e03a4c5a2bc55a6b96ac590bc9c45a48d6a4c250313b8ee33a6e423a098470b88a615dfd1eda3212837d8c46a3e170381a8d882891c8673229684f6061380a1f28d0aee17088947f6043beef03b39088d0f094e170e8385247cb2369dc3fc793652883e7f9bd5eafd3e90c06834422e1791e54d16c360b65d0d4329e856bc1c5d2e9341eddebf54cfe1bdc4d0801e84ca7d38d46636f6fafdd6e1b9b773a9d2e954a0b0b0b28702a9524621cedf7fb8d46abdd6e13512e97ebf7fbed76db7164b95c761c474a914ea73ccfebf7fbfbfbfbbeef27126e2693612bf3b3f90408deb8bebede6eb7f15ef64062ab96d8092ae7fbfe9b376fc23094522255e20d54ddc8f792abe60a8dd175d639766f356e3dcc2cb486d1598c199660a53585e468c5a4957268ac57a9c8943236a790cdb0a6ed5657bf875d0e74332871beef73e4f4845ca1264f97d63a954acdcdcdc14e0ffb5722122094e779b95cae5c2e23b73b8dcdd5d2805484e517937f611882fd002ec330741c67301880cd458b04a5310f65329962b198cbe50a8542a954ca64329d4ec78d0467a6d3e9c5c5c562b178efdebdf9f9792965b3d93c3f3f6f369b854201298cc2304ca5928944627979b9d7eb1d1d1de572b9070f1ecccdcd9d9fd70683bee3380b0b0b1b1beb8d46e3f9f3e7806c3c3a93c9f4fbc3376f760f0e0eb3d9f4ddbb774ba5722a9534f30c317b13f450e8ad93c3d9c56712422493c9b5b5b59595959d9d9d172f5eb8ae7bfffe7d40aa6d25bc911bf981725943422f8de9401ccd15820d1091521aee0b5a6b311e80496bc5d1621dadc2502821dc4422e13ae895524ac78931a9eb00d6f42518c96184461e79c791c6e20b81e5c5719c4c26034392e77948b868accee9743a170933839dd90533c5030ca207f67afd7abd1686e1c2c202a81c59a91cedb9423d8ebb2af3f9fcfcfc3cd08a887abd1e5b0161b4d6aeeb160a85f9f9f9c5c5c5743a4d44502499797575b5542a8d46a34ea7834c21994c269bcd4a2932990cd041ebd3e170c04ca552b1549a83d51f4631664ea5d2440a9caedd6e26934e2e97cd663350365594a7db08aa02463ab65cc360b4c29b1ac31f337b9ee7795ea7d3817a0beb153cda6ee4467e1499692c224218f771379d1e59cd564ad6fac2e9215a57a888484a45046f21867bb71042477cedc2abd3fcd093165f9a34c0eb49076bfb108df3bfbb7a9c45c34ce15fdcdff43133bb6fb445b85c160a85743a6d000eb88b1f3c95ce0b6c6830e8b7dbed62b1b8b9b9994824eaf57abbdd06961b8dc97864595516add08cb430f350fb4fdff70d6025128942a170fffefda5a5a54ea7f3e6cd9b66b3198e0549547dcf1bb9aeabb522d24a859ee711a9e1708884afcce370b1f57a7d67e775bd5e03476b369b52ca64326d9068dac5548f538487608ed00d47a351bd5e87720d7db3d3e9ecefef9f9e9e160a854c2603737eb15804ccdd288637f2238aeda535e60434de853dc69760da11474769be0cba457b801e210b25a5ebb80e8ffd4e899035e7adc59a0958060ee0cb0e3d339148c081426b85611f36a3643289d5d84a29cc240a21e0b2944824a0098219a1df1b6313e6fbd2e9542a950c82b4effb994c269d4e673219989652a9542e979f9b9b83b727d4a25c2e974c26cd0944944c26a574b2d96cb15808430563793299c4ac5c369b1d0e8778974c26834bf0dbac58ac56abf7efdfb77dee4ba552a150989b9b43518bc5622e97751cc1cce572653018b4dbed5eafb3bbbbd3ebf53399f4fc7c65616121994c8c46c36eb7abb55a5aaae6f30521b8d7eb3a8eb3b292832fbe94177eb64aa976bbdd6c368159ad560bb809b33aec7166dd621886a3d1683018140a85adad2d66eef57aed763b9fcfc3b8a6ffbe3db34c1bbed9fe485b53b111d19952bf629f604c8374dc2bc2e83732caee4e963310d1d898e6c4c65b9bc599e75d31261b1f4b702be37e897981442241c489443291480821b5264cf603ad60ca91520e8743d775316d5fafd731a5954e675c3791c964138964269386e70111c1c32097cb856108909a9fafb8aed3e9744e4e4e7cdf9752c24a552c161389849921c4e463a934a7b50696251209d40ed00d3638b8929b12269349bce9eaea6ab1583c3e3eded9d969b7dbc96472797979737313fc2b9d4e2f2d5573b92c10a450286a1d4a294f4f4fcfcfcf85907373736b6b6b95ca4218facd663308fca5a5a552692e9dce361ab58383835eaf37b386fbfdfecececed1d11100ebfcfc7c30182c2c2c388e83170421cd64325aeb7ebf1f8661a552c966b3954aa5d7eb1d1c1c044160afc4b647b9bf37f9cfeede7fb35b661bb03491ad1b5e3436034f7afc5b30c7fda8b5d62c380c5da1949b4824129e741c33ef782d8635fdd54d41e14205c31054a368d24a6badc3102912c7e12330f80353a094816a8d46a3d1681404018c2fa3d1d0f77df8408561a035691dc263d32ca603236bb55a98ec0b82a0dfef371a0dcff360230318799e17e1a92384c48398b9d56a8d46a376bb0dfc86412d0802d7753195098311260de00901aad5eff70f0f0fcfcfcfb3d92c542d6044ad56d35a0f87dee1e191eb26a5948341afdfefb75aad76bb934c26d3e974afd7673e83d3561886a552299d1e85a16eb5daed76bbdbeda552e96432c551ca6f8069ad563b3838e8743aa04870ad80f51d8fee76bba83722c2b700b16db7db7004c37b55ab55cc997ed7cf7d2337f23601271a372d87c230089928108190e3d5fe760c86c8313304442845411068d28e74945241106aada49061180ae93a08b7ec8009719c615d7ff88566014f454ccc092b322745b3a14288e17000139ab16a69ad7bbdde7038344ba30d95d35a8f469ed6ed5eaf27251c3da4e308c771f1e69d4ea7d168a00c4208383ac1bd1eb8a994eaf57a6118d6ebf56432e938aeeb3acc324252168263a5350bca6d7b3645fcd14cdb31f3703804b393529e9f9ff7fb7d8a0c7348557476764ee3b54461100483c180883c2f383d3d6b365b98390d8240297d7676ee382ec071341a6a4ded761be106b5e53202e2a9b5c61c02e0acd96cf67abdfdfd7d8c19666e11d5689cce300600da9452dbdbdb3706ac1bf9f30b5a9f43cc52484de3c413642561d59a840060e1b724d28284520a0b09b5d601872ca4108eeb241c272184a3f59536acabc1cb1c42278f0ddd30701b9ac7cc440cdf741373cad895010ad80f5ac1cc441abe6772569a7840898e961fbaae0b87f568390e6166addfeffb7e001e6a664699391652da9e7ad36625c284ff8800db322b72b4d6707450e3d08870915761a822cf0372c6816c9c300c1a8d26263d4dc983200c82b10b08f6d46a3ea0475bb1386095a3285403101913ac36caeb68ed373e0d4acb7ce1178613cc0482984ce9fa3db6dfa7255bf2431e7db37d07b6e60b92525a88719405221586aadfeffbfe280c9594528d27a+(1, 7, 0x89504e470d0a1a0a0000000d49484452000001900000012c080200000062d57295000000097048597300000b1300000b1301009a9c180000200049444154789cecbd69931c39722dea0e44e4bed55ec52aaebdceeda791ec8d4c92e9fe7ce9834ccfaecd1d6966bad5cd6e76732992c5da322bf78c80bf0f27e1895832595c469a996eb02c1889402022b01c1c77381c7c7a7a7a7676f6e4c993e9745aabd58888889c73cc2c22c61811c179f9d18961162236ec4488884498d949222c2464392247cc2ce2d8108930192744c8c110c9f25944063142ce182621663cdd8890315684b24f2711318645c8184394b95a7cf35c0c11adfbbaf7c8edad796e2ecf30feed65ee9ff54ef16f3d12512e070a4298860a61f3550db81a661ea62fbd1abe9ea629c6ebcbe35298b2f498cb2acc21f739ef57983fe3a3635e01c8071ed998d4c96038b2363e393efee49387d1d9d9d937df7cf32ffff22f83c1a0dbed32b3732ed710d736712672c4448e859984880940c34e52c78e882c1912666121472c44cc64445b0c004b7c2b21624344ceb71beb3b30b1b124cccc446c9888844884c418c3c4cc198841d056a800b4ee28014ce8b787319c05a3dcbdb9bb4ae3734fc9f50ddca56f9bbb9acb2df70eb99a7a6badadcb3300960c6aac4b531a594c2365402605c0ca01440e4d240b61c5044484769bbb84735c0a131443f8945c51977ef89f0134fc791e1d918838112d3d32e63d73b3919d2fd2d76f2ee2b8f69bfff7378d7a3dbabcbcfce1871ffef55ffff5fcfc7c7777d75a9ba669b17ad606902a166221222666622276e41c3b223162d8039678c0c27d42424c24c2424ccc86713f91301331335bdf7a0049c6b0615e0116b10296a6a41c60510022b7b9ba217e33f06dce6d734c0858eb727e2b60959e6f0e9bc1e8366942c808237309a400585280aaf0588a3b8a3ea570837845a530a55e0a7f16e33714c22f615dc8017a0eb034cdbb668b461e57e2e96cf1d3d3d34ab5114795fff5ab2fa2f97c3e994c0683c1f5f5751cc7511485155ffa242616023c11a1ef302d5148909e85448c13117686890d1961874f006011b3b0c812eb1487845888093f0143444bc062b6860d33313922324c64848d6121e28803b0c84152ee3c77d5da0cd869fc070216c25b0128775c973e7c67e75cf826b406c28adf5e5295b700accd419b4a98610e8f4a116d1d601591a8084cfadc2290a569aa5dc8391742d2e6a34258b1347265f80bae6d081eb03275fa818035beb91e8fe7a3d168be9847711cd7ebf56eb73b9fcf3b9d4e1cc7ce070a46feb22c6949748888890d09fe0911b1b090111122678047c4222ce2006accc60316b121c3a4f827c4648cf15d1458c8860db331864984c83193354c2cb4e45f11111bb356e8d3e3ed61e836f094e347c5bbb4b6c234efcabf72578bf0749b98d2f0d696f4d6ceb98e988470b3f9aeb70256313e8ca12c608588839f0a5b0a49a527bfb0adf708594862e672c07abf9c015895d9e2aa35aa561bad56b35aad4404f6628cb5d65aabfd0a27395165792481ae6ad92252e79c132790f7c82bd449083448449c88902323e208c84429118b9018b6c28c044c640c118b73b2a455860d5bc898442c20612c6c889d7f2d638d354294a60281593f5bbf42bf2ed4106d86a4b76abe7229c32722bc2b60ad130cd70d1b9bf9d486abda864ad3bc530b2beddbcc9ca33fcabc8a7785004405a42b05b2d2bb72a2621899a2651492dd8673698194161aafd1bf6cbefa5773d4e121002cfe888065adb5d6d928b2d6424f1d1191732e4992344d9d73699a2649526c6199bc48989899c5b9f96c369b4d13979221d56011b31074f2c69021200b3968db916499131191811a9e590c9331abc732b321366c201291e021640c3320534488c558b2b110877d833c1063c2a256ab359bcd4aa512ca2f61811641e1f6051da62cdeb5a1df521964accb3f97b2d87f4a7b14dd8e9317d3dce6aee2b336c773a050cf456eb8b1f8f9b9772be619de48eb8bfdade8acb896cbed3625f37308dab60b0c2ba3c37abf9c0188ceb9344d923475ce915054ac6c6d0deb9eb7e44e969dc8643e1d0cfb29a57135624b4e96cc4898444852a29418a0631c1947224b0d15d451448bb97389186b6b354b86d2c48938c8774c345fb83411268e2363d8182203da46c424cce484a7292d52c3368e2bb131ec84209782524da7d3344d5bad561cc7711caf538a87e136acaa98be34072dcc75acaa344fed12b9e13a5741b7cff3ad6fbee16473e0ecb472ee0d6f990379814e6f270f1621c64910342500252cae6202c4ab5ab6a8a82a650d616f5cdb177e911cff7b02138027e26ca0c25046c5b62b20534c4cd3c5ec663294d835ea35b694a42961ca8f5988d2344d67ceb0892b9161224e891c131b63e22832d69093c564319ba6b55a6ca36a1451922cc83963d85ac3428b59329d2686d856a328b6968969a9be374cc63009cf27e9cd84a26aa36d3bc658e79c38073e2922b3d96c32993073afd7238f059bc12814873703d65ba14dbbee6d660f4be37339d07ac0ba4d7c7648bc2d2a6d0e456ab68172864050fcd2304d0e77c2788d51980b3f2d7755e53bd50628446a63d0f4614c885f3950fe05a7c2f0515ad1a6fc6939efc686a35c2bb9550642040245e2c8394ec53aa9388a49d254dc521623224953b770c48e22e62ab375248e49acb151ccb1154ac54c539aa536b2d55a1ac7b45824e29c356c2d93a3649ece4d6a892b11d7628aac6312728e9c18e6c872e2ec905371cc6c2a954aa512d9740958954a8588e2389e4ea7393e7f7bc8c814dc3ba6b97dcec5f87705cae2c9baf4a5311b48c4bb861c76ac83b322c1c9e5f056c0520c0ad3e4d853eec652740be12944790a5a0b67b572e1cb176b3387c53f9b205e0c7c072cb95dc69abf44988f0baf163b403e04d1c6b08dad54996bcc319994c509331bc32c24a991940cb3ad5054251333111b22cb5489a41a892432ab7232b7952a576b52a9b828724bc0322c2925734ae7261253afda7a95622b4c8e9c9013c3125b93381a4e6ca51255aab57abd5eadc669ea30f11fc73118d662b1a8542a9010d1f86eaf7af79ff96e0af80dfca834ff0d6936e4509a5b913ddd2646e34b1fb12eac6b9545480a2fe5a06a1d84dd06b014b62800ac1c30418fa95751f52a45e6e60a73d8e40a4153debe947e091f2178ed77890eeb1d03b36132380a09118c4859c8c1c28a0c13c378941d193104e3776799c89235c44ccc8e3935263536151668b844c8b01826cb1459b6c619762c29339111c3640d1189356c8c316c311bb8248f7e421091455ca6db31a0d28e5d7a6f69cacd6c4e0a425c31e63dde7033f32a3d5907619b439838e8c304f9095737b72ef6daa51cc5db0c5812e8b67210864acf9d53010d73af11a6419585a8a7a1341f791785dd2fe1bd036a24caf5a8f7ca88965450c4911312434e44c4f9da1512272e756461456ac889a42919316498d06291492a940a898811583d888890b01171224e5c4ae218ac934998441ce6078b6d37a73d5514d3f69733dda0352ce996693633a9d2630813da4f3e1660e5ce3743d2fb01562e87e0a16fd761853121450a936d00ac5cb2cd412547e5531c28a7344602b306255ce26997922ff60cbd54bdf52165f84bd81050fe1fceb0888276e364394527446a444ac222ec20c75936c610acb72c196308b52bcbb9502722422c8e9969b9c69084247569eac45a212227021307e770cec8c0f9919d02056a0858a57c275728a5f19baf6ecee796477db77702ac2c4c94c8f2a5d02665a4201793fb55561eb9a06f922123e1e34adf361c66c2349c55c3d307001605b0a2f0a42fa6d8843613a6d49f9c0d120c87b936768b82fa25bc4f40217f38c312126134565e366c66e6e5fa1a60966166369619d60a860c31096445225a8a94ab65374bac21c430f9e58644d62cf1d00931131bd86621190814099131925d734301c3a2f570f07e56ef1b2cdd371fe58319562e87dcd5dbdc95a94b3fd66cc8a4905ecf4d903c034f216015fb76296015a18a3602166d042ff24c2a0497507b15b2ad9c71bcfe842e2cd46421b037172a2da25fc2c70a68e11fccb08448d8928d4d2446489c88b3640d1b2c6616724cc6181b4591895358be5b63e3c84696c93139c7642cc7918d229b922347125963992525364e58982313556c24c62e5884194a7736c6b058b6c2c64491ad542a711ca7a9831d179619c5711ceab04a3beaba02bae5b198fe5d7350c07aa76785e739c3d75b8257984c44fc0023b912f23f36a96c34271db814a472cfcdb5378d098faee09f843e00b024900a8bb787a521810088ab21b0869815569926d03c6fd3c07e09ef1644e4431816c3b78230a5c48931a9a554d2d43887fe67580c258e1222264a0d8b61312e49172e656b38b694523277c99c2461971a97462ee134494524254b865d2a499a2c1217b1755449c5512a2c8e8559e06ecb2cc4242ed59514699a2649ea9cb3c1148f364a6558089bd715ae3bdf7c7c27b6a52dfb9de61625e04761ca100872f017e6409b3456e2ff58642515868c697d6fc4d35780a5cf7aeb39157856a8d52ac2d37b0056085b12302c9d37543cd25945f1348a37ce1b2ac30aef2a2b9f5fc287850f66584cc2e2c82d9c73328b171ccbc2a54ec490a42424269dba74e65276924ab230261611c7220b230b2396294d64324ce75319335f5e888d5c922444628d18c32e91e9249d4e9ce5459a9a51e42c272c02499285ac7189f0609c4ea789e3e1f9b989639ba64efce4a0880c0683e9740a1307edc6b9be4d593858575c38c98dc9a5c7d29cc3db89289cb8cc3d7703dcdce6b99b73c8e506600a60880158442160ad8e22e125a695918cc6986221df3e84f7e6660fdf09b0688d239adcedc56cf56a883b1cc89261a4162382429826fe856a7dac8022fd001d96101347268a4d9cb84426240b66b28cb586c224cca9b1629898524ea7247362b6c49c8a4c85fc8a406bada4298f47c4864562f26b1549284d2d1339e1f99cd2c4588e99709d8c101b12474e6c1c33899b4cc6b3599e92cce773668ea208eb9f8b6ce8364c6a3303ba3dc30a5f6c5d9eeb72dbccb03073e553524e2e0b7340e5293c15004b81290f586f690eabce9c01acb0938748514c93830329cc1ede0671c2ac3603566e421081bde916ce550694601db5c29304765b087af517add6c70fccf4210c0bf557afd5b7b776d234319121839584e43d5661b9b231d6180bd6ede03a46b5e8c618598a0f620cdc2e18274ed2e5021fc0a2085bc3d69ac81812af262022162676c28e8dea1ec2566e8c49d3d418d36ab5eaf57ac868680d9fb2d6c229183e30071940bd501c5853b699781d6cd5284c024b45bd6503530bdf734dca250214eecdbc48983807493e868b38b5ee3325231ee6670937144b0eb05cc10e8b0218caf1350e745e7a291742dc29052f7d44ee5994559f95824ef815b9f8e22768e6bf50ad0f0c28c6f76158488fbaac37eab57a4d30bbc498f803c42c57145a637939fa2b172066b24ba7c68660f5b9ec1ea2d69e41b734e47d5d596662b65641449676abc68aefc939c0428ce696635592e54a783a7cae96b22d6d7cc6875cb1e46cbb74100e73509fae1b720863d6f1af1cc3625e6aa0e08823cc21fc59440de4e4d9d6929ae5c03497610e320a19521849eb8356533165115c8a58933b4a6086ae8943c052d80a4b2fb4355566a4471dbab4cc43ad564e9f4505259766bba1108a2187d1bf04f24df7fd19967645a88a489694092dd689183236b2c698f96c3e994de2386e349ad6c2df0bd9a506878996c48a88c6a3d16836a9562aed4e278a22d87519b8c812379d4ea74952a954aab55a14c7e29c9018364cc6580bbd4b0e9e142ce03ca77424d7104511330f0683e17058a954b6b7b7a3285a2c164414c73132994c26f3f9bc52a9b4db6de8c524eb333e57c4216e8a489224c3e1703c1e57abd5adadad5aad26c13211ca020a15e069f3511916ada4425c5deaa43499e756ab5b71d147e571aaf84a6b7e7e7c1a11c2eb06c092c0a74211b064fd2ca10e429a0917f82c65b123875c61a0a0c9218410f90b007d5010910f9b25642282ff2ce7dd9346518496315f2cc4b96ab51a45d1743a1d8d46b55aad5aa91a8e5dea88480c69e330ce701c3be7aefb83cbcbcb4ea753ab37ac8d160b301d21a2c562717979351a8ddaed7614c575b6f0ca668c303b138c60caaa72af1a9ab9e7f45668a9511411d17c3ebfbebe6eb55a3b3b3b699a0e06036b6db7db8591c4743a1d0e87f57abdd56aa9e4b881b529a6a3edce66b3cbcbcb376fde74bbdd6eb75bad56178b450879a56fbee198655e0026e59ae5ec8c0aec49effd4086551ac2be5a4c5c244ae1a5d298f0d121d65056ed551acc9a853b211592826516ea0e39e7660629a0545060b9b2805772d985d9bf84770bccfc7e0c2b6ca6699a2e168b344dadb5715c31c6c4719ca6e962349a4c264992743a9d6ab52a22206279bd0f243a63a0dd5c2c16d3e9b45eafe3f596bd878d884bd3743e9fcf66b35ab5b67a6121cfabcac7e11038f002ec15499a00f17a57bd5edfd9d981ffac8b8b8b972f5f361a8d4ea753a95444a4d168586b61db45010892b753a5accf130a481f5e0f4ef4c1ad149bb24c87280b49d92a5babcf0a745219c0ca1d69a950673df1f19acf32a214b036c4bf35bcdfd0f821b971b056d105f377e179d89ed5b2416f0f65cc5cce5cc6d6b92c50d02a6ed3dd6e3f1efc7c026aea831816b2489264b158786e554195cfe7f3d168c4ccdd6eb75eaf83bc2897d1d1062dc35a823705cce51111f24c93c45a6b0c13595c8de3388aa3288ac46b8222b3749a4a44203239f6c45e49016025a2288af0b6f89070188ca2a8e683885c5d5dbd7af5aad56aedefef379b4d634ca3d168341ae092a078aa90823e1e72253e01dc939961d18a34711ce3a7bead31c6189ba33ca5fc483b4929188988d6e4ba1cfcd50d0c8bc26e52c4d077ed45b28661157bafac675892e553c5188d0c4f24a05da5f48a0a16f07aae4ccdadb7c392820e8bd7302c66463bd12fdaacd57a570ef1730868a81f612d21b0603e9f0311e6f3799aa6e3f1783e9fe331b3d96c3c1ec3e12733cfe7f3e9749a24099a0566f1b6b7b7ebf53a7e0e87c38b8b0b309a5aadda6cb670231e8693e9743a180ca228ea743a90d444a4ea43d8b1f17ae3f178381c2e160b660660552a15a8a8e6f3f97c3e37c6349bcd56ab9524c96432a956ab711c0f87c3c160301e8f9f3d7be69cabd56a488c6d3bd234edf7fbc3e110c0144551b3d9ec743acd6693992793c97038840958b3d96c341ab55a8d03b615628a3f09ab878a31ece7f2d6d7685848ec496a9e6105e7acda2e9f3ebc5acead02807b3753a30d29252b814ad9245d9840a97a3159980905d090833ccda114e3288b989a5bc89b24bb2e3a37aee4e2117252e12f1ceaf6e143191682d61cd04a44e6f339181633572a1563cc6030383f3fef76bb0097d16834994c9c57588e4623e75ca552a9d7ebd815314dd3d168349bcd902d11b75a2d2476be89cc66b37ebf5fabd5aad5ea6c36bbbebe36c66c6d6d01ad4ce092015cafdfefdfdcdc40744500602990d5eb7568a92e2f2f9f3f7fde6c368f8e8ec8032eb45a40a8abab2bc88c8bc5e2ecececeaea0a42a5b576b158c4715cad5689e8e6e6e6f5ebd783c1a05aad76bbddadadadadad2ddde64302e154448cb144a26011b6fe22c3527ec4ac5a2745ab108656b59303ac620c85b7ad392ff6ae10b0d6b5a25b322c1d5d421029dabb6b7a9dc7903285bae29d48dec94c0e954213130497358008f914bd8d619960ed8ecef36853d7abcab68a50fb0b7ead0b28c38fe3adc1f86d69405e9c73305642ab52da4544800fe75cabd5aad56a49924ca7d3d96c063a06512b8e63ccc1cd66338097b5b656ab4186d2ceecfc9619c3e1f0eaeaaad56a55ab55b018bc00a44b70b1e9740ad284fcf5adc0b99acd66afd7dbd9d9a956abce39cce2351a8d2449c0fb767777bbddae31062f0c4d397276ceedeeee4284acd7eb483f9fcf87c3e1f9f9f9e5e565a552994c26699a562a9556ab65b29eb9f4835403956352ca7a7c7a0af068c5b68264acaa777d843e287c6eee24fca938988bf4f9e75e894be38b61736f34c1eaa2104db2ef500e7f1ca893f4dcf82d4836005678e20a26112e50b916bbc95b3b4ed85c8b3f956de9e3f4cd735ffd4ba08fc5b050b2200ed56ab55eaf57abd5244966b319843e6656f513d8ca643269341a3b3b3bdd6e773a9dcee7f32449547b1dc771a7d3393c3cac542ad8de75369bcd66330096eaa4aad52a242f20489aa6d56ab5dd6e371a0d64c8cc50752d168be170a8a0837d28168bc5cdcd0de84fabd5eaf57a7b7b7bdbdbdb49924081d5ed76f7f7f799b956abb5dbed4f3ef9646767a7dfef5f5e5e56abd54aa502eeb6582c5aadd6279f7cb2b5b535994cc0b3269349bfdf8730d86834600c311c0e279349b3d90caded4d108a0ccbd38d4c8bcfcd21866c0b89712a59098bb28095bbba2e3e7c1011c1cb55c8a7de43a2c971a8b0a36a7c480043c644d9ee4d01b2acbbb46ed230f7689d0194acad960b66096fc3b0d6851cbd429987448c6e017f3ff3f0711896de0e48aa542ad56a1544890afe6a89080aac46a3d16c36dbedb63106ea76cdcd79efc610d944045b906953439e00acc964321e8f9d73ed761be425376c8ac87c3e1f8fc7101e615a351a8daeafaf2121429955afd76bb51ab466e13be0858d31bd5eafd7eb8d46234de09c83fe2b8aa25eafd7ed76019d4992bc7cf9f2c58b17954ae5d1a34751145d5f5f5f5d5d4135860fc11771469f8512127f2e4aaf94280527995af4c996e9c3cad4ab011163649e63670a08b4042670340a4e42b55a29ac697a1259dd554cc759295582359ea5e94b73a0408a5c3e3e8b47a5c4aa0858b46ac342b4c9a3034ec2316373c7e120843f73094264cce5f90bbd0a03caff43edb0707bc8148032618c56952211e8c96432512216a6141168b2c4d337dd03556700ebf53a00623c1e5b6bc1d78848b955f84468c7903e8a221025d816404894a59b8724c4561181aa0b4262a3d100902d67f5ac053a33f3783c1691cbcb4be8c886c361bfdfdfdfdf3f3939e9f57aaf5fbf8ea208f65c5110b2df653d5e0873cedf7c48854ab45aa84dad8ad028a1d83dfc798e61adf4f4e4014b44b492c31cb260416580c512eca6c9598493405725657aab304d6ef829bdba0eb0f45211adc21b5da0b182c55fc8b3747a31a45412b0b0db33acf01c417fa2b587e01b76b1cdb0f8f30928b40fb27427222002ba22580cb815f453501b61135340c3f6f6363441575757c3e110e21233630eb1d168b4dbed7abd8e897fd0a84aa5d26c3681508bc502d36ded761be465b158b4dbedfdfdfd6eb7ebbc71033e0f27fbfbfbf57a7d3c1e4fa7d3e7cf9f23b2d56a359b4dbc2aa4423cd45adbe974b6b7b7a1113b3838f8e28b2f86c3e1e9e929b460bd5ecf39d7ed76dbed76a55201613c3d3d45b3031163668032661887c36114453b3b3bbbbbbb9d4e4744767777f1b8b026684585708e619c73221d3363df467f2b922dc18559d3af6e03ac04e3b9a6d4a7eb43894817f4e60732ff02a87df2e9734480fddf5a657c18af6a26ce4ef6e9dbe6869010e66e035822848f0e2e865c86d7dd484bbfdbba33856176222ef7027cbba05f146290fed450940d737db314d17e260105fe116609a194c151442093475154ad5631eb67ad859ce89c8311d3d5d595f291e9744a5e836ead6d341a303445e5619e112803d5bbda97a3892f160be755ec18a9546500b6d56834eaf5fac5c5c5e9e9e9e5e5a531666f6feff0f0104afd2449a0d5d2ace238ee76bb954a05faa9fbf7ef3f79f2e4f9f3e7d7d7d7f7efdf570c25a246a3b1b7b7f7fcf9f367cf9e254902c1b05aad9e9c9cb45aad67cf9e7df7dd77373737511475bbddbdbdbd46a34144c6184c38b0b79f56a3300ee8c672c11311151cd1309b5c1f9012ce55cec54432dc8a280432821e0d69cdd261ec4aec0a81a6549fe5cf4d56907c0bb7d2af2b15b572e7616eeb008bb2dc2a773597c63993bbe4ca660ce96dfe48370734306d9c1c10ae501651c1a2885cbf0494dbfb332c34384876500641cc419382225c44000a38a6695aabd5d234bdb9b9198d4640282cd6bbbcbc24225dac074bd4c56281bb6097008605ab887abd9ea6e9c5c5c5703824a2e7cf9f5f5e5ec2a222142dd99b56dcdcdc5c5e5e5e5f5f6bef8ae31873976acc09d970341a8dc76388abcd66d3397779797971717173730338c3da9d7ebf1fc7f16432b9b8b800f862eab0dfefd7ebf5f97c7e7676f6ead52b2c4b04144e261368d0e6f379afd783f5bc4e7dfadeb83ccf0de0c59ac3291179c593928e0c870a74554b051973c88f988359c8707230942bb585e45e2604ac200669f2565aa54099bb54dac6f4a764955685c424a2c467991c6973daba10ce8cc90196a3e5ee274bb6eb4f96e70185842dd8d28bb72af882bf55c8951533876e6ac2a290603588f6cd75e5f3f30a22f2210c4b070d689ad5c25b336766689a11033302ed57c0114d06dd398c2160685a24057a1c0e872020d3e914537ed013c17222ec06613b20224864b09fcae59feb452232180cd84fee801c5d5d5d6986979797fa2d584b4444002fcd01e40ed9c2108c9967b31911596b61b48172535d0905bd943dfb30819d51591f208539e544ba68d27ffb32256e5dfae6097a0aa04acaf857780ccb27773588316f4da30fcae1919e97a61129110683bb805090f89c5e09d1085f1a021620ded32511c1fe4ccaadc2dd71b04283f1578c314b57a54bea94a679bfef26f0686a028b2d55e01a6f0654e459bf6016dadffb30acb0c340c1049e124a2e4a71c53bffa460f4d0e578124c02eaba167d25ad481d0c75dd1f15802987bc1a831b311b084004b16266585a04ad5354a12e817bdc4a25ae54aa22b25824222b8fbaface984f14bf4c07f126580aaeb22a1101973b9d4ea3d128b642cd165396b82bece7feeb94252d1def0071a2c87a0e25ce85fd7f055be4314e9f18260bca2f47b8f2b4a8d82af07f2e263ce6e2b33afbccf5ecc7ae4448ffd329832b0096c6a09d942edfc165a551219f42d0c2810e0b791aff02e40b877285cccb9598ec5f3278b39291265305b9cf09a5d1f0eacf17b944e4bdfd61691bc2da3aad0c93f53aa0f564cad6f7858fe660d3407d90f18b96c398d263f844a4d4c5c9e113f5c3c398628f2a3e17ea790a5a8ce62c4bb182001c61fc3a180d674e7549367b3687f42a3284f3a72658d6533c42f1a4788e9bf4b91210d5b006834ec8949d100c8b2577924310f26027a222a1f6eab50c2b77cc3d3a1c997269727ddb7f9aa872dd33ac758055fe13c139832b54e6955439149e152aaa88284d570c2b5c5668bc3d3dced5af43eea8cd1269f0ed2ef0cff5b30eccfce17658e01160466a19a05880c9beb089e7a04a3b6dae2b8660a45a1ef26d5775a07afc900000200049444154f05406584809ee638c81a92a8456b0215833cc6633b538c58c247b2a87cf296897f02c81dac218cc451ae75266b6d6186321cc420107335a68f443184573843e0ec515764b9035986ec5717c7070006d1d789909cc2015d7dcd26aac92a6c9703882985cab551b8d26161ba9d103910a83a47d92bdd6890347c901ceb2d7ce94231765018b281c031407691df332869d5b1e013a39dc1411635881d15b782187bca888832fed156051007f01ee8852517f5542640c6ec72be955cc188a046312337b8ea63f5797c2f65f5a0e1a9f4b1642db87f4d3bf8680be992bc4b706ce06f15eae4504d0a032390ca02898f0d26e9f03acb09272cc85fcd812ea7730f8e43854ee5e75d4058bf6f97c0ecd3ad62dd76ab5f1783c180c602701e3753c0b699819b301d65a955ce0183564522abfcce7b2582430cd9f4c26711cb75aad6eb7ab1382e44545fd8ab01895fd01e066b3d9cb972febf5faeeee2e164b623100123bbfb52711c186be56ab6d6f6f13d1783c1a0c06d64644dd66b3e5fd70a541e9710822a804634ca8050bb555fedbf35d4b4a18d65ad18f9640b932e5f728503e6f587a24bfde28e8b77aba8c570b06654e21fadc12b0f0333c0f0816f44aaa4370ce65e60dc38944635697c27585d039a071e6b45aaac3d25601aaa539fcac318b993fdce3288a188b01a11bd2ae88e5d06a8d157a74d1341a135262c00d6a8b0a6418f1bee994074064bfdf0754211ff8de832105d621c3b5031c78212533b75a2d104309b49ebef540b705b37b8b0e13c711115d5f5fbf79733e9d4e014940c3f3f3f3ededed83830358e1e7be54c54c66c6e3d4a0bfd1681c1d1d81128a086630c90bb38acb986f7df6ec59abd56ab73bed766b3eef1091b551bdded0d59dcea500166b8d12101d35f492b591884b92c4b915230b2026c39574c4a13c60651a983fa28131ca803d1909730e8f9e6d15f917790a430a3e592073fa459b01cb04f318b97942fde91c8149313b632854c633434c4bb18bb973c02320a66376ccabfd80393708f89209c54375524459f508821a51bb9fb3b98388bc2bc30a4901f9921511884244047b2bad7b18971bbfcc45e10c25ae2a761d6d427f525aa9cedb1cabc32cb00c159400856a08c6cc6a9efeead52b63ccdede5eabd5c28264acd4815da8122b9829dcdcdce03d1b8d46689c95240966093ce62e1916be428ddd5fbc78212277eedcd9dada9a4ea7979797b06edfddddc5472549a2eb1cbd9386d5c2403c88fd3c06d64eea0af02449c803967ad79acd66e7e7e73ffef863abd5dadbdbef745a9d4e1755005b2db5262122ec651bc7b1b54ba763699a2c1609724681636a02996b64ee18c697a55936ae305e0af3bcdae56ecfb0c27c54400b9a138ee8d5e2d5e11965b63e5463347e4d58396ed7288d219234b5605b696a436d17f45ccc196f0d9ac078974a4ab814a134946a3075f63004afcdbdf5af0adade8361052d66d9f8d411a80b5cc484650a2871ce0d0603acc5035f80dac85a0b4b2ee87d6ab51a6428d828c06409f5648ce9743aed76db39a70e1e66b319e2b7b7b7f11409442de7dc6c365b2c16f0e2b0b5b5d5ed7667b319d458709205eb8a7ebfffead5abc16000e375e71d30cc6633601cc84ead566b361bcd66338a2c440f638cb5c6394992643c1e4d2653889c4747473b3b3bf0d8050f108bc5a2dfeff7fb7d586c844aaec56281459144d4ebf576777761ead5e974eedcb9331a8dbefbeebb7ebf0fa7cc44b4b5b5b5b7b7678c79f3e6cdd3a74f5fbe7c8985df49326b365bcc2ce28cb1711ce1bbc6e331164b56abb5adadadddddbd46a3b1582caeaeaedebc7983f7198d46a3d1687777f7abafbe3a383840b596eaf8c3dacfc5e8d88709b22cb3401a954c9dce7212653894569fe44542d5ac61f592035be4e5baa2159332060d756515a1c254e9b114aa3c1862b02c012c1151fec5bc52c66b20ca2cc7d11bb5713aef678602ee9ce304c5a043f86d3ae95f551091f7b6c3528ea0def8a22882d911a418f272194609f4c08b8b0bf63e4861694944c01de400abd19d9d9d4aa5029282eee49c83460c59e9b21e0016f4faa1a64cfc0c66afd7ebf7fb93c964329960c10df929bf376fdebc79f3c61853abd560c83a1e8f9324a9542ad0ca4f2693d168747575359bcd40916ab5dac1c141a3d18ca24a9a26ce4127c54452afd7b7b6b6d2f40246a7474747fbfbfb30258da2081eb55ebf7e7d797909ca09f6042a371c0eb1b6b1d1686029f5e9e9e97ffcc77fdcbb77eff0f0703a9dfeee77bf3b3b3b7bf8f061b7db85e92c9cd59c9f9fc399579aa6af5fbf8ee3a8dd6e1bc3699ac2ebfccb972ffff8c73f8e46a3c3c3c35aad46c4878747f57a238ee3c160f0e2c58b172f5ecc66b34aa5727a7afae4c993070f1e3c7cf8b0d96cc2854ece9f8f563dbd0db0720c4b45c222c3d27b7d8c72b1d5223e4879e225592f3c6618530edac4e30d652129f753f32904243322692ed2e34e9a032f570836d80eaea8c30a9764a82fa61cdbca9d2bd2850e1e24cb55dfb523ff2585f76058b9db255833acf29ae294ae4006ae4136c1d29676bb2d22f0b8c2cc70a0ee9cbbb9b981a578bbdd9ecd6617171793c9049c4b7d138fc76318b8572a15789842bc0483301859bbddbe7bf72e9cd8cc66b3d3d3d346a3d16ab5b6b6b680713040478be976bba051f0b4678cb9b8b8b8b8b8e8f7fb607f22827710a1288a9dc3d8b8d42f74bbdd478f3ed9d9d985c3afefbefbaed3e9f47a3d3cabdfefbf79f3a6dfef63dd62b86e693c1e8fc7e3344de188f9e8e8a8d3e92449727d7dbdb5b585120633dddddd3d3a3a42a1bd7efd1a0e2a0e0e0e0683411cc7c7c7c7dbdb3bb3d9743c9ea0abc7719c24295686dfbb77cf39777afab2dfefcf66b3d16804f434c61c1c1c743a9dd96cf6fdf7dfe34decd22db54ef3a9a0b7d25eadd15529932a07b542fa7c64f16a685c222542e28acd49c16c9d826efc5e8045c189781d16f9636699740ead7231266b26aa9c8b02cb89db00963146457809786258687fb5b02522efc4b0b4c828cbf6cdd2c07745bcc95b5186fc169e82b150193de4e6e666381c763a9d838303f8937af2e40984140a6c1a202742eba415cfcc90836081a97a680e14f940340016f8d47c3eef743a272727bbbbbb30ce04b3830face974cacc878787fbfbfb575757cf9e3dbbbaba1211589c625661b15818c35114a569e47b0881cd55abb5838383e974faecd9b39f7efa693e9f1f1e1e7efef9e7878787d82c274992bb77ef82ec60e1d1c5c5c5ebd7afebf53a0ae1fefdfb77eedc71ceb5dbed76bb0d500398eeeeeefeeddffeedc3870fcfcfcfbffefaeb172f5ec471fcc9279f341a0dec33f49bdffca6dd6e3d7efcddebd753cc871a639bcde6ddbbf78e8e8ebefaea7f5d5f5f0f8723f43aac289acd668787875f7ef9e5fefe7ebbdd3e3f3faf56ab711c19b39c13c831aca0d2f310462bc0e28025add55b858d4aa12704bb5cc3d346c5ccce893e25074c0a58da148d31488f687a1b606513a8a25d02c05ae64f192b2d49532792aa600838d339c49061a98aa308649b01cbf8e5b15aa4ae4c8d152a46ffaac23b31ac62c3c55d6046582da89eb0b40e20ad4089ab9ed4a1bb21bf72109d736f6f0f2a6aec09864e7b7c7cec9cab56abc3e1f0ececcc390702727474e49c833075767696240936b351ff30a860a8c01a8dc6f6f6366c175ebf7e0d49d31b28ad8ce955addeebf5b6b7b7e1308b99efddbb777070c0ccaf5ebd027ef9e2426930bc1b4f26a3d168dc6c36f7f6f6a032ffe1871f5ebd7a05ff13d085596b5badd6f1f171a3d18044767575b5582cc01fb7b6b67abd1e26077446556409d9f8eabb77ef4551f4c30f3f0c8743203894868d46e3e8e84ea351ffe9a79f50e0c618b816a856abd0f1a193a08866b3196645ebf5fac1c1c1f1f1f1c5c505b635f3b6f26c2d2ff7b7f5f50eda85fadf085814a60718414b55da96724016c688f73311c673c6437406b0c2fc45c4bf2a608888566ed7cae0a9340638b83af720658824589a03b99503c012e78c021617dccb843c2b100f9717fdfaf63c60850c00e015bef9ba9e7b9b0efe171044e4960c8bcb02e2d58f283459e160826586502b82a4a013ea3a15e017d452a3d1086e1b743d30dcbf38e7a6d3e9d9d9d99b376f98f9f0f0b0d7ebc169fa7c3e7ff3e6cde9e9699aa6c7c7c7954a458d836125301e8fcfcfcfe13a666b6b0b1e5d5ebf7e0d8d72086da872dc3e9d4e61680ae9f5e1c38777efde252278ce811e8d08d68cd61853a9c4cec968347afefc05dce01c1d1df57a3d630cf44700a07abd2e22ea21faecececa79f7ebababac28400a635e15b55fcec2134faecd75a0e0683ebebabc160001555ad5643210386fafd7e9a26900103435c49d364369b625a83998c59ae19c22640308cd0d9005d5114c7d162b19661a1f9d00a8c947423a578a8ca9071a503b707acd2781129c618c358252381268bb29a750ec4c97508450508cb05573663e89cb336140f53e7c4ff958884aade0a5d8ce0843931c6a4a941c57af39e12c0626f0c81acf4fd39e013c5defd170c5eccfc512cdd6124098cd0e5c1681910bb804a2a651011b4d1501589c8e9e9e9d9d919dee4e8e808f1f02405af09699ac2798ba2db783cc60c20a44213b855223fe30bc385d168f4c30f3f80828d4623630c2607144f1163adbdb9b9b9b9b979f1e2c5703864e6070f1e38e746a3d1f7df7f0f91106e02432a47de24328a62f8e7fae69b6f5ebe7c8909044c6b62bae0d34f3fbdbaba829777dd32bad3e9c0c905a43f7055668e22db6c369b4de8e6dc743abdb8b8f8ed6f7ffbf2e5cbd168349fcf1e3d7a74e7ce51a3d1984ea7878787c3e1cd6f7ffbdb76bbe55c0aacf4255fd59c31062c162933f77abdcf3efb0cdec47ef8e187376fdefce10f7ff8e9a79f7676765ce00ebf383e05c7fcaaa630a5675e44019059bbd2526553aae5faf22ee046d85029034fab9c156288d85a55dbebd20209f450ab95e13980a295864b44de025839a8c22facc809b45ac639d1c5cf12b8002c15034dd67014271874bcf370f884c807a48756cbfdd59b958ac847b17437c6603b1cd879ebec12f447d0c5607b7722d2ad719819fdfffcfcfcf5ebd7a3d1a8d16840afdce974e03ae6f5ebd7fd7edf5abbb5b5757878b8b3b363adedf7fb676767171717101befddbb07c7c7b096c25ba1fab189ceab57af5ebe7c092fc9b039d8dedededede06c99acd66e05fde47e0e2fcfc62381c3e78f0e0fefdfb83c1000054a9548e8e8e1e3d7a04a32a1798cf4033b2b5b545442f5ebc78fefcf9d75f7f1dc771afd73b3a3a3a3a3a8202aed7eb3d7bf6ecf1e3c7cf9f3f27a2bb77ef420305b38966b3a96eb644a4d56adeb97374707058ab2d4d222e2f2fbffffefb8b8b7363ccc9c9c9af7ef525e46266faecb34f1f3f7efcd34f4f9acde6679f7dbab5b50f3c851d43a3514739349bcdc3c3a3e9745eafd7f7f6f68e8f8f5fbd7af5fbdffffedb6fbf15911f7ef8e1f2f272676747674e42a65606582b90ca350c5a39f0d3019fbd38a96995a915f32c07ac8043e1aecc9c20afd62d860c4bbca12c7b3c2a356e502bf9db861ccf52600a8faab612bf885d258fe068955b05baad546d0cad4d315b650c1b93eaee07086a5fad467c0ac3b93e4b01e7a2bf509ef57e0c2b876e68a368dcd0c5a0109919e64ea057908974fb060cf891df20079e8ba1a941bf454ca3d110916ab5bab3b3b3bdbd0de3296606ee0092f6f7f7b1630da6b7c27743e65096e34d9acd26acb1a06eeb743a8bc502760c954aa5dd6eefeeeec39c1d284344dbdbdbd8bc6b6b6b4b77b14e033f36e2cd47a127025244510450e8f57a10722b95cacecece6834c22dfbfbfbf03b5aafd767b379b55a41b224593073a7d3c1b617d56a05fb09b5dbad3b770ef7f7f745687f7f1fa5319d4eeaf5fae1e1419224954a5cad56f7f6f6b6b6b6209bc7719ca62e499246a36e8ca9d56a272727f3f9a2dd6e031f61f0f1f4e95358811d1c1c3c7cf8107b0549c12c880258f1f26611c23838928a8d3e12cc88c34614b0a70c6031af3a95a60ef7dfc801960819a3aaf710a4149248bbb30738bd770558444b8b53a8d8c19b8a5065569b56903773cf011619a32085b902e75c8a91ce39e78f4eb557fa870e84bba0ccf20c2b2f18e68613d47baec396f6eebf48d81291b732ac70202d1d6c15e98908148682a91f9838a4de95682e9fc562618cc126a3e22db64404b37560672282311fc22011014ac4bb70511b167d61e53e88dfd9d9817d00f36af28b88a228827b2cfd844aa5727474b8b7b74b4490012b95ca975f7ef9d9679fb1d7ca3bef1e4785263dd66ab5e3e363101f1bb897c19b3373a3d1f8e28b2f3efbec33f16607f84c74365a4e69a5c62cbfbdd56ac571648cd9dfdf6b361ffcf33ffff3fdfbf72793c9629130d368341491388ea2a8f9d9679f7ef2c9230c12b917d3328fa2e8f0f008f297ae6583da5e44f6f6f64e4e4e7ef5ab5f6d6d6da5694244c84a2b4b963a6c550c2f2126548a17008b680558aa3ecf5f0d1a0c51005e1b7a1a07da28a20cb489f7dc4005ff331c90a82cd821863cb200b06081b5f4632379317089412292a62677d51f433b2c388f331a1ff22c63d83993a6c639ab4c2b4da1ed5aeab98c31d6a6d6bbf045d049430ec4430fbbab5565b701a6bf00f062e6f7d661e530ce055bdd04834fc60359d10a117c444ddea1c14105837c61b68bfda2045558aa0adf054674c537c43be0add08d0137ba83bc4ec639976285308cf5013149924491857a8e8830e399667d045250d3d65a504818a0a9bb5409bc80a92b77ecb8036863365e5a59d685bac977cef57abdbff99bffa7d56a83af351a8dd168b4582c207a031031074a44a1cf55c562f1663e51141b63209dcce7f36ab5faf0e1c366b30955e0d1d1d1fefe1eb47b00b5829697020ccc41552812e6b6025adee9a7fcd48310f897513308f1b6efe04aea6a2a6c6bb98697ab020556590989e580452b238955c766163fab289e58b10216889bba540e1eb7b4532fc29606ad0ef1e2a109cc1a8095a126cb1836c661d8656fa9a323716995e8989deb11a56db5b4bf6c4ef03f1fdecab0ca1b69418da5312202fd5f69322d0be32795d025442494c0b53e141ab49e3467dd268b3d77e060e0b5c126146891ba4b2b7b2f57412fd225dce4737648a338a5a67ac6af58d4373181c12a11c1f81e8b5a9cf7a9804bba300052adbe217918f5df2828002466e6fdfdbd9d9d6dc4604e436469acafc592fabd3c2868a0e10706fe6021ce3033c14df3975f7e292bbbdfa57217060da5755d6c0f618c312c520e583ea5099b9b093c0285af1d369862ccbac005ce4501cbe082ba9d03cf2dd9ab226254175f34e042003059bf16ad08580a5b3a6eb9824d96f336f1384f92d4b9344da3344de1e45d19969ee7948ccab65002457d96b68410acc3a6521afeecc08b99730ceb3d5e31842a188ea3027413e65cd3a1a0b0b4bc42f4d1783fcbcb2a585150c4dac973fd41c9851f333355a529cdcab1147917029af1eaf5c47b50c83d5d3f47bc6d847e48a8e3b081272f244e036f168a7d5a96e173c5d3524cb3027675915038cc8a67b25a4aebaa89889c2395bcc03d418a416fd3348110e4312be44d9a077316ca287b8d0b577245973bcfd56031bdaf1d7e6b0be5ac3048c10d521003f5e99ee6ac443f221231480ed8a10260d1d2c94c66a3b0d0a3439aea79de819f4298314b85469a3a6340fc8da75996283566b5c7b0c296090207c6a514f86e5258dc505c7f7690f49620b2816195b6aa62dbd2d28191811a58111164ba5c1ba76c7b3759afca5afa4484f534509c87da74cee25ac8bf28e839619e1c2cf45728a1405d42decad12c2dd743afa18668398ab2e780e1fb13858648143e45d3284869bcac5cd6e00dc1adc823e02a67110129cb9567093014804ccf7d392beeacdc87633d262d195f44ab2d0ecb1fa1c55bbcba219ed70056b1cab40073dd896fcdb034b7dc60cc05fea5e95db0346f3de7ca01d672d4cce9b664c5add2c0887415547ba5f149028615f961436709d3348dc0b9108f23b40139868573cc95eb062ea187c8b0e4b3d05c5eaafc67272432bfaf0e6ba53a451163264ebf1fe7d8264bd7cdb09780c2ae48815ca301ae1a86c3e1d5d555abd5ea743a711c83f15aef1b3ee884ab16af31e180a354c564179a65bbc98afdf1528762a2c8c2510991d115ddcc1c9edb6033ae50db6dbd577809dc31e3b978b762b15b6ba26839472105e28676a9c4305f8d592841c8293b00533966245ea5c2dee11792e17a36e7fc43ca808995be7d2060859fbfeec6d210e6a6859c832ac90a89ebd27b7bae0c4889f7d297fbcc00b6c8fb78201193032c11a8d8573a2f453d257a6821ce39282198970a5665585a4790ee736c4b5f8abda4b28e6785e5b911b6fe4c504be4363aacd2a014006805d370488210b3b1dc1f16d5ec2704156e2890e9b4dad026a06e17919b9b9bd7af5fcfe773ec84aa2975d21d2b69540d147a8cc28c9e8880f4b1177f142cfc57a8a74d27e2d23449d3a576bc52a9586bac35449ca6ab7d2bc8af31c2732108abe8aa2408c3a09a17a8e4856fc4d0874f8ea208b302ec1d66a95e03778593155a62d9bac81b1f14e3fd55d6b68e2a2e664e997e98b9a291c5e6e15563797191b2ac278cd14ca80cce7231efd4633800a030071da87247bda514d428ab52506e229e8b1579966fcc4cb45c7b180a68457d96094c49ad8dc0a73cc3729e61d9509f65ad5d2c8c5fe790615b61d3c0a7a9413c65b1271cffb457969628059ec5fee702f38759baafc836d612022630ad369d4ed55814cb03adb570bc89ceccccb042c25660ba56066c564446a3d1cdcd4d9224d8d259f538d0a01311dcb300cb66b359bfdfc7aa175857203d66d38808465e58a663b27a2ee49624e970381c8d46d85ab5d56a610f6a66331c8eaeafafb11119045e787420a2c160707373039481b128ac5b61d904a689f78435064a06ae506104d86834767676b7b7b7e6f3f9c5c5f9f5f5b51a1c6c6f6fefefef63facf65e77d72308468f43bde148cc2106585eb1cc414cfc3c8e26b14555ab406bcf4def0840b8095bbfaae80159068a62c60e92b699ee2c57cc98a81bc06b034c35cc9e47010ff63810e110394f45ecfad562b0a8318c34b1c34982b444ca8fd802c91a6aa4581b9c96afda6d632e444a5ed52a0e75a08ef51d4d9f0a786b3350c6b7da30cdf4ca0fdb1d660221f9d135ca35eafc38214fa72f54d8c9b6131806523cc0c570ad86414ab0bc997b2736e3c1e5f5e5ec2bbd3743abdbabac2d23c64beb5b5b5b3b3638c190c062f5fbe84bf145d6ca88321321c0c06070707980d90a5f1e7f2d39c93d96c767ddd3f3f3f1f8d463013dddbdbdbd9d9b136babebe7efaf4e9cdcd8dced1a4695aad56a7d3e9d3a74f0783811275d80aa469fae2c58b7ebfcf7ed6b2d56aedeeee1e1f1fb7dbedc160f0fdf7dfbf79f306b6b2bd5e0f4abac1a0fffdf7df9f9e9e8239b65a2d6beddede1ea862e8d33d572fb76758c6c07bd70aaac80bb6c56c793d78ad6b1b61ca0dc7d266567aaeac6db3f23817bc3c4521a628f1d1a7e43a30af87a73046f185b2b242518705b1d1794b77bdaa6c2be0592b7f01d626ceb9284a559f858e0086e5799649d308ed308a922449160b0b1127491228b58cb1605e0b1f389812d5935c5187b01e5cd5fa5d15f2ff04db622e655821ef2804c99ec034c1b6db6d2c8e61e67ebf3f9d4ec129e02e1dcc2b49929b9b1b088ff078055352887e49926c6d6d811c8134a90b6398bf2b2ac16cddf9a9143c0513945114b5dbed9d9d9dd96c76757565ad85ff0311b9b8b8004660937a9038f2ddc339994e67d7d7d7af5ebdbabebe8ea2783299309b6ab55aadd6b0749199b1728588b0973d1c6639e7eedcb9831dadf7f6f6daedf68b172fbefffefbf3f373bf529ab6b6b660fb9e24c99b376fbefdf6db7ebf7f7272b2b3b3d3e9743a9d76a552b9b8b8fcfaeb6f5ebf7e7572727272720c8b7ca01565553365caa99250065826074a94e5595480a175e79b7f961e43ca435960cab5cae255dc78fb4e529a3e54e4f3fb021605aad2b00971819a89006d1d519eb879c022afd5b26aed80abd61a6827f02cb7b4e333b083f7dc8a60131f6aafc22a2e3613a8f3f593df360cbc0728c99f92671518166707bad226150a1d2811634cb3d9a856ab100cb1a2103bbe405f0eb8190e87b8c4cced761b4640f02280c10118876537d65a10abededed070f1eececec5c5f5fc38516c425220a35416031ed76fbce9d3b7b7b7b2f5fbe54b77677efde75cefdfef7bf7ff3e60d3cc6c0af83f14ee24564341af5fbfdd1688c16389fcf87c3d1cdcdcd683406698fe3787b7bfbcb2fbf04d10325c1c0b5bdbdfdd5575fedeeeec213711cc73ffef8e3d9d9d9d5d5d5f1f131c01143a5aa3040127776760e0f0fdbed76a3d104dcc31969afd73b3c3cc24a2035c4cde1cb6d5855a9d23d387231256d04acdc6b145b4e69644e778e04b94171dd792ef377ed4021e8e462380b58fa56b454ab2f65b7904985f7e61856ee5cd996c684be1c8c59edea5cd46779b60586856d5c60536d9573854c1f3151946158910f3a810859073c2b7893d5e48f72c3a01c967fb729e7421cff09908bf9bdd61266da659aa6ce2d775580e6086eaae0d3324992bdbdbd5aad4644d3e914950d6b72448a48a7d3b97fff3e6e87b60b8b07c1ce700e490a6260a7d3b977ef1e110d0603ac04821a1ee264a7d3e9743a203ecc5cafd77bbd1e96dd2c160bf89e0ffb27acc92f2f2f9f3e7d6a8cf9fcf3cf9d73706e076b4c38f92322d882d76ab5972f5fc2090c3c49d4eb75f8fc3b3b3b5b2c1650514d2693adadad5ffffad7bbbbbb50ae31f36432d9d9d9b97fffbe884ca7d35eaf371a8d2e2ecee7f3f9a79f7e7a7c7cfc4ffff44fd3e964777777369b7df7dd77575757bffef5afb1e01133d9543690ac03a90f042c2a801779d40831940b5856fa338cdc0c4f1f2b6c00beb73ed704d627b91cf4fd437a45d94ecb6fd3f187782dc19477a0cf62556584f19cb5a481f7a1e06d1913c1c50a5531990ad618e167668b05e74b59ea9628c1bcc2b88db2da7b8402c3a26c3b2b6bf499c19c889c4b67b3799aba385efaedec743add6ef7f9f3e7979797588eabbe2b21b241c32522b3d98c88b6b7b7e13a6e341a9d9d9d0d0603f86257bb126cf32722b55a6d6767076b7421e5b9e512dfa58200ea7c7888c72780cea875984e53ea4cb09a505c5e5e1e1e1e7ef6d967f57afda79f7e7af5ea951f1badf52e7140124f4f4f9d73bae52211c1f1d6ab57af3031ea9cdbdada3a3e3efef5af7f7de7ce9df3f3f3e7cf9f4f2613228ae3f8e1c387474747979797af5ebd7afaf4e9c5c5f97cbe383939b97ffffecece161ef1db3164e8b30000200049444154dffedfafbffee3bd7bf7befcf24b7576b84e122ccc6767e2b3e7a1bc50925e02a50fad01acf018b2a7309978630e0afa40aea58519be6bcc6d0267053a3c7d1dc3caa5cf3d37c7b07293360839dd563190675e2658c4139e87f6eef05763ad752e458bf29aac15c342d3b5364953e55689f2ac523b78e3d71ba6c1feace449a57eb8ffde950133fec7f510a973a8ade19d38d0bb54e9c7d897308aa2249961a307a8d289c85a0be7c55ac7ca4bb1f382d637ac22c6e3312858afd7abd7ebceb976bb7d78789824c993274fa047c7d638cc7c71714144400d6c0003f302c877e8db50811111d45b9019f13e216347fb68b55a506f9f9d9d1963aeaeae207842cc1491d168747979f9bbdffd4e44e6f3391cb61c1c1c6002e1f7bfff3d3e04b384272727cc6cad850a1fce1edaed363c4c5c5f5f5f5e5e9e9e9ec265f3c1c1e1ddbb776bb5da70387cf5ead5e9e969bfdf1f8f47c7c7c7f7efdf87838a70107e5fc0529bfb72b4429dae9334e96d7a744d19f6f6f7039acdeded9dd2ebf9bbbe897e48f8519215304db0a888b3d01cc25348b5b8c0b05cd618226052d8288c9ccbf82665afa5b2566db20ce60afd006f43c062af4050cb67c4a8796a88a739bc16ef77ec4f833eef11ca1816c2fac8ccddbc34bfae10d170b8984c2698ad8fe3b8dbedc217b0091613b0dfde0aeb4b408e6e6e6e4e4f4f078341ad56dbdfdfc7541a1101a49e3d7b767a7a3a9d4e1f3c78b0bbbb6b8c393f3f3f3f3f37c6c09d56abd5d2d5337068035736dbdbdbba3c08baf9bdbd3d6885c206847ba1357ffdfaf5b7df7e8b094d6cb7054f0fb55a6d3e9f3f7dfaf4f1e3c7711cc3a1282ed5ebf51f7ffcf1c993278bc5626767078e5fb065ce0f3ffcf0f5d75fc369fd679f7d064ddc7038fcfefbefbff9e69bd3d3d35aadf6e9a79ffedddffddda3478f44e4bffeebbffecffff9ff1e3f7e5ca954bff8e2f3dffce63777efde8da2082a3335c8a202f3bdc5b9c1fc2073296b2e99f5db70356c0f14f45bbdaa5ddd142c3fa9801deba0e45d216673e002b7e28d0c4bd398aca5121780acb4c48a325718a3ac8a3d2343230c8f5eab65bc3e6bc9bf708ca215db8aa2244d139d374f92e5bc217458e013d090ea3916de63989760b9981e3d84653c557096b11679962f43fa93e9dd993fcc0e4b875683b97cf67a68dd6f42e5352d5f753e457e7881df2b226a369b3b3b3b10067567f9f1782c2220655048e9047fbbddc67e5cd65ab80984e92611351a8dc3c34318b2c26aaed3e9e027aad6bff9b225359b4dd858a0a69bcde6f6f636000ea6b0070707f01c1f45d1fefe3e68205e03daa5c562b1bbbb8b784c5c42c3052f865b5b5bed765b1d63f57a3d22ea76bb8f1e3d3a3939e976bb83c10d50f2e4e4a4d96c7efae9a78f1e3d82920bab9a15f1e92d8065d7c49b1c60690928ac84a09303ac30326c3ec51b8bc9de23bc2b997a6b26b76fe1c5e76ef8642a4379e051887461198628a915410576e33500e2f5596a3fa13e705673886058605b605ed6bbf160ef0a0933f8cab6f42b148942d84a0b2e49d65547a16043b5d7470f6b1856b10ec2d6ab3383f82d2244124571b7dbed76bbc815652481f5908e2d70c0048d3baec2f7b1788701bae619c5b7bfbfbfb7b7c7cc40228875784fd54941cc547f5bccac3f8d5fe30e653c334323a0354abe32409d0e0e0ea0ed32c6a86dbab5166c0ee00e3b297c69bd5e7ff4e8d183070f28b080c7eabc7bf7eeddb97307f13055c3d2c8478f1e3d7cf810ef808fbabcbc14a19393e3a3a3432cc280307b73734344b55a6db330189eaf03ac9ca23dac65539885a4b70196f637caf6c6b0fd149bdbed2337c47f48e0b7312ccaf6612acc0c729655852c2c5762aae72a4e5084cc4b1faa0f529dba2c1dda2c571d7a0d57a43ccbdae2bce1f21caefd4386a54b4d54276b8cc1220df5b6543a25aa75adc4aac8b6b480892045fe892652983fdca73b82b5b6528943b15917426b65c0393238515816ba6c85fd4681a81ed4139462126c670fe594b236c9ba4fd1f205a6909f5706ca84251e363e7d434507e4acf9833342f506d5beaae4b17b0d1a01545ae05cf051054842bc5a6fe876b3f045a39c14449288b0a9c77c3e8fe30aa095cb42915bad635e1b008b02ca16368d4c33d928c771015c6e4f91420e12fefcf036b9e171c563d878723d96d67c4e0eef10c2520dbf2b57f8b9afa6a0e7678b42440c2d4d048c3129b3c1869845ad963129e607898897abf799fc2ada10371513d9fb834fb31e7443004dfdded4e1378625f0df18d6302c7dad5c7117ef0f34b8cbad3bb404151470631445e05fcc6cbd8f504d09f310849c7610cb12432aab33801c0c65144c0218ef268dbd2652f97948a4295b7fecb7b627bf7499b28a18804ed8b191b3dea5f9606473ce018c72df0b6b09554801498d31ce09400aad2d8e2b5e827b0b18f9f3bcea7d1dccf1ad012b778b04737fda827231b91c36c7142f157bf2470cbcd1c24063941ce9b7e7ce4bf32ca6e42c36e5e25de02e4de50f8d57b95244ac450c7c3f609de96a7b2a6b13e7a0b75ad96725c9d21ade9895ed3b7bf110edcd7a2fbec6db6729bd082701a830e9a935958b0c8ecc6c88a0055b5bcbef55811f836189c87cbe1099e90743d88156481fa5dd581fa7350a145754e20026d478444147bc9b40a42c0e74b9f3b07d84cf2d4de3bc93d25c83c31ba6de775a78355dfa5d5bbe12bcc54b4197a9cf757ead865274edf37eee39b216ee95193729d83173169880356bf5565c08b4068cc292096b2d4c1016885ea542fbe30fe0472194fc29429143e5e2c30eb9ee586c3feb1e5784b075655eccc43f8e98b1e9211119b5cff20c4b88d839ebf917fb713a3146b55a9679b95f9c8a84a58d240758bada5f023357da389c00adf059fe28e477452a25aaef14320cabb4400be7f9642292248bd96cbe58ccf5838d31d84b221c7e5d76b17898ad0ddcce50b69f843a42ca7a0d0d752814b0a1b026721fac97424d81e6ac05aa00a131218ce67437b8341e8f6f6e6e607706d7ef6ee9feb864d59eb248935d5e1f02d3baf82c78e5db5ce979ae488bd59d2b76ce221467512c5798c556551ab921fe36797e94c06be60ab96039b939652e4d31bde6b381e422a4c1eee869e0dc517916055c8cfc7c22dcfe85ba2d3d7a7d5612454b7dd66201cbac08dc4a670f815c98b3521fb936b005e3028451415246281231ff13ffbbd094f4036bf0fd1816582ed1d229f07c3c9e2c1673eb9dbae832141bb87052215101088f560d3d7922c6810062bc0909051d3ed7a6918f09367dd08fd2f4da1a42466303b77cece183829156df4df3d74b0a1cd56ad539777d7dfde4c9132c39ea76bb50e1e99b1befc7993da0eb138b10b30e92de11b0f2ce0bb5dcf86d804501b894128ae2d5754d28bcf74fc79b6e1f6ec3a4d6c56f3e86215792b70961a30d8b57f3d4e11cc97cb11305eb8168e95f1b6b0c8d5fde9f115c74b4c6736de0c42df1fb1b72c10e96b3a28cbe4308a6fe6ad87e96c7b0b4f9fd072491b7eab00a21934064694a3e994c9d4ba063463af44f15b2484b6e39119ba681d7274525d507b107141b78c243b62a46e5980e744648000d77ce6b95f88541186498595d32626610d379e1cc0b0cbb146131a5a20bad31210015c09b376fbef9e69bededed7bf7eec1810452c2190e0464f596556482b76755c5941bfa80d659587f9ca500948530addcb0a273319be38b69728deead77bd5386ef746f0e5c7205b2995515395438126c4e537c56ae6a148f42cec5810e01575db0c8d12cddf9af36b3b0d63897b18337c6581b25cb9d0d977aab9c3e8b7dc704cfd279436332ae6f4284ca3129f62cccc32e39876ac247b131f94d5e398371b7afc05b30acb23156df78a9c4592c9622a13aabb3d6622dcb643211918a0fe8e1d80e1eb3638d46a3dd6eb7db6d661e0c06979797699a621ecd04666f807f5839b55a2dd87f92276544747d7d0d0b752c1b4cd314c69f4484d740b1c2e8bcd56a31339c9a8ec7e3344d6bb55ab3d9841f88c964a21b23c2f515fc7621fd68349a4ea7954a656b6b0bebfeaeafaf5fbc78f1ead5ab7ebf0f6f10d81cb0dfef63136966ae56abdd6e77676707be2828f0bc5a0a349b8f6f05a65ca3cf9deb71c390beb9e1bc6353cb34a7f7b8eb63855c1fa37767521ff7585a2f61cdea6b6bb9852088a09223f31229783957c322c49c7ab695d7a870d9d8a933e30a4f2a7e5250f569616b4eda389ce4528a37a37fd7eadb64e91ec66b04e29857fa60630c91807760632ee51d70c0c2ccdd6e17fb39635131fcb58304c1d11dd621f6fb7d6c447c707080fda6d86b7c506aba2e1a1bb22a6972cef5fbfdc78f1fcf66b34ea7a3af8dcddcb1f3335cdc586b0f0f0f21dc9d9d9d3d7ffe1c8eab3a9d4eceaf29e0f2f2f2f2d1a347c7c7c7b3d9ecd9b3675830389fcfadb5373737d3e9b4d96cc28d5f922483c1e0d9b367bbbbbbd6dac964f2e38f3ff6fb7d3cd718737c7c5cad5661fd2f7e779f902b853aafdbc3d62d012b54a551965098ac3690dee69eb8b4c1dcb2cdbd35e5edb37ad750fcf075c75cfae2d10433894a3d4a71274c1f86d0e2a7987fee768d2c322c3d3a6f19eff55058301845518af1dbf84d39d10b307f1deab3700e994041ca785f6fe1670642685e2e06b686ac30acd340f27d9f918b3f649650ab96fd821beb37cbf19b182798d7472f85dde66030180c06d65a189763e1f1f9f939ccd68165d56a153eb046a3d168349acfe7f03c339d4ee10b7032994052634f5544643e9fdfdcdca469bab3b3038736cd66334992f3f3f31f7ffc713c1e634f63630c36611691f1780c47a9bd5e6f7b7b7b341abd79f3268ee3c3c343c0ebebd7af9f3f7fde6ab5eedcb933994c9e3d7b361a8deedcb9d36c3667b3d9643279fefc390cdcf7f6f65ebc78017f5bdd6e6f3e9fbf78f1e2ebafbfbebebe6eb55a6a8a013f13263086be8daeea163ccb149b7aaed11787c1e225cd22ace8ff594ef47183ca329ce5297f6a2655fa26a56972b8a631b9b7cdd59abfba3c8243305b9104dd04a06382cd9c7278c7c178494489df284cd3e01121b1d2172b7e48f0ce78bdb525c0ef303e499e6185c514c66455b94b8c30c1141b04b77abd0e9ea29d4afdbddcb973677b7b7b3e9f434a8233036cddfef8f1e3b3b3b37ebfbfb7b787f5c6bbbbbb9f7cf249a3d1383f3f7ff9f2e5743addd9d9b973e7ce603078f1e2853a6028562a1cd73c78f0e0e0e000ef301c0e6f6e6e20668288a9d9272aa0d3e9b4dbed870f1feeecec7cfbedb7af5ebd6a341a9f7efae9679f7d369bcdfeeddffeed77bffb1d76039ccd66e7e7e7cd66f3abafbe7af8f0e1e5e5e56f7ffbdbc78f1f773a9d870f1f1a637efae9a7adadad7ff8877f383e3e7efaf4e9d9d9d9d9d919fccfc0d66c3e9f8b108632f29e1e8a0c2b3c5fa7b15a0f588697bb0f942bdaa930bb4a05554bae0d14c36d1ad9bb34c4ffa6907ba5d2c2e100c46f790c8dfb7250589a5b3106a1c8d18ac75cad5160b7a50c0bfb4b1b639c2363ac78336cbbf4e86042b6a50bcb42ce857943dd94578fb83d8cc92de8516e6582197f11c6ee6741cced4912fbbfe5bdb7d261d11a8ca460be008005dee482ad22aad56ad307224a92643c1ef77abd5eaf77787888c935b8f414bf3a47fd918ec763f4552880a0ea567731e1c78b9f5badd56a5b5b5bfbfbfb2050588c5dabd5baddeec3870f9324b9baba828b64b09e4aa5d26ab5767676f6f6f69e3d7b061cec76bb47474793c9a45aadc28d0400ebeaeaaad168dcb973e7f3cf3f7ff9f2e51ffef007b8be825a4d84daedf6c3870fb6b6b69e3c79329bcddaedd683070fbef8e28bd96c767a7ada6834ac5db551e559a53054e45394dd3d2c1b8457ae63caa5123d86239b7680b033fc3551aa5c58c77afe74ac6addd5b06ac298b7064db9816189404924dabb437aa1faacd263f808ec87100a80880f2707739fc64b8fa93678b715e210e55557b86f7d8585170b0cab586ad9e2a000ed322f81fbb0cd8cb5a0a399e7a67e171966c64cd97c3e8744265e256ffc2a769011a87e50108854a13aecd8e47504fa9e3a1ac07eb7d96c1e1d1d9d9c9c7cf1c51790d430c187718688e028753a9daaa51c9c7fc2db9f4e4a62c6d01833994caeafaf217e42fec5c48a319c24c96834aa562b44b4b5d56b34ea9f7efae9af7ffdebd168f45ffff55f2252af37748a13bab91c1bd7ef2aeab3c250d05b91072cacd260e6bc41502853d01a9e956b2dc59862b84d9a3f93c05980d0732e60fa3b1d8bdcaac8bf36a7dff0262155c97d0b624219cd18f65375a45bb4626c563a0fb6c5debe47d9961ec339446b2d7a017b5d676eeda1096612c97740ce8229118928c6215e1422946facabb40067983fdcd21d3815454b535a5a62ed12d4a1db367e9d0a66eef055cf9f3f7ff3e60d3ee3e4e4646f6f0f1962b121e086fcca61949488c0ce0daa7dcaa27b1445b55a0dfa7ee02311351a8ddddd5d40e4f9f9b90b1c631111c8202680c187f512f4655114c1cb8d736e6f6fefabafbe9a4ea77ff8c31f7efcf1474c1afcea57bf7af4e89131a6d1683c7cf8603299fcfbbffffbc9c949bd5efbf4d34f2e2e2ee6f3f9b367cf9c73b55aadd56a753aed6a35d6699a906df17a86a531da527378edcf9735c0ab2db932c3a056592ee6e7134222f0a760551f9da329f90ae12c57fb14a01b338b776d1c56b4f34b744d76c67003dbe2f5faacacb57d1eb028bbb428db0e33b581fff0ceb7acbe4dfb12664b2717b71440a228aa562bc6b0b5368a2c330a888db17008035306c5f5bdbdbd5eaf777e7e7e7676361a8deaf5fac1c1c19d3b77b6b6b6d2348de3189ee0611e52a954a08cc7c269fc141138bd0a5f8b999bcda67abc429161e611057d7676767a7a1a45d1dededefefe3e5cdfc0fd0b1e114551abd53a3a3a6a341a7a57b7dbbd7bf76eafd773ce1d1d1dfde33ffee3e3c78f9f3c79727171d16c363ffffcf3bff99bbf393a3a1271fbfbfb7ffff77fff9ffff99f7ffce31f67b3d9fffedfff7c7878f0c73ffef1db6fbffbeebbef1a8dc683070fe03ca75eaf1319b58347b0813f90db0056816195375fca8ecce1d55c2dbf35a6b46dbc35cd9f552816d17fc331e453ebb45448e30a0b5d8bfc2b540eb017f9c266800f25bff2598512655b3a6308da15da67810d60e4feffd97bd3e6388e244dd83d22b3ee0b55000a3740821425526a75b7d4d76876766dcddeb5fdbe7f76e6c3aecd768fa9a76da5115b6cf1a60810f751f79d47c4fbe1a90c44651540e8e81e7637dc68c9429e9191114f3ceee1e18edf66de10665f11cd18da56ad18cf0aa31c88b35078aca5e273e07f1459cc4a2d3cf30bfe5086859941d7758410aeeb448045b0b823638d613d4404f4f17d1f46ab6c368b90ca6055085700cd0b1e5508ea8230c1f8938810970a05309585885798a0343c594a99cfe7c3281322d66023ee0233cfcdcd799e87cc113a8a2e0f274f581c11e31451b41289c4f2f2f2683442061da0dbd2d2522e97eff5ba994c6663636330e83313a25f65b3d9d5d5d54e07f9abb38b8bd54aa5924aa5982fbc607896327885987639734fac27d8f2f7c9a7a6e55de04ddf6f1bfbe806aa6cb1299261917a32a6b39e8c7863bcae68ca92a52da5d5f45f8efc7e68d2b625c65eace3d00e31c08a56b9c44de156b3e4ab2c59d6f9df351e56bcab48295d77acf749294dae73bc0374377b58c0440322bb1b7f7104302022b83e8868898ced1a8ebb21f49d71cfe5c862857be272631bd2910bfbfcfc3c808f8890260337817e2aa25834c67f15a96e8410f01ac5a31134a25aad96cbe520ca814a44fd7e9f88110bebfefdfb77eedc01b564e68d8d8d6ab50ab7e34c260be08b6c4ce31666a8225f5b25240bef280e58e31d34095b7c099cf114b44dcb75cef9ab90e94af80b6fafb676d125ac0abfcdca369e646164350065adf037c62f7bac8a61906db1329ccbee5cb63d0b433ed4c318db62cb0c6f4aa22dbddb2ec0b4d078a99fb0f65cfa057f28c312629ccfdde8cfb0a118d089199bc05111d55346c9b28c7dca2ca6b16e7ea175c35f14f7b1bf8d8e6c58204a36baa36613890458150e197e0b5dd556d7e17467ee6f025ac1ea0f35b352a920c01e4cf541102412495c5e2c1633994c1806c3e108841189bcc230ec767bc3e190ac3ca657dba766722eb2e0c3de63be20860abb5aa6e1e6ef996dbd0b5ce93adbe9d242a69bc4652d842d5b12fa54ac5f98666628986972a6735d06a0f62ca1b2a23c9b72ca6815ad4d0f67765bfbd5a6774e7dbd59d11aae4638733e5d74066dc81e8f4dbf13d63e9a6404315d5a5b53fb06628da2645e72fa7d4434538bce4fd67cad3d86e0b6781c4d5a7662606df05444bebf768d439f272280948cd6c733b3e3602012862a72142275341a71b4e8324ac93b16d03a94645a31bc1ab0ec3d6232ce044d82d465bf677edc2b8efe0dc8747f7ea7b6d3fccb3e7ad97e9aea953a5215cd8bdb5a1ebc79789225d99e5951939e88eb60b818740be09df18037f799863c6de9ad36edb2a1134523222218da60bf27229e8c5dcafc9d189639cdd41a8d3b39acec86848ecb61cf9edae58eae0ae1ccc69331188c61d27e226e32180c1a8d0611c19900f1b68ce828828ff9f0e62df18e002cdb5aeffb3e3251e333c0650c4aa8b910f7c4742745f8eb791e78a215409588b452e3a8d0b07c31f3c1c1c1c9c9692693b975eb3634d0d8ea56c8b4023853622d75ba81fe3db3a7ebc8bbc09e7e2cfe35fd5ed3f86523578c6d89c9e51664f930d394cdc16c31d69af0706cf9beeb4905169dce266b344911ecdb4e924861de298658170ccbee009749ec9c085f50262da5865266680816e5e472399b0ad96f4e539ab6dd694d2dc084a49442527b662e97cb488a63eb8fa6360d3e4ef30ec39e50d148f3d3e974068301ecf18b8b8b668e320625f8c6983d69341aad562b9d4e2f2f2f6381911ac789bf58598a17ffeaabaffecffff9d7c5c5c59595d552a9d4ed7661d24279cc80166b25d32035b3f5d86d91a786df2bbedd5bf7ff4dca6515f8ce6e6d5bd565fe5cf61e1b0bcc9735bf6d50a3497b1618165a38c801d896bd3591b3ec7946117972d94ccdd6fb0c71313b0d96d18531dea856c21e88998dd325e244337f3f1b967dbeef079ee72915baae934aa5e1021a862192bf63b2cc188fc6858a142e836286bf982f61800cbfa17f8d46a36eb74b44d96c56476ef14a29b31ac04e77681c3e632e6d1475ef7ebf5fafd74f4f4f91eb01739783c1a05aad22c3b3b995b66c61994c462955afd79f3f7f3e3737b7b0b090482447a32133a7d329f38e523ad96c560839188cdebc79033a6922db2026bdb9ff3430bd15b0628dd226bfe6d3f095dafddfa7bc0bfce8cfbab547a0e95644165130f4caf60bd5b32601cc9d0de4d9111d629e5c388ade77991b476c69f4e5121f4df535a335b0650f3247230353e87923442f60167038504af5fb7dc469a0c8926dc28389c8da0dcc426736ef0f180253634beb46023183532026b085c31c6ecf6e181493516c2c6636f9100d076c341af57a3d0882b9b9b952a9d46ab54e4e4eb074b1582cc2037e341ae1fe7098705dd7f3bcb3b3b33ffde94f8b8b8b77efdead542aa8cca83001a24af87e904c3a580d4e44fd7e1feb28e1446a6201daadca20f5cca67619609916661f32fbed7175fa43ff5dc96595f98e6f2fe359d3cd4345211ccc8736d752b476d5fc6943468c6d990b0d0c89c91080c66f7e5a3d3498e54499a5ec44d3a6e43a6ec7e00b9a65c1eef81cfc2366163fc22c210a6d7cf6b1ae058ee622f294450c290322894422934967b339666eb59ab55a5d6b8d100b524ae434443f475268600112d923941533034ddaedb6c9029fcd66e7e6e6b2d96cbfdf6f341a6649a752aa50282c2e2e1ac0d25a23a9bdd6ba582c6e6f6f2f2e2e3e7efcf8f9f3e7b833c2d7743a9d76bbdded768510a9542a9fcfe3056bb5dae1e161b3d9fcfaebafe1ea45a4cfce868d4613b1b4128964abd55e5cac221c58b3d9fce69b6fdaedb6e779b95c6e737313b9a3651491d5b4bf18845d0158b6986b63fb6732afbf67f94f6740df7b7bd9bbd862f5ff0b95e2b25664e3117aa58e4c4e26ea2f4f461f328022ac3c2f06b0c87209303a930d2f7601ecc247ea170e5dda5475cc86650c4064f50afb85637bb4158b0ad1f84094b0e4586b8d15ce42885eaf57abd5e06fa9a398c8f97c2e9148a652c97abdfef4e95321e4caca32c2f2e572398a30bedd6e9f9e9e8222d56ab54ea78373c230ec743a8d46a356abc1434a29954c2611e60141205aad56269341f5c199debca68ea61153a954a954aa56abd56af5e0e0c0f058f35e070707f57a1d9c2e954a21d129a0b95eaf7ffbedb7d56a757d7dbddfef7dfbedb76767e7528ae170840fe9fb7eabd542b6fa172f5e00430b8582e779b76edd42782cb2e6196250650fad364bb7bf8eddaaec966188d54c80fbfb94cbd0ffaf686b1b2bed6663148bcb9a0d4d5a45a6c5740adbbb0ab384660ed1741f58af8c0dcb5c651896c12fe32420acb9459ac253a844cc8c8270ccb10b9f8f48fc103f2c0358ccdc683486c321ccd5581bac94829e2584e8743a676767bd5e0f2c31325aa94aa5924a2583c01f0c06d96c167144c1c510330b999f7bbd1e8cf750ee302b371c0e91f72108826c369b4ea7cfcfcf6bb51a02d1f8be0f6684db22ee8db170a1e4f04a0d82e0f4f4f4c99327a7a7a7b55a0d91adf052ccdcebf5f6f6f64e4e4ea00902b6eedfbf5f2e9711306b6969697979b9582c9e9c1cbf7efddaf7837bf7de4ba7b3beef2d2c2c148b457872a552a9e5e5e5e5e5e576bbdd6ab55ebd7a25a55c5c5c4470547b10b3b7570cadd34763dff18652cd9477812bfd6558986115b19de6104d4e7ce14ce3a90031d661db3b94886cfdc96658068c8c910b48649e6eca6317cc94475b32ebe35d6ec39a7ef399e770149e9823ff4f22c2e215f86ac23a3e180c5aad16e2f071940f22d26c299148168bc56ab57aebd62dd7754e4e4e5bad16eec051a88a4aa5b2bebede683460b1761c07f1f39452a552697575b5542a3d7ffefcd9b36750c1606c2a97cbb76edd5a5a5a42d09bd8dc1fcc64081ff8ead52b24945f5d5ddddadacae57230f0773a9d7ebf0f23dad9d9d97038bc77ef1e82f995cbe55c2ef7d9679ffdfad7bf1e0e874f9e3c69b73b8b8b8bbff9cd6fb6b66eb5dbed42a190c9645ebe7c99cbe5969696fedb7ffb6fefbffffedededee79f7fbeb3b393cbe560ea52519821d39e668297fd21626c8b2d3e65b7cbe9df7fe7f267e53e7ff9ade995b16d8c6d99436296975fac72cc706ee086a2e414d28af700abae21536c2564c56d8daf83712b35311e4cf1ec879a62d87388172c2c2a2c1b867505cf328766367d14229d4e239e67ad5643089fcc3f5c00002000494441542aa4f902318147389c00d2e9f46834eaf77b304b01bf13894426932d168b52ca76bb035b8fc9964c4458d8ec384ea3d140793ccf0360a552a9c5c5c54aa5727878188621a26168ad89743a9da9542a4b4b4b26005694f8ef22910fb44266cee572d56a756b6b6b7d7d3d9bcd1e1e1e6291f3dadada83070f84105f7ef9e5d3a74f61844aa55278c73b77ee6c6e6e9e9d9df9bedfe974d6d6d6b6b7ef6c6f6f1f1d1d01b85bad16d4c0f5f57544a448a552dd6eb7dd6edb41204d139cae677bfff4701adb33f39c1b31f22ef0a0bf24db327bc4252e7e348977b63d4b47de94b895e159142111ceb1e7164dcf3299eed81a5f8d37bc9e9c858cd1ae08cb88e26c495f8b614d8b7d09dea7502840f53b3c3cf47d3f93c9643219e324c5ccc9641219658ac562afd73d39391e0c8644e3d20701c2c9f85a5f4492367e091485ac0284e1d1f62423d443d054e3a7aa9436b58c30d51cad52342643ad75a9545a5b5bab56ab4b4b4b483a5f2c168510b55aedc58b178944e2d34f3ffde8a38f98d9f7fdf3f373f3d960ed02ffc28003d7f67ebfdf6c36f7f7f7a1aed6eb759c8fe2c1cc6f3bacd9ae58a655d95f34b6b5bf224f72ab9927df8891cb6ae9af746bdbb362b4c83ec7bcbb3d6368ee4353639bb60c0e986c373e0a4484a66e261c395a5d883df62ca159e2661e8d085478aeb167692b27d6148ce252018a85e7fdd059429014c053b7dbc5845a3a9d464018a8b2854261696929954af6fbbd2008c230c0f2e07c7e3cdf974c26859086714077435c877c3e0f8d1246f47abd8e59c242a1904c26bbddee68347af5ea552a95aad71be572796161c1715c5c8e2811c6a3c2f67b408d208273b55addd8d8585e5e4638537cad7c3e0f5b58bfdf3f3c3c6466a4b700b7aa56ab9f7cf249b3d9fce28b2f7abd1ed2f37cf0c107ccfc873ffce1e1c3879d4e07514c2b950a82348c21d9f753a954b95c069d3470338d327c890d8b2d0e659f60b7daeffd35ffe6e55de03e7fe1ed1543d71568687a8ae32864e2d1d15a1188cdb028a266c604e6baae012373ab3014c6a534b67687ac061c155e6b0d3556447ceb1a36ac18eccd14432e52a914fcb06005874316112d2c2ce472b946a3beb7f766381ca652e96ab58adc0de8c0954aa5582c00c811e88e99612f771cc7f7fd66b3b9bbbbdbe9748410b064cfcfcf3373ad563b3838d8dfdf0fc310ee02ebebeb707d5a5c5c4c2693a9d4385d98552fe3fa4da7d3a5d25c10f850188d2ee9fbbe10727b7b7b65657567e7f5b367cfbff9e61bc7717abd5eb95c9e9f9f17426c6f6fe7f3f97ffff77f7ffcf8f1f1f1f12f7ff9cbadadad7c3effe2c58bafbffebadbed2e2e2eaeadad6d6f6fc3dc864461524ac4fff27d7f717111aa285923a1dd5c8ce8a9f941b33ff6156cb67523d3724de6f2d7be8d8d7fb13dd33fecca9939da69ad8460a5285ace31e19365660c79d20fcbd03d33cf1804a1c120e3e34e5620408a67e22166c12c388aecfe23f86199ce2384c8e7f3781984c76366a542224e26938944c2f73d30ac6432994ea7d3e98c109228c8e5f2ae9b48a733b80f02b38828d93d2cee44043b7a3a9dae542ad0dd30c7078f8a20f0cbe5cacaca72a15010823399cccacab2e338a954426b6dbe1111318f59613a9d5e58a804418888a6d66c9d1682f3f9d2fc7c250c835aade6fb9ee338e572797ebeb2b9b985a8f31b1b1bb55aadd56a6145e1c2c202b00cfe16ababab4b4b4b982445b8e7542a851f6b6b6b854201af607bcc52641a30156b0f957685c7f69ba676c3adde2affe97ce72fb07deb9b1a3dd1480cc894423883b151055708a1c2709c1d396aa81a58a6f545c464224da47ddf0dc3718a62223bbeab14829875188e3353c41816452d19cd5908a0159cb02c86654a1c7b8de9b7b22199236a00ae885c0ccc8c6547e634e02bc2da69ad1c671c2566381c12513e9f2f168bc06b224a2693c6a312951b5d380e6e85007b50f452a9d4fafa7ab55a1582b036080b6972b94c2e971142b86ec2cc874869588c66e6743a95c9a4b466ac97420cc288063ba3d1200cfdb9b9e26f7ef3ab2008a41c2fa9492693e974a6dbed4a29b7b6b616171781d4c836f8e0c183ededed304acbaa94ca66b31f7ef8214cfb4110241289959595e5e565e0afc97e68be996d98b0ebdce6f676f3d29607d6f417bc115b7e742ef32e6fed4632eda565f688c9c004262ea6111d455b86ad495c8448d6521233f9bea428b158180642103305811f860191012ce33fa1619211620c64a66076801a5bdf64c1c442316b26a2ebd9b0de7a021e8980563652a2caa26856895c2e2fa56426639393d2c155b8822223346c4fb80f56f0c1cbc1bc0cf01b2a64a954725d84c70fc33014621c1b0bdf0b65b7bedfb8cc524ad775984d3c2fe02fc32e0faf0bd89b00a0f8724a854a6998ba1074141c0ad0033f7b2925a6027cdf47984066c61c25b442340bd0663d6565e0abc8f9ec9d37dcea9af22e30a0bf24cfba4e85f0a4d024f60921b426ad45a4cd8d97d686a1c33c0e0e03454a2985b8cc5a6b3839eab1417dcc1230c9c4ac23ce75b1c8772643d45a0bc1420a12589a2398f9fbcc124e8b6101f6543d33db06196dad2a221a674c33806dd797e981e6cf300c8111c27252076c2ba57cdf530aa97ac6da75f4f21cc1f9188c880853159897a371a843066c71140cc756d1cd0246a28b908466a2240a77359ed68473bc795f98cf8ccb8999f434eebf31b4c285b1f9638a9894198bf4ac39c41b79ab7c0f9ef2b7b49de659d3443eea9b4c0410611aaf40d65a0b785ed378f6301482b52629432292d267a62018f73ea4c8a2a86b234a6610001604422e47bf290c15f3c5ea451b078423580a1692781c48ee87dab0ec6b6d67b0693dd9ccd6459ad778b6ce78d3daf86df764387498e85a340edc434298a5d1da861b735bfbfd4d2d4c22232172985d5fb6101140564a87f922e6068e2aa50058d8af2d572f1989d6daa4ffc173b1eed2bc2f456605f3214c95c6069c9935ff3d06d5bf677917b8cfbbb39d2951efb0b7e86b63ba20a3087fcce3a60b6e653763c7b960583435ee72c43c88486b65c03156421da5f9a1b1779726fa8e7e58b1ce3f7dc886c9e9ab84b5f8db1c8fc1aa7d1f1bfbec3be0082a148f925218d081189614bbd6ec1156e81fc3aa0cc3329815ed81f218e75fd28a142aad2c38a61e682a31bd4dc269d66068359aef3084dec85be5bb56e9dfe4d66e5ad39c2baa28fb37fe87495a5b68a2a4bc98efc32c21b6ccec795e105cc47a8a7507b654252212020598616293d291520a66a54993d6443f94617d5731f515db79c5f9f685531ddb062f8a9d699f3f0d013132c5578aa184937bde2ef65b5cf19a462e6355df7bc0bc115bde055ef32eb0aa2bce99ee3b3441118c373cacd5643cdac3703c5788c931134089287e7fad2f466ead8939d49a8842bb24c66c22859452ea705cec6b31ac99e7c4faed65575ddd9967febefe99b1aabcec721b5c0c1b8a01d6250c0b7be08c1e3f932793744d3fe50a3e35bdc7dee29b5d7d0e7d171cbc117a07d8cdbbb39dec3e97feb67f101156ec98fa544a1009adb134054909c72a612291b0d3af5ab384e33284a1d98375888c73cc25663d8994d2910e314921e93286a5af7490fdcbcbcc6ab5fe7c0b60c56426a58af6c4899745c1ae4bc76695f0e2b7d9da720545fa8126891bb1e55de038efc2d6ae8d58cdc41ae774ebb54d2bb044c19e1586c8a81a2aa5304b88f80a4a5dac34d4176aa08127dc16ce9213e90e99590a396658cc4821782d4f77f37bfa1dcc3bcfecabd377bbac2ea677be150a9899c6e9c526ec5cb6d8dcc76c63f62961ad5bc45fc6ac2e044be9460ceb5a76abd873cd77b2b73c2bfe3a5f323f78cded8dbc55be5fc5fe0d6fc71d69aae3983da6de78126588286acc44a469ec87050726ad3581615164f40ac38920596c8573a0f1a4e4c442148e26dfc6362c2105b39042fc9059c2d855336f12bbf935e980b92a767e6cffb44ce1d55b24c6980c9f8a665ec700f59d2895fdd54da92e2bf0a4621fff10df6fd8bc912be45d6037efcef6ad756537639a8577529a794311f9bb878e133a8ee3b88e52a1d65a6978608dd546837dd1a20e78d55ba9bd005e5a874a09965073488d03258f19d677822d7372ac67c684a7c0dbec9feed23405f957ef9f42ff8b3f66b22a8a288c6da59ade3a8e83b3c4d45c61ec9e5758af66b2a758f9f5942f55ac4abfebf646de2adfaf62ff4eb6b15e36fda7fd83a2f0587481802aca2aa895d28944c20f7c2cbe21262c9a1653d3e551c7015313e8a3ccc42c486b0e43c152221fe8d88bfc6d9eeea6179185ca6f653a7f11b1806a56bdbf5526e9d505b1b266037f90ad4a4da606d1965cf64a760d7f8fed8dbc55de055ef36e6ea76b2926d3addd6c8560785212111c1591835529c4d552cca49589083891dd5e8f3da2b5d6a49426e393a51431c39788f8a2fb5c9a35e78aaf1e2b746ce7cc97b46f3bddc367eea729189ab5079842c692650e598a5edc73ca18ad6cbb55341be8f0a4bf7bccf78a2ff1b7d253b381b8ef3493fa336d6fe4adf297f9107fd55bc834d98f88cf440ba70bff70adb556ca11626c2f775cc7715ca53491a6687d0f8b5069c582c94a5ac1e35584e31b068118ffd68a8560211dc7134262891dcf8c8735adbbfe8803f85b7bd7b43e655f1bab59226d55650c01795ac40c313b2534412218b3665c7e854c57daf7931f6b90bc9199f22e709977793b595704cd0a7f91952530ea5fb379962159514487318762c14a2bc14c7abc4cc5a01ec26d6aad9931c693d68a5809e1388e23a4640e8998344d302c035e97753f1b2fe81ae833f3f2e9df979d43b35087268602fb1c32a8843f6d3b14473e1d530c8b015552c2dfdd61a6ab19d665d631bec40e15abba997b7ef8f646de2a3f6e85ff0d6f4df7222266f36f42c4d8331e17013994410f441f88bcd3c7444c29c944a1407e1d49c4113f0822c061212e82980b110a81e008ae7494c092209b614db3adeb4b0ce3de8a7d575c6befbfe24c3de995cb7ce121c21386f00b6f06be96d0f54fa6e8035fb3de502df647a63fcff0782333e55d6031effef6921a9b38647702ab23902159524aa924454147b5d6639f78624d1a365e2242ec2d0475883cb6c6162e66868f91e3bad20b85109a2c3fac2b1afd5bcfb90e2ac5de73f29d67ecb49f7b494d318f91e8e2374f5a9a84187b9e596c4bc27f3d625804ee656b88362fb36df3b1ad8d98d1807329938abdc275eaea7b9c7c2337f2c3c5ee5f5a73b4337688226b0c314b662d25402d544a39523a8ea3b4c2b0ac9422ad43939682b5104a690096026011d94b76c629765848c7715dc791d2112cf8fb31ac69f6c491724411a845f36e17fba76f72754f36606182ba7014600cfb1197d9dc6aa6c4d896c12f04e1721c072a21b3804a68a702bb42a60b2cac387c28921d00fb8788f922a6aa6ff8d48dfc5965ba8145ed3ad661197b6243b5bd3e848c1f839414455b515a0b5661a849dbf19127728b8d3d4b85701c092241cc9a69c62ce13494c4facc5b65ea96b3cfa1290e15fb1d0308f33b021f61ec82e690adcdd9162bb66c588e637ec06e05457abc73fa56b6158c2c17120394c2f2008e153ef66ac2f27437a74d43124dc1933d9698abec33635f8a6641db0dd8ddc8f525d6ffa61adbc5d1a8411acaa2a4231d476a2d750449da4ac84ae3f64c82c7fef1cc242542e98d670fb556112ff1a490c44cd30ceb6a99799ab6c4a65426a6558c77d8ef8cab62c0647e83a4986052aeeb22471622bbfbbed7eb755dd7c96673c0608a20c636844f297482883ccf1f0e3d66721c1780e5388eeb26714e229148a7d33648cd2ca1b022f331731004bd5eafdbedfabe8f9c66886a1f437f13b2ddfc19839b9841414f46e03659ce449400eeb2cf67eaf6ad5ff0466e64a644ad65627ed0086067cab035c3ce23c7e1ce496b05b72122ad14398e26cd5a692184264dc4911fd6d8639e48488928e72e91204dfc5d3ddd6d5e60f620ad2b11211d03484410f8e85dc96422914830cbc9179b18ea67421802fe8d4623842a26a26eb7dbebf58ac5622291ec743af57aa350c8e572d964326147011491039b85576346a5b5f2bca0dfef0d87a3300c1122d971643a9dc966b328432e9743ee1ffc39add8da438d1e0723a57ebf7f7070f0e6cd9b5eaf877cb1885b6fbfe6f46f9b6d99df766dd888834487c8e871d9c7329fd2be334db2b01bb991eb0bac543465c3327b88b4358d08d22005432d9436b628a595d24a8d014b2bcd24983854a12662020bc34d42a51473201d37910c1c37c1ec3009f13db2e6c4ced75a0741d0ed76910939954a2125d97038ecf5bacc9ccfe7a5445ef80b5ffe1804d83dd630238a921e1291945229351c0e7bbd5e3a9dd65a799ed7e9b45d771c8034a63189282c9fa95fc771847006837ea7d3edf5ba4a294c4020467b32a94c66535c883c1a50a44da40b13e22716f5586bdd6ab5f6f7f76bb59a49226b10cd44f611e3850b8a2c024816cf8a697fd8391c0edbedf6e9e969bbdd4ea5522b2b2be572d966587635dab79d86ad1bb991ef2a5a33458911f4c45c219aa8b66d32686b319e25a5c482426625a56426ad15b3564862a1352b0e958ae613492b224d600c8ee3388e2ba423c6be9162b6a7bbade8d19445c65655b4d6beeff77a3d040b9e9b9b13420441301a0d3b9d0e45b44b6b4c5e6a43850ca05014045958136de8f0308d8b285c3a47c18885a028529530f5a494f27d1f9194813e626cb037f8257d3f68b75b83c12093c964b3996c368777ca66b3c562114a9ce17750fac230b443b09b7ca848a203c33f323c9f9f9f2712890f3ef860737333954ae14293743ab2f15fe49b34908dd7a7082b63b4a8dbedbe7cf9f2e9d3a79d4e6779793997cbcdcdcdc5781945dc2a4aed710197484662dbe66ef0eb46be8b70a412c650421b60a0f12fc016dc11d891525f8cc4269782026009a19522568a34f1d8dd61dc9895224de484a1108474568e94423a2c1dbe225ac35bed23e637fab6943208824ea7138560c74a484208737475cff34d1055a4ea437266d8aa4cd7721c279148241209c0016c72d0dd1c4702a38ceddc7442cff3f068a48c965222d10e380756de1069dff7915e0cd59ac96433990c52049a170163eaf7fba3d108590891245108e179de6834f23c4f0891cbe57cdf775db7dbed2247613e9f2722bcd17038ec743add6e1775954aa50a8542a150d05a0f06836eb7ab94ca66b3f97cbed7ebd5eb75d77591fc35c6160dfe7a9e874c3cb1558a4600d9dd6eb7dfef67329972b9ec79def9f9b9d67a7e7e1e3aef0d5addc88f22d17c574c78a6603f4812c2886aada5d4cc04d77707b38717b95475180aa51c814933c7918ec342289a354b689549ebcb9d0fb435078954cf4110349bcd6eb79b4c261d47168b45645bc07d3c6fd4edf690ea0ac084a38944024c6430180008a4944852afb51e8d46beef673269a896b0f3a1c836ef532a1c0e87e8cf894402e911a594c964322265e31503aeeb2aa5d0ab0783c1d2d252b15824a27abd3e1a8da494b95c2e91489c9e9eeeeded8d46a3f9f9f9a5a52522c2f983c100e0cbcc9d4e075af07038ecf7fbc3e1d0f3bc6fbffd1659577bbdeee1e11132ad2aa5a494d56a15451a0e87c7c7279d4ebb542aadadadb5dbeddddd37d96c666e6e0e086ed6856aad0b85c2bd7bf792c9e4ab57afac150f17ad832cb35a1004676767878787c562d1719ce170b8b3b32384401a6d9a32f3dfc88dbc4d38c6ad386201cc4ce33856765f1c071010e37f0250416383afc38c9c83e03a4c5a2bc55a6b96ac590bc9c45a48d6a4c250313b8ee33a6e423a098470b88a615dfd1eda3212837d8c46a3e170381a8d882891c8673229684f6061380a1f28d0aee17088947f6043beef03b39088d0f094e170e8385247cb2369dc3fc793652883e7f9bd5eafd3e90c06834422e1791e54d16c360b65d0d4329e856bc1c5d2e9341eddebf54cfe1bdc4d0801e84ca7d38d46636f6fafdd6e1b9b773a9d2e954a0b0b0b28702a9524621cedf7fb8d46abdd6e13512e97ebf7fbed76db7164b95c761c474a914ea73ccfebf7fbfbfbfbbeef27126e2693612bf3b3f90408deb8bebede6eb7f15ef64062ab96d8092ae7fbfe9b376fc23094522255e20d54ddc8f792abe60a8dd175d639766f356e3dcc2cb486d1598c199660a53585e468c5a4957268ac57a9c8943236a790cdb0a6ed5657bf875d0e74332871beef73e4f4845ca1264f97d63a954acdcdcdc14e0ffb5722122094e779b95cae5c2e23b73b8dcdd5d2805484e517937f611882fd002ec330741c67301880cd458b04a5310f65329962b198cbe50a8542a954ca64329d4ec78d0467a6d3e9c5c5c562b178efdebdf9f9792965b3d93c3f3f6f369b854201298cc2304ca5928944627979b9d7eb1d1d1de572b9070f1ecccdcd9d9fd70683bee3380b0b0b1b1beb8d46e3f9f3e7806c3c3a93c9f4fbc3376f760f0e0eb3d9f4ddbb774ba5722a9534f30c317b13f450e8ad93c3d9c56712422493c9b5b5b59595959d9d9d172f5eb8ae7bfffe7d40aa6d25bc911bf981725943422f8de9401ccd15820d1091521aee0b5a6b311e80496bc5d1621dadc2502821dc4422e13ae895524ac78931a9eb00d6f42518c96184461e79c791c6e20b81e5c5719c4c26034392e77948b868accee9743a170933839dd90533c5030ca207f67afd7abd1686e1c2c202a81c59a91cedb9423d8ebb2af3f9fcfcfc3cd08a887abd1e5b0161b4d6aeeb160a85f9f9f9c5c5c5743a4d44502499797575b5542a8d46a34ea7834c21994c269bcd4a2932990cd041ebd3e170c04ca552b1549a83d51f4631664ea5d2440a9caedd6e26934e2e97cd663350365594a7db08aa02463ab65cc360b4c29b1ac31f337b9ee7795ea7d3817a0beb153cda6ee4467e1499692c224218f771379d1e59cd564ad6fac2e9215a57a888484a45046f21867bb71042477cedc2abd3fcd093165f9a34c0eb49076bfb108df3bfbb7a9c45c34ce15fdcdff43133bb6fb445b85c160a85743a6d000eb88b1f3c95ce0b6c6830e8b7dbed62b1b8b9b9994824eaf57abbdd06961b8dc97864595516add08cb430f350fb4fdff70d6025128942a170fffefda5a5a54ea7f3e6cd9b66b3198e0549547dcf1bb9aeabb522d24a859ee711a9e1708884afcce370b1f57a7d67e775bd5e03476b369b52ca64326d9068dac5548f538487608ed00d47a351bd5e87720d7db3d3e9ecefef9f9e9e160a854c2603737eb15804ccdd288637f2238aeda535e60434de853dc69760da11474769be0cba457b801e210b25a5ebb80e8ffd4e899035e7adc59a0958060ee0cb0e3d339148c081426b85611f36a3643289d5d84a29cc240a21e0b2944824a0098219a1df1b6313e6fbd2e9542a950c82b4effb994c269d4e673219989652a9542e979f9b9b83b727d4a25c2e974c26cd0944944c26a574b2d96cb15808430563793299c4ac5c369b1d0e8778974c26834bf0dbac58ac56abf7efdfb77dee4ba552a150989b9b43518bc5622e97751cc1cce572653018b4dbed5eafb3bbbbd3ebf53399f4fc7c65616121994c8c46c36eb7abb55a5aaae6f30521b8d7eb3a8eb3b292832fbe94177eb64aa976bbdd6c368159ad560bb809b33aec7166dd621886a3d1683018140a85adad2d66eef57aed763b9fcfc3b8a6ffbe3db34c1bbed9fe485b53b111d19952bf629f604c8374dc2bc2e83732caee4e963310d1d898e6c4c65b9bc599e75d31261b1f4b702be37e897981442241c489443291480821b5264cf603ad60ca91520e8743d775316d5fafd731a5954e675c3791c964138964269386e70111c1c32097cb856108909a9fafb8aed3e9744e4e4e7cdf9752c24a552c161389849921c4e463a934a7b50696251209d40ed00d3638b8929b12269349bce9eaea6ab1583c3e3eded9d969b7dbc96472797979737313fc2b9d4e2f2d5573b92c10a450286a1d4a294f4f4fcfcfcf85907373736b6b6b95ca4218facd663308fca5a5a552692e9dce361ab58383835eaf37b386fbfdfecececed1d11100ebfcfc7c30182c2c2c388e83170421cd64325aeb7ebf1f8661a552c966b3954aa5d7eb1d1c1c044160afc4b647b9bf37f9cfeede7fb35b661bb03491ad1b5e3436034f7afc5b30c7fda8b5d62c380c5da1949b4824129e741c33ef782d8635fdd54d41e14205c31054a368d24a6badc3102912c7e12330f80353a094816a8d46a3d1681404018c2fa3d1d0f77df8408561a035691dc263d32ca603236bb55a98ec0b82a0dfef371a0dcff360230318799e17e1a92384c48398b9d56a8d46a376bb0dfc86412d0802d7753195098311260de00901aad5eff70f0f0fcfcfcfb3d92c542d6044ad56d35a0f87dee1e191eb26a5948341afdfefb75aad76bb934c26d3e974afd7673e83d3561886a552299d1e85a16eb5daed76bbdbeda552e96432c551ca6f8069ad563b3838e8743aa04870ad80f51d8fee76bba83722c2b700b16db7db7004c37b55ab55cc997ed7cf7d2337f23601271a372d87c230089928108190e3d5fe760c86c8313304442845411068d28e74945241106aada49061180ae93a08b7ec8009719c615d7ff88566014f454ccc092b322745b3a14288e17000139ab16a69ad7bbdde7038344ba30d95d35a8f469ed6ed5eaf27251c3da4e308c771f1e69d4ea7d168a00c4208383ac1bd1eb8a994eaf57a6118d6ebf56432e938aeeb3acc324252168263a5350bca6d7b3645fcd14cdb31f3703804b393529e9f9ff7fb7d8a0c7348557476764ee3b54461100483c180883c2f383d3d6b365b98390d8240297d7676ee382ec071341a6a4ded761be106b5e53202e2a9b5c61c02e0acd96cf67abdfdfd7d8c19666e11d5689cce300600da9452dbdbdb3706ac1bf9f30b5a9f43cc52484de3c413642561d59a840060e1b724d28284520a0b09b5d601872ca4108eeb241c272184a3f59536acabc1cb1c42278f0ddd30701b9ac7cc440cdf741373cad895010ad80f5ac1cc441abe6772569a7840898e961fbaae0b87f568390e6166addfeffb7e001e6a664699391652da9e7ad36625c284ff8800db322b72b4d6707450e3d08870915761a822cf0372c6816c9c300c1a8d26263d4dc983200c82b10b08f6d46a3ea0475bb1386095a3285403101913ac36caeb68ed373e0d4acb7ce1178613cc0482984ce9fa3db6dfa7255bf2431e7db37d07b6e60b92525a88719405221586aadfeffbfe280c9594528d27a INSERT INTO `previews` (`id`, `addon_id`, `filedata`, `filetype`, `thumbdata`, `thumbtype`, `caption`, `highlight`, `created`, `modified`) VALUES 
 (2, 8, '', '', 0x89504e470d0a1a0a0000000d49484452000000c800000096080200000014be504e000000097048597300000b1300000b1301009a9c180000200049444154789cecbd79981cc5952f7a4e446656757555efddd5fb26b55aad1ded0ba805c2181b30020c18e30133e3198f3df6e7b1b9b6afc7331e3e2eefcdf518ee8cafafed798cb187f11bf03306592c360221c0c22c129290d4925a6a2dddaddef7adf6cc88f7c7a98a8ecaaa9604e3057b743e68456565654646fce2774e9c387112fbfafade7aeb2d00000029252242baa0046028a4440007121c0c94082850a200049408524a0494c824020340440e40d7918880c8e8b2eae2aac0189bbd11e25ca7b9ce747de5fad579ce994b321f5c4a79311fa9a07f5447f4b27e24ab500d5d77799f89b898ea09c05024debaf972a3bdbdfdbefbee3bdfb91224130888c06cb4994426984007814b00891285648c21034489cc404444ced0e00c0104e3c8900e2281833196f5a3eb2bd4c4759aaba030371734e7429e3aa83799eb88ea78755008311756e82bf55717c771e8a09312bdfcbe859482bb940e3dd7f987a823a17f70e2dfffed11834e154270ce6ddb7613830490c08051c3318e5230008608d201644c8260cc400404c118678c0170869c730ed23138030688cc05141d3afa5799789a0b7f90012f55501f211bf9b9da25b39932c9c90532d54499a8a2a6d7cbeaaf02966ddb9c73c2932abc6fe1258480f49179fe4a4a0920011918f46344741c873acf75e6f4f4a40d0e32404401c0c000474ae6a0527660004a8327158a811c9131099c2143292548d32b64b25a9c7300282929a17b65721866883a473d9baaa7eb1cfd887a001d522e78e9e30fe7d6442e60652a3b85a74cde9252123971ce096d8c31c2197db46d5bc79642a4eb297ebf828800a854f6f9ce04900020c180548bab36d27f2951740ff7f88a3d8e70101010e353098fc7629683527a2c8b034e0c47cbcbfdb64c20480e6c78281ac8b1bc26935230900eb09e5151122ca7c6e29c8f8c8cf8fd7e8fc7e38211636e62831463b90e66aa451775652ac7ccf2c53453b21134244186cd84883a5165c2cb7582ae04e95be22d521754209e781f12d8c5082220a2e11abbae869620d102c89388022472641897dce7587ec9c0f199b62131340df98536c838038902e333b22057fa73e2281c2ea523adc149aba0a0005280989999e19c33c688bd5caad07544ffca851b17f82003582eb4c17935e35cd683debb996a1100888432a94b018b732e35938b182b531b2a26239b840ea60df20bd937bf3dd1e9f922ce0609d2b8f07949034a20807004320029a4b4b9c940242cc300100071e47194881211246712659c4bc94002721d348a99942ad48f679ee9c25c26e0209b66d40749e6c7d4635dc0d872b56ce6dff3eb4497bda544e94497094f78a221c7182302a3332fa686ef37b9086051eb80e48800081201b80487734326128088c000989428a54460c8d016427226a440892235cc6868920e22bac28b33e1cf436317032cc82030c8ce58c2f5957a7a48b205038dc0547fcb39c4a51f3327898430052f65d453e328fd48ecf55efbf7f72617001602a2cd3cc283204182214ddb4e706999cc4a44e23e6f6e2222c00694b95220302624c49db8e479b68c300409d20603100dc310421886010034225d7a50115826b0ce0f2fb8d084910e2a73786ede4a23866cb43f3b19ccfcfb6e81a5f396c299ae130dc3500446d85250fe83900b014b32eef0e840421808121c2120ce6209273e23393362427064c286735d714086000868c7ac8178dce20c253200092084e8eeee565d188fc7a9bd2005b2b9180b0088d8328105e9ba12d27d5a99c00220e64c3b4e7f924f8a3c55c8d20e524a3a41d780eaab4cb528330cf9acf022a222c3cb05ac442281295381739e4824fe80a84b5e8c2a6c9abf404a011c1011241adc608c912fdd600c91316e30f29f265192fcc7303824bbdf04444551aaa054585678a9d3521761fa5c4fc7a57ec485330d58221d5298415a4cff98c95b38eb2acce2e8525f11af887407849452f9b1a43637149af74191161da147a38faa71ce4f5df87ef2dd5f1858b66d4b292d662160341ab5fcd6d0e0506565658a20180202607bfb89254b96d0a16834dadbdbdbdcdc9c34a478126184154801c2a5fe8e1d3bb664c992e1e1e16030188bc5fafafa9a9a9af47320c5589cf3d1d1d1f6f6f6cb2fbf5c8726cc61dd2baecaaa0a2f12584ace0f2c17c214985c7343a50a75439e40a3a68d042cc33012898432bc6cdb4e2412425cd402cbef512e0cac70382c8420b7d3c0c040535353595919002022cd5c0cc32083809e3f27270753167a2291f07abdaa9920c558f1785c4ae9f57a0180d48165590b172eb46d7bfffefd5bb76ef5f97cf5f5f56ae26d18065d271a8d32c67c3e1f35bace6a2e4b2b83b7d885807581c51f25329b03e282c012e75ded512a4fa4fc5e7450f9b714b068ac12b65cd425d27d90bf5fb930b0a494535353a4f2e9693b3a3a162d5a343c3c1c89441031140a2d5fbe3c1a8d9e3b770e11cbcaca727272e8993b3b3b6b6a6a7a7b7b2b2a2a94b77d7878b8bfbf9f31665996c7e3191c1cf4fbfd8d8d8dfbf7ef6f6969999e9e6e6b6babababebecec5cbf7efd3befbc63dbb66118cdcdcd96651d3e7c9873ded8d8989b9b0b290091093517b00090b1f33156d6bfbab88e640596fe315339ea2a52b7b764bacb54e14937e7159e68e812b0c8ea227865ade4ef5d2e0c2c44f4f97c85858584219672068e8c8c2c59b284737ee4c8116291e6e6e6e9e9e9e1e1e1eaea6aceb961183e9f2f140a4d4e4e2e5fbe1c520aabbfbfbfb1b1b1a8a8281a8df6f4f45456562e5cb890be6a6c6c3c71e2c4a64d9b26272769e04e4f4f5f7bedb5b66d23e29933672291482814324db3a5a505d39cf5d2c5522c7d0988180bd2380c208db12ee0e8ca2a3aaa44babb5c64acf3a8832e7829bf83cbead26d2c256a9e481fc9a88714a6df3ff0bad0ac1011002ccbf27abdba55a40af4302cc3f14d120c064f9f3edddcdc2ca5348cd918072a74757511f81426f4392089611852cab1b131446c6f6fbfe5965bfafafae88788689a26992fca36e79c4b09740748f33e70c87046e86544a93f324b5f8c070080e488cada7999aa102e3449cc548bcac6d26d799e214cf30252d3911d4ccff23eb1bd2ecc58645dd1931414142022b1d7a2458b4e9c38a1467959591963ccebf51615155996555454c4390f0402e17038180cea5eabd5ab571f3c78f0c48913cb972f8fc5621e8f87beadafaf678c5d79e5952fbffcf28a152b2a2b2bfd7eff92254b76efde5d5e5ebe6ad5aa9c9c9ce79f7f9e31d6d2d2e2f57aebeaea482928dc9081ac66a3a0e9c40c0203d0d84b4ac9581a6232790b919f87126486730b3280051a8d65024ba942f2f9a9551d3b43480fd2b313cee2f1b8cba23fcf18f8dd08eedebdfb8b5ffce25c5f33c6c87272e911a6b91cc3e1706e6eaeabcf142dcdcccce4e5e541baaf52e9538282ba268dd764cdd26f0ae99d4d68b8eaaaab94e9a693a5d4dca1a9af24634966d5288dcc2f70dd11d2c1972a70d711120526753c93ae20092947672fc29810424aa1967614c2946721e57bb76ddb4e241cb2b4e82f15e2f1782c168bc5628944821c5dbf0ddea278ac0b9ee648e81f98f8f71f3f723ec6a24e6a68685094ab2c47c2010d173aa294a3ee5ed77f483a8bc849fd45cd4145aa4d1d07cd89c0668d7420e5487797a9e8280293be4c04e9ae07c6409dec2233d0e09e0962adec8e83cd6c2ebde97554417660a591961eb02584300c432944c3701cc7b06d9bb1a42fde300cbd79d5c88cc56274b5df235791cc092cd7881f1f1f07008fc7535858a8ba1935c348ef7bfd69d5576a9edcd7d7c7182b2828282d2dedefefcfc9c9f1f97c524a8a804829cdd91f22e2cc4ce8dcb9738cb1aaaaaae2e262ddc803cd32dbb3674f6b6b2b68d0b46dbbbfbfbfbebebeb3f30c22363636a61e8dea4908e398f28fe880cc6c0a484d33610e073d4092d5084e52ca74fe121a7b6577c73b8e300c3daec649319663db36e736cd91492192a347ad5bd3b88dc7e3e4cdf9cfc0e23f2f170616000c0e0e92772a1e8f8f8d8d959494a8e98cc7e389c7e30040da90ce618ce5e4e4d000628ce5e6e6aabe3f70e0406d6d2d00f4f6f67abddef2f272cef9b163c7a4948b162df2f97ce1701811fd7e3f63a8f0f9da6bafd10ce0c89123ebd7afcfcdcd0d87c3524abaa9e338d168d4e7f3ad5fbf9e31160a8568c4070281898989ddbb77df76db6d75757554e770380c0039393e9f2f170066666668699c060c6481913a225d47cedfb204d64cb5e832e4d38105223d608bf0a42c2dce136aad9a809569d7d3904b2412cab07355e93f81967721e75385d47c131313a669124f103e62b1d8d1a3474b4a4a02810022cecccc20625e5e5e7d7dfda953a7e2f1b8d7eb6d6969397bf62c7db57af56a4879de0381c0d0d0d0f2e5cb9b9a9a00a0adadcdeff77775750180d7ebcdcbcba355c54020b06edd3a0049966c6e6e6e7f7fff962d5bc8c171ead4a9d3a74f03404e4e8ed7eb3d7bf66c5151d1aa55ab9e79e699cf7ef6b3ffe7fffc1f5a036869693977ee5c7f7fff2bafbc525d5d2984c8cfcf7ffef9e7ebebeb0dc3bce69a0f0e0e0e1e3c781011f7eeddfb4ffff44f8a6e219db021c9c112208bc1e76a2ec87074a9b2c8e632cd0496d28c3ab6484cd354361679e439e7a6692a84e91346e22d32fe7ef704961d58ba1aca3c428c327ffe7ccef9db6fbfbd7efd7acef99b6fbed9d0d03039395958584806f5c4c4444e4e4e3018d44d8165cb9645229103070ef8fdfea54b9752732c5ebc5808b164c9929d3b7746a351cbb242a110d95288cc30d8e6cd9bc3e1f0d34f3f5d5d5dbd6eddba93274fae59b3a6a2a222140a1d3972a4b9b979d3a64d645830c68a8a8a6ebef9e6a1a1a1d75e7bedda6baf1d1c1cbcf5d65bdf7aeb0dd262ab57aff9c007ae7efcf19f44a3d1f6f6f6b56bd72e58b0a0a7a7c73066d706a8aaa428534fcc102fec03d3cbae1ed5f9c3c55b19c696a60993c6bbed38c45b42018b6682a4160958fa5f82573c1effed99f3e7972cc07261282f2f6f686888ba2d168b4522914020609aa66ebc43aa3fd6ac59333535f5ce3bef7cf0831f5cb56a552814faf5af7f5d5d5dad4e387af4e8b265cb366dda74e8d021f24ee9bdc539ffc0073e909797b77fff7efa48cec383070f6ed8b0e1e69b6fdeb16347381ca6f901001c3870c0b2acfcfc7c445455523a882c5ce23c00340c8e698be5689aa60284659999062268ee56575521ddfc9f0b583047800d645bed4937b692f84af73b086563d15fd334095e2e6029ab2b168b292f97d4e6e3bf6d9c5dd8c6f2783cf5f5f59d9d9d524aafd7dbd0d02084208b8431b66eddba43870e31c6366cd880886d6d6df1789cd6863b3a3a262626aeb8e20a96f27372cee7cf9fffeaabaf32c6eaeaeaaaababc91a2b2f2f3f74e8d0fefdfbafbbeeba5dbb76c562b12bafbc529965a669363434ecd8b1030056ad5a55545474fdf5d73ffffcf3afbffefa35d75c33353595b2e160c992c59cb3e1e1e19ffce4f1fcfcfcdb6fbf0d11376edcf0f8e38fb5b66e06809c9c1cbfdf6f59564bcba28282825b6fbdf5c9279fdcb3674f6f6f2fa150c750c67464d693a2939966eca7b95855c7c9a44b295996326bfc96c814ddef409248d88ee3e8ee06cbb2e2f1b8699aa669241296699ab1584c995c04b2482442d852d5fb1de847b71f8bda487129610211e92f00505d31e56260a930187a0c2acce57a505fa95ba86f953f42ef5dae39e25d7f792a5022759159a6f98fff78eceebbef028d7af59979ea2fa7c38f3ffef8c0c0c0860d1baeb862936b02ef9ac923ce3a41c0bd1c09906175a98faefe23ee57bc25d23cf2367d2418c994f7c1656c11b014b64827d26430164bc462b168344a7fa3d1682412a1bf04539d32219d4dcf2fff593f96cef6d4cafa41d5d3d9da3d6d3107534e54c5043aaa14924819214ab2d35db8d1094355462f68159bc5d05d77fd49068cd26a4548a6fdd977df7d77ea20e827b89e51014b5549b5925ec88a30ad6fd274a2d0d616530ad11019eef8cc49a20e2f17b00c234eb63cfd55ca111175de52085335ff8deb47433db3aba5f4f2cccc0cc5ab048341cbb2f4c6559022cc8d8c8ca8a01a961ed8ce52ee4d7571652aa5fa72d6710ae9ee53d484a7c734a78813a4e620e5196b8e5981a56e3417b1651d3f2e2465226c2e4144179854e327e7845a59b7e8356c2532798b80459e77d38cc7e371cbb262b198490a320532d3342391482c16537852b7d06bf89bc2d69c8ca5da717a7a7a7a7a9aec989e9e9ef9f3e7c7e3f19c9c1caa1999c64e6a4fe6e1c387376fdeecf3f98410b40ee8f57ae9e139e75eaf37168b01402010d0d1e338895028645956201040e4b158cc711ccbb27c3e9f6ddb9148c4e3f1f8fd7e21049d9697978788b494e1f57afd7e7f22110b87c364c86752a3c28a52df8c71c6380028177626bd41ba32c50cd15b0c2e3a960b353d08d9226d149d28e5a551972184a0a51b42582291201f44cad84a10b02ccbd221a53fa6beaaa82a23b4f01bbd7abf0160651b7612405a9645cf505151415ff5f7f7070201ead4eaeaeae3c78f23a2dfeff7fbfd333333edededf3e6cdebececa4fe686e6e1e1b1b3b7efc7830185417f7fbfdab57af56fa6e7272eac8912388b868d1a28282c237df7c93ba7ce5ca95070e1c0000c6d8ead5ab0f1d3a148fc70dc3686969a9abab7bf1c51701a0b1b171f5ead5cf3df79c94b2a2a2e2ca2baf542a355334bbd000486a76fdfc4c246585545630bd676051417576bad595b6e623842384304d5bc1cbb66dcb9af53e58562c1e8f5b966959a6691a54a0b2f2d487c3611aba90314b9552eaeb0a1abcde35ce0c852aa965250000da22c818fa7cbedadada999999b6b6b6aaaaaab2b2b26030d8d5d5150a852ebffc7200181f1fafa9a9292e2e2e2929292c2c5cb366cdcccccc99336782c1203d30c16be9d2a5bb76eddab061434141c1134f3c41b348eab69e9edea9a9e9e9e9e940208f73c3b2ac0f7ef083d168341e8f4f4e4efec99ffc09b5c21b6fbcd1d4d4e4384e75757522913877eedcc68d1babaaaa10f1ecd9ce75ebd63634345896a520a2f11353ce439db1f4afb292134b77a6e890625956a92f2a90cb45063ab0327b5af747a8802d029969da3a6f5956c2b6139665c6e3718fc78ac52c8294c7635916e9c459cd383333432e2e35452000082132a94a523e86f7062cd51cba41a25421001415151517171f3972840244491fd1099b376f1e1919397af4e8962d5b306546d4d5d56dd8b061606040ad19d35d540f29bb5e0871f2e4c93beeb8a3a3a383e2fb002091489c39738634a6e338bdbdbd8cb19a9a9abbeeba6b7272b2bfbfbfb4b4f40b5ff8c2be7dfb5e78e185bff88bbff8ca57be7ce2c4899ffdec677ffbb77fab2fd0b2d40a5a06bc9236d6ecd3cea1f598b6c8ad70e652857315b2ca5cc062c9c80b3785e8eca58b3e5b246f966ddba66990214f68b22c2b1a8d1a86611896695aa66992a71e00c2e1308d7982296a3e088297fa88a9e5d1f708acb99a263f3f7f70709042af962d5b46dd6018467e7e3e35073933c95fb571e3c6d75f7f7deddab5f5f5f57bf6eca9aeae6e686850e6766d6d2d050c2e58b0800007009cf3ad5bb73efbecb38cb1152b56d4d7d78742a1eddbb72f5ebcb8b1b19131f6e4934fd6d6d66ed9b22510083cf1c4132525251ff9c8472627277ffef39f7bbddebffccbbf04807ffff77f47c4af7ffdebc458a4dd74964aff6bea7ca600e4fa08e916e705f10417825456d171e6d28f2e0e93e93e7ab26e95133565d11ba42528ec9bcc15afd7ebf546bd5eafc7e3314dd3ebf51a86e1f17888b77480a236bd10a9dc24f23d39bd66fd58ae31cdb97210709d03c8e1dbd3d3336fde3cea4597c67139c094a27115321590eb2000a800519d54a832f42da4ac6f7237b0d4ce0ebd3ea95a195a55d32ea8e349672c1d5873a1ea37052c4c9ff0cbf469a38e309769ef622fdb8eebfe2d9adf44a3d16834168944239148381c0e87c3333333333333535353c45b6ad3a27e4d5d0b0380940ec5409f5fb2fbb1309bf9c9d2cd5800f0783cae8d59fab7a4e3d40575e8406a6eafdc9beafa2cc347408b39e4e8d2fd08ba1b42619773c6b941b0516b1abae2cbb0b1189bdbae020d46176429058bf780aaccabe96521dc9bb3656a4d86c69bb290782a6adeb6b9e3085aaa36cdb865252ccb63591ecb8a9a2659f1a6528864ced33e06aeede857ca319d3211914929f4fa9ce7a1d210001ab694c462b1a9a9292a575555a976577f55afa84916a4b679a91a28673d9d494cceb53d612e08d299b4fc0700a74e9da2dd13ca605208534b84d44caaac9fe9fa9b391ef481e142d205592af3cc7725aa89327fce525697faca657b119e74f6d2c29a2dc3306ddb36cd38595796657abd1ed3b4c8fcf2783c86615039140a116f51b8845aa0d4af0c00528294b3b3d7f38b9bb194a883535353939393a5a5a5e42b4f241200402a3c1c0e33c6c8ab445bc1a8aeb66d5324bb629768344a4abda8a88828daebf5e6e6e6c6e3f16834ca392757052216151531c61cc7999e9e360ca3b8b8787a7afae9a79f0e0683656565e170d8b6edbcbc3c6a97f3404a1dd42513582e96826c632c1307734121eb997389de3de73959ffca052cd066153ac2582ac89bd6aa0dc3304d6e9a8665599c2721a5788b9a8574a26118345b64a95dd7ae479612016cc56030376fcd69bceb4f1a0e8727272783c16028143a7af46830182c2e2ea6480782c2bc79f37ef9cb5f363434e804b06cd9b2fcfc7caaf7ce9d3b0b0a0a0cc358be7c795b5b1bb5c8ba75eb3a3a3a3a3a3a82c120a41cee8585855bb66cd9b3670fd1646363632412191e1e7ef5d557376fdefcfaebaf533b6edbb6adb8b858a12733e4cdc5583887631d3424b1740f4256ae3a0f14de2d63659eefea241751e9c731e50cc39416d611464cc6b5edbe8984619a663c1e378ce43cd14ae9459e8ae8a27d759c73da78cc18a32d1b645a21a2c219a652c99de7e9b2ec5cc8ec86e2e2e29a9a1a62a6c2c2c2969696aaaaaa9e9e9ee5cb97af58b1e2cc993388989797b77efdfa79f3e671ce376cd8609ae6f4f4b48eb3d5ab576fddba3591481c3f7e7c7272726868889617d6ac5973dd75d78d8c8c7ce0031fb8f1c61bdbdada18636d6d6d1ffde8473ff4a10f1d3c7870f3e6cdb5b5b51ffff8c7c7c6c60e1c38303e3e7eeedc3972cdeb42b36ba252d56a6ac9cc302c1d7c2e0e73995f982eae1e9d4bde15aa2063b3eb5cd7d78fb33944276962236a0d5af9c84989cf97ebf7fbf3f2f20281407e7e7e41414161612139928a8b8b0b0a0a7c3e5f6e6eaecfe74bcd25bd1e8f87e6927a18346a964386240f1aaea782d9f141de0b94529aa6e9f3e5902aa499a0321e410b3057131cbd7bd4f5fd7e3f1d5fba74696b6beba953a7687ca856a34ad395692b018585509309e170ceaebe7aeb873ffce137df7cd3e7cbd11759796a8b818e9bf4567063c6359c5423b8dbe9bd9ae417948bbcb2eb348545577f2998a2c6617c766722e3dc300c9bf33871bcce55aadd88b7e823adc229f652463d240334923e7a210459f4a9fa256bcbefbefbee9d3b77ce311a92ebbba669e4e6fa1093dd43bb0b6b6b6b0f1e3c383030b079f3667a98d2d252eaddc2c24221447e7e3e6d4625cd4ddba3f3f3f31389c49b6fbe595c5c3c6fde3cc7710a0a0ae8605d5d1d3d406363e392254b7ef6b39f7577777fea539f324db3a6a6fac9279fbcf1c68f0c0f8fbcf0c20b0b172e6c6969219b540dd014336589a54c27a92cd6fa5c3dfddb43d57b964c76d49f622e36a5ae7419a0aa5df4725624606ad1dad562a9b2ee8ac39950e4a69b6f4cfab15c574fb7519000ce987b1a8f19d334963eff5205e5178094e709538b743cddcae69a25ae06966130c5f38661706ed027c698ee4bd3eb80191cc532e6b3f00702a60b8aee59957378edc9ae5761cdb66dd36ec470384cfeada9a9a9e9e9e9a9a9a95028140a85e85be50c8bc7e3e17098d488ba1ad115396ee9be8e60fd8363b37eacb9da57a9290aab8174cb40f51c4bf738b88e732dd0457dc593bb960da50dd3d1cc15c24cd3e41c95914e568461989c73cbb220157bc8b2d9492cdd60820c60cdf5f87f583257f72960d1e313e55073a90d644a21b294f3999a91e223f40e2254a166ce03801069f7521530b2564b974824c6b91d08040060787898621cd4cdd4cfa93b2135b9dbb76f5f5555156937d020a88b6118c3c3c3dddddd8cb1050b16949797a3e605350ce3d8b163ab57af4644cb9a7dfeaf7ce5bf7ffbdbdf56b0a3f83017a4f47b41fafe7ac8c2e47f3ca2fa58ff0829bfb4f24460fafa8752057a984d241251656a6dfaa16a55917ab78010021110414ac952f111d93def7a4f4c4d4d398ee3f7fb11b1a3a3a3a2a20200c85d4bf3442a9ba649bbc1a2d1682291204f04638cf833100830c628fa6c6a6a4a6de2ebe8e8989999696a6adab973e7273ef109fa564a595656168fc77ff2939fd4d6d69696963a8e3336369e9beb2f2b2b8b44228383831e8fa7aaaacaa5705df0856c696d5d2dfec727f4ec3ab674a797de324a81a4cf7266f58c6e20616ac7a86a64f2cedbb69d7ebbe4ff49c6527ca3f310492010e8ebeb1342f4f7f7135dd1e641c6587171514343c3b3cf3edbdcdc8c880d0d0df9f9f96d6d6d9c73cac7d7d7d777ead429bae0d5575fbd73e74ec330727373376fdeecf57aa9ea7575754b972efdf5af7f4d1cf6e69b6fc66231bfdfdfd2d2323232b26bd7ae6baeb9e6a59776716e20626b6bebf8f8f88e1d3b1863ab57afbeeaaaab0c2d894d26b054416ff7df591fff1e45a72e0535fda348ed9663e906314f8532eb1c46ca818c33a5af085298ca752393e137000038d7f62fbdecf7fb29a9dfe0e020adab74767652688365998c617171f1dab56b7b7b7b07070769696fe3c68de4d21d1a1aaaacac5cbc78f14f7ffa53d2f46bd7ae25fda8eaf7d24b2f1d3c78f08a2baef0f97c030303838383894462dfbe7d77dc71475d5ddda73ffd6944fcc10f3abff39defd05cb7bcbcfcde7befedeaea7aecb1c7aeb9e61ad40c3b4dcd6647d57f6571e109344251f330430b34a51ed4a774e480500d4e20538d4c4b408849fc1830778490427d6363e33befbc535050e0f17800c0e7f3ad5dbb564ad1d7d7ab8f0348a91ef279c854e24dda684f972295cab489dbb5d75ebb6ad52a1a19bb76edbae9a69b82c1e0030f3c40eb59e4ca324d331a8d76767646229194399f1c64466a63990b55a08d90ffb2f0d21f5c5f0282f485735d39426a5f024fe55c5142fb1e582a864035b5d4f7e2a6ae96f463299cba9c194489393939939393e5e5e50505058cb18a8a8a43870e8e8c8cae58b182732e84a43519b27b6cdba618e2a6a6a679f3e675777753c285929212c7c07407f10000200049444154712a2b2bbd5e2fa6e62652caa2a2a2a2a2225a6458bb76ed33cf3cf3f6db6fd7d7d7af59b366f3e6cddffffef71b1a1a56ae5cf9e8a38f0a21b66ddb168bc556ac5841cfbf70e142d09282b8947866e3fe5796aceda05b5da859f4a8d95b0a09762a8d20fd8469e9a252d7472171727266dbb68fe0eeddbbefbdf7de4c5f991223fb5a2fd37e925cc85444aa2e95fa385b63f242697e04a642662d4bf7769aa669e96a5eaf926b0ccca5fb2e416a2ec9f475a9fd1a898463db71da99180a4d8742a1e9e9997038140e8729eb6c384c1b15c3b1583c1289ead9b96cdb8ec5c5c9cede1fffe8e12c36d6f91717535d486f526588d9932fea5301962e9cb3142e19e79c60639ab3735dd3b414dad45c57815b7795b1f4384fb804a68b13971ed47a9cfa1420a9349d94964444a46016ea41445214e07222d9e02033386717d862af975dca25abaec9d447ea084bf78c93e87bdfd20bee7834f52bcc70535d02d37b10d4628ef526a5659b940d2e54e42da6fc4abad50400442e8a416c48004821b3bdfd2b2b50f48f1714977ace60ac59b5e89ad3aa8fda97690b4deaca900ee2cc9a5f920b8a0b5b3a23687cc669295008e1f3f9b8e6184f619191479454aa25d0b23c9075c32a64e3a44c846516e602990b55ca5c53b849d958b4c7d29395ab7460b92a039720f55e25b319313531d4466fd2bdae12e8e97fd50974b22de2866571ceb3b81b94e82b9a7a3d30fdf5a4e7879d8257e69c40d78014dc9819c5a1e82a2ba42ee1e93722991dca53a150a9f6968ee3e4f8bcc82432c958daaa06f931a86b623600a024cfbb2e2e24a91bbbca2ee674955d44e532ad5c5acf300cd3b42810cf30b218ecba5ed7ef059780f59b139c557f6939b40cc3204795e3385eaf37454e28936f53231b1f2015df17b3933134b34941f4d00b75b3b97aee3cfd3a9736d4dd198aab14b05c6696ee5960d95ceabfa1f6bc24b392e22df27192218b8c0995a924272787ba82ba84b3e4444a4a50f67bcc06d3f220b25960e937b8c87a4086363c0f9e748b2a6b805e567f9502169b7b4bfb25f94d09e935ea5248b211722e01a410c2b22c4afc9ca43786a954f552d9efde84b42c0fe8c0ca642c57848d8b2db2424a6797ac66bb42921ea1711eae22d1ef089720f5db14d27400b39beb39e700d2341dcb3215b0280247cec6d12497ec62362072649834de5d5da59b72b443abb8b81800c6c74773737303813c1d7ceab78cb14824128944f2f3f3fbfafa9a9b9b8f1e6d5bb76ead6eaa93e2b32ccfd4d4f4d8d81891164562353434189aef5ec1544af9da6baf0d0e0ede74d34da669d2bdc47973e4f7f6f6161717e7e4e4b8a247b4b6bb241710b2b7685d9931e4dc608c53900153af1711699a444a1917066316673ccd78d7579455e461381c1e1818a0d0abfefe7ecac24d7b1a69871aed31a21061afd74bc9b11091d69da91294963d27274719583d3d3d5eafb7b8b8d834cd6030681886949202617d3e1f22d2269f929292f1f1f18e8e8e6ddbb61986313333138bc57c3e9fcfe7a34834c330a6a7a7f3f2f214453ff3cc331d1d1d77de792725f122a1bc5c9665cdcccce4e6e6aae6b8241992d6328cd1eb972563f4ca5c4936bde39800407a33b5195f0ae18dda68581ee4861b58b41f4d7d040044aca8a8e8e9e9f1f97c15151504a3a1a111c33000a0b2b292733e3a3a1a8d460b0b0b8b8b8b2726266a6aaae93d6f24d168b4bfbf9f73ded0d0505353a3b6b30d0d0d251289cb2ebbececd9b300505050f0da6baf353636363535f5f6f652944f7979b9e338131313870e1d5abc78f1e1c38709ca9b366d1a1d1d3d7dfa745353d3891327b66eddaa388952df82c6a652ca89898983070f2e5fbefcc89123adadad14a67149ce23aae9a8cc38e39c01ccfa4b89d2104082044cfee789a1c7eb1342ccbe99dd6551b9ee515252629a26bde69476f8d7d4d478bdde5028949393535252e2f7fbababab53bd9b34fd48a98d8c8c8442a1b1b1b1f1f17142151d5fb264c9860d1b688f35a179debc795bb76e6d6868387cf8f0e8e8e8f8f8f8f8f8f8d2a54b83c1b2abaeba8a12246fdd7a95e3d8d3d3d3b5b5354b972eddb76fef962dad988a34026de64c1fe9785959596b6bebeeddbbb76cd94291f297e4dd894cce1695ad6c59a665591eafe5f1585eaf2727c7ebcbf1fa7c3e5aea9d652c32c7941274d9f294c85a085b19e6f4e203c6d8f4f4f4c4c4447d7d7dca2a023d9c81733e3c3cdcdada3a3a3a4a9bb89593dde7f35166479edab94b498e10b1a8a8e8861b6e88c562f4060a008928394700110e87e816b69d686b3b5c5252dcdbdb535b5baff044595c296f9b65591d1d1db9b9b9e5e5e5148d73faf4e9850b17669a959724aba8f91220622a49ac917cb7439244548271218437870909525f2b54d4e70296c7e3414432a11c07737373bd5e6f4141416f6f6f414141717171341a751ca7b3b3b3b2b23210081417177bbdded2d252afd75b59596918c665975dd6d6d6669a667373b3f22954575717161692c955525242a8226001c0b66ddb76edda6559d6b5d75e2ba5a4c8d579f3e685c3e1175f7cb1a5a5a5acacaca3a363d9b265454545fbf6edabab6b5095dfb3670f63ec9d77de098542f46643cbb28686861a1b1b2b2b2b0f1f3e4c59a37ec73df4072b842c49b37d917aef1f1942866112aa94ba8824129c1b8cf3e4be424ca59e520e4cf57768680867f70f424a6de9f158fa466454cb7c0a4364e3ebb342e57ed77d0aa8852f8af45cab884038a74252bb2353cf93c940cae492e9919300505c5c7cf5d557ff2e3ae58f4784e3d86363a3002052a90553698f9c44c28ec762f178221a8d8c4c26befba35ffced57ff2ccd8f45d0d3fb00002a2a2a08289c73d3e4a9b0e0a44643443ae2f1780c8393de255129e4727272288980d7ebddb76f9f10927605aab54ce55c808c77e6ba4cc8cc27569c2c5391d0904a9c44b95668cea23f54381c7ee699677e1bcdff4721126613432647351d8f46231292ce5241db54a51002ec84ad52a1066b16d88e340cc30dacd9cb6b47c80052b630003096748011d998a68128e93d4724466a03a49eb4830cb29b6eba598b1ab574572aa4984687978eadcc8f591a467b6f8ca26ee5d65346fd2599430424d3762485862a24bb66364fbdca2468db0ea5d77af3cd3723b6e3f70740a6b67fa9812ed3dfa607e99376853dd53d29379a60cc90a99dcd86160c33ab5e558ca8c10d831b866970132570ce90736086403010410ace68c580f2c7314555a8c50fe970919aef0d6717530152af06861411722d93e0259943d0052c489b6873982517e41c543c16005896954818001250ce7ade7524e953427d9e28255254853a8700a6bbcb5df10b86617083f6c49b86e9b5d0b0386326e3a6c98173c61c89532139383a24018305f97e0ffa730d44905200080006022403a979105c6b3b991f75845d243fd113b914b16a10966d738be23f9d4d5dacaf9fe0aa893e2ab2f6a2abfd7f4b5cebaa3ca2db75ac46b55e432a28eb85e689866140021004809c558599d8d2e582f5d3359a5aef330cc3340dc364a6c90d6e71e691e865dc070800091b65df343cf1dc5bcffdf22d07510008277efb75ab6fbd764379519e6971641c24200315a4011a835e647b5de44f745666a9fd272e64b83eb2543a50d77d754ed5b19e79c7cc85a94c2c5ee4f3be37c93a9c2e287af53015a34c3d3e3232e83836ba723748cd783f0fb654639164e2299db44cd3b00cc334381aa6044348c60cce19b3e30eee7cf5f08f7ef2cab296ba4fddb9d5c3e1c489b363839de3a363967482e5450250a2c30111b894108fc7295f0a259238ff93438a51cebfaa789e56cb9cc764823b93ae1863333333f4966b4ca54d8f46a3b9b9b9ae1b4929676666d46439f316945f93ea407b337f1bae5dbabee338b1582cb3927389ae25582aab19636c606020140e4b2993968afe9bb9882af3086aa2b0a53c0bb33616332dc60d8e9c03e38259028d042224e24e643aeed846ff44fcedc39da199d8075ad77ef9eedb6bce9c883dfd54b4eb0c170e93f2a9a79e7cfae9a711f1e5975ffee10f7f78d75d775df0b1a5942323230f3df4d077bffbddac6c9129ededed0f3ef8e0830f3e78f8f061c8b0de7efef39feb5c3e3030b06fdf3e1d52b66d7feb5bdf7af0c1079f7cf2c92f7de94b2323238a6c060606befad5af6665acbbefbefb9ffee99f0e1d3aa4aaad6ed1d7d7f7cd6f7e736c6c8cbefac10f7eb067cf9e0b3ec5bb15f58cd3d3d3fff88fffd8ddddfd6e7fae0380731e0e8785e3d84266598456c63b686012da5bf6a46631e06cd8b18a27263ca9776c58a6e121539d732f479303e3c86c3bee318c0f5fb5bcb36fe4f523677ef4d3973da6599203dfbff30adf23ff1aee3a6d6e5807028687479fffc52ed332376cd8a86ba843870e85c3e1a54b97d2bb99a8ce866144a3d1f2f27200c8cbcbbbe1861bfefaaffffaaffeeaaf8e1f3f3e3131416f2da013bababacacacac6c6c6bababacacbcbabaaaa1e7ae8a17befbd170082c1e0cccccce1c387737272cacaca7c3edff8f8782010181d1dede8e80080c6c6c6aeaeae1ffff8c7a6695e76d965049d871f7ef8b6db6e9352060281175e78414ad9d5d5d5d3d3535353c3391f181878e38d374a4b4b9b9a9ac6c7c78f1f3f1e0804e8c5d5c44667ce9c99376fdef0f030e7bcb8b8584af9faebaf2f5cb8b0b4b4f4dcb973dddddd67cf9e6d6969191e1eeee8e8282a2a5ab870e1debd7b6ddbf6f97c2b56ac88c562f41a07bac5ebafbf0e006bd7aeede9e9c9cbcb9b9999090683fbf7efe79caf5bb7aebdbd9d36fab6b7b73737371f387020168b2d5fbe7cd1a245afbdf6dac73ffef177054addf263a9a02983b3341b0b002863ae4cbd04817e4c077585a28c0c52b28c513234d330684ba08780651896699adcb09019c82dce4c8696c17c28111d99884e979615fcf77bb79deb1ae81d1cd9f95aef1bbb7e6df78f8c0f0e54ce5f6854d60a349e7ef6b99b6ebe29140abdf0c20ba5a5a5a4da9e7aeaa9bebe3e9fcff7fcf3cf575757575757cfccccd8b65d525272faf4697a57856559cdcdcd143973eedcb9dedede1d3b765c7ef9e5bdbdbd9ffef4a7ffe55ffee5aebbee4a2412edededafbcf2ca75d75dd7d4d4f4ad6f7d6bc992255ffce217bff18d6fd4d7d71344f6efdfffc52f7ef1bbdffdeeedb7dffeeaabafae59b3e617bff8c5a64d9b868787cf9e3d7bd965974929b76fdfbe7efd7a5a29223975ead4eeddbbabaaaa5e7ae9a5abaeba8ac0b467cf9eabaeba2a180cb6b7b74f4e4ef6f5f551b30f0d0dfde4273ff9dffffb7fbff0c20b5eaff7965b6e0180c71f7ffca9a79eeae9e979e491476a6b6bfbfbfba594131313ededed6363634343435ffdea57fffccfff3c140a9d3d7bf6e4c993a5a5a59148e4adb7de5ab76e1dad2bbcf1c61bbdbdbde3e3e39ffbdce71e7becb192921221c4d1a3479f7df6d9279f7c1200bef6b5afdd7efbed6363631e8fa7b9b9f9d65b6fbde5965b2e1e580a5e8a5f0855b6e360d6a4200429656909212841b2611894f918b47dfe0070ead4a9a54b972af795cbd7c0180c0c753736d61b864033215818588ca3650b8845f9bf3dfef4c9fef0f51f5892979b5b17c4d3793cd78747c7069b6eff2882134dc45efbf5eb850505f178d4b6ed6ddbb6d1331c3c78f08e3bee58bc78f14d37dd545d5d1d8fc79f7cf249c3306ebdf556d0cc70aadec9932777edda353e3efeca2bafdc77df7d5ffad29776ecd8919797575959f9ed6f7fbbabababbdbd7de5ca955ffef2970160e7ce9dfff22fff72e4c891fbefbf1f00fee7fffc9f5ffad297d6af5f4f03acb5b5f5631ffbd8a73ffde9582cb666cd9a9b6eba09346df2e69b6ffeebbffeebc8c84830181c1e1ef67abdf7dc73cf3ffcc33f0c0f0fb7b4b4fcd99ffdd97ffcc77f747676eed9b3e7d8b16303030394be4c4a595353d3dcdcbc63c78e9d3b77fef8c73fd695e6c4c484e338f7dc734f2814b26dfba9a79eeae8e8e8eeee2e2c2caca8a8f8d33ffdd3c3870fffec673f3b72e4c8f6eddb272727f7eeddbb7bf7ee8282020058b0600100d02079e08107b66fdf3e3131f1d77ffdd7a04d1100a0bdbd9d5216b80cca8b44956ec5d3253d1e4b660596cbc6a2355d7a25d3c4c444797939414d4a49a6250090833b168b1986e1f7fb559016b9288fb4b515151706cbca1832ce2c86a604c63d1ee491eaaad2b74fecffce0f9ef619867412375c7999333d222f5b0e5bae80dc4068726a6a6cf4cffffc5308f2fefbef8fc7e354c3e2e2e2bebe3ece795151d1473ef291bffffbbfbffffefb11f1a1871ebaefbefba8d53a3b3b63b1587171f13befbc73d96597ad5cb9726060404af9dffedb7ffbd6b7bef5f5af7f9d427deebdf7de279e78424a79f2e44929e5d8d8182d80b6b7b77b3c1e993e47ebebeb6b6f6fa70cf5b43cdad0d00000dbb66d7be491476ebdf5d62f7ff9cb5ffbdad710312727c7b6ed13274ed076bcf1f1f1f6f6f65028442fbafaea57bf7af0e0c1dede5e350c6eb9e596fbeebbefeffeeeef543f1516168e8f8f9303f9c489134343437575759d9d9df7de7befabafbeeaeab2b2b232ba3e225656567ef6b39f0580175e7801b4e08ef6f6f670385c51511108044e9e3c89888ee35c75d5554d4d4ddffbdef7e8656c454545ef0a583ac252b8429080984a0a029a9dafce53e4462f0d080402b4b36c7c7c9c3cad94c1766262a2b2b2b2afaf2f914844a351cbb2727272ce9e3d1b8d46a7a6a62627a74687c72dcba8aaae360cefc9a3ed4b972d032698c9189339a6b97ac5e28deb566ede7859ebcae62b1754e081b71a5b5af2d7ae83fc3ce4100c96b55e79655d6d2da5010f06837575759ffce4275f7df5d583070f7ee10b5fa010b1cb2fbfbcb8b8d8b6edd5ab5753fdb76fdffece3bef7cfef39fdfb871e3891327de7aebadfafafa4d9b36959494241289356bd61416160602815dbb7699a6b971e3c69ffffce7a4506ebbedb655ab563df9e4930303036bd7aea53ce41e8fc7b6ed5ffdea57939393b7dc72cbc68d1b8510070e1ca0b11e0804366edcf8e8a38f9e3871a2b5b575c58a15975f7e3963ece5975fdeb469d3ba75eb7a7a7a4e9e3cd9d8d8f8a10f7d68e9d2a53b76ec989a9a6a6d6d6d6c6c5cba74696d6dedd9b36743a1d00d37dca068a0b8b8f8b9e79ebbfefaeb7372725e7cf145afd7bb75ebd6152b563cf7dc73b158acb5b5b5aaaa8ad6e60b0b0b3ff1894f3cfef8e3c78f1f1f1b1b7bf8e1871f7df4d18e8e8ecf7ce6333e9f6fdebc795eafb7b5b5f5f1c71fefe9e9f99bbff99b0f7de843fff66fff76e2c4898d1b378642a1d75f7ffd861b6e58b972e5c30f3ffcc10f7eb0bebefe3d408aca3d3d3d274e75f50c4e6dddb236b9082d356709a627dd52612dd168343f3fbfa8a8a8bbbb9bde059f9f9f5f5b5bdbd5d5bd6ad5cafdfbf79797979ba6595f5f5f5555d5d5d575c51597536e8f3dbf7aedfa1b3e6c9a1c99b163fbcf6fbbf5a38c338912016391f8f0c8c8f0c8d8c4e4e4f4e8d0f2e2e2e9a79ef257d7d67eea53bc381f90a2323842da1c8dea29354f8faba04e40cce22592e99ec9cc73f4565347f6ecd9c339dfb871e35cd777fd5066f83f51858a672c4ffdf297bfacaaaa5ab66c993a6edbf6638f3d76edb5d7d2ab905db7732d558d8e8e7ee52b5ff17abddffce637c965e0aaa4fedbaccd323a3afacc33cf505245784f22a57ce38d3776fcf2e5378ef43ff0779fc992dc5659ee2494bc86f2ca8f8d8d151515599655555565180665e2a254cf8585858b172f668c0148d3e486c11289f8c8c8707e7e2133a51d4f780c0b99b4c1013450220321113d3eabaaa6bca8b8301c8a826c2908e45a576c04e4c00c4004100000080859767de92321f329323faa23fadf4c99eb579b376f3eff99593fba0eea5e53fdcc0f7ff8c3ae8b1b86e172ace8bf62e91b4c8a8b8b1f79e491f33c8e4b1d659e53525272cf3df764bdc20545731400801420c115e0ec3a9510669aa66ddb131313a3a3a395959552cacacacaa1a1a1b1b1b16030c8182b2b2b310c63e1c285dddddde3e3e37575758140a0bebebeaded18220f0683ebd6ad3fb0ff8094827364c89021224826054a00ced0f2fb73cb822565e565566e2e985e304c6000e0d082e8a515e3f7bf28fa5488cf9e6d469116f1b6cfe7a30098e46f0ca3aaaa4aed8ca0b0f7dcdcdc8a8a8adcdc1cce99699a959595f3e6cda7f098d292b2cacd15a6c1a4040426410a262538034363f168824990cc010040968c7f257e22ba920c00defd0b3e2fc9ef48a494a4be207d1d624e60296c01a86d1849c7a98acb63a97436ba287f29d96a8c31864c220043868c4948e65f023e3d351d9909a7de9d2149e7c9b48541018020f112b0decf525151a1dce9aae7e6cc8fa56cac582c46963be520d50d1ac6d8e4e4647e7ebea16d9ce79cbffaeaabd75d778365790867c88171268171a40cc72025306634373581745002484322204a090201019894800c40da800c24bb04acf7ad2830e96973612e1b0b34338b3c0ba6694e4e4e924f8f5e8001008ee39c3b772e1289d0d5676666c2e1b0699a52c2e4e4e4d8d818638c193c9e888f8e8d854221482a3849ffa20404940c05038920404ab005c4250a40904229c70b6c22ba24bf47514443415373aa420540b59243e1a31e8f271a8dcad416d64422110e876b6b6b6ddb1e1f1fcfcbcb3b73e68cdfef9b9818a378e89e9e1ed33443a1d0c2850b0f1c389093e39336d4d5d44804218101a2049060331697381d8a0ff58f226049512090cbbc1e87230260cac613e42ed1661f9718ecfd2e73aa422542884824e2380ee536a69757d36b55962c59e2f7fbe7cf9f9f9b9bdbd9d9b96edd1a9fcf67599eb367bb56ad5ae538cedebd7b5b5a5a4e1c6fafada9038915c13260281184008e5248d13b16fb7f77bcb1fd97afa1344c01cc8e6cbb7ed34d1fd9585992e3350c04063209c5d41e8af305255f92f78f64cfe8a70a94153e3737b7a0a0803c6f535353656565f9f9f9fdfdfd908c464d0048cb326983bc94c98052994a6e595559bda5b575727cc2118e4410888c4b9076cc16cfbf7cf0d19fbcbc6cd1bc3fbd6bab81e2ec89aef1c1bec9a1611e376b6b2a1930092ce5c742f5de625a0bbb24ef67b940e8a0949256940180de9d422ff01d1919c9cbcb334d63e9d225dddd5da15068f9f265274f768c8d8dd7d737cc9b378fa2d21a1b1b19e3ebd7addbfff6db6313e33575b52091494481b62da289442896b0051f1e89bff1f699f1e9e81557acfa8b3ffd687e8e39d83b383315932801e54f7ffab3eddb774809afbcf2eaa38f3e7acf3df71067fd67a86bae9f4a09cf3fbf93cc41fda0ebfcac3fcf3ced8f5dc85c26713ff9f9542191566a232140aa2f83c1602010c8cdf5218261f0c58b17f9fd7ebfdf5f59594df94f5b5a5a1863a6693635352142694959696b29720920102407008484904cda1fdab2bcfbdcf89bfb4ffd7fdb5f791ca1d8c73f755bebd5eb5b6c470c0f8fe4063c4383832fed7a8996f37432ddb76f5f381c5eb162452814f27abd8e634b09a66986c3e1aaaa2a29211209efdbb7cfb2ac0d1b361c3972646c6caca5a5a5b4b4f4d4a9537d7d7d0d0d0dd3d3d38b172f8ac5e2ddddddd168746c6c0c00afb8e2f2402080c8ce9e3ddbdddd5d5b5b5b5f5f0f80005208387efcf8c8c8705353536eaeff9d770ee6e6e6ae5ab5fa9d770e4e4d4d2d5ebcf8e8d1a38b162d2a2d2d515b20ff58fd6f34ae51fd0b905c7c0390785e3f1664c42babf02ce5c47279b054c00cd712d132c610b9448e684b900828d1b1413044db8ecb44bcb220ffef3e7fe3d973fd5dc3c3cfbfdef3e24b07fe63c7af9beaab867a7a0af3f238f2679e7deec61b3f12894476ed7aa1acac0c4000889ffdeca7434343b9b9fe5dbb5eacadada9acaca278acd2d292d3a7cf7ce6337f09000f3ef8606d6d4d4e4e4e341a79fbedb78b8b8b9e7df6998f7decf6175e78b1b2b2a2a8a8f01bdff8c6f6eddbc7c747ffd7ff7ab0b7b78fa2a0f6ef7ffbe4c913f3e6358c8c0c9f3e7deae597777fe2139f983f7f9e9472efdebd7bf6ec292b2bada8087efffbdf6d6a6a0a87c367cf9ef9c10f1ef9f8c7ef78e699a7972e5df2ecb3cffec33ffc5f9c73486e7411296c5173672dff419c40e5d41227b0d451965c6ea3a006092cc55c1730def5b56bd7711d523c3d4f9a5a11a39013061280a3e40860086e024a01521a3311e3873f7aeeecb9f0b5d72cc8c9f395151a868857052bc6468763b168695949241a7d6dcfaf0bf20b62f1b8e3d837df7c33ed063b78f0d09d77ded9d2d272cb2db7d4d6d6d9b6f3d453db53f15848a12e4288b3673be7cd9bd7d171ea95575eadaeae0680fefec1c2c2a2bbefbe474a89c8a40429514a340cf3aebbee06809b6fbe39180c0e0e0e3dfbec73030303870e1dbaf6da0fcd9b371f919d3ddb595353fbb18f7d0c008e1e3d7efffd0f1c3b76ecb1c71ef3f97c77dffdc96ddbb63df8e0431ffbd8c71c4772ce523da19a4e6fc3ace53f9413644a03a2049e429c64b49f0a0053ef84ce1e8fa5f0948446ba0f09b3654156a1c90a5b2960210310296053da1b44302d049ea8ad2f6deb38f4af3ffa85e1f5d82271f5fa866b2e5f32d07decb2a52d798585539313d353d37ff5d9cf01c2dffffddfc7e3092911800583e5dddde71c47949494dc78e3b6af7ffdeb0f3cf000227ef39bfff8c003ff0300a5843befbcb3b3b3f3873ffcd1cd37df7cc71d1f5fbe7cf9f3cf3f9f9beb8f46636d6d4783c1b260b0bcadedd8e8e808210c1153290f717070d0e3f17efef39f7fe4911f22e2534f6dafaaaa2c2828e8e9e96d6b3b5a5959595c5c72f4e8d1dededeb2b2e0b163c7359812d3d3ecf58f729913013840b213096812a4ca642452bbc766e3b1745101a2a825f53629155f6ab3bcd7ebcdc9f17a3c1e5a49f4782ccbf2a8f7bd1ada2b5f111198838828b1adede8e2a54b2552fa53c763e1aa150b37adbbecf20d2bd65e36bfaa08477bdb9b1aaa962d5beecbf5338615e5e59b5b375757571517152f6a59585e5eded0d870d79ffcc9ebaffffa68dbd1cf7dee73e5e54100d8b86163515111805cb56a259937cf3efb6c5767d7bdf77e69ddfab5a74f9f3eb0ffc075d75db766cdaa5028f4c61bafe70502b7defad1a79e7a6aa0bfffca2bb72c5eb2b879c10244c8cdf5ad58be7cd3c68d1e8f67cf9e3df9f9f99b366da204716b56af1e1818787bdfde9292e2ebaefbf0d33b9e7684f3e9bff80b5f8eafb9b9d9e7f32d6c5ee0cbf12d58d0c418a64c2ca9992090bdfc0771029553f6131d475a6e43c140d0603a77aef7c4a9aeeec1a9adad6b92f1586e58a6184b693a0adf0ba4242f2f2f2f2f505090eff7fbc913e1f7fb737272294d034150119864201118302ef1899f3cfed13b6e73242072d3d1d229000020004944415414221e8b0c0d0f0d8e8c4c4ecff4f50d14e5172c6a6e2a2f2fcff1e548e0f424980cc7785fb6f87f911360165894c48ff6dc8394c024f1b494f2adb7f63efdcb5ffdea9d73fff7373e733e1b4ba9339dc0d4117dd5597d7459f7880888a95929720026012570644202209a5e5f79756da0b8241a892e59b4c4e7f35b1eaf69a0001032692ba6228f4026a3b220f978a9827ef0d209bf8d13a84c050180808c9c8bb480228121204894c89260bc08cf3ba48c2a1d5b991343caf4ad5035fb5b09966492094001c01c860ef0036d67a7224ed2880700402e81239372d2014959be84b2f604a4329ebc0fa74bff454ea0b294e45700c950825421acc0a4b372719d9835ede77875afc2906b8b331dd70fb20c416d6f741261487c0380e0208b21bc76b87378d2140e9aa6e3f77b2c14d158424800e0339184835cd0fd056788129de48fdf9d5c7c83ba7e75f1f7ca7a85b9cebc98cb62ea4c75b278f70ffe5b15044040074082e4122522a0742c88d43754da28043ae4ca72ef2b04009d995c204b2f2b84198c71c6d21268abc86e640840d93d90a6a40c001977c00878f9ca15f387c6675e79edede18969c9a48946635515e3122dd3e10cd00409000251203229194864520a260502022954701803290c52ba8c4263190a81201de4e4be6712053204218540e002009904104c32092810243a28912148e17069388092018264824b90923928414ac611413a120508608c3b92920a0bb54a2e9009449436938c014729040a4826cf0185120aec905232e0424a0406924904c61c47c419b35072900ea00d696e8bdfbf486014a222194a892825931229e51fa0b25ce65cd27141aabfbfbfabababafaf4fa5e16b6b3bdadedece184364fbf71ff8d5af7e451b788e1c39c239a7b5200010427cfffbdfff7f1efed778dc0600100e023040af215ad72e181e3cf7adeffce06c67ef156be66d5959579213c368ef8a0565109f0461834824ed7ee08e7000138cc519cea08c0330292582942805d892092925a014200448943647412e5994292b4f4a2105a3cba12905a5491212002432c1b810281c00c620ce20215148708009211d09201090315b0ac18444901c1392494489829cd052300493096042a0044426010069c432291093662f0d778152700652da063206923107514848300608524a313b0b4b4af2317ebfff4974547d18243da21239033092c0c22cc0d2cd23fa28a5eceeeececbcb2b2929b12cabbbbb9b31168944f6eeddbb7ffffe582cc639dfb163c78e1d3b2626267a7a7a5e78e1053dd4ff7bdffbdeea35ab57ae5af9375ffb2a4a0064024080a808e615e59bfd034333e1786961deeac575375ebde2eb5fbcfdcfeeb87a418daf20c796099b03e3c22ece85921cd3401e2cf336d77baedc58cbc10640a43c475270400426106c9482012020c6376daa924c220303eca23c1341308816e619e412052118200710208474508221c02b13ad1bea39b2b262637173314a01202524184f3a6a04381466e10814604ac61d1092de7e251100418029b0d4679ac8a4a0d04510422272004348261000510283a4df4b204a296d860220c621caa460c0a4701873001c98ed2a17c8deef32e7660a4871d5f8f8b8d7eb2d2c2c2c2929a9a9a9a105e6bd7bf75e73cd35353535c78e1d23f577fdf5d753ea0efab98a6ef8dce73eb77ad5aa53ed27376dd8c8504a602001c1f158322fcfb361c5fc05c1e203078e7eea8bdffde4bd3fbcffdbdba742f16041cea2ea62331163124c887e7873cd073795594ed4675a053e2ccbcbe1c2e16073e670699be070611bc2611218482e6c04c964b424cfe4e030276ac0d4559bca11a31e086fdd5883e870b419861043a6741808c61ccee2880994a1d27c0344d46bca7c3f3764c2820417920b30a53045c210094b240c11371832615b3261a0638063c9b825639c45184638844af31dc30000018ec3c006663bcc16dc06e6481012194a06e8204ae9380c2463518030930e9336979209692093d2d13a4400084c5bf47dbf4bf65921a68bcb4e97520e0e0e1e3f7e3c1c0e4f4c4c5e7bed871171e3c68ddff9ce77eaebeb11717474f41bdff8462010f8e77ffe6721e577bff7dda58b966ed97285045ba2231138909a4cac5e52f3837ffefc6b7b0fb79feaded736f8ca1b27fa7a06eefbc29d931353066331e62c6c0e1e3ddece396b5e5036134980700c296a8bd88225a5cce43d7dd308100d870c0b6d96170dc74af2e481e3330c8c7c9f75dd96da98e3741cebf4a1bcb1b5e148db998aa29c1bb6d4769ce85dbf6ed1d8f8f4e464ecc0f1d186faa2f0f4cc999ed8d557af7871d73b0c732f5b5eb7f3c5c38b1aca1beb0a2231d976a47ff9a212afcf1c1c8d9e3a3dbc7c51d0f07bcf9c196a5950f5dc8bed8539ceda95f372f3bce1581ca43c7dac77416351efe8d0fcf979f3ab7dd3d3917d6d63a1044a6117f9e5f245415faef778fb407ec05753951f8f8963c706375fde120a4d0d0e450a4a0b86c742078e0c08f06032a496316120a440f63eb2b52e20692f42517ca39bea454545a150281c0e47a3d1d1d1d1eeeeee50282484686c6cd8b0613d25fd4144d334efbefbee471e7904114b4a4a1e7ef8e1871e7a0800fec7fdf737d6372c58b06074641c00011c09200167a6e36393b1279e7be3b9570fafdbb0e04f3f79edb69b3703e78cc9a19181b33ddd710064b17c1f7a0de6b1588e250dee08860e42d382f2c3c73a77be72a2a1b1c4346cceedea8aa2ba324faee1980c106d04190ac577bd74e2e0be93cb16d73952fee2e58ec1e1c8c858e897af1c8f0bd1d135f2cb578e0b74f20a723b7b4383638e444083d9c261023843e188a52de5c37d23870f9e6da8cdaf28cd45908b9a839525fec84cf8a557da7bba863d06d20aa8c52507b9ebe5a3bb5f3eb2f2b27a64685809c3140cc4c2c6b2c2029f7018075e5d11181e9979f9e5f6fedef1f9f34a5edc7de4d8b1bee605f90927fed2cb076b6b8a76efeea8aa2820ff8a1414512200a4445ba2936172bdafe5c2ef84b62caba9a9e9dcb9738cb1c2c2c2f5ebd71b86b169d3a6e5cb971716165290d6d6ad5b29bbcbd6ad5bd7ac594330a5fdd34d4d4d7bf7eedbb777ffbcc6fabb3e79a7f2b9f50d4e9d3937da3f36f3c48e1d0f3fec14160546a667ea8225b75f7f79e7d99351614866e679a0b9b1f25ca757326c6c287aedcd76e4a64009f0ffb7f7ede15155d7a36bed7326f3ca242104f2180824e1150482bc0d6f44fa7105ca43a5b456fc4a8202f5b67e5fadd8a2adf5d3aff581a5404521d7801705a480a95cf50718a40a28af8072110821ef403299bc27999973f6ba7fec73ce9ccc24407f6dbddab2982f9cc7defbecb3f73a6bafbd9e5c2600ae30e09eebde0169c995353ea606937a455f2ef77292190455c420b3000408a520481c994240488841ce5540055980402522bbcda20455d6ee27e0804c26050839caefbd5fd42fd9f93fee1d79e142c5e9a28ba5150dfdd3fb1200b2280ba92838741e409d0352211ab80f000021a9b7c369a783878f678f1e4ac4dd4976b5dd0708049c1347440221a153051fc78971000249282d193040899340264d42a98b1ebf1bd06d4e6843107ae1c205c31e4655d50f3ffc50686cbefaeaaba8288bc562397ffe822449c78e1d13cbe5e5cb97df7efb6d6353a9f39dacaabaf2c8d1c35923ef94008013675127ce150f48edfd9b5facf436f890a9401d766b5479c9a55aaf0fac891616852a3f5fec3d59544bc47d0ab4fb9137f36b56ffb9d39563c60ccab45b4e9dbe565b4bfdd2ac178a1b18b4f748ec51e9092a602554aaeb7d0186ed60ad69502f7e5171cff4c1e7cf579d395b3d6b6ad695e2ca81e9c9b1713135558d5e8fcfed8ef3234f488b292bf72aaa347182fbd3cf2b55b08dbfab9fcb2e1dfaaca4c1db72e71dee2903075d2eb95e55e5bd63887bfa8c91978b6b3f3d5979f7dd2324e0b59e564b3b28646548d7eb3b3a02eab5ea769bd5316dfa645b942550521517c7da39bf52d238fc8ea4a93312bfbe78fdf3d355d36664b5fb82274f578e1a6955d176bdc1af22abf5b613325de980a8e5aa6100d4495bf7ad874eba426337279902f3092da108b1e272b962636385a5b2cbe58c898971b95c3131710e87c3e9748ad8eea22ee86e1b20364b9c010230be73c75fbebff8813776fdadac51e6416ef1b7f6b0c1a041c9310ea9f8d2c58a6a4f077372d623cad61365e4a81232028b36a614640c88889304c80855e0321222538090319543901310da1038e3c49814042e01930838282884469cfa244725a6c49d2caa619c11c82421417b66460c27eb952bd7664c4e3b76d2d3e25310397140b400e7c848416488c45504402671ce8008192754191071a6822c2149c48144386a154105e02a49c0800171625a945e9009383215891397004828bf8018810a0840320092a10c13bc1572cd7df7ff2b7004460840848424211100c9e85ff54056f5e52f0b3e3c7ca4a8f285a757de5ca52390a3a4a4c462b1c4c7c78f1e3d5a446c3f71e2547272a2881d75f4e851229a376f5e5d5d5d4d4dcdd8b1630d1c25a23fbff66740f6939c1c9bc5cab5bcc3845c952c32c7182fe77ffbb2c20e4109a5a03d8545d964e650515298c248884083888c83ca00402194101927e012070e2ac89c8003975402420ba205891831069c7305191057901821a90c114002acbae6afaabd46c448b21257382984f2a5cbad1c5a012d87ff5619240460848ccb5c520911388870a6b2ccacc003400a0340267312ab1a00a816a6aa80010446c84005520911d12a71524851183221d14540548908540094900171890123509029401202720832143828c444322111a8ecdbb12b6484421dc7743b5204356c9d0e8f9a0c9d6d66105155d5e2e2e2be7dfb0a678ae2e2e2b163c7b6b6b61e3f7ebc77efde23478e8a8b637bf7ee45c4499326d5d4d41c3a7468ecd8b146831b376e9c38f12e007ceac9d5afbefa2a310900927a58250c7021e26116801e327120e20c099013202a5c130d09e1070fe93c8134e52181b80ec22b517cdd141466429a151900222011681a7995116a0b0d0251401403000618f2320310c274224250751d3e0128080a8016e8105021129a0512da1d8e4655450c2ba00ac401c54aa6a2781b63ab445cc714ae795a86dcbe55938e4ed50ff83f1b49fe7e4021b42342105f2bf1a005558b042a20d77bdf058f6566b0841ccbe170242626daedf6989898d8d858443c76ecd8dcb973ebeaeace9d3b979c9c8c88f3e6cddbb3674f7676b6b92900f8e94f7f8a886f6d7b6bcae4c908403c2801ccffde782200049500f0661e1db7e15b06a4ff157a69094188e04b4865ba64243cfb5718185a6700d0fce51139e742fededcdc5c5f5f3f7bf66c00983c79f22bafbcd2af5f3f22f2783c6bd6ac713a9d7ffce31f0160dd9fd68fcc1a3165ca1400ce202891ca8833c63efdf453afb7e1dfd3d0f2df160ca462042884e83367ccb0daed00c48898ae88ea44b1bac4ad9e3d7b5655558930846d6d6d353535696969443464c810a7d3b96ddb3683bcfde4273ff9d5af7e25a2e66ddebc59b4f6dbdffe76ccb8b16919e91e8f2721215e6212220021114dca9e04c20c430b30f3cd5b83dc2e708b05a00bb51221001a26eb844828712609a9c8cd25ef369b6dd8b061c5c5c582799f366d9a2449d3a74f1f3d7ab4cbe51281ed67cf9e2d9cbd66ce9c3966cc1866ca8e3464c89053274e9c3a71223d3dfda1879672600012e869e208808594f766b4c68883db05be55058c33122c0d01aa2862bc0018886596bc8709488b8a8a0cd1434747c7eeddbb45728093274f0a0bf73367ce489274f8f061215ff8faebafb76fdf6e3445244431505959f9c92747c68e1bc785c42fa4fa42c3994807d2bf0f24e2064113b748b768242de399c1101bbe0c641c849aed2a8553672063abd04d81db604c8b382141b584050d10325099bebdb8915fa180d1a3478bbcbd4ea733363656975d697f9d4ea7d3a999ba8bdc71268f42d47544463f60d7ae5d4c3f266da78ac23d2d4470090980218aed5f881c8bfd88f08d44cdaf0699e97551339c15ad09ac230c35ad996aa3d6a099d083d103869c13631856e05bbb4a7dd30ba1f1958b2911234a44008c64469a6f731766336630026a996f8559b547960ffbe2755f080010ba2f0462400c892169e63bfac26818c3916e4e05efef7fff4f1b365cba741140f81869b29d53a74e5dbb5e4344fbdfdf4f009cb4a6852d0001e79a10426b568c2032e05cd8d36b17c5737534178650c029bc4097c7ff210574e2409d7ea8cf2e2220d32c3175abf79bb8d8333d6f582432859ddea01da339b1cc9040351d83402340061069d9eb40519477de79273ada3565f2c47dfbf6cd9b37d7e9747a3c1e22183a34f3d0a143bd7af59a3163bacd16c510ae969679bdded4d4be0e87e3e2c58b44949898e476bb3d9ebaf2f2f21e3de2d3d2d2040269125a0c7d840000484fad7eaab6b6169175ba7e1bba841041070040948878e9d592d401c3c06c9a6cb044069618b812d2cc74f69530d0ce2869c6b0cea8c60dc648ec520db2440002e1c37b4d04800d0d8d478e7cba79f31b4494953572e1c2452929296e774a6c6cdc81030725493a7ffe7cfffe691b37be161f9ff0d1471fc5c6c6ecdbf7dee4c993376efcf3ac5933ebebbdf3e6cddbbd7b777272d2800103d3d2d245afc44a173956a5a5e5f9f9ffcb6a1579c86f735add00e9ff61680a853a73edab6b4f7d794978b486142f00201611d01690505206137dd2161ac6c4baaa02081b48d5f86b9431fd746a07228a9ff143ec5a8865d05bed3d0c460b11962e5dba72e58acf3f3f4ec4172c58307dfa34225e5c7cb97fff7e2b56aca8aff7f87c6d13268c5bb16285cd66bd76ada6a2a29c73ee743a44533acb1ff1488d981a4fef1446d09c75d6b868f60e378ecd058c53a380f1b7cbebe6a6c2ca845dbcc115d155e356d869976f14f9d0c83e84fa86401a7ba10d979856413690182342baa1cd7b57079d089b2060000c51fb81196d42bf6ea1bb7ba2fdd8d8d83163c61c3870a0b4b474ddba75bffef5af01a0b2b2b2acac2c2e2e4e24c5a8abab0300a7d3e9f3f9cacbcbc5ee81f4b8d0d1d1d1cf3efb6c4a4aca8e1d3b0c16b03b30eefafd7e61e07f83c2e65acdcdcd656565a5a5a5adadad61b71051f4d078bacfe70b2b16080444758fc7632e69ee5597e4d39875f1089fcff7fbdfffde68c158581a1b1bcbcacacacaca2a2a2a8c8ae6d566dbb66d57ae5c11415f84ed9d2873f6ecd9bd7bf78ae39a9a9ad75e7bcde89b887a4ca61db4b81ef0fb8973b8811c0b4c4b1be9d40bb193bb8e69ebd71d3e75de78dd1aa01e2dc262b12c5fbe7cc78e1dc78e1d5bb060c1f0e1c3df7cf3cdddbb77bb5cae175f7c312121213f3fff8b2fbe58b264c9bdf7debb77efdead5bb73ef8e083292929f1f1f14424f2a06cdbb64d96e50d1b3698336252573205e3ad3d1ecfb66ddb0e1e3cf8c9279f60e7549ac680182db4b4b4ac5dbb560cc5a2458b323333c914ee9c880a0b0b1f78e001e329858585353535cb962d33aebcf9e69bd7af5f07801123467cfffbdf370f823810b3d8256e0983de471f7df42f7ff98ba228c2523cecfb59bf7e7d4d4d4d7272b2d56afde52f7f69bc82f12225252522cd16111517175bad56f1168d8d8d151515e24d3b3a3a44ba2163eac184f4a41ba3b7b4b4b4b55900f84d0cfd22af44ecf8b0cb2a9d81ba39eea6b4a9bb002002bc0000e73c333373f1e2c5090909e2cac30f3f6cbcd2fcf9f38df4606eb79b8884e2f2e9a79f16850d337c4378dbe57301c0ed763ff3cc3367ce9c0180e79f7ffeead5abd3a64d8b8e8e962469ce9c39ab57af7ee289270a0b0b3ffcf0c32143862c5ab4a8bdbd7dc68c1949494943870eddb66ddb279f7c3260c000ce794c4c8cdbed3e70e0404747c7debd7b7bf6ec999d9dddbb77efad5bb77a3c9e279f7c1200d6af5f3f7cf8f0471e79443c7dc58a151b366c906579d9b265fdfbf78f8f8f4f4949d9bd7bf75d77dd3575ead4a3478f7ef1c5172929298f3cf2c892254b060d1a141717f7e8a38fd6d7d7e7e6e62e5fbe1c11972f5fbe69d32644ccc9c9d9b2658b78afe1c387676464c8b25c5d5dfdfaebaf5755558d1b372e3333b3a0a020313111117ff7bbdff5ecd973e6cc998cb1989898e3c78f7ff6d967d5d5d5b366cdfaeb5fff5a5050d0dadaea76bb3ffbecb3fcfc7c227aecb1c7f2f3f31b1b1b25495ab264c9dd77df2d26a2de5b1fc03825a8dcd25268305bdd95819be35668fa6e05b7d024cf342e32c656ad5ad5b3674f30510eb34750181d32568ab06fb4cbae76b9f30804022258e6b3cf3e3b6ad4a8c3870f9f3871a2478f1e76bb3d180c22e2ce9d3bebeaea7273739b9b9b0f1e3c78ecd8b1bd7bf7e6e5e5ad5ebdbaa9a9c9e5722d5cb8b0bebebeadad6dd5aa557979791f7df491aaaa4b972e5dbd7ab5e8704b4b8bcbe53268527d7dbde8b6d7eb152dcc9f3fdfe3f1646767f7efdfffe5975f26a253a74e151616262424e4e5e53dfcf0c36fbdf5567c7cfc962d5b060f1e0c000f3ffcf02bafbcb269d3a6c58b171bafd3d2d2d2dcdcdcd4d474f0e0c13befbc332f2feff8f1e3f5f5f51e8f67c58a1500f09bdffce68d37ded8b16387b0412f2828d8bc79b3206ff9f9f95bb66c118bec73cf3d2706f0c5175f6c686858b76e5d5e5edec68d1bc58338e7aa1224ae12a97218fb8688aaaa023023d89a6a0245514414d0402020a2dceaee152a916a0499d179af4ef45c900a3182b708066e1984d7c01e23837c6461f3296adb401e56d28c88dddd0580575f7d75d6ac59e3c78f5fb060416a6aea8811230e1d3a3475ead473e7ce5555556dd9b2e585175e0080f4f4f48c8c8c77de79472c1c4653d9d9d991dc92992346c43163c69c387142242d3317161d98387122223a1c8e51a346b5b4b44c9830212f2fefead5abededed7bf6ec3173d6c607939d9dbd7ffffea6a6a6a54b9782cea4cf9a356be4c89188b875eb56f383468e1c69e48136862b72548d6e3b1c0e4105f7efdfffeebbef86f5161109486cf265225214c598789d0084124f04834149920281802ccb1d1db291250011459a42550d0682d640d06a58304b922e92d02c8c346e9a73ae07a3ba113e85112a339f073acf61701291236b1e2633fe61679636acbaf9298f3ffe787373f3934f3ed9bf7ffff5ebd76fdebcd9eff703c0d2a54b9f78e289bbeebacbe7f39d397366d9b265b5b5b553a64cc9c9c941c4214386e4e6e6daedf665cb960d1c38b04f9f3e369b0d11070e1c48446bd7aeddb163c7e2c58befbefbeebcbcbc975e7a49a4debce79e7bce9e3d2b58ae091326bcf4d24b2b57aee49c272626f6eddbd762b170ce33323288c8e974ce9933272727272d2d6de5ca951919190060b7dbdd6ef7fcf9f37373731f7df4d1b4b43422cac8c8484848b0dbeda033060e8743bcdddcb973376ddaf4fefbef7fef7bdf73bbdd1d1d1d00909292f2d24b2fd9edf6152b56040281e8e8e8871e7a282727a7adad6dfefcf98f3ffe786e6e6e3018cccacacacdcdcdcdcd0580356bd69c3c7952f8248bee69bc1732cdece1c081033ffbd9cff429214962b22c33a6852eb25aadc22ed9e572391c8e9818116d345a3f8db1dbed0e873dca1a658db24ab2f64f629ae84b93807234a48e1f7f5cf8e0830fde08ad742c89c4b0afbffe5a4c64e4adeeb03392b61984cd8c64e2fa0f7ff8c337df7c53e49e8c44f1307208a694a4e6a536f214005e7bed35a1a1efb293c681c12f9a49b5b9d9b0ac74d0f97b30ae2f5ab468cf9e3d069930f394660ad45d676ed049a3b5b06e8b115ebb76edffdeb1479113fef4f2d3b211149931266c23655996248bc562b15aad22cc9add6e77381c029f84ad9fcbe58a8e8e8e8d8d75381c22f09acd6613190e4596b9ce443544246459ee8ecb31c03cf744b468d1229bcdb67dfbf68a8a8ae2e2628158911c98310d0f3cf0c0ae5dbbc495bababa7efdfaeddbb76fd6ac594b972eddb46993f88e01a0b5b575fdfaf525252500f0f39fff7cd8b061e646ba1ce848c62eaccf605aefcc2d2c5fbe3cac4a1842845156f3e899572233d1555555f84189f2e6aeeedcb9d33cc89103158634dd610ce8d86c7e44e407663e365e53362a43673c30b3026123686a57e8909888e409a0fd153f6380ba9c9e1b83c1f77cf0c107b367cf0e068385858588b87dfbf653a74e4d9b366de1c285efbdf7dea14387eebcf3ce1ffff8c7ebd6ad7be699674e9c38515d5d7df9f2e59c9c9ce79e7b2e2929898866ce9c595050306bd62c45513a3a3af2f3f34f9d3a357dfaf43163c6b4b5b5ad59b3c6e572c5c7c7efdfbfbfb4b474d5aa555eafd7eff7272626d6d6d61a71e75a5b5b0525131fe14de96518449234f32475771a5638b21d7381ee1e018000061fd249e6645c345717b81c2aa6cb8bccb366467173ddd2d252b4448be05932088b70ad84a0346128c9056f0e2064b5c0398858a0ba5037d4d7ee68a971702b58651e9a9a9a1ab7dbedf3f9ae5dbb969898f8a31ffd68c58a156bd6ac3970e0405151515e5edee6cd9b0b0b0bcf9f3f0f005eaf5784da160ca680949494499326eddab58b888e1c3982885bb66c79eaa9a7468f1e3d67ce9cb7df7e5b55d5f9f3e76fdfbefde8d1a300b072e5cacccccc1ffce007f7df7fbfdbed4e4f4f4f4f4fdfb06183f0971c376e5cd80af52d03b13732cb11d174fde6a0055104d4229d2021101247ed66b7d34744252525e72e5c2df31031490edbff7749a2ccc7669ceb92a4fde360105eafd7bb6eddbaacac2c222a2a2a7afef9e76fb08c0ad7d9c8ce23e27df7ddf78b5ffca2a6a6266c95c9cecececece7efdf5d7c5826854b9fffefb4502ec3e7dfa6465658d1831e29d77de193c7830636ce2c489fff4f7fd57823120b73e4dc27e0449e8fb88cc32eeee5c1bc57c454747d735051a822d9224756bdd60a240da1ac73988dd2211e75cd123a5706e265cdd10adbf170c323b63c60c6138bf7cf9728bc5f2eebbef9e3e7d7ad0a04163c78ebd7cf9f2b265cb525353efbdf7de8a8a8ae5cb97d7d6d6ce9f3fffbefbee134b617272b22449369b4d96e5a953a76eddba352b2baba8a828272767f0e0c19224e5e4e410516a6aeadcb9732b2b2b737373870f1fee7038186356ab55688df2f3f3131212eebffffe9933676edebcb9a0a0e0b1c71efbbb48ef770d349a2748166a740b40c728ec1e47af5fbf1e171787e56d0018725845dd5a4144c0926559d8ee399d4eb12b14dc7a4c8ccbe58a8e11d16d5d2e87c3e174ba6c369b286c481c5087b067efdcb9d310dc75075d720cd059914226e19651318c238ee437bbdc43dd8061fac31ffe306ddab4f1e3c78775a94bc1fdbf07700825010881d8dd035084059f79e88e1f3f5ef0e1279f9dad7ce1e91b06b715d50c7523e9292a48c250ca8f000008be494441545743eab7341be3aea6873a53e35bfaca0db44093f4b24b8631b2b7dde156770f8208d434364744b46cd932210132b389b7f20adf1ab8d531374a0368c948c9545fa05a97af1e39202a11279055550d0402c69430c6844454446a10023a4551144511c9bd3a3ada7dbeb6b6b636e1566f881bac56ab39eb8999950113b10906835d4e7f77dd356b6c8c5373f91bd48ddcb4475e8f6cc1780422f6ead5ab8bb1fc8e009120319c08c3446ee6329dbf406421ba242a000724242462da72d829e1adc13285c60d1800ca8c016320f68388da12662401b0e820a45942a025a2ba0bb196c02dabd56ab7db2c51b22c5b645912d99fc38ce9c4bbf9fdbe73e78a0c42720366fc36fcb7802102e791fb18d4250944d449eed069874b88c480110795a130d766044c84eb24ae6aa1f3cced221a12b5eaea4a00ce810048067dca89884815316ac9945a5c80205a611a430d143f93400a32d29647993126b43ac67700a009c1274c18af280a11288ae26df05ebd5adae06de45cf9970ff87f061031c6508f5f6a88a698111a1451e5c4413f2122a6fb1000a0b659232e33225209197186202348042a31508187716044c424465c3311b6d99d92247340b97321ae13c14e60ce626fb059c681518a74e34ce36bd1c9928aa849cb12937aeb2c1a45bba22d164b6b4b1bef1416f136fc03a0e792100c8cdd6e5755113347d2c493a86a01304c127c2350231059488d0e2ace802a01b55898cf6209a00c2421439fe28fb25b41e914ff238c8bbdde10888eaed7c40d06031429c90c235d82629911ce8c5ea0c9e23991c602eb8c1172ae619ba11f4004972bda6e4f53d5ef5268cd6f37106941a611885a5b9a7b2526b6b707546e292dad68686eb6da6d8949f13d62ec320a0e0a1131100830c66c361b0582f6805f2eb95a76e94a7d756330a040ac2335a36fd2a09460efde41496a686f89eb151fec08188f03b1188504ece8aa69721e2f0f976319a867265410815e5de153e8962431339aeab44a7b84896d078bc5722baac3db70cbc009552019491281c99d0e3ba0c5afd89ada7170567647c05f57578592ea4ee8213164c0112910253394ec366b94d21238f795e7bdf75b59fca7352d4194fd4d8d291f7f3e6a4446d69279b103d315e688714477487eed697aa62330512cbb3d48921559f7025201664c12e4ca38361f18881556b7cbddbe81490613761bb1fe49c0806440a6c56d6212932c2a041b9a1a9151479bafe44a795b4039ff655952425c8c8d8d1b31c0e6107ee872545055be38d5b27b5ff09af78bebd5be3bc68e9c371d255672eee2d9f28bf1ffa760f08f7ec86263190263cce45c0c00c0759b28c6989e0434c2e6ddc024d4edf222f92db533446058a8a92e31c6bc25011399bc0dff2020218a58a62286bc08d6a6404363abaaa0c32a8f199579adaef1444bdb679f9fb3045bedb2326a4c2690c4408d6a6b2fbef0a5fb9e7bea8aaf59f77d30b4b97268bcdd75c7c029f764dbebaa6b776cae3e5de49a3819486c218d29e3a4ed2b795353a3cfe7e3142d6e7461fe11761a6647ca3b835100420b62275cbcf970dc2657ff34200684c839ea11140855159b5b54901ce5959588c192fffb755abf64004e14ec999c00280127e25cf175343434cbc387c5ce99ddd6d7dd5251f1c1136b5e5ef5fcf3bfcf2f6d064bbfcc6b25c5b212943af9ce694a0822f27aebcbcbcb62636200b40034370f1519c65a855129f3a9991513756f23cd370c048af02217d2050624a1446069f7073d0db51919493f587ccfc90b5513278e9395a6d89ed12a06992ca1a230408b6ce52a4b1d3dea7fee7afbcadefd35fbf73baed67c5edd987fe9d263e3fb5a2c519ca11ee10542b60b4435d5d55eaf774046060018c2cb2e623798f9711e01918ba019441be64dc037309ab741002170469c8918168c1100a95116723aa5f6405b47000bff56d4d4ee2f29bd3865ca6849a696462f0057b90a68c168bb332eda77faf47fbdf7717ec1c7f6a91307fdece769bd5d77fa6b333de55459d627f30e5592817131bf2852f412555454343535a5a7a75757573735351933de058f8518c22ac1947547abc288964eb13811a31b2af56ec3bf08081850287712223039909a1a535153e9f7fb3b7cb8b7e070f65dc313a2a35c4e5bfd754fbfe424e48810e5b75b078c1d7be1ddbd2df12def9faec8dbf65f292ea997d737d1ce47589a2db18eb83b86d65a983594768510b1a4a424180ca6a5a5151717c7c5c5a5a4a49454b7889e749b6c3cf222e972ac3008e3ee5535a4c4657a96b97fe560de8610102282d8b59108cd03a4c6465bc68f1a70fa54f195cbd74b3dc1da8a9aa183fb5dbc7876c6cc6cd282f70415d916356c6806e37cef81df0e8e76f4744b00962136b5b6cc969a92b470617b8f9e14f023000222c340c07fe54ab1c3e1e8d5bbf7e5e2e2a4c44444acacac04162b7a1249b1c0a0585dae86aaaa98bdc122574633b5333698dff808ff87821e4301008890382082cc54b557ac6de2b8c1fd53e2af9696363735b6fbea264d1a9b9a9a42120b2a8acc3881d2618d8a1a3634ab478fbaafbeaebd7435d0d21e9b1ce79eb4c03164882fd61e90500d10a14ce01792d1a4a4949898e88e8e8e7ea9a9ae989896e666bbdd7ebd495f0a894815bc11111143e4c40911b9b1ad4402246400484c4249462649b24546262193001191ab8ac255550906ad369bd56a9524495839a088ef701bb1be4910fc35923f186c6a6c0a04fd0848a032647ddcce3eee4cd44358b5fb7c24d4831cacb2c4890801137ad8268e4f1f371638912cf9644b0393a1bd5d250a06785363a3a2061081736e91e5765f3b003026b5b6b44a4c220ea404190480b84c84c1a08a281111810ac2e1109121aa2a30462ae79c90137262807ece99c2254595dafda8a892df4ffe0059dbb8d3495156458e0a44455985e3a12c4b88c01803c4904debb72a39fbbf7b014f63fd7fa3050c9989aa0401320a23d4357600088575580b2064006d41944446d9b2f28a23478e00000072ad1280b65d4414e9709924fc349890adca127040c6648b0591812c11a22c5b880851222049621c50d6769e6816a8dd86ef3adcc0741011546480512306f5fd7fb0ce129839c4a7d20000000049454e44ae426082, 'image/png', 127, 0, '2006-10-16 00:00:00', '2006-10-16 00:00:00');
 INSERT INTO `previews` (`id`, `addon_id`, `filedata`, `filetype`, `thumbdata`, `thumbtype`, `caption`, `highlight`, `created`, `modified`) VALUES 
@@ -625,10 +620,6 @@ INSERT INTO `translations` (`id`, `locale`, `localized_string`, `created`, `modi
 (162, 'en-US', 'Arts', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
 (163, 'en-US', 'General', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
 (164, 'en-US', 'Reference', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
-(165, 'en-US', 'Testo Collection Name', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
-(166, 'en-US', 'Testo Collection Description', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
-(167, 'en-US', 'FF Collection Name', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
-(168, 'en-US', 'FF Collection Description', '2007-02-11 17:58:10', '2007-02-11 17:58:10'),
 (42824, 'en-US', 'Slovar za slovenski jezik', '2007-01-28 12:09:53', NULL),
 (42825, 'en-US', 'http://mozilla.lugos.si/', '2007-01-28 12:09:53', NULL),
 (42826, 'en-US', 'Spell-checking dictionary for the Slovene language (GNU GPL licensed)\r\n\r\nSlovar za slovenski jezik (pod licenco GNU GPL)', '2007-01-28 12:09:53', NULL),
@@ -886,6 +877,48 @@ INSERT INTO `translations` (`id`, `locale`, `localized_string`, `created`, `modi
 INSERT INTO `translations_seq` (`id`) VALUES 
 (46715);
 
+--
+-- Set up the materialized views for search
+--
+INSERT INTO `text_search_summary`
+SELECT  a.id AS id, 
+`tr_name`.locale AS locale,  
+a.addontype_id AS addontype, 
+a.status AS status, 
+a.inactive AS inactive, 
+a.averagerating AS averagerating, 
+a.weeklydownloads AS weeklydownloads,
+`tr_name`.localized_string AS name, 
+`tr_summary`.localized_string AS summary, 
+`tr_description`.localized_string AS description
+FROM addons AS a 
+LEFT JOIN translations AS `tr_name` ON (`tr_name`.id = a.`name`) 
+LEFT JOIN translations AS `tr_summary` ON (`tr_summary`.id = a.`summary` AND  `tr_name`.locale = `tr_summary`.locale) 
+LEFT JOIN translations AS `tr_description` ON (`tr_description`.id = a.`description` AND  `tr_name`.locale = `tr_description`.locale)
+WHERE `tr_name`.locale IS NOT NULL 
+AND 
+(`tr_name`.localized_string IS NOT NULL 
+OR `tr_summary`.localized_string IS NOT NULL 
+OR `tr_description`.localized_string IS NOT NULL) 
+ORDER BY a.id ASC, locale DESC;
+	
+CREATE TEMPORARY TABLE `most_recent_version` (
+    `addon_id` int(11) NOT NULL,
+    `created` DATETIME NOT NULL   
+) DEFAULT CHARSET=utf8;
+
+INSERT INTO `most_recent_version`
+SELECT DISTINCT addon_id, MAX(created)
+FROM versions
+GROUP BY addon_id;
+
+
+INSERT INTO `versions_summary`
+SELECT DISTINCT v.addon_id, v.id, av.application_id, v.created, v.modified, av.min, av.max
+FROM (most_recent_version AS mrv NATURAL JOIN versions AS v) LEFT JOIN applications_versions AS av
+ON (av.version_id = v.id );
+
+DROP TABLE  `most_recent_version`;
 
 -- 
 -- Dumping data for table `userevents`
@@ -1010,68 +1043,4 @@ INSERT INTO `versions` (`id`, `addon_id`, `version`, `approvalnotes`, `releaseno
 (28900, 4023, '1.0', '', 46713, '2007-02-12 22:16:19', '2007-02-12 22:16:49'),
 (28901, 4023, '0.9', '', 46713, '2007-02-12 22:16:19', '2007-02-20 22:16:49');
 
---
--- Set up the materialized views for search
---
-INSERT INTO `text_search_summary`
-SELECT  a.id AS id, 
-`tr_name`.locale AS locale,  
-a.addontype_id AS addontype, 
-a.status AS status, 
-a.inactive AS inactive, 
-a.averagerating AS averagerating, 
-a.weeklydownloads AS weeklydownloads,
-`tr_name`.localized_string AS name, 
-`tr_summary`.localized_string AS summary, 
-`tr_description`.localized_string AS description
-FROM addons AS a 
-LEFT JOIN translations AS `tr_name` ON (`tr_name`.id = a.`name`) 
-LEFT JOIN translations AS `tr_summary` ON (`tr_summary`.id = a.`summary` AND  `tr_name`.locale = `tr_summary`.locale) 
-LEFT JOIN translations AS `tr_description` ON (`tr_description`.id = a.`description` AND  `tr_name`.locale = `tr_description`.locale)
-WHERE `tr_name`.locale IS NOT NULL 
-AND 
-(`tr_name`.localized_string IS NOT NULL 
-OR `tr_summary`.localized_string IS NOT NULL 
-OR `tr_description`.localized_string IS NOT NULL) 
-ORDER BY a.id ASC, locale DESC;
-	
-CREATE TEMPORARY TABLE `most_recent_version` (
-    `addon_id` int(11) NOT NULL,
-    `created` DATETIME NOT NULL   
-) DEFAULT CHARSET=utf8;
-
-INSERT INTO `most_recent_version`
-SELECT DISTINCT addon_id, MAX(created)
-FROM versions
-GROUP BY addon_id;
-
-
-INSERT INTO `versions_summary`
-SELECT DISTINCT v.addon_id, v.id, av.application_id, v.created, v.modified, av.min, av.max
-FROM (most_recent_version AS mrv NATURAL JOIN versions AS v) LEFT JOIN applications_versions AS av
-ON (av.version_id = v.id );
-
-DROP TABLE  `most_recent_version`;
-
-DELETE FROM `collections_search_summary`;
-
-INSERT INTO `collections_search_summary`
-SELECT  `c`.`id` AS `id`, 
-   `tr_name`.`locale` AS `locale`,  
-   `tr_name`.`localized_string` AS `name`, 
-   `tr_description`.`localized_string` AS `description`
-FROM `collections` AS `c` 
-LEFT JOIN `translations` AS `tr_name` ON (`tr_name`.`id` = `c`.`name`) 
-LEFT JOIN `translations` AS `tr_description` 
-       ON (`tr_description`.`id` = `c`.`description` AND  `tr_name`.`locale` = `tr_description`.`locale`)
-WHERE `tr_name`.`locale` IS NOT NULL AND (
-   `tr_name`.`localized_string` IS NOT NULL 
-   OR `tr_description`.`localized_string` IS NOT NULL
-) 
-ORDER BY `c`.`id` ASC, `locale` DESC;
-
---
--- Insert new data above materialized views
---
-
 SET FOREIGN_KEY_CHECKS=1;
diff --git a/site/app/tests/installation.test.php b/site/app/tests/installation.test.php
index be4e419..12e0dfa 100644
--- a/site/app/tests/installation.test.php
+++ b/site/app/tests/installation.test.php
@@ -71,7 +71,6 @@ class InstallationTest extends UnitTestCase {
         $this->assertTrue(function_exists('mb_strlen'), 'PHP: mb_strlen is available');
         $this->assertTrue(function_exists('mb_substr'), 'PHP: mb_substr is available');
         $this->assertTrue(function_exists('mb_strrpos'), 'PHP: mb_strrpos is available');
-        $this->assertTrue(in_array('sha512', hash_algos()), 'PHP: sha512 is available');
 
         $_memlimit_wanted = '16M';
         $_memlimit_actual = $this->_return_bytes(ini_get('memory_limit'));
diff --git a/site/app/tests/languageConfig.test.php b/site/app/tests/languageConfig.test.php
index 8586133..56fe679 100644
--- a/site/app/tests/languageConfig.test.php
+++ b/site/app/tests/languageConfig.test.php
@@ -198,7 +198,6 @@ class LanguageConfigTest extends WebTestHelper {
         global $valid_languages;
 
         $this->WebTestCase("Testing that bootstrap allows users to choose a language.");
-        $this->_browser->skipParse = True;
         foreach ($valid_languages as $lang => $mapping) {
             // Bootstrap will do one redirect to switch lang.
             $this->setMaximumRedirects(1);
diff --git a/site/app/tests/models/app_model.test.php b/site/app/tests/models/app_model.test.php
index 950d27c..c8dc3c7 100644
--- a/site/app/tests/models/app_model.test.php
+++ b/site/app/tests/models/app_model.test.php
@@ -83,76 +83,5 @@ class App_ModelTest extends UnitTestCase {
 
         $this->assertTrue(empty($addon['Addon']) && (!isset($addon['Translation']) || empty($addon['Translation'])), 'No excessive retrieval beyond list of default fields');
     }
-
-    /**
-     * Test extended field validation
-     */
-    function testExtendedValidation() {
-        $testdata = array(
-            'ValidationModel' => array(
-                'testfield' => 'do not fail'
-        ));
-
-        // validation function should be called once
-        $vmodel = &new TallyValidationModel();
-        $vmodel->expectOnce('clean_testfield', array($testdata['ValidationModel']['testfield']));
-        $vmodel->invalidFields($testdata);
-        $vmodel->tally();
-
-        // now instanciate the real model and check if validationErrors is amended correctly
-        $vmodel = &new MockValidationModel();
-        $vmodel->invalidFields($testdata);
-        $this->assertTrue(empty($vmodel->validationErrors), 'valid field does not cause extended validation error');
-
-        $vmodel = &new MockValidationModel();
-        $testdata['ValidationModel']['testfield'] = 'fail';
-        $vmodel->invalidFields($testdata);
-        $this->assertFalse(empty($vmodel->validationErrors), 'invalid field causes extended validation error');
-    }
-
-    /**
-     * Test field validation for bulk translations
-     */
-    function testTranslationValidation() {
-        $testdata = array(
-            'testfield' => array(
-                'en-US' => 'okay',
-                'ab-CD' => 'fail',
-                'de'    => 'okay'
-            )
-        );
-
-        // validation function should be called at least once
-        $vmodel = &new TallyValidationModel();
-        $vmodel->expectAtLeastOnce('clean_testfield');
-        $vmodel->expectMaximumCallCount('clean_testfield', count($testdata['testfield'])); // do not "over-validate"
-        $vmodel->validateTranslations($testdata);
-        $vmodel->tally();
-
-        // invalid translations should fail
-        $vmodel = &new MockValidationModel();
-        $res = $vmodel->validateTranslations($testdata);
-        $this->assertFalse($res, 'invalid translation leads to extended validation error');
-
-        // valid translations should not fail
-        $vmodel = &new MockValidationModel();
-        unset($testdata['testfield']['ab-CD']); // remove invalid data
-        $res = $vmodel->validateTranslations($testdata);
-        $this->assertTrue($res, '(only) valid translations should not lead to extended validation error');
-    }
-}
-
-class ValidationModel extends AppModel {
-    var $name = 'ValidationModel';
-    var $validate = array('testfield' => VALID_NOT_EMPTY);
-    var $translated_fields = array('testfield');
-    /**
-     * extended validation function: invalidates testfield iff it equals "fail"
-     */
-    function clean_testfield($input) {
-        if ($input == 'fail') $this->invalidate('testfield');
-    }
 }
-Mock::generatePartial('ValidationModel', 'TallyValidationModel', array('clean_testfield'));
-Mock::generatePartial('ValidationModel', 'MockValidationModel', array());
 ?>
diff --git a/site/app/tests/services/bin/parse_logs/count_downloads.test.php b/site/app/tests/services/bin/parse_logs/count_downloads.test.php
index 3def4ca..757f543 100644
--- a/site/app/tests/services/bin/parse_logs/count_downloads.test.php
+++ b/site/app/tests/services/bin/parse_logs/count_downloads.test.php
@@ -101,12 +101,12 @@ class CountDownloadsServiceTest extends UnitTestCase {
 
         $this->_resetCountData();
 
-        $_total_total = mysql_fetch_array($this->cd->db->read("SELECT totaldownloads FROM addons WHERE id=7"));
-        $_collection_total = mysql_fetch_array($this->cd->db->read("SELECT downloads from collections WHERE id=1"));
-        $_addons_collection_total = mysql_fetch_array($this->cd->db->read("SELECT downloads from addons_collections WHERE addon_id=8 and collection_id=1"));
+        $_total_total = mysql_fetch_array($this->cd->db->query("SELECT totaldownloads FROM addons WHERE id=7"));
+        $_collection_total = mysql_fetch_array($this->cd->db->query("SELECT downloads from collections WHERE id=1"));
+        $_addons_collection_total = mysql_fetch_array($this->cd->db->query("SELECT downloads from addons_collections WHERE addon_id=8 and collection_id=1"));
 
         // We have to do this cheesy hack because there is no UNIQUE constraint on the addon_id and date columns.
-        $_result = $this->cd->db->read("SELECT count FROM download_counts WHERE addon_id=9 AND date='2008-11-25'");
+        $_result = $this->cd->db->query("SELECT count FROM download_counts WHERE addon_id=9 AND date='2008-11-25'");
         $_daily_total = 0;
         while ($row = mysql_fetch_array($_result)) {
             $_daily_total +=$row[0];
@@ -116,12 +116,12 @@ class CountDownloadsServiceTest extends UnitTestCase {
 
         $this->cd->logfileParsedCallback();
 
-        $_new_total_total = mysql_fetch_array($this->cd->db->read("SELECT totaldownloads FROM addons WHERE id=7"));
-        $_new_collection_total = mysql_fetch_array($this->cd->db->read("SELECT downloads from collections WHERE id=1"));
-        $_new_addons_collection_total = mysql_fetch_array($this->cd->db->read("SELECT downloads from addons_collections WHERE addon_id=8 and collection_id=1"));
+        $_new_total_total = mysql_fetch_array($this->cd->db->query("SELECT totaldownloads FROM addons WHERE id=7"));
+        $_new_collection_total = mysql_fetch_array($this->cd->db->query("SELECT downloads from collections WHERE id=1"));
+        $_new_addons_collection_total = mysql_fetch_array($this->cd->db->query("SELECT downloads from addons_collections WHERE addon_id=8 and collection_id=1"));
 
         // We have to do this cheesy hack because there is no UNIQUE constraint on the addon_id and date columns.
-        $_result = $this->cd->db->read("SELECT count FROM download_counts WHERE addon_id=9 AND date='2008-11-25'");
+        $_result = $this->cd->db->query("SELECT count FROM download_counts WHERE addon_id=9 AND date='2008-11-25'");
         $_new_daily_total = 0;
         while ($row = mysql_fetch_array($_result)) {
             $_new_daily_total +=$row[0];
diff --git a/site/app/tests/test_helper_web.php b/site/app/tests/test_helper_web.php
index 81ec63f..68cdb34 100644
--- a/site/app/tests/test_helper_web.php
+++ b/site/app/tests/test_helper_web.php
@@ -18,9 +18,6 @@ class WebTestHelper extends WebTestCase {
     /**
      * The default SimpleBrowser tries to parse all responses, even when
      * they're not HTML.  That fails.  We need a better browser.
-     *
-     *    Creates a new default web browser object.
-     *    Will be cleared at the end of the test method.
      */
     function &createBrowser() {
         $browser =& new BetterBrowser();
@@ -95,49 +92,11 @@ class WebTestHelper extends WebTestCase {
     }
 
     /**
-     * Check that there is a link like <a href=$href>$text</a>.
+     * Check that there is a link like <a href=$href>$title</a>.
      */
-    function assertLinkLocation($href, $text) {
-        phpQuery::newDocument($this->_browser->getContent());
-        $q = pq("a[href$={$href}");
-        $msg = htmlentities("<a href='{$href}'>{$text}</a> exists");
-        $this->assertEqual($q->text(), $text, $msg);
-    }
-
-    /**
-     * Check that the element $q has the attributes in the $attrs array.
-     * $q can be a phpquery object or a selector string.
-     */
-    function assertAttrs($q, $attrs, $msg) {
-        if (is_string($q)) {
-            phpQuery::newDocument($this->_browser->getContent());
-            $q = pq($q);
-        }
-        foreach ($attrs as $attr => $val) {
-            $this->assertEqual($q->attr($attr), $val, $msg);
-        }
-    }
-
-    /* Helper to normalize whitespace in a string. */
-    function _norm($x) {
-        return implode(' ', preg_split('/\s+/', trim($x)));
-    }
-
-    /* Assert that the strings have the same content, ignoring whitespace. */
-    function assertEquiv($a, $b, $msg=null) {
-        $this->assertEqual($this->_norm($a), $this->_norm($b));
-    }
-
-    function delete($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->delete($url, $parameters));
-    }
-    
-    function put($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->put($url, $parameters));
-    }
-    
-    function postMultipart($url, $parameters = false, $files = false) {
-        return $this->_failOnError($this->_browser->postMultipart($url, $parameters, $files));
+    function assertLinkLocation($href, $title) {
+        $pattern = '#<a [^>]*href="[^"]*'.$href.'"[^>]*>'.$title.'</a>#';
+        $this->assertWantedPattern($pattern, htmlentities($pattern));
     }
 }
 
@@ -156,89 +115,5 @@ class BetterBrowser extends SimpleBrowser {
         }
         return $page;
     }
-
-    /* Define $this->_browser->skipParse to avoid the HTML parsing overhead. */
-    function &_fetch($url, $encoding, $depth=0) {
-        if (isset($this->skipParse)) {
-            $response = &$this->_user_agent->fetchResponse($url, $encoding);
-            $page = new SimplePage($response);
-            return $page;
-        } else {
-            return parent::_fetch($url, $encoding, $depth);
-        }
-    }
-
-    function delete($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimpleDeleteEncoding($parameters));
-    }
-
-    function put($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimplePutEncoding($parameters));
-    }
-
-    /**
-     * Multipart POST request. May contain file attachments.
-     * @param string $url target URL
-     * @param array $parameters array of POST parameters
-     * @param array $files further POST parameters of type key => path to file to attach
-     */
-    function postMultipart($url, $parameters = false, $files = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        // prepare multipart encoding
-        $encoding = new SimpleMultipartEncoding($parameters);
-        // attach files if needed
-        if (!empty($files) && is_array($files)) {
-            foreach($files as $k => &$f) {
-                if (! file_exists($f)) continue;
-                $encoding->attach(
-                    $k,
-                    implode('', file($f)),
-                    basename($f));
-            }
-        }
-
-        return $this->_load($url, $encoding);
-    }
-}
-
-/**
- * Bundle of URL parameters for a DELETE request.
- */
-class SimpleDeleteEncoding extends SimpleGetEncoding {
-    function SimpleDeleteEncoding($query = false) {
-        $this->SimpleGetEncoding($query);
-    }
-    function getMethod() {
-        return 'DELETE';
-    }
-}
-
-/**
- * Bundle of URL parameters for a PUT request.
- */
-class SimplePutEncoding extends SimplePostEncoding {
-    function SimplePutEncoding($query = false) {
-        $this->SimplePostEncoding($query);
-    }
-    function getMethod() {
-        return 'PUT';
-    }
 }
 ?>
diff --git a/site/app/tests/views/addons/dictionaries.test.php b/site/app/tests/views/addons/dictionaries.test.php
index 3bf686b..823e0a2 100644
--- a/site/app/tests/views/addons/dictionaries.test.php
+++ b/site/app/tests/views/addons/dictionaries.test.php
@@ -53,7 +53,7 @@ class AddonDictionariesTest extends WebTestHelper {
 
     function testRemoraPage() {
         // just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testDicts() {
diff --git a/site/app/tests/views/addons/display.test.php b/site/app/tests/views/addons/display.test.php
index abaa42f..942a56b 100644
--- a/site/app/tests/views/addons/display.test.php
+++ b/site/app/tests/views/addons/display.test.php
@@ -82,7 +82,7 @@ class AddonTest extends WebTestHelper {
 
     function testRemoraPage() {
         //just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testDisplay() {
@@ -95,11 +95,27 @@ class AddonTest extends WebTestHelper {
         $this->actionPath = $this->actionPath(""); 
         $this->authorPattern = "@<h4 class=\"author\">by +<a href=\"{$this->actionPath}/user/{$userid}\"  class=\"profileLink\">{$username}</a> ?</h4>@";
         $this->assertWantedPattern($this->authorPattern, htmlentities($this->authorPattern));
-
+        // Icon
+        $wantedPattern = "#<img src=\"" . $this->controller->Image->getAddonIconURL($this->id) . "\" class=\"addon-icon\" alt=\"\" />#";
+        $this->assertWantedPattern($wantedPattern, htmlentities($wantedPattern));
+        // Preview
+        $wantedPattern = '#<img src="' . $this->controller->Image->getHighlightedPreviewURL($this->id) . '" alt="" />#';
+        $this->assertWantedPattern($wantedPattern, htmlentities($wantedPattern));
         //@TODO Size: Figure out some way to use the Number Helper in this test
         //$this->wantedPattern = "#<span>\(" . $this->data['Version'][0]['File'][0]['size'] . "KB\)</span>#";
         //$this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
-
+        
+        //check the main version area
+        $this->wantedPattern = "@<h5>" . sprintf(_('addon_display_header_version'), $this->data['Version'][0]['Version']['version']) . " <span title=\"" . strftime(_('datetime'), strtotime($this->data['Version'][0]['Version']['created'])) . "\">&mdash; " . strftime(_('date'), strtotime($this->data['Version'][0]['Version']['created'])) . "</span> &mdash; .*</h5>@";
+        $this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
+        $this->wantedPattern = "#<p {$this->data['Version'][0]['Translation']['releasenotes']['locale_html']}>" . $this->data['Version'][0]['Translation']['releasenotes']['string'] . "</p>#";
+        $this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
+        // check the version at the top title
+        $this->wantedPattern = "#" . $this->data['Version'][0]['Version']['version'] . "#";
+        $this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
+        // check if previous versions link is displayed
+        $this->wantedPattern = _('addons_display_version_history');
+        $this->assertLink($this->wantedPattern, htmlentities($this->wantedPattern));
         // tags
         foreach ($this->tagData as $tag) {
             $this->wantedPattern = "@<li><a href=\"[^\"]+\"( )*>" . $tag['Translation']['name']['string'] . "</a></li>@";
@@ -111,105 +127,11 @@ class AddonTest extends WebTestHelper {
 
         $this->wantedPattern = "@It works but not well.@";
         $this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
-    }
-
-    function testVersion() {
-        $this->getAction("/addon/" . $this->id);
-        phpQuery::newDocument($this->_browser->getContent());
-
-        // Check the version detail area.
-        $version_link = pq('h5#version-detail a');
-        $version = $this->data['Version'][0]['Version']['version'];
-        $this->assertEqual($version_link->text(), sprintf(_('addon_display_header_version'), $version));
-        $link = sprintf('addons/versions/%s#version-%s', $this->id, $version);
-        $this->assertEqual($version_link->attr('href'), $this->controller->url($link));
-
-        $span = pq('h5#version-detail span');
-        $created = strtotime($this->data['Version'][0]['Version']['created']);
-        $this->assertEqual($span->attr('title'), strftime(_('datetime'), $created));
-        $this->assertEquiv($span->text(), '— '.strftime(_('date'), $created));
-
-        $notes = $this->data['Version'][0]['Translation']['releasenotes']['string'];
-        $this->assertEquiv(pq('#release-notes')->text(), $notes);
-
-        // check the version at the top title
-        $this->wantedPattern = "#" . $this->data['Version'][0]['Version']['version'] . "#";
-        $this->assertWantedPattern($this->wantedPattern, htmlentities($this->wantedPattern));
 
-        // check if previous versions link is displayed
-        $link = $this->controller->url('addons/versions/'.$this->id);
-        $text = ___('addons_display_see_all_versions');
-        $this->assertLinkLocation($link, $text);
+        // If gettext can't find the translation, it just returns what it was given
+        $this->assertNotEqual(_('addons_display_version_history'), 'addons_display_version_history');
     }
-
-    function testIcon() {
-        $this->getAction("/addon/" . $this->id);
-        phpQuery::newDocument($this->_browser->getContent());
-
-        $img = pq('#addon-summary .name img.addon-icon');
-        $this->assertEqual($img->attr('src'), $this->controller->Image->getAddonIconURL($this->id));
-    }
-
-    function testPreviewsWithMoreImages() {
-        // Check the preview images for addon 7.  It has 2 in total.
-        $this->getAction("/addon/" . $this->id);
-        phpQuery::newDocument($this->_browser->getContent());
-        $previews = $this->controller->Preview->findAllByAddonId($this->id,
-                                                                 array('id', 'addon_id', 'caption'),
-                                                                 'highlight desc');
-
-        // Check the main preview image.
-        $this->checkImage($previews[0], '.preview-img a', '.preview-img img');
-
-        // Check the More Images section.
-        $this->assertEqual(pq('#addon-info h4:first')->text(), ___('addons_display_more_images'));
-        $this->checkImage($previews[1], '.addon-images li a', '.addon-images li a img');
-
-        //$this->getAction("/addon/" . $this->id);
-    }
-
-    function testPreviewsWithoutMoreImages() {
-        // Addon 9 only has one preview image.
-        $id = 9;
-        $this->getAction("/addon/" . $id);
-        phpQuery::newDocument($this->_browser->getContent());
-        $previews = $this->controller->Preview->findAllByAddonId($id,
-                                                                 array('id', 'addon_id', 'caption'),
-                                                                 'highlight desc');
-        // Check the main preview image.
-        $this->checkImage($previews[0], '.preview-img a', '.preview-img img');
-        // No More Images section.
-        $this->assertNotEqual(pq('#addon-info h4:first')->text(), ___('addons_display_more_images'));
-        $this->assertEqual(pq('#addon-info .addon-images')->size(), 0);
-    }
-
-    function testPreviewsDefaultImage() {
-        // Addon 4022 only has no preview images.
-        $id = 4022;
-        $this->getAction("/addon/" . $id);
-        phpQuery::newDocument($this->_browser->getContent());
-        $this->assertEqual(pq('.preview-img img')->attr('src'), $this->controller->base.'/img/no-preview.png');
-        // No More Images section.
-        $this->assertNotEqual(pq('#addon-info h4:first')->text(), ___('addons_display_more_images'));
-        $this->assertEqual(pq('#addon-info .addon-images')->size(), 0);
-    }
-
-    function checkImage($preview, $link_selector, $image_selector) {
-        list($thumb, $full, $caption) = $this->_previewData($preview);
-        $link = pq($link_selector);
-        $image = pq($image_selector);
-        $this->assertEqual($link->attr('href'), $full);
-        $this->assertEqual($link->attr('title'), $caption);
-        $this->assertEqual($image->attr('src'), $thumb);
-    }
-
-    function _previewData($preview) {
-        $thumb = $this->controller->Image->getPreviewURL($preview['Preview']['id']);
-        $full = $this->controller->Image->getPreviewURL($preview['Preview']['id'], 'full');
-        $caption = $preview['Translation']['caption']['string'];
-        return array($thumb, $full, $caption);
-    }
-
+    
     /**
      * bug 412580 was a bug about some UTF-8 characters breaking out HTML sanitization.
      * Make sure this does not happen anymore.
diff --git a/site/app/tests/views/addons/home.test.php b/site/app/tests/views/addons/home.test.php
index 351ce0e..3fd7afe 100644
--- a/site/app/tests/views/addons/home.test.php
+++ b/site/app/tests/views/addons/home.test.php
@@ -54,7 +54,7 @@ class AddonHomeTest extends WebTestHelper {
 
     function testRemoraHome() {
         //just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testTitle() {
diff --git a/site/app/tests/views/addons/plugins.test.php b/site/app/tests/views/addons/plugins.test.php
index 67b4fcf..9c07209 100644
--- a/site/app/tests/views/addons/plugins.test.php
+++ b/site/app/tests/views/addons/plugins.test.php
@@ -53,7 +53,7 @@ class AddonPluginsTest extends WebTestHelper {
 
     function testRemoraPage() {
         // just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testPlugins() {
diff --git a/site/app/tests/views/addons/previews.test.php b/site/app/tests/views/addons/previews.test.php
index 6fa4ace..b3001b9 100644
--- a/site/app/tests/views/addons/previews.test.php
+++ b/site/app/tests/views/addons/previews.test.php
@@ -54,7 +54,7 @@ class AddonPreviewsTest extends WebTestHelper {
 
     function testRemoraPage() {
         // just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testPreviews() {
diff --git a/site/app/tests/views/addons/searchengines.test.php b/site/app/tests/views/addons/searchengines.test.php
index 23e6cff..266cd1c 100644
--- a/site/app/tests/views/addons/searchengines.test.php
+++ b/site/app/tests/views/addons/searchengines.test.php
@@ -53,7 +53,7 @@ class AddonSearchenginesTest extends WebTestHelper {
 
     function testRemoraPage() {
         // just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testSearchengines() {
diff --git a/site/app/tests/views/addons/versions.test.php b/site/app/tests/views/addons/versions.test.php
index dedff88..afdb6fb 100644
--- a/site/app/tests/views/addons/versions.test.php
+++ b/site/app/tests/views/addons/versions.test.php
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 class AddonVersionsTest extends WebTestHelper {
-    var $addonid = null;
+    var $addonid = 7;
 
     function AddonVersionsTest() {
         $this->WebTestCase("Views->Addons->Previous Versions Tests");
@@ -57,17 +57,10 @@ class AddonVersionsTest extends WebTestHelper {
         }
 
     }
-}
-
-/**
- * Tests for a regular, enabled add-on's previous versions page
- */
-class AddonEnabledVersionsTest extends AddonVersionsTest {
-    var $addonid = 7;
 
     function testRemoraPage() {
         // just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testRssLink() {
@@ -108,18 +101,4 @@ class AddonEnabledVersionsTest extends AddonVersionsTest {
         }
     }
 }
-
-/**
- * Tests for a disabled add-on's versions page
- */
-class AddonDisabledVersionsTest extends AddonVersionsTest {
-    var $addonid = 3716;
-
-    /**
-     * Test if version page is _not_ shown for disabled add-ons
-     */
-    function testDisabledAddonVersionsPage() {
-        $this->assertText(___('error_addon_notfound'), "disabled add-on's versions page");
-    }
-}
 ?>
diff --git a/site/app/tests/views/admin/addons_status.test.php b/site/app/tests/views/admin/addons_status.test.php
index a85d26d..757ee16 100644
--- a/site/app/tests/views/admin/addons_status.test.php
+++ b/site/app/tests/views/admin/addons_status.test.php
@@ -12,7 +12,7 @@ class AdminAddonsStatusTest extends WebTestHelper {
     }
 
     function testRemoraPage() {
-        $this->assertWantedPattern('/Mozilla Add-ons/i', 'pattern detected');
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', 'pattern detected');
         $this->assertResponse('200');
     }
 
diff --git a/site/app/tests/views/admin/serverstatus.test.php b/site/app/tests/views/admin/serverstatus.test.php
index b54d86d..a85bbcc 100644
--- a/site/app/tests/views/admin/serverstatus.test.php
+++ b/site/app/tests/views/admin/serverstatus.test.php
@@ -52,7 +52,7 @@ class AdminServerStatusTest extends WebTestHelper {
     }
 
     function testRemoraPage() {
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
         $this->assertResponse('200');
     }
 
diff --git a/site/app/tests/views/developers/editversion.test.php b/site/app/tests/views/developers/editversion.test.php
index 1654b2e..ced5855 100644
--- a/site/app/tests/views/developers/editversion.test.php
+++ b/site/app/tests/views/developers/editversion.test.php
@@ -48,6 +48,8 @@ class DevelopersEditVersionTest extends WebTestHelper {
         $this->model->caching = false; // Make sure caching is off.
         $this->model->id = $this->id;
         $this->getAction('/developers/editversion/' . $this->id);
+
+        global $TestController;
     }
 
     function testRemoraPage() {
@@ -62,23 +64,17 @@ class DevelopersEditVersionTest extends WebTestHelper {
         //Check fields
         $this->model->useLang = 'en-US';
         $this->data = $this->model->find("Version.id={$this->id}", null , null , 2);
-        $this->assertFieldByName('data[Version][releasenotes][en-US]', htmlentities($this->data['Translation']['releasenotes']['string']),
-                                 'Version Notes (en-US) field populated: %s');
-
+        $this->assertFieldById('VersionReleasenotes_en_US', htmlentities($this->data['Translation']['releasenotes']['string']), 'Version Notes (en-US) field populated: %s');
+        
         $this->model->useLang = 'de';
         $this->data = $this->model->find("Version.id={$this->id}", null , null , 2);
-        $this->assertFieldByName('data[Version][releasenotes][de]', htmlentities($this->data['Translation']['releasenotes']['string']),
-                                 'Version Notes (de) field populated: %s');
+        $this->assertFieldById('VersionReleasenotes_de', htmlentities($this->data['Translation']['releasenotes']['string']), 'Version Notes (de) field populated: %s');
 
         $this->assertField('data[Version][approvalnotes]', $this->data['Version']['approvalnotes'], 'Version Approval Notes field populated: %s');
+        
+        $this->assertText($this->data['File'][0]['filename'].' ('.$this->data['File'][0]['size'].' KB)', 'File listing detected');
 
-        $this->assertText($this->data['File'][0]['size'].' KB', 'File size listing detected');
-
-        phpQuery::newDocument($this->_browser->getContent());
-        $platform = pq('#files-table option:first');
-        $this->assertAttrs($platform, array('value' => 1, 'selected' => 'selected'),
-                           'ALL platform is selected: %s');
-        $this->assertEqual($platform->text(), 'ALL', 'ALL platform is selected: %s');
+        $this->assertWantedPattern('/\<option value="1"  selected="selected"\>ALL\<\/option\>/', 'Correct platform selected');
     }
 }
 ?>
diff --git a/site/app/tests/views/developers/index.test.php b/site/app/tests/views/developers/index.test.php
index 784947f..c80fff2 100644
--- a/site/app/tests/views/developers/index.test.php
+++ b/site/app/tests/views/developers/index.test.php
@@ -48,7 +48,7 @@ class DevelopersIndexTest extends WebTestHelper {
 
     function testRemoraPage() {
         //just checks if the page works or not
-        $this->assertWantedPattern('/My Add-ons/i', 'Header detected');
+        $this->assertWantedPattern('/'.___('devcp_index_header_myaddons').'/i', 'Header detected');
     }
 
     function testDisplay() {
diff --git a/site/app/tests/views/elements/install.test.php b/site/app/tests/views/elements/install.test.php
index c4d10ff..f874f58 100644
--- a/site/app/tests/views/elements/install.test.php
+++ b/site/app/tests/views/elements/install.test.php
@@ -72,8 +72,8 @@ class InstallTest extends WebTestHelper {
         $installMessage = _('a_eula_install');
         
         //test filenames matches with database
-        $this->wantedPattern = "@<a href=\"{$this->actionPath}/downloads/latest/{$this->id}/addon-{$this->id}-latest.xpi\"@";
-        $this->assertWantedPattern($this->wantedPattern, "install url matches: ".htmlentities($this->wantedPattern));
+        $this->wantedPattern = "@<a href=\"{$this->actionPath}/downloads/file/{$this->data['Version'][0]['File'][0]['id']}@";
+        $this->assertWantedPattern($this->wantedPattern, "install url matches: {$this->actionPath}/downloads/file/{$this->data['Version'][0]['File'][0]['id']}");
         
         //test add-on name matches in install trigger
         $this->wantedPattern = "@addonName=\"{$this->data['Translation']['name']['string']}\"@";
diff --git a/site/app/tests/views/helpers/addons_html.test.php b/site/app/tests/views/helpers/addons_html.test.php
index a6fa122..44ce4c9 100644
--- a/site/app/tests/views/helpers/addons_html.test.php
+++ b/site/app/tests/views/helpers/addons_html.test.php
@@ -41,12 +41,9 @@ class AddonsHtmlHelperTest extends UnitTestCase {
     var $html = null;   // the helper
 	
 	function setUp() {
-
-	    
         static $tags;
 		loadHelper('AddonsHtml');
-        loadModel('Addon');
-        $this->Addon = new Addon();
+
         $this->html =& new AddonsHtmlHelper();
         $this->html->webroot = '';
         $this->html->here    = '';
@@ -103,16 +100,5 @@ class AddonsHtmlHelperTest extends UnitTestCase {
         $this->assertEqual('abcde', $this->html->truncateChars(5, 'abcde'));
         $this->assertEqual('ab...', $this->html->truncateChars(5, 'abcdef'));
     }
-    
-    /**
-     * Tests that an addon that has the addons_tags.feature = 1 is shown as featured
-     */
-    function testRecommendedFlag() {
-        $addon = $this->Addon->getListAddons(4021, array(STATUS_PUBLIC), '', true);
-        $addon = $addon[0];
-        $result = $this->html->flag($addon);
-        phpQuery::newDocument($result);
-        $this->assertEqual(pq('h5.flag a')->text(), 'recommended', 'Category recommended and recommended addons are flagged as recommended');
-    }
 }
 ?>
diff --git a/site/app/tests/views/reviews/add.test.php b/site/app/tests/views/reviews/add.test.php
index 86ccaba..c08e55d 100644
--- a/site/app/tests/views/reviews/add.test.php
+++ b/site/app/tests/views/reviews/add.test.php
@@ -54,7 +54,7 @@ class ReviewsAddTest extends WebTestHelper {
 
     function testRemoraPage() {
         //just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testReviews() {
diff --git a/site/app/tests/views/reviews/display.test.php b/site/app/tests/views/reviews/display.test.php
index 60f6190..9c85651 100644
--- a/site/app/tests/views/reviews/display.test.php
+++ b/site/app/tests/views/reviews/display.test.php
@@ -52,7 +52,7 @@ class AddonReviewsTest extends WebTestHelper {
 
     function testRemoraPage() {
         //just checks if the page works or not
-        $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected");
+        $this->assertWantedPattern('/'.SITE_NAME.'/i', "pattern detected");
     }
 
     function testReviews() {
diff --git a/site/app/tests/views/search/index.test.php b/site/app/tests/views/search/index.test.php
index 5197c4c..e742227 100644
--- a/site/app/tests/views/search/index.test.php
+++ b/site/app/tests/views/search/index.test.php
@@ -44,6 +44,7 @@ class SearchResultTest extends WebTestHelper {
     
     function testBasicResults() {
         $this->getAction("/search/?q=the");
+        $this->assertWantedPattern("/mozilla.thtml processed for search/", "correct template");
         $this->assertNoUnwantedPattern("/"._('search_nothing_found')."/", "No results found.");
         $this->assertFieldById('query', 'the', "previous query pre-populated");
     }
diff --git a/site/app/views/addons/browse.thtml b/site/app/views/addons/browse.thtml
index 7c5f80f..69d6acf 100644
--- a/site/app/views/addons/browse.thtml
+++ b/site/app/views/addons/browse.thtml
@@ -38,38 +38,51 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+?>
+
+<div id="content" class="category">
 
-$this->viewVars['bodyclass'] = 'inverse';
-$this->layout = 'amo2009';
+<?php
+if (!empty($type) && !empty($this_tag) && array_key_exists('Tag', $this_tag))
+    echo $this->renderElement('search', array('category' => 
+        array($type, $this_tag['Tag']['id'])));
+else
+    echo $this->renderElement('search');
 ?>
 
-<div class="section" id="browse">
-    <div class="stand-alone-options">
-        <?=$this->renderElement('amo2009/categories')?>
-        <?php
-        if (!empty($type) && array_key_exists('Tag', $this_tag))
-            echo $this->renderElement('amo2009/search', array('category' =>
-                array($type, $this_tag['Tag']['id'])));
-        else
-            echo $this->renderElement('amo2009/search');
-        ?>
-    </div>
-    <div class="primary full" role="main">
-        <h2><?=$subpagetitle?></h2>
+<div id="content-main">
 
-        <h3><?=sprintf(ngettext('addon_list_category_totalcount',
-            'addon_list_category_totalcount', $paging['total']),
-            $paging['total'])?></h3>
-        <div class="featured listing" id="addon-listing">
-            <?php
-            echo $this->renderElement('amo2009/addon_list_options', array('paging' => $paging));
-            foreach ($addons as $val) {
-                echo $this->renderElement('amo2009/homepage_addon', array('addon' => $val));
-            }
-            ?>
-        </div>
+<?=$this->renderElement('addon_list_options', array('paging'=>$paging))?>
 
-        <?=$this->renderElement('amo2009/pagination');?>
-    </div><!-- /primary -->
+<ul id="addon-listing">
+<?
+foreach ($addons as $val) {
+    // prepare preview image
+    $prevPath = $this->controller->Image->getHighlightedPreviewURL($val['Addon']['id']);
+    // prepare icon
+    $iconPath = $this->controller->Image->getAddonIconURL($val['Addon']['id']);
+
+    echo $this->renderElement('addon_listitem', array(
+        'addon'             => $val,
+        'addonIconPath'     => $iconPath,
+        'addonPreviewPath'  => $prevPath,
+        ));
+}
+?>
+</ul>
 
-</div><!-- /section -->
+<?=$this->renderElement('pagination', array('countstring' =>
+        sprintf(ngettext('addon_list_category_totalcount',
+        'addon_list_category_totalcount', $paging['total']), $paging['total'])));?>
+
+</div><!-- /#content-main -->
+
+<?php
+if (!empty($type) && array_key_exists('Tag', $this_tag))
+    echo $this->renderElement('sidebar', array('highlight' => 
+        array($type, $this_tag['Tag']['id'])));
+else
+    echo $this->renderElement('sidebar');
+?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/browse_thumbs.thtml b/site/app/views/addons/browse_thumbs.thtml
index a5c029e..a405f89 100644
--- a/site/app/views/addons/browse_thumbs.thtml
+++ b/site/app/views/addons/browse_thumbs.thtml
@@ -36,65 +36,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->viewVars['bodyclass']  = 'browse_thumbs';
-$this->layout = 'amo2009';
 ?>
 
-<div class="stand-alone-options">
-    <?=$this->renderElement('amo2009/categories')?>
-    <?php
-    if (!empty($type) && !empty($this_tag) && array_key_exists('Tag', $this_tag))
-        echo $this->renderElement('amo2009/search', array('category' =>
-            array($type, $this_tag['Tag']['id'])));
-    else
-        echo $this->renderElement('amo2009/search');
-    ?>
-</div>
-
-<div class="secondary">
-    <div class="highlight" id="thumb-subcategories">
-        <h3><?=___('general_addontype_theme_plural', 'Themes')?></h3>
-        <ul class="subcategories">
-            <li<?= ($this_tag == FALSE) ? ' class="selected"' : '' ?>><?=$html->link( 
-                    'All',
-                    "/browse/type:{$type}/cat:all?sort={$sort_by}"
-                )?>
-                <span class="items"><?=$all_total?></span>
-            </li>
-            <?php foreach ($subcats as $subcat): ?>
-                <?php
-                    $params = 'sort=' . $sort_by;
-                    if ($show_exp) 
-                        $params .= '&exp=on';
-                    if ($show_limit) 
-                        $params .= '&show=' . $show_limit;
-                ?>
-                <li class="sub<?= ($this_tag['Tag']['id'] == $subcat['Tag']['id']) ? ' selected' : '' ?>"><?=$html->link( 
-                    $subcat['Translation']['name']['string'],
-                    "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?{$params}"
-                    )?>
-                    <span class="items"><?=(isset($subcat_totals[$subcat['Tag']['id']]) ? $subcat_totals[$subcat['Tag']['id']] : 0) ?></span>
-                </li>
-            <?php endforeach; ?>
-        </ul>
-    </div>
-</div>
+<div id="content" class="landing browse">
 
-<div class="primary" role="main">
+    <?=$this->renderElement('search', array('category' => array($type, 0)))?>
 
-    <?php if ( empty($this_tag)): ?>
-        <h2><?=___('themes_landing_browse_themes', 'Browse Themes')?></h2>
-    <?php else: ?>
-        <h2><?=$this_tag['Translation']['name']['string']?></h2>
-    <?php endif ?>
+    <div id="content-main">
 
-    <h3><?=sprintf(ngettext('addon_list_category_totalcount',
-        'addon_list_category_totalcount', $paging['total']),
-        $paging['total'])?></h3>
-    <div class="featured listing" id="addon-listing">
-        <?= $this->renderElement('amo2009/addon_list_options', array('paging' => $paging)) ?>
+        <div id="thumb-browser">
 
-            <ul class="thumbs clearfix">
+            <?=$this->renderElement('addon_list_options', array('paging'=>$paging))?>
+
+            <ul class="thumbs">
             <?php
             foreach ($addons as $addon) {
                 $addonID   = $addon['Addon']['id'];
@@ -106,43 +60,93 @@ $this->layout = 'amo2009';
                 $_alt = sprintf(_('img_preview_of'),$addonName);
                 $previmg = '<img src="'.$prevPath.'" alt="'.$_alt.'" title="'.$_alt.'"/>';
                 $previmg = $html->link($previmg, "/addon/{$addonID}");
+
+                // is addon recommended or experimental?
+                global $experimental_status;
+                if (in_array($addon['Addon']['status'], $experimental_status)) {
+                    $flag = _('addon_listitem_flag_experimental');
+                    $li_extraclass = 'exp';
+                } elseif ($addon['Addon']['recommended']) {
+                    $flag = _('addon_listitem_flag_recommended');
+                    $li_extraclass = 'rec';
+                } else {
+                    $flag = '';
+                    $li_extraclass = '';
+                }
+
                 ?>
-                    <li class="thumb <?=$html->extraClass($addon)?>">
-                        <div class="thumb_item">
-                            <div class="img"><?=$previmg?></div>
-                            <h4 class="name"><?=$html->link("$addonName", "/addon/{$addonID}");?></h4>
-                            <?=$html->flag($addon)?>
-                            <p class="meta">
-                                <?php if ($sort_by == 'updated'): ?>
-                                    <?php
-                                    $_update_string = (_('addon_detail_last_updated') == 'addon_detail_last_updated') ? 'Updated %s' : _('addon_detail_last_updated');
-                                    $_version_date = (isset($addon['Addon']['datestatuschanged']) ? $addon['Addon']['datestatuschanged'] : $addon['Version'][0]['created']);
-                                    echo sprintf($_update_string, strftime(_('date'), strtotime($_version_date)));
-                                    ?>
-                                <?php elseif ($sort_by == 'popular'): ?>
-                                    <em><?=$html->number_format($addon['Addon']['weeklydownloads'], 0)?></em>
-                                    <?php 
-                                    echo ___('addon_downloads_weekly', _('addon_downloads'));
-                                    ?>
-                                <?php else: ?>
-                                    <?=$this->renderElement('stars',array('rating' => $addon['Addon']['averagerating']))?>
-                                    <?php if ($addon['Addon']['totalreviews'] > 0): ?> 
-                                        <a href="<?= $html->url('/addon/'.$addon['Addon']['id'].'#reviews') ?>"><?=
-                                            sprintf(ngettext('feature_reviews','feature_reviews', 
-                                                $addon['Addon']['totalreviews']), $addon['Addon']['totalreviews'])
-                                        ?></a>
+                    <li class="thumb <?=$li_extraclass?>">
+                        <div class="wrapper">
+                            <div class="item">
+                                <div class="img"><?=$previmg?></div>
+                                <h3 class="name"><?=$html->link("$addonName", "/addon/{$addonID}");?></h3>
+                                <? if (!empty($flag)) echo '<h5 class="flag">'.$flag.'</h5>'; ?>
+                                <p class="meta">
+                                    <?php if ($sort_by == 'updated'): ?>
+                                        <?php
+                                        $_update_string = (_('addon_detail_last_updated') == 'addon_detail_last_updated') ? 'Updated %s' : _('addon_detail_last_updated');
+                                        $_version_date = (isset($addon['Addon']['datestatuschanged']) ? $addon['Addon']['datestatuschanged'] : $addon['Version'][0]['created']);
+                                        echo sprintf($_update_string, strftime(_('date'), strtotime($_version_date)));
+                                        ?>
+                                    <?php elseif ($sort_by == 'popular'): ?>
+                                        <em><?=$html->number_format($addon['Addon']['weeklydownloads'], 0)?></em>
+                                        <?php 
+                                        echo ___('addon_downloads_weekly', _('addon_downloads'));
+                                        ?>
+                                    <?php else: ?>
+                                        <?=$this->renderElement('stars',array('rating' => $addon['Addon']['averagerating']))?>
+                                        <?php if ($addon['Addon']['totalreviews'] > 0): ?> 
+                                            <a href="<?= $html->url('/addon/'.$addon['Addon']['id'].'#reviews') ?>"><?=
+                                                sprintf(ngettext('feature_reviews','feature_reviews', 
+                                                    $addon['Addon']['totalreviews']), $addon['Addon']['totalreviews'])
+                                            ?></a>
+                                        <?php endif ?>
                                     <?php endif ?>
-                                <?php endif ?>
-                            </p>
+                                </p>
+                            </div>
                         </div>
+                        <div class="vex"><span>&nbsp;</span></div>
                     </li>
                 <?php
             }
             ?>
             </ul>
 
+            <br style="clear:both" />
+
+            <?=$this->renderElement('pagination', array('countstring' =>
+                    sprintf(ngettext('addon_list_category_totalcount',
+                    'addon_list_category_totalcount', $paging['total']), $paging['total'])));?>
+
+        </div> <!-- #thumb-browser -->
+
+
+    </div><!-- /#content-main -->
+
+    <div id="thumb-subcategories">
+        <ul class="subcategories">
+            <li<?= ($this_tag == FALSE) ? ' class="selected"' : '' ?>><?=$html->link( 
+                    'All ('.$all_total.')',
+                    "/browse/type:{$type}/cat:all?sort={$sort_by}"
+            )?></li>
+            <?php foreach ($subcats as $subcat): ?>
+                <?php
+                    $params = 'sort=' . $sort_by;
+                    if ($show_exp) 
+                        $params .= '&exp=on';
+                    if ($show_limit) 
+                        $params .= '&show=' . $show_limit;
+                ?>
+                <li<?= ($this_tag['Tag']['id'] == $subcat['Tag']['id']) ? ' class="selected"' : '' ?>><?=$html->link( 
+                    $subcat['Translation']['name']['string'] . ' (' . (isset($subcat_totals[$subcat['Tag']['id']]) ? $subcat_totals[$subcat['Tag']['id']] : 0) . ')',
+                    "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?{$params}"
+                )?></li>
+            <?php endforeach; ?>
+        </ul>
     </div>
 
-    <?=$this->renderElement('amo2009/pagination');?>
+    <?=$this->renderElement('sidebar', array('highlight' => array($type, 0)))?>
+
+    <?=$this->renderElement('app_chooser')?>
 
-</div><!-- /primary -->
+</div><!-- /#content -->
diff --git a/site/app/views/addons/category_landing.thtml b/site/app/views/addons/category_landing.thtml
index db0764c..5cff14d 100644
--- a/site/app/views/addons/category_landing.thtml
+++ b/site/app/views/addons/category_landing.thtml
@@ -37,142 +37,187 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-
-$this->viewVars['bodyclass'] = 'inverse category_landing';
-$this->layout = 'amo2009';
-
-$curr_tag_name = $this_tag['Translation']['name']['string'];
-$curr_tag_desc = $this_tag['Translation']['description']['string'];
-
-$nameLimit = 40;
-$summaryLimit = 70; 
 ?>
-<div class="stand-alone-options">
-    <?=$this->renderElement('amo2009/categories')?>
-    <?=$this->renderElement('amo2009/search')?>
-</div>
 
-<div class="primary" role="main">
+<div id="content" class="landing landing-with-slider">
 
-    <h2><?php echo $curr_tag_name ?></h2>
+<?=$this->renderElement('search', array('category' => 
+    array($this_tag['Tag']['addontype_id'], $this_tag['Tag']['id'])))?>
 
-    <div id="featured_addons" class="clearfix">
-        <ul>
-            <?php foreach ($featured_addons as $addon): ?>
-               
-                <li class="addon_block_wrapper">
-                    <div class="addon_block item">
-                        <h4 class="name"><a href="<?=$html->url("/addon/{$addon['Addon']['id']}")?>"><?php echo $html->truncateChars(28, $addon['Translation']['name']['string'], true) ?></a></h4>
-                        <p class="authors"><?=_('addons_home_by')?> <?=$html->linkUsersFromModel($addon['User'], 2,"/addon/{$addon['Addon']['id']}#authors" );?></p>
-                        <p class="summary"><?php echo $html->truncateChars($summaryLimit, $addon['Translation']['summary']['string'], true) ?></p>
-                        <div class="preview"><a href="<?=$html->url("/addon/{$addon['Addon']['id']}")?>"><img src="<?php echo $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']);?>" alt="" /></a></div>
-                        <p class="rating"><?=$this->renderElement('amo2009/stars',array('rating' => $addon['Addon']['averagerating']))?></p>
-                        <?php
-                            $addonIconPath = $this->controller->Image->getAddonIconURL($addon['Addon']['id']);
-                            $addonID = $addon['Addon']['id'];
-                            $addonName = $addon['Translation']['name']['string'];
-                            $hasVersion = (isset($addon['Version']) && !empty($addon['Version']));
-                            $addonVersion = ($hasVersion ? $addon['Version'][0]['version'] : '');
-                            $hasFiles = ($hasVersion && !empty($addon['File']));
-                            if ($hasFiles) {
-                                $addonFiles = $addon['File'];
-                                $addonEULA = $addon['Translation']['eula']['string'];
-                                
-                                
-                                $addonCreators = $addon['User'];
-                                $addonSummary = $addon['Translation']['summary']['string'];
+<div id="content-main">
+    
+    <div id="content-extra">
+        <div class="more-addons">
+            <h3><?=$html->link(sprintf(_('category_extra_see_all'), $this_tag['Translation']['name']['string']),
+                "/browse/type:{$type_id}/cat:{$cat_id}?sort=name",
+                array('class'=>'view'))?></h3>
+            
+            <ul>
+                <?php
+                $sortorders = array(
+                    'popular'   => _('category_extra_mostpopular'),
+                    'rated'     => _('category_extra_highestrated'),
+                    'updated'   => _('category_extra_lastupdated'),
+                );
+                foreach ($sortorders as $sortkey => $title):
+                ?>
+                <li><?=$html->link($title,
+                    "/browse/type:{$type_id}/cat:{$cat_id}?sort={$sortkey}",
+                    array('class'=>'view'))?></li>
+                <?php endforeach; ?>
+                <li><?=$html->link(_('category_extra_allrecommended'),
+                    "/recommended/cat:{$cat_id}", array('class'=>'view'))?></li>
+            </ul>
+        </div>
+        
+        <?=$this->renderElement('pitch'); ?>
+    </div><!-- /#content-extra -->
 
-                                // prepare preview image
-                                if (isset($addonPreviewPath) && !empty($addonPreviewPath)) {
-                                    $_alt = sprintf(_('img_preview_of'),$addonName);
-                                    $previmg = '<img src="'.$addonPreviewPath.'" '
-                                        .'alt="'.$_alt.'" title="'.$_alt.'"/>';
-                                    $previmg = '<p class="preview-img">'
-                                        .$html->link($previmg, "/addon/{$addonID}").'</p>';
-                                } else
-                                    $previmg = '';
-                                // prepare icon
-                                if (isset($addonIconPath) && !empty($addonIconPath))
-                                    $icon = '<img src="'.$addonIconPath.'" class="icon" alt=""/>';
-                                else
-                                    $icon = '';
+    <?php if (!empty($featureAddons)): ?>
+    <!-- <div> -->
+    <div id="recommended">
+        <h3><?=_('addons_home_feature_head')?></h3>
 
-                                // prepare categories
-                                if (!empty($addon['Tag'])) {
-                                    $categories = $this->renderElement('addon_categories', array('tags' => $addon['Tag']));
-                                } else
-                                    $categories = '';
+        <div id="slider" class="slider_widget">
+            <div class="inner">
+                <div class="viewport">
+                    <ul class="item_set">
+                        <?php
+                        $idx = 0;
+                        $total_features = count( $featureAddons );
+                        foreach ( $featureAddons as $feature1 ) {
+                            $idx++;
 
-                                // prepare summary
-                                if (!isset($addonSummary) || empty($addonSummary))
-                                    $addonSummary = '&nbsp;';
+                            $prev_idx = $idx - 1;
+                            if ($prev_idx < 1) 
+                                $prev_idx = $total_features;
+                            $next_idx = $idx + 1;
+                            if ($next_idx > $total_features)
+                                $next_idx = 1;
 
-                                $_install_render_options = array(
-                                    'addonIconPath' => $addonIconPath, 
-                                    'addonName'     => $addonName,
-                                    'addonId'       => $addonID,
-                                    'addonFiles'    => $addonFiles,
-                                    'addonEULA'     => $addonEULA,
-                                    'addonStatus'   => $addon['Addon']['status'],
-                                    'is_latest'     => ($addon['Addon']['status'] == STATUS_PUBLIC),
-                                    'addonType'     => $addon['Addon']['addontype_id'],
-                                    'compatible_apps' => $addon['compatible_apps'],
-                                    'allPlatforms'  => $platforms,
-                                    'buttonType'    => 'small',
-                                    'showInstructions' => false
-                                	);
-                                echo $this->renderElement('amo2009/install', $_install_render_options);
-                                
-                            } 
-                        ?>
+                            ?>
+                            <li id="feature1_<?=$idx?>" class="item addon featured main">
+                                <?=$this->renderElement('feature', array(
+                                    'addonIconPath' => $this->controller->Image->getAddonIconURL($feature1['Addon']['id']),
+                                    'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($feature1['Addon']['id']),
+                                    'addonName' => $feature1['Translation']['name']['string'],
+                                    'addonSummary' => $feature1['Translation']['summary']['string'],
+                                    'addonId' => $feature1['Addon']['id'],
+                                    'addonFiles' => $feature1['File'],
+                                    'addonEULA' => $feature1['Translation']['eula']['string'],
+                                    'addonStatus' => $feature1['Addon']['status'],
+                                    'addonAuthors' => $feature1['User'],
+                                    'addonTags' => $feature1['Tag'],
+                                    'addonWeeklyDownloads' => $feature1['Addon']['weeklydownloads'],
+                                    'allPlatforms' => $platforms,
+                                    'compatible_apps' => $feature1['compatible_apps'],
+                                    'addonType' => $feature1['Addon']['addontype_id'],
+                                    'addonRating' => $feature1['Addon']['averagerating'],
+                                    'addonReviews' => $feature1['Addon']['totalreviews'],
+                                    'addonVersionCreated' => $feature1['Version'][0]['created']
+                                ))?>
+                            </li>
+                            <?php 
+                        } ?>
+                    </ul>
+                </div>
+                <div class="controls">
+                    <div class="controls_inner">
+                        <a href="#slider" title="Previous" class="prev">
+                            <img src="<?=$html->urlImage("slider-prev-disabled.gif")?>"
+                                width="30" height="30" alt="<?=___('addon_slider_tooltip_previous', 'Previous Add-on')?>"
+                                title="<?=___('addon_slider_tooltip_previous', 'Previous Add-on')?>" /> 
+                        </a>    
+                        <span class="indicator">
+                            <span class="index">1</span> 
+                            /
+                            <span class="total"><?=$total_features?></span>
+                        </span>
+                        <a href="#slider" title="Next" class="next">
+                            <img src="<?=$html->urlImage("slider-next.gif")?>"
+                                width="30" height="30" alt="<?=___('addon_slider_tooltip_next', 'Next Add-on')?>"
+                                title="<?=___('addon_slider_tooltip_next', 'Next Add-on')?>" /> 
+                        </a>    
                     </div>
-                </li>
-            <?php endforeach ?>
-        </ul>        
-    </div>
-
-    <div id="new_addons" class="addons_column clearfix">
-        <h3><span><?= ___('addons_recently_added') ?></span></h3>
-        <ul>
-            <?php foreach ($new_addons as $idx=>$addon): ?>
-                <li class="<?= (0 == ($idx % 2)) ? 'odd' : 'even' ?>"><a href="<?=$html->url("/addon/{$addon['id']}")?>">
-                    <img class="icon" src="<?php echo $addon['icon_url']?>" width="32" height="32" alt="" />
-                    <span class="name"><?php echo $html->truncateChars($nameLimit, $addon['name'], true) ?></span>
-                    <span class="meta created">
-                        added <?php echo strftime('%m/%d/%Y', strtotime($addon['created'])) ?>
-                    </span>
-                </a></li>
-            <?php endforeach ?>
-        </ul>
-        <p class="view-all"><?=$html->link(___('view_recently_added').' »',"/browse/type:{$type_id}/cat:{$cat_id}?sort=newest")?></p>     
-    </div>
+                </div>
+            </div>
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+    </div><!-- /#recommended -->
+    <?php endif; /* !empty(recommended) */ ?>
 
-    <div id="popular_addons" class="addons_column clearfix">
-        <h3><span><?=___('addons_top_downloads') ?></span></h3>
-        <ul>
-            <?php foreach ($popular_addons as $idx=>$addon): ?>
-                <li class="<?= (0 == ($idx % 2)) ? 'odd' : 'even' ?>"><a href="<?=$html->url("/addon/{$addon['id']}")?>">
-                    <img class="icon" src="<?php echo $addon['icon_url']?>" width="32" height="32" alt="" />
-                    <span class="name"><?php echo $html->truncateChars($nameLimit, $addon['name'], true) ?></span>
-                    <span class="meta downloads"><?php echo $html->number_format($addon['weeklydownloads']) ?> <?= _('addon_downloads_weekly') ?></span>
-                </a></li>
-            <?php endforeach ?>
-        </ul>
-        <p class="view-all"><?=$html->link(___('view_top_downloads').' »',"/browse/type:{$type_id}/cat:{$cat_id}?sort=popular")?></p>       
-    </div>
+    <?php if (FALSE && !empty($featureAddons)): ?>
+    <div id="recommended">
+        <h3><?=_('addons_home_feature_head')?></h3>
+        <?php
+        foreach($featureAddons as $id => $addon):
+        ?>
+        <div id="feature<?=$id+1?>" class="addon main">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonFiles' => $addon['File'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'compatible_apps' => $addon['compatible_apps'],
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews'],
+                'addonVersionCreated' => $addon['Version'][0]['created']
+            ))?>
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+        <?php endforeach; ?>
+    </div><!-- /#recommended -->
+    <?php endif; /* !empty(recommended) */ ?>
+    
+    <?php if (!empty($randomAddons)): ?>
+    <div id="secondaries">
+        <?php
+        global $experimental_status;
+        $is_first = TRUE; 
+        foreach($randomAddons as $id => $addon):
+            $idx = count($featureAddons) + $id + 1;
+            if (in_array($addon['Addon']['status'], $experimental_status))
+                $extraclass = ' exp';
+            else
+                $extraclass = '';
+            if ($is_first) {
+                $is_first = FALSE; $extraclass = ' first';
+            }
+        ?>
+        <div id="feature<?=$idx?>" class="addon sub<?=$extraclass?>">
+            <div class="irk">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonStatus' => $addon['Addon']['status'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews']
+            ))?>
+            </div>
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+        <?php endforeach; ?>
+    </div><!-- /#secondaries -->
+    <?php endif; /* !empty(random) */ ?>
 
-    <div id="updated_addons" class="addons_column last clearfix">
-        <h3><span><?=___('addons_top_rated') ?></span></h3>
-        <ul>
-            <?php foreach ($updated_addons as $idx=>$addon): ?>
-                <li class="<?= (0 == ($idx % 2)) ? 'odd' : 'even' ?>"><a href="<?=$html->url("/addon/{$addon['id']}")?>">
-                    <img class="icon" src="<?php echo $addon['icon_url']?>" width="32" height="32" alt="" />
-                    <span class="name"><?php echo $html->truncateChars($nameLimit, $addon['name'], true) ?></span>
-                    <span class="meta rating"><?=$this->renderElement('amo2009/stars',array('rating' => $addon['averagerating']))?></span>
-                </a></li>
-            <?php endforeach ?>
-        </ul>
-        <p class="view-all"><?=$html->link(___('view_top_rated').' »',"/browse/type:{$type_id}/cat:{$cat_id}?sort=rated")?></p>
-    </div>
+</div><!-- /#content-main -->
 
-</div>
+<?=$this->renderElement('sidebar', array('highlight' =>
+    array($this_tag['Tag']['addontype_id'], $this_tag['Tag']['id'])))?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/dictionaries.thtml b/site/app/views/addons/dictionaries.thtml
index da197e8..0a0bcd7 100644
--- a/site/app/views/addons/dictionaries.thtml
+++ b/site/app/views/addons/dictionaries.thtml
@@ -47,18 +47,14 @@ if (in_array(APP_ID, $browser_apps)) {
     $install_text[ADDON_DICT]  = _('langtools_download_dictionary');
     $install_text[ADDON_LPAPP] = _('langtools_download_langpack');
 }
-
-$this->viewVars['bodyclass'] = 'inverse';
-$this->layout = 'amo2009';
 ?>
-<div class="section">
-    <div class="stand-alone-options">
-        <?=$this->renderElement('amo2009/categories')?>
-        <?=$this->renderElement('amo2009/search'); ?>
-    </div>
 
+<div id="content" class="landing languages">
+
+<?=$this->renderElement('search', array('category'=>array(ADDON_DICT, 0)))?>
+
+<div id="content-main">
     <?php /* list of dictionaries and language packs */ ?>
-    <div class="featured"><div class="featured-inner">
     <div id="dictionaries">
         <h3><?=_('langtools_header_dicts_and_langpacks')?></h3>
         
@@ -105,7 +101,9 @@ $this->layout = 'amo2009';
             </tbody>
         </table>
     </div><!-- /#dictionaries -->
-    </div></div><!-- /featured -->
 
+</div><!-- /#content-main -->
 
-</div><!-- /.section -->
+<?=$this->renderElement('sidebar', array('highlight' => array(ADDON_DICT, 0)))?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/display.thtml b/site/app/views/addons/display.thtml
index 32a81ff..c0825d1 100644
--- a/site/app/views/addons/display.thtml
+++ b/site/app/views/addons/display.thtml
@@ -41,35 +41,32 @@
 ?>
 
 <?php
+        
     if (empty($addonIconPath))
         $addonIconPath = ($addon['Addon']['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON));
-?>
 
-<div class="stand-alone-options">
+// is addon experimental?
+global $experimental_status;
+if (in_array($addon['Addon']['status'], $experimental_status)) {
+    $flag = _('addon_listitem_flag_experimental');
+    $box_extraclass = 'exp';
+} else {
+    $flag = '';
+    $box_extraclass = '';
+}
 
-    <?=$this->renderElement('amo2009/categories')?>
+?>
 
-    <?=$this->renderElement('amo2009/search')?>
+  <div id="content" class="detail-page">
 
-  </div>
+<?=$this->renderElement('search')?>
 
-<div class="primary" role="main">
-    <?php
-    if (!empty($coll_addon_added)) {
-        echo $this->renderElement('notification', array(
-            'type' => 'success',
-            'msg' => sprintf(___('addons_display_collection_publish_success'),
-                $addon['Translation']['name']['string'],
-                $html->link($coll_addon_added['Translation']['name']['string'],
-                    "/collection/{$coll_addon_added['Collection']['uuid']}")
-                )
-        ));
-    }
-    ?>
-    <h2 <?=$addon['Translation']['name']['locale_html']?> class="addon"><img src="<?=$addonIconPath?>" class="icon" alt="" /><span><?=$addon['Translation']['name']['string']?> <?=($hasversion?$addon['Version'][0]['Version']['version']:'')?></span></h2>
+  <div id="content-main">
+
+    <div id="addon-summary" class="addon <?=$box_extraclass?>">
+    <h3 class="name"<?=$addon['Translation']['name']['locale_html']?>><img src="<?=$addonIconPath?>" class="addon-icon" alt="" /><?=$addon['Translation']['name']['string']?> <?=($hasversion?$addon['Version'][0]['Version']['version']:'')?></h3>
     <h4 class="author"><?=_('addons_home_by')?> <?= $html->linkUsersFromModel($addon['User'], 0); ?></h4>
-    <div id="addon-summary" class="addon <?=$html->extraClass($addon)?>">
-    
+    <? if (!empty($flag)) echo '<h5 class="flag">'.$flag.'</h5>'; ?>
 
     <?php if (count($previews) > 0) {
         $shown = 0;
@@ -83,7 +80,7 @@
     ?>
 
     <p class="preview-img">
-      <a class="screenshot" rel="jquery-lightbox" href="<?=$full?>" title="<?=$caption?>">
+      <a rel="jquery-lightbox" href="<?=$full?>" title="<?=$caption?>">
         <img src="<?=$thumb?>" alt=""/>
       </a>
     </p>
@@ -92,429 +89,397 @@
       <img src="<?=$html->urlImage('no-preview.png')?>" alt="" width="200" height="150" />
     </p>
     <?php } ?>
-<p class="desc"<?=$addon['Translation']['summary']['locale_html']?>><?=nl2br($addon['Translation']['summary']['string'])?> </p>
-
 
     <h4 class="hidden"><?=_('addons_display_categories')?></h4>
     <?=$this->renderElement('addon_categories', array('tags' => $relatedTags)); ?>
 
+    <p class="desc"<?=$addon['Translation']['summary']['locale_html']?>><?=nl2br($addon['Translation']['summary']['string'])?> </p>
+
+    <p class="rating"><?=$this->renderElement('stars',array('rating' => $addon['Addon']['averagerating']))?> <?php if ($review_count > 0) { ?> <a href="<?=$html->url('/addon/'.$addon['Addon']['id'].'#reviews')?>"><?=sprintf(ngettext('feature_reviews','feature_reviews', $review_count), $review_count)?></a><?php } ?></p>
+
+    <div class="link-sharing rollover-reveal">
+        <div class="badge">
+            <p class="share-button">
+                <a class="activator" href="#"><span><span><span>
+                    <strong><?php echo ___('addons_share_button_text', 'Share this') ?></strong>
+                </span></span></span></a>
+            </p>
+        </div>
+        <div class="choices to-reveal"><div>
+            <ul>
+                <?php foreach ($link_sharing_services as $l_name => $l_details) :?>
+                    <li class="<?= $l_name ?>"><p>
+                        <a class="uniquify" href="<?=$html->url('/addon/share/'.$addon['Addon']['id']) . '?service=' . $l_name ?>"><?php 
+                            // Escaping here because these details came via set()
+                            echo htmlentities($l_details['label'])
+                        ?></a>
+                    </p></li>
+                <?php endforeach ?>
+            </ul>
+            <br style="clear: both" />
+        </div></div>
+    </div>
+
     <? if ($hasversion): ?>
     <p class="updated">
         <?php
-        echo sprintf(___('addon_detail_last_updated'), strftime(_('date'), strtotime($addon['Version'][0]['Version']['created'])));
+        // @partial 5/08/08, bug 425527
+        $_update_string = (_('addon_detail_last_updated') == 'addon_detail_last_updated') ? 'Updated %s' : _('addon_detail_last_updated');
+        echo sprintf($_update_string, strftime(_('date'), strtotime($addon['Version'][0]['Version']['created'])));
         ?>
     </p>
     <? endif; ?>
-
-    <?php
-       if ($hasversion) {
-
-           $flags = array($html->byStatus($addon, array('experimental' => 'experimental',
-                                                   'recommended'  => 'recommended',
-                                                   'default'      => 'default')));
-
-           global $experimental_status;
-           if (isset($addonStatus) && in_array($addonStatus, $experimental_status)) {
-               $flags[] = 'experimental';
-           }
-           
-           $addon['File'] = $addon['Version'][0]['File']; //install.thtml expects this
-           
-           echo $this->renderElement('amo2009/install', array(
-               'flags' => $flags,
-               'buttonClass' => 'significant', 
-               'buttonSize'  => '16x16',
-               'addon' => $addon
-           ));
-
-           if (!empty($addon['Translation']['privacypolicy']['string'])) {
-               echo '<div class="privacypolicy">';
-               echo $html->link(_('addons_display_has_privacy'), "/addons/policy/0/{$addon['Addon']['id']}");
-               echo '</div>';
-           }
-       }
-       ?>
-
-       
-    <p class="rating">
-      <?=$this->renderElement('amo2009/reviews', array('addon' => $addon))?>
-    </p>
-
-    
     <p class="stats">
+        <em><?=$html->number_format($addon['Addon']['weeklydownloads'], 0)?></em>
         <?php
-            echo '<em>'.$html->number_format($addon['Addon']['weeklydownloads'], 0).'</em> '.___('addon_downloads_weekly');
+        /* @partial 4/25/08
+           Only show total downloads if string has been translated to avoid
+           showing two "downloads" with different numbers */
+        if (_('addon_downloads_weekly') == 'addon_downloads_weekly') {
+            echo _('addon_downloads');
+        }
+        else {
+            echo _('addon_downloads_weekly');
             echo '<br /><em>'.$html->number_format($addon['Addon']['totaldownloads'], 0).'</em> '._('addon_downloads_total');
+        }
         ?>
     </p>
 
+    <?php
+    if ($hasversion) {
+
+        $_install_render_options = array(
+            'addonIconPath' => $addonIconPath, 
+            'addonName'     => $addon['Translation']['name']['string'],
+            'addonId'       => $addon['Addon']['id'],
+            'addonFiles'    => ($hasversion?$addon['Version'][0]['File']:''),
+            'is_latest'     => true,
+            'addonEULA'     => $addon['Translation']['eula']['string'],
+            'addonStatus'   => $addon['Addon']['status'],
+            'addonType'     => $addon['Addon']['addontype_id'],
+            'allPlatforms'  => $platforms,
+            'compatible_apps'=> $compatible_apps
+            );
+        echo $this->renderElement('install', $_install_render_options);
 
-    <div class="share-this">
-                <a class="share button" href="#">
-                    <?php echo ___('addons_share_button_text', 'Share this') ?>
-                </a>
-
-        <div class="share-networks">
-            <ul>
-                <?php foreach ($link_sharing_services as $l_name => $l_details) :?>
-                    <li class="<?= $l_name ?>"><p>
-                        <?php $share_url = str_replace('/addon/', '/addon/share/', $_SERVER['REQUEST_URI']) ?>
-                        <a class="uniquify" target="_blank" href="<?php echo $share_url . '?service=' . $l_name ?>"><?php 
-                            // Escaping here because these details came via set()
-                            echo htmlentities($l_details['label'], ENT_COMPAT, 'UTF-8')
-                        ?></a>
-                    </p></li>
-                <?php endforeach ?>
-            </ul>   
-    </div>
+        if (!empty($addon['Translation']['privacypolicy']['string'])) {
+            echo '<div class="privacypolicy">';
+            echo $html->link(_('addons_display_has_privacy'), "/addons/policy/0/{$addon['Addon']['id']}");
+            echo '</div>';
+        }
+    }
+    ?>
 
+    <div class="vex"><span><!-- bottom edge --></span></div>
   </div>
-  </div>
-  <div id="addon-info" class="featured listing">
-      <div class="featured-inner">
-    
-      <? if (count($previews) > 1): // Only show this if there are 2 or more images. ?>
-      <div class="item">
-          <h5><?=_('addons_display_more_images')?></h5>
+  <!-- /#addon-summary -->
 
-            <?php
-                $shown = 0;
-                $_js_string = '';
-
-                foreach ($previews as $preview):
-
-                    // Skip the first one, which is the preview.
-                    if ($shown < 1) {
-                        $shown++;
-                        continue;
-                    }
-
-                    $thumb = $this->controller->Image->getPreviewURL($preview['Preview']['id']);
-                    $full = $this->controller->Image->getPreviewURL($preview['Preview']['id'], 'full');
-                    $caption = $preview['Translation']['caption']['string'];
-                    // Lightbox supports HTML in their captions, but we strip it
-                    // out in the dev cp.
-                    $_js_string .= empty($_js_string) ? "['{$full}','{$caption}']" : ", ['{$full}','{$caption}']";
-                    $shown++;
-            ?>
+  <div id="addon-info">
 
-              <a class="screenshot thumbnail" rel="jquery-lightbox" href="<?=$full?>" title="<?=$caption?>"><img src="<?=$thumb?>" alt="" /></a>
-
-                <? endforeach; ?>
-                </div>
-            <? endif; ?>
-      
-      
-
-      <div class="item">
-          <h5><?=_('addons_display_long_description')?></h5>
-            <p<?=$addon['Translation']['description']['locale_html']?>><?=nl2br($addon['Translation']['description']['string'])?></p>
-      </div>
-      <div class="item">
-          <?=$this->renderElement('app_compatibility', array('compatible_apps' => $compatible_apps)) ?>
-
-          <div id="addon_app_compatibility" ><?php
-          // link to complete version history
-          if ($hasversion) {
-              echo $html->link(___('addons_display_see_all_versions'),
-                  "/addons/versions/{$addon['Addon']['id']}", array('class'=>'view'));
-          }
-          ?></div>
-      </div>
-            
-
-            <?php 
-            /* Homepage URL link */
-            if (!empty($addon['Translation']['homepage']['string'])): ?>
-                <div class="item">
-                    <?php echo '<h5 id="homepage">'.___('addons_display_header_homepage').'</h5>'; ?>
-                    <p><?=$html->link($addon['Translation']['homepage']['string'])?></p>
-                </div>
-                
-
-            <?php endif; // h4:Homepage ?>
-
-            <?php  /* License */
-            if ($hasversion && isset($addon['Version'][0]['Version']['license_id'])):
-                $license_id = $addon['Version'][0]['Version']['license_id'];
-                $version_id = $addon['Version'][0]['Version']['id'];
-                $license_name = $this->controller->License->getName($license_id);
-                $license_link = $html->link($license_name,
-                                            '/versions/license/'.$version_id);
-             ?>
-                <div class="item">
-                    <h5 id="license">
-                        <?=___('addons_display_header_license')?>
-                        <a href="<?=$html->url('/pages/developer_faq')?>">
-                          <?=___('addons_display_a_license_what')?>
-                        </a>
-                    </h5>
-                    <p><?=$license_link?></p>
-                </div>
-            <?php endif; ?>
+    <? if (count($previews) > 1): // Only show this if there are 2 or more images. ?>
+    <h4><?=_('addons_display_more_images')?></h4>
+    <ul class="addon-images">
+    <?php
+        $shown = 0;
+        $_js_string = '';
 
-            <?php
-            $has_supportemail = !empty($addon['Translation']['supportemail']['string']);
-            $has_supporturl = !empty($addon['Translation']['supporturl']['string']);
-            if ($has_supportemail || $has_supporturl): ?>
-                <div class="item">
-                     <?php echo '<h5 id="support">'.___('addons_display_header_support').'</h5>'; ?>
-
-                        <?php
-                        /* Support email/URL link */
-                        if ($has_supportemail && $has_supporturl) {
-                            // both support email and support URL present
-                        ?>
-                        <p>
-                            <?=sprintf(_('addons_display_paragraph_supportinfoemailurl'),
-                                $html->link($addon['Translation']['supporturl']['string']),
-                                $link->email($addon['Translation']['supportemail']['string']));?>
-                        </p>
-                        <?php
-                        } else if ($has_supporturl) {
-                            // support URL only
-                        ?>
-                        <p>
-                            <?=sprintf(_('addons_display_paragraph_supportinfourl'),
-                                $html->link($addon['Translation']['supporturl']['string']));?>
-                        </p>
-                        <?php
-                        } else if ($has_supportemail) {
-                            // support email only
-                        ?>
-                        <p>
-                            <?=sprintf(_('addons_display_paragraph_supportinfoemail'),
-                                $link->email($addon['Translation']['supportemail']['string']));?>
-                        </p>
-                        <?php } ?>
-                </div>
-            <?php endif; // h4:Support ?>
-    
-      <div id="addon-advanced" class="item">
-        <h5><?=_('addons_display_advanced_details')?></h5>
+        foreach ($previews as $preview):
 
-        <?php if (!empty($addon['Translation']['developercomments']['string'])) { ?>
-        <h5><?=_('addons_display_header_developer_comments')?></h5>
-        <p<?=$addon['Translation']['developercomments']['locale_html']?>>
-          <?=nl2br($addon['Translation']['developercomments']['string'])?>
-        </p>
-        <?php } ?>
+            // Skip the first one, which is the preview.
+            if ($shown < 1) {
+                $shown++;
+                continue;
+            }
 
-        <?php if ($hasversion):
-            $_version_data = array(
-                'addonid' => $addon['Addon']['id'],
-                'version' => $addon['Version'][0]['Version']['version'],
-                'created' => $addon['Version'][0]['Version']['created'],
-                'fileSize' => $addon['Version'][0]['File'][0]['size'] 
-            );
+            $thumb = $this->controller->Image->getPreviewURL($preview['Preview']['id']);
+            $full = $this->controller->Image->getPreviewURL($preview['Preview']['id'], 'full');
+            $caption = $preview['Translation']['caption']['string'];
+            // Lightbox supports HTML in their captions, but we strip it
+            // out in the dev cp.
+            $_js_string .= empty($_js_string) ? "['{$full}','{$caption}']" : ", ['{$full}','{$caption}']";
+            $shown++;
+    ?>
+
+      <li><a rel="jquery-lightbox" href="<?=$full?>" title="<?=$caption?>"><img src="<?=$thumb?>" alt="" /></a></li>
+
+        <? endforeach; ?>
+    </ul>
+    <? endif; ?>
+
+
+    <h4><?=_('addons_display_long_description')?></h4>
+    <p<?=$addon['Translation']['description']['locale_html']?>><?=nl2br($addon['Translation']['description']['string'])?></p>
+
+    <?=$this->renderElement('app_compatibility', array('compatible_apps' => $compatible_apps)) ?>
+
+    <div id="addon_app_compatibility" ><?php
+    // link to complete version history
+    if ($hasversion) {
+        // @partial, 4/9/08
+        $_versionhistory_linktext = (_('addons_display_see_all_versions') ==
+            'addons_display_see_all_versions' ? _('addons_display_version_history') :
+            _('addons_display_see_all_versions'));
+        echo '<h4 class="version-link">'.$html->link($_versionhistory_linktext,
+            "/addons/versions/{$addon['Addon']['id']}", array('class'=>'view'))."</h4>";
+    }
+    ?></div>
+
+    <?php 
+    /* Homepage URL link */
+    if (!empty($addon['Translation']['homepage']['string'])): ?>
+
+        <?php //@partial, 5/12/08, bug 425537
+            if (_('addons_display_header_homepage') == 'addons_display_header_homepage') {
+                echo '<h4 id="homepage">Homepage</h4>';
+            } else {
+                echo '<h4 id="homepage">'._('addons_display_header_homepage').'</h4>';
+            }
+        ?>
+        <p><?=$html->link($addon['Translation']['homepage']['string'])?></p>
+
+    <?php endif; // h4:Homepage ?>
+
+
+    <?php
+    $has_supportemail = !empty($addon['Translation']['supportemail']['string']);
+    $has_supporturl = !empty($addon['Translation']['supporturl']['string']);
+    if ($has_supportemail || $has_supporturl): ?>
+
+        <?php //@partial, 4/25/08, bug 425510
+            if (_('addons_display_header_support') == 'addons_display_header_support') {
+                echo '<h4 id="support">Support</h4>';
+            } else {
+                echo '<h4 id="support">'._('addons_display_header_support').'</h4>';
+            }
         ?>
-        <h5 id="version-detail">
-          <?=$this->renderElement('addon_version_detail', $_version_data)?>
-        </h5>
-        <p id="release-notes" <?=$addon['Version'][0]['Translation']['releasenotes']['locale_html']?>>
-          <?=nl2br($addon['Version'][0]['Translation']['releasenotes']['string'])?>
+
+        <?php
+        /* Support email/URL link */
+        if ($has_supportemail && $has_supporturl) {
+            // both support email and support URL present
+        ?>
+        <p>
+            <?=sprintf(_('addons_display_paragraph_supportinfoemailurl'),
+                $html->link($addon['Translation']['supporturl']['string']),
+                $link->email($addon['Translation']['supportemail']['string']));?>
         </p>
+        <?php
+        } else if ($has_supporturl) {
+            // support URL only
+        ?>
         <p>
+            <?=sprintf(_('addons_display_paragraph_supportinfourl'),
+                $html->link($addon['Translation']['supporturl']['string']));?>
+        </p>
         <?php
-            $additionalLinks = array();
-            if ($addon['Addon']['viewsource'] == 1 && $this->controller->Session->check('User')) {
-              $additionalLinks[] = $html->link(_('addons_display_view_source'), "/files/browse/{$addon['Version'][0]['File'][0]['id']}");
-            }
-            if ($addon['Addon']['publicstats'] == 1) {
-              $additionalLinks[] = $html->link(_('addons_display_view_stats'), "/statistics/addon/{$addon['Addon']['id']}");
-            }
-
-            if (!empty($additionalLinks)) {
-              echo implode($additionalLinks, ' | ');
-            }
+        } else if ($has_supportemail) {
+            // support email only
         ?>
+        <p>
+            <?=sprintf(_('addons_display_paragraph_supportinfoemail'),
+                $link->email($addon['Translation']['supportemail']['string']));?>
         </p>
-        <? endif; ?>
-</div>
-      </div></div>
-      
-        <?php if (!empty($reviews)): ?>
-            <h3 id="reviews"><?=_('addons_display_header_reviews')?></h3>
-            <div class="article">
-                
+        <?php } ?>
+
+    <?php endif; // h4:Support ?>
+
+    <?php if (!empty($reviews)): ?>
+
+    <h4 id="reviews"><?=_('addons_display_header_reviews')?></h4>
+
+    <ul class="addon-reviews">
+
+    <?php
+    foreach ($reviews as $rev_no => $review):
+        $review['Translation'] = (array_key_exists(LANG, $review['Translation']) ?
+            $review['Translation'][LANG] : current($review['Translation']));
+    ?>
+        <li id="review-<?=$rev_no?>">
+          <blockquote>
+            <?php if (!empty($review['Translation']['title']['string'])): ?>
+            <h5><?=$review['Translation']['title']['string']?></h5>
+            <?php endif; ?>
+            <p><?=$review['Translation']['body']['string']?></p>
+          </blockquote>
+          <p class="cite">
+            <?=$this->renderElement('stars',array('rating' => $review['Review']['rating']))?>
+            <cite>
             <?php
-                foreach ($reviews as $rev_no => $review):
-                    $review['Translation'] = (array_key_exists(LANG, $review['Translation']) ?
-                        $review['Translation'][LANG] : current($review['Translation']));
+                // @partial: translation fallback for bug 427376, 04/24/08
+                if (_('addon_reviewed_by_u_on_d') == 'addon_reviewed_by_u_on_d') {
+                    echo $html->linkUserFromModel($review['User']).", ".strftime(_('date'), strtotime($review['Review']['created']));
+                } else {
+                    echo sprintf(_('addon_reviewed_by_u_on_d'),
+                             $html->linkUserFromModel($review['User']),
+                             strftime(_('date'), strtotime($review['Review']['created'])));
+                }
             ?>
+            </cite>
+          </p>
+        </li>
+    <?php
+    endforeach;
+    ?>
         
-            <div id="review-<?=$rev_no?>" class="hreview">
-                <?php if (!empty($review['Translation']['title']['string'])): ?>
-                    <h5><?=$review['Translation']['title']['string']?></h5>
-                <?php endif; ?>
-                <p class="description"><?=$review['Translation']['body']['string']?></p>
+    </ul>
+
+    <? echo '<p>'.$html->link(sprintf(_('addons_display_see_all_reviews'), $review_count), '/reviews/display/'.$addon['Addon']['id'], array('class'=>'view')).'</p>'; ?>
+    
+    <?php endif; ?>
+
+
+
+    </div>
+    <!-- /#addon-info -->
+
+    <div id="addon-advanced">
+      <h4><?=_('addons_display_advanced_details')?></h4>
+
+      <?php if (!empty($addon['Translation']['developercomments']['string'])) { ?>
+      <h5><?=_('addons_display_header_developer_comments')?></h5>
+      <p<?=$addon['Translation']['developercomments']['locale_html']?>>
+        <?=nl2br($addon['Translation']['developercomments']['string'])?>
+      </p>
+      <?php } ?>
+
+      <?php if ($hasversion):
+          $_version_data = array(
+              'addonid' => $addon['Addon']['id'],
+              'version' => $addon['Version'][0]['Version']['version'],
+              'created' => $addon['Version'][0]['Version']['created'],
+              'fileSize' => $addon['Version'][0]['File'][0]['size'] 
+          );
+      ?>
+      <h5><?=$this->renderElement('addon_version_detail', $_version_data)?></h5>
+      <p <?=$addon['Version'][0]['Translation']['releasenotes']['locale_html']?>><?=nl2br($addon['Version'][0]['Translation']['releasenotes']['string'])?></p>
+      <p>
+      <?php
+          $additionalLinks = array();
+          if ($addon['Addon']['viewsource'] == 1 && $this->controller->Session->check('User')) {
+            $additionalLinks[] = $html->link(_('addons_display_view_source'), "/files/browse/{$addon['Version'][0]['File'][0]['id']}");
+          }
+          if ($addon['Addon']['publicstats'] == 1) {
+            $additionalLinks[] = $html->link(_('addons_display_view_stats'), "/statistics/addon/{$addon['Addon']['id']}");
+          }
+          
+          if (!empty($additionalLinks)) {
+            echo implode($additionalLinks, ' | ');
+          }
+      ?>
+      </p>
+      <? endif; ?>
+  
+
+
+    </div>
+    <!-- /#addon-advanced -->
+
+    <div id="content-extra">
+
+      <?php if(empty($isAuthor)) { ?>
+      <form id="form-review" action="<?=$html->url('/reviews/add/'.$addon['Addon']['id'])?>" method="post">
+        <?=$html->hiddenSession() ?>       
+        <h3><?=_('addons_display_what_do_you_think')?></h3>
+        <?php if(!$loggedIn) { ?>
+            <p class="login">(<?php echo $html->link(_('header_navlink_login'), $html->login_url());?>)</p>
+        <?php } ?>
+        <p><input type="hidden" name="data[Review][id]"  value="" id="ReviewId"/></p>
+        <p><input type="hidden" name="data[Review][title]"  value=" " id="ReviewTitle"/></p>
+        <fieldset id="rate-it">
+            <h4><?=_('addons_display_rate_it')?></h4>
+            <div class="stars degrade">
+                <p><input class="star" type="radio" name="data[Review][rating]" value="1" title="<?=_('addons_display_hate_it')?>" /> <?=_('addons_display_hate_it')?></p>
+                <p><input class="star" type="radio" name="data[Review][rating]" value="2" title="<?=_('addons_display_dont_like_it')?>"/> <?=_('addons_display_dont_like_it')?></p>
+                <p><input class="star" type="radio" name="data[Review][rating]" value="3" title="<?=_('addons_display_like_it')?>"/> <?=_('addons_display_like_it')?></p>
+                <p><input class="star" type="radio" name="data[Review][rating]" value="4" title="<?=_('addons_display_really_like_it')?>"/> <?=_('addons_display_really_like_it')?></p>
+                <p><input class="star" type="radio" name="data[Review][rating]" value="5" title="<?=_('addons_display_love_it')?>"/> <?=_('addons_display_love_it')?></p>
+            </div>
+            <?=$html->tagErrorMsg('Review/rating', _('error_review_rating_required')) ?>
+        </fieldset>
+        <p><textarea name="data[Review][body]"  cols="30" rows="6" id="short-review" <?php if(!$loggedIn) { ?>disabled="disabled" class="disabled" <?php } ?>></textarea></p>
+        <p id="review-submit">
+            <?php
+            //@partial
+                $_submit_value = (_('addons_display_review_submit') == 'addons_display_review_submit') ? _('forum_save') : _('addons_display_review_submit');
+            ?>
+            <input type='submit' value='<?=$_submit_value?>' class="amo-submit" <?php if(!$loggedIn) { ?>disabled="disabled" <?php } ?> />
+
+            <a href="<?=$html->url('/reviews/add/'.$addon['Addon']['id'])?>"><?=_('addons_display_detailed_review')?></a></p>
+            <div id="addons-display-review-etiquette">
                 <p>
-                    <?=$this->renderElement('amo2009/stars',array('rating' => $review['Review']['rating']));?>
-                    <?php
-                        echo sprintf(___('addon_reviewed_by_u_on_d'),
-                            $html->linkUserFromModel($review['User']),
-                            strftime(_('date'), strtotime($review['Review']['created'])));
-                    ?>
+                <?php // @partial 5/12/08
+                    if (_('addons_display_review_etiquette') == 'addons_display_review_etiquette'): ?>
+                    Please do not post bug reports in reviews. We do not make your email address available to add-on developers and they may need to contact you to help resolve your issue. 
+                <?php else: ?>
+                    <?php echo _('addons_display_review_etiquette'); ?>
+                <?php endif; ?>
                 </p>
-            </div>
-            
-        <?php
-            endforeach;
-        ?>
-         <? echo '<p>'.$html->link(sprintf(_('addons_display_see_all_reviews'), $review_count), '/reviews/display/'.$addon['Addon']['id'], array('class'=>'more-info')).'</p>'; ?>
-         
-        </div>
-      <?php endif; ?>
-      
-</div>
-<div class="secondary" role="secondary">
-    
-        <?php if(empty($isAuthor)) { ?>
-            <div class="highlight">
-          <form id="form-review" action="<?=$html->url('/reviews/add/'.$addon['Addon']['id'])?>" method="post">
-            <?=$html->hiddenSession() ?>       
-            <h3><?=_('addons_display_what_do_you_think')?></h3>
-            <?php if(!$loggedIn) { ?>
-                <p class="login">(<?php echo $html->link(_('header_navlink_login'), $html->login_url());?>)</p>
-            <?php } ?>
-            <p><input type="hidden" name="data[Review][id]"  value="" id="ReviewId"/></p>
-            <p><input type="hidden" name="data[Review][title]"  value=" " id="ReviewTitle"/></p>
-
-                <h4><?=_('addons_display_rate_it')?></h4>
-                
-                 <?php if(!$loggedIn) { ?>
-                        <p class="stars stars-0">&nbsp;</p>
-                <?php } else {?>
-                
-                <select id="review-rating" name="data[Review][rating]">
-                		<option></option>
-                			<option value="1" class="worst">*</option>
-        					<option value="2" class="bad">**</option>
-
-        					<option value="3" class="fair">***</option>
-        					<option value="4" class="good">****</option>
-        					<option value="5" class="best">*****</option>
-        				</select>
-                <?php } ?>
-                
-                <?=$html->tagErrorMsg('Review/rating', _('error_review_rating_required')) ?>
-            <p><textarea name="data[Review][body]"  cols="30" rows="6" id="short-review" <?php if(!$loggedIn) { ?>disabled="disabled" class="disabled" <?php } ?>></textarea></p>
-            <p>
-                <a href="<?=$html->url('/reviews/add/'.$addon['Addon']['id'])?>"><?=_('addons_display_detailed_review')?></a>
-                <button <?php if(!$loggedIn) { ?>disabled="disabled" <?php } ?> ><?=___('addons_display_review_submit')?></button>
-            </p>
-            
-             
-                <div id="addons-display-review-etiquette">
-                    <p>
-                        <?php echo ___('addons_display_review_etiquette'); ?>
-                    </p>
+                <?php
+                if ($has_supportemail || $has_supporturl) {
+                    // @partial 5/13/08
+                    if (_('addons_display_review_see_support') == 'addons_display_review_see_support'): ?>
+                    <p>See the <a href="#support">support section</a> to find out where to get assistance for this add-on.</p>
                     <?php
-                    if ($has_supportemail || $has_supporturl) {
-                        echo '<p>'.sprintf(___('addons_display_review_see_support'), '#support').'</p>';
-                    }
-                    ?>
-                    <p><?=sprintf(___('addons_display_review_guidelines_link', '<a href="%s">Review Guidelines</a>'), $html->url('/pages/review_guide')) ?></p>
-                </div>
-          </form> 
-          </div>
-          <?php } ?>
-    
-  
+                    else:
+                    echo '<p>'.sprintf(_('addons_display_review_see_support'),
+                        '#support').'</p>';
+                    endif;
+                }
+                ?>
+                <p><?=sprintf(___('addons_display_review_guidelines_link', '<a href="%s">Review Guidelines</a>'), $html->url('/pages/review_guide')) /* @partial, 6/25/08 */ ?></p>
+            </div>
+      </form> 
+      <?php } ?>
 
-<div class="highlight">
+    <div class="more-addons">
 
-  <?php 
-  if (is_array($relatedTags)) {
-      foreach ($relatedTags as $tag) {
-          echo $html->link(sprintf(_('addons_display_see_all_addons'),$tag['Translation']['name']['string']), '/browse/' . "type:" . $tag['Tag']['addontype_id'] . '/' . "cat:" . $tag['Tag']['id'], array('class' => 'more-info')) . "\n";
+      <?php 
+      if (is_array($relatedTags)) {
+          foreach ($relatedTags as $tag) {
+              echo '<h3>'.$html->link(sprintf(_('addons_display_see_all_addons'),$tag['Translation']['name']['string']), '/browse/' . "type:" . $tag['Tag']['addontype_id'] . '/' . "cat:" . $tag['Tag']['id'], array('class'=>'view')) . '</h3>'."\n";
+          }
       }
-  }
-  ?>
-
- <?php if (count($authorAddons) > 1): ?>
- <h4 class="other-author-addons"><?=sprintf(n___('addons_display_other_addons_by', 'addons_display_other_addons_by', count($addon['User'])),
-                $html->linkUsersFromModel($addon['User'], 0));?>
- </h4>
- <div class="prose">
-     <ul>
-      <?php
-         if (count($authorAddons) > 3) {
-             echo '<form id="addons-author-addons" method="get" action="">';
-             echo '<select id="addons-author-addons-select" name="addons-author-addons-select" onchange="this.form.submit()">';
-             echo $this->renderElement('addon_author_addons', array('tag' => 'option'));
-             echo '</select>';
-             echo '<input class="hidden" type="submit" value="'._('addons_author_addons_submit').'"/>';
-             echo '</form>';
-         } else {
-             echo $this->renderElement('addon_author_addons', array('tag' => 'li'));
-         }
       ?>
-      </ul>
- </div>
- 
- <?php endif; ?>
 
-</div>
-<!-- /#more-addons-->
+     <?php if (count($authorAddons) > 1): ?>
+     <h4><?=sprintf(n___('addons_display_other_addons_by', 'addons_display_other_addons_by', count($addon['User'])),
+                    $html->linkUsersFromModel($addon['User'], 0));?>
+     </h4>
+     <ul>
+     <?php
+        if (count($authorAddons) > 3) {
+            echo '<form id="addons-author-addons" method="get" action="">';
+            echo '<select id="addons-author-addons-select" name="addons-author-addons-select" onchange="this.form.submit()">';
+            echo $this->renderElement('addon_author_addons', array('tag' => 'option'));
+            echo '</select>';
+            echo '<input class="hidden" type="submit" value="'._('addons_author_addons_submit').'"/>';
+            echo '</form>';
+        } else {
+            echo $this->renderElement('addon_author_addons', array('tag' => 'li'));
+        }
+     ?>
+     </ul>
+     <?php endif; ?>
 
-    <div class="highlight collections-add prose">
-        <h3><?=___('addons_display_header_collections')?></h3>
+    </div>
+    <!-- /#more-addons-->
 
-        <?php if (empty($pop_collections)): ?>
-            <p><?=___('addons_display_nocollections')?></p>
-        <?php else: ?>
-            <ul>
-                <?php foreach($pop_collections as &$_coll): ?>
-                    <li><?=$link->collection($_coll)?></li>
-                <?php endforeach; ?>
-            <?php if (($_othercolls = $collection_count - count($pop_collections)) > 0): ?>
-                <li>
-                    <?=sprintf(n___('addons_display_collections_more', 'addons_display_collections_more', $_othercolls), $_othercolls)?>
-                </li>
-        
-        <?php endif; ?>
-        </ul>
-        <?php endif; ?>        
-        <?php if ($loggedIn): ?>
-        <form action="<?= $html->url('/collections/addtocollection') ?>" method="post" id="coll_publish">
-            <div>
-            <h3><label for="publish_to"><?=___('addons_display_collection_add')?></label></h3>
-            <?=$html->link(___('addons_display_collection_whatsthis'), '/collections/')?>
-            <?=$html->hiddenSession() ?>
-            <input name="data[addon_id]" type="hidden" value="<?= $addon['Addon']['id'] ?>" />
-            <select name="data[collection_uuid]" id="publish_to">
-                <option value="" selected="selected"><?=___('addons_display_collection_add_select_one')?></option>
-                <?php foreach ($userCollections as $collection): ?>
-                <option value="<?=$collection['Collection']['uuid'] ?>"><?=$collection['Translation']['name']['string'] ?></option>
-                <?php endforeach; ?>
-                <option value="new"><?=___('addons_display_collection_add_new')?></option>
-            </select>
-            <button><?=___('addons_display_collection_add_submit')?></button>
-            </div>
-        </form>
-        <?php endif; ?>
+  
     </div>
+    <!-- /#content-extra -->
 
+  </div>
+  <!-- /#content-main -->
+
+<?=$this->renderElement('sidebar')?>
+
+<?=$this->renderElement('app_chooser')?>
 
 </div>
 <script type="text/javascript" charset="utf-8">
-    $(function(){
-        addons_display.init({
-            jsonURL: '<?=$html->url('/collections/json')?>',
-            collViewURL: '<?=$html->url('/collection/')?>',
-            loggedIn: <?=(int)$loggedIn?>
-            });
-            $("a[rel=jquery-lightbox]").lightBox({
-                overlayOpacity: 0.6,
-                imageBlank: "<?= $html->urlImage('jquery-lightbox/lightbox-blank.gif') ?>",
-                imageLoading: "<?= $html->urlImage('jquery-lightbox/lightbox-ico-loading.gif')?>",
-                imageBtnClose: "<?= $html->urlImage('jquery-lightbox/close.png')?>",
-                imageBtnPrev: "<?= $html->urlImage('jquery-lightbox/goleft.png')?>",
-                imageBtnNext: "<?= $html->urlImage('jquery-lightbox/goright.png')?>",
-                containerResizeSpeed: 350
-            });
-        
+    $(function(){ 
+        $('.stars').rating(<?php if(!$loggedIn) { ?> {readOnly:true}<?php } ?>); 
+        $('.rollover-reveal').rolloverReveal();
     });
 </script>
 <!-- /#content -->
diff --git a/site/app/views/addons/home.thtml b/site/app/views/addons/home.thtml
index 7d79eb0..0443155 100644
--- a/site/app/views/addons/home.thtml
+++ b/site/app/views/addons/home.thtml
@@ -24,7 +24,6 @@
  *   Frederic Wenzel <fwenzel@mozilla.com>
  *   Mike Morgan <morgamic@mozilla.com>
  *   Wil Clouser <clouserw@mozilla.com>
- *   l.m.orchard <lorchard@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -39,142 +38,198 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-
-// Pass a CSS class for the body tag up to the layout.
-$this->viewVars['bodyclass'] = 'home';
 ?>
 
-<?php ob_start() ?>
-    <?= $javascript->link('amo2009/home.js') ?>
-<?php $this->viewVars['head_extra'] = ob_get_clean() ?>
-
-<?php /* Display locale-formatted site stats, if available (bug 492998). */ ?>
-<?php ob_start() ?>
-    <?php $lc = localeconv(); ?>
-    <ul class="stats">
-        <?php if (!empty($stats_downloaded)): ?>
-            <li><?=sprintf(
-                n___('addons_home_stats_downloaded', 'addons_home_stats_downloaded', $stats_downloaded),
-                $html->number_format($stats_downloaded, 0)
-            )?></li>
-        <?php endif ?>
-        <?php if (!empty($stats_inuse)): ?>
-            <li><?=sprintf(
-                n___('addons_home_stats_inuse', 'addons_home_stats_inuse', $stats_inuse),
-                $html->number_format($stats_inuse, 0)
-            )?></li>
-        <?php endif ?>
-    </ul>
-<?php $this->viewVars['header_extra'] = ob_get_clean() ?>
-
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories', array('clickable_header'=>FALSE))?>
-
-    <?php /*
-        TODO: Enable this when there's content for developer center, leaving it for
-        the markup example
-    */ ?>
-    <?php if (false): ?>
-    <div class="highlight">
-        <h3>Create a Firefox Add-on</h3>
-        <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-            eiusmod tempor incididunt ut labore et dolore magna aliqua.
-        </p>
-        <p><strong><a href="#">Visit the Developer Center</a></strong></p>
-    </div>
-    <?php endif ?>
-
-</div>
-
-<div class="primary" role="main">
+<div id="content" class="main-page">
 
-    <?=$this->renderElement('amo2009/search')?>
+<?=$this->renderElement('search')?>
 
-    <? if(APP_ID == APP_FIREFOX): ?>
-        <?=$this->renderElement('amo2009/teaser_collections', array(
-            'teaser_collection_promos' => $teaser_collection_promos,
-            'promoted_collections'  => $promoted_collections
-        ))?>
-    <? endif; ?>
+<div id="content-main">
+    <?php
+    if (count($featureAddons) != 0) {
+        ?>
+        <h3><?=_('addons_home_feature_head')?></h3>
 
-    <h2><?=___('addons_home_browse_title', 'Browse Add-ons')?></h2>
-    <div class="primary">
-        <div class="featured show-<?=$featured_type?> listing" id="featured">
-            <div class="featured-inner">
-                <div class="listing-header">
-                    <ul>
-                        <li<?= ('recommended'==$featured_type) ? ' class="selected"' : '' ?>>
-                            <a href="?featured=recommended#featured"><?=___('addons_home_browse_recommended', 'Recommended')?></a></li>
-                        <li<?= ('popular'==$featured_type) ? ' class="selected"' : '' ?>>
-                            <a href="?featured=popular#featured"><?=___('addons_home_browse_popular', 'Popular')?></a></li>
-                        <li<?= ('added'==$featured_type) ? ' class="selected"' : '' ?>>
-                            <a href="?featured=added#featured"><?=___('addons_home_browse_new', 'Just Added')?></a></li>
-                        <li<?= ('updated'==$featured_type) ? ' class="selected"' : '' ?>>
-                            <a href="?featured=updated#featured"><?=___('addons_home_browse_updated', 'Updated')?></a></li>
+        <div id="slider" class="slider_widget">
+            <div class="inner">
+                <div class="viewport">
+                    <ul class="item_set">
+                        <?php
+                        $fyf_time = gmmktime(16, 00, 00, 11, 18, 2008);
+                        $fyf = ($fyf_time < gmmktime() && LANG == 'en-US' && APP_ID == APP_FIREFOX); // is it FYF promo time?
+                        $total_features = min(count($featureAddons), ($fyf ? 6 : 5)); // FYF promo
+                        for ($idx=1; $idx<=$total_features; $idx++) {
+                            
+                            $prev_idx = $idx - 1;
+                            if ($prev_idx < 1) $prev_idx = $total_features;
+                            $next_idx = $idx + 1;
+                            if ($next_idx > $total_features) $next_idx = 1;
+                            
+                            if (!$fyf || $idx > 1) // FYF promo
+                                $feature1 = array_shift($featureAddons);
+                            ?>
+                            <li id="feature1_<?=$idx?>" class="item addon featured main">
+                            <?php
+                            if ($fyf && $idx == 1):
+                                echo $this->renderElement('fyf_promotion');
+                            else:
+                            ?>
+                                <?=$this->renderElement('feature', array(
+                                    'addonIconPath' => $this->controller->Image->getAddonIconURL($feature1['Addon']['id']),
+                                    'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($feature1['Addon']['id']),
+                                    'addonName' => $feature1['Translation']['name']['string'],
+                                    'addonSummary' => $feature1['Translation']['summary']['string'],
+                                    'addonId' => $feature1['Addon']['id'],
+                                    'addonFiles' => $feature1['File'],
+                                    'addonEULA' => $feature1['Translation']['eula']['string'],
+                                    'addonStatus' => $feature1['Addon']['status'],
+                                    'addonAuthors' => $feature1['User'],
+                                    'addonTags' => $feature1['Tag'],
+                                    'addonWeeklyDownloads' => $feature1['Addon']['weeklydownloads'],
+                                    'allPlatforms' => $platforms,
+                                    'compatible_apps' => $feature1['compatible_apps'],
+                                    'addonType' => $feature1['Addon']['addontype_id'],
+                                    'addonRating' => $feature1['Addon']['averagerating'],
+                                    'addonReviews' => $feature1['Addon']['totalreviews'],
+                                    'addonVersionCreated' => $feature1['Version'][0]['created']
+                                ))?>
+                            <?php endif; ?>
+                            </li>
+                            <?php 
+                        } ?>
                     </ul>
                 </div>
-                <div class="addon-listing">
-                  <?=$this->renderElement('amo2009/homepage_addon_listing')?>
+                <div class="controls">
+                    <div class="controls_inner">
+                        <a href="#slider" title="Previous" class="prev">
+                            <img src="<?=$html->urlImage("slider-prev-disabled.gif")?>"
+                                width="30" height="30" alt="<?=___('addon_slider_tooltip_previous', 'Previous Add-on')?>"
+                                title="<?=___('addon_slider_tooltip_previous', 'Previous Add-on')?>" /> 
+                        </a>
+                        <span class="indicator">
+                            <span class="index">1</span>
+                            /
+                            <span class="total"><?=$total_features?></span>
+                        </span>
+                        <a href="#slider" title="Next" class="next">
+                            <img src="<?=$html->urlImage("slider-next.gif")?>"
+                                width="30" height="30" alt="<?=___('addon_slider_tooltip_next', 'Next Add-on')?>"
+                                title="<?=___('addon_slider_tooltip_next', 'Next Add-on')?>" /> 
+                        </a>
+                    </div>
                 </div>
-                <script type="text/javascript">
-                $(document).ready(function(){
-                    $('.listing-header a').click(function(e){
-                        e.preventDefault();
-                        var link = $(this);
-                        link.addClass('loading');
-                        $('.listing-header .selected').removeClass('selected');
-                        link.parent().addClass('selected');
-                        $.get('<?=$html->url('/addons/ajaxy')?>' + link.attr('href'),
-                              function(content){
-                                  $('.addon-listing').html(content);
-                                  link.removeClass('loading');
-                       });
-                    });
-                });
-                </script>
             </div>
+
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+        <?php
+    }
+    ?>
+    
+    <div id="secondaries">
+        <?php
+        foreach($featureAddons as $id => $addon):
+            $idx = $id + 2;
+        ?>
+        <div id="feature<?=$idx?>" class="addon featured sub">
+            <div class="irk">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonStatus' => $addon['Addon']['status'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews']
+            ))?>
+            </div>
+            <div class="vex"><span><!-- bottom edge --></span></div>
         </div>
-    </div>
+        <?php endforeach; ?>
+    </div><!-- /#secondaries -->
+    
+    <div id="content-extra">
 
-    <div class="secondary">
-        <img class="pull-right" src="<?=$html->url('/img/amo2009/illustrations/logo-collections-100x125.png', null, false, false)?>" alt=""/>
-        <h3><a href="<?=$html->url('/collections')?>"><?=___('addons_home_collections','Collections')?></a>
-            <span class="new indicator"><?=___('addons_home_new_indicator', 'NEW!')?></span></h3>
-        <p><?=___('addons_home_collections_intro', '
-            Collections are a way for you to categorize, mix, match and mingle
-            add-ons.  Subscribe to collections created by other users or create your
-            own.
-        ')?></p>
+<?php
+    /**
+     * Developer tools
+     * Shows links to dev cp and admin stuff depending on user permissions.
+     * If the user is not logged in, they won't see any of this.
+     */
+    if ($this->controller->Session->check('User')) {
+?>
+        <div id="developer" class="extra">
+            <h3><?=(!empty($welcomeName) ? sprintf(_('sidebar_navlink_welcome_name'), $welcomeName) : _('sidebar_navlink_welcome'))?></h3>
+            <ul>
+                <li><?=$html->link(_('sidebar_navlink_developer_tools'), '/developers/dashboard')?></li>
+                <?php if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))): ?>
+                <li><?=$html->link(_('sidebar_navlink_editor_tools'), '/editors')?></li>
+                <?php endif;
+                if ($this->controller->SimpleAcl->actionAllowed('Localizers', '%', $this->controller->Session->read('User'))): ?>
+                <li><?=$html->link('Localizer Tools', '/localizers')?></li>
+                <?php endif;
+                if ($this->controller->SimpleAcl->actionAllowed('Admin', '%', $this->controller->Session->read('User'))): ?>
+                    <li><?=$html->link(_('sidebar_navlink_admin_tools'), '/admin')?></li>
+                <?php endif; ?>
+            </ul>
+        </div>
+<?php
+    }
+?>
 
-        <?php if (!empty($popular_collections)): ?>
-        <h4><?=___('addons_home_collection_popular_title', 'Popular Collections')?></h4>
-        <?php foreach ($popular_collections as $c): ?>
-            <div class="item">
-                <h5>
-                    <img class="icon" src="<?=$c['icon_url']?>" width="32" height="32" alt="<?=$c['name']?>"/>
-                    <?=$link->collection(array(
-                        'Collection'  => array('uuid'=>$c['uuid'], 'nickname'=>$c['nickname']),
-                        'Translation' => array('name'=>array('string'=>$c['name']))
-                    ))?>
-                    <span><?=_('addons_home_by')?> <?=$html->linkUsersFromModel($c['authors'], null);?></span>
-                </h5>
-                <blockquote cite="#">
-                    <p><?=$html->truncateChars(200, $c['description'])?></p>
-                </blockquote>
-                <div class="meta">
-                    <span class="addons"><?=sprintf(
-                        n___('addons_home_collections_addon_count','addons_home_collections_addon_count',$c['addons_count']),
-                        $c['addons_count']
-                    )?></span>
-                    <span class="subscribers"><?=sprintf(
-                        n___('addons_home_collections_subscribers','addons_home_collections_subscribers',$c['subscribers']),
-                        $c['subscribers'])
-                    ?></span>
-                </div>
-            </div>
-        <?php endforeach ?>
-        <?php endif ?>
-        <p><a class="more-info" href="<?=$html->url('/collections')?>"><?=___('addons_home_collections_all', 'View All Collections')?></a></p>
-    </div>
-</div>
+        <div id="recs" class="extra">
+            <h3><?=_('addons_home_recommended_header')?></h3>
+            <ul>
+                <? foreach ($recAddons as $recAddon): ?>
+                <li><?=$html->link($recAddon['Translation']['name']['string'], "/addon/{$recAddon['Addon']['id']}")?><br />
+                <span><?=isset($recAddon['Tag'][0]['Translation']['name']['string']) ? $recAddon['Tag'][0]['Translation']['name']['string'] : ''; ?></span>
+                </li>
+                <? endforeach; ?>
+            </ul>
+            <p class="view-all"><a href="<?=$html->url('/recommended')?>" class="view" title="<?=_('addons_home_view_all_recommended_title')?>"><?=_('addons_home_view_all')?></a></p>
+            
+            <h3><?=_('addons_home_popular_header')?></h3>
+            <ul>
+                <? foreach ($popAddons as $popAddon): ?>
+                <li><?=$html->link($popAddon['Translation']['name']['string'], "/addon/{$popAddon['Addon']['id']}")?><br />
+                     <span><?=isset($popAddon['Tag'][0]['Translation']['name']['string']) ? $popAddon['Tag'][0]['Translation']['name']['string'] : ''; ?></span>
+                </li>
+                <? endforeach; ?>
+            </ul>
+            <p class="view-all"><a href="<?=$html->url("/browse/type:1/cat:all?sort=popular")?>" class="view" title="<?=_('addons_home_view_all_popular_title')?>"><?=_('addons_home_view_all')?></a></p>
+            
+            <h3><?=___('addons_home_newest_header','Newest:')?></h3>
+            <ul>
+                <? foreach ($newAddons as $newAddon): ?>
+                <li><?=$html->link($newAddon['Translation']['name']['string'], "/addon/{$newAddon['Addon']['id']}")?> <br />
+	                    <span><?= isset($newAddon['Tag'][0]['Translation']['name']['string']) ? $newAddon['Tag'][0]['Translation']['name']['string'] : '' ; ?></span>
+	               </li>
+                <? endforeach; ?>
+            </ul>
+            <p class="view-all"><a href="<?=$html->url("/browse/type:1/cat:all?sort=newest")?>" class="view" title="<?=_('addons_home_view_all_newest_title')?>"><?=_('addons_home_view_all')?></a></p>
+            
+            <h3><?=___('addons_home_updated_header', 'Recently Updated:')?></h3>
+            <ul>
+                <? foreach ($updAddons as $updAddon): ?>
+                <li><?=$html->link($updAddon['Translation']['name']['string'], "/addon/{$updAddon['Addon']['id']}")?><br />
+	                    <span><?= $updAddon['Tag'][0]['Translation']['name']['string']; ?></span>
+	               </li>
+                <? endforeach; ?>
+            </ul>
+            <p class="view-all"><a href="<?=$html->url("/browse/type:1/cat:all?sort=updated")?>" class="view" title="<?=_('addons_home_view_all_updated_title')?>"><?=_('addons_home_view_all')?></a></p>
+        </div>
+    </div><!-- /#content-extra -->
+
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar', array('pitch'=>true))?>
+
+<?=$this->renderElement('app_chooser')?>
+
+</div><!-- /#content -->
diff --git a/site/app/views/addons/plugins.thtml b/site/app/views/addons/plugins.thtml
index c6c2a64..e1426c3 100644
--- a/site/app/views/addons/plugins.thtml
+++ b/site/app/views/addons/plugins.thtml
@@ -41,101 +41,120 @@
  * We will most likely move to a dynamic version of this page pulling from the database.
  */
 
-$this->layout='amo2009';
-
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
 
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
-    
-    <div class="featured listing">
-      <div class="featured-inner">
-        <div class="listing-header">
-            <p><?=_('addons_plugins_main_description')?></p>
-        </div> <!-- listing-header -->
-
-<div class="item">
-    <h2><a href="http://www.adobe.com/products/reader/">Adobe Reader</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
-    <p>For viewing and printing Adobe Portable Document Format (PDF)</p>
-    <div class="install install-container"><p class="install-button">
-        <a class="button positive" href="http://www.adobe.com/products/acrobat/readstep2.html"> <img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=sprintf(_('a_download'),'')?></a></p>
-    </div>
+<div id="content" class="landing browse">
+
+<?=$this->renderElement('search', array())?>
+
+<div id="content-main">
+
+<p class="first"><?=_('addons_plugins_main_description')?></p>
+
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.adobe.com/products/reader/">Adobe Reader</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
+    <p class="first">For viewing and printing Adobe Portable Document Format (PDF)</p>
+    <div class="install-container"><p class="install-button">
+<a href="http://www.adobe.com/products/acrobat/readstep2.html"><span><span><span><strong><?=sprintf(_('a_download'),'')?></strong></span></span></span></a></p></div>
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#Acrobat">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Acrobat">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Acrobat">Mac OS X</a> | <a href="http://plugindoc.mozdev.org/faqs/acroread.html">Acrobat Reader FAQ</a></p></div>
+    </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-<div class="item">
-    <h2><a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Player</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
-    <p>Adobe Flash Player is the universal rich client for delivering effective Adobe Flash experiences across desktops and devices.</p>
-    <div class="install install-container"><p class="install-button">
-        <a class="button positive" href="http://www.adobe.com/go/getflashplayer"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=sprintf(_('a_download'),'')?></a></p>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Player</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
+    <p class="first">Adobe Flash Player is the universal rich client for delivering effective Adobe Flash experiences across desktops and devices.</p>
+    <div class="install-container"><p class="install-button"><a href="http://www.adobe.com/go/getflashplayer"><span><span><span><strong><?=sprintf(_('a_download'),'')?></strong></span></span></span></a></p>
     </div>
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#Flash">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Flash">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Flash">Mac OS X</a> | <a href="http://plugindoc.mozdev.org/faqs/flash.html">Flash Player FAQ</a></p></div>
+    </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-<div class="item">
-    <h2><a href="http://www.java.com/en/about/">Java</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.sun.com/">Sun Microsystems</a></p>
-    <p>The Java Runtime Environment enables your computer to run applications and applets that use Java technology.</p>
-    <div class="install install-container"><p class="install-button">
-        <a class="button positive" href="http://www.java.com/en/download/"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=sprintf(_('a_download'),'')?></a></p>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.java.com/en/about/">Java</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.sun.com/">Sun Microsystems</a></p>
+    <p class="first">The Java Runtime Environment enables your computer to run applications and applets that use Java technology.</p>
+    <div class="install-container"><p class="install-button"><a href="http://www.java.com/en/download/"><span><span><span><strong><?=sprintf(_('a_download'),'')?></strong></span></span></span></a></p>
     </div>
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#Java">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Java">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Java">Mac OS X</a> | <a href="http://plugindoc.mozdev.org/faqs/java.html">Java Plugin FAQ</a></p></div>
+    </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-<div class="item">
-    <h2><a href="http://www.apple.com/quicktime/">QuickTime</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.apple.com/">Apple</a></p>
-    <p>QuickTime Player is an easy-to-use application for playing, interacting with or viewing video, audio, VR or graphics files.</p>
-    <div class="install install-container"><p class="install-button">
-        <a class="button positive" href="http://www.apple.com/quicktime/download/"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=sprintf(_('a_download'),'')?></a></p>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.apple.com/quicktime/">QuickTime</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.apple.com/">Apple</a></p>
+    <p class="first">QuickTime Player is an easy-to-use application for playing, interacting with or viewing video, audio, VR or graphics files.</p>
+    <div class="install-container"><p class="install-button"><a href="http://www.apple.com/quicktime/download/"><span><span><span><strong><?=sprintf(_('a_download'),'')?></strong></span></span></span></a></p>
     </div>
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#Quicktime">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Quicktime">Mac OS X</a></p></div>
+    </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-<div class="item">
-    <h2><a href="http://www.real.com/player/">RealPlayer</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.realnetworks.com/">Real Networks</a></p>
-    <p>RealPlayer enables your computer to play streaming RealVideo and RealAudio.</p>
-    <div class="install install-container">
-        <p class="install-button"><a class="button positive" href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/realone.html?type=eva1&amp;rppr=rnwk&amp;src=040104freeplayer"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_windows')?> Version 11</a></p>
-        <p class="install-button"><a class="button positive" href="http://www.real.com/linux/"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_linux')?> Version 10</a></p>
-        <p class="install-button"><a class="button positive" href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/mac.html?rppr=rnwk&amp;src=040104freeplayer"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_macosx')?> Version 10</a></p>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.real.com/player/">RealPlayer</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.realnetworks.com/">Real Networks</a></p>
+    <p class="first">RealPlayer enables your computer to play streaming RealVideo and RealAudio.</p>
+      
+        <p class="install-button"><a href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/realone.html?type=eva1&amp;rppr=rnwk&amp;src=040104freeplayer"><span><span><span><strong><img src="<?=$html->url('/img/plugins/windows_icon.png',false,false,false)?>" height="34" width="34" alt="" ><?=_('addons_plugins_for_windows')?> Version 11</strong></span></span></span></a></p>
+    
+        <p class="install-button"><a href="http://www.real.com/linux/"><span><span><span><strong><img src="<?=$html->url('/img/plugins/linux_icon.png',false,false,false)?>" height="34" width="34" alt="" ><?=_('addons_plugins_for_linux')?> Version 10</strong></span></span></span></a></p>
+    
+        <p class="install-button"><a href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/mac.html?rppr=rnwk&amp;src=040104freeplayer"><span><span><span><strong><img src="<?=$html->url('/img/plugins/macosx_icon.png',false,false,false)?>" height="34" width="34" alt="" ><?=_('addons_plugins_for_macosx')?> Version 10</strong></span></span></span></a></p>
+
+
+    <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" style="float: left; margin:0 4px 0 0" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#RealOne">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#RealPlayer">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#RealOne">Mac OS X</a></p></div>
+
     </div>
-    <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#RealOne">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#RealPlayer">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#RealOne">Mac OS X</a></p></div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
 
-<div class="item">
-    <h2><a href="http://www.adobe.com/products/shockwaveplayer/">Shockwave</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
-    <p>Shockwave Player displays Web content that has been created by Adobe Director.</p>
-    <div class="install install-container"><p class="install-button">
-        <a class="button positive" href="http://www.adobe.com/shockwave/download/"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=sprintf(_('a_download'),'')?></a></p>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.adobe.com/products/shockwaveplayer/">Shockwave</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.adobe.com/">Adobe</a></p>
+    <p class="first">Shockwave Player displays Web content that has been created by Adobe Director.</p>
+    <div class="install-container"><p class="install-button"><a href="http://www.adobe.com/shockwave/download/"><span><span><span><strong><?=sprintf(_('a_download'),'')?></strong></span></span></span></a></p>
     </div>
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#Shockwave">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Shockwave">Mac OS X</a></p></div>
+   </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-<div class="item">
-    <h2><a href="http://www.microsoft.com/windows/windowsmedia/default.aspx">Windows Media Player</a></h2>
-    <p><?=_('addons_plugins_by')?> <a href="http://www.microsoft.com/">Microsoft</a></p>
-    <p>Windows Media Player lets you play streaming audio, video, animations, and multimedia presentations on the web.</p>
-    <div class="install install-container">
-        <p class="install-button"><a class="button positive" href="http://port25.technet.com/pages/windows-media-player-firefox-plugin-download.aspx"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_windows')?> Vers. 11 (XP, Vista)</a></p> 
-        <p class="install-button"><a class="button positive" href="http://www.microsoft.com/windows/windowsmedia/9series/player.aspx"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_windows')?> Vers. 9 (98 SE, ME, 2000)</a></p>
-        <p class="install-button"><a class="button positive" href="http://www.microsoft.com/windows/windowsmedia/player/mac/default.aspx"><img src="/remora/site/img/amo2009/icons/buttons/plus-green-8x9.gif" alt=""><?=_('addons_plugins_for_macosx')?> Version 9 or QuickTime Components</a></p>
-    </div>
+<div class="addon sub">
+    <div class="irk">
+    <h2 class="first"><a href="http://www.microsoft.com/windows/windowsmedia/default.aspx">Windows Media Player</a></h2>
+    <p class="first"><?=_('addons_plugins_by')?> <a href="http://www.microsoft.com/">Microsoft</a></p>
+    <p class="first">Windows Media Player lets you play streaming audio, video, animations, and multimedia presentations on the web.</p>
+
+        <p class="install-button"><a href="http://port25.technet.com/pages/windows-media-player-firefox-plugin-download.aspx"><span><span><span><strong><img src="<?=$html->url('/img/plugins/windows_icon.png',false,false,false)?>" height="34" width="34" alt="" ><?=_('addons_plugins_for_windows')?> Vers. 11 (XP, Vista)</strong></span></span></span></a></p> 
+
+        <p class="install-button"><a href="http://www.microsoft.com/windows/windowsmedia/9series/player.aspx"><span><span><span><strong><img src="<?=$html->url('/img/plugins/windows_icon.png',false,false,false)?>" height="34" width="34" alt="" > Vers. 9</strong></span></span></span></a></p>
+
+        <p class="install-button"><a href="http://www.microsoft.com/windows/windowsmedia/player/mac/default.aspx"><span><span><span><strong><img src="<?=$html->url('/img/plugins/macosx_icon.png',false,false,false)?>" height="34" width="34" alt="" ><?=_('addons_plugins_for_macosx')?> Version 9 or QuickTime Components</strong></span></span></span></a></p>
+
     <div class="baseline"><p><img src="<?=$html->url('/img/plugins/faq_small.png',false,false,false)?>" class="faq" height="16" width="16" alt="" ><?=_('addons_plugins_support_documentation')?> <a href="http://plugindoc.mozdev.org/windows.html#WMP">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#WMP">Mac OS X</a></p></div>
+   </div>
+    <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
 
-      </div> <!-- featured-inner -->
 <h2><?=_('addons_plugins_looking_for_plugin')?></h2>
 
-<p><?=sprintf(_('addons_plugins_looking_for_more'),'<a href="http://plugindoc.mozdev.org">PluginDoc</a>')?></p>
-    </div> <!-- featured listing -->
-  </div> <!-- primary -->
+<p class="first"><?=sprintf(_('addons_plugins_looking_for_more'),'<a href="http://plugindoc.mozdev.org">PluginDoc</a>')?></p>
+
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar', array('highlight' => $this_tag))?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/policy.thtml b/site/app/views/addons/policy.thtml
index b3a136b..46e38df 100644
--- a/site/app/views/addons/policy.thtml
+++ b/site/app/views/addons/policy.thtml
@@ -37,6 +37,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
+?>
+<?php
 
 if (empty($policy))
     $policy_index = 'eula';
@@ -44,79 +46,69 @@ else
     $policy_index = 'privacypolicy';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
+<div id="content">
 
-<div id="content" class="primary prose" role="main">
+<?=$this->renderElement('sidebar')?>
 
-  <h2 class="name"<?=$addon['Translation']['name']['locale_html']?>>
+<div id="content-main">
+
+<div id="addon-summary" class="addon addon-policy">
+  <div id="policy-tl"></div>
+  
+  <h3 class="name"<?=$addon['Translation']['name']['locale_html']?>>
     <?=$addon['Translation']['name']['string']?><?php if (empty($policy)) {?> <?=$addon['Version'][0]['Version']['version']?><? }?>
-  </h2>
+  </h3>
+
+  <h4 class="author"> <?=_('addons_home_by')?> <?=$html->linkUsersFromModel($addon['User'], 0);?></h4>
 
-  <h3 class="author"> <?=_('addons_home_by')?> <?=$html->linkUsersFromModel($addon['User'], 0);?></h3>
+  <div id="content-policy">
 
   <?php if (empty($policy)) {?>
-      <div class="addon-policy-tagline">
-      <p<?=$addon['Translation']['name']['locale_html']?>><?=sprintf(_('addons_policy_eula_require'), $addon['Translation']['name']['string']);?></p> 
-      </div>
+  <div class="addon-policy-tagline">
+  <p<?=$addon['Translation']['name']['locale_html']?>><?=sprintf(_('addons_policy_eula_require'), $addon['Translation']['name']['string']);?></p> 
+  </div>
   <?php }?>
 
-  <textarea readonly="readonly" cols="80" rows="20"<?=$addon['Translation'][$policy_index]['locale_html']?>><?=$addon['Translation'][$policy_index]['string']?></textarea>
+  <textarea class="policy-area" readonly="readonly" cols="80" rows="20"<?=$addon['Translation'][$policy_index]['locale_html']?>><?=$addon['Translation'][$policy_index]['string']?></textarea>
 
-  <?php if (empty($policy)): ?>
-    <div id="addon-summary" class="condensed <?=$html->extraClass($addon)?>">
-    <?
-      global $browser_apps;
-      if (!in_array(APP_ID, $browser_apps)) {
-          $buttonMessage = ___('a_eula_download');
-      } else {
+  <?php if (empty($policy)) {
+  global $browser_apps;
+  if (!in_array(APP_ID, $browser_apps)) {
+      // @partial: translation fallback for locale changes from 1/9/08
+      if (_('a_eula_download') != 'a_eula_download')
+          $buttonMessage = _('a_eula_download');
+      else
           $buttonMessage = _('a_eula_install');
-      }
-      if (array_key_exists('collection_id', $_GET) && $this->controller->Collection->isValidUUID($_GET['collection_id'])) {
-          $_collection_uuid = $_GET['collection_id'];
-      } else {
-          $_collection_uuid = '';
-      }
-
-      $_install_render_options = array(
-                                  'addon'           => $addon,
-                                  'addonFiles'      => $addon['Version'][0]['File'],
-                                  'compatible_apps' => array(),
-                                  'collection_uuid' => $_collection_uuid,
-                                  'addonEULA'       => '', // override a EULA if it exists since this page is pulling double duty
-                                  'is_latest'       => $is_latest,
-                                  'platforms'       => $platforms,
-                                  'buttonMessage'   => $buttonMessage,
-                                  'is_eula_page'    => true
-                              );
-      echo $this->renderElement('amo2009/install', $_install_render_options);
-      ?>
-      </div>
-      <!-- /.addon-summary -->
-      
-      <p class="policy-link"><?=$html->link(_('a_cancel_installation'), "/addon/{$addon['Addon']['id']}");?></p>
-  <?php endif;?>
+  } else {
+      $buttonMessage = _('a_eula_install');
+  }
+  $_install_render_options = array(
+                              'addonIconPath' => $addonIconPath, 
+                              'addonName'     => $addon['Translation']['name']['string'],
+                              'addonId'       => $addon['Addon']['id'],
+                              'addonFiles'    => $addon['Version'][0]['File'],
+                              'addonEULA'     => '',
+                              'addonStatus'   => $addon['Addon']['status'],
+                              'is_latest'     => ($addon['Addon']['status'] == STATUS_PUBLIC),
+                              'addonType'     => $addon['Addon']['addontype_id'],
+                              'allPlatforms'  => $platforms,
+                              'buttonMessage' => $buttonMessage
+                          );
+  echo $this->renderElement('install', $_install_render_options);
+  ?>
+  
+  <?=$html->link(_('a_cancel_installation'), "/addon/{$addon['Addon']['id']}");?>
+  <?php }?>
+  </div>
+  <!-- /#content-policy -->
 
-  <p class="policy-link"><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></p>
+  <div class="vex"><span><!-- bottom edge --></span></div>
 </div>
-<!-- /#primary -->
+<!-- /#addon-summary -->
+    <p><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></p>
+</div>
+<!-- /#main-content -->
 
-<script type="text/javascript">
-$( function() {
-      if (window.location.href.match(/confirmed/)) {
-        var bt = $("div#content").find('.install-button a');
-        var href = $(bt).attr('href');
-          if (href)
-              if (href.match(/collection_id/)) {
-                  $(bt).attr('href', href + "&confirmed");
-              } else {
-                  $(bt).attr('href', href + "?confirmed");
-              }
+</div>
+<!-- /#content -->
 
-        var onclick = $(bt).attr('onclick');
-          if (onclick && onclick.match(/\.xml'\);$/))
-              $(bt).attr('onclick', onclick.replace(/\.xml'\);$/, ".xml?confirmed');"));
-      }
-   });
-</script>
diff --git a/site/app/views/addons/recommended.thtml b/site/app/views/addons/recommended.thtml
index ab27e5a..7d578e9 100644
--- a/site/app/views/addons/recommended.thtml
+++ b/site/app/views/addons/recommended.thtml
@@ -36,29 +36,39 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
+?>
 
-$this->layout = 'amo2009';
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-?>
+<?=$this->renderElement('extendfirefox')?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
+<p><?=_('addons_recommended_introduction')?></p>
 
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
-    <div>
-    <?=_('addons_recommended_introduction')?>
-    </div>
-    <div class="featured listing">
-      <div class="featured-inner">
-        <div class="listing-header">
-        </div> <!-- listing-header -->
+<ul id="addon-listing">
 <?php
-foreach ($addons as $addon) {
-    echo $this->renderElement('amo2009/homepage_addon', array('group'=>'recommended', 'addon' => $addon));
-}
+foreach ($addons as $addon):
+    // prepare preview image
+    $prevPath = $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']);
+    // prepare icon
+    $iconPath = $this->controller->Image->getAddonIconURL($addon['Addon']['id']);
+
+    echo $this->renderElement('addon_listitem', array(
+        'addon'            => $addon,
+        'addonIconPath'    => $iconPath,
+        'addonPreviewPath' => $prevPath,
+        ));
 ?>
-      </div> <!-- featured-inner -->
-    </div> <!-- featured listing -->
-</div> <!-- primary -->
+
+<? endforeach; ?>
+</ul>
+
+    </div>
+    <!-- /#content-main -->
+</div>
+<!-- /#content -->
+
diff --git a/site/app/views/addons/searchengines.thtml b/site/app/views/addons/searchengines.thtml
index 77d6032..2fa9e18 100644
--- a/site/app/views/addons/searchengines.thtml
+++ b/site/app/views/addons/searchengines.thtml
@@ -37,59 +37,142 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 
-$this->layout = 'amo2009';
-
 ?>
-    <div class="stand-alone-options">
-        <?=$this->renderElement('amo2009/categories', array('clickable_header' => true, 'category' => 'x'))?>
-        <?=$this->renderElement('amo2009/search', array('category'=>array(ADDON_SEARCH, 0)))?>
-    </div><!-- /.stand-alone-options -->
 
-    <div class="primary" role="main">
+<div id="content" class="landing browse">
+
+<?=$this->renderElement('search', array('category'=>array(ADDON_SEARCH, 0)))?>
+
+<div id="content-main">
     
-        <noscript>
-            <?=$this->renderElement('notification', array('type' => 'error', 'description' => _('addons_searchengines_error_nojavascript'))); ?>
-        </noscript>
-        <div class="featured show-recommended listing" id="featured">
-            <div class="featured-inner">
-                <div class="listing-header">
-                    <ul>
-                        <li class="selected"><a href="?featured=recommended#featured"><?=___('addons_home_browse_recommended', 'Recommended')?></a></li>
-                    </ul>
-                </div>
-                <?php foreach ($featureAddons as $id => $addon): ?>
-                    <?= $this->renderElement('amo2009/homepage_addon', array(
-                        'group' => 'recommended', 'addon' => $addon
-                    )) ?>
-                <?php endforeach; ?>
-                <div class="recommended listing-footer"> </div>
-            </div>
+    <noscript><div class="error-notice">
+        <?=_('addons_searchengines_error_nojavascript'); ?>
+    </div></noscript>
+    
+    <?php if (!empty($featureAddons)): ?>
+    <div id="recommended">
+        <h3><?=_('addons_home_feature_head')?></h3>
+        <?php
+        foreach($featureAddons as $id => $addon):
+        ?>
+        <div id="feature<?=$id+1?>" class="addon main">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonFiles' => $addon['File'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'compatible_apps' => $addon['compatible_apps'],
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews'],
+                'addonVersionCreated' => $addon['Version'][0]['created']
+            ))?>
+            <div class="vex"><span><!-- bottom edge --></span></div>
         </div>
+        <?php endforeach; ?>
+    </div><!-- /#recommended -->
+    <?php endif; /* !empty(recommended) */ ?>
     
-</div><!-- /.primary -->
+    <?php if (!empty($randomAddons)): ?>
+    <div id="secondaries">
+        <?php
+        global $experimental_status;
+        
+        foreach($randomAddons as $id => $addon):
+            $idx = count($featureAddons) + $id + 1;
+            if (in_array($addon['Addon']['status'], $experimental_status))
+                $extraclass = ' exp';
+            else
+                $extraclass = '';
+        ?>
+        <div id="feature<?=$idx?>" class="addon sub<?=$extraclass?>">
+            <div class="irk">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonStatus' => $addon['Addon']['status'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews']
+            ))?>
+            </div>
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+        <?php endforeach; ?>
+    </div><!-- /#secondaries -->
+    <?php endif; /* !empty(random) */ ?>
 
-<div class="secondary" role="complementary">
+    <div id="content-extra">
+        <div class="more-addons">
+            <h3><?=$html->link(_('search_landing_browse_search_engines'),
+                "/browse/type:".ADDON_SEARCH."/cat:all?sort=name",
+                array('class'=>'view'))?></h3>
+            <ol class="browse-list">
+                <li><?=$html->link(_('search_landing_all_search_engines'),
+                    "/browse/type:".ADDON_SEARCH."/cat:all?sort=name")?></li>
+                <?php
+                foreach ($subcats as $subcat):
+                ?>
+                <li><?=$html->link($subcat['Translation']['name']['string'],
+                    "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?sort=name")?></li>
+                <?php endforeach; ?>
+            </ol>
+        </div>
+        <div class="more-addons">
+            <h3><?=$html->link(sprintf(_('category_extra_see_all'), $this_tag['Translation']['name']['string']),
+                "/browse/type:{$this_tag['Tag']['addontype_id']}/cat:{$this_tag['Tag']['id']}?sort=name",
+                array('class'=>'view'))?></h3>
+        </div>
 
-    <h3 class="compact"><?=$html->link(_('search_landing_browse_search_engines'), "/browse/type:".ADDON_SEARCH."/cat:all?sort=name", array('class'=>'view'))?></h3>
+    </div><!-- /#content-extra -->
 
-    <ul class="highlight">
-        <li><?=$html->link(_('search_landing_all_search_engines'),
-            "/browse/type:".ADDON_SEARCH."/cat:all?sort=name", array('class' => 'category'))?></li>
-        <?php foreach ($subcats as $subcat): ?>
-            <li class="sub-category"><?=$html->link($subcat['Translation']['name']['string'],
-                "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?sort=name", array('class' => 'category'))?></li>
-        <?php endforeach; ?>
-    </ul>
+    <?php
+    /* @partial 5/12/08  bug 426234 */
 
-    <h3 class="clear"><?=___('addons_searchengines_additional_resources')?></h3>
-    <div class="article prose compact">
+    // Find out if we're serving msgid's or not.  If we are, show the
+    // all-english version for now.
+    if (_('addons_searchengines_additional_resources') == 'addons_searchengines_additional_resources' ||
+        _('addons_searchengines_more') == ' addons_searchengines_more' ||
+        _('addons_searchengines_mycroft_link') == 'addons_searchengines_mycroft_link' ||
+        _('addons_searchengines_learn_howto') == 'addons_searchengines_learn_howto' ||
+        _('addons_searchengines_makeyourown_link') == 'addons_searchengines_makeyourown_link' ||
+        _('addons_searchengines_makeyourown_href') == 'addons_searchengines_makeyourown_href' ||
+        _('addons_searchengines_devmo_link') == 'addons_searchengines_devmo_link' ||
+        _('addons_searchengines_thanks') == 'addons_searchengines_thanks') {
+    ?>
+        <h1 class="clear">Additional Resources</h1>
         <ul>
-            <li><?=$html->link(sprintf(_('category_extra_see_all'), $this_tag['Translation']['name']['string']), "/browse/type:{$this_tag['Tag']['addontype_id']}/cat:{$this_tag['Tag']['id']}?sort=name", array('class'=>'view'))?></li>
-            <li><?=sprintf(___('addons_searchengines_more'), $html->link(___('addons_searchengines_mycroft_link'), 'http://mycroft.mozdev.org/'))?></li>
-            <li><?=sprintf(___('addons_searchengines_learn_howto'), 
-                           $html->link(___('addons_searchengines_makeyourown_link'), 'http://developer.mozilla.org'.___('addons_searchengines_makeyourown_href')),
-                           $html->link(___('addons_searchengines_devmo_link'), 'http://developer.mozilla.org/'))?></li>
+            <li>Browse through more search engines at <a href="http://mycroft.mozdev.org/" >mycroft.mozdev.org</a></li>
+            <li>Learn how to <a href="http://developer.mozilla.org/en/docs/Creating_OpenSearch_plugins_for_Firefox" >make your own</a> at the <a href="http://developer.mozilla.org/" >Mozilla Developer Center</a>.</li>
+
         </ul>
-    </div>
-    <div class="article prose highlight"> <?=_('addons_searchengines_thanks')?> </div>
-</div><!-- /.secondary -->
+        <p>Special thanks to the Mycroft Project for their work on Firefox Search Engines.</p>
+    <?php } else { ?>
+        <h1 class="clear"><?=_('addons_searchengines_additional_resources')?></h1>
+        <ul>
+            <li><?=sprintf(_('addons_searchengines_more'), $html->link(_('addons_searchengines_mycroft_link'), 'http://mycroft.mozdev.org/'))?></li>
+            <li><?=sprintf(_('addons_searchengines_learn_howto'), 
+                           $html->link(_('addons_searchengines_makeyourown_link'), 'http://developer.mozilla.org'._('addons_searchengines_makeyourown_href')),
+                           $html->link(_('addons_searchengines_devmo_link'), 'http://developer.mozilla.org/'))?></li>
+        </ul>
+        <p><?=_('addons_searchengines_thanks')?></p>
+    <?php } ?>
+
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar', array('highlight' => array(ADDON_SEARCH,0)))?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/themes_landing.thtml b/site/app/views/addons/themes_landing.thtml
index f6af812..431d435 100644
--- a/site/app/views/addons/themes_landing.thtml
+++ b/site/app/views/addons/themes_landing.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,39 +36,98 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
-
 ?>
-    <div class="stand-alone-options">
-        <?=$this->renderElement('amo2009/categories', array('clickable_header' => true, 'category' => 'x'))?>
-        <?=$this->renderElement('amo2009/search', array('category'=>array(ADDON_THEME, 0)))?>
-    </div><!-- /.stand-alone-options -->
 
-<div class="primary" role="main">
+<div id="content" class="landing browse">
+
+<?=$this->renderElement('search', array('category' => array(ADDON_THEME, 0)))?>
+
+<div id="content-main">
+
     <?php if (!empty($featureAddons)): ?>
-        <div class="featured show-recommended listing" id="featured">
-            <div class="featured-inner">
-                <div class="listing-header">
-                    <ul>
-                        <li class="selected"><a href="?featured=recommended#featured"><?=___('addons_home_browse_recommended', 'Recommended')?></a></li>
-                    </ul>
-                </div>
-                <?php foreach ($featureAddons as $id => $addon): ?>
-                    <?= $this->renderElement('amo2009/homepage_addon', array( 'group' => 'recommended', 'addon' => $addon)) ?>
-                <?php endforeach; ?>
-                <div class="recommended listing-footer"> </div>
+    <div id="recommended">
+        <h3><?=_('addons_home_feature_head')?></h3>
+        <?php
+        foreach($featureAddons as $id => $addon):
+        ?>
+        <div id="feature<?=$id+1?>" class="addon main">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonFiles' => $addon['File'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'compatible_apps' => $addon['compatible_apps'],																
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews'],
+                'addonVersionCreated' => $addon['Version'][0]['created']
+            ))?>
+            <div class="vex"><span><!-- bottom edge --></span></div>
+        </div>
+        <?php endforeach; ?>
+    </div><!-- /#recommended -->
+    <?php endif; /* !empty(recommended) */ ?>
+    
+    <?php if (!empty($randomAddons)): ?>
+    <div id="secondaries">
+        <?php
+        global $experimental_status;
+        
+        foreach($randomAddons as $id => $addon):
+            $idx = count($featureAddons) + $id + 1;
+            if (in_array($addon['Addon']['status'], $experimental_status))
+                $extraclass = ' exp';
+            else
+                $extraclass = '';
+        ?>
+        <div id="feature<?=$idx?>" class="addon sub<?=$extraclass?>">
+            <div class="irk">
+            <?=$this->renderElement('feature', array(
+                'addonIconPath' => $this->controller->Image->getAddonIconURL($addon['Addon']['id']),
+                'addonThumbPath' => $this->controller->Image->getHighlightedPreviewURL($addon['Addon']['id']),
+                'addonName' => $addon['Translation']['name']['string'],
+                'addonSummary' => $addon['Translation']['summary']['string'],
+                'addonId' => $addon['Addon']['id'],
+                'addonEULA' => $addon['Translation']['eula']['string'],
+                'addonStatus' => $addon['Addon']['status'],
+                'addonAuthors' => $addon['User'],
+                'addonWeeklyDownloads' => $addon['Addon']['weeklydownloads'],
+                'allPlatforms' => $platforms,
+                'addonType' => $addon['Addon']['addontype_id'],
+                'addonRating' => $addon['Addon']['averagerating'],
+                'addonReviews' => $addon['Addon']['totalreviews']
+            ))?>
             </div>
+            <div class="vex"><span><!-- bottom edge --></span></div>
         </div>
-    <?php endif; /* !empty($featureAddons) */ ?>
-</div><!-- /.primary -->
+        <?php endforeach; ?>
+    </div><!-- /#secondaries -->
+    <?php endif; /* !empty(random) */ ?>
     
-<div class="secondary" role="navigation">
-    <h3 class="compact"><?=$html->link(_('themes_landing_browse_themes'), "/browse/type:".ADDON_THEME."/cat:all?sort=name", array('class'=>'view'))?></h3>
+    <div id="content-extra">
+        <div class="more-addons">
+            <h3><?=$html->link(_('themes_landing_browse_themes'),
+                "/browse/type:".ADDON_THEME."/cat:all?sort=name",
+                array('class'=>'view'))?></h3>
+            <ol class="browse-list">
+                <li><?=$html->link(_('themes_landing_all_themes'), "/browse/type:".ADDON_THEME."/cat:all?sort=name")?></li>
+                <?php
+                foreach ($subcats as $subcat):
+                ?>
+                <li><?=$html->link($subcat['Translation']['name']['string'],
+                    "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?sort=name")?></li>
+                <?php endforeach; ?>
+            </ol>
+        </div>
+    </div><!-- /#content-extra -->
+</div><!-- /#content-main -->
 
-    <ul class="highlight">
-        <li><?=$html->link(_('themes_landing_all_themes'), "/browse/type:".ADDON_THEME."/cat:all?sort=name")?></li>
-        <?php foreach ($subcats as $subcat): ?>
-            <li class="sub-category"><?=$html->link($subcat['Translation']['name']['string'], "/browse/type:{$subcat['Tag']['addontype_id']}/cat:{$subcat['Tag']['id']}?sort=name", array('class' => 'category'))?></li>
-        <?php endforeach; ?>
-    </ul>
-</div><!-- /.secondary -->
+<?=$this->renderElement('sidebar', array('highlight' => array(ADDON_THEME, 0)))?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/addons/versions.thtml b/site/app/views/addons/versions.thtml
index 231756a..7a0c7ae 100644
--- a/site/app/views/addons/versions.thtml
+++ b/site/app/views/addons/versions.thtml
@@ -35,110 +35,88 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
- * ***** END LICENSE BLOCK ***** */
-
-$this->viewVars['bodyclass'] = 'inverse';
-$this->layout = 'amo2009';
-
-$addonIconPath = $this->controller->Image->getAddonIconURL($addon['Addon']['id']);
+ * ***** END LICENSE BLOCK ***** */ 
 ?>
-<div class="section" id="version-history">
-    <div class="stand-alone-options">
-        <?=$this->renderElement('amo2009/categories')?>
-        <?=$this->renderElement('amo2009/search')?>
-    </div>
-    <div class="primary" role="main">
-        <?=$this->renderElement('amo2009/breadcrumbs')?>
-
-        <h2><?=$subpagetitle?></h2>
-
-        <div id="latest-version-container" class="featured listing"
-            style="display:none;">
-        </div>
-
-        <?php
-        echo $this->renderElement('notification', array(
-            'type' => 'warning',
-            'msg' => ___('addons_versions_careful'),
-            'description' => ___('addons_versions_careful_introduction')
-        ));
-        ?>
-
-        <div class="featured listing">
-            <?php
-            foreach ($versions as $version):
-                $_version_data = array(
-                    'addonid' => $addon['Addon']['id'],
-                    'version' => $version['Version']['version'],
-                    'created' => $version['Version']['created'],
-                    'fileSize' => $version['File'][0]['size'],
-                    'license_id' => $version['Version']['license_id']
-                );
-
-                $addon['File'] = $version['File'];
-                $addon['compatible_apps'] = $version['Compatibility'];
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
 
-                // determine add-on flags
-                global $experimental_status;
-                $flags = array();
-                if (in_array($version['File'][0]['status'], $experimental_status))
-                    $flags[] = 'experimental';
-                ?>
-                <div class="item oldversion <?=implode(' ', $flags)?>" id="version-<?=$_version_data['version']?>">
-                    <?=$this->renderElement('amo2009/install', array(
-                        'flags' => $flags,
-                        'addon' => $addon,
-                        'is_latest' => false
-                    ))?>
-                    <h3><?=$this->renderElement('amo2009/addon_version_detail', $_version_data)?></h3>
+    <div id="content-main">
+    <h3><?=$subpagetitle ?></h3>
+      <div id="latest-version-container">
+      </div>  
 
-                    <?=$this->renderElement('app_compatibility', array('compatible_apps' => $version['Compatibility'])); ?>
+<h3><?=_('addons_versions_history')?></h3>
+ 
+<div class="error-notice">
+<h3><?=_('addons_versions_careful')?></h3>
+<p><?=_('addons_versions_careful_introduction')?></p>
+</div>
 
-                    <p<?=$version['Translation']['releasenotes']['locale_html']?>>
-                        <?=nl2br($version['Translation']['releasenotes']['string'])?></p>
 
-                    <?php
-                    $show_license = isset($_version_data['license_id']);
-                    $show_source = $addon['Addon']['viewsource'] == 1 && $this->controller->Session->check('User');
-                    if ($show_license || $show_source) {
-                        echo '<ul class="legal">';
-
-                        if ($show_license) {
-                            $license_name = $this->controller->License->getName($_version_data['license_id']);
-                            $license_link = $html->link($license_name, '/versions/license/'.$version['Version']['id']);
-                            echo '<li class="license">'
-                                .___('addons_display_header_license').' '
-                                .$license_link
-                                .'</li>';
-                        }
-
-                        if ($show_source) {
-                            echo '<li class="source">'
-                                .$html->link(_('addons_display_view_source'),
-                                    "/files/browse/{$version['File'][0]['id']}")
-                                .'</li>';
-                        }
-                        echo '</ul>';
-                    }
+<?php
+foreach ($versions as $version):
+    $_version_data = array(
+        'addonid' => $addon['Addon']['id'],
+        'version' => $version['Version']['version'],
+        'created' => $version['Version']['created'],
+        'fileSize' => $version['File'][0]['size'] 
+    );
+    
+    // show "experimental" flag for non-public versions
+    if ($version['File'][0]['status'] == STATUS_PUBLIC) {
+        $flag = '';
+        $box_extraclass = '';
+    } else {
+        $flag = _('addon_listitem_flag_experimental');
+        $box_extraclass = 'exp';
+    }
+?>
+<div class="addon oldversion <?=$box_extraclass?>" id="version-<?=$_version_data['version']?>">
+    <? if (!empty($flag)) echo '<h5 class="flag">'.$flag.'</h5>'; ?>
+    <h3><?=$this->renderElement('addon_version_detail', $_version_data)?></h3>
+        <?=$this->renderElement('app_compatibility', array('compatible_apps' => $version['Compatibility'])); ?>
 
-                    ?>
+    <p<?=$version['Translation']['releasenotes']['locale_html']?>>
+        <?=nl2br($version['Translation']['releasenotes']['string'])?>
+    </p>
 
-                </div>
-            <?php endforeach; ?>
-        </div><!-- /listing -->
+        <?php
+            $_install_render_options = array(
+                'addonIconPath' => $addonIconPath, 
+                'addonName'     => $addon['Translation']['name']['string'],
+                'addonId'       => $addon['Addon']['id'],
+                'addonFiles'    => $version['File'],
+                'addonEULA'     => $addon['Translation']['eula']['string'],
+                'addonStatus'   => $addon['Addon']['status'],
+                'addonType'     => $addon['Addon']['addontype_id'],
+                'allPlatforms'  => $platforms,
+                'compatible_apps'=> $version['Compatibility']
+                );
+            echo $this->renderElement('install', $_install_render_options);
+        ?>
+    <p>
+        <?php
+            if ($addon['Addon']['viewsource'] == 1 && $this->controller->Session->check('User')) {
+                echo '<p>';
+                echo $html->link(_('addons_display_view_source'), "/files/browse/{$version['File'][0]['id']}");
+                echo '</p>';
+            }
+        ?>
+    </p>
 
-    <p><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), "/addon/{$addon['Addon']['id']}");?></p>
+    <div class="vex"><span><!-- bottom edge --></span></div>
+</div>
+<?php endforeach; ?>
 
-    </div><!-- primary -->
+<p><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), "/addon/{$addon['Addon']['id']}");?></p>
 
-</div><!-- /section -->
+    </div>
+</div>
 <script type="text/javascript">
-    $(document).ready(function() {
-        if (gIsFirefox) {
-            addons_history.init();
-            addons_history.createLatestVersionElement("<?php
-                echo addslashes(___('addon_versions_getlatestversion'))
-                ?>", "<?=addslashes(APP_PRETTYNAME)?>");
-        }
-    });
+    <?php $latest_text = ___('addon_versions_getlatestversion', 'The most recent version compatible with %1$s (%2$s)'); ?>
+    setTimeout(function() { 
+        if(gLatestVersionID != null) createLatestVersionElement("<?=$latest_text ?>", "<?=APP_PRETTYNAME?>");
+    }, 0);
 </script>
diff --git a/site/app/views/admin/addons.thtml b/site/app/views/admin/addons.thtml
index c961d8f..b96aed5 100644
--- a/site/app/views/admin/addons.thtml
+++ b/site/app/views/admin/addons.thtml
@@ -50,13 +50,15 @@
         <p><i>Enter at least 4 characters of an add-on's name for auto-completion, or enter an add-on ID in brackets (e.g. [2848])</i></p>
         
         <script language="JavaScript" type="text/javascript">
+            function formatItem(row) {
+                return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>';
+            }
+            function formatValue(row) {
+                return row[2];
+            }
+    
             $(document).ready(function() {
-                $('#addon-name').autocomplete("<?=$html->url('/admin/addonLookup')?>",
-                    {
-                        minChars: 4,
-                        formatItem: function(row) { return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>'; },
-                        formatResult: function(row) { return row[2]; }
-                    });
+                $('#addon-name').autocomplete("<?=$html->url('/admin/addonLookup')?>", { minChars: 4, formatItem: formatItem, formatValue: formatValue });
             });
         </script>
         
diff --git a/site/app/views/admin/addons_status.thtml b/site/app/views/admin/addons_status.thtml
index 4c1f122..01ccc45 100644
--- a/site/app/views/admin/addons_status.thtml
+++ b/site/app/views/admin/addons_status.thtml
@@ -58,7 +58,7 @@
                 if (!empty($version['File'])) {
                     echo '<ul>';
                     foreach ($version['File'] as $file) {
-                        echo "<li> File ".$html->link($file['File']['id'], '/files/browse/'.$file['File']['id']).": {$platforms[$file['Platform']['id']]} - ";
+                        echo "<li> File {$file['File']['id']}: {$platforms[$file['Platform']['id']]} - ";
                         echo $html->hidden('File/id][', array('value' => $file['File']['id']));
                         echo $html->selectTag('File/status][', $fileStatuses, $file['File']['status'], null, null, false);
                         echo ' | '.$html->link('Recalc Hash', '/admin/addons/hash/'.$addon['Addon']['id'].'/'.$file['File']['id'], array('title' => $file['File']['hash']));
diff --git a/site/app/views/admin/features.thtml b/site/app/views/admin/features.thtml
index 0eaed0c..351fadf 100644
--- a/site/app/views/admin/features.thtml
+++ b/site/app/views/admin/features.thtml
@@ -112,13 +112,15 @@
                     <p><i>(yyyy-mm-dd or blank for NOW()+6 months)</i></p>
                 </div>
                 <script language="JavaScript" type="text/javascript">
+                    function formatItem(row) {
+                        return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>';
+                    }
+                    function formatValue(row) {
+                        return row[2];
+                    }
+            
                     $(document).ready(function() {
-                        $('#addon-name').autocomplete("<?=$html->url('/admin/addonLookup?s=4')?>",
-                            {
-                                minChars: 4,
-                                formatItem: function(row) { return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>'; },
-                                formatResult: function(row) { return row[2]; }
-                            });
+                        $('#addon-name').autocomplete("<?=$html->url('/admin/addonLookup?s=4')?>", { minChars: 4, formatItem: formatItem, formatValue: formatValue });
                     });
                 </script>
                 <?=$html->submit('Add', array('name' => 'add'))?>
diff --git a/site/app/views/admin/flagged_queue.thtml b/site/app/views/admin/flagged_queue.thtml
index 7e6a5dc..4cc3941 100644
--- a/site/app/views/admin/flagged_queue.thtml
+++ b/site/app/views/admin/flagged_queue.thtml
@@ -47,50 +47,35 @@
         echo '<div class="greenNotice"><b>'.$unflagged.'</b> add-ons unflagged.</div>';
     echo $html->formTag('/admin/flagged');
 ?>
-<table width="100%" id="flagged">
+<table width="100%">
     <tr class="queueHeader">
         <td>&nbsp;</td>
         <td><?=_('editors_th_addon')?></td>
-        <td>Review</td>
         <td>Flagged on</td>
         <td>Flagged by</td>
         <td>Comments</td>
     </tr>
 <?php
-if (!empty($addons)):
-    $i = 0;
-    foreach ($addons as &$addon):
+    if (!empty($addons)) {
+        $i = 0;
+        foreach ($addons as $addon) {
+            echo '<tr'.($i % 2 == 1 ? ' bgcolor="#eeeeff"' : '').'>';
+                echo '<td><input type="checkbox" name="data[Addon][unflag][]" value="'.$addon['Addon']['id'].'"></td>';
+                echo '<td>'.$html->link($addon['Translation']['name']['string'].' '.$addon['Version']['version'], '/editors/review/'.$addon['Version']['id']).'</td>';
+                echo "<td>{$addon['Approval']['created']}</td>";
+                echo "<td>{$addon['User']['firstname']} {$addon['User']['lastname']}</td>";
+                echo "<td>{$addon['Approval']['comments']}</td>";
+            echo '</tr>';
+            $i++;
+        }
+        echo '</table>';
+        echo '<input type="submit" value="Unflag Selected Add-ons">';
+    }
+    else {
+        echo '<tr><td colspan=8 class="emptyQueue">'._('editors_notice_none_found').'</td></tr>';
+        echo '</table>';
+    }
 ?>
-    <tr<?=(++$i % 2 ? '' : ' class="even"')?>>
-        <td><input type="checkbox" name="data[Addon][unflag][]" value="<?=$addon['Addon']['id']?>"/></td>
-        <td><?=sprintf('%1$s %2$s', $html->link($addon['Translation']['name']['string'], '/admin/addons/status/'.$addon['Addon']['id'])
-            , (!empty($addon['Version'])?' '.$addon['Version']['version']:''))?></td>
-        
-        <?php if (!empty($addon['Version'])): ?>
-        <td><?=$html->link($html->image('developers/admin_review.png', 'width="16" height="16" alt="review version"'),
-            '/editors/review/'.$addon['Version']['id'], array('title'=>'review flagged add-on version'))?></td>
-        <?php else: ?>
-        <td>&nbsp;</td>
-        <?php endif; ?>
-        
-        <?php if (!empty($addon['Approval'])): ?>
-        <td><?=$addon['Approval']['created']?></td>
-        <td><?=$addon['User']['firstname'].' '.$addon['User']['lastname']?></td>
-        <td><?=$addon['Approval']['comments']?></td>
-        <?php else: ?>
-        <td colspan="3">&nbsp;</td>
-        <?php endif; ?>
-    </tr>
-<?php endforeach; ?>
-</table>
-<p><input type="submit" value="Unflag Selected Add-ons"/></p>
-
-<?php else: ?>
-    <tr><td colspan=8 class="emptyQueue"><?=_('editors_notice_none_found')?></td></tr>
-</table>
-
-<?php endif; ?>
-
     </form>
     </div> <!-- corner-box -->
 </div> <!-- content-right -->
diff --git a/site/app/views/admin/groups.thtml b/site/app/views/admin/groups.thtml
index 5d757c0..82373ac 100644
--- a/site/app/views/admin/groups.thtml
+++ b/site/app/views/admin/groups.thtml
@@ -74,11 +74,7 @@
                     </div>
                     <script language="JavaScript" type="text/javascript">
                         $(document).ready(function() {
-                            $('#group<?=$gid?>_new').autocomplete("<?=$html->url('/admin/userLookup')?>",
-                                {
-                                    minChars: 4,
-                                    formatItem: function(row) { return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>'; }
-                                });
+                            $('#group<?=$gid?>_new').autocomplete("<?=$html->url('/admin/userLookup')?>", { minChars: 4, formatItem: formatItem });
                         });
                     </script>
                     </form>
@@ -91,3 +87,9 @@
         <?=$html->link('Create Group', '/admin/groups/create')?>
     </div>
 </div>
+
+<script language="JavaScript" type="text/javascript">
+    function formatItem(row) {
+        return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>';
+    }
+</script>
diff --git a/site/app/views/admin/summary.thtml b/site/app/views/admin/summary.thtml
index 30c8c46..f6f9fdd 100644
--- a/site/app/views/admin/summary.thtml
+++ b/site/app/views/admin/summary.thtml
@@ -84,21 +84,10 @@
             <tr>
                 <td class="heading" colspan=2>Total Counts</td>
             </tr>
-            <tr>
-                <td class="title">Extensions</td>
-                <td class="value"><?=$count['extensions'][0][0]['COUNT(*)']?></td>
-            </tr>
-            <tr>
-                <td class="title">Themes</td>
-                <td class="value"><?=$count['themes'][0][0]['COUNT(*)']?></td>
-            </tr>
-            <tr>
-                <td class="title">Dictionaries</td>
-                <td class="value"><?=$count['dictionaries'][0][0]['COUNT(*)']?></td>
-            </tr>
-            <tr>
-                <td class="title">Search Plugins</td>
-                <td class="value"><?=$count['searchengines'][0][0]['COUNT(*)']?></td>
+            
+	    <tr>
+                <td class="title">Activities</td>
+                <td class="value"><?=$count['activities'][0][0]['COUNT(*)']?></td>
             </tr>
             <tr>
                 <td class="title">Current Sessions</td>
diff --git a/site/app/views/admin/users_edit.thtml b/site/app/views/admin/users_edit.thtml
index ae76037..fd49a27 100644
--- a/site/app/views/admin/users_edit.thtml
+++ b/site/app/views/admin/users_edit.thtml
@@ -36,21 +36,6 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-
-
-/* Prepare translation box element */
-// Retrieve language arrays from bootstrap.
-global $valid_languages, $native_languages;
-foreach (array_keys($valid_languages) as $key) {
-    $languages[$key] = $native_languages[$key]['native'];
-}
-ksort($languages);
-$this->translationBox = array(
-    'defaultLocale' => LANG,
-    'languages' => $languages,
-    'table' => 'User',
-    'loaded' => false
-);
 ?>
 <div id="content">
     <?=$this->renderElement('developers/adminmenu');?>
@@ -102,19 +87,6 @@ $this->translationBox = array(
             </div>
             
             <div>
-            <?php
-            echo $this->renderElement('translationbox', array(
-                'field' => 'bio',
-                'translations' => $translations['bio'],
-                'height' => '100',
-                'maxLength' => '500',
-                'displayName' => ___('user_form_bio'),
-                'description' => ___('user_form_bio_description'),
-            ));
-            ?>
-            </div>
-
-            <div>
                 <label for="UserConfirmationCode">Confirmation Code</label>
                 <?=$html->input('User/confirmationcode', array('value' => $user['User']['confirmationcode'])) ?>
             </div>
diff --git a/site/app/views/api/api_addon.thtml b/site/app/views/api/api_addon.thtml
index a1dcf4c..077f91b 100644
--- a/site/app/views/api/api_addon.thtml
+++ b/site/app/views/api/api_addon.thtml
@@ -39,7 +39,7 @@
       $addonIconPath = ($addon['Addon']['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON));
     }
 
-    $amo = 'https://addons.mozilla.org';
+    $amo = SSITE_URL;
 ?>
 <addon>
     <?php 
diff --git a/site/app/views/api/collections_feed.thtml b/site/app/views/api/collections_feed.thtml
index 3e856ff..ab31e7d 100644
--- a/site/app/views/api/collections_feed.thtml
+++ b/site/app/views/api/collections_feed.thtml
@@ -54,7 +54,7 @@ if (isset($error)) { ?>
       $addonIconPath = ($addon['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON));
     }
 
-    $amo = 'https://addons.mozilla.org';
+    $amo = SSITE_URL;
 ?>
 <addon>
     <meta>
diff --git a/site/app/views/api/email/recommend_email_plain.thtml b/site/app/views/api/email/recommend_email_plain.thtml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/site/app/views/api/email/recommend_email_plain.thtml
diff --git a/site/app/views/api/recommend_email.thtml b/site/app/views/api/recommend_email.thtml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/site/app/views/api/recommend_email.thtml
diff --git a/site/app/views/collections/display.thtml b/site/app/views/collections/display.thtml
new file mode 100644
index 0000000..5c59c14
--- /dev/null
+++ b/site/app/views/collections/display.thtml
@@ -0,0 +1,86 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ryan Doherty <rdoherty@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */ 
+?>
+    
+
+
+<div id="content" class="collections">
+<?=$this->renderElement('search');?>
+<div id="content-main" class="full">
+    <ul class="nav">
+        <li><a href="<?=$html->url('/collections/display/'.$collection['Collection']['id'].'?format=rss')?>">Subscribe</a></li>
+        <li><a href="<?=$html->url('/collections')?>">Back to Feeds</a></li>
+    </ul>
+
+    <h3 class="title"><?php echo $collection['Translation']['name']['string']; ?></h3>
+    <h4><?php echo $collection['Translation']['description']['string']; ?></h4>
+    
+<form action="<?=$html->url('/collections/install')?>" method="post" id="collectionform">
+
+<ul class="addon-listing collections-web">
+    <?php
+    foreach ($addons as $val) {
+        $prevPath = $this->controller->Image->getHighlightedPreviewURL($val['Addon']['id']);
+        $iconPath = $this->controller->Image->getAddonIconURL($val['Addon']['id']);
+        echo $this->renderElement('collections_interactive_addon', array(
+            'addon'             => $val,
+            'addonIconPath'     => $iconPath,
+            'addonPreviewPath'  => $prevPath,
+            'showDate'          => true
+            ));
+    }
+?>
+
+<div class="installsubmit"><input type="submit" value="Install my Add-ons!"/></div>
+
+</form>
+
+<div id="installdialog" class="jqmWindow" style="display:none">Please wait...</div>
+<script type="text/javascript">
+// <![CDATA[
+    $(document).ready(function() {
+        $('.collections').collection({'installUrl':"<?=$html->url('install/ajax')?>", 'shoppingCart':true});
+    });
+    // ]]>
+    </script>
+
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar')?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
\ No newline at end of file
diff --git a/site/app/views/collections/index.thtml b/site/app/views/collections/index.thtml
new file mode 100644
index 0000000..f03c23f
--- /dev/null
+++ b/site/app/views/collections/index.thtml
@@ -0,0 +1,48 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ryan Doherty <rdoherty@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */ 
+?>
+<div id="content" class="collections">
+<?=$this->renderElement('search');?>
+<div id="content-main" class="full">
+
+
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar')?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
\ No newline at end of file
diff --git a/site/app/views/compatibility/dashboard.thtml b/site/app/views/compatibility/dashboard.thtml
index bfc3595..035727c 100644
--- a/site/app/views/compatibility/dashboard.thtml
+++ b/site/app/views/compatibility/dashboard.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,11 +35,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-
-$this->viewVars['bodyclass'] = 'inverse';
-
 ?>
-<div id="content" class="primary prose" style="min-height: 400px;">
+<div id="content" style="min-height: 400px;">
     <div id="compat-home-nav">
         <a href="#" onclick="compatibility.viewHome(); return false;"><?=___('compatibility_dashboard_main_link', 'Back to Main')?></a>
     </div>
@@ -57,12 +53,20 @@ $this->viewVars['bodyclass'] = 'inverse';
         </div>
     
         <div id="report-intro">
+        <?php
+        $percentages = array(
+            COMPAT_OTHER => (($totals[COMPAT_OTHER]['adu'] / $totals['adu95']) * 100),
+            COMPAT_ALPHA => (($totals[COMPAT_ALPHA]['adu'] / $totals['adu95']) * 100),
+            COMPAT_BETA => (($totals[COMPAT_BETA]['adu'] / $totals['adu95']) * 100),
+            COMPAT_LATEST => (($totals[COMPAT_LATEST]['adu'] / $totals['adu95']) * 100),
+        );
+        ?>
             <div class="header">
                 <div class="title">
                     <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_report_title', 'Add-on Compatibility Report')?>
                 </div>
             </div>
-            <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, <b>%2$s&#37;</b> are currently considered compatible with the latest builds of %3$s.'), $html->number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p>
+            <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s add-ons that make up 95&#37; of add-on usage known to Mozilla, <b>%2$s&#37;</b> are currently considered compatible with the latest builds of %3$s.'), number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p>
             <div id="overall-compat">
                 <div id="overall-compat-bar">
                     <div class="compat-other" style="width: <?=$percentages[COMPAT_OTHER]?>%;"><?=($percentages[COMPAT_OTHER] >= 5 ? round($percentages[COMPAT_OTHER]).'%': '')?></div>
diff --git a/site/app/views/compatibility/developers.thtml b/site/app/views/compatibility/developers.thtml
index 45af4ee..c79e5e1 100644
--- a/site/app/views/compatibility/developers.thtml
+++ b/site/app/views/compatibility/developers.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,9 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 if ($format != 'ajax') {
-$this->viewVars['bodyclass'] = 'inverse';
 ?>
-<div id="content" class="primary prose" style="min-height: 400px;">
+<div id="content" style="min-height: 400px;">
     <h2><?=___('compatibility_developer_info', 'Information for Add-on Developers')?></h2>
     <?=$localization->includeLocalPage('compatibility_developer_tips', array(
             APP_PRETTYNAME." {$version}",
diff --git a/site/app/views/compatibility/report.thtml b/site/app/views/compatibility/report.thtml
index f84024f..c97f37d 100644
--- a/site/app/views/compatibility/report.thtml
+++ b/site/app/views/compatibility/report.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,9 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 if ($format != 'ajax'):
-$this->viewVars['bodyclass'] = 'inverse';
 ?>
-<div id="content" class="primary prose" style="min-height: 400px;">
+<div id="content" style="min-height: 400px;">
     <h2><?=___('compatibility_dashboard_report', 'Add-on Compatibility Report')?></h2>
 <?php endif; ?>
     <p class="intro"><?=___('compatibility_report_detail_intro', 'The add-ons below make up 95% of add-on usage known to Mozilla and are ordered by their usage size.')?></p>
@@ -71,4 +69,4 @@ $this->viewVars['bodyclass'] = 'inverse';
     </table>
 <?php if ($format != 'ajax'): ?>
 </div>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/site/app/views/compatibility/users.thtml b/site/app/views/compatibility/users.thtml
index b214dad..0cc8b87 100644
--- a/site/app/views/compatibility/users.thtml
+++ b/site/app/views/compatibility/users.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,9 +35,8 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-$this->viewVars['bodyclass'] = 'inverse';
 ?>
-<div id="content" class="primary prose" style="min-height: 400px;">
+<div id="content" style="min-height: 400px;">
     <h2><?=___('compatibility_user_info', 'Information for Add-on Users')?></h2>
     <?=$localization->includeLocalPage('compatibility_user_tips', array(
             APP_PRETTYNAME." {$version}",
@@ -49,4 +47,4 @@ $this->viewVars['bodyclass'] = 'inverse';
             $html->url('/'),
             APP_PRETTYNAME
         ))?>
-</div>
+</div>
\ No newline at end of file
diff --git a/site/app/views/developers/add_step0.thtml b/site/app/views/developers/add_step0.thtml
new file mode 100644
index 0000000..d0ea92e
--- /dev/null
+++ b/site/app/views/developers/add_step0.thtml
@@ -0,0 +1,64 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        
+        <h3><?=sprintf(_('devcp_header_developer_agreement'))?></h3>
+
+        <?php
+        echo $html->formTag('/developers/add');
+        echo $html->hidden('Addon/add_step0');
+        ?>
+        <div id="developerAgreement">
+            <p>
+                <?=_('devcp_review_agreement_please')?>
+            </p>
+            <blockquote>
+                <?=$localization->includeLocalPage('developer_agreement')?>
+            </blockquote>
+            <div class="buttonBox" id="agreementButtons">
+                <input type="button" class="cancel" value="<?=_('devcp_submit_decline_dev_agreement')?>" onClick="window.location='<?=$html->url('/developers')?>';">
+                <?=$html->submit(_('devcp_submit_accept_dev_agreement'), array('name' => 'accept'))?>
+            </div>
+        </div>
+        </form>
+    </div>
+</div>
diff --git a/site/app/views/developers/add_step1.thtml b/site/app/views/developers/add_step1.thtml
new file mode 100644
index 0000000..228efb3
--- /dev/null
+++ b/site/app/views/developers/add_step1.thtml
@@ -0,0 +1,134 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Wil Clouser <wclouser@mozilla.com>
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        <h3><?=sprintf('%s &bull; %s', _('devcp_header_step1'), _('devcp_header_step1_upload'))?></h3>
+
+        <?php
+        echo $html->formTag('/developers/add/'.$id, 'post', array('enctype'=>'multipart/form-data'));
+        echo $html->hidden('Addon/add_step1');
+        echo $html->hidden('Addon/newAddon', array('value' => ($newAddon == true ? 'true' : 'false')));
+        if ($newAddon == false) {
+            echo '<div class="addonName">'.$existing['Translation']['name']['string'].'</div>';
+        }
+        if (!empty($errors['main'])) {
+            echo '<div class="error">'.$errors['main'].'</div>';
+        }
+        ?>
+        <div id="developersForm">
+            <div>
+                <label for="AddonAddontypeId"><?=_('devcp_form_label_addontype')?></label>
+            <?php
+                if ($newAddon == true) {
+                    echo $html->selectTag('Addon/addontype_id', $allowedAddonTypes, null, array('onChange' => 'selectType(this);'), null, false);
+                    echo $html->tagErrorMsg('Addon/addontype_id', _('devcp_form_error_select_addontype'));
+                }
+                else {
+                    echo $addonTypes[$existing['Addon']['addontype_id']];
+                    echo $html->hidden('Addon/addontype_id', array('value' => $existing['Addon']['addontype_id']));
+                }
+            ?>
+            </div>
+            <div>
+                <label for="FileFile1"><?=_('devcp_form_label_addonfile')?></label>
+                <?=$html->file('File/file1').$html->tagErrorMsg('File/file1', $errors['File/file1'])?>
+                <div class="platforms" <?=(((!empty($existing['Addon']['addontype_id']) && $existing['Addon']['addontype_id'] == ADDON_SEARCH) || (!empty($data['Addon']['addontype_id']) && $data['Addon']['addontype_id'] == ADDON_SEARCH)) ? ' style="display: none;"' : '')?>>
+                    <label for="FilePlatformId1"><?=_('devcp_form_label_platforms')?></label>
+                    <?=$html->selectTag('File/platform_id1', $platforms, null, array('onChange' => 'selectPlatform(this);'), null, false)?>
+                </div>
+            </div>
+            <div id="file2"<?=(empty($data['File']['file2']['name'])) ? ' style="display: none;"' : ''?>>
+                <label for="FileFile2"><?=_('devcp_form_label_addonfile2')?></label>
+                <?=$html->file('File/file2').$html->tagErrorMsg('File/file2', $errors['File/file2'])?>
+                <div class="platforms">
+                    <label for="FilePlatformId2"><?=_('devcp_form_label_platforms')?></label>
+                    <?php unset($platforms[1]); ?>
+                    <?=$html->selectTag('File/platform_id2', $platforms, $data['File']['platform_id2'])?>
+                </div>
+            </div>
+            <div id="file3"<?=(empty($data['File']['file3']['name'])) ? ' style="display: none;"' : ''?>>
+                <label for="FileFile3"><?=_('devcp_form_label_addonfile3')?></label>
+                <?=$html->file('File/file3').$html->tagErrorMsg('File/file3', $errors['File/file3'])?>
+                <div class="platforms">
+                    <label for="FilePlatformId3"><?=_('devcp_form_label_platforms')?></label>
+                    <?=$html->selectTag('File/platform_id3', $platforms, $data['File']['platform_id3'])?>
+                </div>
+            </div>
+            <div id="addrow"<?=(!empty($data['File']['platform_id1']) && $data['File']['platform_id1'] > 1 && !empty($data['Addon']['addontype_id']) && $data['Addon']['addontype_id'] != ADDON_SEARCH) ? '' : ' style="display: none;"'?>>
+                <?=$html->link(_('devcp_file_addanother'), 'javascript: void(0);', array('onClick' => 'addFile();'))?>
+            </div>
+            <?php
+                if ($newAddon == true) {
+                    echo '<div>';
+                        echo '<label for="FileFile4">'._('devcp_form_label_iconfile').'</label>';
+                        echo $html->file('File/file4').$html->tagErrorMsg('File/file4', $errors['File/file4']);
+                    echo '</div>';
+                }
+            ?>
+            <div>
+                <label for="AddonDefaultlocale"><?=_('devcp_form_label_defaultlocale')?></label>
+                <select id="AddonDefaultlocale" name="data[Addon][defaultlocale]">
+                <?php
+                foreach ($languages as $key => $language) {
+                    echo '<option value="'.$key.'" '.($key == $defaultLocale ? 'selected' : '').'>'
+                        .$language.'</option>';
+                }
+                ?>
+                </select>
+            </div>
+        <?php
+            if ($newAddon == false) {
+                echo '<div>';
+                    $ReviewInfo['class'] = 'vmiddle';
+                    echo $html->checkbox('Addon/Review', null, $ReviewInfo);
+                    echo '<label for="AddonReview" class="nofloat">'._('devcp_skip_reviewing_addon_info').'</label>';  
+                echo '</div>';
+            }
+        ?>
+            <div class="buttonBox">
+                <?=$html->submit(_('devcp_button_next').' &raquo;', array('escape' => false))?>
+                <?=$html->submit(_('devcp_button_cancel'), array('name' => 'cancel', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('devcp_button_cancel_confirm').'\');'))?>
+            </div>
+        </div> <!-- developersForm -->
+        </form>
+    </div>
+</div>
diff --git a/site/app/views/developers/add_step2.thtml b/site/app/views/developers/add_step2.thtml
new file mode 100644
index 0000000..233e6c9
--- /dev/null
+++ b/site/app/views/developers/add_step2.thtml
@@ -0,0 +1,174 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        <h3><?=sprintf('%s &bull; %s', _('devcp_header_step2'), _('devcp_header_step2_addondetails'))?></h3>
+
+        <?php
+        echo (!empty($mainError) ? '<div class="error_message">'.$mainError.'</div>' : '');
+        echo $html->formTag('/developers/add/'.$id);
+        echo $html->hidden('Addon/add_step2');
+        echo $html->hidden('Version/id', array('value' => $version));
+        echo $html->hidden('Addon/newAddon', array('value' => ($newAddon == true ? 'true' : 'false')));
+        if ($newAddon == false) {
+            echo '<div class="addonName">'.$existing['Translation']['name']['string'].'</div>';
+        }
+        if (!empty($errors['main'])) {
+            echo '<div class="error">'.$errors['main'].'</div>';
+        }
+        if ($defaultLocale != LANG) {
+            echo '<div class="notice"><strong>'._('error_notice').'</strong>: '.sprintf(_('devcp_notice_different_defaultlocale'), $nativeLanguages[$defaultLocale], $defaultLocale, $nativeLanguages[LANG], LANG).'</div>';
+        }
+        if (!empty($autoDetected)) {
+        ?>
+            <div class="greenNotice">
+                <?=sprintf(_('devcp_notice_autodetected_addontype'), '<b>'.$autoDetected.'</b>')?>
+                 (<?=$html->link(_('devcp_question_addontype_incorrect'), 'javascript:void(0);', array('onClick' => 'showAddontypes();'))?>)
+                <div id="changeAddontype" style="display: none;">
+                   <?=_('devcp_change_addontype').'&nbsp;'.$html->selectTag('Addon/addontype_id', $allowedAddonTypes, $info['Addon']['addontype_id'], array('onChange' => 'changeAddontype(this, '.$info['Addon']['addontype_id'].');'), null, false)?>
+                </div>
+            </div>
+        <?php
+        }
+        ?>
+        <div id="developersForm">
+            <div>
+                <label for="AddonName"><?=_('devcp_form_label_name')?></label>
+                <?=$html->input('Addon/name', array('value'=>$info['Addon']['name'])).
+                   $html->tagErrorMsg('Addon/name', _('devcp_form_error_name_required'))?>
+            </div>
+            <div>
+                <label for="addLink"><?=_('devcp_form_label_authors')?></label>
+                <div id="authors" class="spaced">
+                <?php
+                    if (!empty($info['authors'])) {
+                        foreach ($info['authors'] as $id => $author) {
+                             echo '<div>'.$author.' ('.$html->link(_('devcp_form_author_remove'), 'javascript:void(0);', array('onClick' => 'removeAuthor(this);')).')';
+                             echo $html->hidden('User/User][', array('value' => $id)).'</div>';
+                        }
+                    }
+                    echo $html->tagErrorMsg('User/User', $errors['User/User']);
+                ?>
+                </div>
+            </div>
+            <div id="addAuthorRow" class="spaced">
+                 <?=$html->link(_('devcp_form_author_add'), 'javascript:void(0);', array('id' => 'addLink', 'onClick' => 'showAuthorForm();'))?>
+            </div>
+            <div id="newAuthorRow" style="display: none;">
+                <form>
+                <label for="AddonAuthor"><?=_('devcp_form_label_author_email')?></label>
+                <?=$html->input('Addon/Author', array('size' => 40, 'id' => 'newAuthor'))?>
+                <button type="submit" id="addButton" onClick="addAuthor('<?=$html->url('/developers/authorLookup/')?>');"><?=_('devcp_form_author_add')?></button>
+                </form>
+            </div>
+            <div>
+                <label for="TagTag"><?=_('devcp_form_label_categories')?></label>
+                <?=(!empty($tags) ? $html->selectTag('Tag/Tag', $tags['names'], $info['selectedTags'], array('multiple' => 'multiple', 'size' => 10, 'style' => 'float: left;', 'onChange' => 'updateTagDescription(this);'), null, false).
+                   $html->tagErrorMsg('Tag/Tag', $errors['Tag/Tag']) : $html->hidden('Tag/noTags', array('value' => 'true'))._('devcp_form_error_categories_unavailable'))?>
+                <div id="tagDescription"></div>
+                <div id="tagNext" style="display: none;"><?=_('devcp_form_categories_nextstep')?></div>
+            </div>
+            <div id="afterDescription">
+                <label for="AddonHomepage"><?=_('devcp_form_label_homepage')?></label>
+                <?=$html->input('Addon/homepage', array('size' => 40, 'value' => $info['Addon']['homepage'])).
+                   $html->tagErrorMsg('Addon/homepage', _('error_invalid_url'))?>
+            </div>		
+            <div>
+                <label for="AddonSupportemail"><?=_('devcp_form_label_supportemail')?></label>
+                <?=$html->input('Addon/supportemail', array('size' => 40, 'value' => $info['Addon']['supportemail'])).
+                   $html->tagErrorMsg('Addon/supportemail', _('error_email_invalid'))?>
+            </div>
+            <div>
+                <label for="AddonSupporturl"><?=_('devcp_form_label_supporturl')?></label>
+                <?=$html->input('Addon/supporturl', array('size' => 40, 'value' => $info['Addon']['supporturl'])).
+                   $html->tagErrorMsg('Addon/supporturl', _('error_invalid_url'))?>
+            </div>							
+            <div>
+                <label for="AddonSummary"><?=_('devcp_form_label_summary')?></label>
+                <?=$html->textarea('Addon/summary', array('value' => $info['Addon']['summary'], 'rows' => 3, 'cols' => 55, 'onBlur' => 'checkSummary(this, \''._('devcp_error_addon_field_summary_toolong').'\');')).
+                $html->tagErrorMsg('Addon/summary', _('devcp_form_error_summary_notempty'))?>
+            </div>
+            <div>
+                <label for="AddonDescription"><?=_('devcp_form_label_description')?></label>
+                <?=$html->textarea('Addon/description', array('value' => $info['Addon']['description'], 'rows' => 4, 'cols' => 55)).
+                    $html->tagErrorMsg('Addon/description', _('devcp_form_error_description_notempty'))?>
+            </div>
+            <div>
+            <div>
+                <label for="AddonEula"><?=_('devcp_form_label_eula')?></label>
+                <?=$html->textarea('Addon/eula', array('value' => $info['Addon']['eula'], 'rows' => 6, 'cols' => 55))?>
+            </div>
+            <div>
+                <label for="AddonPrivacypolicy"><?=_('devcp_form_label_privacy')?></label>
+                <?=$html->textarea('Addon/privacypolicy', array('value' => $info['Addon']['privacypolicy'], 'rows' => 6, 'cols' => 55))?>
+            </div>
+            <div>
+                <?=$html->checkbox('Addon/viewsource', null, $info['Addon']['viewsource'])?>
+                <label for="AddonViewsource" class="nofloat"><?=_('devcp_form_label_allow_viewsource')?></label>
+            </div>
+            <div>
+                <?=$html->checkbox('Addon/prerelease', null, $info['Addon']['prerelease'])?>
+                <label for="AddonPrerelease" class="nofloat"><?=_('devcp_form_label_prerelease')?></label>
+            </div>
+            <div>
+                <?=$html->checkbox('Addon/sitespecific', null, $info['Addon']['sitespecific'])?>
+                <label for="AddonSitespecific" class="nofloat"><?=_('devcp_form_label_sitespecific')?></label>
+            </div>
+            <div>
+                <?=$html->checkbox('Addon/externalsoftware', null, $info['Addon']['externalsoftware'])?>
+                <label for="AddonExternalsoftware" class="nofloat"><?=_('devcp_form_label_externalsoftware')?></label>
+            </div>
+            <div class="buttonBox">
+                <?=$html->submit(_('devcp_button_next').' &raquo;', array('escape' => false))?>
+                <?=$html->submit(_('devcp_button_cancel'), array('name' => 'cancel', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('devcp_button_cancel_confirm').'\');'))?>
+            </div>
+        </div> <!-- developersForm -->
+        </form>
+</div>
+</div>
+
+<script language="JavaScript" type="text/javascript">
+<?php
+    if (!empty($tags['descriptions'])) {
+        echo 'var tagDescriptions = {'.implode(',', $tags['descriptions']).'};';
+    }
+?>
+</script>
diff --git a/site/app/views/developers/add_step3.thtml b/site/app/views/developers/add_step3.thtml
new file mode 100644
index 0000000..aec591d
--- /dev/null
+++ b/site/app/views/developers/add_step3.thtml
@@ -0,0 +1,131 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        <h3><?=sprintf('%s &bull; %s', _('devcp_header_step3'), _('devcp_header_step3_versiondetails'))?></h3>
+
+        <?php
+        echo $html->formTag('/developers/add/'.$id);
+        echo $html->hidden('Addon/add_step3');
+        echo $html->hidden('Version/id', array('value' => $version));
+        echo $html->hidden('Addon/newAddon', array('value' => ($newAddon == true ? 'true' : 'false')));
+        if ($newAddon == false) {
+            echo '<div class="addonName">'.$existing['Translation']['name']['string'].'</div>';
+        }
+        if (!empty($errors['main'])) {
+            echo '<div class="error">'.$errors['main'].'</div>';
+        }
+        if ($defaultLocale != LANG) {
+            echo '<div class="notice"><strong>'._('error_notice').'</strong>: '.sprintf(_('devcp_notice_different_defaultlocale'), $nativeLanguages[$defaultLocale], $defaultLocale, $nativeLanguages[LANG], LANG).'</div>';
+        }
+        if (!empty($showFirefoxVersionNotice) && $showFirefoxVersionNotice == true) {
+            echo '<div class="notice">'.sprintf(_('devcp_additem_firefox_notice'), $this->controller->Config->getValue('firefox_notice_version'), $this->controller->Config->getValue('firefox_notice_url')).'</div>';
+        }
+
+        ?>
+        <div id="developersForm">
+            <div>
+                <label><?=_('devcp_form_label_version')?></label>
+                <?=$info['Version']['version']?>
+            </div>
+            <div>
+                <label><?=_('devcp_form_label_files')?></label>
+                <div class="spaced">
+                <?php
+                    foreach ($info['files'] as $file) {
+                        echo $file['File']['filename'].' ('.sprintf(_('size_kb'), $file['File']['size']).') - '.$platforms[$file['Platform']['id']].'<br>';
+                    }
+                ?>
+                </div>
+            </div>
+            <div>
+                <label><?=_('devcp_form_label_target_applications')?></label>
+                <div class="spaced">
+                <?php
+                    if (!empty($info['targetapps'])) {
+                        foreach ($info['targetapps'] as $app) {
+                            echo $app['translations']['localized_string'].' '.$app['min']['version'].' - '.$app['max']['version'].'<br>';
+                        }
+                    }
+                    else {
+                        echo _('devcp_form_no_target_apps');
+                    }
+                ?>
+                </div>
+            </div>
+            <div>
+                <label for="VersionReleasenotes"><?=_('devcp_form_label_versionnotes')?></label>
+                <?=$html->textarea('Version/releasenotes', array('rows' => 3, 'cols' => 55)).
+                   $html->tagErrorMsg('Addon/releasenotes', $errors['Version/releasenotes'])?>
+            </div>
+            <div>
+                <label for="VersionApprovalnotes"><?=_('devcp_form_reviewernotes')?></label>
+                <?=$html->textarea('Version/approvalnotes', array('rows' => 3, 'cols' => 55))?>
+            </div>
+            <?php
+                if (!empty($tags)) {
+            ?>
+                    <div>
+                        <label for="TagTag"><?=_('devcp_form_label_categories')?></label>
+                        <?=$html->selectTag('Tag/Tag', $tags['names'], null, array('multiple' => 'multiple', 'size' => 10, 'style' => 'float: left;'), null, false)?>
+                    </div>
+            <?php
+                }
+                if ($existing['Addon']['trusted'] == 1) {
+                    echo '<div>';
+                    echo _('devcp_form_trustedaddon_destination');
+            ?>
+                        <input type="radio" name="data[File][status]" id="FileStatusSandbox" value="sandbox" checked>
+                        <label for="FileStatusSandbox" class="normal"><?=_('devcp_form_trustedaddon_destination_sandbox')?></label>
+                        <input type="radio" name="data[File][status]" id="FileStatusPublic" value="public">
+                        <label for="FileStatusPublic" class="normal"><?=_('devcp_form_trustedaddon_destination_public')?></label>
+                    </div>
+            <?
+                }
+            ?>
+            <div id="afterDescription" class="buttonBox">
+                <?=$html->submit(_('devcp_button_next').' &raquo;', array('escape' => false))?>
+                <?=$html->submit(_('devcp_button_cancel'), array('name' => 'cancel', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('devcp_button_cancel_confirm').'\');'))?>
+            </div>
+        </div> <!-- developersForm -->
+        </form>
+    </div>
+</div>
diff --git a/site/app/views/developers/add_step4.thtml b/site/app/views/developers/add_step4.thtml
new file mode 100644
index 0000000..262af8a
--- /dev/null
+++ b/site/app/views/developers/add_step4.thtml
@@ -0,0 +1,66 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        <h3><?=sprintf('%s &bull; %s', _('devcp_header_step4'), _('devcp_header_step4_localization'))?></h3>
+
+        <?php
+        echo $html->formTag('/developers/add/'.$id);
+        echo $html->hidden('Addon/add_step4');
+        echo $html->hidden('Version/id', array('value' => $version));
+        echo $html->hidden('Addon/newAddon', array('value' => ($newAddon == true ? 'true' : 'false')));
+        if ($newAddon == false) {
+            echo '<div class="addonName">'.$existing['Translation']['name']['string'].'</div>';
+        }
+        if (!empty($errors['main'])) {
+            echo '<div class="error">'.$errors['main'].'</div>';
+        }
+        ?>
+        <div id="developersForm">
+            <?=$this->renderElement('developers/localebox')?>
+            <div class="buttonBox">
+                <?=$html->submit(_('devcp_button_next').' &raquo;', array('escape' => false))?>
+                <?=$html->submit(_('devcp_button_cancel'), array('name' => 'cancel', 'class' => 'cancel', 'onClick' => 'return confirm(\''._('devcp_button_cancel_confirm').'\');'))?>
+            </div>
+        </div> <!-- developersForm -->
+        </form>
+    </div>
+</div>
diff --git a/site/app/views/developers/add_step5.thtml b/site/app/views/developers/add_step5.thtml
new file mode 100644
index 0000000..4fbdf81
--- /dev/null
+++ b/site/app/views/developers/add_step5.thtml
@@ -0,0 +1,78 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/additem');?>
+    
+    <div id="content-main">
+        <h3><?=sprintf('%s &bull; %s', _('devcp_header_step5'), _('devcp_header_step5_success'))?></h3>
+        <?php
+        if ($newAddon == false) {
+            echo '<div class="addonName">'.$existing['Translation']['name']['string'].'</div>';
+        }
+        ?>
+        <p>
+        <?php
+            echo _('devcp_addon_submission_success');
+            echo '</p><p>';
+            if ($fileStatus == STATUS_PUBLIC) {
+                echo _('devcp_addon_submission_trusted_public');
+            }
+            elseif ($fileStatus == STATUS_PENDING) {
+                echo _('devcp_addon_submission_pending');
+            }
+            elseif ($fileStatus == STATUS_SANDBOX) {
+                echo sprintf(_('devcp_addon_submission_sandboxed'), $html->link(_('devcp_addon_submission_sandboxed_nominate_link'), '/developers/nominate/'.$id));
+            }
+            
+            echo ' '.sprintf(_('devcp_addon_submission_sandbox_readmore'), $html->link(_('devcp_addon_submission_sandbox_readmore_link'), '/pages/sandbox'));
+        
+            if (empty($existing['Preview'])) {
+                echo '</p><p>';
+                if ($existing['Addon']['addontype_id'] == ADDON_THEME) {
+                    echo sprintf(_('devcp_theme_upload_preview'), $html->link(_('devcp_theme_upload_preview_link'), '/previews/add/'.$id));
+                }
+                else {
+                    echo sprintf(_('devcp_addon_upload_preview'), $html->link(_('devcp_addon_upload_preview_link'), '/previews/add/'.$id));
+                }
+            }
+        ?>
+        </p>
+        <p><?=sprintf(_('devcp_addon_submission_makechanges'), $html->link(_('devcp_addon_submission_makechanges_link'), '/developers/edit/'.$id), $html->link(_('devcp_addon_submission_makechanges_devcp_link'), '/developers'))?></p>
+    </div>
+</div>
diff --git a/site/app/views/developers/addon_edit_authors.thtml b/site/app/views/developers/addon_edit_authors.thtml
index 86dda99..dcfb3f3 100644
--- a/site/app/views/developers/addon_edit_authors.thtml
+++ b/site/app/views/developers/addon_edit_authors.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -67,14 +66,13 @@
                 <tbody></tbody>
             </table>
             <div class="save-changes rounded">
-                <strong><?=___('devcp_notice_unsaved_changes')?></strong> <?=___('devcp_edit_authors_click_save')?>
+                <strong><?=___('devcp_notice_unsaved_changes')?></strong><?=___('devcp_edit_authors_click_save')?>
             </div>
             <div class="add-button-container"><a href="#add-author" onclick="addon_edit_authors.showAddForm();" class="add-button rounded"><?=___('devcp_edit_authors_add_author')?></a></div>
         </div>
         </form>
         
-        <div id="empty-authors" class="notice-error rounded" style="display:none"><span><?=___('devcp_error_empty_authors', 'Your add-on must have at least one owner.')?></span></div>
-        <div class="action-button-container centered"><a href="#" id="submit" onclick="addon_edit_authors.save(); return false;" class="action-button rounded"><?=___('devcp_edit_authors_update_author')?></a></div>
+        <div class="action-button-container centered"><a href="#" onclick="addon_edit_authors.save(); return false;" class="action-button rounded"><?=___('devcp_edit_authors_update_author')?></a></div>
         <br />
         
         <div id="add-author" class="graybox rounded spaced field" style="display: none;">
diff --git a/site/app/views/developers/addon_edit_categories.thtml b/site/app/views/developers/addon_edit_categories.thtml
index c34f6f9..d664d06 100644
--- a/site/app/views/developers/addon_edit_categories.thtml
+++ b/site/app/views/developers/addon_edit_categories.thtml
@@ -88,7 +88,7 @@
                         echo ___('devcp_edit_categories_does_not_fit');
                         echo '</label>';
                     }
-                    echo '</td><td id="edit-categories-descriptions'.$application_id.'" class="edit-categories-descriptions">'.___('devcp_edit_categories_hover').'</td></tr></table>';
+                    echo '</td><td id="edit-categories-descriptions'.$application_id.'" style="border-left: 1px solid #CCCCCC;">'.___('devcp_edit_categories_hover').'</td></tr></table>';
                 }
                 else {
                     echo '<p>'.___('devcp_edit_categories_none_available').'</p>';
diff --git a/site/app/views/developers/addon_edit_descriptions.thtml b/site/app/views/developers/addon_edit_descriptions.thtml
index 2dcbd2e..69ad01d 100644
--- a/site/app/views/developers/addon_edit_descriptions.thtml
+++ b/site/app/views/developers/addon_edit_descriptions.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -69,7 +68,7 @@
                             );
         
         // Summary
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'summary',
                     'translations' => $translations['summary'],
                     'height' => '60',
@@ -79,7 +78,7 @@
                 ));
         
         // Description
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'description',
                     'translations' => $translations['description'],
                     'displayName' => ___('devcp_edit_descriptions_transbox_description_name'),
@@ -87,7 +86,7 @@
                 ));
         
         // Developer Comments
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'developercomments',
                     'translations' => $translations['developercomments'],
                     'displayName' => ___('devcp_edit_descriptions_transbox_comments_name'),
@@ -95,7 +94,7 @@
                 ));
         
         // EULA
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'eula',
                     'translations' => $translations['eula'],
                     'height' => '200',
@@ -104,7 +103,7 @@
                 ));
         
         // Privacy Policy
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'privacypolicy',
                     'translations' => $translations['privacypolicy'],
                     'height' => '200',
diff --git a/site/app/views/developers/addon_edit_properties.thtml b/site/app/views/developers/addon_edit_properties.thtml
index 200a782..0d62a3c 100644
--- a/site/app/views/developers/addon_edit_properties.thtml
+++ b/site/app/views/developers/addon_edit_properties.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -71,7 +70,7 @@
                             );
         
         // Name
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'name',
                     'translations' => $translations['name'],
                     'type' => 'textbox',
@@ -128,7 +127,7 @@
         
         <?php
         // Homepage
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'homepage',
                     'translations' => $translations['homepage'],
                     'type' => 'textbox',
@@ -137,7 +136,7 @@
                 ));
         
         // Support Email
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'supportemail',
                     'translations' => $translations['supportemail'],
                     'type' => 'textbox',
@@ -146,7 +145,7 @@
                 ));
         
         // Support URL
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'supporturl',
                     'translations' => $translations['supporturl'],
                     'type' => 'textbox',
diff --git a/site/app/views/developers/addon_status.thtml b/site/app/views/developers/addon_status.thtml
index 5858a28..baa8209 100644
--- a/site/app/views/developers/addon_status.thtml
+++ b/site/app/views/developers/addon_status.thtml
@@ -118,12 +118,12 @@
                 echo '<h5>'.___('devcp_addon_status_header_nomination').'</h5>';
                 echo '<ul class="criteria">';
                 echo '<li class="'.($criteria['previews'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_preview').'</li>';
+                echo '<li class="'.($criteria['reviews'] ? 'pass' : 'meh').'">'.___('devcp_addon_status_criteria_review').'</li>';
                 echo '<li class="'.($criteria['prerelease'] ? 'pass' : 'fail').'">'.___('devcp_addon_status_criteria_prerelease').'</li>';
                 echo '</ul>';
                 
                 if ((!in_array($addon['Addon']['addontype_id'], array(ADDON_EXTENSION, ADDON_THEME)) || $criteria['previews']) && $criteria['prerelease']) {
                     $nominationEnabled = true;
-                    echo '<p>'.___('devcp_addon_status_nominate_enabled').'</p>';
                 }
                 else {
                     echo '<p>'.___('devcp_addon_status_nominate_disabled').'</p>';
@@ -137,6 +137,7 @@
                 $actions .= '<td class="description">'.___('devcp_addon_status_action_complete_description').'</td></tr>';
             }
             if ($addon['Addon']['status'] == STATUS_SANDBOX && $nominationEnabled === true) {
+                echo '<p>'.___('devcp_addon_status_nominate_enabled').'</p>';
                 $actions .= '<tr><td class="action"><a href="'.$html->url("/developers/addon/status/{$addon_id}/nominate").'" class="nominate add-button rounded">'.___('devcp_addon_status_action_nominate').'</a></td>';
                 $actions .= '<td class="description">'.___('devcp_addon_status_action_nominate_description').'</td></tr>';
             }
diff --git a/site/app/views/developers/author_lookup.thtml b/site/app/views/developers/author_lookup.thtml
new file mode 100644
index 0000000..ee4ab11
--- /dev/null
+++ b/site/app/views/developers/author_lookup.thtml
@@ -0,0 +1,48 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<?php
+    if ($author === false) {
+        echo '<strong>'.sprintf(_('devcp_author_lookup_none_found'), $email).'</strong>';
+    }
+    else {
+        echo $author.' ('.$html->link(_('devcp_author_lookup_remove'), 'javascript:void(0);', array('onClick' => 'removeAuthor(this);')).')';
+        //the User/id][ is intentional in order to get cake to let us have an array
+        echo $html->hidden('User/User][', array('value' => $id));
+    }
+?>
diff --git a/site/app/views/developers/details.thtml b/site/app/views/developers/details.thtml
new file mode 100644
index 0000000..b986a6c
--- /dev/null
+++ b/site/app/views/developers/details.thtml
@@ -0,0 +1,164 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+$addonIconPath = $this->controller->Image->getAddonIconURL($addon['Addon']['id']);
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+<?php
+if (!empty($addon)) {
+        $users = array();
+        if (count($addon['User']) > 0) {
+            foreach($addon['User'] as $user) {
+                $users[] = $html->link($user['firstname'].' '.$user['lastname'], '/user/'.$user['id']);
+            }
+        }
+?>
+    <div class="addon-details">
+        <?=$this->renderElement('developers/actionbar', array(
+                        'addon_id' => $addon['Addon']['id'],
+                        'disabled' => $addon['Addon']['inactive'],
+                        'showNominateLink' => ($addon['Addon']['status'] == STATUS_SANDBOX ? true : false)
+        ));?>
+        
+        <h3><img src="<?=$addonIconPath?>"> <?=$addon['Translation']['name']['string']?></h3>
+        
+        <h4><?=_('devcp_details_header_details')?></h4>
+        <ul class="mainlist">
+            <li><?=$addontypes[$addon['Addon']['addontype_id']].'; '.$approval[$addon['Addon']['status']].
+            (!empty($addon['Addon']['trusted']) ? '; '._('devcp_details_trusted') : '').
+            (!empty($addon['Addon']['inactive']) ? '; '._('devcp_details_disabled') : '')?></li>
+            <li><?=(count($users) == 1 ? _('devcp_details_author') : _('devcp_details_authors')).': '.(!empty($users) ? implode(', ', $users) : _('devcp_details_authors_none'))?></li>
+            <li><?=_('devcp_details_guid').': '.$addon['Addon']['guid']?></li>
+            <li><?=_('devcp_details_homepage').': '.(!empty($addon['Translation']['homepage']['string']) ? $html->link($addon['Translation']['homepage']['string']) : _('devcp_details_homepage_none'))?></li>
+            <li><?=_('devcp_details_supportemail').': '.(!empty($addon['Translation']['supportemail']['string']) ? $link->email($addon['Translation']['supportemail']['string']) : _('devcp_details_supportemail_none'))?></li>
+            <li><?=_('devcp_details_supporturl').': '.(!empty($addon['Translation']['supporturl']['string']) ? $html->link($addon['Translation']['supporturl']['string']) : _('devcp_details_supporturl_none'))?></li>						
+            <li><?=(count($addon['Tags']) == 1 ? _('devcp_details_category') : _('devcp_details_categories')).': '.(!empty($addon['Tags']) ? implode(', ', $addon['Tags']) : 'None')?></li>
+            <li><?=_('devcp_details_description').': '?>
+                <blockquote><?=nl2br($addon['Translation']['description']['string'])?></blockquote>                            
+            </li>
+        </ul>                    
+
+        <h4><?=_('devcp_details_header_versions')?></h4>
+        <?php
+            if (count($addon['Version']) > 0) {
+                echo '<ul class="mainlist">';
+                foreach ($addon['Version'] as $version) {
+                    echo '<li><strong>'.$html->link(sprintf(_('devcp_details_version'), $version['version']), '/developers/editversion/'.$version['id']).'</strong> - '.$this->controller->Amo->LEGACY_describeVersionStatus($version['File']).'</li>';
+                    if (count($version['File']) > 0) {
+                        echo '<ul>';
+                        foreach ($version['File'] as $file) {
+                            echo '<li>';
+                                echo sprintf('%s (%s KB) - %s', $file['File']['filename'], $file['File']['size'], $platforms[$file['File']['platform_id']]);
+                            echo '</li>';
+                        }
+                        echo '</ul>';
+                    }
+                }
+                echo '</ul>';
+            }
+            else {
+                echo _('devcp_details_versions_none_found');
+            }
+        ?>
+
+        <h4><?=_('devcp_details_header_previews')?></h4>
+        <?php
+            if (count($addon['Preview']) > 0) {
+                for ($i = 0; $i < count($addon['Preview']); $i++) {
+                    echo '<div class="preview-entry">';
+                    $caption = $addon['Preview'][$i]['Translation']['caption']['string'];
+                    if (empty($caption)) { 
+                        $caption = '<i>'._('devcp_details_preview_nocaption').'</i>';
+                    }
+                    echo $caption . '<br>';
+                    $previewUrl = $this->controller->Image->getPreviewURL($addon['Preview'][$i]['Preview']['id']);
+                    echo $html->link('<img src="'.$previewUrl.'" border=0>', '/previews/edit/'.$addon['Preview'][$i]['Preview']['id'], array(), false, false);
+                    echo '</div>';
+                }
+            } else {
+                echo _('devcp_details_previews_nonefound').' ';
+            }
+
+            echo $html->link(_('devcp_details_addpreview_link'), '/previews/add/'.$addon['Addon']['id']);
+        
+            echo $html->formTag('/developers/details/'.$addon['Addon']['id']);
+        ?>
+
+        <h4><?=_('devcp_details_header_devcomments')?></h4>
+        <div id="translationBox">
+            <div id="locale-box">
+            <?php
+                foreach ($localebox['languages'] as $locale => $language) {
+                    echo '<span onClick="showLocale(\''.str_replace('-', '_', $locale).'\', this);" title="'.$language.'"'.
+                         (($locale == $localebox['defaultLocale']) ? 'id="defaultLocaleSpan" class="selected"' : '').'>'.$locale.'</span>';
+                }
+            ?>
+            </div>
+
+            <?php
+                foreach ($localebox['languages'] as $locale => $language) {
+                    $localeClass = str_replace('-', '_', $locale);
+            ?>
+                    <div id="locale_<?=$localeClass?>" <?=($locale != $localebox['defaultLocale']) ? 'style="display: none;"' : ''?>>
+                        <input type="hidden" name="data[Locales][]" value="<?=$locale?>">
+                        <h5 style="clear:both;"><?=$language.' ['.$locale.']'?></h5>
+                        <?=$html->textarea('Addon/developercomments][', array('value' => (!empty($localebox['info'][$locale]['developercomments']) ? $localebox['info'][$locale]['developercomments'] : ''), 'rows' => 4, 'cols' => 70))?>
+                    </div>
+            <?php
+                }
+            ?>
+            </div>
+        </div>
+        <div class="buttonBox">
+            <?=$html->submit(_('devcp_details_submit_update'))?>
+        </div>
+        </form>         
+    </div>
+<?php
+}
+?>
+    </div>
+</div>
+
+<script language="JavaScript" style="text/javascript">
+    var previousLocale = '<?=str_replace('-', '_', $localebox['defaultLocale'])?>';
+    var previousSpan = document.getElementById('defaultLocaleSpan');
+</script>
diff --git a/site/app/views/developers/disable.thtml b/site/app/views/developers/disable.thtml
new file mode 100644
index 0000000..f77377d
--- /dev/null
+++ b/site/app/views/developers/disable.thtml
@@ -0,0 +1,65 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/e
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Scott <fligtar@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+<?php
+echo $html->formTag('/developers/disable/'.$addon['Addon']['id'], 'post');
+
+if ($addon['Addon']['inactive'] == 1) {
+?>
+    <h3><?=sprintf(_('devcp_disable_enable_title'), $addon['Translation']['name']['string'])?></h3>
+    <p><?=_('devcp_disable_enable_description')?></p>
+    
+    <p><?=_('devcp_disable_enable_confirm')?></p>
+    
+    <input type="submit" name="enable" value="<?=_('devcp_disable_enable_button')?>">
+<?php } else { ?>
+    <h3><?=sprintf(_('devcp_disable_disable_title'), $addon['Translation']['name']['string'])?></h3>
+    <p><?=_('devcp_disable_disable_description')?></p>
+    
+    <p><?=_('devcp_disable_disable_confirm')?></p>
+    
+    <input type="submit" name="disable" value="<?=_('devcp_disable_disable_button')?>">
+<?php
+}
+?>
+    <p><?=$html->link(_('devcp_disable_cancel'), '/developers/details/'.$addon['Addon']['id'])?></p>
+</form>
diff --git a/site/app/views/developers/edit.thtml b/site/app/views/developers/edit.thtml
new file mode 100644
index 0000000..4f71333
--- /dev/null
+++ b/site/app/views/developers/edit.thtml
@@ -0,0 +1,164 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/e
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+
+<?php
+echo $html->formTag('/developers/edit/'.$addon['Addon']['id'], 'post', array('enctype'=>'multipart/form-data'));
+?>
+<h3>Edit <?=$addon['Translation']['name']['string']?></h3>
+<?=!empty($errors['main']) ? '<div class="error">'.$errors['main'].'</div>' : ''?>
+<div id="developersForm">
+    <div>
+        <label for="addLink"><?=_('devcp_edit_header_authors')?></label>
+        <div id="authors" class="spaced">
+        <?php
+            if (!empty($addon['authors'])) {
+                foreach ($addon['authors'] as $id => $author) {
+                     echo '<div>'.$author.' ('.$html->link(_('devcp_edit_author_remove'), 'javascript:void(0);', array('onClick' => 'removeAuthor(this);')).')';
+                     echo $html->hidden('User/User][', array('value' => $id)).'</div>';
+                }
+            }
+            echo $html->tagErrorMsg('User/User', $errors['User/User']);
+        ?>
+        </div>
+    </div>
+    <div id="addAuthorRow" class="spaced">
+         <?=$html->link(_('devcp_edit_author_add'), 'javascript:void(0);', array('id' => 'addLink', 'onClick' => 'showAuthorForm();'))?>
+    </div>
+    <div id="newAuthorRow" style="display: none; clear: both;">
+        <form>
+        <label for="AddonAuthor"><?=_('devcp_edit_author_email')?></label>
+        <?=$html->input('Addon/Author', array('size' => 40, 'id' => 'newAuthor'))?>
+        <button type="submit" id="addButton" onClick="addAuthor('<?=$html->url('/developers/authorLookup/')?>');return false;"><?=_('devcp_edit_author_add')?></button>
+        </form>
+    </div>
+    <div>
+        <label for="TagTag"><?=_('devcp_edit_label_categories')?></label>
+        <?=(!empty($tags) ? $html->selectTag('Tag/Tag', $tags['names'], $selectedTags, array('multiple' => 'multiple', 'size' => 10, 'style' => 'float: left;', 'onChange' => 'updateTagDescription(this);'), null, false).
+           $html->tagErrorMsg('Tag/Tag', $errors['Tag/Tag']) : $html->hidden('Tag/noTags', array('value' => 'true'))._('devcp_edit_error_categories_unavailable'))?>
+        <div id="tagDescription"></div>
+    </div>
+    <div id="afterDescription">
+        <label for="AddonDefaultlocale"><?=_('devcp_edit_label_defaultlocale')?></label>
+        <select id="AddonDefaultlocale" name="data[Addon][defaultlocale]">
+        <?php
+        foreach ($localebox['languages'] as $key => $language) {
+            echo '<option value="'.$key.'" '.($key == $localebox['defaultLocale'] ? 'selected' : '').'>'
+                .html_entity_decode($language).'</option>';
+        }
+        ?>
+        </select>
+    </div>
+    <div id="iconDiv">
+        <label><?=_('devcp_edit_label_info')?></label>
+        <?php
+        if (!empty($addon['Addon']['icontype'])) {
+            echo '<img src="'.$this->controller->Image->getAddonIconURL($addon['Addon']['id']).'">';
+            echo $html->link(_('devcp_edit_icon_change_link'), 'javascript:void(0);', array('onClick' => 'addIcon(\'edit\');', 'id' => 'iconLink'));
+        }
+        else {
+            echo $html->link(_('devcp_edit_icon_add_link'), 'javascript:void(0);', array('onClick' => 'addIcon(\'new\');', 'id' => 'iconLink'));
+        }
+        ?>
+    </div>
+    <div id="newIcon" style="display: none;">
+        <label><?=_('devcp_edit_label_icon_new')?></label>
+        <?=$html->file('Addon/icon').$html->tagErrorMsg('Addon/icon', $errors['Addon/icon'])?>
+    </div>
+    <div id="deleteIcon" class="spaced" style="display: none;">
+        <?=$html->checkbox('Addon/DeleteIcon', array('class' => 'vmiddle'))?>
+        <label for="AddonDeleteIcon" class="nofloat">
+        <?=_('devcp_edit_label_icon_delete')?></label>
+    </div>
+    <?php
+    if (!empty($errors['Addon/icon'])) {
+        echo '<div class="error_message">'.$errors['Addon/icon'].'</div>';
+    }
+    ?>
+    <?php if (in_array($addon['Addon']['addontype_id'], array(ADDON_DICT, ADDON_LPAPP))): ?>
+    <div>
+        <label for="AddonTargetLocale"><?=_('devcp_edit_label_target_locale')?></label>
+        <?=$html->input('Addon/target_locale', array('value'=>$html->unsanitize($addon['Addon']['target_locale'])))?>
+        <?=_('devcp_edit_target_locale_explanation')?>
+    </div>
+    <div>
+        <label for="AddonLocaleDisambiguation"><?=_('devcp_edit_label_locale_disambiguation')?></label>
+        <?=$html->input('Addon/locale_disambiguation', array('value'=>$html->unsanitize($addon['Addon']['locale_disambiguation'])))?>
+        <?=_('devcp_edit_locale_disambiguation_explanation')?>
+    </div>
+    <?php endif; ?>
+    <div>
+        <?=$html->checkbox('Addon/viewsource', null, $addon['Addon']['viewsource'])?>
+        <label for="AddonViewsource" class="nofloat"><?=_('devcp_edit_label_allow_viewsource')?></label>
+    </div>
+    <div>
+        <?=$html->checkbox('Addon/prerelease', null, $addon['Addon']['prerelease'])?>
+        <label for="AddonPrerelease" class="nofloat"><?=_('devcp_edit_label_prerelease')?></label>
+    </div>
+    <div>
+        <?=$html->checkbox('Addon/sitespecific', null, $addon['Addon']['sitespecific'])?>
+        <label for="AddonSitespecific" class="nofloat"><?=_('devcp_edit_label_sitespecific')?></label>
+    </div>
+    <div>
+        <?=$html->checkbox('Addon/externalsoftware', null, $addon['Addon']['externalsoftware'])?>
+        <label for="AddonExternalsoftware" class="nofloat"><?=_('devcp_edit_label_externalsoftware')?></label>
+    </div>
+    <?php if ($this->controller->SimpleAcl->actionAllowed('*', '*', $this->controller->Session->read('User'))): ?>
+    <div>
+        <?=$html->checkbox('Addon/trusted', null, $addon['Addon']['trusted'])?>
+        <label for="AddonTrusted" class="nofloat">This add-on is trusted [ADMIN]</label>
+    </div>
+    <?php endif; ?>
+    <?=$this->renderElement('developers/localebox')?>
+    <div class="buttonBox">
+    <?=$html->submit(_('devcp_edit_submit_update'), array('name' => 'update'));?>
+    </div>
+</div> <!-- developersForm -->
+</form>
+</div> <!-- corner-box -->
+<script language="JavaScript" type="text/javascript">
+<?php
+    if (!empty($tags['descriptions'])) {
+        echo 'var tagDescriptions = {'.html_entity_decode(implode(',', $tags['descriptions'])).'};';
+    }
+?>
+</script>
diff --git a/site/app/views/developers/editversion.thtml b/site/app/views/developers/editversion.thtml
new file mode 100644
index 0000000..4d3530e
--- /dev/null
+++ b/site/app/views/developers/editversion.thtml
@@ -0,0 +1,127 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/e
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+    
+        <?=$html->formTag('/developers/editversion/'.$version['Version']['id'])?>
+        <h3>Edit <?=$addon['Translation']['name']['string'].' '.$version['Version']['version']?></h3>
+        <div id="developersForm">
+            <div>
+                <label><?=_('devcp_editversion_label_files')?></label>
+                <div class="spaced">
+                <?php
+                if (!empty($version['File'])) {
+                    echo '<table id="fileList">';
+                    foreach ($version['File'] as $file) {
+                        echo '<tr>';
+                        echo $html->hidden('File/id][', array('value' => $file['id']));
+                        echo '<td><input type="checkbox" name="data[File][Delete][]" value="1" id="FileId'.$file['id'].'" class="vmiddle" onClick="return confirmDelete(this);"></td>';
+                        echo '<td><label class="nofloat" for="FileId'.$file['id'].'">';
+                        echo sprintf(_('devcp_editversion_filename_size'), $file['filename'], sprintf(_('size_kb'), $file['size']));
+                        echo '</label></td>';
+                        echo '<td class="separator">-</td>';
+                        echo '<td>';
+                        echo $html->selectTag('File/platform_id][', $platforms, $file['platform_id'], null, null, false);
+                        echo '</td></tr>';
+                    }
+                    echo '</table>';
+                    echo '<i>'._('devcp_editversion_checkedfiles_delete').'</i>';
+                }
+                else {
+                    echo '<i>'._('devcp_editversion_nofiles').'</i>';
+                }
+                ?>
+                </div>
+            </div>
+            <div>
+                <label><?=_('devcp_editversion_label_targetapps')?></label>
+                <div class="spaced">
+                    <table id="targetApps">
+                <?php
+                    foreach ($version['targetapps'] as $app) {
+                        echo '<tr>';
+                        echo $html->hidden('targetApps/id][', array('value' => $app['applications']['id']));
+                        echo '<td>';
+                        if ($app['applications']['supported'] == 1) {
+                            echo $html->image('developers/'.strtolower($app['translations']['localized_string']).'.png');
+                        }
+                        else {
+                            echo '&nbsp;';
+                        }
+                        echo '</td>';
+                        echo "<td>{$app['translations']['localized_string']}</td>";
+                        echo '<td><select name="data[targetApps][minVersion][]">';
+                        foreach ($app['appversions'] as $appVersion) {
+                            echo '<option value="'.$appVersion['Appversion']['id'].'"';
+                            if ($appVersion['Appversion']['id'] == $app['min']['id']) {
+                                echo ' selected';
+                            }
+                            echo '>'.$appVersion['Appversion']['version'].'</option>';
+                        }
+                        echo '</select></td>';
+                        echo '<td class="separator">-</td>';
+                        echo '<td><select name="data[targetApps][maxVersion][]">';
+                        foreach ($app['appversions'] as $appVersion) {
+                            echo '<option value="'.$appVersion['Appversion']['id'].'"';
+                            if ($appVersion['Appversion']['id'] == $app['max']['id']) {
+                                echo ' selected';
+                            }
+                            echo '>'.$appVersion['Appversion']['version'].'</option>';
+                        }
+                        echo '</select></td>';
+                        echo '</tr>';
+                    }
+                ?>
+                    </table>
+                </div>
+            </div>
+            <div>
+                <label for="VersionApprovalnotes"><?=_('devcp_editversion_reviewernotes')?></label>
+                <?=$html->textarea('Version/approvalnotes', array('rows' => 3, 'cols' => 55, 'value' => $version['Version']['approvalnotes']))?>
+            </div>
+            <?=$this->renderElement('developers/localebox')?>
+            <div class="buttonBox">
+                <?=$html->submit(_('devcp_editversion_submit_update'))?>
+            </div>
+        </div> <!-- developersForm -->
+        </form>
+    </div>
+</div>
diff --git a/site/app/views/developers/index.thtml b/site/app/views/developers/index.thtml
new file mode 100644
index 0000000..0cdab59
--- /dev/null
+++ b/site/app/views/developers/index.thtml
@@ -0,0 +1,107 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+        <?php if (LANG == 'en-US'): ?>
+    <div class="graybox rounded spaced"><h4>Try out our new Developer Tools!</h4><p>We're giving the Developer Tools area a new look soon and are interested in hearing what you think about our upcoming changes. Give the new tools a try and <a href="<?=SITE_DEVELOPER_WIKI?>">let us know</a> if you have any problems or suggestions.</p>
+        <div class="action-button-container" style="text-align: right;"><a href="<?=$html->url('/developers/dashboard')?>" class="action-button rounded">Use New Tools</a></div>
+</div>
+        <?php endif; ?>
+        <h3><?=_('devcp_index_header_myaddons')?></h3>
+        
+        <div id="summary">
+        <?php
+        if (!empty($data['Addon'])) {
+            foreach ($data['Addon'] as $addon) {
+                $addonIconPath = $this->controller->Image->getAddonIconURL($addon['id']);
+                if (empty($addonIconPath))
+                    $addonIconPath = ($addon['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON));
+        ?>
+            <div class="addon sub<?=($addon['inactive'] == 1 || $addon['Addon']['status'] == STATUS_DISABLED) ? ' disabled' : ''?>">
+            <div class="addon-container">
+            <?php if ($addon['Addon']['status'] != STATUS_DISABLED): ?>
+                <?=$this->renderElement('developers/actionbar', array(
+                                'addon_id' => $addon['id'],
+                                'revamp' => false,
+                                'disabled' => $addon['inactive']
+                ));?>
+            
+                <h4>
+                <?php
+                    echo '<a href="'.$html->url('/developers/details/'.$addon['id']).'">';
+                    echo '<img src="'.$addonIconPath.'">';
+                    echo $addon['Translation']['name']['string'];
+                    echo '</a>';
+                    echo ' ('.$addontypes[$addon['addontype_id']].'; '.$approval[$addon['Addon']['status']];
+                    echo (!empty($addon['Addon']['trusted']) ? '; '._('devcp_summary_header_trusted') : '');
+                    echo (!empty($addon['Addon']['inactive']) ? '; '._('devcp_summary_header_disabled') : '').')';
+                ?>
+                </h4>
+                <p><?=$addon['Translation']['summary']['string']?></p>
+                <?php
+                    $latestVersion = !empty($addon['Version'][0]) ? $addon['Version'][0] : 0;         
+                    if (!empty($latestVersion)) {                        
+                        echo _('devcp_summary_lastversion').' '.$html->link($latestVersion['version'], '/developers/editversion/'.$latestVersion['id']).' ('.$this->controller->Amo->LEGACY_describeVersionStatus($latestVersion['File']).')<br><br>';
+                    }
+                    echo $this->renderElement('developers/statsbar', array('addon' => $addon));
+                ?>
+            <?php else: ?>
+                <h4>
+                    <?='<u>'.$addon['Translation']['name']['string'].
+                      '</u> ('.$addontypes[$addon['addontype_id']].'; '.$approval[$addon['Addon']['status']].')'?>
+                </h4>
+                <?=_('devcp_summary_admin_disabled')?>
+            <?php endif; ?>
+            </div>
+                <div class="vex"><span><!-- bottom edge --></span></div>
+            </div>
+        <?php
+            }
+        }
+        else {
+            echo '<br>';
+            echo sprintf(_('devcp_summary_noaddons_submit_one'),
+                 $html->link(_('devcp_summary_noaddons_submit_one_link'), '/developers/add'));
+        }
+        ?>
+        </div>
+    </div> <!-- content-main -->
+</div> <!-- content -->
diff --git a/site/app/views/developers/nominate.thtml b/site/app/views/developers/nominate.thtml
new file mode 100644
index 0000000..8461517
--- /dev/null
+++ b/site/app/views/developers/nominate.thtml
@@ -0,0 +1,58 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * Justin Scott <fligtar@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<div id="content">
+    <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
+    
+    <div id="content-main">
+        
+        <h3><?=$addon['Translation']['name']['string']?></h3>
+        
+        <?=$localization->includeLocalPage('nomination', array($html->url('/pages/policy')))?>
+        
+        <div class="buttonBox" id="agreementButtons">
+        <?php
+        echo $html->formTag('/developers/nominate/'.$addon['Addon']['id']);
+        echo $html->textarea('Addon/nominationmessage', array('value' => $addon['Addon']['nominationmessage'], 'cols' => '70', 'rows' => '5')).'<br>';
+        echo $html->submit(sprintf(_('devcp_nominate_submit_nominate'), $addon['Translation']['name']['string']), array('name' => 'nominate')).'<br>';
+        echo $html->link(_('devcp_nominate_link_returnto_details'), '/developers/details/'.$addon['Addon']['id']);
+        ?>
+        </form>
+        </div>
+    </div>
+</div>
diff --git a/site/app/views/developers/previews.thtml b/site/app/views/developers/previews.thtml
index e229be3..2cbdccf 100644
--- a/site/app/views/developers/previews.thtml
+++ b/site/app/views/developers/previews.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -71,15 +70,16 @@
                                 'loaded' => false
                             );
             
-            foreach ($previews as &$preview) {
+            foreach ($previews as $preview) {
             ?>
                 <div class="preview-box graybox rounded spaced field">
                 <table style="width: 100%;"><tr><td style="width: 200px; text-align: center; vertical-align: top;">
                 <img src="<?=$this->controller->Image->getPreviewURL($preview['Preview']['id'])?>/0" alt="<?=___('devcp_previews_thumbnail')?>" />
                 </td><td style="vertical-align: top;">
                 <h5 style="margin-top: 0; margin-bottom: 2px;"><?=___('devcp_previews_header_caption')?></h5>
+                <div class="translation-box">
                 <?php
-                echo $this->renderElement('translationbox', array(
+                echo $this->renderElement('developers/translationbox', array(
                     'field' => 'caption',
                     'id' => $preview['Preview']['id'],
                     'translations' => !empty($translations[$preview['Preview']['id']]['caption']) ? $translations[$preview['Preview']['id']]['caption'] : array(),
@@ -87,11 +87,12 @@
                     'graybox' => false
                 ));
                 ?>
+                </div>
                 
                 <table style="width: 100%; padding-top: 10px;"><tr><td>
                 <label><input type="radio" name="data[Preview][highlight]" value="<?=$preview['Preview']['id']?>" style="vertical-align: top;"<?=($preview['Preview']['highlight'] == 1 ? ' checked="checked"' : '')?>/>
                 <?=___('devcp_previews_label_default')?></label>
-                </td><td class="preview-buttons">
+                </td><td style="text-align: right;">
                 <a href="#" onclick="previews.showReplaceBox(this); return false;" class="edit-button rounded"><?=___('devcp_previews_a_replace')?></a>&nbsp;
                 <a href="#" onclick="previews.deletePreview(this); return false;" class="remove-button rounded"><?=___('devcp_previews_a_delete')?></a>
                 </td></tr></table>
@@ -118,7 +119,7 @@
                 <label class="new-preview"><?=___('devcp_previews_label_upload')?><input type="file" name="data[Preview][New][]" size="40" /></label>
             </div>
             <div class="add-button-container"><a href="#" onclick="previews.addUploadBox(); return false;" class="add-button rounded"><?=___('devcp_previews_a_another')?></a></div>
-            <div class="preview-add-button-description"><?=___('devcp_previews_click_below')?></div>
+            <div style="text-align: right;"><?=___('devcp_previews_click_below')?></div>
         </div>
         
         <div class="add-button-container" style="<?=(empty($previews) ? 'display: none;' : '')?>"><a href="#add-preview-box" onclick="previews.showAddBox(this);" class="add-button rounded"><?=___('devcp_previews_add_new')?></a></div>
@@ -126,4 +127,4 @@
         <div class="action-button-container centered"><a href="#" onclick="previews.save(); return false;" class="action-button rounded"><?=___('devcp_previews_a_update')?></a></div>
         </form>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/site/app/views/developers/uploader.thtml b/site/app/views/developers/uploader.thtml
index ec1976f..d363bfd 100644
--- a/site/app/views/developers/uploader.thtml
+++ b/site/app/views/developers/uploader.thtml
@@ -67,53 +67,19 @@
             <?=___('devcp_uploader_how')?>
             <div style="text-align: center;"><a href="#" onclick="upload.showAgreement(); return false;" class="action-button rounded"><?=___('devcp_uploader_a_start')?></a></div>
         </div> <!-- /#step-intro -->
-    <?php endif; ?>
-    <?php $showAgreement = ($type == 'new' || !$hasAgreement); ?>
-    <?php if ($showAgreement): ?>
-        <div id="step-agreement" <?=($type != 'new' ? 'style="display:block"' : '')?>>
+        <div id="step-agreement">
             <p><?=_('devcp_review_agreement_please')?></p>
-            <?=$localization->includeLocalPage('developer_agreement',array($html->url('/pages/developer_faq')))?>
-
-            <?php
-            list($licenses, $trans) = $this->controller->Developers->getLicenses();
-            echo $this->renderElement('developers/license_picker',
-                                      array('licenses' => $licenses));
-            ?>
-            <input type="button" value="<?=___('devcp_uploader_button_agree')?>"
-                id="accept-agreement" disabled="true" onclick="upload.acceptAgreement()"/>
-            <?php
-            // Retrieve language arrays from bootstrap.
-            global $valid_languages, $native_languages;
-            foreach (array_keys($valid_languages) as $key) {
-                $languages[$key] = $native_languages[$key]['native'];
-            }
-            ksort($languages);
-
-            $this->translationBox = array(
-                                'defaultLocale' => LANG,
-                                'languages' => $languages,
-                                'table' => 'License',
-                                'loaded' => false
-                            );
-            echo $this->renderElement('developers/license_translationbox',
-                                      array('translations' => $trans,
-                                            'fieldname' => 'text'));
-            ?>
-            <script type="text/javascript">
-            $(document).ready(function($){
-                $('#license-name').change(function() {
-                    if ($('#license-name').val() == 'null')
-                        $('#accept-agreement').attr('disabled', 'true');
-                    else
-                        $('#accept-agreement').removeAttr('disabled');
-                });
-                $('#license-name').change();
-            });
-            </script>
+            <div class="agreement-text rounded">
+                <?=$localization->includeLocalPage('developer_agreement')?>
+                <div class="agreement-buttons">
+                    <input type="button" value="<?=_('devcp_submit_decline_dev_agreement')?>" onclick="upload.hideAgreement();" />
+                    <input type="button" value="<?=_('devcp_submit_accept_dev_agreement')?>" onclick="upload.acceptAgreement();"/>
+                </div>
+            </div>
         </div> <!-- /#step-agreement -->
     <?php endif; ?>
-
-        <div id="file-upload"<?=($showAgreement ? ' style="display: none;"' : '')?>>
+    
+        <div id="file-upload"<?=($type == 'new' ? ' style="display: none;"' : '')?>>
             <h3><?=___('devcp_uploader_header_upload')?></h3>
             <p><?=___('devcp_uploader_p_upload')?>
             <br />
diff --git a/site/app/views/developers/versions.thtml b/site/app/views/developers/versions.thtml
index d3bed4a..323ba34 100644
--- a/site/app/views/developers/versions.thtml
+++ b/site/app/views/developers/versions.thtml
@@ -65,7 +65,7 @@
                         echo '<td><a href="'.$html->url('/developers/versions/edit/'.$version['Version']['id']).'">'.sprintf(_('devcp_details_version'), $version['Version']['version']).'</a></td>';
                         echo '<td>'.$this->controller->Amo->describeVersionStatus($version['File']).'</td>';
                         echo '<td>'.strftime(_('date'), strtotime($version['Version']['created'])).'</td>';
-                        echo '<td class="delete-area version-delete-area">';
+                        echo '<td class="delete-area" style="text-align: right;">';
                         if (empty($version['File'])) {
                             echo '<div class="inline-delete-button uses-button">';
                             echo '<a href="#" onclick="versions.deleteVersion(this); return false;" class="remove-button rounded trigger">'.___('devcp_versions_a_remove').'</a>';
diff --git a/site/app/views/developers/versions_edit.thtml b/site/app/views/developers/versions_edit.thtml
index 55e8517..40b0578 100644
--- a/site/app/views/developers/versions_edit.thtml
+++ b/site/app/views/developers/versions_edit.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *      Justin Scott <fligtar@mozilla.com> (Original Author)
- *      Frederic Wenzel <fwenzel@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -174,9 +173,9 @@
             echo '</span></div>';
             echo '</div>';
         }
-
+        
         // Version Notes
-        echo $this->renderElement('translationbox', array(
+        echo $this->renderElement('developers/translationbox', array(
                     'field' => 'releasenotes',
                     'translations' => $translations['releasenotes'],
                     'height' => '130',
@@ -184,26 +183,9 @@
                     'displayName' => ___('devcp_versions_edit_transbox_releasenotes_name'),
                     'description' => ___('devcp_versions_edit_transbox_releasenotes_description'),
                 ));
-        ?>
-
-        <!-- Source Code License -->
-        <div class="graybox rounded spaced field">
-            <h4><?=___('devcp_versions_edit_header_license')?></h4>
-            <p><?=___('devcp_versions_edit_license_description')?></p>
-            <?php
-            list($licenses, $trans) = $this->controller->Developers->getLicenses($version['Version']['id']);
-            echo $this->renderElement('developers/license_picker',
-                                      array('licenses' => $licenses));
-            echo $this->renderElement('developers/license_translationbox',
-                                      array('translations' => $trans,
-                                            // The transbox wraps fieldname with []
-                                            'fieldname' => 'License][text'));
-            ?>
-        </div>
-
-        <div class="graybox rounded spaced field">
-        <h4><?=___('devcp_versions_edit_header_approval')?></h4>
-        <?php
+        
+        echo '<div class="graybox rounded spaced field">';
+        echo '<h4>'.___('devcp_versions_edit_header_approval').'</h4>';
         if (!empty($version['File'])) {
             echo '<ul>';
             foreach ($version['File'] as $file) {
diff --git a/site/app/views/editors/email/nominated/public_plain.thtml b/site/app/views/editors/email/nominated/public_plain.thtml
index 00c4d6d..638b432 100644
--- a/site/app/views/editors/email/nominated/public_plain.thtml
+++ b/site/app/views/editors/email/nominated/public_plain.thtml
@@ -1,4 +1,4 @@
-Congratulations! Your nominated, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?> editor who approved your add-on to be public.
+Congratulations! Your nominated add-on, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?> editor who approved your add-on to be public.
 
 Your most recent version (<?=$info['version']?>) has also been made public.
 
diff --git a/site/app/views/editors/queue.thtml b/site/app/views/editors/queue.thtml
index 945ebde..49d2e27 100644
--- a/site/app/views/editors/queue.thtml
+++ b/site/app/views/editors/queue.thtml
@@ -38,116 +38,47 @@
  * ***** END LICENSE BLOCK ***** */
 ?>
 <div id="content">
-<?=$this->renderElement('developers/editorsmenu');?>
-<?=$this->renderElement('developers/editorsqueue');?>
+        <?=$this->renderElement('developers/editorsmenu');?>
+        <?=$this->renderElement('developers/editorsqueue');?>
 
 <div id="filterBox">
-<?=$html->formTag("/editors/queue/{$mode}", 'post');?>
-    <div id="filterHeader">&darr;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?=_('editors_filter_queue')?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&darr;</div>
-    <?php if ($filtered == true) { ?><div id="sessionNotice"><?=_('editors_notice_filter_session')?></div><?php } ?>
-    <div id="filterTable" <?=($filterChanged == false ? ' style="display: none;"' : '')?>>
-        <div class="group left">
-            <div>
-                <label for="FilterAddonOrAuthor"><?=___('editors_queue_filter_label_addon', 'Add-on or Author Email')?></label>
-                <?=$html->input('Filter/AddonOrAuthor', array('value'=>$addonOrAuthor))?>
-            </div>
-
-            <div>
-                <label for="FilterApplication"><?=___('editors_queue_filter_label_application', 'Application')?></label>
-                <?=$html->selectTag('Filter/Application', $applications, $selected['Application'], null, null, true)?>
-            </div>
-
-            <div>
-                <label for="FilterMaxVersion"><?=___('editors_queue_filter_label_maxversion', 'Max. Version')?></label>
-                <?=$html->selectTag('Filter/MaxVersion', $maxVersions, $selected['MaxVersion'], null, null, true)?>
-            </div>
-
-            <div>
-                <label for="FilterSubmissionAge"><?=___('editors_queue_filter_label_submissionage', 'Age of Submission (days)')?></label>
-                <?=$html->selectTag('Filter/SubmissionAge', $submissionAges, $selected['SubmissionAge'], null, null, true)?>
-            </div>
-        </div>
-        <div class="group">
-            <div>
-                <label for="FilterAddontype"><?=___('editors_queue_filter_label_addontypes', 'Add-on Types')?></label><br/>
-                <?=$html->selectTag('Filter/Addontype', $addontypes, $selected['Addontype'], array('multiple' => 'multiple', 'size' => 5), null, false)?>
-            </div>
-        </div>
-        <div class="group">
-            <div>
-                <label for="FilterPlatform"><?=___('editors_queue_filter_label_platforms', 'Platforms')?></label><br/>
-                <?=$html->selectTag('Filter/Platform', $platforms, $selected['Platform'], array('multiple' => 'multiple', 'size' => 5), null, false)?>
-            </div>
-        </div>
-        <div class="buttons">
-            <?=$html->submit(_('editors_queue_submit_filter'), array('name' => 'filter'));?>
-            <?=$html->submit(_('editors_queue_submit_clean'), array('name' => 'clear'))?>
-        </div>
-    </div>
-</form>
-<?php if ($filtered): ?>
-    <div>
-        <?=sprintf(n___('editors_queue_filter_result_count','editors_queue_filter_result_count', $filteredCount, 'Results of Your Filtered Search: <strong>%d</strong> Add-ons'), $filteredCount)?>
-    </div>
-<?php endif; ?>
+<?php
+    echo $html->formTag('/editors/queue', 'post');
+    echo '<div id="filterHeader" onClick="toggleFilters();">&darr;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'._('editors_filter_queue').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&darr;</div>';
+    if ($filtered == true) {
+        echo '<div id="sessionNotice">'._('editors_notice_filter_session').'</div>';
+    }
+    echo '<table id="filterTable"'.($filtered == false ? ' style="display: none;"' : '').'>';
+        echo '<tr><td colspan=5><b>Filters are not yet functional!</b></td></tr>';
+        echo '<tr id="headerRow">';
+            echo '<td>'._('editors_th_addontypes').'</td>';
+            echo '<td>'._('editors_th_platforms').'</td>';
+            echo '<td>'._('editors_th_applications').'</td>';
+            echo '<td>'._('editors_th_submissiontypes').'</td>';
+            echo '<td>&nbsp;</td>';
+        echo '</tr>';
+        echo '<tr>';
+            echo '<td>'.$html->selectTag('Approval/Addontype', $addontypes, $selected['Addontype'], array('multiple' => 'multiple', 'size' => 5), null, false).'</td>';
+            echo '<td>'.$html->selectTag('Approval/Platform', $platforms, $selected['Platform'], array('multiple' => 'multiple', 'size' => 5), null, false).'</td>';
+            echo '<td>'.$html->selectTag('Approval/Application', $applications, $selected['Application'], array('multiple' => 'multiple', 'size' => 5), null, false).'</td>';
+            echo '<td>'.$html->selectTag('Approval/SubmissionType', $submissionTypes, $selected['SubmissionType'], array('multiple' => 'multiple', 'size' => 5), null, false).'</td>';
+            echo '<td>'.$html->submit(_('editors_queue_submit_filter'), array('name' => 'filter')).'<br><br>'.$html->submit(_('editors_queue_submit_clean'), array('name' => 'clear')).'</td>';
+        echo '</tr>';
+    echo '</table>';
+    echo '</form>';
+?>
 </div>
 <table width="100%">
     <tr class="queueHeader">
-        <td><?php
-            $sorturl = "/editors/queue/{$mode}?sort=name";
-            $sortimg = '';
-            if ($sortBy == 'name') {
-                if ($sortDir == 'ASC') {
-                    $sortimg = $html->image('developers/arrow_up.png', array('title' => ___('editors_th_sort_ascending', 'ascending sort')));
-                    $sorturl .= '&dir=desc';
-
-                } else {
-                    $sortimg = $html->image('developers/arrow_down.png', array('title' => ___('editors_th_sort_descending', 'descending sort')));
-                    $sorturl .= '&dir=asc';
-                }
-            }
-            echo $html->link(___('editors_th_addon'), $sorturl);
-            echo $sortimg;
-        ?></td>
-        <td><?php
-            $sorturl = "/editors/queue/{$mode}?sort=type";
-            $sortimg = '';
-            if ($sortBy == 'type') {
-                if ($sortDir == 'ASC') {
-                    $sortimg = $html->image('developers/arrow_up.png', array('title' => ___('editors_th_sort_ascending', 'ascending sort')));
-                    $sorturl .= '&dir=desc';
-
-                } else {
-                    $sortimg = $html->image('developers/arrow_down.png', array('title' => ___('editors_th_sort_descending', 'descending sort')));
-                    $sorturl .= '&dir=asc';
-                }
-            }
-            echo $html->link(___('editors_th_addontype'), $sorturl);
-            echo $sortimg;
-        ?></td>
+        <td><?=_('editors_th_addon')?></td>
+        <td><?=_('editors_th_addontype')?></td>
     <?php
-        $apps = array();
+        $apps = array('Sugar');
         foreach ($apps as $app) {
             echo '<td>'.$html->image('developers/'.strtolower($app).'.png', array('title' => sprintf(_('editors_queue_app_compatibility'), $app))).'</td>';
         }
     ?>
-        <td><?php
-            $sorturl = "/editors/queue/{$mode}?sort=age";
-            $sortimg = '';
-            if ($sortBy == 'age') {
-                if ($sortDir == 'ASC') {
-                    // age sort is actually on a timestamp, so age direction is opposite
-                    $sortimg = $html->image('developers/arrow_down.png', array('title' => ___('editors_th_sort_descending', 'descending sort')));
-                    $sorturl .= '&dir=desc';
-
-                } else {
-                    $sortimg = $html->image('developers/arrow_up.png', array('title' => ___('editors_th_sort_ascending', 'ascending sort')));
-                    $sorturl .= '&dir=asc';
-                }
-            }
-            echo $html->link(___('editors_th_nomination_age'), $sorturl);
-            echo $sortimg;
-        ?></td>
+        <td><?=_('editors_th_age')?></td>
         <td><?=_('editors_th_additional_info')?></td>
     </tr>
 <?php
@@ -165,7 +96,7 @@
                         echo '<td>&nbsp;</td>';
                     }
                 }
-                echo '<td>'.(($mode == 'nominated') ? $addon['nominationage'] : $addon['age']).'</td>';
+                echo '<td>'.$addon['age'].'</td>';
                 echo '<td>'.(!empty($addon['notes']) ? implode('; ', $addon['notes']) : '').'</td>';
             echo '</tr>';
             $num++;
@@ -179,13 +110,6 @@
     }
 ?>
 <div id="helpfulLinks">
-<?=_('editors_helpful_links').': '.$html->link(_('editors_link_policy'), '/pages/policy').' | '.$html->link(_('editors_link_guide'), SITE_EDITOR_WIKI)?>
+<?=_('editors_helpful_links').': '.$html->link(_('editors_link_policy'), '/pages/policy').' | '.$html->link(_('editors_link_guide'), SITE_EDITOR_WIKI')?>
 </div>
 </div>
-<script type="text/javascript">
-// <![CDATA[
-    var addonAutocompleteUrl = '<?=$html->url("/editors/addonAndAuthorLookup/{$mode}")?>';
-    var appversionLookupUrl = '<?=$html->url('/editors/appversionLookup/')?>';
-    $(document).ready(function() { editors_queue.init(); });
-// ]]>
-</script>
diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml
index f3cb36f..02c0620 100644
--- a/site/app/views/editors/review.thtml
+++ b/site/app/views/editors/review.thtml
@@ -40,15 +40,9 @@
     <?=$this->renderElement('developers/editorsmenu');?>
     <?php if ($queueRank): ?>
     <div class="reviewnav">
-        <?php
-            if ($filtered) {
-                echo sprintf(___('editors_review_rank_in_queue_filtered', '<strong># %1$s</strong> of %2$s in queue (filtered)'), $queueRank, $filteredCount);
-            } else {
-                echo sprintf(___('editors_review_rank_in_queue'), $queueRank, $filteredCount);
-            }
-        ?><br/>
-        <?php if ($queueRank > 1) echo $html->link(___('editors_review_previous_link'), "/editors/queue/{$reviewType}?num=".($queueRank-1)); ?>
-        <?php if ($queueRank < $count[$reviewType]) echo $html->link(___('editors_review_next_link'), "/editors/queue/{$reviewType}?num=".($queueRank+1)); ?>
+        <?php echo sprintf(___('editors_review_rank_in_queue', '<strong># %1$s</strong> of %2$s in queue'), $queueRank, $count[$reviewType]);?><br/>
+        <?php if ($queueRank > 1) echo $html->link(___('editors_review_previous_link', '&laquo; prev'), "/editors/queue/{$reviewType}?num=".($queueRank-1)); ?>
+        <?php if ($queueRank < $count[$reviewType]) echo $html->link(___('editors_review_next_link', 'next &raquo;'), "/editors/queue/{$reviewType}?num=".($queueRank+1)); ?>
     </div>
     <?php endif; ?>
     
@@ -67,7 +61,7 @@
             <?php
                 if (!empty($addon['User'])) {
                     foreach ($addon['User'] as $user) {
-                        echo '<li>'.$html->linkUserFromModel($user).'</li>';
+                        echo '<li>'.$html->link($user['firstname'].' '.$user['lastname'], '/user/'.$user['id']).'</li>';
                     }
                 }
             ?>
@@ -138,15 +132,15 @@
         }
     ?>
     </ul>
-    <span id="multipleNotice" style="display: none;"><?=___('editors_review_mulitple_notice')?></span>
+    <span id="multipleNotice" style="display: none;">Notice: Only review more than one file if you have tested EVERY file you select.</span>
 </div>
 <br class="clear">
 <div id="links">
-    <span id="overview_link"><?=$html->link(___('editors_review_a_item_overview'), '/addon/'.$addon['Addon']['id'])?></span>
-    <span id="history_link"><a href="#history"><?=___('editors_review_a_item_history')?></a></span>
-    <span id="previews_link"><a href="#previews"><?=___('editors_review_a_previews')?></a></span>
-    <?=(!empty($addon['Addon']['homepage'])) ? '<span id="homepage_link">'.$html->link(___('editors_review_a_item_homepage'), $addon['Addon']['homepage']).'</span>' : ''?>
-    <?=($this->controller->SimpleAcl->actionAllowed('Admin', 'EditAnyAddon', $this->controller->Session->read('User'))) ? '<span id="edit_link">'.$html->link(___('editors_review_a_edit_item'), '/developers/edit/'.$addon['Addon']['id']).'</span>' : ''?>
+    <span id="overview_link"><?=$html->link('Item Overview', '/addon/'.$addon['Addon']['id'])?></span>
+    <span id="history_link"><a href="#history">Item History</a></span>
+    <span id="previews_link"><a href="#previews">Previews</a></span>
+    <?=(!empty($addon['Addon']['homepage'])) ? '<span id="homepage_link">'.$html->link('Item Homepage', $addon['Addon']['homepage']).'</span>' : ''?>
+    <?=($this->controller->SimpleAcl->actionAllowed('Admin', 'EditAnyAddon', $this->controller->Session->read('User'))) ? '<span id="edit_link">'.$html->link('Edit Item', '/developers/addon/edit/'.$addon['Addon']['id']).'</span>' : ''?>
 </div>
 <div id="form">
     <?php
@@ -156,7 +150,7 @@
     <div id="actionbox">
         <span id="public" class="action_color" onClick="selectAction('public');"><?=$html->image('developers/public-bw.png', array('id' => 'publicIcon')).' '._('editors_review_action_public')?></span>
         <span id="sandbox" class="action_color" onClick="selectAction('sandbox');"><?=$html->image('developers/sandbox-bw.png', array('id' => 'sandboxIcon')).' '._('editors_review_action_sandbox')?></span>
-        <span id="info" class="action_color" onClick="selectAction('info');"><?=$html->image('developers/info-bw.png', array('id' => 'infoIcon')).' '.___('editors_review_action_info')?></span>
+        <span id="info" class="action_color" onClick="selectAction('info');"><?=$html->image('developers/info-bw.png', array('id' => 'infoIcon')).' '.___('editors_review_action_info', 'Request More Information')?></span>
         <span id="superreview" class="action_color" onClick="selectAction('superreview');"><?=$html->image('developers/superreview-bw.png', array('id' => 'superreviewIcon')).' '._('editors_review_action_request_superreview')?></span>
     </div>
     <div id="actiondetails">
@@ -179,7 +173,9 @@
         }
     ?>
         <div id="details-info" style="display: none;">
-        <?=___('editors_review_details_info_request')?>
+        <?=___('editors_review_details_info_request', 'Use this form to request more information '
+            .'from the author. They will receive an email and be able to answer here. You will be '
+            .'notified by email when they reply.');?>
         </div>
         <div id="details-superreview" style="display: none;">
         <?=_('editors_review_details_superreview');?>
@@ -214,7 +210,7 @@
         ?>
         <div id="subscribe">
             <?php
-            $_subscribetext = ___('editors_review_update_notify_once');
+            $_subscribetext = ___('editors_review_update_notify_once', 'Notify me the next time this add-on is updated. (Subsequent updates will not generate an email)');
             echo $html->checkbox('Approval/subscribe', $_subscribetext);
             ?>
             <label for="ApprovalSubscribe"><?=$_subscribetext?></label>
diff --git a/site/app/views/elements/addon_categories.thtml b/site/app/views/elements/addon_categories.thtml
index 96d0e2b..27b68cd 100644
--- a/site/app/views/elements/addon_categories.thtml
+++ b/site/app/views/elements/addon_categories.thtml
@@ -34,7 +34,7 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
- * ***** END LICENSE BLOCK ***** */
+ * ***** END LICENSE BLOCK ***** */ 
 
 
 /**
@@ -46,13 +46,16 @@
 <?php
 // show top-level category for non-extension add-ons
 if (!empty($tags)) {
+    // @partial translation fallback, 5/17/08
     switch ($tags[0]['Tag']['addontype_id']) {
     case ADDON_DICT:
     case ADDON_LPAPP:
-        $li = $html->link(___('nav_category_dicts_langpacks'), '/browse/type:'.ADDON_DICT);
+        $li = $html->link((_('nav_category_dicts_langpacks')!='nav_category_dicts_langpacks'?
+            _('nav_category_dicts_langpacks'):_('langtools_header_dicts_and_langpacks')), '/browse/type:'.ADDON_DICT);
         break;
     case ADDON_THEME:
-        $li = $html->link(___('nav_category_themes'), '/browse/type:'.ADDON_THEME);
+        $li = $html->link((_('nav_category_themes')!='nav_category_themes'?
+            _('nav_category_themes'):'Themes'), '/browse/type:'.ADDON_THEME);
         break;
     default:
         $li = '';
@@ -61,15 +64,9 @@ if (!empty($tags)) {
 }
 
 // regular category list
-$c = 0;
-foreach ($tags as $_tag) {
-    if (0 == $c++)
-        echo '<li class="first">';
-    else
-        echo '<li>';
-    echo $html->link($_tag['Translation']['name']['string'],
+foreach ($tags as $_tag)
+    echo '<li>'.$html->link($_tag['Translation']['name']['string'],
         "/browse/type:{$_tag['Tag']['addontype_id']}/cat:{$_tag['Tag']['id']}")
         ."</li>\n";
-}
 ?>
 </ul>
diff --git a/site/app/views/elements/addon_listitem.thtml b/site/app/views/elements/addon_listitem.thtml
index cd68b71..9bcfd94 100644
--- a/site/app/views/elements/addon_listitem.thtml
+++ b/site/app/views/elements/addon_listitem.thtml
@@ -62,6 +62,19 @@ if ($hasFiles) {
 $addonCreators = $addon['User'];
 $addonSummary = $addon['Translation']['summary']['string'];
 
+// is addon recommended or experimental?
+global $experimental_status;
+if (in_array($addon['Addon']['status'], $experimental_status)) {
+    $flag = _('addon_listitem_flag_experimental');
+    $li_extraclass = 'exp';
+} elseif ($addon['Addon']['recommended']) {
+    $flag = _('addon_listitem_flag_recommended');
+    $li_extraclass = 'rec';
+} else {
+    $flag = '';
+    $li_extraclass = '';
+}
+
 // prepare preview image
 if (isset($addonPreviewPath) && !empty($addonPreviewPath)) {
     $_alt = sprintf(_('img_preview_of'),$addonName);
@@ -103,23 +116,26 @@ $installbutton = $this->renderElement('install', $_install_render_options);
 
 ?>
 
-<li class="addon <?=$html->extraClass($addon)?>">
+<li class="addon <?=$li_extraclass?>">
     <div class="irk">
         <h3 class="name"><?=$html->link("$icon $addonName", "/addon/{$addonID}");?></h3>
         <h4 class="author"> <?=_('addons_home_by')?> <?=$html->linkUsersFromModel($addonCreators, null, "/addon/{$addonID}#authors")?></h4>
-        <?=$html->flag($addon)?>
+        <? if (!empty($flag)) echo '<h5 class="flag">'.$flag.'</h5>'; ?>
         <?=$previmg ?>
         <p class="rating"><?=$this->renderElement('stars',array('rating' => $addon['Addon']['averagerating']))?><?php if ($addon['Addon']['totalreviews'] > 0) { ?> <a href="<?=$html->url('/addon/'.$addon['Addon']['id'].'#reviews')?>"><?=sprintf(ngettext('feature_reviews','feature_reviews', $addon['Addon']['totalreviews']), $addon['Addon']['totalreviews'])?></a><?php } ?></p>
         <span class="stats">
             <em><?=$html->number_format($addon['Addon']['weeklydownloads'], 0)?></em>
-            <?php echo ___('addon_downloads_weekly'); ?>
+            <?php // @partial 4/25/08
+            echo ___('addon_downloads_weekly', _('addon_downloads'));
+            ?>
         </span>
         <?=$categories?>
         <p class="desc"><?=$addonSummary?></p>
         <?=$installbutton?>
         <p class="updated">
             <?php
-            $_update_string = ___('addon_detail_last_updated');
+            // @partial 5/08/08, bug 425527
+            $_update_string = (_('addon_detail_last_updated') == 'addon_detail_last_updated') ? 'Updated %s' : _('addon_detail_last_updated');
             $_version_date = (isset($addon['Addon']['datestatuschanged']) ? $addon['Addon']['datestatuschanged'] : $addon['Version'][0]['created']);
             echo sprintf($_update_string, strftime(_('date'), strtotime($_version_date)));
             ?>
diff --git a/site/app/views/elements/amo2009/install.thtml b/site/app/views/elements/amo2009/install.thtml
index e938571..c9aab3e 100644
--- a/site/app/views/elements/amo2009/install.thtml
+++ b/site/app/views/elements/amo2009/install.thtml
@@ -179,6 +179,9 @@ if (count($addonFiles) < 1) {
             }
         }
 
+        // we are sugar
+        $_class_platform_string = "platform-ALL";
+
         // run the right javascript action for the addon type in question
         $installTriggerName = "installTrigger" . $file['id'] . $uniqueId;
 
diff --git a/site/app/views/elements/amo2009/search.thtml b/site/app/views/elements/amo2009/search.thtml
index 1596895..ba682b8 100644
--- a/site/app/views/elements/amo2009/search.thtml
+++ b/site/app/views/elements/amo2009/search.thtml
@@ -267,12 +267,13 @@ if (!isset($category)) $category = array(0, 0);
     echo "versions = new Array();\n";
     foreach($versions as $application_id => $ver_array) {
         echo "versions[{$application_id}] = {";
+        echo "'".___('advanced_search_form_any_version')."' : 'any',\n";
         foreach ($ver_array as $version) {
             if($version !="") {
                 echo "\"{$version}\": \"{$version}\", ";
             }
         }
-        echo "'".___('advanced_search_form_any_version')."' : 'any' };\n";
+        echo "};\n";
     }
 
    // to get default version value set up correctly needed to do after $appid, $lver and $hver set-up above in this element
diff --git a/site/app/views/elements/app_chooser.thtml b/site/app/views/elements/app_chooser.thtml
index f1cb175..c20acd6 100644
--- a/site/app/views/elements/app_chooser.thtml
+++ b/site/app/views/elements/app_chooser.thtml
@@ -44,7 +44,7 @@ foreach (array_keys($app_shortnames) as $_app) {
     $applist[] = '<li id="app-'.$_app.'"><a href="'.$html->url("/$_app/",false,true,false).'">'.$app_prettynames[$_app].'</a></li>';
 }
 ?>
-<div id="other-apps" class="highlight" title="<?=___('other_apps_tooltip');?>">
+<div id="other-apps" title="<?=___('other_apps_tooltip');?>">
         <h3><?=_('addons_home_other_applications')?></h3>
         <ul id="nav-apps">
             <?php foreach ($applist as $_app): ?>
diff --git a/site/app/views/elements/app_compatibility.thtml b/site/app/views/elements/app_compatibility.thtml
index d47ffd5..a60c07e 100644
--- a/site/app/views/elements/app_compatibility.thtml
+++ b/site/app/views/elements/app_compatibility.thtml
@@ -46,7 +46,7 @@ global $app_prettynames, $app_shortnames;
 
 ?>
 <div class="app_compat">
-    <h5><?=_('addons_display_workswith')?></h5>
+    <h4><?=_('addons_display_workswith')?></h4>
     <ul>
         <?
         foreach($compatible_apps as $app):
diff --git a/site/app/views/elements/developers/adminmenu.thtml b/site/app/views/elements/developers/adminmenu.thtml
index 5208464..ef31dc9 100644
--- a/site/app/views/elements/developers/adminmenu.thtml
+++ b/site/app/views/elements/developers/adminmenu.thtml
@@ -47,9 +47,6 @@
             if ($this->controller->SimpleAcl->actionAllowed('Admin', 'applications', $this->controller->Session->read('User'))): ?>
             <li<?=($page == 'applications') ? ' class="selected"' : ''?>><?=$html->link('Application Manager', '/admin/applications')?></li>
         <?php endif;
-            if ($this->controller->SimpleAcl->actionAllowed('Admin', 'collections', $this->controller->Session->read('User'))): ?>
-            <li<?=($page == 'collections') ? ' class="selected"' : ''?>><?=$html->link('Collections Manager', '/admin/collections')?></li>
-        <?php endif;
             if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))): ?>
             <li><?=$html->link('Editor Tools', '/editors')?></li>
         <?php endif;
diff --git a/site/app/views/elements/developers/editorsmenu.thtml b/site/app/views/elements/developers/editorsmenu.thtml
index 472ec1a..68dce06 100644
--- a/site/app/views/elements/developers/editorsmenu.thtml
+++ b/site/app/views/elements/developers/editorsmenu.thtml
@@ -59,7 +59,6 @@ if (empty($mode)) {
             <li<?=($mode == 'featured') ? ' class="selected"' : ''?>><?=$html->link(_('devcp_editorsqueue_featured'), '/editors/featured')?></li>
             <li<?=($page == 'logs') ? ' class="selected"' : ''?>><?=$html->link(_('editorcp_menu_eventlog_link'), '/editors/logs')?></li>
             <li<?=($page == 'reviewlog') ? ' class="selected"' : ''?>><?=$html->link(_('editorcp_menu_reviewlog_link'), '/editors/reviewlog')?></li>
-            <li<?=($page == 'performance') ? ' class="selected"' : ''?>><?=$html->link(___('editorcp_menu_performance_link', 'Performance'), '/editors/performance')?></li>
             <li><?=$html->link(_('editorcp_menu_mainpage_link'), '/')?></li>
         </ul>
     </div>
diff --git a/site/app/views/elements/developers/myaddons.thtml b/site/app/views/elements/developers/myaddons.thtml
index 708db07..a2eaacd 100644
--- a/site/app/views/elements/developers/myaddons.thtml
+++ b/site/app/views/elements/developers/myaddons.thtml
@@ -44,28 +44,21 @@
     }
     ?>
 
-    <div id="categories" class="secondary-item-list">
+    <div id="categories">
+        <h3><span><?=_('devcp_myaddons_title')?></span></h3>
         
-    <?php if (!$this->controller->Session->check('User')): ?>
-            <h4><?=$html->link(_('header_navlink_login'), $html->login_url())?></h4>
-    <?php else: ?>
-        <h4><?=$html->link(_('devcp_myaddons_link'), '/developers/index')?></h4>
         <ul id="cat-list">
+    <?php if ($this->controller->Session->check('User')): ?>
+            <li><?=$html->link(_('devcp_myaddons_link'), '/developers/index')?></li>
         <?php
             if (!empty($addons)) {
                 foreach ($addons as $id => $name) {
                     echo '<li class="indented">';
-                    echo $html->link($name, '/developers/details/'.$id, array('class' => 'addons'));
+                    echo $html->link($name, '/developers/details/'.$id);
                     echo '</li>';
                 }
             }
         ?>
-        </ul>
-    </div>
-    
-    <div class="secondary-item-list">
-        <h4><span><?=_('devcp_myaddons_title')?></span></h4>
-        <ul class="">
             <li><?=$html->link(_('devcp_myaddons_submitaddon_link'), '/developers/add')?></li>
             <li><?=$html->link(_('devcp_myaddons_statistics_link'), '/statistics')?></li>
             <?php if ($this->controller->SimpleAcl->actionAllowed('Editors', '*', $this->controller->Session->read('User'))): ?>
@@ -75,8 +68,10 @@
                 <li><?=$html->link(_('devcp_myaddons_admincp_link'), '/admin')?></li>
             <?php endif; ?>
             <li><?=$html->link(_('devcp_myaddons_mainpage_link'), '/')?></li>
-        </ul>
+    <?php else: ?>
+            <li><?=$html->link(_('header_navlink_login'), $html->login_url())?></li>
     <?php endif; ?>
+        </ul>
         
     </div>
 </div>
diff --git a/site/app/views/elements/developers/translationbox.thtml b/site/app/views/elements/developers/translationbox.thtml
new file mode 100644
index 0000000..ff8e4c0
--- /dev/null
+++ b/site/app/views/elements/developers/translationbox.thtml
@@ -0,0 +1,158 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Scott <fligtar@mozilla.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Translation Box
+ * Element for rendering a translation box with tabs for the locales. Requires
+ * $this->translationBox be set with defaultLocale, languages, table, and loaded.
+ *
+ * See app/views/developers/addon_edit_descriptions.thtml for sample usage
+ *
+ * Required parameters:
+ *    - $field - name of the field
+ *    - $translations - array in form of 'en-US' => 'Translation'
+ *
+ * Optional parameters:
+ *    - $id - the db id of the object if multiple will be on the same page
+ *    - $type - type of field - textbox or textarea (default)
+ *    - $width - width of the field, defaults to 600px
+ *    - $height - height of the field, defaults to 20 for textboxes and 100 for textareas
+ *    - $maxLength - maximum number of characters for a field
+ *    - $displayName - the name of the field for the header
+ *    - $description - description of the field
+ *    - $graybox - whether to display in a graybox
+ */
+
+if (!isset($graybox) || $graybox === true) {
+    echo '<div class="translation-box graybox rounded spaced" style="width: '.(!empty($width) ? $width : '600px').';">';
+}
+    echo (!empty($displayName) ? '<h4><a href="#" title="'.___('devcp_transbox_a_title_help').'" onclick="translation_box.showHelp(this); return false;">'.$html->image('developers/help.png', array('alt' => ___('devcp_transbox_alt_help'))).'</a>'.$displayName.'  </h4>' : '');
+    echo (!empty($description) ? "<p>{$description}</p>" : '');
+    ?>
+    <div class="translation-row">
+        <div class="translation-tabs">
+        <?php
+            // Make sure default locale is present
+            if (!array_key_exists($this->translationBox['defaultLocale'], $translations)) {
+                $translations[$this->translationBox['defaultLocale']] = '';
+            }
+            
+            foreach ($translations as $locale => $translation) {
+                echo '<div class="translation-tab'.($this->translationBox['defaultLocale'] == $locale ? ' selected' : '').'" onclick="translation_box.switchLocale(this, \''.$locale.'\');" title="'.$this->translationBox['languages'][$locale].'">';
+                echo $locale.'</div>';
+            }
+        ?>
+        </div>
+        <div class="translation-button"><?=$html->image('developers/tab_add.png', array('onclick' => 'translation_box.addTab(this);', 'alt' => ___('devcp_transbox_img_add_trans'), 'title' => ___('devcp_transbox_img_add_trans')))?></div>
+        <div class="translation-button remove" style="display: none;"><?=$html->image('developers/tab_delete.png', array('onclick' => 'translation_box.confirmRemove(this);', 'alt' => ___('devcp_transbox_img_remove_trans'), 'title' => ___('devcp_transbox_img_remove_trans')))?></div>
+    </div>
+    <div class="translation-area" table="<?=$this->translationBox['table']?>" field="<?=$field?>" defaultLocale="<?=$this->translationBox['defaultLocale']?>"<?=(!empty($id) ? ' itemID="'.$id.'"' : '')?>>
+    <?php
+        foreach ($translations as $locale => $translation) {
+            $fieldName = "data[{$this->translationBox['table']}]".(!empty($id) ? "[{$id}]" : '')."[{$field}][{$locale}]";
+            
+            if (empty($type) || $type == 'textarea') {
+                echo '<textarea class="input '.$locale.($this->translationBox['defaultLocale'] == $locale ? ' selected' : '').'" name="'.$fieldName.'" cols="" rows="" style="height: '.(!empty($height) ? $height : '100').'px;"'.(!empty($maxLength) ? ' maxlength="'.$maxLength.'" onkeyup="translation_box.checkLength(this, '.$maxLength.');"  onchange="translation_box.checkLength(this, '.$maxLength.');"' : '').'>'.$translation.'</textarea>';
+            }
+            elseif ($type == 'textbox') {
+                echo '<input type="text" class="input '.$locale.($this->translationBox['defaultLocale'] == $locale ? ' selected' : '').'" name="'.$fieldName.'" value="'.$html->entities($translation).'" style="height: '.(!empty($height) ? $height : '20').'px;" '.(!empty($maxLength) ? ' maxlength="'.$maxLength.'"' : '').' />';
+            }
+            
+            if (!empty($maxLength)) {
+                echo '<div class="translation-maxlength '.$locale.($this->translationBox['defaultLocale'] == $locale ? ' selected' : '').'">'.$html->image('developers/exclamation.png', array('alt' => '')).sprintf(___('devcp_transbox_chars_used'), '<span>'.strlen($translation).'</span>', $maxLength).'</div>';
+            }
+        }
+    ?>
+    </div>
+
+<?php
+if (!isset($graybox) || $graybox === true) {
+    echo '</div>';
+}
+?>
+
+<?php if (!$this->translationBox['loaded']): ?>
+<div class="translation-newlocale-container">
+    <div class="translation-newlocale new selected">
+        <div class="padded">
+            <?=___('devcp_transbox_select_locale')?>
+            <select>
+            <?php
+                foreach ($this->translationBox['languages'] as $code => $name) {
+                    echo '<option value="'.$code.'">'.$name.' ('.$code.')</option>';
+                }
+            ?>
+            </select>
+            <div class="buttons">
+                <input type="button" value="<?=___('devcp_transbox_input_add_locale')?>" onclick="translation_box.addLocale(this, false);" />
+                <input type="button" value="<?=___('devcp_transbox_input_add_all')?>" onclick="translation_box.addLocale(this, true);" />
+                <input type="button" value="<?=___('devcp_transbox_input_cancel')?>" onclick="translation_box.cancelAdd(this);" />
+            </div>
+        </div>
+    </div>
+</div>
+<div class="translation-deletelocale-container">
+    <div class="translation-deletelocale">
+        <div class="padded">
+            <?=___('devcp_transbox_delete_sure')?>
+            <div class="buttons">
+                <input type="button" value="<?=___('devcp_transbox_input_delete')?>" onclick="translation_box.removeLocale(this);" />
+                <input type="button" value="<?=___('devcp_transbox_input_cancel')?>" onclick="translation_box.cancelRemove(this);" />
+            </div>
+        </div>
+    </div>
+</div>
+<div class="translation-help-container">
+    <div class="translation-help bluebox-tr"><div class="bluebox-tl">
+        <div class="padded">
+            <h4><?=sprintf(___('devcp_transbox_help_header_tabs'), $this->translationBox['defaultLocale'])?></h4>
+            <p><?=___('devcp_transbox_help_transbox')?></p>
+            <h4><?=___('devcp_transbox_help_header_what')?></h4>
+            <p><?=___('devcp_transbox_help_if')?>
+            <div style="text-align: right;"><a href="#" onclick="translation_box.hideHelp(this); return false;"><?=___('devcp_transbox_help_hide')?></a></div>
+        </div>
+        <div class="bluebox-br"><div class="bluebox-bl"></div></div>
+    </div></div>
+</div>
+<div class="translation-error-container">
+    <div class="translation-error error-message rounded"></div>
+</div>
+<?php
+    $this->translationBox['loaded'] = true;
+    endif;
+?>
\ No newline at end of file
diff --git a/site/app/views/elements/feature.thtml b/site/app/views/elements/feature.thtml
index 2f43bcb..17ac654 100644
--- a/site/app/views/elements/feature.thtml
+++ b/site/app/views/elements/feature.thtml
@@ -98,12 +98,19 @@ else
 <p class="desc"><?=$addonSummary?></p>
 <p class="rating"><?=$this->renderElement('stars',array('rating' => $addonRating))?><?php if ($addonReviews > 0) { ?> <a href="<?=$html->url('/addon/'.$addonId.'#reviews')?>"><?=sprintf(ngettext('feature_reviews','feature_reviews', $addonReviews), $addonReviews)?></a><?php } ?></p>
 <p class="stats"><em><?=$html->number_format($addonWeeklyDownloads, 0)?></em>
-<?php echo ___('addon_downloads_weekly'); ?>
+<?php
+// @partial 4/25/08
+echo (_('addon_downloads_weekly') == 'addon_downloads_weekly') ? _('addon_downloads') : _('addon_downloads_weekly');
+?>
 </p>
 <?php if (isset($addonFiles)): ?>
 
 <p class="updated">
-    <?php echo sprintf(___('addon_detail_last_updated'), strftime(_('date'), strtotime($addonVersionCreated))); ?>
+    <?php
+    // @partial 5/08/08, bug 425527
+    $_update_string = (_('addon_detail_last_updated') == 'addon_detail_last_updated') ? 'Updated %s' : _('addon_detail_last_updated');
+    echo sprintf($_update_string, strftime(_('date'), strtotime($addonVersionCreated)));
+    ?>
 </p>
 
 <?=$this->renderElement('install',array(
diff --git a/site/app/views/elements/fyf_promotion.thtml b/site/app/views/elements/fyf_promotion.thtml
new file mode 100644
index 0000000..3d668e8
--- /dev/null
+++ b/site/app/views/elements/fyf_promotion.thtml
@@ -0,0 +1,60 @@
+<?php
+/* ***** 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
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is addons.mozilla.org site.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mike Morgan <morgamic@mozilla.com> (Original Author)
+ *   Frederic Wenzel <fwenzel@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+?>
+<?php
+/**
+ * This element is behaves like the "feature" element but is a promotion for
+ * fashionyourfirefox.com.
+ */
+
+$_alt = sprintf(_('img_preview_of'), 'Fashion Your Firefox');
+$targeturl = '/fashionyourfirefox';
+?>
+
+<h4 class="name" title="<?=___('addons_title_tooltip') ?>"><a href="<?=$html->url($targeturl)?>"><img src="<?=$html->urlImage('fyf/fyf_promo_icon.png')?>" width="40" height="50" alt="" class="icon"/>Fashion Your Firefox</a></h4>
+<h5 class="author" title="<?=___('addons_author_tooltip') ?>"><?=_('addons_home_by')?> <?=$html->link('Mozilla', 'http://mozilla.com');?></h5>
+<p class="preview-img"><a href="<?=$html->url($targeturl)?>"><img src="<?=$html->urlImage('fyf/fyf_promo_preview.jpg')?>" alt="<?=$_alt?>" title="<?=$_alt?>"/></a></p>
+<p class="desc">
+    Why not customize your Firefox for the things you really love to do? Take
+    your browser from simple to spectacular. Add a personal touch to your browser
+    with Fashion Your Firefox, a simple Web application that customizes your Firefox
+    browser based on your interests and online activities. Select multiple add-ons
+    that fit your needs and install them with just one click.
+</p>
+<p class="more-from">Find out how to <?=$html->link('Fashion Your Firefox', $targeturl, array('class'=>'view'))?></p>
diff --git a/site/app/views/elements/install.thtml b/site/app/views/elements/install.thtml
index fb0b6af..60a5055 100644
--- a/site/app/views/elements/install.thtml
+++ b/site/app/views/elements/install.thtml
@@ -50,17 +50,13 @@
  * - $addonStatus
  * - $allPlatforms - There should only be one platform in the list when this is used on the eula view.
  * - $addonType - default ADDON_EXTENSION
- * - $collection_uuid - if this add-on download is collection related, this will set a tracking code in the download ID. default null
  * - $buttonMessage - default 'a_install'
- * - $showInstructions - Show install instructions for Thunderbird or Seamonkey, defaults to true
  */
 global $browser_apps, $experimental_status, $valid_status;
 
 /* prepare add-on type */
 if (!isset($addonType)) $addonType = ADDON_EXTENSION;
 
-if (!isset($showInstructions)) $showInstructions = true;
-
 /* logged in users can install experimental add-ons */
 $loggedin = $this->controller->Session->check('User');
 
@@ -100,13 +96,13 @@ if (count($addonFiles) < 1) {
     // If we're looking at thunderbird pages, and there is no EULA, show the TB
     // install instructions.  Bug 401272 fixed the button so it downloads instead of
     // installs, but it doesn't hurt to have these instructions still.
-    if (APP_ID == APP_THUNDERBIRD && empty($addonEULA) && $showInstructions) {
+    if (APP_ID == APP_THUNDERBIRD && empty($addonEULA)) {
         echo '<div class="app_install">';
         echo '<h3>'._('addons_install_in_thunderbird_title').'</h3>';
         echo _('addons_install_in_thunderbird');
         echo '</div>';
     }
-    if (APP_ID == APP_SUNBIRD && empty($addonEULA) && $showInstructions) {
+    if (APP_ID == APP_SUNBIRD && empty($addonEULA)) {
         echo '<div class="app_install">';
         echo '<h3>'._('addons_install_in_sunbird_title').'</h3>';
         echo _('addons_install_in_sunbird');
@@ -147,116 +143,94 @@ if (count($addonFiles) < 1) {
         if ($addonType != ADDON_SEARCH) {
             /* install for search  */
             if (in_array(APP_ID, $browser_apps)) {
-                // prepare link options for browser apps
+                // prepare onclick install for browser apps
                 $linkOptions = array(
                     'id' => $installTriggerName,
                     'title'     => sprintf(_('install_button_title'), $addonName, APP_PRETTYNAME),
                     'addonName' => $addonName,
                     'addonIcon' => $addonIconPath,
                     'addonHash' => $file['hash'], 
-                    'jsInstallMethod' => 'browser_app_addon_install',
+                    'onclick'   => "return install(event,"
+                        ."document.getElementById('{$installTriggerName}').getAttribute('addonName'), "
+                        ."document.getElementById('{$installTriggerName}').getAttribute('addonIcon'), "
+                        ."document.getElementById('{$installTriggerName}').getAttribute('addonHash'));"
                     );
             } else {
-                // prepare link options for non-browser apps
+                // prepare onclick install for non-browser apps
                 $linkOptions = array('id' => $installTriggerName, 
                     'title'=>sprintf(_('install_download'),$addonName));
             }
         } else {
-            /* prepare link options for search engines */
+            /* special install javascript for search engines */
             $linkOptions = array(
                 'id'        => $installTriggerName,
                 'title'     => sprintf(_('install_button_title'), $addonName, APP_PRETTYNAME),
-                'engineURL' => FULL_BASE_URL . $html->urlFile($file['id'], $file['filename'], @$collection_uuid),
-                // search engines use a special install method
-                'jsInstallMethod' => 'search_engine_install',
+                'onclick'   => "return addEngine('".FULL_BASE_URL.$html->urlFile($file['id'], $file['filename'])."');"
                 );
         }
         ?>
 
-        <?php
-        $install_button_html = '';
-        if (empty($addonEULA)) {
-            // wipe disallowed characters off the displayed filename
-            $addon_filename = $html->entities(preg_replace(
-                INVALID_FILENAME_CHARS, '_', $html->unsanitize($file['filename'])));
-                
-            // if this is the latest public version, use perma-URL. Otherwise, link directly to file.
-            $linktitle = '<span><span><span><strong>'.sprintf(_('a_download'),$_install_platform_string).'</strong></span></span></span>';
-            if ($is_latest && $file['status'] == STATUS_PUBLIC) {
-                $latest_permalink = "/downloads/latest/{$addonId}";
-                if ($file['platform_id'] != PLATFORM_ALL) $latest_permalink .= "/platform:{$file['platform_id']}";
-
-                $file_id = $this->controller->File->getLatestFileByAddonId($addonId);
-                $file_data = $this->controller->File->findById($file_id);
-                $path_info = pathinfo($file_data['File']['filename']);
-
-                $latest_permalink .= "/addon-${addonId}-latest.".$path_info['extension'];
-
-                if (!empty($collection_uuid)) $latest_permalink .= "?collection_id={$collection_uuid}";
-
-                $install_button_html .= $html->link($linktitle, $latest_permalink, $linkOptions);
-            } else {
-                $install_button_html .= $html->linkFile($file['id'], $linktitle, null,
-                    $linkOptions, false, $addon_filename, @$collection_uuid);
-            }
-        } else {
-            $eula_attributes = array('id' => $installTriggerName,
-                'addonName' => $addonName,
-                'title' => sprintf(_('install_button_title'), $addonName, APP_PRETTYNAME),
-                'isEULAPageLink' => 'true');
-            $install_button_html .= $html->link('<span><span><span><strong>'
-                .sprintf(_('a_download'),$_install_platform_string)
-                .'</strong></span></span></span>',
-                "/addons/policy/0/{$addonId}/{$file['id']}",
-                $eula_attributes, false, false);
-        }
 
-        /**
-         * For logged-in users or public add-ons, show the standard install button.
-         */
-        if ($loggedin || !in_array($file['status'], $experimental_status) || (isset($is_eula_page) && isset($_GET['confirmed']))):
-        ?>
-            <p class="install-button <?=$_class_platform_string?>">
-                <?= $install_button_html ?>
-            </p>
         <?php
         /**
-         * For sandbox add-ons, show a frozen version of the standard install button.
-         * Users unfreeze the button client-side by checking a confirmation box.
-         * Non-JS users must unfreeze by logging in.
+         * For logged-in users or public add-ons.
          */
-        else: 
+        if ($loggedin || !in_array($file['status'], $experimental_status)):
         ?>
-            <div class="exp-loggedout install">
-                <div class="exp-confirm-install" style="display: none">
-                    <input type="checkbox" name="confirm-<?= $addonId ?>" />
-                    <div class="exp-desc">
-                    <label for="exp-confirm-install-checkbox-<?=$addonId?>"></label>
-                    <span><?= sprintf(___('install_button_confirm_exp_install'), $html->url('/pages/faq#experimental-addons')) ?></span>
-                    </div>
-                </div>
-
-                <p class="install-button <?=$_class_platform_string?>" style="display: none">
-                <?= $install_button_html ?>
-                </p>
-
-                <noscript>
-                <p class="install-button <?=$_class_platform_string?>">
-                <?php
-                $login_url = $html->login_url('/'.LANG.'/'.APP_SHORTNAME."/addon/{$addonId}", false);
-                $attributes = array('id' => $installTriggerName,
+            <p class="install-button <?=$_class_platform_string?>">
+            <?php
+            if (empty($addonEULA)) {
+                // wipe disallowed characters off the displayed filename
+                $addon_filename = $html->entities(preg_replace(
+                    INVALID_FILENAME_CHARS, '_', $html->unsanitize($file['filename'])));
+                
+                // if this is the latest public version, use perma-URL. Otherwise, link directly to file.
+                $linktitle = '<span><span><span><strong>'.sprintf(_('a_download'),$_install_platform_string).'</strong></span></span></span>';
+                if ($is_latest && $file['status'] == STATUS_PUBLIC) {
+                    $latest_permalink = "/downloads/latest/{$addonId}";
+                    if ($file['platform_id'] != PLATFORM_ALL) $latest_permalink .= "/platform:{$file['platform_id']}";
+                    echo $html->link($linktitle, $latest_permalink, $linkOptions);
+                } else {
+                    echo $html->linkFile($file['id'], $linktitle, null,
+                        $linkOptions, false, $addon_filename);
+                }
+            } else {
+                $eula_attributes = array('id' => $installTriggerName,
                     'addonName' => $addonName,
                     'title' => sprintf(_('install_button_title'), $addonName, APP_PRETTYNAME));
                 echo $html->link('<span><span><span><strong>'
                     .sprintf(_('a_download'),$_install_platform_string)
                     .'</strong></span></span></span>',
-                    $login_url, $attributes, false, false);
+                    "/addons/policy/0/{$addonId}/{$file['id']}",
+                    $eula_attributes, false, false);
+            }
+            ?>
+            </p>
 
-                $exp_addon_url = "/pages/faq#experimental-addons";
-                ?>
-                </p>
-                <?= sprintf(___('install_a_login_to_install'), $html->url($login_url), $html->url($exp_addon_url)); ?>
-                </noscript>
+
+        <?php
+        /**
+         * For sandbox add-ons.
+         */
+        else: /* don't allow install of experimental add-ons before login */
+        ?>
+            <div class="exp-loggedout install">
+            <p class="install-button <?=$_class_platform_string?>">
+            <?php
+            $login_url = $html->login_url('/'.LANG.'/'.APP_SHORTNAME."/addon/{$addonId}", false);
+            $attributes = array('id' => $installTriggerName,
+                'addonName' => $addonName,
+                'title' => sprintf(_('install_button_title'), $addonName, APP_PRETTYNAME));
+            echo $html->link('<span><span><span><strong>'
+                .sprintf(_('a_download'),$_install_platform_string)
+                .'</strong></span></span></span>',
+                $login_url, $attributes, false, false);
+            ?>
+            </p>
+            <?php
+                 $exp_addon_url = "/pages/faq#experimental-addons";
+                 echo sprintf(___('install_a_login_to_install'), $html->url($login_url), $html->url($exp_addon_url)); 
+            ?>
             </div>
         <?php endif; ?>
 	<script type="text/javascript">
@@ -265,42 +239,44 @@ if (count($addonFiles) < 1) {
     <?php
     }
     echo "</div>";
+    ?>
 
-    // show all add-on versions for all platforms on the
-    // "all versions" page
-    // This script will detect which install button should show, and hide the rest
-    echo '<script type="text/javascript">'.
-         'setTimeout(function() {'; 
-    echo "initExpConfirm('{$versionId}');";
-    $versionsPage = false;	  
-    if (!($this->name == 'Addons' && $this->action == 'versions')) {
-        echo "fixPlatformLinks('{$versionId}', document.getElementById('{$installTriggerName}').getAttribute('addonName'));";
-    } else {
-        $versionsPage = true;
-    }		
+	<?php
+	
+    if ($loggedin || !in_array($file['status'], $experimental_status)) {
+        // show all add-on versions for all platforms on the
+        // "all versions" page
+            // This script will detect which install button should show, and hide the rest
+            echo '<script type="text/javascript">'.
+                  'setTimeout(function() {'; 
+		$versionsPage = false;		  
+        if (!($this->name == 'Addons' && $this->action == 'versions')) {
+
+            echo "fixPlatformLinks('{$versionId}', document.getElementById('{$installTriggerName}').getAttribute('addonName'));";
+        } else {
+		    $versionsPage = true;		
+        }		
 		
-    // show add-on compatibility hints for Firefox
-    if (APP_ID == APP_FIREFOX && !empty($compatible_apps)) {
-        $fromVer = $toVer = null;
-        foreach ($compatible_apps as $app) {
-            if ($app['Application']['application_id'] == APP_FIREFOX) {
-                $fromVer = $app['Min_Version']['version'];
-                $toVer = $app['Max_Version']['version'];
+            // show add-on compatibility hints for Firefox
+            if (APP_ID == APP_FIREFOX && !empty($compatible_apps)) {
+                $fromVer = $toVer = null;
+                foreach ($compatible_apps as $app) {
+                    if ($app['Application']['application_id'] == APP_FIREFOX) {
+                        $fromVer = $app['Min_Version']['version'];
+                        $toVer = $app['Max_Version']['version'];
+                    }
+                }
+                if ($fromVer && $toVer) { 
+                    // show "ignore" link for logged in users only
+                    $_loggedin = $this->controller->Session->check('User');
+                    echo "addCompatibilityHints('{$addonId}', '{$versionId}', "
+                        ."'{$fromVer}', '{$toVer}', '{$_loggedin}', '{$versionsPage}');";
+                }
             }
-        }
-        if ($fromVer && $toVer) { 
-            // show "ignore" link for logged in users only
-            $_loggedin = $this->controller->Session->check('User');
-            echo "addCompatibilityHints('{$addonId}', '{$versionId}', "
-                ."'{$fromVer}', '{$toVer}', '{$_loggedin}', '{$versionsPage}');";
-        }
+            echo "},0);"
+                .'</script>';
+	
 
     }
-    echo "},0);".
-         '</script>';
-    ?>
-
-
-<?php
 }
 ?>
diff --git a/site/app/views/elements/pitch.thtml b/site/app/views/elements/pitch.thtml
index b7c96f0..5fdeafd 100644
--- a/site/app/views/elements/pitch.thtml
+++ b/site/app/views/elements/pitch.thtml
@@ -43,6 +43,13 @@
 
 // display appropriate links for browser/non-browser apps
 global $browser_apps;
+// we are sugar
+if (true) {
+    $pitch_links = array(
+        '/browse/type:'.ADDON_ACTIVITY.'/cat:all?sort=name' => _('sidebar_pitch_activity'),
+        '/browse/type:'.ADDON_CONTENT.'/cat:all?sort=name' => _('sidebar_pitch_content')
+    );
+} else
 if (in_array(APP_ID, $browser_apps)) {
     $pitch_links = array(
         '/browse/type:'.ADDON_THEME.'/cat:all?sort=name' => _('sidebar_pitch_theme'),
@@ -65,11 +72,12 @@ if (in_array(APP_ID, $browser_apps)) {
     <?php endforeach; ?>
     </ul>
     <?php
+    // @partial - 04-29-08
     // RSS links the hard way, bug 426541
-    $subscribeHeader = ___('sidebar_pitch_subscribe_to');
-    $newestLink = ___('sidebar_pitch_newest_addons');
-    $updatedLink = ___('sidebar_pitch_updated_addons');
-    $featuredLink = ___('sidebar_pitch_featured_addons');
+    $subscribeHeader = _('sidebar_pitch_subscribe_to') == 'sidebar_pitch_subscribe_to' ? 'Subscribe to' : _('sidebar_pitch_subscribe_to');
+    $newestLink = _('sidebar_pitch_newest_addons') == 'sidebar_pitch_newest_addons' ? 'Newest Add-ons' : _('sidebar_pitch_newest_addons');
+    $updatedLink = _('sidebar_pitch_updated_addons') == 'sidebar_pitch_updated_addons' ? 'Updated Add-ons' : _('sidebar_pitch_updated_addons');
+    $featuredLink = _('sidebar_pitch_featured_addons') == 'sidebar_pitch_featured_addons' ? 'Featured Add-ons' : _('sidebar_pitch_featured_addons');
     ?>
     <br/>
     <h3><?=$subscribeHeader?></h3>
diff --git a/site/app/views/elements/search.thtml b/site/app/views/elements/search.thtml
index 60cedc3..ed17837 100644
--- a/site/app/views/elements/search.thtml
+++ b/site/app/views/elements/search.thtml
@@ -67,19 +67,18 @@ $min_display_version_by_app = array( // eventually this information should be ke
 $new_versions = array();
 foreach ($app_shortnames as $n => $k) {
 // AmoVersions is from controller->beforeRender()
-    if (!empty($AmoVersions[$k])) foreach ($AmoVersions[$k] as $version) {
+    foreach ($AmoVersions[$k] as $version) {
         $versions_parts = explode(".", $version);
         $second_part = (isset($versions_parts[1])) ? ".".intval($versions_parts[1]) : "";
         if (!isset($min_display_version_by_app[$k])
             || $min_display_version_by_app[$k] <= $versions_parts[0].$second_part ) {
             
-            if ($k != APP_FIREFOX || !in_array($versions_parts[0].$second_part, array('1.4','3.1'))) { // yuck. Baz didn't like FF 1.4.  Nick didn't like FF 3.1.
+            if ($k != APP_FIREFOX || $versions_parts[0].$second_part !== '1.4') { // yuck. Baz didn't like FF 1.4
                 $new_versions[$k][] = $versions_parts[0].$second_part;  
             }
         }
     }
-    if (!empty($new_versions[$k]))
-        $new_versions[$k] = array_unique($new_versions[$k]);
+    $new_versions[$k] = array_unique($new_versions[$k]);
 }
 $versions = $new_versions;
 
diff --git a/site/app/views/errors/error404.thtml b/site/app/views/errors/error404.thtml
index 42a3a09..c204a47 100644
--- a/site/app/views/errors/error404.thtml
+++ b/site/app/views/errors/error404.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -47,14 +46,15 @@ if ($_SERVER['SERVER_NAME'] == 'localhost') {
    <?php
 } else {
 
-$this->layout='amo2009'; // use regular layout
+$this->layout='mozilla'; // use regular layout
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
 
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
 <div class="error-notice">
 
@@ -71,5 +71,6 @@ $this->layout='amo2009'; // use regular layout
 ?>
 </div>
 
+    </div>
 </div>
 <?php } ?>
diff --git a/site/app/views/helpers/addons_html.php b/site/app/views/helpers/addons_html.php
index e996a82..b2d90b6 100644
--- a/site/app/views/helpers/addons_html.php
+++ b/site/app/views/helpers/addons_html.php
@@ -123,7 +123,7 @@ class AddonsHtmlHelper extends HtmlHelper
     /**
      * creates an <a href> link to a file
      */
-    function linkFile($fileId, $title, $path, $htmlAttributes = array(), $return = false, $filename = null, $collection_id = null) {
+    function linkFile($fileId, $title, $path, $htmlAttributes = array(), $return = false, $filename = null) {
         if (strpos($path, '://')!==false) {
             $url = $path;
         } else {
@@ -141,17 +141,13 @@ class AddonsHtmlHelper extends HtmlHelper
             // optionally add file name for Save As to work correctly
             if (!empty($filename))
                 $url .= "/$filename";
-
-            // optionally add a collection stats code to the URL
-            if (!empty($collection_id))
-                $url .= "?collection_id={$collection_id}";
         }
         return $this->output(sprintf($this->tags['link'], $url, $this->parseHtmlOptions($htmlAttributes, null, '', ' '), $title), $return);
     }
     /**
      * returns the url to $fileId
      */
-    function urlFile($fileId, $filename = null, $collection_id = null) {
+    function urlFile($fileId, $filename = null) {
         $url = $this->base . '/';
         $url .= LANG;
         $url .= '/'.APP_SHORTNAME;
@@ -160,11 +156,7 @@ class AddonsHtmlHelper extends HtmlHelper
         //optionally add file name for Save As to work correctly
         if (!empty($filename))
             $url .= "/$filename";
-
-        // optionally add a collection stats code to the URL
-        if (!empty($collection_id))
-            $url .= "?collection_id={$collection_id}";
-
+            
         return $url;
     }
     
@@ -215,7 +207,7 @@ class AddonsHtmlHelper extends HtmlHelper
             $showOthers = false;
         }
 
-        $text = @implode(", ", array_map(array(&$this, 'linkUserFromModel'), $usersModel));
+        $text = implode(", ", array_map(array(&$this, 'linkUserFromModel'), $usersModel));
         
         if ($showOthers) {
             $text .= ', ';
@@ -229,23 +221,12 @@ class AddonsHtmlHelper extends HtmlHelper
     }
     
     /**
-     * Helper for getting a URL without application and locale.
-     */
-    function rootUrl($url = null) {
-        return $this->url($url, false, false, false);
-    }
-
-    /**
      * locale and application aware url generator function
      */
     function url($url = null, $return = false, $addLocale = true, $addApplication = true) {
         $oldbase = $this->base;
 
-        if (!empty($this->plugin)) {
-            $newbase = strip_plugin($this->base, $this->plugin);
-        } else {
-            $newbase = $this->base;
-        }
+        $newbase = strip_plugin($this->base, $this->plugin);
 
         // Rewrite base address to include locale, if applicable
         if ($addLocale && $this->addLocale) {
@@ -267,7 +248,7 @@ class AddonsHtmlHelper extends HtmlHelper
             $newbase .= '/'.APP_SHORTNAME;
         }
 
-        if (!empty($this->plugin)) {
+        if ($this->plugin) {
             $newbase .= '/'.$this->plugin;
         }
         
@@ -288,22 +269,18 @@ class AddonsHtmlHelper extends HtmlHelper
             // Shouldn't see anything weird here, because it has to be a valid cake url
             $_forward_to = empty($this->params['url']['url']) ?  '' : $this->params['url']['url'];
         }
-        $get_params = array();
         
         if ($add_get_parameters) {
             // add GET parameters
+            $get_params = array();
             foreach($this->params['url'] as $_key => $_param)
                 if ($_key != 'url') $get_params[] = "{$_key}={$_param}";
             if (!empty($get_params)) $_forward_to .= '?'.implode('&',$get_params);
         }
         
-        if(!isset($this->params['url']['to'])) {
-            $_forward_to = urlencode($_forward_to); // urlencode entities in the parameters
-        } else {
-            $_forward_to = urlencode($this->params['url']['to']);
-        }
-        
+        $_forward_to = urlencode($_forward_to); // urlencode entities in the parameters
         $_forward_to = '?to='.$_forward_to;
+        
         return '/users/log'.(!$logout?'in':'out').$_forward_to;
     }
     
@@ -506,95 +483,13 @@ class AddonsHtmlHelper extends HtmlHelper
         return $this->output(implode("\n", $select), $return);
     }
 
-    function truncateChars($length, $string, $onSpaces = false) {
+    function truncateChars($length, $string) {
         if (mb_strlen($string) <= $length) {
             return $string;
         } else {
-            if($onSpaces) {
-                $string = mb_substr($string, 0, $length-3);
-                $sub = mb_substr($string, 0, mb_strrpos($string, ' '));
-            } else {
-                $sub = mb_substr($string, 0, $length - 3);
-            }
+            $sub = mb_substr($string, 0, $length - 3);
             return $sub.'...';
         }
     }
-
-    /**
-     * Returns the value of $statusMap according to the status of $addon.
-     *
-     * @param array $addon Addon object
-     * @param array $statusMap assoc array with keys 'experimental',
-     *                         'recommended', and 'default'
-     */
-    function byStatus($addon, $statusMap) {
-        global $experimental_status;
-        if (in_array($addon['Addon']['status'], $experimental_status)) {
-            return $statusMap['experimental'];
-        } elseif ((isset($addon['Addon']['recommended']) && $addon['Addon']['recommended']) || $this->isFeatured($addon))
-        {
-            return $statusMap['recommended'];
-        } else {
-            return $statusMap['default'];
-        }
-    }
-
-    function extraClass($addon, $default='') {
-        return $this->byStatus($addon, array('experimental' => 'exp',
-                                             'recommended'  => 'rec',
-                                             'default'      => $default));
-    }
-    
-    /**
-     * Returns true or false if the addon is featured
-     * 
-     * @param array $addon Addon object
-     * @return boolean True/false if addon is featured
-     */
-    function isFeatured($addon) {
-        $featured = false;
-        
-        foreach($addon['AddonTag'] as $tag) {
-            if($tag['feature'] == 1) {
-                $featured = true;
-                break;
-            }
-        }
-        return $featured;
-    }
-
-    function flag($addon, $default='') {
-        $flag = $this->byStatus($addon, array(
-            'experimental' => $this->link(___('addon_listitem_flag_experimental'),
-                                          '/pages/faq#experimental-addons'),
-            'recommended'  => $this->link(___('addon_listitem_flag_recommended'),
-                                          '/pages/faq#recommended-addons'),
-            'default' => $default
-        ));
-        if (!empty($flag)) {
-            return '<h5 class="flag">'.$flag.'</h5>';
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * This is copied from cake, but with less fail.
-     *
-     * If $model->validationErrors[$field] is 1, we'll show $default_text.
-     * This is for backwards compat with $model->invalidate.
-     *
-     * If $model->validationErrors[$field] is a string, we'll use that as
-     * the error message.
-     */
-    function tagErrorMsg($field, $text) {
-        $this->setFormTag($field);
-        if ($error = $this->tagIsInvalid($this->model, $this->field)) {
-            $msg = is_string($error) ? $error : $text;
-            return sprintf('<div class="error_message">%s</div>', $msg);
-        } else {
-            return null;
-        }
-    }
 }
 ?>
diff --git a/site/app/views/helpers/link.php b/site/app/views/helpers/link.php
index e42d1d6..3c17cc5 100644
--- a/site/app/views/helpers/link.php
+++ b/site/app/views/helpers/link.php
@@ -49,27 +49,5 @@ class LinkHelper extends Helper
 
         return $this->output($o);
     }
-
-    /**
-     * Create a link to a collection.
-     * @param array $coll Collection (from collection model)
-     * @param string $app (optional) application to link to, defaults to current app
-     */
-    function collection($coll, $app = null) {
-        if (empty($coll)) return false;
-
-        $url = '/collection/';
-        if (!empty($coll['Collection']['nickname']))
-            $url .= $coll['Collection']['nickname'];
-        else
-            $url .= $coll['Collection']['uuid'];
-
-        if (!empty($app)) {
-            return $this->Html->linkNoLocaleNoApp($coll['Translation']['name']['string'],
-                sprintf('/%s/%s%s', LANG, $app, $url));
-        } else {
-            return $this->Html->link($coll['Translation']['name']['string'], $url);
-        }
-    }
 }
 ?>
diff --git a/site/app/views/helpers/listing.php b/site/app/views/helpers/listing.php
index 33bceb1..cb71113 100644
--- a/site/app/views/helpers/listing.php
+++ b/site/app/views/helpers/listing.php
@@ -95,7 +95,7 @@ class ListingHelper extends Helper
                     elseif ($encode)
                         echo '"'.urlencode($value).'",'."\n";
                     else
-                        echo "'".preg_replace('/\n/', '\n', addslashes($value))."',\n";
+                        echo "\"{$value}\",\n";
             }
         }
         echo str_repeat("\t", $tab).'}'.($tab == 0 ? '' : ',')."\n";
diff --git a/site/app/views/helpers/pagination.php b/site/app/views/helpers/pagination.php
index 3bb2243..51b9961 100644
--- a/site/app/views/helpers/pagination.php
+++ b/site/app/views/helpers/pagination.php
@@ -194,8 +194,13 @@ class PaginationHelper extends Helper
             $upperLimit = $upperLimit-1;
 
         for ($i = $lowerLimit; $i <= $upperLimit; $i++) {
-             $class = ($i == $this->_pageDetails['page']) ? 'class="selected"' : '';
-             $text = "<li {$class}>".$this->_generateLink($i,$i,$escapeTitle).'</li>';
+             if($i == $this->_pageDetails['page']) {
+                $text = '<li class="current"><strong title="'
+                    .sprintf(_('pagination_page_number_title'),$i,$total)
+                    .'">'.$i.'</strong></li>';
+             } else {
+                $text = '<li>'.$this->_generateLink($i,$i,$escapeTitle).'</li>';
+             }
              $t[] = $text;
         }
         if ($dottedUpperLimit) {
@@ -220,7 +225,7 @@ class PaginationHelper extends Helper
         if (empty($this->_pageDetails)) { return false; }
         if ( !empty($this->_pageDetails['previousPage']) )
         {
-            return $this->_generateLink($text,$this->_pageDetails['previousPage'],$escapeTitle,'prev');
+            return $this->_generateLink($text,$this->_pageDetails['previousPage'],$escapeTitle);
         }
         return '';
     }
@@ -237,7 +242,7 @@ class PaginationHelper extends Helper
         if (empty($this->_pageDetails)) { return false; }
         if (!empty($this->_pageDetails['nextPage']))
         {
-            return $this->_generateLink($text,$this->_pageDetails['nextPage'],$escapeTitle,'next');
+            return $this->_generateLink($text,$this->_pageDetails['nextPage'],$escapeTitle);
         }
         return '';
     }
@@ -396,7 +401,7 @@ class PaginationHelper extends Helper
 * @param string the div to be updated by AJAX updates
 * @return string html for link
 **/
-    function _generateLink ($title,$page=NULL,$escapeTitle,$rel=null)
+    function _generateLink ($title,$page=NULL,$escapeTitle) 
     {
         $url = $this->_generateUrl($page);
         $AjaxDivUpdate = $this->_pageDetails['ajaxDivUpdate'];
@@ -440,7 +445,7 @@ class PaginationHelper extends Helper
             return $this->Html->linkNoLocaleNoApp(
                             $title,
                             $url,
-                            isset($rel) ? array('rel' => $rel) : NULL,
+                            NULL,
                             NULL,
                             $escapeTitle
                                 );
diff --git a/site/app/views/layouts/amo2009.thtml b/site/app/views/layouts/amo2009.thtml
index c1aa4ce..56773eb 100644
--- a/site/app/views/layouts/amo2009.thtml
+++ b/site/app/views/layouts/amo2009.thtml
@@ -67,7 +67,7 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin
     <meta http-equiv="imagetoolbar" content="no"/>
     <meta name="Rating" content="General"/>
 
-    <link rel="search" type="application/opensearchdescription+xml" title="Mozilla Add-ons"
+    <link rel="search" type="application/opensearchdescription+xml" title="<?=SITE_NAME?>"
         href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" />
 
     <?php if (isset($addon['Addon']['addontype_id']) && ($addon['Addon']['addontype_id'] == ADDON_SEARCH)) : ?>
@@ -82,6 +82,7 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin
         <?= $html->css('amo2009/main', 'stylesheet', array('media'=>'screen,projection,tv')) ?>
         <?= $html->css('amo2009/slimbox2', 'stylesheet', array('media'=>'screen,projection,tv')) ?>
         <?= $html->css('amo2009/main-mozilla', 'stylesheet', array('media'=>'screen,projection,tv')) ?>
+        <?= $html->css('sugar', 'stylesheet', array('media'=>'screen,projection')) ?>
         <?= $html->css('amo2009/legacy', 'stylesheet', array('media'=>'screen,projection,tv')) ?>
     <?php endif ?>
 
@@ -196,7 +197,7 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin
     <?php endif; ?>
 </head>
 
-<body id="mozilla-com" class="html-<?=TEXTDIR?> <?=APP_SHORTNAME?> <?= ($this->controller->Session->check('User')) ? 'user-login' : 'user-anon' ?><?= isset($bodyclass) ? ' ' . $bodyclass : '' ?>">
+<body id="mozilla-com" class="html-<?=TEXTDIR?> <?=APP_SHORTNAME?> <?= ($this->controller->Session->check('User')) ? 'user-login' : 'user-anon' ?><?= isset($bodyclass) ? ' ' . $bodyclass : '' ?>  sugar">
 
     <ul id="nav-access" role="navigation">
         <li><a href="#content"><?=___('header_navaccess_main_content', 'Skip to main content')?></a></li>
@@ -343,14 +344,14 @@ if(defined('SITE_STATE') && (SITE_STATE == 'production' || SITE_STATE == 'stagin
             </form>
         <?php endif; ?>
 
-        <p><strong><?=_('footer_copyright')?> <span title="<?=php_uname('n')?>">&#169;</span> 2005&#8211;<?=date('Y')?> Mozilla.</strong> <?=_('footer_all_rights_reserved')?></p>
+        <p><strong><?=_('footer_copyright')?> <span title="<?=php_uname('n')?>">&#169;</span> 2005&#8211;<?=date('Y')?> Mozilla, <?=date('Y')?> <?=SITE_ORG?>.</strong> <?=_('footer_all_rights_reserved')?></p>
         <ul>
             <li><?=$html->link(_('footer_privacy_policy'), '/pages/privacy');?></li>
             <li><a href="http://www.mozilla.com/<?=LANG?>/about/legal.html"><?=_('footer_legal_notices')?></a></li>
             <?php if (!isset($suppressCredits) || !$suppressCredits): ?><li><?=$html->link(_('footer_credits'), '/pages/credits')?></li><?php endif; ?>
-            <li><?=$html->link(___('footer_a_about'), '/pages/about')?></li>
-            <li><?=$html->link('<abbr title="'.___('footer_abbr_faq').'">'.___('footer_a_faq').'</abbr>', '/pages/faq')?></li>
-            <li><a href="http://blog.mozilla.com/addons"><?=___('footer_a_blog')?></a></li>
+            <li><?=$html->link(___('footer_a_about'), SITE_ABOUT)?></li>
+            <li><?=$html->link('<abbr title="'.___('footer_abbr_faq').'">'.___('footer_a_faq').'</abbr>', SITE_FAQ)?></li>
+            <li><?=$html->link(___('footer_a_blog'), SITE_BLOG)?></li>
         </ul>
 
         <p class="disclaimer"><?=_('footer_disclaimer')?></p>
diff --git a/site/app/views/layouts/mozilla.thtml b/site/app/views/layouts/mozilla.thtml
index 722ef91..94e923c 100644
--- a/site/app/views/layouts/mozilla.thtml
+++ b/site/app/views/layouts/mozilla.thtml
@@ -152,7 +152,7 @@
           // <![CDATA[
 
             $(document).ready(function() {
-                $("a[rel*=jquery-lightbox]").lightBox({
+                $("a[@rel*=jquery-lightbox]").lightBox({
                     overlayOpacity: 0.6,
                     imageBlank: "'.$html->url('/img/jquery-lightbox/lightbox-blank.gif', null, false, false).'",
                     imageLoading: "'.$html->url('/img/jquery-lightbox/lightbox-ico-loading.gif', null, false, false).'",
@@ -322,6 +322,7 @@ if (!(isset($suppressHeader) && $suppressHeader))
     echo $this->renderElement('header');
 ?>
 
+<!-- mozilla.thtml processed for <?=basename(preg_replace("/\?.*/", "", $_SERVER["REQUEST_URI"]));?> -->
 <?=$content_for_layout ?>
 
 <?php
diff --git a/site/app/views/layouts/tests.thtml b/site/app/views/layouts/tests.thtml
index d538ad2..cd95736 100644
--- a/site/app/views/layouts/tests.thtml
+++ b/site/app/views/layouts/tests.thtml
@@ -6,7 +6,7 @@
     <?=$html->css('tests')?>
     <?=$html->css('admin')?>
     <?=$javascript->link('jquery-compressed.js')?>
-    <?=$javascript->link('jquery.autocomplete.pack.js')?>
+    <?=$javascript->link('jquery.autocomplete.js')?>
     <?=$javascript->link('listing')?>
 </head>
 <body>
diff --git a/site/app/views/pages/about.thtml b/site/app/views/pages/about.thtml
index 4c7befc..548086f 100644
--- a/site/app/views/pages/about.thtml
+++ b/site/app/views/pages/about.thtml
@@ -1,49 +1,14 @@
 <?php
-/* ***** 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
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is addons.mozilla.org site.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- *
- * Contributor(s):
- *   Jeff Balogh <jbalogh@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
-
-    <?=$localization->includeLocalPage('about')?>
+<div id="content">
+    <?php
+    echo $this->renderElement('search');
+    echo $this->renderElement('sidebar', array('pitch' => true));
+    echo $this->renderElement('app_chooser');
+    ?>
+    <div id="content-main">
+        <?=$localization->includeLocalPage('about')?>
+    </div>
 </div>
diff --git a/site/app/views/pages/appversions.thtml b/site/app/views/pages/appversions.thtml
index d719204..66120ae 100644
--- a/site/app/views/pages/appversions.thtml
+++ b/site/app/views/pages/appversions.thtml
@@ -20,7 +20,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 
 loadModel('Application');
 loadComponent('Versioncompare');
@@ -68,12 +67,12 @@ foreach ($applications as $application) {
 }
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
 <?php
     echo '<h1>'._('pages_appversions_header').'</h1>';
@@ -93,4 +92,5 @@ foreach ($applications as $application) {
     echo '<p>'.sprintf(_('pages_appversions_required_files'), $html->link(_('pages_appversions_required_files_link'), 'http://developer.mozilla.org/en/docs/Install_Manifests')).'</p>';
 ?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/credits.thtml b/site/app/views/pages/credits.thtml
index 409c3c8..e45fe7d 100644
--- a/site/app/views/pages/credits.thtml
+++ b/site/app/views/pages/credits.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Justin Scott <fligtar@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 
 loadModel('Group');
 $groupModel =& new Group();
@@ -89,13 +88,12 @@ ksort($editors);
 ksort($past_developers);
 ksort($other_contributors);
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
-
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 <?=_('credits_intro')?>
 <br/><br/>
 <div class="corner-box">
@@ -142,3 +140,4 @@ ksort($other_contributors);
 <?=sprintf(_('credits_contributing'), $html->link(_('credits_contributing_wikipage'), SITE_WIKI))?>
 
 </div>
+</div>
diff --git a/site/app/views/pages/faq.thtml b/site/app/views/pages/faq.thtml
index 1133b08..5700c14 100644
--- a/site/app/views/pages/faq.thtml
+++ b/site/app/views/pages/faq.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Mike Morgan <morgamic@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,16 +36,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
-    <?=$localization->includeLocalPage('faq')?>
+<?=$localization->includeLocalPage('faq')?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/js_constants.js.thtml b/site/app/views/pages/js_constants.js.thtml
index aca2ea9..bd61078 100644
--- a/site/app/views/pages/js_constants.js.thtml
+++ b/site/app/views/pages/js_constants.js.thtml
@@ -54,55 +54,33 @@ var APP_SHORTNAME = "<?=APP_SHORTNAME?>";
 var APP_PRETTYNAME = "<?=APP_PRETTYNAME?>";
 var LATEST_FIREFOX_VERSION = '<?=LATEST_FIREFOX_VERSION?>';
 var LATEST_FIREFOX_DEVEL_VERSION = '<?=LATEST_FIREFOX_DEVEL_VERSION?>';
-var APP_FIREFOX = '<?=APP_FIREFOX?>';
-var APP_SEAMONKEY = '<?=APP_SEAMONKEY?>';
-var APP_THUNDERBIRD = '<?=APP_THUNDERBIRD?>';
-var APP_SUNBIRD = '<?=APP_SUNBIRD?>';
-var APP_FENNEC = '<?=APP_FENNEC?>';
-<?php /* generic constants */ ?>
-var KEYCODE_ENTER = 13;
-<?php
-$constants = array(
-    'addOnNotAvailableForPlatform' => ___('addon_not_available_for_platform'),
-    'error_opensearch_unsupported' => ___('addons_searchengines_error_mozilla_browser_required'),
-
-    /* Fallback from 3/19/08 */
-    'app_compat_update_firefox' => ___('app_compat_update_firefox'),
-    'app_compat_try_old_version' => ___('app_compat_try_old_version'),
-    'app_compat_older_firefox_only' => ___('app_compat_older_firefox_only'),
-    'app_compat_unreleased_version' => ___('app_compat_unreleased_version'),
-    'app_compat_older_version_or_ignore_check' => ___('app_compat_older_version_or_ignore_check'),
-
-    /* developers.js */
-    'devcp_js_upload_alert' => ___('devcp_js_upload_alert'),
-    'addons_status_public' => ___('addons_status_public'),
-    'addons_status_sandbox' => ___('addons_status_sandbox'),
-    'addons_status_pending' => ___('addons_status_pending'),
-    'devcp_js_img_move_down' => ___('devcp_js_img_move_down'),
-    'devcp_js_img_move_up' => ___('devcp_js_img_move_up'),
-    'devcp_js_option_owner' => ___('devcp_js_option_owner'),
-    'devcp_js_option_developer' => ___('devcp_js_option_developer'),
-    'devcp_js_option_viewer' => ___('devcp_js_option_viewer'),
-    'devcp_js_input_list_author' => ___('devcp_js_input_list_author'),
-    'devcp_js_sure_remove' => ___('devcp_js_sure_remove'),
-    'devcp_js_remove_author' => ___('devcp_js_remove_author'),
-    'devcp_js_a_cancel' => ___('devcp_js_a_cancel'),
-    'devcp_js_add_email' => ___('devcp_js_add_email'),
-    'devcp_js_img_remove_compat' => ___('devcp_js_img_remove_compat'),
-    'devcp_js_license_select' => ___('devcp_js_license_select'),
-    'devcp_js_license_text' => ___('devcp_js_license_text'),
+var addOnNotAvailableForPlatform = "<?=_('addon_not_available_for_platform')?>";
+var error_opensearch_unsupported = "<?=_('addons_searchengines_error_mozilla_browser_required')?>";
 
-    /* Fallback from 4/14/08 */
-    'app_compat_ignore_check' => ___('app_compat_ignore_check'),
+<?php /* Fallback from 3/19/08 */?>
+var app_compat_update_firefox = '<?=___('app_compat_update_firefox')?>';
+var app_compat_try_old_version = '<?=___('app_compat_try_old_version')?>';
+var app_compat_older_firefox_only = '<?=___('app_compat_older_firefox_only')?>';
+var app_compat_unreleased_version = '<?=___('app_compat_unreleased_version')?>';
+var app_compat_older_version_or_ignore_check = '<?=___('app_compat_older_version_or_ignore_check')?>';
 
-    // collections
-    'collections_edit_submit' => ___('collections_edit_submit'),
-    'collections_edit_submit_deletecollection' => ___('collections_edit_submit_deletecollection'),
+<?php /* developers.js */ ?>
+var devcp_js_upload_alert = '<?=___('devcp_js_upload_alert')?>';
+var addons_status_public = '<?=___('addons_status_public')?>';
+var addons_status_sandbox = '<?=___('addons_status_sandbox')?>';
+var addons_status_pending = '<?=___('addons_status_pending')?>';
+var devcp_js_img_move_down = '<?=___('devcp_js_img_move_down')?>';
+var devcp_js_img_move_up = '<?=___('devcp_js_img_move_up')?>';
+var devcp_js_option_owner = '<?=___('devcp_js_option_owner')?>';
+var devcp_js_option_developer = '<?=___('devcp_js_option_developer')?>';
+var devcp_js_option_viewer = '<?=___('devcp_js_option_viewer')?>';
+var devcp_js_input_list_author = '<?=___('devcp_js_input_list_author')?>';
+var devcp_js_sure_remove = '<?=___('devcp_js_sure_remove')?>';
+var devcp_js_remove_author = '<?=___('devcp_js_remove_author')?>';
+var devcp_js_a_cancel = '<?=___('devcp_js_a_cancel')?>';
+var devcp_js_add_email = '<?=___('devcp_js_add_email')?>';
+var devcp_js_img_remove_compat = '<?=___('devcp_js_img_remove_compat')?>';
 
-    /* addons display page */
-    'addons_display_collection_publish_success' => ___('addons_display_collection_publish_success')
-);
+<?php /* Fallback from 4/14/08 */?>
+var app_compat_ignore_check = '<?=___('app_compat_ignore_check')?>';
 
-foreach ($constants as $var_name => $l10n_string) {
-    echo sprintf('var %s = "%s";'."\n", $var_name, addslashes($l10n_string));
-}
diff --git a/site/app/views/pages/policy.thtml b/site/app/views/pages/policy.thtml
index 23c93ca..de718ec 100644
--- a/site/app/views/pages/policy.thtml
+++ b/site/app/views/pages/policy.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
-    <?=$localization->includeLocalPage('policy', array($html->link(_('pages_policy_sandbox_link'), '/pages/sandbox')))?>
+<?=$localization->includeLocalPage('policy', array($html->link(_('pages_policy_sandbox_link'), '/pages/sandbox')))?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/privacy.thtml b/site/app/views/pages/privacy.thtml
index 23d072a..cccaa88 100644
--- a/site/app/views/pages/privacy.thtml
+++ b/site/app/views/pages/privacy.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,17 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-    <?=$localization->includeLocalPage('privacy')?>
+<?=$localization->includeLocalPage('privacy')?>
 
+    </div>
 </div>
 
diff --git a/site/app/views/pages/review_guide.thtml b/site/app/views/pages/review_guide.thtml
index 8ddd885..d88fd4e 100644
--- a/site/app/views/pages/review_guide.thtml
+++ b/site/app/views/pages/review_guide.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,17 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-    <?=$localization->includeLocalPage('reviewguide')?>
+<?=$localization->includeLocalPage('reviewguide')?>
 
+    </div>
 </div>
 
diff --git a/site/app/views/pages/sandbox.thtml b/site/app/views/pages/sandbox.thtml
index 734e8b6..559a4ef 100644
--- a/site/app/views/pages/sandbox.thtml
+++ b/site/app/views/pages/sandbox.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-    <?=$localization->includeLocalPage('sandbox', array('<img src="'.$html->url('/images/localized_image/sandbox-review.png').'">'))?>
+<?=$localization->includeLocalPage('sandbox', array('<img src="'.$html->url('/images/localized_image/sandbox-review.png').'">'))?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/submissionhelp.thtml b/site/app/views/pages/submissionhelp.thtml
index e615b0f..91adf6c 100644
--- a/site/app/views/pages/submissionhelp.thtml
+++ b/site/app/views/pages/submissionhelp.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-    <?=$localization->includeLocalPage('submission_help', array($html->url('/pages/policy')))?>
+<?=$localization->includeLocalPage('submission_help', array($html->url('/pages/policy')))?>
 
+    </div>
 </div>
diff --git a/site/app/views/reviews/add.thtml b/site/app/views/reviews/add.thtml
index 1e20e47..c97731a 100644
--- a/site/app/views/reviews/add.thtml
+++ b/site/app/views/reviews/add.thtml
@@ -35,22 +35,36 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
-
-$this->viewVars['bodyclass'] = 'review_add';
-$this->layout = 'amo2009';
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
     <div id="content-main">
     
-<h2><?=sprintf((@$this->data['Review']['id'] > 0) ? _('addon_review_edit_title') : _('addon_review_add_title'), $addon['Translation']['name']['string']); ?></h2>
-<? $reviewRating = @$this->data['Review']['rating']; ?>
-<?php echo sprintf(___('review_guidelines_short'), $html->url("/addon/{$addon['Addon']['id']}#support"), $html->url('/pages/review_guide')); ?>
+<h1><?=sprintf((@$this->data['Review']['id'] > 0) ? _('addon_review_edit_title') : _('addon_review_add_title'), $addon['Translation']['name']['string']); ?></h1>
+
+<?php echo sprintf(___('review_guidelines_short', <<<EOT
+<p>Keep these tips in mind:</p>
+<ul>
+<li>Write like you're telling a friend about your experience with the add-on. 
+Give specifics and helpful details, such as what features you liked and/or
+disliked, how easy to use it is, and any disadvantages it has.  Avoid generic
+language such as calling it "Great" or "Bad" unless you can give reasons why
+you believe this is so.</li>
+<li>Please do not post bug reports in reviews. We do not make your email address
+available to add-on developers and they may need to contact you to help resolve
+your issue. See the <a href="%1\$s">support section</a> to find out where to get
+assistance for this add-on.</li>
+<li>Please keep reviews clean, avoid the use of improper language and do not
+post any personal information.</li>
+</ul>
+<p>Please read the <a href="%2\$s">Review Guidelines</a> for more detail about
+user add-on reviews.</p>
+EOT
+), $html->url("/addon/{$addon['Addon']['id']}#support"),
+    $html->url('/pages/review_guide')); /* @partial, 6/22/08 */ ?>
 
 <? // if this is a developer reply, show the original review
 if (!empty($reply_to)) {
diff --git a/site/app/views/reviews/delete.thtml b/site/app/views/reviews/delete.thtml
index 89a2bf6..f65d302 100644
--- a/site/app/views/reviews/delete.thtml
+++ b/site/app/views/reviews/delete.thtml
@@ -20,7 +20,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Wil Clouser <clouserw@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,34 +34,29 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
-$this->layout = 'amo2009';
 ?>
-
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
+    <div id="content-main">
         <h2><?=_('addon_review_delete_header')?></h2><br>
         
-        <div class="article">
-            <h3><?=$html->link($review['Addon']['Translation']['name']['string'], '/addons/display/'.$review['Addon']['Addon']['id']).
-                    ': '.$review['Translation']['title']['string']?></h3>
-            <div>
-                <?= sprintf(_('addon_reviewed_on_x_rated_y'), $html->linkUserFromModel($review['User']), strftime(_('date'), strtotime($review['Review']['created'])), $review['Review']['rating'])?>
-            </div>
-            <?=$review['Translation']['body']['string']?>
-        
-            <?=$html->formTag("/reviews/delete/{$review['Review']['id']}")?>
+        <h3><?=$html->link($review['Addon']['Translation']['name']['string'], '/addons/display/'.$review['Addon']['Addon']['id']).
+                ': '.$review['Translation']['title']['string']?></h3>
+        <div class="reviewed-on">
+            <?= sprintf(_('addon_reviewed_on_x_rated_y'), $html->linkUserFromModel($review['User']), strftime(_('date'), strtotime($review['Review']['created'])), $review['Review']['rating'])?>
         </div>
-        <div class="item">
-            <div align="center">
-                <?=_('addon_review_confirm_delete')?><br>
-                <input type="submit" name="no" value="<?=_('addon_review_confirm_no')?>">
-                <input type="submit" name="yes" value="<?=_('addon_review_confirm_yes')?>">
-            </div>
-            </form>
+        <?=$review['Translation']['body']['string']?>
+    
+        <?=$html->formTag("/reviews/delete/{$review['Review']['id']}")?>
+        <div align="center">
+            <?=_('addon_review_confirm_delete')?><br>
+            <input type="submit" name="no" value="<?=_('addon_review_confirm_no')?>">
+            <input type="submit" name="yes" value="<?=_('addon_review_confirm_yes')?>">
         </div>
+        </form>
+
+    </div>
 </div>
diff --git a/site/app/views/reviews/display.thtml b/site/app/views/reviews/display.thtml
index 200aac5..a8b0146 100644
--- a/site/app/views/reviews/display.thtml
+++ b/site/app/views/reviews/display.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <clouserw@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 
+// @partial translation fallback for review flagging, 5/22/08
 if ($loggedin) {
     $_review_flag_this = ___('review_flag_this', 'Report this review');
     $_review_flag_this_titletip = ___('review_flag_this_titletip', 'Is this review inappropriate, inaccurate or spam? Click here to flag it for editor review.');
@@ -44,34 +44,38 @@ if ($loggedin) {
 $bare = isset($_GET['bare']) ? ( $_GET['bare'] == 1 ) : FALSE;
 ?>
 <?php if (!$bare): ?>
-<?php $this->layout = 'amo2009'; ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
-<div id="content-main" class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+    <div id="content-main">
     
-<h2><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h2>
+<h1><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h1>
+<p></p>
 <?php else: ?>
 <div class="other-reviews">
 <?php endif ?>
-
 <?php
 foreach ($reviews as $review):
     $review_id = $review['Review']['id'];
     $review['Translation'] = (array_key_exists(LANG, $review['Translation']) ?
         $review['Translation'][LANG] : current($review['Translation']));
 ?>
-    <div class="item review" id="review-<?=$review['Review']['id']?>">
+    <div class="corner-box review" id="review-<?=$review['Review']['id']?>">
     <h3><?=$review['Translation']['title']['string']?></h3>
     
     <div class="reviewed-on">
-        <?=$this->renderElement('amo2009/stars',array('rating' => $review['Review']['rating']))?>	
+        <?=$this->renderElement('stars',array('rating' => $review['Review']['rating']))?>	
         <?php
-            echo sprintf(___('addon_reviewed_by_u_on_d'),
-                     $html->linkUserFromModel($review['User']),
-                     strftime(_('date'), strtotime($review['Review']['created'])));
+            // @partial: translation fallback for bug 427376, 04/24/08
+            if (_('addon_reviewed_by_u_on_d') == 'addon_reviewed_by_u_on_d') {
+                echo $html->linkUserFromModel($review['User']).", ".strftime(_('date'), strtotime($review['Review']['created']));
+            } else {
+                echo sprintf(_('addon_reviewed_by_u_on_d'),
+                         $html->linkUserFromModel($review['User']),
+                         strftime(_('date'), strtotime($review['Review']['created'])));
+            }
         ?>
         <?=($isAuthor || $isAdmin) ? '['.$html->link(_('addon_review_author_reply_link'), "/reviews/reply/{$review['Review']['id']}").']' : '' ?>
         <?=($canDelete) ? '['.$html->link(_('addon_review_admin_delete'), "/reviews/delete/{$review['Review']['id']}").']' : ''?>
@@ -153,7 +157,7 @@ foreach ($reviews as $review):
         $reply['Translation'][LANG] : current($reply['Translation']));
     $reply_id = $reply['Review']['id'];
     ?>
-        <div class="review review-reply" id="review-<?=$reply['Review']['id']?>">
+        <div class="corner-box review-reply" id="review-<?=$reply['Review']['id']?>">
         <h3><?=_('addon_review_reply_prefix') .' '. $reply['Translation']['title']['string']?></h3>
         
         <div class="reviewed-on">
@@ -209,8 +213,9 @@ foreach ($reviews as $review):
 <? endforeach; ?>
 
 <?php if (!$bare): ?>
-<? if (!empty($reviews)) echo $this->renderElement('amo2009/pagination');?>
-<div class="clearboth"> <hr /> </div>
+<? if (!empty($reviews)) echo $this->renderElement('pagination');?>
+<p></p>
+<div class="divider"><hr></div>
 
 <ul>
     <li><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></li>
diff --git a/site/app/views/reviews/flag.thtml b/site/app/views/reviews/flag.thtml
index 3106ac3..e19665b 100644
--- a/site/app/views/reviews/flag.thtml
+++ b/site/app/views/reviews/flag.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <clouserw@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -40,21 +39,20 @@
 if (!empty($ajaxreply)):
     echo "<strong>{$msg}</strong>";
 else:
-    $this->layout = 'amo2009';
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
 <?php if (empty($addon)): ?>
-    <?=$this->renderElement('notification', array('msg' => $msg));?>
+    <h1><?=$msg?></h1>
     <p><?=$html->link(_('link_return_to_front_page'), '/')?></p>
 <?php else: ?>
-    <h2><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h2>
-    <?=$this->renderElement('notification', array('msg' => $msg));?>
+    <h1><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h1>
+    <p><?=$msg?></p>
     
     <ul>
         <li><?= $html->link(sprintf(_('addon_review_a_back_to_reviews'), $addon['Translation']['name']['string']), '/reviews/display/'.$addon['Addon']['id']); ?></li>
diff --git a/site/app/views/reviews/review_added.thtml b/site/app/views/reviews/review_added.thtml
index 5b2e608..81214bf 100644
--- a/site/app/views/reviews/review_added.thtml
+++ b/site/app/views/reviews/review_added.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <clouserw@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,25 +35,23 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
-
-$this->layout = 'amo2009';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
-    <h2><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h2>
-    <?=$this->renderElement('notification', array('type' => 'success', 'msg' => _('addon_review_saved_successfully')));?>
-    <? if (isset($moderated) && $moderated) 
-        $this->renderElement('notification', array('type' => 'notification', 'msg' => _('addon_review_in_moderation'))); ?>
+<h1><?=sprintf(_('reviews_header'), $addon['Translation']['name']['string']);?></h1>
+<p><?=_('addon_review_saved_successfully')?></p>
+<p><? if (isset($moderated) && $moderated) echo _('addon_review_in_moderation'); ?></p>
 
 <ul>
     <li><?= $html->link(sprintf(_('addon_review_a_back_to_reviews'), $addon['Translation']['name']['string']), '/reviews/display/'.$addon['Addon']['id']); ?></li>
     <li><?=$html->link(sprintf(_('addon_review_a_back_to_addon_x'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></li>
 </ul>
 
+    </div>
 </div>
diff --git a/site/app/views/search/index.thtml b/site/app/views/search/index.thtml
index 619790d..6bc1ea4 100644
--- a/site/app/views/search/index.thtml
+++ b/site/app/views/search/index.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,40 +35,44 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
+?>
+
+<div id="content" class="search">
 
-$this->viewVars['bodyclass'] = 'inverse';
-$this->layout = 'amo2009';
+<?=$this->renderElement('search', array('query'=>$search_terms, 
+    'category'=>$category, 'appid'=>$appid, 'atype'=>$atype, 'lup'=>"$lup", 
+    'pid'=>$pid, 'sort'=>$sort, 'hver'=>$hver, 'lver'=>$lver, 'vfuz'=>$vfuz, 'pp'=>$pp))?>
 
+<div id="content-main">
+
+<?php if (empty($search_results)): ?>
+<p class="addon-search-message"><?=_('search_nothing_found')?></p>
+<?php else: ?>
+    <ul id="addon-listing">
+<?php
+    foreach ($search_results as $var => $val) {
+        // prepare preview image
+        $prevPath = $this->controller->Image->getHighlightedPreviewURL($val['Addon']['id']);
+        // prepare icon
+        $iconPath = $this->controller->Image->getAddonIconURL($val['Addon']['id']);
+        
+        echo $this->renderElement('addon_listitem', array(
+            'addon'         => $val,
+            'addonIconPath' => $iconPath,
+            'addonPreviewPath' => $prevPath
+            ));
+    }
 ?>
-<div class="section">
-  <div class="stand-alone-options">
-    <?=$this->renderElement('amo2009/categories')?>
-    <?=$this->renderElement('amo2009/search', array('query'=>$search_terms, 
-        'category'=>$category, 'appid'=>$appid, 'atype'=>$atype, 'lup'=>"$lup", 
-        'pid'=>$pid, 'sort'=>$sort, 'hver'=>$hver, 'lver'=>$lver, 'vfuz'=>$vfuz, 'pp'=>$pp))?>
-  </div>
-  <?php // TODO Remove style when new search design is implemented; bug 482857 ?>
-  <div class="primary" style="width:100%;">
-    <?=$this->renderElement('amo2009/breadcrumbs')?>
 
-    <div class="featured listing">
-      <div class="featured-inner">
-        <div class="listing-header">
-            <?php if (empty($search_results)): ?>
-                <p class="addon-search-message"><?=_('search_nothing_found')?></p>
-            <?php endif; ?>
-        </div> <!-- listing-header -->
-            <?php
-                foreach ($search_results as $var => $val) {
-                    echo $this->renderElement('amo2009/homepage_addon', array('addon' => $val));
-                }
-            ?>
-      </div> <!-- featured-inner -->
-      <?php if (count($search_results) > 0): ?>
-        <div class="listing-footer">
-          <?=$this->renderElement('amo2009/pagination');?>
-        </div>
-      <?php endif; ?>
-    </div> <!-- featured listing -->
-  </div> <!-- primary -->
-</div><!-- /#section -->
+    </ul>
+
+<?=$this->renderElement('pagination',
+    array('countstring' => sprintf(ngettext('search_matching_addons_number',
+        'search_matching_addons_number', $paging['total']), $paging['total'])));?>
+
+<?php endif; ?>
+</div><!-- /#content-main -->
+
+<?=$this->renderElement('sidebar')?>
+<?=$this->renderElement('app_chooser')?>
+</div><!-- /#content -->
diff --git a/site/app/views/statistics/addon.thtml b/site/app/views/statistics/addon.thtml
index f05abad..b22702d 100644
--- a/site/app/views/statistics/addon.thtml
+++ b/site/app/views/statistics/addon.thtml
@@ -44,25 +44,25 @@ echo '<div id="content">';
         echo '<div class="notice-updated">'._('statistics_notice_settings_updated').'</div>';
     }
 ?>
-    <div class="article">
+    
     <div class="bluebox-tr"><div class="bluebox-tl">
-        <div id="statistics-header">
-            <div id="statistics-controls">
+        <div style="min-height: 32px; padding: 10px;">
+            <div style="text-align: right; float: right;">
                 <?php
                 if (!empty($all_addons)) {
                     echo _('statistics_addon_switch').':';
                     echo $html->selectTag('Addon/id', $all_addons, $addon_id, array('onChange' => 'changeAddon(this);'), null, false).'<br>';
                 }
                 ?>
-                <span id="statistics-links">
+                <span style="font-size: 10px;">
                     <?=$html->link(_('statistics_addon_developertools_link'), '/developers')?> |
                     <?=$html->link(_('statistics_addon_dashboard_link'), '/statistics')?> |
                     <a href="#" onclick="$('#helpbox').toggle(); return false;"><?=_('statistics_help_link')?></a>
                 </span>
             </div>
             <div>
-                <img id="addon-icon" src="<?=$addonIcon?>" alt="<?=$addon_name?> Icon">
-                <h3 id="addon-title"><?=sprintf(_('statistics_title_addon_stats'), $addon_name)?></h3>
+                <img id="addon-icon" src="<?=$addonIcon?>" alt="<?=$addon_name?> Icon" style="padding-right: 5px; float: left;">
+                <h3 style="line-height: 2;"><?=sprintf(_('statistics_title_addon_stats'), $addon_name)?></h3>
             </div>
         </div>
         
@@ -138,9 +138,9 @@ echo '<div id="content">';
         <?php endif; ?>
         
         <div class="bluebox-br"><div class="bluebox-bl"></div></div>
-    </div></div></div>
+    </div></div>
 
-<br />
+<br>
 
 <?php if (!$this->controller->Config->getValue('stats_disabled') || $this->controller->SimpleAcl->actionAllowed('*', '*', $this->controller->Session->read('User'))): ?>
 <div class="greenbox-tr"><div class="greenbox-tl">
@@ -151,7 +151,7 @@ echo '<div id="content">';
                     <?=_('statistics_summary_downloads_total')?>
                     <div class="date"><?=sprintf(_('statistics_summary_downloads_total_sincedate'), strftime(_('statistics_date_shortmonthwithyear'), strtotime($addon['Addon']['created'])))?></div>
                 </td>
-                <td class="bigvalue" style="width: 19%;"><?=$statistics->number_format($stats, 'totaldownloads')?></td>
+                <td class="bigvalue" style="width: 19%;"><?=(!empty($stats['totaldownloads']) ? $html->number_format($stats['totaldownloads'], 0) : 0)?></td>
                 <td class="spacer" style="width: 2%;"></td>
                 <td class="biglabel" valign="middle" style="width: 30%;">
                     <?=_('statistics_summary_updatepings_total')?>
@@ -164,14 +164,14 @@ echo '<div id="content">';
                         ?>
                     </div>
                 </td>
-                <td class="bigvalue" style="width: 19%;"><?=$statistics->number_format($stats, 'last_updatepings')?></td>
+                <td class="bigvalue" style="width: 19%;"><?=(!empty($stats['last_updatepings']) ? $html->number_format($stats['last_updatepings'], 0) : 0)?></td>
             </tr>
             <tr>
                 <td class="label">
                     <?=_('statistics_summary_downloads_lastcount')?>
                     <div class="date"><?=(!empty($stats['last_downloads_date']) ? strftime(_('statistics_date_weekdayshortmonth'), strtotime($stats['last_downloads_date'])) : '')?></div>
                 </td>
-                <td class="value"><?=$statistics->number_format($stats, 'last_downloads')?></td>
+                <td class="value"><?=(!empty($stats['last_downloads']) ? $html->number_format($stats['last_downloads'], 0) : 0)?></td>
                 <td class="spacer"></td>
                 <td class="label">
                     <?=_('statistics_summary_updatepings_changefromprevious')?>
@@ -185,31 +185,33 @@ echo '<div id="content">';
                     </div>
                 </td>
                 <td class="value">
-                    <?=$statistics->colored_percentage($stats, 'updateping_change')?>
+                    <?php
+                    if (!empty($stats['updateping_change'])) {
+                        if ($stats['updateping_change'] > 0)
+                            echo '<span style="color: green;">+';
+                        elseif ($stats['updateping_change'] < 0)
+                            echo '<span style="color: red;">';
+                        else
+                            echo '<span style="color: blue;">';
+                        echo round($stats['updateping_change'], 2).'%</span>';
+                    }
+                    else
+                        echo '0';
+                    ?>
                 </td>
             </tr>
             <tr>
                 <td class="label"><?=_('statistics_summary_downloads_average')?></td>
-                <td class="value"><?=$statistics->number_format($stats, 'avg_downloads')?></td>
+                <td class="value"><?=(!empty($stats['avg_downloads']) ? $html->number_format($stats['avg_downloads'], 0) : 0)?></td>
                 <td class="spacer"></td>
                 <td class="label"><?=_('statistics_summary_updatepings_average')?></td>
-                <td class="value"><?=$statistics->number_format($stats, 'avg_updatepings')?></td>
+                <td class="value"><?=(!empty($stats['avg_updatepings']) ? $html->number_format($stats['avg_updatepings'], 0) : 0)?></td>
             </tr>
             <tr>
                 <td class="label"><?=_('statistics_summary_downloads_lastweek')?></td>
-                <td class="value"><?=$statistics->number_format($stats, 'weeklydownloads')?></td>
+                <td class="value"><?=(!empty($stats['weeklydownloads']) ? $html->number_format($stats['weeklydownloads'], 0) : 0)?></td>
                 <td class="spacer"></td>
-                <td class="label">
-                    <?=___('statistics_summary_updatepings_weekly_average')?>
-                    <div class="date">
-                        <?=sprintf(___('statistics_summary_updatepings_weekly_change'),
-                                   $statistics->colored_percentage($stats, 'weekly_updatepings_change'))
-                        ?>
-                    </div>
-                </td>
-                <td class="value">
-                    <?=$statistics->number_format($stats, 'weekly_updatepings')?>
-                </td>
+                <td colspan="2" style="text-align: right; vertical-align: baseline;"><?=$html->link($html->image('stats/rss16x16.png'), "/statistics/addon/{$addon['Addon']['id']}/format:rss{$key}", array('title' => _('statistics_rss_icon_title')))?></td>
             </tr>
         </table>
     </div>
diff --git a/site/app/views/statistics/index.thtml b/site/app/views/statistics/index.thtml
index 5b40a4d..4fc7aaa 100644
--- a/site/app/views/statistics/index.thtml
+++ b/site/app/views/statistics/index.thtml
@@ -35,38 +35,12 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
- 
-echo '<h1>'._('statistics_index_title').'</h1>';
 
-echo '<div class="secondary" role="complementary">';
+echo '<div id="content">';
     echo $this->renderElement('developers/myaddons', array('addons' => $addons));
-echo '</div>';
 
-echo '<div class="primary">';
-
-    echo '<div id="content-main" class="article">';
-        echo '<h4>Current Review Queue Stats:</h4>';
-        echo '<ul>';
-        echo '<li>'.$dailyStats['nomination'].' add-ons currently nominated to become public</li>';
-        echo '<li>'.$dailyStats['pending'].' files currently pending review</li>';
-        echo '<li>'.$dailyStats['flagged'].' add-ons flagged for admin review</li>';
-        echo '<li>'.$dailyStats['reviews'].' user reviews currently flagged</li>';
-        echo '</ul>';
-
-        echo '<h4>Daily Totals for '.$dailyStats['after'].' thru '.$dailyStats['before'].':</h4>';
-        echo '<ul>';
-        echo '<li>'.$dailyStats['dailyAddons'].' new add-ons ('.$dailyStats['totalAddons'].' total)</li>';
-        echo '<li>'.$dailyStats['dailyVersions'].' new add-on versions</li>';
-        echo '<li>'.$dailyStats['dailyUsers'].' new user accounts total</li>';
-        echo '<li>'.$dailyStats['dailyReviews'].' new user reviews</li>';
-        echo '<li>'.$dailyStats['dailyImages'].' new preview images</li>';
-        echo '<li>'.$dailyStats['dailyDownloads'].' add-on downloads yesterday</li>';
-        echo '</ul>';
-    echo '</div>';
-
-    echo '<h3>Add-on statistics</h3>';
-    echo '<div class="featured prose">';
-    echo '<div class="featured-inner article">';
+    echo '<div id="content-main">';
+    echo '<h3>'._('statistics_index_title').'</h3>';
         if (!empty($addons)) {
             echo '<p>'._('statistics_index_myaddons').':</p>';
             echo '<ul>';
@@ -97,7 +71,6 @@ echo '<div class="primary">';
             echo '<noscript><input type="submit" value="'._('statistics_index_view_button').'"></noscript>';
             echo '</form>';
         }
-    echo '</div>';
-    echo '</div>';
     ?>
     </div>
+</div>
\ No newline at end of file
diff --git a/site/app/views/statistics/rss/summary.thtml b/site/app/views/statistics/rss/summary.thtml
index 8412069..25ee7ca 100644
--- a/site/app/views/statistics/rss/summary.thtml
+++ b/site/app/views/statistics/rss/summary.thtml
@@ -37,10 +37,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 $summary = '<b>'._('statistics_summary_downloads_heading').'</b><br />';
-$summary .= _('statistics_summary_downloads_total').' ('.sprintf(_('statistics_summary_downloads_total_sincedate'), strftime(_('statistics_date_shortmonthwithyear'), strtotime($addon['Addon']['created']))).'): '.$statistics->number_format($stats, 'totaldownloads').'<br />';
-$summary .= _('statistics_summary_downloads_lastcount').(!empty($stats['last_downloads_date']) ? ' ('.strftime(_('statistics_date_weekdayshortmonth'), strtotime($stats['last_downloads_date'])).')' : '').': '.$statistics->number_format($stats, 'last_downloads').'<br />';
-$summary .= _('statistics_summary_downloads_average').': '.$statistics->number_format($stats, 'avg_downloads').'<br />';
-$summary .= _('statistics_summary_downloads_lastweek').': '.$statistics->number_format($stats, 'weeklydownloads').'<br /><br />';
+$summary .= _('statistics_summary_downloads_total').' ('.sprintf(_('statistics_summary_downloads_total_sincedate'), strftime(_('statistics_date_shortmonthwithyear'), strtotime($addon['Addon']['created']))).'): '.(!empty($stats['totaldownloads']) ? $html->number_format($stats['totaldownloads'], 0) : 0).'<br />';
+$summary .= _('statistics_summary_downloads_lastcount').(!empty($stats['last_downloads_date']) ? ' ('.strftime(_('statistics_date_weekdayshortmonth'), strtotime($stats['last_downloads_date'])).')' : '').': '.(!empty($stats['last_downloads']) ? $html->number_format($stats['last_downloads'], 0) : 0).'<br />';
+$summary .= _('statistics_summary_downloads_average').': '.(!empty($stats['avg_downloads']) ? $html->number_format($stats['avg_downloads'], 0) : 0).'<br />';
+$summary .= _('statistics_summary_downloads_lastweek').': '.(!empty($stats['weeklydownloads']) ? $html->number_format($stats['weeklydownloads'], 0) : 0).'<br /><br />';
 
 $summary .= '<b>'._('statistics_summary_updatepings_heading').'</b><br />';
 $summary .= _('statistics_summary_updatepings_total').' (';
@@ -48,19 +48,26 @@ if (!empty($stats['last_updatepings_date']))
     $summary .= sprintf(_('statistics_summary_updatepings_total_ondate'), strftime(_('statistics_date_weekdayshortmonth'), strtotime($stats['last_updatepings_date'])));
 else
     $summary .= _('statistics_summary_nodata');
-$summary .= '): '.$statistics->number_format($stats, 'last_updatepings').'<br />';
+$summary .= '): '.(!empty($stats['last_updatepings']) ? $html->number_format($stats['last_updatepings'], 0) : 0).'<br />';
 $summary .= _('statistics_summary_updatepings_changefromprevious').' (';
 if (!empty($stats['previous_updatepings']))
     $summary .= sprintf(_('statistics_summary_updatepings_changefromprevious_ondate'), $html->number_format($stats['previous_updatepings'], 0), strftime(_('statistics_date_shortmonth'), strtotime($stats['previous_updatepings_date'])));
 else
     $summary .= _('statistics_summary_nodata');
 $summary .= '): ';
-$summary .= $statistics->colored_percentage($stats, 'updateping_change');
+if (!empty($stats['updateping_change'])) {
+    if ($stats['updateping_change'] > 0)
+        $summary .= '<span style="color: green;">+';
+    elseif ($stats['updateping_change'] < 0)
+        $summary .= '<span style="color: red;">';
+    else
+        $summary .= '<span style="color: blue;">';
+    $summary .= round($stats['updateping_change'], 2).'%</span>';
+}
+else
+    $summary .= '0';
 $summary .= '<br />';
-$summary .= _('statistics_summary_updatepings_average').': '.$statistics->number_format($stats, 'avg_updatepings').'<br />';
-$summary .= ___('statistics_summary_updatepings_weekly_average').': '.$statistics->number_format($stats, 'weekly_updatepings');
-$summary .= ' ('.sprintf(___('statistics_summary_updatepings_weekly_change'),
-                         $statistics->colored_percentage($stats, 'weekly_updatepings_change')).')';
+$summary .= _('statistics_summary_updatepings_average').': '.(!empty($stats['avg_updatepings']) ? $html->number_format($stats['avg_updatepings'], 0) : 0).'<br />';
 
 $today = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
 
diff --git a/site/app/views/statistics/settings.thtml b/site/app/views/statistics/settings.thtml
index 549ad64..a23f8a3 100644
--- a/site/app/views/statistics/settings.thtml
+++ b/site/app/views/statistics/settings.thtml
@@ -36,13 +36,10 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 ?>
-<div class="secondary" role="complementary">
+<div id="content">
     <?=$this->renderElement('developers/myaddons', array('addons' => $all_addons));?>
-</div>
 
-<div class="primary prose">
-
-    <div id="content-main" class="article settings-content">
+    <div id="content-main" class="settings-content">
         <h3><?=sprintf(_('statistics_settings_title'), $addon['Translation']['name']['string'])?></h3><br>
         <?=$html->formTag('/statistics/settings/'.$addon['Addon']['id'], 'post');?>
         <h4><?=_('statistics_settings_access_heading')?></h4>
@@ -58,4 +55,4 @@
         </div>
         </form>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/site/app/views/users/activatefirst.thtml b/site/app/views/users/activatefirst.thtml
index ed5a464..8c93eb7 100644
--- a/site/app/views/users/activatefirst.thtml
+++ b/site/app/views/users/activatefirst.thtml
@@ -37,17 +37,18 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
-    <?=$this->renderElement('notification', array('type' => 'error', 'msg' => _('error_user_unconfirmed')));?>
-    <br/>
-    <p><?=sprintf(_('user_register_click_confirm_link'), $email, APP_PRETTYNAME)?></p>
-    <br/>
-    <p><?=sprintf(_('user_register_resend_confirmation_link'), $html->link(_('user_register_confirmation_link_text'), "/users/verify/{$userid}/resend"))?></p>
+    <div id="content-main">
+
+<h2><?=_('error_user_unconfirmed')?></h2>
+<br/>
+<p><?=sprintf(_('user_register_click_confirm_link'), $email, APP_PRETTYNAME)?></p>
+<br/>
+<p><?=sprintf(_('user_register_resend_confirmation_link'), $html->link(_('user_register_confirmation_link_text'), "/users/verify/{$userid}/resend"))?></p>
 
+    </div>
 </div>
diff --git a/site/app/views/users/delete.thtml b/site/app/views/users/delete.thtml
index dbbfa5b..631a640 100644
--- a/site/app/views/users/delete.thtml
+++ b/site/app/views/users/delete.thtml
@@ -37,65 +37,58 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
 <?php if (isset($success) && $success): ?>
-<?=$this->renderElement('notification', array('type' => 'success', 
-'msg' => ___('user_del_header_farewell', 'Farewell!'),
-'description' => sprintf(___('user_del_account_deleted', 'Your user account %1$s '
+    <h1><?=___('user_del_header_farewell', 'Farewell!')?></h1>
+    <p><?php echo sprintf(___('user_del_account_deleted', 'Your user account %1$s '
         .'has been successfully deleted. If you want to come back some time, '
         .'you can re-register on the <a href="%2$s">user registration page</a>.')
-        , $useremail, $html->url('/users/register')))); ?>
+        , $useremail, $html->url('/users/register')); ?></p>
     <p><?=$html->link(_('link_return_to_front_page'), '/');?></p>
 
 <?php else: ?>
-    <?php if (!empty($deleteerror)){
+    <?php if (!empty($deleteerror)): ?>
+    <div class="amo-form-error">
+    <?php
         switch ($deleteerror) {
         case 'addons':
             echo '<p>';
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => sprintf(___('user_del_error_addons', 'You cannot delete your '
+            echo sprintf(___('user_del_error_addons', 'You cannot delete your '
                 .'account if you are listed as an <a href="%1$s"> author of any '
                 .'add-ons</a>. To delete your account, please have another person '
                 .'in your development group delete you from the list of authors '
                 .'for your add-ons. Afterwards you will be able to delete your account '
-                .'here.'), $html->url("/user/{$userid}"))));
+                .'here.'), $html->url("/user/{$userid}"));
             echo '</p>';
             echo sprintf(___('user_del_error_addons_more_questions', 'If you '
                 .'have additional questions, please contact %1$s for assistance.'),
                 $link->email(EDITOR_EMAIL));
             break;
         case 'checkbox':
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => ___('user_del_error_checkbox', 'You need to check the box "I '
-                .'understand..." before we can delete your account.')));
+            echo ___('user_del_error_checkbox', 'You need to check the box "I '
+                .'understand..." before we can delete your account.');
             break;
         case 'password':
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => ___('user_del_error_password', 'Please enter your password '
-                .'correctly in order to perform this step.')));
+            echo ___('user_del_error_password', 'Please enter your password '
+                .'correctly in order to perform this step.');
             break;
         case 'unknown':
         default:
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => sprintf(___('user_del_error_unknown', 'An unknown error occured '
+            echo sprintf(___('user_del_error_unknown', 'An unknown error occured '
                 .'deleting your account. Please contact %1$s with the issue and '
                 .'we will delete it for you. We apologize for the inconvenience.'),
                 $link->email(ADMIN_EMAIL));
             break;
         }
-    }
     ?>
+    </div>
+    <?php endif; ?>
     
     <h1><?php echo sprintf(___('user_del_header_delete_account', 'Delete User Account %s'), $useremail)?></h1>
     
@@ -106,7 +99,7 @@
     .'now, but contact us at %1$s and we will do our best to assist you in '
     .'solving it.'), $link->email(EDITOR_EMAIL))?></p>
     
-    <div class="highlight">
+    <div class="corner-box">
     <h2><?=___('user_del_header_confirm_deletion', 'Confirm account deletion')?></h2>
     
     <p><?=___('user_del_permanently_removed_means', 'By clicking "delete" your '
@@ -136,4 +129,5 @@
     </div>
     <p><?=$html->link(_('link_return_to_front_page'), '/');?></p>
 <?php endif; ?>
+    </div>
 </div>
diff --git a/site/app/views/users/edit.thtml b/site/app/views/users/edit.thtml
index 36a1176..5be872d 100644
--- a/site/app/views/users/edit.thtml
+++ b/site/app/views/users/edit.thtml
@@ -36,49 +36,52 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */ 
-
-
-/* Prepare translation box element */
-// Retrieve language arrays from bootstrap.
-global $valid_languages, $native_languages;
-foreach (array_keys($valid_languages) as $key) {
-    $languages[$key] = $native_languages[$key]['native'];
-}
-ksort($languages);
-$this->translationBox = array(
-    'defaultLocale' => LANG,
-    'languages' => $languages,
-    'table' => 'User',
-    'loaded' => false
-);
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
 <?php
 // show confirmation message?
 if (isset($confirmation_page) && $confirmation_page):
 ?>
 
-    <?echo $this->renderElement('notification', array('type' => 'success', 'msg' => $confirmation_message))?>
+    <h1><?=$confirmation_message?></h1>
     
     <?php if (isset($newemail) && $newemail): ?>
-        <?echo $this->renderElement('notification', array('type' => 'success', 'description' => sprintf(___('user_edit_confirm_email_sent'), $newemail)));?>
+        <?php
+        // @partial translation fallback, 5/5/08
+        if (_('user_edit_confirm_email_sent') != 'user_edit_confirm_email_sent')
+            $_user_edit_confirm_email_sent = _('user_edit_confirm_email_sent');
+        else
+            $_user_edit_confirm_email_sent = 'An email has been sent to your '
+                .'address %1$s to confirm your new email address. For the '
+                .'change to take effect, you need to click on the link provided '
+                .'in this email. Until then, you can keep logging in with your '
+                .'current email address.';
+        ?>
+        <p><?=sprintf($_user_edit_confirm_email_sent, $newemail)?></p>
     <?php endif; ?>
 
-    <p><?=$html->link(___('link_return_to_front_page'), '/')?></p>
+    <?php
+    // @partial translation fallback, 5/5/08
+    if (_('link_return_to_front_page') != 'link_return_to_front_page')
+        $_link_return_to_front_page = _('link_return_to_front_page');
+    else
+        $_link_return_to_front_page = 'Click here to return to the front page.';
+    ?>
+    <p><?=$html->link($_link_return_to_front_page, '/')?></p>
 
 <?php
 else:
 // show "edit" form
 ?>
 <?php if(isset($errorMessage)): ?>
-    <?echo $this->renderElement('notification', array('type' => 'error', 'msg' => _('error_formerrors')));?>
+<div class="amo-form-error"><?php echo _('error_formerrors'); ?></div>
 <p></p>
 <?php endif; ?>
 
@@ -90,68 +93,44 @@ else:
     
 <div id="tabbed-editor" class="flora">
     <ul class="tabs-nav">
-        <li><a href="#profile-user"><span><?=___('user_tab_profile', 'User Profile');?></span></a></li>
-        <li><a href="#profile-collections"><span><?=___('user_tab_collections');?></span></a></li>
-        <li><a href="#profile-notifications"><span><?=___('user_tab_notifications');?></span></a></li>
-        <li><a href="#profile-change-pw-email"><span><?=_('user_change_password_or_email'); ?></span></a></li>
-        <li><a href="#profile-other"><span><?=___('user_form_otheractions');?></span></a></li>
+        <li><a href="#profile-user"><span><?=___('user_tab_profile', 'User Profile'); /* @partial: 12/7/08 */ ?></span></a></li>
+        <li><a href="#profile-notifications"><span><?=___('user_tab_notifications', 'Notifications'); /* @partial: 12/7/08 */ ?></span></a></li>
+        <li><a href="#profile-changepw"><span><?=_('user_change_password'); ?></span></a></li>
+        <li><a href="#profile-changeemail"><span><?=___('user_change_email', 'Change Email Address'); /* @partial: translation fallback, 5/5/08 */ ?></span></a></li>
+        <li><a href="#profile-other"><span><?=___('user_form_otheractions', 'Other Actions');?></span></a></li>
     </ul>
     
     <div id="profile-user">
-        <h3 class="hidden"><?=___('user_tab_profile', 'User Profile');?></h3>
-        <div class="line">
+        <h3><?=___('user_tab_profile', 'User Profile'); /* @partial: 12/7/08 */ ?></h3>
+        <div>
             <label class="amo-label-large" for="UserFirstname"><?=_('user_form_firstname')?></label>
             <?=$html->input('User/firstname') ?>
             <?=$html->tagErrorMsg('User/firstname', _('error_field_required'))?>
             <?=___('user_required_firstlast_or_nickname', 'A first name, last name or nickname is required.')?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserLastname"><?=_('user_form_lastname')?></label>
             <?=$html->input('User/lastname') ?>
             <?=$html->tagErrorMsg('User/lastname', _('error_field_required'))?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserNickname"><?=_('user_form_nickname')?></label>
             <?=$html->input('User/nickname') ?>
             <?=$html->tagErrorMsg('User/nickname', _('error_user_nickname_notunique'))?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserEmailhidden"><?=_('user_form_hideemail')?></label>
             <?=$html->checkBox('User/emailhidden') ?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserHomepage"><?=_('user_form_homepage')?></label>
             <?=$html->input('User/homepage') ?>
             <?=$html->tagErrorMsg('User/homepage', _('error_invalid_url'))?>
         </div>
-        <div class="line">
-            <?php
-            echo $this->renderElement('translationbox', array(
-                'field' => 'bio',
-                'translations' => $translations['bio'],
-                'height' => '100',
-                'maxLength' => '500',
-                'displayName' => ___('user_form_bio'),
-                'description' => ___('user_form_bio_description'),
-            ));
-            ?>
-        </div>
     </div>
     
-    <div id="profile-collections">
-        <h3 class="hidden"><?=___('user_tab_collections');?></h3>
-        <div class="line">
-            <?=$html->checkbox('User/display_collections') ?>
-            <label for="UserDisplayCollections"><?=___('user_form_display_collections')?></label>
-        </div>
-        <div class="line">
-            <?=$html->checkbox('User/display_collections_fav') ?>
-            <label for="UserDisplayCollectionsFav"><?=___('user_form_display_collections_fav')?></label>
-        </div>
-    </div>
-
     <div id="profile-notifications">
-        <h3 class="hidden"><?=___('user_tab_notifications', 'Notifications');?></h3>
+        <h3><?=___('user_tab_notifications', 'Notifications'); /* @partial: 12/7/08 */ ?></h3>
         <?php if (empty($userAddons)): ?>
             <p><?=___('user_notifications_none_available', 'There are currently no notifications available for you to configure.')?></p>
         <?php else: ?>
@@ -166,25 +145,28 @@ else:
         <?php endif; ?>
     </div>
 
-    <div id="profile-change-pw-email">
+    <div id="profile-changepw">
         <h3><?=_('user_change_password'); ?></h3>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserPassword"><?=_('user_form_oldpassword')?></label>
             <?=$html->password('User/password', array('autocomplete'=>'off')) ?>
             <?=$html->tagErrorMsg('User/password', _('error_wrong_password'))?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserNewpassword"><?=_('user_form_newpassword')?></label>
             <?=$html->password('User/newpassword', array('autocomplete'=>'off')) ?>
             <?=$html->tagErrorMsg('User/newpassword', 'error_field_required')?>
         </div>
-        <div class="line">
+        <div>
             <label class="amo-label-large" for="UserConfirmpw"><?=_('user_form_confirmpassword')?></label>
             <?=$html->password('User/confirmpw', array('autocomplete'=>'off')) ?>
             <?=$html->tagErrorMsg('User/confirmpw', _('error_user_confirmpw_nomatch'))?>
         </div>
-        <h3><?=___('user_change_email', 'Change Email Address');?></h3>
-        <div class="line">
+    </div>
+    
+    <div id="profile-changeemail">
+        <h3><?=___('user_change_email', 'Change Email Address'); /* @partial: translation fallback, 5/5/08 */ ?></h3>
+        <div>
             <label class="amo-label-large" for="UserEmail"><?=_('user_form_email')?></label>
             <?=$html->input('User/email') ?>
             <?php if (isset($error_email_notunique))
@@ -198,7 +180,7 @@ else:
     </div>
     
     <div id="profile-other">
-        <h3 class="hidden"><?=___('user_form_otheractions', 'Other Actions');?></h3>
+        <h3><?=___('user_form_otheractions', 'Other Actions');?></h3>
         <p><?=$html->link(___('user_edit_delete_user', 'Delete user account'), '/users/delete');?></p>
     </div>
 </div>
@@ -208,6 +190,7 @@ else:
 
 <?php endif; /* end of form vs. confirmation */ ?>
 
+    </div>
 </div>
 
 <script type="text/javascript">
diff --git a/site/app/views/users/email/emailchange_plain.thtml b/site/app/views/users/email/emailchange_plain.thtml
index 4a1a852..7a2ae90 100644
--- a/site/app/views/users/email/emailchange_plain.thtml
+++ b/site/app/views/users/email/emailchange_plain.thtml
@@ -2,6 +2,20 @@
 $confirmurl = SITE_URL.$html->url('/users/emailchange/'.$userid.'?code='
     .urlencode($changecode), true);
 
-echo $html->lineBreaks(sprintf(___('user_email_confirm_emailchange'), $confirmurl, APP_PRETTYNAME));
+// @partial: translation fallback, 5/6/08
+if (_('user_email_confirm_emailchange') != 'user_email_confirm_emailchange'):
 
+echo $html->lineBreaks(sprintf(_('user_email_confirm_emailchange'),
+    $confirmurl, APP_PRETTYNAME));
+
+else:
+echo "You requested a change to your email address at ".APP_PRETTYNAME." Add-ons.\n\n"
+    ."In order to confirm the new address, please click the link below or copy "
+    ."and paste the whole thing into your browser's location bar:\n\n"
+    . $confirmurl . "\n\n"
+    ."You have 48 hours to confirm the new address. If you do not want to change "
+    ."the address anymore, you can just ignore this email.\n\n"
+   ."Thanks!\n"
+   ."-- ".APP_PRETTYNAME." Add-ons Staff";
+endif;
 ?>
diff --git a/site/app/views/users/emailchange.thtml b/site/app/views/users/emailchange.thtml
index 9f91a53..48dc877 100644
--- a/site/app/views/users/emailchange.thtml
+++ b/site/app/views/users/emailchange.thtml
@@ -37,24 +37,37 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
 <?php
-$_user_emailchange_success = ___('user_emailchange_success');
-$_user_emailchange_successful_description = sprintf(___('user_emailchange_successful_description'), $newemail);
-$_user_emailchange_error = ___('user_emailchange_error');
-$_link_return_to_front_page = ___('link_return_to_front_page');
+// @partial translation fallback, 5/7/08
+if (_('user_emailchange_success') != 'user_emailchange_success') {
+    $_user_emailchange_success = _('user_emailchange_success');
+    $_user_emailchange_successful_description = sprintf(
+        _('user_emailchange_successful_description'), $newemail);
+    $_user_emailchange_error = _('user_emailchange_error');
+    $_link_return_to_front_page = _('link_return_to_front_page');
+} else {
+    $_user_emailchange_success = 'Success!';
+    $_user_emailchange_successful_description = sprintf('Your email address was '
+        .'changed successfully. From now on, please use %1$s to log in.',
+        $newemail);
+    $_user_emailchange_error = 'Error!';
+    $_link_return_to_front_page = 'Click here to return to the front page.';
+}
 
 if (!isset($errormsg)): ?>
-<?=$this->renderElement('notification', array('type' => 'success', 'msg' => $_user_emailchange_success, 'description' => $_user_emailchange_successful_description))?>
+    <h1><?=$_user_emailchange_success?></h1>
+    <p><?=$_user_emailchange_successful_description?></p>
 <?php else: ?>
-<?=$this->renderElement('notification', array('type' => 'error', 'msg' => $_user_emailchange_error, 'description' => $errormsg))?>
+    <h1><?=$_user_emailchange_error?></h1>
+    <p><?=$errormsg?></p>
 <?php endif; ?>
     <p><?=$html->link($_link_return_to_front_page, '/')?></p>
-
+    </div>
 </div>
diff --git a/site/app/views/users/info.thtml b/site/app/views/users/info.thtml
index 659abb6..25c1d0d 100644
--- a/site/app/views/users/info.thtml
+++ b/site/app/views/users/info.thtml
@@ -38,12 +38,11 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
+<div id="content">
+   
+    <?=$this->renderElement('search')?>
 
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+    <div id="content-main">
     
     <h3><?=_('users_info_author_profile')?></h3>
     <dl>
@@ -66,12 +65,7 @@
         <dt><?=_('users_info_email')?></dt>
         <dd><?=$link->email($profile['User']['email'])?></dd>
         <? endif; ?>
-
-        <?php if ($profile['Translation']['bio']['string']): ?>
-        <dt><?=___('users_info_aboutme')?></dt>
-        <dd><?=nl2br($profile['Translation']['bio']['string'])?></dd>
-        <?php endif; ?>
-
+        
         <dt><?=sprintf(_('user_info_usersince'), APP_PRETTYNAME)?></dt>
         <dd><?=strftime(_('date'), strtotime($profile['User']['created']))?></dd>
 
@@ -132,41 +126,11 @@
 </div>
 <?php endif; ?>
 
-<?php if (!empty($coll)): ?>
-<div>
-<h3><?=sprintf(___('users_info_collections_by_user'), $displayName)?></h3>
-<dl>
-    <?php
-    global $app_shortnames;
-    foreach ($coll as &$c):
-    ?>
-    <dt><?= $html->linkNoLocaleNoApp($c['Translation']['name']['string'],
-        sprintf('/%s/%s/collection/%s', LANG, array_search($c['Collection']['application_id'], $app_shortnames),
-            empty($c['Collection']['nickname'])?$c['Collection']['uuid']:$c['Collection']['nickname'])); ?>
-    </dt>
-    <dd><?=$c['Translation']['description']['string']?></dd>
-    <? endforeach; ?>
-</dl>
-</div>
-<?php endif; ?>
-
-<?php if (!empty($coll_fav)): ?>
-<div>
-<h3><?=___('users_info_fav_collections_by_user')?></h3>
-<dl>
-    <?php
-    global $app_shortnames;
-    foreach ($coll_fav as &$c):
-    ?>
-    <dt><?= $html->linkNoLocaleNoApp($c['Translation']['name']['string'],
-        sprintf('/%s/%s/collection/%s', LANG, array_search($c['Collection']['application_id'], $app_shortnames),
-            empty($c['Collection']['nickname'])?$c['Collection']['uuid']:$c['Collection']['nickname'])); ?>
-    </dt>
-    <dd><?=$c['Translation']['description']['string']?></dd>
-    <? endforeach; ?>
-</dl>
-</div>
-<?php endif; ?>
+    </div>
+    <!-- /#content-main -->
 
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+ 
 </div>
-<!-- /#.primary -->
+<!-- /#content -->
diff --git a/site/app/views/users/login.thtml b/site/app/views/users/login.thtml
index a3c6e83..106a27e 100644
--- a/site/app/views/users/login.thtml
+++ b/site/app/views/users/login.thtml
@@ -38,13 +38,13 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
+    <div id="content-main">
+
 <?php
     //banner warning messages for display
     if(isset($_GET['m'])) {
@@ -59,37 +59,40 @@
             $warn_msg = null;
         }
     }
-    if (!empty($warn_msg))
-        echo $this->renderElement('notification', array('type' => 'info', 'description' => $warn_msg));
+    if (!empty($warn_msg)): 
 ?>
+<div class="amo-form-error"><?=$warn_msg?></div>
+<?php endif; ?>
 
-<?php if ($loginerror)
-        echo $this->renderElement('notification', array('type' => 'error', 'description' => _('error_username_or_pw_wrong')));
-?>
+<?php if ($loginerror): ?>
+<div class="amo-form-error"><?php echo _('error_username_or_pw_wrong'); ?></div>
 <p></p>
-<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form highlight">
+<?php endif; ?>
+<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
     <div>
         <? 
-        $redir = (isset($_GET['to'])) ? urldecode($_GET['to']) : urldecode(@$this->data['Login']['referer']);
+        $redir = (isset($_GET['to']) ? urldecode($_GET['to']) : $this->controller->referer('/', true));
         $redir = $html->entities($redir);
-        $redir = html_entity_decode($redir);
         echo $html->hidden('Login/referer', array('value' => $redir));
         ?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="LoginEmail"><?=_('user_form_email')?></label>
         <?=$html->input('Login/email') ?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="LoginPassword"><?=_('user_form_password')?></label>
         <?=$html->password('Login/password') ?>
     </div>
-    <div class="container">
+    
+    <div>
+        
         <?=$html->input('Login/remember', array('type' => 'checkbox', 'value' => '1', 'class' => 'amo-remember'))?>
         <label for="LoginRemember"><?=___('user_form_remember_me')?></label>
     </div>
-    <div class="container">
+    
+    <div>
         <?=$html->submit(_('user_form_submit_login'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
@@ -98,8 +101,11 @@
     $(document).ready(function() { $('#LoginEmail').focus(); });
 </script>
 
+<div class="divider"><hr/></div>
+
 <ul>
     <li><?= $html->link(_('user_login_register_link'), '/users/register'); ?></li>
     <li><?= $html->link(_('user_pwreset_link'), '/users/pwreset',null,null,false); ?></li>
 </ul>
-</div><!-- /.primary -->
+    </div>
+</div><!-- /#content -->
diff --git a/site/app/views/users/pwreset.thtml b/site/app/views/users/pwreset.thtml
index b9962c0..ea1e916 100644
--- a/site/app/views/users/pwreset.thtml
+++ b/site/app/views/users/pwreset.thtml
@@ -37,23 +37,23 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
 <?php if(!isset($email)): ?>
 
 <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmail"><?=_('user_form_email')?></label>
         <?=$html->input('User/email') ?>
         <?=$html->tagErrorMsg('User/email', _('error_user_notfound'))?>
     </div>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_pwreset_submit_sendlink'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
@@ -68,20 +68,21 @@ else:
 <form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
 
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserPassword"><?=_('user_form_newpassword')?></label>
         <?=$html->password('User/password') ?>
         <?=$html->tagErrorMsg('User/password', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserConfirmpw"><?=_('user_form_confirmpassword')?></label>
         <?=$html->password('User/confirmpw') ?>
         <?=$html->tagErrorMsg('User/confirmpw', _('error_user_confirmpw_nomatch'))?>
     </div>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_pwreset_submit_changepw'), array('class'=>'amo-submit'));?>
     </div>
 </form>
 <?php endif; ?>
 
+    </div>
 </div>
diff --git a/site/app/views/users/register.thtml b/site/app/views/users/register.thtml
index 6872360..63f82f8 100644
--- a/site/app/views/users/register.thtml
+++ b/site/app/views/users/register.thtml
@@ -38,69 +38,64 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
-        <div>
-            <h1><?= ___('user_register_welcome_header') ?></h1>
-            <?= sprintf(___('user_register_details'), 'http://www.mozilla.com/about/legal.html', $html->url('/pages/privacy')) ?>
-        </div>
-
 <?php if(isset($errorMessage)): ?>
-<?=$this->renderElement('notification', array('type' => 'error', 'msg' => _('error_formerrors')));?>
+<div class="amo-form-error"><?php echo _('error_formerrors'); ?></div>
 <p></p>
 <?php 
 endif;
 ?>
 
-<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form">
+<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmail"><?=_('user_form_email')?></label>
         <?=$html->input('User/email') ?>
         <?=(isset($error_email_notunique)) ? '<div class="error_message">'._('error_user_email_notunique').'</div>' : $html->tagErrorMsg('User/email', _('error_email_invalid'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserPassword"><?=_('user_form_password')?></label>
         <?=$html->password('User/password') ?>
         <?=$html->tagErrorMsg('User/password', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserConfirmpw"><?=_('user_form_confirmpassword')?></label>
         <?=$html->password('User/confirmpw') ?>
         <?=$html->tagErrorMsg('User/confirmpw', _('error_user_confirmpw_nomatch'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserFirstname"><?=_('user_form_firstname')?></label>
         <?=$html->input('User/firstname') ?>
         <?=$html->tagErrorMsg('User/firstname', _('error_field_required'))?>
         <?=___('user_required_firstlast_or_nickname', 'A first name, last name or nickname is required.')?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserLastname"><?=_('user_form_lastname')?></label>
         <?=$html->input('User/lastname') ?>
         <?=$html->tagErrorMsg('User/lastname', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserNickname"><?=_('user_form_nickname')?></label>
         <?=$html->input('User/nickname') ?>
         <?=$html->tagErrorMsg('User/nickname', _('error_user_nickname_notunique'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmailhidden"><?=_('user_form_hideemail')?></label>
         <?=$html->checkBox('User/emailhidden')?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserHomepage"><?=_('user_form_homepage')?></label>
         <?=$html->input('User/homepage') ?>
         <?=$html->tagErrorMsg('User/homepage', _('error_invalid_url'))?>
     </div>
 <?php if (isset($this->controller->Recaptcha) && $this->controller->Recaptcha->enabled): ?>
-    <div class="container">
+    <div>
         <div class="amo-label-large">
             <label for="recaptcha_response_field"><?=___('recaptcha_label', 'Are you human?')?></label><br/>
             <span id="recaptcha_whatsthis"><a href="javascript:Recaptcha.showhelp()"><?=___('recaptcha_whatsthis', "What's this?")?></a></span>
@@ -109,9 +104,10 @@ endif;
         <?=$html->tagErrorMsg('User/captcha', ___('error_invalid_captcha', 'Invalid captcha, please try again!'))?>
     </div>
 <?php endif; ?>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_form_submit_register'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
 
+    </div>
 </div>
diff --git a/site/app/views/users/register_complete.thtml b/site/app/views/users/register_complete.thtml
index f709972..6be8a9f 100644
--- a/site/app/views/users/register_complete.thtml
+++ b/site/app/views/users/register_complete.thtml
@@ -37,14 +37,15 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
 
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
 
-    <?=$this->renderElement('notification', array('type' => 'success', 'msg' => _('user_register_congratulations')));?>
+    <p><?=_('user_register_congratulations')?></p>
     
     <p><?=sprintf(_('user_register_confirm_email_sent'), $data['User']['email'])?></p>
     
diff --git a/site/app/webroot/css/color.css b/site/app/webroot/css/color.css
index 2ae6eac..2ef67d3 100644
--- a/site/app/webroot/css/color.css
+++ b/site/app/webroot/css/color.css
@@ -19,7 +19,7 @@ a:link { color: #1d587f; }
 a:visited { color: #748d9e; }
 a:active, a:hover, a:focus { color: #000000; }
 
-a.view { background: transparent url("../img/sprite.png?20090430") 100% -247px no-repeat; }
+a.view { background: transparent url("../img/sprite.png?20081210") 100% -247px no-repeat; }
 .html-ltr a.view:hover { background-position: 100% -301px; }
 .html-rtl a.view { background-position: 100% -486px; }
 .html-rtl a.view:hover { background-position: 100% -540px; }
@@ -72,7 +72,7 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 #other-apps h3 { color: #4d757b; }
 
 #other-apps.js h3 { border-bottom: 1px solid #90c8dd; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
-#other-apps.js h3 { background: transparent url("../img/sprite.png?20090430") 4px -262px no-repeat; }
+#other-apps.js h3 { background: transparent url("../img/sprite.png?20081210") 4px -262px no-repeat; }
 .html-rtl #other-apps.js h3 { background-position: 14px -262px; }
 
 #other-apps.js h3:hover { background-color: #c5e3ee; }
@@ -97,11 +97,11 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 .html-rtl #other-apps.collapsed h3 { border-bottom: 0; background-position: 16px -320px; }
 
 /*** =Search form ***/
-#search-bubble-outer { background: transparent url("../img/sprite.png?20090430") right top no-repeat; }
-#search-bubble-inner { background: transparent url("../img/sprite.png?20090430") left top no-repeat; }
+#search-bubble-outer { background: transparent url("../img/sprite.png?20081210") right top no-repeat; }
+#search-bubble-inner { background: transparent url("../img/sprite.png?20081210") left top no-repeat; }
 #search-form li { color: #666; }
-.html-ltr #search-form #query { background: #fff url("../img/sprite.png?20090430") -977px -686px no-repeat; }
-.html-rtl #search-form #query { background: #fff url("../img/sprite.png?20090430") 100% -686px no-repeat; }
+.html-ltr #search-form #query { background: #fff url("../img/sprite.png?20081210") -977px -686px no-repeat; }
+.html-rtl #search-form #query { background: #fff url("../img/sprite.png?20081210") 100% -686px no-repeat; }
 #search-form #search-category label { color: #426a13; }
 .html-ltr #search-form #my-submit { background: url("../img/sprite-alpha.png") -120px 0 no-repeat; } 
 .html-ltr #search-form #my-submit:hover { background-position: -157px 0;}
@@ -109,15 +109,15 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 .html-rtl #search-form #my-submit:hover { background: url("../img/sprite-alpha.png") -157px -40px no-repeat;} 
 
 #advanced-search {background-color: #e6e6e6; border: 1px solid #68B41C; }
-#advanced-search-toggle {background: url("../img/sprite.png?20090430") right -68px no-repeat; }
-#advanced-search-toggle div {background: transparent url("../img/sprite.png?20090430") left -68px no-repeat;}
+#advanced-search-toggle {background: url("../img/sprite.png?20081210") right -68px no-repeat; }
+#advanced-search-toggle div {background: transparent url("../img/sprite.png?20081210") left -68px no-repeat;}
 #advanced-search-toggle a {color: black; text-decoration: none;  padding:1px 3px 1px 3px;}
-.html-ltr #advanced-search-toggle a.asclosed { background: url("../img/sprite.png?20090430") right -354px no-repeat;}
-.html-ltr #advanced-search-toggle a.asopen { background: url("../img/sprite.png?20090430") right -369px no-repeat;}
-.html-rtl #advanced-search-toggle a.asclosed {background: url("../img/sprite.png?20090430") -989px -354px no-repeat;}
-.html-rtl #advanced-search-toggle a.asopen { background: url("../img/sprite.png?20090430") -989px -369px no-repeat;}
-#advanced-search-toggle #toggle-outer {background: url("../img/sprite.png?20090430") right -87px no-repeat;  }
-#advanced-search-toggle #toggle-inner {background: url("../img/sprite.png?20090430") -861px -87px no-repeat; }
+.html-ltr #advanced-search-toggle a.asclosed { background: url("../img/sprite.png?20081210") right -354px no-repeat;}
+.html-ltr #advanced-search-toggle a.asopen { background: url("../img/sprite.png?20081210") right -369px no-repeat;}
+.html-rtl #advanced-search-toggle a.asclosed {background: url("../img/sprite.png?20081210") -989px -354px no-repeat;}
+.html-rtl #advanced-search-toggle a.asopen { background: url("../img/sprite.png?20081210") -989px -369px no-repeat;}
+#advanced-search-toggle #toggle-outer {background: url("../img/sprite.png?20081210") right -87px no-repeat;  }
+#advanced-search-toggle #toggle-inner {background: url("../img/sprite.png?20081210") -861px -87px no-repeat; }
 
 /*** =Footer ***/
 #footer { color: #888; padding: 1em 0; background: transparent url("../img/foot-bg.png") repeat-x; }
@@ -128,8 +128,8 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 #content-extra .extra { border: 1px solid #d8dcdf; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
 
 /*** =Categories ***/
-#categories h3 { background: #79be1b url("../img/sprite.png?20090430") -104px -106px no-repeat; border-bottom: 1px solid #abe071; }
-#categories h3 span { color: #426a13; background: transparent url("../img/sprite.png?20090430") -230px -106px no-repeat; }
+#categories h3 { background: #79be1b url("../img/sprite.png?20081210") -104px -106px no-repeat; border-bottom: 1px solid #abe071; }
+#categories h3 span { color: #426a13; background: transparent url("../img/sprite.png?20081210") -230px -106px no-repeat; }
 #categories.collapsed h3 { background-position: 0 -106px; }
 #categories.collapsed h3.open { background-position: -26px -106px; }
 
@@ -155,34 +155,30 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 #categories.collapsed h3:hover span { background-position: -533px -106px; }
 #categories p { border-top: 1px solid #e8e6e6; }
 
-
-
 /*** =Add-on boxes ***/
-.addon { border-left: 1px solid #d8dcdf; background: transparent url("../img/sprite.png?20090430") right -1256px no-repeat; }
-.addon .vex { background: transparent url("../img/sprite.png?20090430") right bottom no-repeat; }
-.addon .vex span { background: transparent url("../img/sprite.png?20090430") left bottom no-repeat; }
-.addon .preview-img { background: transparent url("../img/sprite.png?20090430") left -1256px no-repeat; }
+.addon { border-left: 1px solid #d8dcdf; background: transparent url("../img/sprite.png?20081210") right -1256px no-repeat; }
+.addon .vex { background: transparent url("../img/sprite.png?20081210") right bottom no-repeat; }
+.addon .vex span { background: transparent url("../img/sprite.png?20081210") left bottom no-repeat; }
+.addon .preview-img { background: transparent url("../img/sprite.png?20081210") left -1256px no-repeat; }
 .addon .stats em { color: #d54601; }
 .addon .flag { border: 1px solid #ccc; border-width: 0 1px 1px 0; }
-#addon-listing .addon .vex { background: transparent url("../img/sprite.png?20090430") no-repeat right bottom; }
+#addon-listing .addon .vex { background: transparent url("../img/sprite.png?20081210") no-repeat right bottom; }
 
 /* =Secondary featured add-ons */
-.sub .irk { background: transparent url("../img/sprite.png?20090430") left -1256px no-repeat; }
+.sub .irk { background: transparent url("../img/sprite.png?20081210") left -1256px no-repeat; }
 .sub .preview-img { background-image: none; }
 
 /* =Recommended add-ons */
 .rec { background: url("../img/rec-tr.png") no-repeat right top; border-left-color: #c1e1c1; }
 .rec .preview-img { background: transparent url("../img/rec-tl.png") left top no-repeat; }
-.rec .flag { background: #f8f8f7 url("../img/rec-flag.png") no-repeat; }
+.rec .flag { color: #360; background: #f8f8f7 url("../img/rec-flag.png") no-repeat; }
 .rec .vex { background-image: url("../img/rec-br.png"); }
 .rec .vex span { background-image: url("../img/rec-bl.png"); }
-.rec .flag a { color: #360; text-decoration: none; }
 
 /* =Experimental add-ons */
 .exp { background: url("../img/exp-tr.png") no-repeat right top; border-left-color: #e3c1c1; }
 .exp .preview-img { background: transparent url("../img/exp-tl.png") left top no-repeat; }
-.exp .flag { background: #f8f8f7 url("../img/exp-flag.png") no-repeat; }
-.exp .flag a { color: #900; text-decoration: none; }
+.exp .flag { color: #900; background: #f8f8f7 url("../img/exp-flag.png") no-repeat; }
 .exp .vex { background-image: url("../img/exp-br.png"); }
 .exp .vex span { background-image: url("../img/exp-bl.png"); }
 
@@ -191,7 +187,7 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 #addon-listing .more li:last-child { border: 0; }
 
 /*** =Install button ***/
-.install-button a { color: #062445; background: #7cc11c url("../img/sprite.png?20090430") 100% -730px no-repeat; }
+.install-button a { color: #062445; background: #7cc11c url("../img/sprite.png?20081210") 100% -730px no-repeat; }
 .install-button a span { background: transparent url("../img/installbtn-edges.png") left bottom no-repeat; }
 .install-button a span span { background: transparent url("../img/installbtn-edges.png") right bottom no-repeat; }
 .install-button a span span span { background: transparent url("../img/installbtn-edges.png") left top no-repeat; }
@@ -213,22 +209,18 @@ h4#moz a:hover, h1#moz a:active, h1#moz a:focus { background-position: 0 -51px;
 
 /* In listings - recommended add-ons */
 #addon-listing .rec .install-button a span, 
-#addon-listing .rec .install-button a span, 
 #addon-listing .rec .install-button a span span, 
-#addon-listing .rec .install-button a span span, 
-#addon-listing .rec .install-button a span span span, 
 #addon-listing .rec .install-button a span span span, 
 #addon-listing .rec .install-button a span span span strong { background-image: url("../img/installbtn-edges-rec.png"); }
 
 /* Experimental add-ons - while logged out */
-#content-main .exp-loggedout, #content .exp-loggedout,
-#content-main .exp-confirmed { border: 1px solid #d8d8d8; background: #fff; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
-#content-main .exp-loggedout .install-button a, #content .exp-loggedout .install-button a { color: #aaa; background-color: #fff; background-position: 100% -995px; }
-#content-main .exp-loggedout .install-button a span, #content .exp-loggedout .install-button a span,
-#content-main .exp-loggedout .install-button a span span, #content .exp-loggedout .install-button a span span,
-#content-main .exp-loggedout .install-button a span span span, #content .exp-loggedout .install-button a span span span,
-#content-main .exp-loggedout .install-button a span span span strong, #content .exp-loggedout .install-button a span span span strong { background-image: url("../img/installbtn-edges-dis.png"); }
-#content-main .exp-loggedout .install-button a:hover, #content .exp-loggedout .install-button a:hover { background-color: #f3f3f3; background-position: 100% -1125px; }
+#content-main .exp-loggedout { border: 1px solid #d8d8d8; background: #fff; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
+#content-main .exp-loggedout .install-button a { color: #aaa; background-color: #fff; background-position: 100% -995px; }
+#content-main .exp-loggedout .install-button a span,
+#content-main .exp-loggedout .install-button a span span,
+#content-main .exp-loggedout .install-button a span span span,
+#content-main .exp-loggedout .install-button a span span span strong { background-image: url("../img/installbtn-edges-dis.png"); }
+#content-main .exp-loggedout .install-button a:hover { background-color: #f3f3f3; background-position: 100% -1125px; }
 
 /* Unavailable add-ons */
 #content-main .install-container .not-avail { padding: 5px 10px; float: left; color: #666; border: 1px solid #d8d8d8; background: #fff; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
@@ -286,7 +278,7 @@ ul.star-rating { background: #fff; padding: 3px 5px; border: 1px solid #edbe97;
 */
 
 /* =More add-ons */
-.more-addons h3 a.view { background: transparent url("../img/sprite.png?20090430") 100% -387px no-repeat; }
+.more-addons h3 a.view { background: transparent url("../img/sprite.png?20081210") 100% -387px no-repeat; }
 .html-ltr .more-addons h3 a.view:hover { background-position: 100% -437px; }
 .html-rtl .more-addons h3 a.view { background-position: 100% -597px; }
 .html-rtl .more-addons h3 a.view:hover { background-position: 100% -647px; }
@@ -295,7 +287,7 @@ ul.star-rating { background: #fff; padding: 3px 5px; border: 1px solid #edbe97;
 .pagination { background-color: #f7fafc; border: 1px solid #eef1f3; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
 .pages a { border: 1px solid #fff; }
 .pages a:hover { background-color: #ccf29b; border-color: #bbde92; }
-.pages .selected a { background-color: #ccf29b; border: 1px solid #83c53f; text-decoration: none; font-weight: bold; color: black; }
+.pages .current strong { background-color: #ccf29b; border: 1px solid #83c53f; }
 .pages .prev a { background: transparent url("../img/arr-prev.png") 0 50% no-repeat; }
 .pages .prev a:hover { background-color: #ccf29b; }
 .pages .next a { background: transparent url("../img/arr-next.png") 100% 50% no-repeat; }
@@ -317,11 +309,11 @@ ul.star-rating { background: #fff; padding: 3px 5px; border: 1px solid #edbe97;
 #thumb-subcategories a:hover, #thumb-subcategories a:active, #thumb-subcategories a:focus { background: #F2F8Fd }
 #thumb-subcategories li.selected a:link, #thumb-subcategories li.selected a:visited { background-color:#89A8C1; color:#FFFFFF; }
 
-#thumb-browser .thumbs li.thumb { background: transparent url(../img/sprite.png?20090430) no-repeat scroll right -1256px; }
-#thumb-browser .thumbs li.thumb div.wrapper { background: transparent url(../img/sprite.png?20090430) no-repeat scroll left -1256px; }
+#thumb-browser .thumbs li.thumb { background: transparent url(../img/sprite.png?20081210) no-repeat scroll right -1256px; }
+#thumb-browser .thumbs li.thumb div.wrapper { background: transparent url(../img/sprite.png?20081210) no-repeat scroll left -1256px; }
 #thumb-browser .thumbs li.exp { background: transparent url(../img/exp-tr.png) no-repeat scroll right top; }
 #thumb-browser .thumbs li.exp div.wrapper { background: transparent url(../img/exp-tl.png) no-repeat scroll left top; }
-#thumb-browser .thumbs li.thumb .vex { background:transparent url(../img/sprite.png?20090430) no-repeat scroll right bottom; }
-#thumb-browser .thumbs li.thumb .vex span { background:transparent url(../img/sprite.png?20090430) no-repeat scroll left bottom; width: 10px; height: 10px; float: left;}
+#thumb-browser .thumbs li.thumb .vex { background:transparent url(../img/sprite.png?20081210) no-repeat scroll right bottom; }
+#thumb-browser .thumbs li.thumb .vex span { background:transparent url(../img/sprite.png?20081210) no-repeat scroll left bottom; width: 10px; height: 10px; float: left;}
 #thumb-browser .thumbs li.exp .vex { background:transparent url(../img/exp-br.png) no-repeat scroll right bottom; }
 #thumb-browser .thumbs li.exp .vex span { background:transparent url(../img/exp-bl.png) no-repeat scroll left bottom; }
diff --git a/site/app/webroot/css/developers.css b/site/app/webroot/css/developers.css
index 6bd440a..dbfbee1 100644
--- a/site/app/webroot/css/developers.css
+++ b/site/app/webroot/css/developers.css
@@ -1,8 +1,3 @@
-.html-rtl th,
-.html-rtl td {
-    text-align: right;
-}
-
 .graybox {
     background-color: #F7FAFC;
     border: 1px solid #EEF1F3;
@@ -33,12 +28,6 @@
     font-size: 110%;
     color: #5D6C8C;
 }
-.html-rtl .action-button {
-    background-image: url('../img/arr-view-rtl-big.png');
-    background-position: 2% 3px;
-    padding-right: auto;
-    padding-left: 30px;
-}
 a.action-button {
     text-decoration: none;
 }
@@ -46,50 +35,30 @@ a.action-button:hover {
     background-position: 98% -295px;
     color: #2D3B58;
 }
-.html-rtl a.action-button:hover {
-    background-position: 2% -295px;
-}
 .action-button.disabled {
     background: #EEEEEE url('../img/developers/privileges.png') no-repeat 96% 50%;
     border-color: gray;
     color: gray;
     cursor: default;
 }
-.html-rtl .action-button.disabled {
-    background-position: 4% 50%;
-}
 a.action-button.disabled:hover {
     color: gray;
     background-position: 96% 50%;
 }
-.html-rtl a.action-button.disabled:hover {
-    background-position: 4% 50%;
-}
 
 .index-actions {
     margin: 15px 0 0 30px;
     padding: 0;
     list-style: none;
 }
-.html-rtl .index-actions {
-    margin: 15px 30px 0 0;
-}
 .index-actions li {
     padding-left: 20px;
     font-weight: bold;
 }
-.html-rtl .index-actions li {
-    padding-left: auto;
-    padding-right: 20px;
-}
 .action-details {
     margin-left: 10px;
     font-weight: normal;
 }
-.html-rtl .action-details {
-    margin-left: auto;
-    margin-right: 10px;
-}
 
 .add-button-container {
     margin-top: 10px;
@@ -100,13 +69,6 @@ a.action-button.disabled:hover {
     background: #FFFFFF url('../img/developers/add.png') no-repeat 5px 50%;
     padding: 3px 5px 3px 25px;
     border: 1px solid #5D6C8C;
-    white-space: nowrap;
-}
-.html-rtl .add-button,
-.html-rtl .remove-button,
-.html-rtl .edit-button {
-    background-position: 100% 50%;
-    padding: 3px 20px 3px 5px;
 }
 .button {
     background-color: #FFFFFF;
@@ -125,9 +87,6 @@ a.button {
     font-size: 105%;
     border: 1px solid #5D6C8C;
 }
-.html-rtl .add-button.bigger {
-    padding: 5px 25px 5px 10px;
-}
 .edit-button {
     background-image: url('../img/developers/pencil.png');
     border: 1px solid #FFCC66;
@@ -147,17 +106,14 @@ a.button:hover {
     text-decoration: underline;
 }
 
-#dev-agreement {
+.agreement-text {
     background-color: #EEEEEE;
-    margin: 0 5% 10px;
+    margin: 0 5%;
     padding: 10px;
-    max-height: 300px;
-    overflow: auto;
-    border: 1px solid #AAA;
-    font-size: 85%;
 }
-#license-disclosure {
-  font-size: 95%;
+.agreement-buttons {
+    text-align: center;
+    margin: 5px 0;
 }
 
 #step-agreement,
@@ -250,18 +206,10 @@ p {
     padding-left: 25px;
     min-height: 20px;
 }
-.html-rtl #edit-listing dt {
-    padding-left: auto;
-    padding-right: 25px;
-}
 #edit-listing dd {
     padding-left: 20px;
     padding-bottom: 10px;
 }
-.html-rtl #edit-listing dd {
-    padding-left: auto;
-    padding-right: 20px;
-}
 .pitch ul {
     margin: 0;
     list-style: none;
@@ -270,24 +218,13 @@ p {
     padding-left: 23px;
     margin-top: 5px;
 }
-.html-rtl .pitch .actionbar li {
-    padding-left: auto;
-    padding-right: 23px;
-}
 .pitch .actionbar li.container {
     padding-left: 0;
     margin-top: 0;
 }
-.html-rtl .pitch .actionbar li.container {
-    padding-right: 0;
-}
 .pitch .actionbar ul li {
     margin-left: 15px;
 }
-.html-rtl .pitch .actionbar ul li {
-    margin-left: auto;
-    margin-right: 15px;
-}
 .pitch .actionbar li.selected {
     font-weight: bold;
 }
@@ -343,28 +280,6 @@ p {
 .actionbar .previews {
     background: transparent url('../img/developers/actionbar/previews.png') no-repeat 0% 50%;
 }
-.html-rtl .actionbar .displaypage,
-.html-rtl .actionbar .details,
-.html-rtl .actionbar .edit,
-.html-rtl .actionbar .edit-properties,
-.html-rtl .actionbar .edit-descriptions,
-.html-rtl .actionbar .edit-categories,
-.html-rtl .actionbar .edit-authors,
-.html-rtl .actionbar .status,
-.html-rtl .actionbar .statistics,
-.html-rtl .actionbar .versions,
-.html-rtl .actionbar .versions-add,
-.html-rtl .actionbar .previews {
-    background-position: 100% 50%;
-}
-
-.edit-categories-descriptions {
-  border-left: 1px solid #CCCCCC;
-}
-.html-rtl .edit-categories-descriptions {
-  border-left-width: 0;
-  border-right: 1px solid #CCCCCC;
-}
 
 #add-author-button .add-button {
     background-image: url('../img/developers/edit_authors_add.png');
@@ -390,10 +305,6 @@ p {
     border: 1px solid #5D6C8C;
     margin: 5px;
 }
-.html-rtl .save-changes {
-    background-position: 100% 50%;
-    padding: 5px 25px 5px 0;
-}
 #add-author p {
     margin-bottom: 5px;
 }
@@ -403,10 +314,6 @@ p {
     padding: 5px 0 5px 30px;
     display: none;
 }
-.html-rtl #add-author #add-error {
-    background-position: 100% 50%;
-    padding: 5px 25px 5px 0;
-}
 #add-author #add-loading {
     display: none;
 }
@@ -415,10 +322,6 @@ p {
     vertical-align: middle;
     margin-right: 10px;
 }
-.html-rtl .edit-categories-box h4 img {
-    margin-right: auto;
-    margin-left: 10px;
-}
 
 #edit-properties-icon-table th {
     color: #2D3B58;
@@ -448,10 +351,6 @@ p {
     padding-left: 20px;
     display: none;
 }
-.html-rtl #new-app-picker {
-    padding-left: auto;
-    padding-right: 20px;
-}
 
 table .inline-delete-button img {
     padding-bottom: 4px;
@@ -461,11 +360,6 @@ a.filelink {
     background: transparent url('../img/developers/versions_link.png') no-repeat left;
     padding-left: 20px;
 }
-.html-rtl a.filelink {
-    background-position: right;
-    padding-left: auto;
-    padding-right: 20px;
-}
 
 #files-table .inline-delete-box .remove-button {
     background-image: url('../img/developers/versions_delete.png');
@@ -488,28 +382,12 @@ a.filelink {
 .replace-preview input {
     margin-left: 20px;
 }
-.html-rtl .replace-preview input {
-    margin-left: auto;
-    margin-right: 20px;
-}
 #content-main .replace-preview p {
     margin-bottom: 0;
 }
 #add-preview-box .add-button {
     background-image: url('../img/developers/preview_add.png');
 }
-.preview-buttons {
-    text-align: right;
-}
-.html-rtl .preview-buttons {
-    text-align: left;
-}
-.preview-add-button-description {
-    text-align: right;
-}
-.html-rtl .preview-add-button-description {
-    text-align: left;
-}
 
 /* Change Status Page */
 div.status {
@@ -546,12 +424,9 @@ h4.status span {
 .actions .action {
     text-align: left;
     vertical-align: middle;
-    min-width: 25%;
+    width: 25%;
     padding-bottom: 5px;
 }
-.html-rtl .actions .action {
-    text-align: right;
-}
 .actions .description {
     color: #5D6C8C;
 }
@@ -579,18 +454,10 @@ h4.status span {
 .criteria {
     margin-left: 10px;
 }
-.html-rtl .criteria {
-    margin-left: auto;
-    margin-right: 10px;
-}
 .criteria li {
     list-style: none;
     padding-left: 20px;
 }
-.html-rtl .criteria li {
-    padding-left: auto;
-    padding-right: 20px;
-}
 .criteria .pass {
     background: url('../img/developers/tick.png') no-repeat left center;
 }
@@ -600,11 +467,6 @@ h4.status span {
 .criteria .meh {
     background: url('../img/developers/asterisk_yellow.png') no-repeat left center;
 }
-.html-rtl .criteria .pass,
-.html-rtl .criteria .fail,
-.html-rtl .criteria .meh {
-    background-position: right center;
-}
 
 .pretty-table {
     width: 100%;
@@ -663,24 +525,11 @@ h4.status span {
     -webkit-border-top-right-radius: 0;
     border-radius: 6px 0 6px 6px;
 }
-.html-rtl .inline-delete-box {
-    margin-left: auto;
-    margin-right: -378px;
-    -moz-border-radius: 0 6px 6px 6px;
-    -webkit-border-radius: 6px;
-    -webkit-border-top-left-radius: 0;
-    border-radius: 0 6px 6px 6px;
-}
 .uses-button .inline-delete-box {
     right: 0;
     margin: 2px 22px 0 0;
     width: 50%;
 }
-.html-rtl .uses-button .inline-delete-box {
-    right: auto;
-    left: 0;
-    margin: 2px 0 0 22px;
-}
 .inline-delete-box p {
     margin: 0 !important;
     padding: 0;
@@ -725,6 +574,145 @@ label.indented {
     text-indent: 2em;
 }
 
+/* translation box */
+.translation-box h4 {
+    border-bottom: 1px solid #2D3B58;
+}
+.translation-box h4 img {
+    float: right;
+    margin-top: 3px;
+}
+.translation-box .translation-button img {
+    cursor: pointer;
+    float: left;
+    background-color: #EEEEEE;
+    border: 1px solid #EEEEEE;
+    border-bottom: none;
+    padding: 2px 5px 3px;
+    margin: 5px 0 0 10px;
+    height: 1.5em;
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+}
+.translation-box .translation-button.remove img {
+    float: right;
+}
+.translation-box .translation-button img:hover {
+    background-color: #E4F3FA;
+}
+.translation-box .translation-tab {
+    float: left;
+    margin-right: 2px;
+    background-color: #DDDDDD;
+    text-align: center;
+    padding: 5px;
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    width: 3.1em;
+    height: 1.5em;
+    cursor: pointer;
+    border-bottom: 1px solid #FFFFFF;
+}
+.translation-box .translation-tab.selected {
+    border: 1px solid #1D587F;
+    background-color: #DDDDFF;
+    border-bottom: none;
+    color: #1D587F;
+}
+.translation-box .translation-tab:hover {
+    text-decoration: underline;
+}
+.translation-box .translation-area {
+    clear: both;
+    margin: 0;
+}
+.translation-box .translation-maxlength {
+    text-align: right;
+    display: none;
+}
+.translation-box .translation-maxlength.selected {
+    display: block;
+}
+.translation-box .translation-maxlength img {
+    display: none;
+}
+.translation-box .translation-maxlength.over {
+    color: #CC3333;
+}
+.translation-box .translation-maxlength.over img {
+    display: inline;
+    vertical-align: middle;
+}
+.translation-box .translation-maxlength span {
+    font-weight: bold;
+}
+.translation-box .input {
+    border: 1px solid #1D587F;
+    margin: 0;
+    -moz-border-radius-bottomleft: 6px;
+    -moz-border-radius-bottomright: 6px;
+    -webkit-border-bottom-left-radius: 6px;
+    -webkit-border-bottom-right-radius: 6px;
+    width: 100%;
+    display: none;
+}
+.translation-box .input.selected {
+    display: block;
+}
+.translation-newlocale-container,
+.translation-deletelocale-container,
+.translation-help-container,
+.translation-error-container {
+    display: none;
+}
+.translation-newlocale,
+.translation-deletelocale {
+    border: 1px solid #1D587F;
+    margin: 0;
+    -moz-border-radius-bottomleft: 6px;
+    -moz-border-radius-bottomright: 6px;
+    -webkit-border-bottom-left-radius: 6px;
+    -webkit-border-bottom-right-radius: 6px;
+    width: 100%;
+    height: 100px;
+    display: none;
+}
+.translation-deletelocale.textarea {
+    position: absolute;
+    z-index: 10;
+}
+.translation-newlocale.selected,
+.translation-deletelocale {
+    display: block;
+}
+.translation-newlocale .padded,
+.translation-deletelocale .padded,
+.translation-help .padded {
+    padding: 15px;
+}
+.translation-newlocale .buttons,
+.translation-deletelocale .buttons {
+    text-align: center;
+    margin: 10px;
+}
+.translation-help {
+    background-color: #FFFFFF;
+    margin-bottom: 10px;
+    width: 630px;
+    display: none;
+}
+
+
+.graybox .error-message {
+    background: transparent url('../img/developers/exclamation.png') no-repeat 5px 50%;
+    color: red;
+    padding: 5px 0 5px 30px;
+}
+
 .preview-box .error-message {
     display: none;
     background-image: url('../img/developers/preview_delete.png');
@@ -739,10 +727,6 @@ label.indented {
     margin-bottom: 5px;
     padding: 5px 5px 5px 30px;
 }
-.html-rtl .notice-success {
-    background-position: 100% 50%;
-    padding: 5px 25px 5px 5px;
-}
 .notice-success span {
     font-weight: bold;
 }
@@ -753,10 +737,6 @@ label.indented {
     margin-bottom: 5px;
     padding: 5px 5px 5px 30px;
 }
-.html-rtl .notice-error {
-    background-position: 100% 50%;
-    padding: 5px 25px 5px 5px;
-}
 .notice-error span {
     font-weight: bold;
 }
@@ -782,22 +762,12 @@ label.indented {
     padding-left: 30px;
     background: #FFFF99 url('../img/developers/noscript.png') no-repeat 5px 50%;
 }
-.html-rtl .notice.noscript {
-    padding-left: auto;
-    padding-right: 30px;
-    background-position: 100% 50%;
-}
 
 .notice.no-privs-box {
     padding-left: 30px;
     background: #FFFF99 url('../img/developers/privileges.png') no-repeat 5px 50%;
     display: none;
 }
-.html-rtl .notice.no-privs-box {
-    padding-left: auto;
-    padding-right: 30px;
-    background-position: 100% 50%;
-}
 
 #content-main.no-privs .no-privs-box {
     display: block;
@@ -812,12 +782,6 @@ label.indented {
 #content-main.no-privs .remove-button {
     display: none;
 }
-.version-delete-area {
-    text-align: right;
-}
-.html-rtl .version-delete-area {
-    text-align: left;
-}
 
 #content-main.no-privs input,
 #content-main.no-privs select,
@@ -850,24 +814,15 @@ div.error_message {
 .sub div { margin: 0; padding: 0; }
 .sub div.addon-container { margin-left: -1px; padding: 14px 20px 8px; }
 .sub .vex { left: 0; }
-.html-rtl .sub .vex { left: 0; }
 
 #summary h4 img {
     float: left;
     padding-right: 10px;
 }
-.html-rtl #summary h4 img {
-    float: right;
-    padding-right: auto;
-    padding-left: 10px;
-}
 #summary p {
     padding: 5px;
     clear: left;
 }
-.html-rtl #summary p {
-    clear: right;
-}
 
 /*** =Extra content ***/
 .action-bar {
@@ -879,9 +834,6 @@ div.error_message {
     -webkit-border-radius: 6px;
     border-radius: 6px;
 }
-.html-rtl .action-bar {
-    float: left;
-}
 .action-bar  ul {
     margin: 10px !important;
     list-style: none;
@@ -889,10 +841,6 @@ div.error_message {
 .action-bar ul li {
     padding-left: 20px;
 }
-.html-rtl .action-bar ul li {
-    padding-left: auto;
-    padding-right: 20px;
-}
 
 .addon-details h3 img {
     vertical-align: middle;
@@ -920,10 +868,6 @@ div.summaryBar {
     border: 0px;
     margin-left: 10px;
 }
-.html-rtl .summaryBar img {
-    margin-left: auto;
-    margin-right: 10px;
-}
 .summaryBar div {
     /* IE hack */
     zoom: 1;
@@ -962,10 +906,6 @@ div.greenNotice {
 #developersForm {
     padding-left: 15px;
 }
-.html-rtl #developersForm {
-    padding-left: auto;
-    padding-right: 15px;
-}
 #submissionHelp {
     text-align: center;
 }
@@ -984,24 +924,13 @@ div.greenNotice {
     float: left;
     width: 14em;
 }
-.html-rtl #developersForm label {
-    float: right;
-}
 #developersForm ul.rightlist li {
     list-style: none;
     padding-left: 11em;
 }
-.html-rtl #developersForm ul.rightlist li {
-    padding-left: auto;
-    padding-right: 11em;
-}
 #developersForm ul.rightlist li:first-child {
     padding-left: 0;
 }
-.html-rtl #developersForm ul.rightlist li:first-child {
-    padding-left: auto;
-    padding-right: 0;
-}
 #developersForm div div.platforms label {
     float: left;
     border: none;
@@ -1009,19 +938,11 @@ div.greenNotice {
     width: 14em;
     text-align: right;
 }
-.html-rtl #developersForm div div.platforms label {
-    float: right;
-    text-align: left;
-}
 #developersForm label.nofloat {
     float: none;
     margin-left: 10px;
     border: none;
 }
-.html-rtl #developersForm label.nofloat {
-    margin-left: auto;
-    margin-right: 10px;
-}
 #developersForm label.normal {
     float: none;
     border: none;
@@ -1030,17 +951,9 @@ div.greenNotice {
     font-style: italic;
     margin-left: 14em;
 }
-.html-rtl #developersForm div.description {
-    margin-left: auto;
-    margin-right: 14em;
-}
 #developersForm .spaced {
     margin-left: 14em;
 }
-.html-rtl #developersForm .spaced {
-    margin-left: auto;
-    margin-right: 14em;
-}
 #developersForm input.vmiddle {
     vertical-align: middle;
 }
@@ -1049,12 +962,6 @@ div.greenNotice {
 #developersForm textarea {
     margin-left: 5px;
 }
-.html-rtl #developersForm input,
-.html-rtl #developersForm select,
-.html-rtl #developersForm textarea {
-    margin-left: left;
-    margin-right: 5px;
-}
 #developersForm select {
     border: 1px solid #eee;
 }
@@ -1066,10 +973,6 @@ div.addonName {
     font-size: 14px;
     font-style: italic;
 }
-div.addonName {
-    padding-left: auto;
-    padding-right: 20px;
-}
 .buttonBox input {
     margin: 10px;
 }
@@ -1084,10 +987,6 @@ div.addonName {
     vertical-align: top;
     padding-left: 20px;
 }
-.html-rtl #tagDescription {
-    padding-left: auto;
-    padding-right: 20px;
-}
 #afterDescription {
     clear: both;
     padding-top: 15px;
@@ -1130,11 +1029,6 @@ div.addonName {
     padding: .4em;
     border-right: 1px solid #eee;
 }
-#locale-box span {
-    float: right;
-    border-right-width: 0;
-    border-left: 1px solid #eee;
-}
 #locale-box span:hover,
 #locale-box span.selected {
     background: url(../img/developers/locale-background-hover.png) repeat-x;
@@ -1152,18 +1046,11 @@ div.addonName {
 #fileList td.separator {
     padding: 0 15px;
 }
-#license-translationbox {
-    margin-top: 1em;
-}
 
 /* developers/tshirtrequest  */
 #tshirtRequestForm {
     padding-left: 15px;
 }
-.html-rtl #tshirtRequestForm {
-    padding-left: auto;
-    padding-right: 15px;
-}
 
 #tshirtRequestForm div {
     margin-top: 15px;
@@ -1172,8 +1059,4 @@ div.addonName {
 #requestTShirtButton {
     margin-left: 14em;
 }
-.html-rtl #requestTShirtButton {
-    margin-left: auto;
-    margin-right: 14em;
-}
 
diff --git a/site/app/webroot/css/editors.css b/site/app/webroot/css/editors.css
index 0c25025..4c11658 100644
--- a/site/app/webroot/css/editors.css
+++ b/site/app/webroot/css/editors.css
@@ -63,29 +63,9 @@ div.error_message {
 }
 #filterTable {
     width: 100%;
-    margin: 0 auto;
-    padding-bottom: 10px;
 }
-#filterTable div.group {
-    display: -moz-inline-box;
-    display: inline-block;
-    margin: 10px;
-}
-#filterTable div.left {
-    text-align: left;
-}
-#filterTable div.left div {
-    margin: 5px 0;
-}
-#filterTable div.left label {
-    float: left;
-    width: 150px;
-}
-#filterTable div.buttons {
-    clear: both;
-}
-input#FilterAddonOrAuthor {
-    width:250px;
+#filterTable td {
+    text-align: center;
 }
 #sessionNotice {
     text-align: center;
@@ -372,106 +352,3 @@ div.autocomplete ul li {
     padding-left:5px;
     color: #f33;
 }
-/* flagged add-ons */
-table#flagged tr.even { background-color: #eeeeff; }
-
-/* editors/performance */
-form#performanceFilter > div {
-    margin: 5px;
-}
-input#user {
-    width: 250px;
-}
-.performanceHeader {
-    margin-top: 20px;
-    margin-bottom: 10px;
-    padding-left: 24px;
-    font-size: 160%;
-    color: #426a13;
-    background: #abe071 url('../img/sprite.png?20090430') 0px 0px no-repeat;
-    border-bottom: 1px solid #79be1b;
-}
-.performanceHeader.collapsible span {
-    display: block;
-    margin-left: -17px;
-    padding-left: 17px;
-    background: transparent url('../img/sprite.png?20090430') 0px -318px no-repeat;
-}
-.performanceHeader.collapsible.expanded span {
-    background-position: 0px -261px;
-}
-#historyTable th {
-    font-weight: bold;
-    border-bottom: 1px solid gray;
-}
-#weeklyTable th {
-    font-weight: bold;
-    border-bottom: 1px solid gray;
-}
-th.numeric {
-    text-align: right;
-}
-td.numeric {
-    text-align: right;
-}
-th.headerSort { 
-    cursor: pointer; 
-    background-image: url('../img/developers/sort-bg.gif'); 
-    background-repeat: no-repeat; 
-    background-position: center right; 
-    padding-right: 20px; 
-    background-color: #e6eeee;
-}
-th.headerSortDown { 
-    background-image: url('../img/developers/sort-asc.gif'); 
-    background-color: #ccccff; 
-}
-th.headerSortUp { 
-    background-image: url('../img/developers/sort-desc.gif'); 
-    background-color: #ccccff; 
-}
-#tabTable #details,
-#tabTable #charts {
-    border-bottom: 1px solid black;
-    text-align: left;
-    vertical-align: bottom;
-}
-.html-rtl #tabTable #details,
-.html-rtl #tabTable #charts {
-    text-align: right;
-}
-#performanceUserSelect {
-    float:right;
-}
-.html-rtl #performanceUserSelect {
-    float:left;
-}
-.performancePieContainer {
-    height: 200px;
-    margin: 10px 5px;
-}
-#byCatTeamChart,
-#byCatUserChart {
-    width: 200px;
-    float: left;
-    clear: left;
-}
-.html-rtl #byCatTeamChart,
-.html-rtl #byCatUserChart {
-    float: right;
-    clear: left;
-}
-#performanceTeamLegend,
-#performanceUserLegend {
-    float: left;
-    margin: 0 10px;
-}
-#performanceTeamLegend div,
-#performanceUserLegend div {
-    margin: 0.2em;
-    padding: 0 0.2em;
-}
-.html-rtl #performanceTeamLegend,
-.html-rtl #performanceUserLegend {
-    float: right;
-}
diff --git a/site/app/webroot/css/forms.css b/site/app/webroot/css/forms.css
index 0c091e4..3e984cc 100644
--- a/site/app/webroot/css/forms.css
+++ b/site/app/webroot/css/forms.css
@@ -53,21 +53,11 @@
     margin-left: 14em;
 }
 
-.html-rtl .amo-form div.amo-form-indent {
-    margin-left: auto;
-    margin-right: 14em;
-}
-
 .amo-remember {
     margin-left: 12.2em;
 }
 
-.html-rtl .amo-remember {
-    margin-left: auto;
-    margin-right: 12.2em;
-}
-
-.html-rtl .amo-label-large, .html-rtl .amo-label-medium, .html-rtl .amo-label-small {
+[dir="rtl"] .amo-label-large, [dir="rtl"] .amo-label-medium, [dir="rtl"] .amo-label-small {
     float: right;
 }
 
diff --git a/site/app/webroot/css/ie.css b/site/app/webroot/css/ie.css
index 35f561e..e62235a 100644
--- a/site/app/webroot/css/ie.css
+++ b/site/app/webroot/css/ie.css
@@ -34,8 +34,7 @@ Created by Craig Cook - focalcurve.com
 /* Size adjustements */
 .html-ltr #search-element {left: 18%}
 #search-form #search-submit { width: 4em; }
-#addon-listing .exp .exp-loggedout,
-#addon-listing .exp .exp-confirmed { width: 160px; }
+#addon-listing .exp .exp-loggedout { width: 160px; }
 #rate-it legend span { left: -6px; }
 
 #content.landing #content-extra { width: 21%; }
diff --git a/site/app/webroot/css/ie6.css b/site/app/webroot/css/ie6.css
index 5e31336..0373c9f 100644
--- a/site/app/webroot/css/ie6.css
+++ b/site/app/webroot/css/ie6.css
@@ -63,8 +63,7 @@ div.error-notice { background-image: url("../img/warning-ie.png"); }
 #addon-listing .addon .vex span { position: relative; left: -220px; }
 
 /* IE6 doesn't shrinkwrap the float, so removing the border makes it look better */
-#addon-summary .exp-loggedout,
-#addon-summary .exp-confirmed { border: 0; padding: 0; }
+#addon-summary .exp-loggedout { border: 0; padding: 0; }
 
 /* Lose the left border because IE6 doesn't support :first-child */
 #nav-user li, .addon-cats li, #addon-listing .more li { border: 0; padding-left: 0; }
@@ -78,8 +77,7 @@ div.error-notice { background-image: url("../img/warning-ie.png"); }
 #content.landing.languages #secondaries { margin-bottom: 1.5em; }
 
 /* Color adjustments */
-.exp-loggedout .install-button a:hover,
-.exp-confirmed .install-button a:hover { color: #aaa; }
+.exp-loggedout .install-button a:hover { color: #aaa; }
 
 /* Position and margin adjustments */
 .sub .irk, .addon .vex span { margin-left: 0; position: relative; left: -1px; }
@@ -106,7 +104,6 @@ div.error-notice { background-image: url("../img/warning-ie.png"); }
 #categories.collapsed #cat-list a:active { width: 150px; }
 .main .vex, #addon-listing .addon .vex, #addon-summary .vex { padding-right: 261px; }
 #categories.collapsed #cat-list.visible { width: auto; margin: 0; }
-
 #recommended { padding: 0 10px 10px; width: auto; }
 #addon-summary, #recommended .addon { height: 220px; }
 .sub .preview-img { width: 100%; }
diff --git a/site/app/webroot/css/jquery-lightbox.css b/site/app/webroot/css/jquery-lightbox.css
index fe73a31..e922e2e 100644
--- a/site/app/webroot/css/jquery-lightbox.css
+++ b/site/app/webroot/css/jquery-lightbox.css
@@ -15,7 +15,7 @@
 	position: absolute;
 	top: 0;
 	left: 0;
-	z-index: 900;
+	z-index: 90;
 	width: 100%;
 	height: 500px;
 }
@@ -24,7 +24,7 @@
 	top: 0;
 	left: 0;
 	width: 100%;
-	z-index: 901;
+	z-index: 100;
 	text-align: center;
 	line-height: 0;
 }
diff --git a/site/app/webroot/css/jquery-ui/flora/flora.tabs.css b/site/app/webroot/css/jquery-ui/flora/flora.tabs.css
index 19c5994..42a2117 100644
--- a/site/app/webroot/css/jquery-ui/flora/flora.tabs.css
+++ b/site/app/webroot/css/jquery-ui/flora/flora.tabs.css
@@ -24,9 +24,6 @@
     margin: 0;
     padding: 0 0 0 3px;
 }
-.html-rtl .ui-tabs-nav {
-    padding: 0 3px 0 0;
-}
 .ui-tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
     display: block;
     clear: both;
@@ -37,10 +34,6 @@
     margin: 0 0 0 2px;
     font-weight: bold;
 }
-.html-rtl .ui-tabs-nav li {
-    float: right;
-    margin: 0 2px 0 0;
-}
 .ui-tabs-nav a, .ui-tabs-nav a span {
     float: left; /* fixes dir=ltr problem and other quirks IE */
     padding: 0 12px;
diff --git a/site/app/webroot/css/remora.css b/site/app/webroot/css/remora.css
index 3c098e5..4386b6c 100644
--- a/site/app/webroot/css/remora.css
+++ b/site/app/webroot/css/remora.css
@@ -18,13 +18,13 @@
 #cat-list li.selected a { background: #99CC66; }
 
 /* Add-on Summary */
-#addon-summary .stats { position: absolute; left: 20px; top: 19em; margin: 1em 0; text-align: center; }
+#addon-summary { min-height: 255px; }
 #addon-summary .privacypolicy { clear: both; padding-top: .5em; }
 
 /* Details Page */
 #addon-info h4.version-link { margin: 2em 0; }
 
-#addon-info h4.version-link a.view { background: transparent url("../img/sprite.png?20090430") 100% -387px no-repeat; }
+#addon-info h4.version-link a.view { background: transparent url("../img/sprite.png?20081210") 100% -387px no-repeat; }
 .html-ltr #addon-info h4.version-link a.view:hover { background-position: 100% -437px; }
 .html-rtl #addon-info h4.version-link a.view { background-position: 100% -597px; }
 .html-rtl #addon-info h4.version-link a.view:hover { background-position: 100% -647px; }
@@ -32,7 +32,7 @@
 
 /* Install Box Outer */
 .sub div.install-container { padding: 0; margin: 0; }
-.sub div.secondary-container { background: transparent url("../img/sprite.png?20090430") left -1256px no-repeat; }
+.sub div.secondary-container { background: transparent url("../img/sprite.png?20081210") left -1256px no-repeat; }
 
 /* Footer */
 ul#nav-legal { margin:0; }
@@ -45,8 +45,8 @@ ul#nav-legal { margin:0; }
 .error-notice { margin: 0 auto; padding: 10px 80px 20px 80px; background: url(../img/warning.png) 20px 20px no-repeat; min-height: 48px; }
 
 /* right sidebar */
-.sidebar-content h3 { margin: 0 -1px; padding-left: 6px; font-size: 120%; background: #79be1b url("../img/sprite.png?20090430") -217px -106px no-repeat; border-bottom: 1px solid #abe071; }
-.sidebar-content h3 span { display: block; padding: 8px 4px; color: #426a13; background: transparent url("../img/sprite.png?20090430") -342px -106px no-repeat; }
+.sidebar-content h3 { margin: 0 -1px; padding-left: 6px; font-size: 120%; background: #79be1b url("../img/sprite.png?20081210") -217px -106px no-repeat; border-bottom: 1px solid #abe071; }
+.sidebar-content h3 span { display: block; padding: 8px 4px; color: #426a13; background: transparent url("../img/sprite.png?20081210") -342px -106px no-repeat; }
 .sidebar-content { margin-bottom: 1em; position: relative; z-index: 5; padding-bottom: 6px; background-color: #f6f6f6; border: 1px solid #d8dcdf; border-width: 0 1px 1px; }
 .sidebar-content { -moz-border-radius-bottomright: 6px; -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-right-radius: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; border-bottom-left-radius: 6px; }
 .sidebar-list { margin-left: 0; list-style: none; border-top: 1px solid #e8e6e6; }
@@ -65,7 +65,7 @@ ul#nav-legal { margin:0; }
 #addon-summary.addon-policy { padding-left: 0; }
 div#content-policy { margin: 0 0 2em 44px; }
 .policy-area { margin-bottom: 2em ;}
-#policy-tl  { position: absolute; left: -1px; top: 0; padding: 18px 0 0 20px; background: transparent url("../img/sprite.png?20090430") left -1256px no-repeat; height: 10px; width: 10px; }
+#policy-tl  { position: absolute; left: -1px; top: 0; padding: 18px 0 0 20px; background: transparent url("../img/sprite.png?20081210") left -1256px no-repeat; height: 10px; width: 10px; }
 
 /* options bar on listing pages */
 #form-listcontrol #options-submit { position: absolute; top:15px; right:-30px; }
@@ -124,9 +124,12 @@ div.hsession { display: none; }
     font-family: inherit;
     font-size: inherit;
 }
-#tabbed-editor .line {
+#tabbed-editor div div {
     margin: 10px 0;
 }
+#tabbed-editor .ui-tabs-panel h3 {
+    display: none;
+}
 #tabbed-editor .tabs-nav {
     display: none;
 }
@@ -148,30 +151,3 @@ dl.faq dd {
 dl.faq dt:target {
     color: #df731b;
 }
-
-
-/* Developer Agreement */
-#dev-agreement ul {
-  list-style-type: disc;
-}
-
-/* Version License */
-#version-license {
-    background-color: #EEE;
-    border: 1px solid #AAA;
-    max-width: 600px;
-    max-height: 400px;
-    overflow: auto;
-}
-
-/* Get Satisfaction */
-div#gsfn_list_widget img { border: none; }
-div#gsfn_list_widget { float:right; font-size: 12px; width: 250px; border: 6px solid #DDD; padding: 5px 5px 25px 20px; margin: 5px 5px 10px 10px;}
-div#gsfn_list_widget a.widget_title { color: #000; display: block; margin-bottom: 10px; font-weight: bold; }
-div#gsfn_list_widget .powered_by { margin-top: 8px; padding-top: 8px; border-top: 1px solid #DDD; }
-div#gsfn_list_widget .powered_by a { color: #333; font-size: 90%; }
-div#gsfn_list_widget div#gsfn_content { }
-div#gsfn_list_widget div#gsfn_content li { text-align:left; margin-bottom:6px; }
-div#gsfn_list_widget div#gsfn_content a.gsfn_link { line-height: 1; }
-div#gsfn_list_widget div#gsfn_content span.time { font-size: 90%; padding-left: 3px; }
-div#gsfn_list_widget div#gsfn_content p.gsfn_summary { margin-top: 2px }
diff --git a/site/app/webroot/css/screen.css b/site/app/webroot/css/screen.css
index 0e640d6..498295e 100644
--- a/site/app/webroot/css/screen.css
+++ b/site/app/webroot/css/screen.css
@@ -102,7 +102,7 @@ h4#moz a { display: block; height: 44px; width: 100px; padding-left: 10px;}
 
 #other-apps.js { width: 12em; padding-bottom: 6px; }
 
-#other-apps h3 { margin-right: 20px; }
+#other-apps h3 { float: left; margin-right: 20px; }
 
 #other-apps.js h3 { float: none; cursor: pointer; }
 .html-ltr #other-apps.js h3 {margin: -6px -10px; padding: 6px 15px 6px 20px; }
@@ -112,6 +112,7 @@ h4#moz a { display: block; height: 44px; width: 100px; padding-left: 10px;}
 .html-ltr #nav-apps { margin-left: 0;}
 .html-rtl #nav-apps { margin-right: 0;}
 
+#nav-apps li { display: inline; }
 .html-ltr #nav-apps li {  margin-right: 10px; }
 .html-rtl #nav-apps li {  margin-left: 10px; }
 
@@ -145,24 +146,19 @@ h4#moz a { display: block; height: 44px; width: 100px; padding-left: 10px;}
 #search-form ol { margin: 0; padding: 0; }
 #search-form #search-query { width: 55%; }
 
-#search-form #search-query label, #search-mini #search-query label { display: none; } /* label is hidden by default when JS isn't available */
-#search-mini #search-query label { font-style:  italic; color: #46651f;}
-#search-form #search-query label, #search-mini #search-query label { position: absolute;  top: 20px; }
-#search-mini #search-query label {top: 2px;}
+#search-form #search-query label { display: none; } /* label is hidden by default when JS isn't available */
+
+#search-form #search-query label { position: absolute;  top: 20px; }
 .html-ltr #search-form #search-query label { left: 17px; padding: .2em 5px .2em 30px; }
 .html-rtl #search-form #search-query label { right: 17px; padding: .2em 30px .2em 5px; }
 
-
 #search-form #query { width: 42%;}  
 .html-ltr #search-form #query {  padding: .2em 5px .2em 24px;}
 .html-rtl #search-form #query {  padding: .2em 24px .2em 5px;}
 
-#search-form #category { width: 36%; padding: .2em 0;  }
+#search-form #category { width: 36%; padding: .3em 0 .2em 0;  }
 #search-form #category option { min-width: 14em; }
 
-
-#search-form #search-query input, #search-form #category option { height: 21px; -ms-box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; }
-
 #search-form #my-submit { width:37px; height: 38px; border: 0px; margin-left: 9px; }
 
 /*** =Advanced Search Form ***/
@@ -186,51 +182,6 @@ form.asclosed {display: none;}
 .html-ltr #search-platform {float: left;   margin-bottom: 1.5em; margin-right: 1in;}
 .html-rtl #search-platform {float: right;  margin-bottom: 1.5em; margin-left: 1in;}
 
-/*** =Mini search form ***/
-#search-mini {
-    display: inline;
-    float: right;
-    border: 1px solid #8cb956;
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    border-radius: 6px;
-    background: #91ce43 url('../img/sprite.png?20090430') no-repeat right -23px;
-    padding: 5px;
-    position: relative;
-    -moz-box-shadow: 2px 2px 3px -1px #888888;
-    -webkit-box-shadow: 2px 2px 3px -1px #888888;
-    box-shadow: 2px 2px 3px -1px #888888;
-}
-
-.html-rtl #search-mini {
-    float: left;
-    -moz-box-shadow: -2px 2px 3px -1px #888888;
-    -webkit-box-shadow: -2px 2px 3px -1px #888888;
-    box-shadow: -2px 2px 3px -1px #888888;
-}
-
-#search-mini #category { 
-    font-size: 113%;
-    max-width:250px;
-}
-
-.html-ltr #search-mini #search-query label { left: 9px; padding: 0.39em 15px 0.2em 5px;}
-.html-rtl #search-mini #search-query label { right: 9px; padding: 0.39em 5px 0.2em 15px;}
-
-#search-mini-submit {
-    border: 1px solid #6d9041;
-    background: url('../img/sprite.png?20090430') no-repeat right -23px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    padding: 2px 9px;
-    vertical-align: top;
-    margin: 0 0 0 3px;
-    -moz-box-shadow: 2px 2px 3px -1px #888888;
-    -webkit-box-shadow: 2px 2px 3px -1px #888888;
-    box-shadow: 2px 2px 3px -1px #888888;
-}
-
 /*** =Footer ***/
 #footer { position: relative; width: 100%; clear: both; padding: 1em 0;  min-width: 770px;}
 #footer-lang-form { position: relative; max-width: 900px; min-width: 770px;}
@@ -246,7 +197,7 @@ form.asclosed {display: none;}
 #footer-disclaimer { margin-top: 1em; }
 
 /*** =Content layout ***/
-#content { clear: both; position: relative; padding: 1em 50px; max-width: 950px; margin: 0 auto 1em; min-width: 770px; min-height:1000px; }
+#content { clear: both; position: relative; padding: 1em 50px; max-width: 950px; margin: 0 auto 1em; margin-bottom: 25ex; min-width: 770px; min-height:1000px; }
 #content-main { position: relative; margin-left: 190px; min-height: 50em; }
 #content.main-page #content-main, 
 #content.detail-page #content-main, 
@@ -274,8 +225,8 @@ form.asclosed {display: none;}
 #content-extra ul li span {font-size: 8pt;}
 #content-extra p.view-all { margin-bottom: .5em; }
 .html-rtl #content-extra p.view-all {margin-right: 4px}
-/*** =Categories ***/
 
+/*** =Categories ***/
 #categories { margin-bottom: 1em; position: relative; z-index: 5; }
 #categories h3 { margin: 0 -1px; padding-left: 6px; }
 #categories.collapsed h3 { padding-left: 18px; }
@@ -295,8 +246,6 @@ form.asclosed {display: none;}
 #categories.collapsed #cat-list a:active, #categories.collapsed #cat-list a:focus { position: absolute; left: 999em; top: 1002.4em; width: 85%; }
 #categories.collapsed #cat-list.visible a:active, #categories.collapsed #cat-list.visible a:focus { position: static; width: auto; }
 
-
-
 /*** =Content-main, general styles ***/
 #content-main p, #content-main ul, #content-main ol { margin-bottom: 1.25em; }
 #content-main li { margin-bottom: .5em; }
@@ -344,9 +293,7 @@ form.asclosed {display: none;}
 /*** =Install button ***/
 .install-button:after, .install-container:after {content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;} /* clear floats */
 .install-button a { float: left; cursor: pointer; max-width: 290px;}
-.html-rtl .install-button a { float: right; }
 .install-button a * { display: block; float: left; position: relative; }
-.html-rtl .install-button a * { float: right; }
 .install-button a span { padding: 0 0 0 6px; }
 .install-button a span span { padding: 0 0 8px 0; }
 .install-button a span span span { left: -6px; padding: 0 0 6px 0; }
@@ -357,25 +304,12 @@ form.asclosed {display: none;}
 #addon-listing .install-container .install-button { margin-bottom: .5em; float: right; }
 #addon-listing .addon p.updated { position: absolute; right: 0; bottom: 5px; max-width: 180px; padding: 0 15px; }
 
-#addon-listing .exp .exp-loggedout,
-#addon-listing .exp .exp-confirmed { float: right; }
-#addon-listing .exp .exp-loggedout .install-button,
-#addon-listing .exp .exp-confirmed .install-button { float: none; }
-
-.exp-loggedout, .exp-confirmed { float: left; padding: 5px 5px 3px 8px; }
-.html-rtl .exp-loggedout, .html-rtl .exp-confirmed { float: right; padding: 5px 8px 3px 5px; }
-.exp-loggedout .install-button,
-.exp-confirmed .install-button { margin-top: 3px; margin-right: -3px; }
-.html-rtl .exp-loggedout .install-button,
-.html-rtl .exp-confirmed .install-button { margin-right: 0; margin-left: -3px; }
-.exp-loggedout .install-button a { cursor: default; }
-#content-main .exp-loggedout p.install-button,
-#content-main .exp-confirmed p.install-button { margin-bottom: 0; }
-
-.exp-confirm-install input { float: left; }
-.html-rtl .exp-confirm-install input { float: right; }
-.exp-confirm-install .exp-desc { float: right; width: 85%; padding: 0px 0px 5px 0px; }
-.html-rtl .exp-confirm-install .exp-desc { float: left; }
+#addon-listing .exp .exp-loggedout { float: right; }
+#addon-listing .exp .exp-loggedout .install-button { float: none; }
+
+.exp-loggedout { float: left; padding: 5px 5px 3px 8px; }
+.exp-loggedout .install-button { margin-top: 3px; margin-right: -3px; }
+#content-main .exp-loggedout p.install-button { margin-bottom: 0; }
 
 /*** =Pitch ***/
 .pitch { margin-bottom: 1em; padding: 10px; }
@@ -444,21 +378,21 @@ form.asclosed {display: none;}
 #dictionaries th, #dictionaries td { padding: 6px 12px; }
 
 /*** =Detail page ***/
-#addon-summary { padding-left: 240px; min-height: 270px; }
+#addon-summary { padding-left: 240px; min-height: 225px; }
 #addon-summary .name { margin-bottom: 0; }
 #addon-summary .preview-img { position: absolute; left: -1px; top: 0; padding: 18px 0 0 20px;}
 #addon-summary.exp .preview-img, #addon-summary.rec .preview-img { padding-top: 2.5em; }
-#addon-summary .rating img {  }
-#addon-summary .rating { position: absolute; left: 20px; top: 180px; width: 200px; text-align: center; line-height: 14px }
-#content-main #addon-summary .stats { position: absolute; text-align: center; left: 20px; top: 202px; width: 200px; margin-top: 3.5em; }
+#addon-summary .rating img { display: block; }
+#addon-summary .rating { position: absolute; left: 20px; top: 180px; width: 200px; }
+#addon-summary .stats { position: absolute; left: 20px; top: 180px; width: 200px; margin-top: 3.5em; }
 
-#addon-summary .link-sharing { position: absolute; left: 60px; top: 218px; font-size: 0.75em; }
+#addon-summary .link-sharing { position: absolute; left: 105px; /*padding-left: 25px; border-left: 1px solid #cecece;*/ top: 180px; font-size: 0.7em; }
 #addon-summary .link-sharing .badge { } 
-#addon-summary .link-sharing .badge .button {  display: block;color: #062445; background: #7cc11c url("../img/sprite.png?20090430") -800px -730px no-repeat;  }
+#addon-summary .link-sharing .badge .button {  display: block;color: #062445; background: #7cc11c url("../img/sprite.png?20081210") -800px -730px no-repeat;  }
 #addon-summary .link-sharing .badge .button a { display: block; padding: 0 8px 8px 0; background: transparent url(../img/installbtn-edges.png) no-repeat scroll right bottom; }
 #addon-summary .link-sharing .badge .button a span { display: block; text-align: center; font-weight: bold; padding: 2px 0 0 2px; background: transparent url(../img/installbtn-edges-list.png) no-repeat scroll left top; }
 
-#addon-summary .link-sharing .share-button { padding: 0; margin: 0; width: 100px; }
+#addon-summary .link-sharing .share-button { padding: 0; margin: 0 }
 #addon-summary .link-sharing .share-button:after, .install-container:after {content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}
 #addon-summary .link-sharing .share-button a { float: left; cursor: pointer; max-width: 290px; text-decoration: none; }
 #addon-summary .link-sharing .share-button a * { display: block; float: left; position: relative; }
@@ -468,7 +402,7 @@ form.asclosed {display: none;}
 #addon-summary .link-sharing .share-button a span span span strong { width: 90px; text-align: center; right: -6px; padding: 0 18px 0 6px; }
 #addon-summary .link-sharing .share-button a span span span strong img {padding: 0 6px 0 0;}
 
-#addon-summary .link-sharing .share-button a { color: #062445; background: #7cc11c url("../img/sprite.png?20090430") -800px -730px no-repeat; }
+#addon-summary .link-sharing .share-button a { color: #062445; background: #7cc11c url("../img/sprite.png?20081210") -800px -730px no-repeat; }
 #addon-summary .link-sharing .share-button a span { background: transparent url("../img/installbtn-edges.png") left bottom no-repeat; }
 #addon-summary .link-sharing .share-button a span span { background: transparent url("../img/installbtn-edges.png") right bottom no-repeat; }
 #addon-summary .link-sharing .share-button a span span span { background: transparent url("../img/installbtn-edges.png") left top no-repeat; }
@@ -478,7 +412,7 @@ form.asclosed {display: none;}
 
 #addon-summary .link-sharing .badge .counter { display: block; position: relative; padding-right: 4px; text-align: center; top: -4px; }
 
-#addon-summary .link-sharing .choices { display: none; position: absolute; z-index: 9999; left: -120px; top: 12px; width: 360px; background: transparent url(../img/box-pointer-top.png) center top no-repeat; padding-top: 12px; }
+#addon-summary .link-sharing .choices { display: none; position: absolute; z-index: 999; left: -120px; top: 12px; width: 360px; background: transparent url(../img/box-pointer-top.png) center top no-repeat; padding-top: 12px; }
 #addon-summary .link-sharing .choices div { margin: 0; padding: 1em; background-color: #f8f8f8; border: 1px solid #657b86; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; }
 #addon-summary .link-sharing .choices ul { list-style: none; margin: 0; }
 #addon-summary .link-sharing .choices ul li { width: 50%; float: left; }
@@ -704,11 +638,6 @@ form.asclosed {display: none;}
     content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;
 }
 
-/* =Publish to collection from display page */
-#publish_to option:first-child {
-    display:none;
-}
-
 /* =More add-ons */
 .more-addons { padding: 10px; }
 .more-addons h3 a.view { display: block; padding-right: 30px; padding: .2em 30px .2em 0; }
@@ -720,6 +649,7 @@ form.asclosed {display: none;}
 .pages { margin: 0; float: left; }
 .pages li { display: inline; margin: 0 2px; }
 .pages a { padding: 3px 6px; }
+.pages .current strong { padding: 3px 6px; }
 .pages .prev a { padding-left: 15px; }
 .pages .next a { padding-right: 15px; }
 #content-main .pagination p.count { margin-bottom: 0; }
@@ -764,205 +694,28 @@ form.asclosed {display: none;}
 #thumb-browser #form-listcontrol { margin-left: 20%; padding: 8px 12% 8px 15%; }
 #thumb-browser #form-listcontrol #order-by button { white-space: nowrap; width: 16.5% }
 
-#slider { margin-bottom: 18px; width: 100%; background:transparent url(../img/sprite.png?20090430) no-repeat scroll left -1256px; }
-#slider .inner { background:transparent url(../img/sprite.png?20090430) no-repeat scroll right -1256px; width: 100%; }
+#slider { margin-bottom: 18px; width: 100%; background:transparent url(../img/sprite.png?20081210) no-repeat scroll left -1256px; }
+#slider .inner { background:transparent url(../img/sprite.png?20081210) no-repeat scroll right -1256px; width: 100%; }
 #slider .viewport { position: relative; width: 100%; overflow: hidden; }
 #slider .item_set { width: 6000px; }
 #slider .item_set .addon { float: left; width: 308px; }
 #slider .item_set li.addon { list-style: none; }
-#slider .item_set .addon .preview-img { background: transparent url(../img/sprite.png?20090430) no-repeat 1px -1256px } 
+#slider .item_set .addon .preview-img { background: transparent url(../img/sprite.png?20081210) no-repeat 1px -1256px } 
 #slider .item_set .addon { background: none; border-left: none } 
 #slider .item_set .addon .install-container { height: 85px; }
 #slider .item_set .addon .install-button { padding-top: 1.75em; padding-left: .5em; }
-#slider .item_set .addon .exp-loggedout .install-button,
-#slider .item_set .addon .exp-confirmed .install-button { padding-top: 0; padding-left: 0; }
+#slider .item_set .addon .exp-loggedout .install-button { padding-top: 0; padding-left: 0; }
 #slider .item_set .addon .count { border-top:1px solid #CCCCCC; bottom:4px; height:35px; margin-left:-240px; position:absolute; }
 #slider .controls { border-top: 1px solid #ccc; width: 100%; }
 #slider .controls_inner { font-size: 140%; text-align: center; padding-top: 6px; border-left: 1px solid #ccc; border-right: 1px solid #ccc }
 #slider .controls a { text-decoration: none; padding: 0 0.5em; }
 #slider .controls a img { border: none; vertical-align: top }
-#slider .vex { background: transparent url("../img/sprite.png?20090430") right bottom no-repeat; width: 100%; }
+#slider .vex { background: transparent url("../img/sprite.png?20081210") right bottom no-repeat; width: 100%; }
 .html-rtl #slider .vex { direction: ltr; }
-#slider .vex span { background: transparent url("../img/sprite.png?20090430") left bottom no-repeat; height: 10px; display: block; width: 10px; }
-
-
-/* translation box */
-.graybox {
-    background-color: #F7FAFC;
-    border: 1px solid #EEF1F3;
-    padding: 15px;
-}
-.graybox.errors {
-    background-color: #FFA5A5;
-}
-.graybox.spaced {
-    margin-bottom: 10px;
-}
-.rounded {
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    border-radius: 6px;
-}
-.translation-box h4 {
-    border-bottom: 1px solid #2D3B58;
-}
-.translation-box h4 img {
-    float: right;
-    margin-top: 3px;
-}
-.html-rtl .translation-box h4 img {
-    float: left;
-}
-.translation-box .translation-button img {
-    cursor: pointer;
-    float: left;
-    background-color: #EEEEEE;
-    border: 1px solid #EEEEEE;
-    border-bottom: none;
-    padding: 2px 5px 3px;
-    margin: 5px 0 0 10px;
-    height: 1.5em;
-    -moz-border-radius-topleft: 6px;
-    -moz-border-radius-topright: 6px;
-    -webkit-border-top-left-radius: 6px;
-    -webkit-border-top-right-radius: 6px;
-}
-.html-rtl .translation-box .translation-button img {
-    float: right;
-    margin: 5px 10px 0 0;
-}
-.translation-box .translation-button.remove img {
-    float: right;
-}
-.html-rtl .translation-box .translation-button.remove img {
-    float: left;
-}
-.translation-box .translation-button img:hover {
-    background-color: #E4F3FA;
-}
-.translation-box .translation-tab {
-    float: left;
-    margin-right: 2px;
-    background-color: #DDDDDD;
-    text-align: center;
-    padding: 5px;
-    -moz-border-radius-topleft: 6px;
-    -moz-border-radius-topright: 6px;
-    -webkit-border-top-left-radius: 6px;
-    -webkit-border-top-right-radius: 6px;
-    width: 3.1em;
-    height: 1.5em;
-    cursor: pointer;
-    border-bottom: 1px solid #FFFFFF;
-}
-.html-rtl .translation-box .translation-tab {
-    float: right;
-    margin-right: auto;
-    margin-left: 2px;
-}
-.translation-box .translation-tab.selected {
-    border: 1px solid #1D587F;
-    background-color: #DDDDFF;
-    border-bottom: none;
-    color: #1D587F;
-}
-.translation-box .translation-tab:hover {
-    text-decoration: underline;
-}
-.translation-box .translation-area {
-    clear: both;
-    margin: 0;
-}
-.translation-box .translation-maxlength {
-    text-align: right;
-    display: none;
-}
-.html-rtl .translation-box .translation-maxlength {
-    text-align: left;
-}
-.translation-box .translation-maxlength.selected {
-    display: block;
-}
-.translation-box .translation-maxlength img {
-    display: none;
-}
-.translation-box .translation-maxlength.over {
-    color: #CC3333;
-}
-.translation-box .translation-maxlength.over img {
-    display: inline;
-    vertical-align: middle;
-}
-.translation-box .translation-maxlength span {
-    font-weight: bold;
-}
-.translation-box .input {
-    border: 1px solid #1D587F;
-    margin: 0;
-    -moz-border-radius-bottomleft: 6px;
-    -moz-border-radius-bottomright: 6px;
-    -webkit-border-bottom-left-radius: 6px;
-    -webkit-border-bottom-right-radius: 6px;
-    width: 100%;
-    display: none;
-}
-.translation-box .input.selected {
-    display: block;
-}
-.translation-newlocale-container,
-.translation-deletelocale-container,
-.translation-help-container,
-.translation-error-container {
-    display: none;
-}
-.translation-newlocale,
-.translation-deletelocale {
-    border: 1px solid #1D587F;
-    margin: 0;
-    -moz-border-radius-bottomleft: 6px;
-    -moz-border-radius-bottomright: 6px;
-    -webkit-border-bottom-left-radius: 6px;
-    -webkit-border-bottom-right-radius: 6px;
-    width: 100%;
-    height: 100px;
-    display: none;
-}
-.translation-deletelocale.textarea {
-    position: absolute;
-    z-index: 10;
-}
-.translation-newlocale.selected,
-.translation-deletelocale {
-    display: block;
-}
-.translation-newlocale .padded,
-.translation-deletelocale .padded,
-.translation-help .padded {
-    padding: 15px;
-}
-.translation-newlocale .buttons,
-.translation-deletelocale .buttons {
-    text-align: center;
-    margin: 10px;
-}
-.translation-help {
-    background-color: #FFFFFF;
-    margin-bottom: 10px;
-    width: 630px;
-    display: none;
-}
-.graybox .error-message {
-    background: transparent url('../img/developers/exclamation.png') no-repeat 5px 50%;
-    color: red;
-    padding: 5px 0 5px 30px;
-}
-.html-rtl .graybox .error-message {
-    background-position: 100% 50%;
-    padding: 5px 25px 5px 0;
-}
-
+#slider .vex span { background: transparent url("../img/sprite.png?20081210") left bottom no-repeat; height: 10px; display: block; width: 10px; }
 
 /** Collections normal view **/
+
 #content .addon-listing .date-added {
     margin: 0;
     float: right;
@@ -1173,7 +926,6 @@ form.asclosed {display: none;}
     float: right;
     text-align: right;
 }
-
 /* jqModal base Styling courtesy of Brice Burgess <bhb@iceburg.net> */
 
 /* The Window's CSS z-index value is respected (takes priority). If none is supplied,
@@ -1211,616 +963,3 @@ form.asclosed {display: none;}
     top: expression((document.documentElement.scrollTop || document.body.scrollTop)+Math.round(17 *(document.documentElement.offsetHeight || document.body.clientHeight) / 100)+'px');
 }
 
-#content.landing {
-    width: 995px;
-}
-
-#content.landing .crumbs a {
-    color: #5086b6;
-}
-#content.landing .categories {
-    position: relative;
-    clear: both;
-    border: none;
-    z-index: 3000;
-}
-
-#content.landing .categories h3 {
-    display: inline;
-    font-size: 189%;
-    padding:0 0 0 10px
-}
-.html-rtl #content.landing .categories h3 {
-    padding: 0 10px 0 0;
-}
-
-#content.landing .categories .selection .current {
-    font-size: 250%;
-    padding: 0; 
-    margin: 5px 0 0 0;
-    font-weight: normal;
-    display: inline;
-    padding: 0 3px 0 0;
-    
-}
-.html-rtl #content.landing .categories .selection .current {
-    padding: 0 0 0 3px;
-}
-#content.landing .categories .selection .current a {
-    text-decoration: none;
-    color: #5086b6;
-    background: none;
-    display: inline;
-    padding: 0;
-
-}
-#content.landing .categories .selection .current a:hover {
-    color: #000;
-
-}
-#content.landing .categories .selection .current .all {
-    display: inline;
-    padding: 4px;
-    background: url('../img/sprite.png?20090430') left -444px no-repeat;
-    
-}
-#content.landing .categories .selection .current a:hover .all {
-    background: url('../img/sprite.png?20090430') left -498px no-repeat;
-}
-
-#content.landing .categories.open .current a .all {
-    background: url('../img/sprite.png?20090430') left -498px no-repeat;
-}
-
-#content.landing .categories h3.featured_title {
-    float: left;
-    font-size: 24px;
-    padding: 0 0 0 0.5em; margin: 0;
-}
-#content.landing .categories h3.featured_title span {
-    font-size: 20px;
-}
-#content.landing .categories .selections {
-    background-color: #fff;
-    width: 410px;
-    list-style: none;
-    margin: 0; 
-    padding: 6px;
-    -moz-box-shadow: 4px 7px 7px 2px #888888;
-    -webkit-box-shadow: 4px 7px 7px 2px #888888;
-    box-shadow: 4px 7px 7px 2px #888888;
-}
-.html-rtl #content.landing .categories .selections {
-    -moz-box-shadow: -4px 7px 7px 2px #888888;
-    -webkit-box-shadow: -4px 7px 7px 2px #888888;
-    box-shadow: -4px 7px 7px 2px #888888;
-}
-
-#content.landing .categories.degrade .selections {
-    border-left: 1px solid #888888;
-    border-right:  1px solid #888888;
-    border-bottom:  1px solid #888888;
-}
-
-#content.landing .categories.closed .selections {
-    position: absolute;
-    top: -1000px;
-    left: -100000px;
-}
-.html-rtl #content.landing .categories.closed .selections {
-    left: auto;
-    right: -100000px;
-}
-
-#content.landing .categories.open .selections {
-    position: absolute;
-    left: -3px;
-    top: 3.3em;
-    z-index: 999;
-    -moz-column-count: 2;
-    column-count: 2;
-}
-.html-rtl #content.landing .categories.open .selections {
-    left: auto;
-    right: -3px;
-}
-
-#content.landing .categories.open h2.current {
-    -moz-box-shadow: 2px 2px 7px 0 #888888;
-    -webkit-box-shadow: 2px 2px 7px 0 #888888;
-    box-shadow: 2px 2px 7px 0 #888888;
-    margin: 2px 0 -3px -3px;
-    padding: 3px;
-}
-.html-rtl #content.landing .categories.open h2.current {
-    -moz-box-shadow: -2px 2px 7px 0 #888888;
-    -webkit-box-shadow: -2px 2px 7px 0 #888888;
-    box-shadow: -2px 2px 7px 0 #888888;
-    margin: 2px -3px -3px 0;
-    padding: 3px;
-}
-
-#content.landing .categories.open.degrade {
-    margin: 0 0 12px 0;
-}
-
-#content.landing .categories.open.degrade h2.current {
-    border-top: 1px solid #888888;
-    border-left: 1px solid #888888;
-    border-right: 1px solid #888888;
-    margin: 5px -2px 5px -3px;
-}
-
-#content.landing .categories.open.degrade .header {
-    background:#888888 none repeat scroll 0 0;
-    display:block;
-    height:1px;
-    left:273px;
-    line-height:0;
-    position:absolute;
-    top:39px;
-    padding: 0;
-}
-
-#content.landing .categories.open .current a {
-    color: #000000;
-}
-
-#content.landing .categories .selections li {
-    border: none;
-    padding: 0;
-}
-#content.landing .categories .selections li a {
-    display: block;
-    padding: 1px 1px 1px 5px;
-    margin: 0 4px 0 0;
-    text-decoration: none;
-    color: #000;
-    background: none;
-}
-.html-rtl #content.landing .categories .selections li a {
-    padding: 1px 5px 1px 1px;
-    margin: 0 0 0 4px;
-}
-#content.landing .categories .selections li a:hover {
-    background: #ddd;
-}
-#content.landing .search {
-    /* TODO */
-    display: none;
-}
-#featured_addons {
-    width: 995px;
-    z-index: 2;
-    position: relative;
-}
-#featured_addons ul {
-    list-style-type: none;
-    margin: 0; padding: 0;
-}
-#featured_addons ul li {
-    display: block; 
-    float: left;
-    margin: 0; padding: 0 8px 8px 0;
-}
-.html-rtl #featured_addons ul li {
-    float: right;
-    padding: 0 0 8px 8px;
-}
-#featured_addons ul li div.addon_block 
-{
-    display: block;
-    position: relative;
-    background: #f9f9f9 url(../img/sprite.png?20090430) no-repeat scroll left -968px;
-    width: 299px;
-    height: 200px;
-    overflow: hidden;
-    border: 1px solid #ececec;
-    -moz-border-radius-topleft: 8px;
-    -moz-border-radius-topright: 8px; 
-    -moz-border-radius-bottomleft: 8px;
-    -moz-border-radius-bottomright: 8px; 
-    -webkit-border-top-left-radius: 8px; 
-    -webkit-border-top-right-radius: 8px; 
-    -webkit-border-bottom-left-radius: 8px; 
-    -webkit-border-bottom-right-radius: 8px; 
-    border-top-right-radius: 8px; 
-    border-top-left-radius: 8px;
-    border-bottom-right-radius: 8px; 
-    border-bottom-left-radius: 8px;
-    padding: 0 0 0 9px;
-}
-.html-rtl #featured_addons ul li div.addon_block  {
-    padding: 0 9px 0 0;
-}
-#featured_addons ul li div.addon_block .name {
-    font-size: 138%;
-    margin: 8px 155px 0px 0;
-    line-height: 1.25em;
-}
-.html-rtl #featured_addons ul li div.addon_block .name {
-    margin: 8px 0 0 155px;
-}
-#featured_addons ul li div.addon_block .name a {
-    color: black;
-    text-decoration: none;
-}
-
-#featured_addons ul li div.addon_block .preview {
-    position: absolute;
-    top: 8px; right: 9px;
-}
-.html-rtl #featured_addons ul li div.addon_block .preview {
-    right: auto;
-    left: 9px;
-}
-#featured_addons ul li div.addon_block .preview img {
-    width: 138px;
-}
-
-#featured_addons ul li div.addon_block .summary {
-    font-size: 93%;
-    line-height: 1.5em;
-    margin: 0px 149px 0px 0px;
-    max-height: 4.5em;
-    overflow: hidden;
-}
-.html-rtl #featured_addons ul li div.addon_block .summary {
-    margin: 0 0 0 149px;
-}
-
-#featured_addons ul li div.addon_block .authors {
-    font-size: 100%;
-    line-height: 1.5em;
-    margin: 0 145px 0 0;
-    color: #2363a5;
-}
-.html-rtl #featured_addons ul li div.addon_block .authors {
-    margin: 0 0 0 145px;
-}
-#featured_addons ul li div.addon_block .authors a {
-    text-decoration: none;
-    /*
-    white-space: nowrap;
-    */
-}
-#featured_addons ul li div.addon_block .rating {
-    font-size: 10px;
-    overflow: hidden;
-    margin: 2px 0 0 0;
-}
-.rating span {
-    display: block;
-    background: transparent url(../img/ratings/5stars.png) no-repeat scroll top left;
-    width: 68px; height: 12px;
-    text-indent: -1000em;
-}
-span.rating-1 {
-    background-image: url(../img/ratings/1stars.png)
-}
-span.rating-2 {
-    background-image: url(../img/ratings/2stars.png)
-}
-span.rating-3 {
-    background-image: url(../img/ratings/3stars.png)
-}
-span.rating-4 {
-    background-image: url(../img/ratings/4stars.png)
-}
-span.rating-5 {
-    background-image: url(../img/ratings/5stars.png)
-}
-
-#featured_addons div.addon_block .install-container {
-    position: absolute;
-    left: 7px;
-    bottom: 7px;
-}
-.html-rtl #featured_addons div.addon_block .install-container {
-    left: auto;
-    right: 7px;
-}
-
-#featured_addons div.addon_block .install-container .install-button a {
-    background-position: 100% -736px;
-}
-
-#featured_addons div.addon_block .install-container .exp-loggedout .install-button a {
-    background-position:100% -1002px;
-}
-
-#featured_addons div.addon_block .install-container .install-button a span span {
-    padding:0 0 8px;
-}
-
-#featured_addons div.addon_block .install-container .install-button a span span span strong {
-    padding:3px 45px 0 6px;
-}
-
-#featured_addons div.addon_block .install-container .install-button a span span span {
-    padding: 0;
-}
-
-#featured_addons div.addon_block .install-container .install-button a:hover, .install-button a:focus, 
-#featured_addons div.addon_block .install-container .install-button a:active { 
-    color: #0a3b73; background-color: #9dd34c; background-position: 100% -866px; 
-}
-
-#featured_addons div.addon_block .install-container .exp-loggedout .install-button a:hover, 
-#featured_addons div.addon_block .install-container .exp-loggedout .install-button a:hover { 
-    background-color: #f3f3f3; background-position: 100% -1132px; 
-    color: #aaa;
-}
-
-#content.landing div.addons_column {
-    float: left;
-    padding: 0 9px 8px 0;
-}
-.html-rtl #content.landing div.addons_column {
-    float: right;
-    padding: 0 0 8px 9px;
-}
-
-#content.landing div.addons_column.last {
-    float: left;
-    padding: 0 0 8px 0;
-}
-#content.landing div.addons_column.last {
-    float: right;
-}
-
-#content.landing div.addons_column h3 {
-    background: #acacac;
-    width: 309px;
-    -moz-border-radius-topleft: 8px;
-    -moz-border-radius-topright: 8px; 
-    -webkit-border-top-left-radius: 8px; 
-    -webkit-border-top-right-radius: 8px; 
-    border-top-right-radius: 8px; 
-    border-top-left-radius: 8px;
-}
-#content.landing div.addons_column h3 span {
-    padding: 0 8px 0 8px;
-    text-transform: uppercase;
-    font-size: 14px;
-    color: #fff;
-    font-weight: bold;
-}
-#content.landing div.addons_column ul {
-    width: 309px;
-    list-style: none;
-    margin: 0; 
-    padding: 0;
-}
-#content.landing div.addons_column ul li {
-    position: relative;
-    border-left: 1px solid #c9c8c9;
-    border-right: 1px solid #c9c8c9;
-    margin: 0;
-    
-}
-#content.landing div.addons_column ul li.odd {
-}
-#content.landing div.addons_column ul li.even {
-    background: #f0efef;
-}
-#content.landing div.addons_column ul li a {
-    height: 44px;
-    display: block;
-    text-decoration: none;
-    border: 1px solid transparent;
-    background: transparent url(../img/sprite.png?20090430) no-repeat scroll 287px -558px;
-}
-.html-rtl #content.landing div.addons_column ul li a {
-    background-position: -363px -558px;
-}
-#content.landing div.addons_column ul li a:hover {
-    border-top: 1px solid #000;
-    border-left: 1px solid #000;
-    border-bottom: 1px solid #000;
-    background: transparent url(../img/sprite.png?20090430) no-repeat scroll 287px -670px;
-}
-.html-rtl #content.landing div.addons_column ul li a:hover {
-    border-left: 1px solid transparent;
-    border-right: 1px solid #000;
-    background-position: -363px -670px;
-}
-#content.landing div.addons_column ul li a img.icon {
-    position: absolute;
-    top: 6px; left: 6px;
-}
-.html-rtl #content.landing div.addons_column ul li a img.icon {
-    left: auto;
-    right: 6px;
-}
-#content.landing div.addons_column ul li a .name {
-    display: block;
-    padding: 4px 15px 0 0;
-    margin-left: 46px;
-    color: #000;
-    font-size: 116%;
-    line-height: 1.25em;
-    height: 1.25em;
-    overflow: hidden;
-}
-.html-rtl #content.landing div.addons_column ul li a .name {
-    padding: 4px 0 0 15px;
-    margin-left: 0;
-    margin-right: 46px;
-}
-
-#content.landing div.addons_column ul li a .rating {
-   margin-left: 46px;
-   display: block;
-}
-.html-rtl #content.landing div.addons_column ul li a .rating {
-    margin-left: 0;
-    margin-right: 46px;
-}
-
-#content.landing div.addons_column ul li a .meta {
-    display: block;
-    margin-left: 46px;
-    font-size: 93%;
-    color: #777;
-    position: absolute;
-    bottom: 6px;
-}
-.html-rtl #content.landing div.addons_column ul li a .meta {
-    margin-left: 0;
-    margin-right: 46px;
-}
-
-#content.landing div.addons_column .view-all {
-    color: #fff;
-    font-weight: bold;
-    background: #acacac;
-    -moz-border-radius-bottomleft: 8px;
-    -moz-border-radius-bottomright: 8px; 
-    -webkit-border-bottom-left-radius: 8px; 
-    -webkit-border-bottom-right-radius: 8px; 
-    border-bottom-right-radius: 8px; 
-    border-bottom-left-radius: 8px;
-    padding: 2px 0 2px 9px;
-    
-}
-.html-rtl #content.landing div.addons_column .view-all {
-    padding: 2px 9px 2px 0;
-}
-
-#content.landing div.addons_column .view-all a:link,
-#content.landing div.addons_column .view-all a:visited,
-#content.landing div.addons_column .view-all a:hover,
-#content.landing div.addons_column .view-all a:active {
-    color: #fff;
-    text-decoration: none;
-    font-size: 93%;
-}
-
-#content.landing div.addons_column .view-all a:hover {
-    text-decoration: underline;
-}
-
-.clearfix:after {
-    content: ".";
-    display: block;
-    clear: both;
-    visibility: hidden;
-    line-height: 0;
-    height: 0;
-}
- 
-.clearfix {
-    display: inline-block;
-}
- 
-html[xmlns] .clearfix {
-    display: block;
-}
- 
-* html .clearfix {
-    height: 1%;
-}
-
-/* notification box element */
-.notification-box {
-    border: 1px solid;
-    display: block;
-    padding: 10px;
-}
-.notification-box.warning {
-    border-color: red;
-    background-color: #FFA5A5;
-}
-
-/* Bandwagon: "add" page */
-.collections #addonname {
-    width: 200px;
-}
-.collections #selectedaddons {
-    width: 80%;
-    overflow: auto;
-    max-height: 300px;
-}
-.collections #selectedaddons > ul {
-    -moz-column-count: 2;
-}
-.collections #firstaddons {
-    display: none; /* shown with JS */
-}
-
-/* Bandwagon: add-on autocomplete */
-.ac_input {
-    width: 400px;
-}
-.ac_results {
-    padding: 0px;
-    border: 1px solid WindowFrame;
-    background-color: Window;
-    overflow-x: hidden;
-    overflow-y: auto;
-    max-height: 400px;
-}
-
-.ac_results ul {
-    width: 100%;
-    list-style-position: outside;
-    list-style: none;
-    padding: 0;
-    margin: 0;
-}
-
-.ac_results iframe {
-    display:none;/*sorry for IE5*/
-    display/**/:block;/*sorry for IE5*/
-    position:absolute;
-    top:0;
-    left:0;
-    z-index:-1;
-    filter:mask();
-    width:3000px;
-    height:3000px;
-}
-
-.ac_results li {
-    margin: 0px;
-    padding: 2px 5px;
-    cursor: pointer;
-    display: block;
-    width: 100%;
-    font: menu;
-    font-size: 12px;
-    overflow: hidden;
-}
-.ac_loading {
-    background : url('../img/ajax_loading.gif') right center no-repeat;
-}
-.ac_over {
-    background-color: Highlight;
-    color: HighlightText;
-}
-/** collections edit page */
-#coll-edit .jsonly {
-    display: none;
-}
-#coll-edit .error, #coll-edit .error_message {
-    color: #f00;
-}
-#coll-edit .coll-addon {
-    padding-bottom: 10px;
-    margin-bottom: 10px;
-    border-bottom: solid 1px #ddd;
-}
-#coll-edit .coll-addon .name {
-    font-weight: bold;
-}
-#coll-edit .coll-addon .added {
-    float: right;
-    font-style: italic;
-}
-#coll-edit .coll-addon a.removeaddon {
-    float: right;
-}
-#collections input#submitbutton {
-    margin: 10px;
-}
diff --git a/site/app/webroot/css/stats/dropdowns.css b/site/app/webroot/css/stats/dropdowns.css
index a9ddc2c..336ad95 100755
--- a/site/app/webroot/css/stats/dropdowns.css
+++ b/site/app/webroot/css/stats/dropdowns.css
@@ -9,9 +9,6 @@
     z-index: 12;
     margin: 2px 5px;
 }
-.html-rtl .plot-dropdown {
-    float: right;
-}
 .plot-dropdown.menu-open {
     -moz-border-radius-bottomright: 0px;
     -webkit-border-bottom-right-radius: 0px;
@@ -29,10 +26,6 @@
     border: 1px solid gray;
     float: left;
 }
-.html-rtl .plot-dropdown .colorbox,
-.html-rtl .plot-legend .colorbox {
-    float: right;
-}
 .plot-dropdown .colorbox.removable:hover {
     background: gray url('../../img/stats/x.png') no-repeat top left !important;
 }
@@ -47,10 +40,6 @@
     margin-top: -3px;
     height: 18px;
 }
-.html-rtl .plot-dropdown .selected {
-    float: right;
-    background-position: 2% 50%;
-}
 .plot-dropdown .selected .selected-text {
     float: left;
     padding-left: 5px;
@@ -58,11 +47,6 @@
     overflow: hidden;
     height: 17px;
 }
-.html-rtl .plot-dropdown .selected .selected-text {
-    float: right;
-    padding-left: auto;
-    padding-right: 5px;
-}
 .plot-dropdown .selected .selected-prefix {
     font-size: 10px;
     color: #006600;
@@ -70,10 +54,6 @@
 .plot-dropdown .selected .selected-name {
     padding-left: 2px;
 }
-.html-rtl .plot-dropdown .selected .selected-name {
-    padding-left: 0;
-    padding-right: 2px;
-}
 .plot-dropdown ul {
     display: none;
     position: absolute;
@@ -228,24 +208,12 @@
     width: 169px;
     margin: 22px 0 0 -4px;
 }
-.html-rtl .plot-dropdown.big-menu ul {
-    margin-left: 0;
-    margin-right: -4px;
-}
 .plot-dropdown.big-menu ul li a {
     padding-left: 8px;
 }
-.html-rtl .plot-dropdown.big-menu ul li a {
-    padding-left: 0;
-    padding-right: 8px;
-}
 .plot-dropdown.big-menu ul li.indented a {
     padding-left: 23px;
 }
-.html-rtl .plot-dropdown.big-menu ul li.indented a {
-    padding-left: 0;
-    padding-right: 23px;
-}
 
 #options.plot-dropdown {
     width: 35px;
@@ -278,23 +246,14 @@
     width: 180px;
     float: left;
 }
-.html-rtl #plot-options #plot-selector-area {
-    float: right;
-}
 #plot-options #options-area {
     width: 100px;
     float: right;
 }
-.html-rtl #plot-options #options-area {
-    float: left;
-}
 #plot-options #plot-selection {
     width: 620px;
     float: left;
 }
-.html-rtl #plot-options #plot-selection {
-    float: right;
-}
 
 #plot-options .options {
     float: right;
@@ -316,11 +275,6 @@
     float: left;
     margin-left: 120px;
 }
-.html-rtl #summary-legend {
-    float: right;
-    margin-left: auto;
-    margin-right: 120px;
-}
 .plot-legend .colorbox {
     margin: 2px;
 }
@@ -328,18 +282,10 @@
     float: left;
     padding: 2px;
 }
-.html-rtl .plot-legend {
-    float: right;
-}
 .plot-legend .plot-name {
     float: left;
     margin: -2px 10px 0 2px;
 }
-.html-rtl .plot-legend .plot-name {
-    float: right;
-    margin-left: 10px;
-    margin-right: 2px;
-}
 
 #summary-options {
     border: 2px solid #D8DCDF;
@@ -347,9 +293,6 @@
     -webkit-border-radius: 6px;
     float: right;
 }
-.html-rtl #summary-options {
-    float: left;
-}
 .zoom-button {
     float: left;
     width: 16px;
diff --git a/site/app/webroot/css/stats/stats.css b/site/app/webroot/css/stats/stats.css
index 16f2097..7da787f 100755
--- a/site/app/webroot/css/stats/stats.css
+++ b/site/app/webroot/css/stats/stats.css
@@ -1,14 +1,5 @@
 .template { display: none; }
 
-#content {
-    width: 948px;
-    margin-left:auto;
-    margin-right:auto;
-}
-.section {
-    width: 950px;
-}
-
 #stats-table {
     display: none;
     width: 948px;
@@ -109,11 +100,6 @@ td, th {
     margin: 0 20px 10px 20px;
     padding: 5px 20px 5px 100px;
 }
-.html-rtl .warning {
-    background-position: 810px 50%;
-    padding-left: 20px;
-    padding-right: 80px;
-}
 .warning div {
     display: table-cell;
     height: 48px;
@@ -185,9 +171,6 @@ td, th {
     text-align: right;
     border-bottom: 1px dashed gray;
 }
-.html-rtl #stats_overview .value {
-    text-align: left;
-}
 #stats_overview .biglabel {
     font-weight: bold;
     font-size: 120%;
@@ -201,9 +184,6 @@ td, th {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
 }
-.html-rtl #stats_overview .bigvalue {
-    text-align: left;
-}
 #stats_overview .date {
     text-indent: 2em;
     color: gray;
@@ -229,9 +209,6 @@ td, th {
     text-align: right;
     padding-top: 10px;
 }
-.html-rtl #settings {
-    text-align: left;
-}
 #settings .confidential {
     color: red;
     font-weight: bold;
@@ -249,31 +226,3 @@ td, th {
     margin-bottom: 5px;
     padding: 5px 5px 5px 30px;
 }
-
-#statistics-header {
-    min-height: 32px;
-    padding: 10px;
-}
-#statistics-controls {
-    text-align: right;
-    float: right;
-}
-.html-rtl #statistics-controls {
-    text-align: left;
-    float: left;
-}
-#statistics-links {
-    font-size: 10px;
-}
-#statistics-header #addon-icon {
-    padding-right: 5px;
-    float: left;
-}
-.html-rtl #statistics-header #addon-icon {
-    padding-right: auto;
-    padding-left: 5px;
-    float: right;
-}
-#statistics-header #addon-title {
-    line-height: 2;
-}
diff --git a/site/app/webroot/css/style.min.css b/site/app/webroot/css/style.min.css
index f931e3c..81edbc0 100644
--- a/site/app/webroot/css/style.min.css
+++ b/site/app/webroot/css/style.min.css
@@ -1 +1 @@
-html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}caption,th,td{text-align:left;font-weight:400;}blockquote:before,blockquote:after,q:before,q:after{content:"";}blockquote,q{quotes:"" "";}form ol,form ul{list-style:none;}input,button,select,textarea{font-family:inherit;font-size:inherit;color:inherit;}body{font:62.5%/1.6 Verdana,"Trebuchet MS",sans-serif;}a:link{text-decoration:underline;}h1,h2,h3,h4,h5,h6,caption,#rate-it legend{font-family:"Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}h2{font-weight:bold;font-size:140%;}h3,caption{font-size:140%;}h4,#rate-it legend{font-size:125%;}dt{font-weight:bold;}thead th{font-size:95%;}#site-notice{font-size:110%;}#nav-access{list-style:none;font-size:115%;}#nav-access a:active,#nav-access a:focus{text-align:center;}h4#moz{font-weight:bold;font-size:130%;}#page-title h1{font-weight:bold;font-size:300%;line-height:1.2;}#page-title h1 a{text-decoration:none;}#page-title h2{font-size:220%;}#page-title p.page-intro{line-height:1.25;font-size:125%;font-weight:bold;}#nav-user{text-align:right;font-size:115%;}#nav-user a:link,#nav-user a:visited{text-decoration:none;}#nav-user a:hover,#nav-user a:active,#nav-user a:focus{text-decoration:underline;}#other-apps h3{font-size:100%;}#nav-apps{list-style:none;font:bold 110% "Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}#other-apps.js #nav-apps{font-size:130%;}#nav-apps a{text-decoration:none;}#search-form{font-size:100%;}#search-form #search-query label,#search-form #query,#search-form #category{font-size:140%;}#search-form #search-category{white-space:nowrap;}#nav-legal{list-style:none;}#footer-disclaimer{text-align:center;}#content{font-size:120%;}#content-extra h3{font-size:110%;}#content-extra .nav-addon h3{font-size:130%;}#content-extra ul{font-size:98%;}#content-extra p.view-all{text-align:right;}#categories h3{font-size:120%;}#cat-list{list-style:none;}#categories a:link,#categories a:visited{text-decoration:none;}#categories p{line-height:1.4;}.addon .name{font-size:180%;line-height:1.2;font-weight:normal;}.addon .author{font-size:100%;}.addon .name a,.addon .author a{text-decoration:none;}.addon .name a:hover,.addon .author a:hover{text-decoration:underline;}.addon .rating,.addon .stats,.addon .updated{font-size:95%;}.addon .stats em{font-style:normal;}.addon .more-from{font-size:90%;}.addon .flag{font-size:100%;line-height:1;}.main .name{font-size:200%;}.sub .name{font-size:150%;}.sub .preview-img{text-align:center;}.sub .desc{font-size:98%;}#addon-listing{list-style:none;}#addon-listing .author{font-size:100%;}#addon-listing .more{list-style:none;font-size:95%;}.install-button{font:bold 120% "Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}.install-button a{text-decoration:none;}.exp-loggedout,.exp-confirmed{font-size:90%;}.exp-loggedout .install-button a,.exp-confirmed .install-button a{font-size:110%;text-align:left;}.pitch h3{font-size:100%;font-weight:bold;line-height:1.2;}.pitch h3 a{text-decoration:none;}.pitch p{font-size:95%;}#recommended .name{font-size:160%;}#content.landing #secondaries .sub .flag{font-size:95%;}#content.landing .more-addons h3{font-size:130%;}#content.landing .more-addons ul{list-style:none;}#content.browse .more-addons h3{text-align:center;}.browse-list a{text-decoration:none;font-weight:bold;}#dictionaries tbody th{font-weight:bold;}#addon-summary .name{font-size:200%;}.addon-cats{list-style:none;font-size:95%;}.addon-cats a:link,.addon-cats a:visited{text-decoration:none;}.addon-cats a:hover,.addon-cats a:active,.addon-cats a:focus{text-decoration:underline;}.addon-images,.addon-reviews{list-style:none;}.addon-images a img{vertical-align:top;}.addon-reviews .cite{font-size:95%;}#license a{font-size:70%;}.oldversion .license a{font-size:80%;}#form-review #review-submit{font-size:90%;}#recaptcha_whatsthis{font-size:90%;}.more-addons h3{line-height:1.3;}.more-addons h3 a.view{text-decoration:none;}.more-addons h4{font-size:100%;}.pages{list-style:none;text-align:left;}.pagination p.count,.pagination p.perpage{text-align:right;}#form-listcontrol{font-family:"Trebuchet MS",Helvetica,"Helvetica Neue",sans-serif;}#form-listcontrol #per-page{font-size:110%;font-weight:bold;}#order-by button{text-align:center;}#form-listcontrol #experimental label{font-size:95%;line-height:1.1;}body{background:#fff;color:#333;}a:link{color:#1d587f;}a:visited{color:#748d9e;}a:active,a:hover,a:focus{color:#000;}a.view{background:transparent url("../img/sprite.png?20090430") 100% -247px no-repeat;}.html-ltr a.view:hover{background-position:100% -301px;}.html-rtl a.view{background-position:100% -486px;}.html-rtl a.view:hover{background-position:100% -540px;}h3,h4,h5,h6{color:#2d3b58;}td,th{border-bottom:1px solid #eee;}thead th{color:#555;}input,button,select,textarea{color:inherit;}a img{border:none;}div.error-notice{background:#fffefa url("../img/warning.png") 10px 10px no-repeat;border:1px solid #eee;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#site-notice{background:#ffe;border-bottom:2px solid #ccc;}#nav-access a:active,#nav-access a:focus{color:#000;background:#fff;border:1px solid #475470;outline:0;}h4#moz a{background:transparent url("../img/sprite-alpha.png") no-repeat 0 -1px;}h4#moz a:hover,h1#moz a:active,h1#moz a:focus{background-position:0 -51px;}#page-title{background:transparent url("../img/brandbanner-bg.png") 0 40% repeat-x;}#page-title p.page-intro{color:#354a4f;}#page-title.firefox h1,#page-title.firefox h1 a{color:#bd1d01;}#page-title.thunderbird h1,#page-title.thunderbird h1 a{color:#0b4190;}#page-title.fennec h1,#page-title.fennec h1 a{color:#0b4190;}#page-title.seamonkey h1,#page-title.seamonkey h1 a{color:#3f38a3;}#page-title.sunbird h1,#page-title.sunbird h1 a{color:#337b5a;}#page-title.generic h1,#page-title.generic h1 a{color:#bd1d01;}#page-title.developers h1,#page-title.developers h1 a{color:#bd1d01;}#page-title h2{color:#2D3B58;}.html-ltr #nav-user li{border-left:1px solid #666;}.html-rtl #nav-user li{border-right:1px solid #666;}#nav-user li:first-child{border-left:0;}#nav-user li:first-child{border-right:0;}#nav-user a:link{color:#000;}#nav-user a:visited{color:#666;}#nav-user a:hover,#nav-user a:active,#nav-user a:focus{color:#000;}#other-apps{background-color:#b3deee;border:1px solid #90c8dd;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#other-apps h3{color:#4d757b;}#other-apps.js h3{border-bottom:1px solid #90c8dd;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#other-apps.js h3{background:transparent url("../img/sprite.png?20090430") 4px -262px no-repeat;}.html-rtl #other-apps.js h3{background-position:14px -262px;}#other-apps.js h3:hover{background-color:#c5e3ee;}#nav-apps a{color:#1f0084;background-repeat:no-repeat;background-position:0 50%;}#nav-apps a:hover,#nav-apps a:active,#nav-apps a:focus{color:#1d587f;}.html-ltr #other-apps.js #nav-apps #app-seamonkey a{background:url("../img/sprite-alpha.png") -465px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-seamonkey a{background:url("../img/sprite-alpha.png") -390px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-sunbird a{background:url("../img/sprite-alpha.png") -616px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-sunbird a{background:url("../img/sprite-alpha.png") -541px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-thunderbird a{background:url("../img/sprite-alpha.png") -766px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-thunderbird a{background:url("../img/sprite-alpha.png") -691px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-fennec a{background:url("../img/sprite-alpha.png") -766px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-fennec a{background:url("../img/sprite-alpha.png") -691px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-firefox a{background:url("../img/sprite-alpha.png") -321px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-firefox a{background:url("../img/sprite-alpha.png") -246px 0 no-repeat;}.html-ltr #other-apps.collapsed h3{border-bottom:0;background-position:6px -320px;}.html-rtl #other-apps.collapsed h3{border-bottom:0;background-position:16px -320px;}#search-bubble-outer{background:transparent url("../img/sprite.png?20090430") right top no-repeat;}#search-bubble-inner{background:transparent url("../img/sprite.png?20090430") left top no-repeat;}#search-form li{color:#666;}.html-ltr #search-form #query{background:#fff url("../img/sprite.png?20090430") -977px -686px no-repeat;}.html-rtl #search-form #query{background:#fff url("../img/sprite.png?20090430") 100% -686px no-repeat;}#search-form #search-category label{color:#426a13;}.html-ltr #search-form #my-submit{background:url("../img/sprite-alpha.png") -120px 0 no-repeat;}.html-ltr #search-form #my-submit:hover{background-position:-157px 0;}.html-rtl #search-form #my-submit{background:url("../img/sprite-alpha.png") -120px -40px no-repeat;}.html-rtl #search-form #my-submit:hover{background:url("../img/sprite-alpha.png") -157px -40px no-repeat;}#advanced-search{background-color:#e6e6e6;border:1px solid #68B41C;}#advanced-search-toggle{background:url("../img/sprite.png?20090430") right -68px no-repeat;}#advanced-search-toggle div{background:transparent url("../img/sprite.png?20090430") left -68px no-repeat;}#advanced-search-toggle a{color:black;text-decoration:none;padding:1px 3px 1px 3px;}.html-ltr #advanced-search-toggle a.asclosed{background:url("../img/sprite.png?20090430") right -354px no-repeat;}.html-ltr #advanced-search-toggle a.asopen{background:url("../img/sprite.png?20090430") right -369px no-repeat;}.html-rtl #advanced-search-toggle a.asclosed{background:url("../img/sprite.png?20090430") -989px -354px no-repeat;}.html-rtl #advanced-search-toggle a.asopen{background:url("../img/sprite.png?20090430") -989px -369px no-repeat;}#advanced-search-toggle #toggle-outer{background:url("../img/sprite.png?20090430") right -87px no-repeat;}#advanced-search-toggle #toggle-inner{background:url("../img/sprite.png?20090430") -861px -87px no-repeat;}#footer{color:#888;padding:1em 0;background:transparent url("../img/foot-bg.png") repeat-x;}#footer a:link,#footer a:visited{color:#777;}#footer a:hover,#footer a:active,#footer a:focus{color:#000;}#content-extra .extra{border:1px solid #d8dcdf;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#categories h3{background:#79be1b url("../img/sprite.png?20090430") -104px -106px no-repeat;border-bottom:1px solid #abe071;}#categories h3 span{color:#426a13;background:transparent url("../img/sprite.png?20090430") -230px -106px no-repeat;}#categories.collapsed h3{background-position:0 -106px;}#categories.collapsed h3.open{background-position:-26px -106px;}#categories,#categories.collapsed #cat-list{background-color:#f6f6f6;border:1px solid #d8dcdf;border-width:0 1px 1px;}#categories,#categories.collapsed #cat-list{-moz-border-radius-bottomright:6px;-moz-border-radius-bottomleft:6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}#cat-list{border-top:1px solid #e8e6e6;}#cat-list li{border-bottom:3px double #e8e6e6;}#cat-list a{background:#f4f2f2 url("../img/cat-link.png") repeat-x left top;}#categories a:link{color:#4e4e4e;}#categories a:visited{color:#777;}#categories a:hover,#categories a:active,#categories a:focus{color:#1d587f;background:#f1f0f0 url("../img/cat-link.png") repeat-x left -100px;}#categories.collapsed h3 span{background-position:-242px -106px;}#categories.collapsed h3:hover{color:#4f7f17;background-position:-52px -106px;}#categories.collapsed h3.open:hover{background-position:-78px -106px;}#categories.collapsed h3:hover span{background-position:-533px -106px;}#categories p{border-top:1px solid #e8e6e6;}.addon{border-left:1px solid #d8dcdf;background:transparent url("../img/sprite.png?20090430") right -1256px no-repeat;}.addon .vex{background:transparent url("../img/sprite.png?20090430") right bottom no-repeat;}.addon .vex span{background:transparent url("../img/sprite.png?20090430") left bottom no-repeat;}.addon .preview-img{background:transparent url("../img/sprite.png?20090430") left -1256px no-repeat;}.addon .stats em{color:#d54601;}.addon .flag{border:1px solid #ccc;border-width:0 1px 1px 0;}#addon-listing .addon .vex{background:transparent url("../img/sprite.png?20090430") no-repeat right bottom;}.sub .irk{background:transparent url("../img/sprite.png?20090430") left -1256px no-repeat;}.sub .preview-img{background-image:none;}.rec{background:url("../img/rec-tr.png") no-repeat right top;border-left-color:#c1e1c1;}.rec .preview-img{background:transparent url("../img/rec-tl.png") left top no-repeat;}.rec .flag{background:#f8f8f7 url("../img/rec-flag.png") no-repeat;}.rec .vex{background-image:url("../img/rec-br.png");}.rec .vex span{background-image:url("../img/rec-bl.png");}.rec .flag a{color:#360;text-decoration:none;}.exp{background:url("../img/exp-tr.png") no-repeat right top;border-left-color:#e3c1c1;}.exp .preview-img{background:transparent url("../img/exp-tl.png") left top no-repeat;}.exp .flag{background:#f8f8f7 url("../img/exp-flag.png") no-repeat;}.exp .flag a{color:#900;text-decoration:none;}.exp .vex{background-image:url("../img/exp-br.png");}.exp .vex span{background-image:url("../img/exp-bl.png");}#addon-listing .more li{border-right:1px solid #666;}#addon-listing .more li:last-child{border:0;}.install-button a{color:#062445;background:#7cc11c url("../img/sprite.png?20090430") 100% -730px no-repeat;}.install-button a span{background:transparent url("../img/installbtn-edges.png") left bottom no-repeat;}.install-button a span span{background:transparent url("../img/installbtn-edges.png") right bottom no-repeat;}.install-button a span span span{background:transparent url("../img/installbtn-edges.png") left top no-repeat;}.install-button a span span span strong{background:transparent url("../img/installbtn-edges.png") right top no-repeat;}.install-button a:hover,.install-button a:focus,.install-button a:active{color:#0a3b73;background-color:#9dd34c;background-position:100% -860px;}.install-button a span,.install-button a span span,.install-button a span span span,.install-button a span span span strong{background-image:url("../img/installbtn-edges-list.png");}.exp .install-button a span,.exp .install-button a span span,.exp .install-button a span span span,.exp .install-button a span span span strong{background-image:url("../img/installbtn-edges-exp.png");}#addon-listing .rec .install-button a span,#addon-listing .rec .install-button a span,#addon-listing .rec .install-button a span span,#addon-listing .rec .install-button a span span,#addon-listing .rec .install-button a span span span,#addon-listing .rec .install-button a span span span,#addon-listing .rec .install-button a span span span strong{background-image:url("../img/installbtn-edges-rec.png");}#content-main .exp-loggedout,#content .exp-loggedout,#content-main .exp-confirmed{border:1px solid #d8d8d8;background:#fff;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#content-main .exp-loggedout .install-button a,#content .exp-loggedout .install-button a{color:#aaa;background-color:#fff;background-position:100% -995px;}#content-main .exp-loggedout .install-button a span,#content .exp-loggedout .install-button a span,#content-main .exp-loggedout .install-button a span span,#content .exp-loggedout .install-button a span span,#content-main .exp-loggedout .install-button a span span span,#content .exp-loggedout .install-button a span span span,#content-main .exp-loggedout .install-button a span span span strong,#content .exp-loggedout .install-button a span span span strong{background-image:url("../img/installbtn-edges-dis.png");}#content-main .exp-loggedout .install-button a:hover,#content .exp-loggedout .install-button a:hover{background-color:#f3f3f3;background-position:100% -1125px;}#content-main .install-container .not-avail{padding:5px 10px;float:left;color:#666;border:1px solid #d8d8d8;background:#fff;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pitch{background-color:#f8f8f8;border:1px solid #e4f3fa;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pitch h3{color:#042253;}#recommended{background:#f2f8fd;border:1px solid #e9f1f8;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#recommended .addon{background:#fff url("../img/landrec-tr.png") no-repeat top right;}#recommended .addon .preview-img{background:url("../img/landrec-tl.png") no-repeat top left;}#recommended .addon .vex{background-image:url("../img/landrec-br.png");}#recommended .vex span{background-image:url("../img/landrec-bl.png");}#content.landing #secondaries .exp .irk{background-image:url("../img/exp-tl.png");}#content.landing #secondaries .sub .vex{background-image:url("../img/addon-br.png");}#content.landing #secondaries .exp .vex{background-image:url("../img/exp-br.png");}#content.landing #secondaries .exp .preview-img{background-image:none;}#content.landing .more-addons{border:1px solid #5d6c8c;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.browse-list a{background:#fafafa;border:1px solid #e8e6e6;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.browse-list a:hover{background-color:#f1f0f0;border-color:#e1dfdf;}#dictionaries{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#dictionaries th,#dictionaries td{border-bottom:1px solid #eee;}#dictionaries tbody tr.alt th,#dictionaries tbody tr.alt td{background-color:#fff;}.addon-cats li{border-left:1px solid #666;}.addon-cats li:first-child{border-left:0;}#addon-info,#addon-advanced{border:1px solid #d8dcdf;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.addon-images a img{border:1px solid #1d587f;}.addon-reviews li,.addon-versions li{border-top:1px solid #d8dcdf;}#addon-info .addon-reviews li{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#addon-advanced h5{border-top:1px solid #d8dcdf;}#latest-version{border:1px solid #5d6c8c;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div.oldversion{-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#form-review{background-color:#f8f8f8;border:1px solid #e4f3fa;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#recaptcha_image{border:1px solid #d8dcdf;}#rate-it legend span{color:#042758;}.more-addons h3 a.view{background:transparent url("../img/sprite.png?20090430") 100% -387px no-repeat;}.html-ltr .more-addons h3 a.view:hover{background-position:100% -437px;}.html-rtl .more-addons h3 a.view{background-position:100% -597px;}.html-rtl .more-addons h3 a.view:hover{background-position:100% -647px;}.pagination{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pages a{border:1px solid #fff;}.pages a:hover{background-color:#ccf29b;border-color:#bbde92;}.pages .selected a{background-color:#ccf29b;border:1px solid #83c53f;text-decoration:none;font-weight:bold;color:black;}.pages .prev a{background:transparent url("../img/arr-prev.png") 0 50% no-repeat;}.pages .prev a:hover{background-color:#ccf29b;}.pages .next a{background:transparent url("../img/arr-next.png") 100% 50% no-repeat;}.pages .next a:hover{background-color:#ccf29b;}#form-listcontrol{background:#f2f8fd;border:1px solid #e9eff4;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#order-by button{color:#7598b5;background-color:#fff;border:1px solid #89a8c1;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#order-by button:hover{background-color:#e9eff4;color:#496377;}#order-by button.current,#order-by button.current:hover{background-color:#89a8c1;color:#fff;}#form-listcontrol #experimental label{background:#fff;border:1px solid #933;color:#933;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#thumb-subcategories ul{-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;border-color:#D8DCDF;border-style:solid;border-width:0 1px 1px;}#thumb-subcategories ul li{border-top:1px solid #E8E6E6;}#thumb-subcategories a:link{color:#4e4e4e;}#thumb-subcategories a:visited{color:#777;}#thumb-subcategories a:hover,#thumb-subcategories a:active,#thumb-subcategories a:focus{background:#F2F8Fd;}#thumb-subcategories li.selected a:link,#thumb-subcategories li.selected a:visited{background-color:#89A8C1;color:#FFF;}#thumb-browser .thumbs li.thumb{background:transparent url(../img/sprite.png?20090430) no-repeat scroll right -1256px;}#thumb-browser .thumbs li.thumb div.wrapper{background:transparent url(../img/sprite.png?20090430) no-repeat scroll left -1256px;}#thumb-browser .thumbs li.exp{background:transparent url(../img/exp-tr.png) no-repeat scroll right top;}#thumb-browser .thumbs li.exp div.wrapper{background:transparent url(../img/exp-tl.png) no-repeat scroll left top;}#thumb-browser .thumbs li.thumb .vex{background:transparent url(../img/sprite.png?20090430) no-repeat scroll right bottom;}#thumb-browser .thumbs li.thumb .vex span{background:transparent url(../img/sprite.png?20090430) no-repeat scroll left bottom;width:10px;height:10px;float:left;}#thumb-browser .thumbs li.exp .vex{background:transparent url(../img/exp-br.png) no-repeat scroll right bottom;}#thumb-browser .thumbs li.exp .vex span{background:transparent url(../img/exp-bl.png) no-repeat scroll left bottom;}@media screen,projection{html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;}table{border-collapse:separate;border-spacing:0;}body{min-width:770px;}ol,ul{margin-left:2em;}blockquote{margin:0 3em 1em;}dd{margin-left:2em;}td,th{padding:2px 6px;}a.view{padding-right:10px;}button,input[type="submit"]{cursor:pointer;}h2{margin-bottom:.5em;}div.error-notice{margin:0;min-height:48px;margin-bottom:1.5em;padding:10px 10px 0 70px;}.with-js .hide-with-js{display:none;}.show-with-js{display:none;}.with-js .show-with-js{display:block;}#site-notice{width:80%;padding:5px 10%;}#nav-access{position:absolute;top:-10em;margin:0 auto;width:100%;}#nav-access a:active,#nav-access a:focus{position:absolute;top:11em;width:18em;z-index:2;}.html-ltr #nav-access a:active,.html-ltr #nav-access a:focus{left:50%;margin-left:-8em;}.html-rtl #nav-access a:active,.html-rtl #nav-access a:focus{right:50%;margin-right:-8em;}#branding{position:relative;}h4#moz{position:absolute;top:10px;margin:0;z-index:1;}.html-rtl h4#moz{left:0;}.html-rtl h4#moz img{position:relative;left:-10px;}h4#moz a{display:block;height:44px;width:100px;padding-left:10px;}#page-title{height:13em;}#page-title div{max-width:900px;margin:0 auto;}.html-ltr #page-title div{padding:25px 105px 0;}.html-rtl #page-title div{position:relative;left:-70px;padding:25px 0 0 0;}#page-title h1{position:relative;}.html-ltr #page-title h1{padding:10px 0 5px 125px;}.html-rtl #page-title h1{padding:10px 320px 5px 0;}#page-title h1 img{position:absolute;top:0;}.html-ltr #page-title h1 img{left:0;}.html-rtl #page-title h1 img{right:200px;}#page-title h2{position:relative;}.html-ltr #page-title h2{margin:-5px 0 5px 175px;}.html-rtl #page-title h2{margin:-5px 370px 5px 0;}#page-title p.page-intro{margin-bottom:0;width:42em;max-width:650px;}.html-ltr #page-title p.page-intro{padding-left:125px;}.html-rtl #page-title p.page-intro{padding-right:320px;}#nav-user{max-width:900px;min-width:770px;}.html-ltr #nav-user{margin:-1.75em auto 0;padding:0 50px;}.html-rtl #nav-user{margin:0 auto 0;padding:0 0 0 50px;}#nav-user li{display:inline;}.html-ltr #nav-user li{padding-left:1em;margin-right:.5em;}.html-rtl #nav-user li{padding-right:1em;margin-left:.5em;}.html-ltr #nav-user li:first-child{border-left:0;padding-left:0;}.html-rtl #nav-user li:first-child{border-right:0;padding-right:0;}#other-apps{position:absolute;top:-9.65em;z-index:5;}.html-ltr #other-apps{right:50px;padding:6px 10px 0;}.html-rtl #other-apps{right:50px;padding:6px 10px 0;}#other-apps.js{width:12em;padding-bottom:6px;}#other-apps h3{margin-right:20px;}#other-apps.js h3{float:none;cursor:pointer;}.html-ltr #other-apps.js h3{margin:-6px -10px;padding:6px 15px 6px 20px;}.html-rtl #other-apps.js h3{margin:-6px -10px;padding:6px 15px 6px 20px;}#nav-apps{margin-top:.1em;}.html-ltr #nav-apps{margin-left:0;}.html-rtl #nav-apps{margin-right:0;}.html-ltr #nav-apps li{margin-right:10px;}.html-rtl #nav-apps li{margin-left:10px;}#other-apps.js #nav-apps{margin-top:1em;}#other-apps.js #nav-apps li{display:block;margin-right:0;}.html-ltr #other-apps.js #nav-apps li{margin-right:0;}.html-rtl #other-apps.js #nav-apps li{margin-left:0;}#other-apps.js #nav-apps a{display:block;line-height:35px;}.html-ltr #other-apps.js #nav-apps a{padding-left:40px;}.html-rtl #other-apps.js #nav-apps a{padding-right:40px;}#other-apps.collapsed #nav-apps{position:absolute;}.html-ltr #other-apps.collapsed #nav-apps{left:-999em;}.html-rtl #other-apps.collapsed #nav-apps{right:-999em;}#other-apps.collapsed #nav-apps a:active,#other-apps.collapsed #nav-apps a:focus{position:absolute;top:0;}.html-ltr #other-apps.collapsed #nav-apps a:active,.html-ltr #other-apps.collapsed #nav-apps a:focus{left:-999em;}.html-rtl #other-apps.collapsed #nav-apps a:active,.html-rtl #other-apps.collapsed #nav-apps a:focus{right:-999em;}#search-element{position:relative;width:80%;}.html-ltr #search-element{left:190px;}.html-rtl #search-element{left:0;}#search-bubble-inner{height:71px;margin:0;padding:0;width:6px;float:left;}.html-ltr #standard-search{padding:20px 4px 15px 14px;}.html-rtl #standard-search{padding:20px 20px 15px 4px;}#search-bubble-outer legend{display:none;}#search-form ol{margin:0;padding:0;}#search-form #search-query{width:55%;}#search-form #search-query label,#search-mini #search-query label{display:none;}#search-mini #search-query label{font-style:italic;color:#46651f;}#search-form #search-query label,#search-mini #search-query label{position:absolute;top:20px;}#search-mini #search-query label{top:2px;}.html-ltr #search-form #search-query label{left:17px;padding:.2em 5px .2em 30px;}.html-rtl #search-form #search-query label{right:17px;padding:.2em 30px .2em 5px;}#search-form #query{width:42%;}.html-ltr #search-form #query{padding:.2em 5px .2em 24px;}.html-rtl #search-form #query{padding:.2em 24px .2em 5px;}#search-form #category{width:36%;padding:.2em 0;}#search-form #category option{min-width:14em;}#search-form #search-query input,#search-form #category option{height:21px;-ms-box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}#search-form #my-submit{width:37px;height:38px;border:0;margin-left:9px;}#advanced-search{margin:-2px 0 0 0;padding:.1in .25in 0 .25in;}form.asclosed{display:none;}#search-application{padding-bottom:.1in;}#advanced-search-toggle{position:relative;top:-2px;}.html-ltr #advanced-search-toggle{text-align:right;}.html-rtl #advanced-search-toggle{text-align:left;direction:ltr;}#advanced-search-toggle div{width:6px;height:6px;float:left;}#advanced-search-toggle #toggle-inner{padding-left:3px;}.html-ltr #advanced-search-toggle #toggle-outer{margin:0 .25in .1in 0;padding-right:4px;}.html-ltr #advanced-search-toggle a{padding-right:.15in;}.html-rtl #advanced-search-toggle #toggle-outer{margin:0 0 .1in .25in;padding-right:4px;}.html-rtl #advanced-search-toggle a{padding-left:.15in;}.html-ltr #search-application td{padding-right:.2in;}.html-rtl #search-application td{padding-left:.2in;}.html-rtl #advanced-search td{text-align:right;}.html-ltr #search-platform{float:left;margin-bottom:1.5em;margin-right:1in;}.html-rtl #search-platform{float:right;margin-bottom:1.5em;margin-left:1in;}#search-mini{display:inline;float:right;border:1px solid #8cb956;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;background:#91ce43 url('../img/sprite.png?20090430') no-repeat right -23px;padding:5px;position:relative;-moz-box-shadow:2px 2px 3px -1px #888;-webkit-box-shadow:2px 2px 3px -1px #888;box-shadow:2px 2px 3px -1px #888;}.html-rtl #search-mini{float:left;-moz-box-shadow:-2px 2px 3px -1px #888;-webkit-box-shadow:-2px 2px 3px -1px #888;box-shadow:-2px 2px 3px -1px #888;}#search-mini #category{font-size:113%;max-width:250px;}.html-ltr #search-mini #search-query label{left:9px;padding:.39em 15px .2em 5px;}.html-rtl #search-mini #search-query label{right:9px;padding:.39em 5px .2em 15px;}#search-mini-submit{border:1px solid #6d9041;background:url('../img/sprite.png?20090430') no-repeat right -23px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:2px 9px;vertical-align:top;margin:0 0 0 3px;-moz-box-shadow:2px 2px 3px -1px #888;-webkit-box-shadow:2px 2px 3px -1px #888;box-shadow:2px 2px 3px -1px #888;}#footer{position:relative;width:100%;clear:both;padding:1em 0;min-width:770px;}#footer-lang-form{position:relative;max-width:900px;min-width:770px;}.html-ltr #footer-lang-form{padding:0 50px;margin:0 auto;}.html-rtl #footer-lang-form{padding:0 0 0 50px;margin:0;}.html-ltr #footer-lang-form p{position:absolute;right:50px;}.html-rtl #footer-lang-form p{position:absolute;left:50px;}#footer-legal{max-width:900px;margin:0 auto;padding:0 50px;min-width:770px;}#copyright{margin-bottom:0;}#nav-legal li{display:inline;margin-right:.5em;}#footer-disclaimer{margin-top:1em;}#content{clear:both;position:relative;padding:1em 50px;max-width:950px;margin:0 auto 1em;min-width:770px;min-height:1000px;}#content-main{position:relative;margin-left:190px;min-height:50em;}#content.main-page #content-main,#content.detail-page #content-main,#content.reviews-page #content-main,#content.versions-page #content-main{width:60%;padding-right:20%;}#content-main.full{margin-left:0;}#content.detail-page #content-main.full,#content.reviews-page #content-main.full,#content.versions-page #content-main.full{width:75%;padding-right:25%;}#secondaries .sub{width:48%;}#secondaries #feature3{float:right;}#secondaries #feature2{float:left;}#content #sidebar{position:absolute;left:50px;top:1em;width:170px;}#content-extra{position:absolute;right:0;top:0;width:23%;}#content-extra .extra{margin-bottom:.1em;padding:5px 12px;}#content-extra h3{margin-bottom:.1em;}.html-ltr #content-extra ul{margin:0 0 0 10px;}.html-rtl #content-extra ul{margin:0 10px 0 0;}#content-extra ul li{margin:0;padding:0;}#content-extra ul li span{font-size:8pt;}#content-extra p.view-all{margin-bottom:.5em;}.html-rtl #content-extra p.view-all{margin-right:4px;}#categories{margin-bottom:1em;position:relative;z-index:5;}#categories h3{margin:0 -1px;padding-left:6px;}#categories.collapsed h3{padding-left:18px;}#categories h3 span{display:block;padding:8px 4px;}#categories,#categories.collapsed #cat-list{padding-bottom:6px;}#categories.collapsed h3 span{text-indent:4px;padding-left:0;}#cat-list{margin-left:0;}#cat-list li{padding-right:1px;}#cat-list a,#cat-list span{display:block;padding:.5em 10px;}#categories.collapsed h3{cursor:pointer;}#categories p{margin:0 -1px -6px;padding:.6em 10px;}#categories.collapsed #cat-list{position:absolute;left:-999em;top:-999em;}.html-rtl #categories.collapsed #cat-list{position:absolute;left:999em;top:-999em;}#categories.collapsed #cat-list.visible{margin:0 -1px;width:100%;left:0;top:3.35em;height:auto;overflow:visible;z-index:99;}#categories.collapsed #cat-list a:active,#categories.collapsed #cat-list a:focus{position:absolute;left:999em;top:1002.4em;width:85%;}#categories.collapsed #cat-list.visible a:active,#categories.collapsed #cat-list.visible a:focus{position:static;width:auto;}#content-main p,#content-main ul,#content-main ol{margin-bottom:1.25em;}#content-main li{margin-bottom:.5em;}#content-main li ul,#content-main li ol{margin-left:15px;}.addon{position:relative;min-height:160px;padding:18px 20px 10px;margin-bottom:1.6em;}.addon .vex{height:10px;width:100%;position:absolute;left:0;bottom:0;}.addon .vex span{display:block;height:10px;margin-left:-1px;width:10px;float:left;}.addon .name{padding-left:44px;position:relative;}.addon .name img{position:absolute;left:0;}.addon .author{margin:0 0 1.25em 44px;}.addon .preview-img{position:absolute;left:-1px;top:0;padding:18px 0 0 20px;width:200px;height:150px;overflow:hidden;}.addon .flag{position:absolute;left:-1px;top:0;padding:5px 10px 3px 10px;z-index:5;}.addon .baseline img.faq{margin:0 5px 0 0;float:left;}.rec,.exp{min-height:170px;}.rec .preview-img,.exp .preview-img{padding:2.5em 0 0 20px;}.updated{font-size:75%;color:#666;}.main{padding-left:240px;min-height:220px;}.main .rating{position:absolute;left:20px;top:180px;width:200px;}.main .stats{position:absolute;left:20px;top:180px;width:200px;margin-top:2em;}.sub{position:relative;padding:0;}.sub .irk{margin-left:-1px;padding:14px 20px 8px;margin-right:4px;}.sub .vex{padding:0;left:0;}.sub .name{margin-bottom:0;}.sub .preview-img{position:static;padding:0;}.sub .rating{position:static;width:40%;padding-right:10%;float:left;}.sub .rating img{display:block;}.sub .more-from{clear:both;}#content-main #addon-listing{margin-left:0;}#addon-listing .addon{padding:18px 240px 10px;margin-bottom:1em;}#addon-listing .preview-img{position:absolute;left:-1px;top:0;}#addon-listing .rating{display:inline;margin-right:2em;}#addon-listing .stats{display:inline;margin-right:2em;}#addon-listing .more{display:inline;margin:0;padding:0;}#addon-listing .more li{display:inline;margin:0 10px 0 0;padding:0 15px 0 0;}#addon-listing .desc{margin-top:.5em;}.install-button:after,.install-container:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}.install-button a{float:left;cursor:pointer;max-width:290px;}.html-rtl .install-button a{float:right;}.install-button a *{display:block;float:left;position:relative;}.html-rtl .install-button a *{float:right;}.install-button a span{padding:0 0 0 6px;}.install-button a span span{padding:0 0 8px 0;}.install-button a span span span{left:-6px;padding:0 0 6px 0;}.install-button a span span span strong{right:-6px;padding:10px 45px 0 6px;}.install-button a span span span strong img{padding:0 6px 0 0;}#addon-listing .install-container{position:absolute;right:0;top:20px;max-width:180px;padding:0 15px;}#addon-listing .install-container .install-button{margin-bottom:.5em;float:right;}#addon-listing .addon p.updated{position:absolute;right:0;bottom:5px;max-width:180px;padding:0 15px;}#addon-listing .exp .exp-loggedout,#addon-listing .exp .exp-confirmed{float:right;}#addon-listing .exp .exp-loggedout .install-button,#addon-listing .exp .exp-confirmed .install-button{float:none;}.exp-loggedout,.exp-confirmed{float:left;padding:5px 5px 3px 8px;}.html-rtl .exp-loggedout,.html-rtl .exp-confirmed{float:right;padding:5px 8px 3px 5px;}.exp-loggedout .install-button,.exp-confirmed .install-button{margin-top:3px;margin-right:-3px;}.html-rtl .exp-loggedout .install-button,.html-rtl .exp-confirmed .install-button{margin-right:0;margin-left:-3px;}.exp-loggedout .install-button a{cursor:default;}#content-main .exp-loggedout p.install-button,#content-main .exp-confirmed p.install-button{margin-bottom:0;}.exp-confirm-install input{float:left;}.html-rtl .exp-confirm-install input{float:right;}.exp-confirm-install .exp-desc{float:right;width:85%;padding:0 0 5px 0;}.html-rtl .exp-confirm-install .exp-desc{float:left;}.pitch{margin-bottom:1em;padding:10px;}.pitch h3,.pitch p{margin-bottom:1em;}.html-rtl .pitch ul{padding-right:15px;}.pitch h3 img{float:left;margin:-4px 10px 0 0;}#recommended{padding:0 1% 10px;width:98%;float:left;margin-bottom:1em;}#recommended .addon{float:none;}#content.wide #recommended .addon{width:20%;padding-left:26.5%;min-width:100px;margin-bottom:0;}#content.wide #recommended .addon .preview-img{width:45%;}#content.wide #recommended #feature1{float:left;}#content.wide #recommended #feature2{float:right;}#content.landing #secondaries{float:left;}#content.landing #secondaries .sub{float:left;width:30.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries .sub{float:left;width:31.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries #feature8{margin-right:0;}#content.landing #secondaries .sub .irk{padding-top:2.2em;}#content.landing #secondaries .sub .vex{padding-top:0;}#content.landing #secondaries .exp .preview-img{padding:0;}#content.landing #secondaries .addon .preview-img{padding:0;width:180px;}#content.landing-with-slider #secondaries .sub{float:left;width:31.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries #feature8{margin-right:0;}#content.landing #secondaries{width:77%;}#content.landing #content-extra{width:23%;}#content.landing-with-slider #secondaries{width:100%;}#content.landing-with-slider #content-extra{width:25%;position:absolute;top:0;right:0;}#content.landing-with-slider #content-main{position:relative;}#content.landing-with-slider #recommended{float:none;position:relative;left:0;width:71%;}.html-rtl #content.landing-with-slider #recommended{float:left;}#content.landing-with-slider #recommended #slider .item_set .addon{float:left;width:308px;padding-left:240px;}#content.landing-with-slider #recommended #slider{background-color:#fff;margin-bottom:0;}#content.landing #content-extra{position:static;float:right;}#content.landing-with-slider #content-extra{position:absolute;float:none;}#content.landing.languages #content-extra{margin-right:0;}#content.landing .more-addons{margin:0 0 1em;padding:6px 10px 0;}#content.landing.browse #secondaries{width:50%;}#content.landing.browse #secondaries .sub{width:47%;}#content.landing.browse #secondaries #feature4{margin-right:0;}#content.landing.browse #content-extra{width:47%;}#content.browse .more-addons h3 a.view{display:inline;}.browse-list{list-style:none;margin:0;width:100%;overflow:auto;}.browse-list li{width:48%;margin:0 0 3px 1%;float:left;}.browse-list a{display:block;padding:3px 5px;}#content.landing.languages .sub{width:23.75%;margin-right:2%;float:left;}#content.landing.languages #feature3{margin-right:0;}#dictionaries{margin-top:1.5em;clear:both;padding:10px 15px;}#dictionaries table{width:100%;}#dictionaries th,#dictionaries td{padding:6px 12px;}#addon-summary{padding-left:240px;min-height:270px;}#addon-summary .name{margin-bottom:0;}#addon-summary .preview-img{position:absolute;left:-1px;top:0;padding:18px 0 0 20px;}#addon-summary.exp .preview-img,#addon-summary.rec .preview-img{padding-top:2.5em;}#addon-summary .rating{position:absolute;left:20px;top:180px;width:200px;text-align:center;line-height:14px;}#content-main #addon-summary .stats{position:absolute;text-align:center;left:20px;top:202px;width:200px;margin-top:3.5em;}#addon-summary .link-sharing{position:absolute;left:60px;top:218px;font-size:.75em;}#addon-summary .link-sharing .badge .button{display:block;color:#062445;background:#7cc11c url("../img/sprite.png?20090430") -800px -730px no-repeat;}#addon-summary .link-sharing .badge .button a{display:block;padding:0 8px 8px 0;background:transparent url(../img/installbtn-edges.png) no-repeat scroll right bottom;}#addon-summary .link-sharing .badge .button a span{display:block;text-align:center;font-weight:bold;padding:2px 0 0 2px;background:transparent url(../img/installbtn-edges-list.png) no-repeat scroll left top;}#addon-summary .link-sharing .share-button{padding:0;margin:0;width:100px;}#addon-summary .link-sharing .share-button:after,.install-container:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}#addon-summary .link-sharing .share-button a{float:left;cursor:pointer;max-width:290px;text-decoration:none;}#addon-summary .link-sharing .share-button a *{display:block;float:left;position:relative;}#addon-summary .link-sharing .share-button a span{padding:0 0 0 6px;}#addon-summary .link-sharing .share-button a span span{padding:0 0 8px 0;}#addon-summary .link-sharing .share-button a span span span{left:-6px;padding:0;}#addon-summary .link-sharing .share-button a span span span strong{width:90px;text-align:center;right:-6px;padding:0 18px 0 6px;}#addon-summary .link-sharing .share-button a span span span strong img{padding:0 6px 0 0;}#addon-summary .link-sharing .share-button a{color:#062445;background:#7cc11c url("../img/sprite.png?20090430") -800px -730px no-repeat;}#addon-summary .link-sharing .share-button a span{background:transparent url("../img/installbtn-edges.png") left bottom no-repeat;}#addon-summary .link-sharing .share-button a span span{background:transparent url("../img/installbtn-edges.png") right bottom no-repeat;}#addon-summary .link-sharing .share-button a span span span{background:transparent url("../img/installbtn-edges.png") left top no-repeat;}#addon-summary .link-sharing .share-button a span span span strong{background:transparent url("../img/installbtn-edges.png") right top no-repeat;}#addon-summary .link-sharing .share-button a:hover,.install-button a:focus,.install-button a:active{color:#0a3b73;background-color:#9dd34c;background-position:-800px -860px;}#addon-summary .link-sharing .badge .counter{display:block;position:relative;padding-right:4px;text-align:center;top:-4px;}#addon-summary .link-sharing .choices{display:none;position:absolute;z-index:9999;left:-120px;top:12px;width:360px;background:transparent url(../img/box-pointer-top.png) center top no-repeat;padding-top:12px;}#addon-summary .link-sharing .choices div{margin:0;padding:1em;background-color:#f8f8f8;border:1px solid #657b86;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#addon-summary .link-sharing .choices ul{list-style:none;margin:0;}#addon-summary .link-sharing .choices ul li{width:50%;float:left;}#addon-summary .link-sharing .choices ul li p{padding:.25em;margin:0 .25em 0 0;}#addon-summary .link-sharing .choices ul li p a{font-weight:bold;display:block;height:20px;text-decoration:none;padding-left:22px;background:transparent url(../img/favicons/digg.gif) left top no-repeat;}#addon-summary .link-sharing .choices ul li.digg p a{background-image:url(../img/favicons/digg.gif);}#addon-summary .link-sharing .choices ul li.facebook p a{background-image:url(../img/favicons/facebook.gif);}#addon-summary .link-sharing .choices ul li.delicious p a{background-image:url(../img/favicons/delicious.gif);}#addon-summary .link-sharing .choices ul li.myspace p a{background-image:url(../img/favicons/myspace.gif);}#addon-summary .link-sharing .choices ul li.friendfeed p a{background-image:url(../img/favicons/friendfeed.gif);}#addon-summary .link-sharing .choices ul li.reddit p a{background-image:url(../img/favicons/reddit.gif);}.addon-cats{margin-left:0;}.addon-cats li{display:inline;padding-left:1em;margin-right:.5em;}.addon-cats li:first-child{padding-left:0;}#addon-info,#addon-advanced{padding:8px 15px;margin-bottom:1em;}.html-ltr #addon_app_compatibility{position:relative;top:.6em;padding-left:22em;font-weight:bold;}.html-rtl #addon_app_compatibility{position:relative;top:.6em;padding-right:22em;font-weight:bold;}.html-ltr #addon-info .app_compat{float:left;}.html-rtl #addon-info .app_compat{float:right;}#addon-info h4{font-size:147%;}.addon-images{margin:1em auto 1.5em;}.addon-images li{display:inline;margin-right:10px;}.addon-images a img{margin-bottom:10px;}#addon-advanced{position:relative;}#addon-advanced h5{margin-top:1em;}#content .addon-reviews{margin-left:0;}#content .addon-reviews blockquote{margin:0;}#content .addon-reviews li{padding:8px 10px;}#content .addon-reviews .cite{font-size:95%;margin-bottom:0;}#content-extra ul.nav-addon{list-style:none;margin-left:0;padding-left:0;}#content .review .others-by-user{font-style:italic;display:block;margin-top:.5em;font-size:.85em;}#content .review .others-by-user a{padding-left:22px;}#content .review .others-by-user a.loading{background:transparent url(../img/ajax_loading.gif) no-repeat 2px top;}#content .others-by-user-load{padding-left:3em;}#content .review-reply{margin-left:3em;}#content .review p.flag-thanks,#content .review-reply p.flag-thanks{font-weight:bold;}#content .review form.flag,#content .review-reply form.flag{display:block;padding-bottom:1em;}#content .review form.flag label,#content .review-reply form.flag label{display:block;font-weight:bold;}.with-js #content .review p.flag-thanks,.with-js #content .review-reply p.flag-thanks{display:inline;}.with-js #content .review form.flag,.with-js #content .review-reply form.flag{display:inline;}.with-js #content .review form.flag label,.with-js #content .review-reply form.flag label{display:none;}#content .review .flag span.loading,#content .review-reply .flag span.loading{padding-left:22px;background:transparent url(../img/ajax_loading.gif) no-repeat 2px top;}#content ul.review-flags{padding:1em 1em .5em 1em;list-style-type:square;}#content ul.review-flags li{font-weight:bold;}#content ul.review-flags-notes{padding:.25em .5em;list-style-type:disc;}#content ul.review-flags-notes li{font-weight:normal;}#content ul.review-flags-notes .note{font-style:italic;}#latest-version{width:96%;float:left;margin-bottom:1.5em;padding:8px 2%;}#latest-version h3{float:left;}#latest-version .install-button{float:right;margin-bottom:0;}#content .addon-versions{margin-left:0;padding-left:0;list-style:none;}#content .addon-versions li{padding:8px 10px 0;}#content .addon-versions h3{margin-bottom:.5em;}#content .version-details,#content .version-links{list-style:none;margin-left:0;padding-left:0;}#content .version-details li,#content .version-links li{padding:0;border:0;}#content .version-links li{margin-bottom:.25em;}#content .version-details em,#content .version-links em{font-style:normal;color:#888;}#form-review{position:relative;margin-bottom:1em;padding:10px;}#form-review textarea{width:98%;margin:0 auto .5em;}#form-review #review-submit{width:100%;clear:both;margin-top:-1.5em;}#form-review .disabled{background:#eee;}#form-review h3{display:inline;}#form-review .login{display:inline;font-size:92%;}#form-review .login a:link,#form-review .login a:visited{text-decoration:none;}.html-ltr #form-review #review-submit{float:left;}.html-rtl #form-review #review-submit{float:right;}.html-ltr #form-review #review-submit input{float:right;}.html-rtl #form-review #review-submit input{float:left;}#recaptcha_image{margin:.5em 0;}#rate-it{margin-bottom:1em;}#rate-it h4{float:left;width:6em;font-size:110%;}.html-rtl #form-review #rate-it h4{float:right;}#rate-it .stars{display:block;float:left;width:90px;margin:.3em 0 0 0;}#form-review #rate-it .degrade{margin-left:0;width:145px;}#form-review #rate-it .degrade p{margin:.2em 0;}#rate-it .rating{cursor:pointer;margin:2em;clear:both;display:block;}#rate-it .rating:after{content:'.';display:block;height:0;width:0;clear:both;visibility:hidden;}#long-review .stars{margin:0;}#long-review .degrade{margin-left:14em;}#long-review .stars p{margin:.2em 0;}#long-review .rating{margin:1em 0;}.stars input{margin:0 4px;}.stars{zoom:1;}.stars .cancel,.stars .star{float:left;width:12px;height:14px;overflow:hidden;text-indent:-999em;cursor:pointer;}.html-rtl .stars .star,.html-rtl .stars .cancel{float:right;}.stars .cancel a,.stars .cancel a{background:url(../img/ratings_images.gif) no-repeat;}.stars .star a,.stars .star a{background:url(../img/ratings_images.gif) no-repeat;}.stars.cancel a,.stars .star a,.stars .cancel a,.stars .star a{display:block;width:100%;height:100%;background-position:0 -25px;border:1 solid #F00;}.stars .cancel a,.stars.cancel a{background-position:0 2px;}.stars div.star_hover a,.stars div.star_hover a{background-position:0 -38px;}.stars div.cancel_on a,.stars div.cancel_on a{background-position:0 -11px;}.stars div.star_on a,.stars div.star_on a{background-position:0 -38px;}.stars:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}#publish_to option:first-child{display:none;}.more-addons{padding:10px;}.more-addons h3 a.view{display:block;padding-right:30px;padding:.2em 30px .2em 0;}.more-addons h4{margin-top:1.5em;}#content.landing #content-extra .more-addons ul{margin-left:0;}.pagination{padding:8px 10px 0;margin-top:1em;}.pages{margin:0;float:left;}.pages li{display:inline;margin:0 2px;}.pages a{padding:3px 6px;}.pages .prev a{padding-left:15px;}.pages .next a{padding-right:15px;}#content-main .pagination p.count{margin-bottom:0;}.pagination p.perpage em,.pagination .perpage a{margin:0;}#form-listcontrol{position:relative;margin-bottom:1em;padding:8px 20% 8px 18%;}#form-listcontrol p,#form-listcontrol ul{margin:0;}#form-listcontrol #per-page{position:absolute;top:8px;left:10px;padding-top:6px;}#order-by li{display:inline;margin:0 2px;}#order-by button{cursor:pointer;padding:8px 2px;width:18.5%;}#order-by button.current,#order-by button.current:hover{cursor:default;}#form-listcontrol #experimental{position:absolute;top:8px;right:10px;width:140px;}#form-listcontrol #experimental label{display:block;cursor:pointer;padding:4px 0 4px 30px;}#form-listcontrol #experimental label input{position:absolute;left:6px;top:20%;}#developerAgreement ul{list-style-type:disc;margin-top:5px;}#thumb-subcategories{position:absolute;left:50px;top:7.125em;width:170px;}#thumb-subcategories ul{list-style-type:none;margin:0;padding:0;padding-bottom:6px;margin-bottom:1em;position:relative;}#thumb-subcategories ul li{padding-right:1px;overflow:hidden;}#thumb-subcategories ul li a,#thumb-subcategories ul li span{display:block;font-size:95%;padding:.25em 10px;}#thumb-subcategories a:link,#thumb-subcategories a:visited{text-decoration:none;}#thumb-browser .thumbs{list-style-type:none;margin-left:23%;}#thumb-browser .thumbs li.thumb{position:relative;width:170px;margin-right:10px;display:inline;float:left;text-align:center;}#thumb-browser .thumbs li.thumb div.wrapper{padding:1.75em 9px 0 9px;margin:0 5px 0 0;}#thumb-browser .thumbs li.thumb div.wrapper div.item{width:150px;}#thumb-browser .thumbs li.thumb div.img{border:1px solid #ccc;background:#fff;height:112px;overflow:hidden;}#thumb-browser .thumbs li.thumb div.img img{width:150px;}#thumb-browser .thumbs li.thumb h3{font-size:115%;line-height:115%;height:2.25em;overflow:hidden;padding-top:.5em;margin-bottom:.5em;}#thumb-browser .thumbs li.thumb .flag{position:absolute;top:0;left:0;padding:0 6px;}#thumb-browser .thumbs li.thumb p.meta{margin-bottom:0;padding:0;height:3.5em;overflow:hidden;}#thumb-browser .thumbs li.thumb .vex{text-align:left;height:8px;}#thumb-browser .thumbs li.thumb .vex span{display:block;height:8px;margin-left:0;}#thumb-browser #form-listcontrol{margin-left:20%;padding:8px 12% 8px 15%;}#thumb-browser #form-listcontrol #order-by button{white-space:nowrap;width:16.5%;}#slider{margin-bottom:18px;width:100%;background:transparent url(../img/sprite.png?20090430) no-repeat scroll left -1256px;}#slider .inner{background:transparent url(../img/sprite.png?20090430) no-repeat scroll right -1256px;width:100%;}#slider .viewport{position:relative;width:100%;overflow:hidden;}#slider .item_set{width:6000px;}#slider .item_set .addon{float:left;width:308px;}#slider .item_set li.addon{list-style:none;}#slider .item_set .addon .preview-img{background:transparent url(../img/sprite.png?20090430) no-repeat 1px -1256px;}#slider .item_set .addon{background:none;border-left:none;}#slider .item_set .addon .install-container{height:85px;}#slider .item_set .addon .install-button{padding-top:1.75em;padding-left:.5em;}#slider .item_set .addon .exp-loggedout .install-button,#slider .item_set .addon .exp-confirmed .install-button{padding-top:0;padding-left:0;}#slider .item_set .addon .count{border-top:1px solid #CCC;bottom:4px;height:35px;margin-left:-240px;position:absolute;}#slider .controls{border-top:1px solid #ccc;width:100%;}#slider .controls_inner{font-size:140%;text-align:center;padding-top:6px;border-left:1px solid #ccc;border-right:1px solid #ccc;}#slider .controls a{text-decoration:none;padding:0 .5em;}#slider .controls a img{border:none;vertical-align:top;}#slider .vex{background:transparent url("../img/sprite.png?20090430") right bottom no-repeat;width:100%;}.html-rtl #slider .vex{direction:ltr;}#slider .vex span{background:transparent url("../img/sprite.png?20090430") left bottom no-repeat;height:10px;display:block;width:10px;}.graybox{background-color:#F7FAFC;border:1px solid #EEF1F3;padding:15px;}.graybox.errors{background-color:#FFA5A5;}.graybox.spaced{margin-bottom:10px;}.rounded{-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.translation-box h4{border-bottom:1px solid #2D3B58;}.translation-box h4 img{float:right;margin-top:3px;}.html-rtl .translation-box h4 img{float:left;}.translation-box .translation-button img{cursor:pointer;float:left;background-color:#EEE;border:1px solid #EEE;border-bottom:none;padding:2px 5px 3px;margin:5px 0 0 10px;height:1.5em;-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;}.html-rtl .translation-box .translation-button img{float:right;margin:5px 10px 0 0;}.translation-box .translation-button.remove img{float:right;}.html-rtl .translation-box .translation-button.remove img{float:left;}.translation-box .translation-button img:hover{background-color:#E4F3FA;}.translation-box .translation-tab{float:left;margin-right:2px;background-color:#DDD;text-align:center;padding:5px;-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;-webkit-border-top-left-radius:6px;-webkit-border-top-right-radius:6px;width:3.1em;height:1.5em;cursor:pointer;border-bottom:1px solid #FFF;}.html-rtl .translation-box .translation-tab{float:right;margin-right:auto;margin-left:2px;}.translation-box .translation-tab.selected{border:1px solid #1D587F;background-color:#DDF;border-bottom:none;color:#1D587F;}.translation-box .translation-tab:hover{text-decoration:underline;}.translation-box .translation-area{clear:both;margin:0;}.translation-box .translation-maxlength{text-align:right;display:none;}.html-rtl .translation-box .translation-maxlength{text-align:left;}.translation-box .translation-maxlength.selected{display:block;}.translation-box .translation-maxlength img{display:none;}.translation-box .translation-maxlength.over{color:#C33;}.translation-box .translation-maxlength.over img{display:inline;vertical-align:middle;}.translation-box .translation-maxlength span{font-weight:bold;}.translation-box .input{border:1px solid #1D587F;margin:0;-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-bottom-right-radius:6px;width:100%;display:none;}.translation-box .input.selected{display:block;}.translation-newlocale-container,.translation-deletelocale-container,.translation-help-container,.translation-error-container{display:none;}.translation-newlocale,.translation-deletelocale{border:1px solid #1D587F;margin:0;-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;-webkit-border-bottom-left-radius:6px;-webkit-border-bottom-right-radius:6px;width:100%;height:100px;display:none;}.translation-deletelocale.textarea{position:absolute;z-index:10;}.translation-newlocale.selected,.translation-deletelocale{display:block;}.translation-newlocale .padded,.translation-deletelocale .padded,.translation-help .padded{padding:15px;}.translation-newlocale .buttons,.translation-deletelocale .buttons{text-align:center;margin:10px;}.translation-help{background-color:#FFF;margin-bottom:10px;width:630px;display:none;}.graybox .error-message{background:transparent url('../img/developers/exclamation.png') no-repeat 5px 50%;color:red;padding:5px 0 5px 30px;}.html-rtl .graybox .error-message{background-position:100% 50%;padding:5px 25px 5px 0;}#content .addon-listing .date-added{margin:0;float:right;}#content .coll-addon .preview-img{margin:0;}.collections .nav{list-style-type:none;margin:0;padding:0;float:right;}.collections .nav:after{float:left;}.collections .nav li{float:left;margin:5px;}.collections .collections-web li.coll-addon{margin:0;}.collections p.amo-plug{float:right;-moz-border-radius:7px;border:1px solid #d8dcdf;padding:5px;}.collections #content-main h1{font-size:200%;}.collections .cat-name{margin-left:.3em;}.collections .cat-header h3{background:transparent url(../img/fyf/triangle-right.png) scroll no-repeat left 5px;padding-left:20px;margin-right:.4em;}.collections .cat-header.selected h3{background:transparent url(../img/fyf/triangle-down.png) scroll no-repeat left 5px;}.collections #content-main .cat-header p{margin:0;margin-left:20px;padding-right:5px;}.collections ul.addon-listing{padding:0;margin:0;}.collections ul.addon-install-listing{max-height:30em;overflow:auto;}.collections li.list-addon:after,.collections .coll-addon .preview-img:after,.collections .nav:after,#collectionform:after{content:'.';clear:both;display:block;line-height:0;visibility:hidden;width:0;height:0;}.collections li.coll-addon{margin:.2em 2em .2em 2em;padding:.5em 0;border-top:1px solid #ccc;}.collections li.inst-addon{margin:.5em 0;padding:.5em;}.collections .coll-addon .preview-img{max-width:12em;float:left;clear:both;}.collections .coll-addon .preview-img img{float:left;clear:both;margin:.5em 1em 0 0;max-width:12em;max-height:9em;}.collections .list-addon h4{color:#2d3b58;font-size:140%;}.collections .inst-addon .desc h4{width:auto;float:none;}.collections .list-addon .desc{width:81%;margin:.2em 0 0 0;float:left;}.collections .list-addon img.icon{float:left;margin-right:.5em;vertical-align:middle;}.collections .inst-addon .desc{float:left;width:auto;margin:0;}.collections .inst-addon .desc p{font-size:90%;float:left;}.collections .coll-addon h4 a{text-decoration:none;}.collections .list-addon .add-button,.collections .coll-addon .done-box{-moz-border-radius:7px;padding:5px 10px;float:right;}.collections .list-addon .add-button,.collections .coll-addon .done-box{min-width:160px;}.collections .list-addon .done-box{display:none;clear:right;}.collections .list-addon .add-button{background:transparent url(../img/installbtn-bg.png) repeat-x top left;}.collections .coll-addon .add-button{font-weight:bold;}.collections .inst-addon .add-button{margin:1em 1em 0 2em;min-width:15%;}.collections .add-button .add,.collections .add-button input{vertical-align:middle;cursor:pointer;}.collections .add-button .add{color:#062445;}.collections .add-button.upgrade{background:#fff;border:1px solid #d8dcdf;font-size:125%;}.collections #content-main .add-button p{margin:0;font-weight:normal;}.collections .done-box{margin-top:.5em;border:1px solid #d8dcdf;}.collections .installsubmit{margin:1em 0;float:right;}.collections .installsubmit input{font-size:120%;margin:0 .5em;}.collections .faq{float:right;text-align:right;}.jqmWindow{display:none;position:fixed;top:17%;left:50%;margin-left:-400px;width:800px;background-color:#efefef;color:#333;border:1px solid black;padding:12px;}.jqmOverlay{background-color:#000;}* iframe.jqm{position:absolute;top:0;left:0;z-index:-1;width:expression(this.parentNode.offsetWidth+'px');height:expression(this.parentNode.offsetHeight+'px');}* html .jqmWindow{position:absolute;top:expression((document.documentElement.scrollTop || document.body.scrollTop)+Math.round(17 *(document.documentElement.offsetHeight || document.body.clientHeight) / 100)+'px');}#content.landing{width:995px;}#content.landing .crumbs a{color:#5086b6;}#content.landing .categories{position:relative;clear:both;border:none;z-index:3000;}#content.landing .categories h3{display:inline;font-size:189%;padding:0 0 0 10px;}.html-rtl #content.landing .categories h3{padding:0 10px 0 0;}#content.landing .categories .selection .current{font-size:250%;padding:0;margin:5px 0 0 0;font-weight:normal;display:inline;padding:0 3px 0 0;}.html-rtl #content.landing .categories .selection .current{padding:0 0 0 3px;}#content.landing .categories .selection .current a{text-decoration:none;color:#5086b6;background:none;display:inline;padding:0;}#content.landing .categories .selection .current a:hover{color:#000;}#content.landing .categories .selection .current .all{display:inline;padding:4px;background:url('../img/sprite.png?20090430') left -444px no-repeat;}#content.landing .categories .selection .current a:hover .all{background:url('../img/sprite.png?20090430') left -498px no-repeat;}#content.landing .categories.open .current a .all{background:url('../img/sprite.png?20090430') left -498px no-repeat;}#content.landing .categories h3.featured_title{float:left;font-size:24px;padding:0 0 0 .5em;margin:0;}#content.landing .categories h3.featured_title span{font-size:20px;}#content.landing .categories .selections{background-color:#fff;width:410px;list-style:none;margin:0;padding:6px;-moz-box-shadow:4px 7px 7px 2px #888;-webkit-box-shadow:4px 7px 7px 2px #888;box-shadow:4px 7px 7px 2px #888;}.html-rtl #content.landing .categories .selections{-moz-box-shadow:-4px 7px 7px 2px #888;-webkit-box-shadow:-4px 7px 7px 2px #888;box-shadow:-4px 7px 7px 2px #888;}#content.landing .categories.degrade .selections{border-left:1px solid #888;border-right:1px solid #888;border-bottom:1px solid #888;}#content.landing .categories.closed .selections{position:absolute;top:-1000px;left:-100000px;}.html-rtl #content.landing .categories.closed .selections{left:auto;right:-100000px;}#content.landing .categories.open .selections{position:absolute;left:-3px;top:3.3em;z-index:999;-moz-column-count:2;column-count:2;}.html-rtl #content.landing .categories.open .selections{left:auto;right:-3px;}#content.landing .categories.open h2.current{-moz-box-shadow:2px 2px 7px 0 #888;-webkit-box-shadow:2px 2px 7px 0 #888;box-shadow:2px 2px 7px 0 #888;margin:2px 0 -3px -3px;padding:3px;}.html-rtl #content.landing .categories.open h2.current{-moz-box-shadow:-2px 2px 7px 0 #888;-webkit-box-shadow:-2px 2px 7px 0 #888;box-shadow:-2px 2px 7px 0 #888;margin:2px -3px -3px 0;padding:3px;}#content.landing .categories.open.degrade{margin:0 0 12px 0;}#content.landing .categories.open.degrade h2.current{border-top:1px solid #888;border-left:1px solid #888;border-right:1px solid #888;margin:5px -2px 5px -3px;}#content.landing .categories.open.degrade .header{background:#888 none repeat scroll 0 0;display:block;height:1px;left:273px;line-height:0;position:absolute;top:39px;padding:0;}#content.landing .categories.open .current a{color:#000;}#content.landing .categories .selections li{border:none;padding:0;}#content.landing .categories .selections li a{display:block;padding:1px 1px 1px 5px;margin:0 4px 0 0;text-decoration:none;color:#000;background:none;}.html-rtl #content.landing .categories .selections li a{padding:1px 5px 1px 1px;margin:0 0 0 4px;}#content.landing .categories .selections li a:hover{background:#ddd;}#content.landing .search{display:none;}#featured_addons{width:995px;z-index:2;position:relative;}#featured_addons ul{list-style-type:none;margin:0;padding:0;}#featured_addons ul li{display:block;float:left;margin:0;padding:0 8px 8px 0;}.html-rtl #featured_addons ul li{float:right;padding:0 0 8px 8px;}#featured_addons ul li div.addon_block{display:block;position:relative;background:#f9f9f9 url(../img/sprite.png?20090430) no-repeat scroll left -968px;width:299px;height:200px;overflow:hidden;border:1px solid #ececec;-moz-border-radius-topleft:8px;-moz-border-radius-topright:8px;-moz-border-radius-bottomleft:8px;-moz-border-radius-bottomright:8px;-webkit-border-top-left-radius:8px;-webkit-border-top-right-radius:8px;-webkit-border-bottom-left-radius:8px;-webkit-border-bottom-right-radius:8px;border-top-right-radius:8px;border-top-left-radius:8px;border-bottom-right-radius:8px;border-bottom-left-radius:8px;padding:0 0 0 9px;}.html-rtl #featured_addons ul li div.addon_block{padding:0 9px 0 0;}#featured_addons ul li div.addon_block .name{font-size:138%;margin:8px 155px 0 0;line-height:1.25em;}.html-rtl #featured_addons ul li div.addon_block .name{margin:8px 0 0 155px;}#featured_addons ul li div.addon_block .name a{color:black;text-decoration:none;}#featured_addons ul li div.addon_block .preview{position:absolute;top:8px;right:9px;}.html-rtl #featured_addons ul li div.addon_block .preview{right:auto;left:9px;}#featured_addons ul li div.addon_block .preview img{width:138px;}#featured_addons ul li div.addon_block .summary{font-size:93%;line-height:1.5em;margin:0 149px 0 0;max-height:4.5em;overflow:hidden;}.html-rtl #featured_addons ul li div.addon_block .summary{margin:0 0 0 149px;}#featured_addons ul li div.addon_block .authors{font-size:100%;line-height:1.5em;margin:0 145px 0 0;color:#2363a5;}.html-rtl #featured_addons ul li div.addon_block .authors{margin:0 0 0 145px;}#featured_addons ul li div.addon_block .authors a{text-decoration:none;}#featured_addons ul li div.addon_block .rating{font-size:10px;overflow:hidden;margin:2px 0 0 0;}.rating span{display:block;background:transparent url(../img/ratings/5stars.png) no-repeat scroll top left;width:68px;height:12px;text-indent:-1000em;}span.rating-1{background-image:url(../img/ratings/1stars.png);}span.rating-2{background-image:url(../img/ratings/2stars.png);}span.rating-3{background-image:url(../img/ratings/3stars.png);}span.rating-4{background-image:url(../img/ratings/4stars.png);}span.rating-5{background-image:url(../img/ratings/5sta+html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}caption,th,td{text-align:left;font-weight:400;}blockquote:before,blockquote:after,q:before,q:after{content:"";}blockquote,q{quotes:"" "";}form ol,form ul{list-style:none;}input,button,select,textarea{font-family:inherit;font-size:inherit;color:inherit;}body{font:62.5%/1.6 Verdana,"Trebuchet MS",sans-serif;}a:link{text-decoration:underline;}h1,h2,h3,h4,h5,h6,caption,#rate-it legend{font-family:"Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}h2{font-weight:bold;font-size:140%;}h3,caption{font-size:140%;}h4,#rate-it legend{font-size:125%;}dt{font-weight:bold;}thead th{font-size:95%;}#site-notice{font-size:110%;}#nav-access{list-style:none;font-size:115%;}#nav-access a:active,#nav-access a:focus{text-align:center;}h4#moz{font-weight:bold;font-size:130%;}#page-title h1{font-weight:bold;font-size:300%;line-height:1.2;}#page-title h1 a{text-decoration:none;}#page-title h2{font-size:220%;}#page-title p.page-intro{line-height:1.25;font-size:125%;font-weight:bold;}#nav-user{text-align:right;font-size:115%;}#nav-user a:link,#nav-user a:visited{text-decoration:none;}#nav-user a:hover,#nav-user a:active,#nav-user a:focus{text-decoration:underline;}#other-apps h3{font-size:100%;}#nav-apps{list-style:none;font:bold 110% "Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}#other-apps.js #nav-apps{font-size:130%;}#nav-apps a{text-decoration:none;}#search-form{font-size:100%;}#search-form #search-query label,#search-form #query,#search-form #category{font-size:140%;}#search-form #search-category{white-space:nowrap;}#nav-legal{list-style:none;}#footer-disclaimer{text-align:center;}#content{font-size:120%;}#content-extra h3{font-size:110%;}#content-extra .nav-addon h3{font-size:130%;}#content-extra ul{font-size:98%;}#content-extra p.view-all{text-align:right;}#categories h3{font-size:120%;}#cat-list{list-style:none;}#categories a:link,#categories a:visited{text-decoration:none;}#categories p{line-height:1.4;}.addon .name{font-size:180%;line-height:1.2;font-weight:normal;}.addon .author{font-size:100%;}.addon .name a,.addon .author a{text-decoration:none;}.addon .name a:hover,.addon .author a:hover{text-decoration:underline;}.addon .rating,.addon .stats,.addon .updated{font-size:95%;}.addon .stats em{font-style:normal;}.addon .more-from{font-size:90%;}.addon .flag{font-size:100%;line-height:1;}.main .name{font-size:200%;}.sub .name{font-size:150%;}.sub .preview-img{text-align:center;}.sub .desc{font-size:98%;}#addon-listing{list-style:none;}#addon-listing .author{font-size:100%;}#addon-listing .more{list-style:none;font-size:95%;}.install-button{font:bold 120% "Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif;}.install-button a{text-decoration:none;}.exp-loggedout{font-size:90%;}.exp-loggedout .install-button a{font-size:110%;text-align:left;}.pitch h3{font-size:100%;font-weight:bold;line-height:1.2;}.pitch h3 a{text-decoration:none;}.pitch p{font-size:95%;}#recommended .name{font-size:160%;}#content.landing #secondaries .sub .flag{font-size:95%;}#content.landing .more-addons h3{font-size:130%;}#content.landing .more-addons ul{list-style:none;}#content.browse .more-addons h3{text-align:center;}.browse-list a{text-decoration:none;font-weight:bold;}#dictionaries tbody th{font-weight:bold;}#addon-summary .name{font-size:200%;}.addon-cats{list-style:none;font-size:95%;}.addon-cats a:link{text-decoration:none;}.addon-cats a:hover,.addon-cats a:active,.addon-cats a:focus{text-decoration:underline;}.addon-images,.addon-reviews{list-style:none;}.addon-images a img{vertical-align:top;}.addon-reviews .cite{font-size:95%;}#form-review #review-submit{font-size:90%;}#recaptcha_whatsthis{font-size:90%;}.more-addons h3{line-height:1.3;}.more-addons h3 a.view{text-decoration:none;}.more-addons h4{font-size:100%;}.pages{list-style:none;text-align:left;}.pagination p.count,.pagination p.perpage{text-align:right;}#form-listcontrol{font-family:"Trebuchet MS",Helvetica,"Helvetica Neue",sans-serif;}#form-listcontrol #per-page{font-size:110%;font-weight:bold;}#order-by button{text-align:center;}#form-listcontrol #experimental label{font-size:95%;line-height:1.1;}body{background:#fff;color:#333;}a:link{color:#1d587f;}a:visited{color:#748d9e;}a:active,a:hover,a:focus{color:#000;}a.view{background:transparent url("../img/sprite.png?20081210") 100% -247px no-repeat;}.html-ltr a.view:hover{background-position:100% -301px;}.html-rtl a.view{background-position:100% -486px;}.html-rtl a.view:hover{background-position:100% -540px;}h3,h4,h5,h6{color:#2d3b58;}td,th{border-bottom:1px solid #eee;}thead th{color:#555;}input,button,select,textarea{color:inherit;}a img{border:none;}div.error-notice{background:#fffefa url("../img/warning.png") 10px 10px no-repeat;border:1px solid #eee;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#site-notice{background:#ffe;border-bottom:2px solid #ccc;}#nav-access a:active,#nav-access a:focus{color:#000;background:#fff;border:1px solid #475470;outline:0;}h4#moz a{background:transparent url("../img/sprite-alpha.png") no-repeat 0 -1px;}h4#moz a:hover,h1#moz a:active,h1#moz a:focus{background-position:0 -51px;}#page-title{background:transparent url("../img/brandbanner-bg.png") 0 40% repeat-x;}#page-title p.page-intro{color:#354a4f;}#page-title.firefox h1,#page-title.firefox h1 a{color:#bd1d01;}#page-title.thunderbird h1,#page-title.thunderbird h1 a{color:#0b4190;}#page-title.fennec h1,#page-title.fennec h1 a{color:#0b4190;}#page-title.seamonkey h1,#page-title.seamonkey h1 a{color:#3f38a3;}#page-title.sunbird h1,#page-title.sunbird h1 a{color:#337b5a;}#page-title.generic h1,#page-title.generic h1 a{color:#bd1d01;}#page-title.developers h1,#page-title.developers h1 a{color:#bd1d01;}#page-title h2{color:#2D3B58;}.html-ltr #nav-user li{border-left:1px solid #666;}.html-rtl #nav-user li{border-right:1px solid #666;}#nav-user li:first-child{border-left:0;}#nav-user li:first-child{border-right:0;}#nav-user a:link{color:#000;}#nav-user a:visited{color:#666;}#nav-user a:hover,#nav-user a:active,#nav-user a:focus{color:#000;}#other-apps{background-color:#b3deee;border:1px solid #90c8dd;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#other-apps h3{color:#4d757b;}#other-apps.js h3{border-bottom:1px solid #90c8dd;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#other-apps.js h3{background:transparent url("../img/sprite.png?20081210") 4px -262px no-repeat;}.html-rtl #other-apps.js h3{background-position:14px -262px;}#other-apps.js h3:hover{background-color:#c5e3ee;}#nav-apps a{color:#1f0084;background-repeat:no-repeat;background-position:0 50%;}#nav-apps a:hover,#nav-apps a:active,#nav-apps a:focus{color:#1d587f;}.html-ltr #other-apps.js #nav-apps #app-seamonkey a{background:url("../img/sprite-alpha.png") -465px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-seamonkey a{background:url("../img/sprite-alpha.png") -390px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-sunbird a{background:url("../img/sprite-alpha.png") -616px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-sunbird a{background:url("../img/sprite-alpha.png") -541px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-thunderbird a{background:url("../img/sprite-alpha.png") -766px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-thunderbird a{background:url("../img/sprite-alpha.png") -691px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-fennec a{background:url("../img/sprite-alpha.png") -766px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-fennec a{background:url("../img/sprite-alpha.png") -691px 0 no-repeat;}.html-ltr #other-apps.js #nav-apps #app-firefox a{background:url("../img/sprite-alpha.png") -321px 0 no-repeat;}.html-rtl #other-apps.js #nav-apps #app-firefox a{background:url("../img/sprite-alpha.png") -246px 0 no-repeat;}.html-ltr #other-apps.collapsed h3{border-bottom:0;background-position:6px -320px;}.html-rtl #other-apps.collapsed h3{border-bottom:0;background-position:16px -320px;}#search-bubble-outer{background:transparent url("../img/sprite.png?20081210") right top no-repeat;}#search-bubble-inner{background:transparent url("../img/sprite.png?20081210") left top no-repeat;}#search-form li{color:#666;}.html-ltr #search-form #query{background:#fff url("../img/sprite.png?20081210") -977px -686px no-repeat;}.html-rtl #search-form #query{background:#fff url("../img/sprite.png?20081210") 100% -686px no-repeat;}#search-form #search-category label{color:#426a13;}.html-ltr #search-form #my-submit{background:url("../img/sprite-alpha.png") -120px 0 no-repeat;}.html-ltr #search-form #my-submit:hover{background-position:-157px 0;}.html-rtl #search-form #my-submit{background:url("../img/sprite-alpha.png") -120px -40px no-repeat;}.html-rtl #search-form #my-submit:hover{background:url("../img/sprite-alpha.png") -157px -40px no-repeat;}#advanced-search{background-color:#e6e6e6;border:1px solid #68B41C;}#advanced-search-toggle{background:url("../img/sprite.png?20081210") right -68px no-repeat;}#advanced-search-toggle div{background:transparent url("../img/sprite.png?20081210") left -68px no-repeat;}#advanced-search-toggle a{color:black;text-decoration:none;padding:1px 3px 1px 3px;}.html-ltr #advanced-search-toggle a.asclosed{background:url("../img/sprite.png?20081210") right -354px no-repeat;}.html-ltr #advanced-search-toggle a.asopen{background:url("../img/sprite.png?20081210") right -369px no-repeat;}.html-rtl #advanced-search-toggle a.asclosed{background:url("../img/sprite.png?20081210") -989px -354px no-repeat;}.html-rtl #advanced-search-toggle a.asopen{background:url("../img/sprite.png?20081210") -989px -369px no-repeat;}#advanced-search-toggle #toggle-outer{background:url("../img/sprite.png?20081210") right -87px no-repeat;}#advanced-search-toggle #toggle-inner{background:url("../img/sprite.png?20081210") -861px -87px no-repeat;}#footer{color:#888;padding:1em 0;background:transparent url("../img/foot-bg.png") repeat-x;}#footer a:link,#footer a:visited{color:#777;}#footer a:hover,#footer a:active,#footer a:focus{color:#000;}#content-extra .extra{border:1px solid #d8dcdf;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#categories h3{background:#79be1b url("../img/sprite.png?20081210") -104px -106px no-repeat;border-bottom:1px solid #abe071;}#categories h3 span{color:#426a13;background:transparent url("../img/sprite.png?20081210") -230px -106px no-repeat;}#categories.collapsed h3{background-position:0 -106px;}#categories.collapsed h3.open{background-position:-26px -106px;}#categories,#categories.collapsed #cat-list{background-color:#f6f6f6;border:1px solid #d8dcdf;border-width:0 1px 1px;}#categories,#categories.collapsed #cat-list{-moz-border-radius-bottomright:6px;-moz-border-radius-bottomleft:6px;-webkit-border-bottom-right-radius:6px;-webkit-border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px;}#cat-list{border-top:1px solid #e8e6e6;}#cat-list li{border-bottom:3px double #e8e6e6;}#cat-list a{background:#f4f2f2 url("../img/cat-link.png") repeat-x left top;}#categories a:link{color:#4e4e4e;}#categories a:visited{color:#777;}#categories a:hover,#categories a:active,#categories a:focus{color:#1d587f;background:#f1f0f0 url("../img/cat-link.png") repeat-x left -100px;}#categories.collapsed h3 span{background-position:-242px -106px;}#categories.collapsed h3:hover{color:#4f7f17;background-position:-52px -106px;}#categories.collapsed h3.open:hover{background-position:-78px -106px;}#categories.collapsed h3:hover span{background-position:-533px -106px;}#categories p{border-top:1px solid #e8e6e6;}.addon{border-left:1px solid #d8dcdf;background:transparent url("../img/sprite.png?20081210") right -1256px no-repeat;}.addon .vex{background:transparent url("../img/sprite.png?20081210") right bottom no-repeat;}.addon .vex span{background:transparent url("../img/sprite.png?20081210") left bottom no-repeat;}.addon .preview-img{background:transparent url("../img/sprite.png?20081210") left -1256px no-repeat;}.addon .stats em{color:#d54601;}.addon .flag{border:1px solid #ccc;border-width:0 1px 1px 0;}#addon-listing .addon .vex{background:transparent url("../img/sprite.png?20081210") no-repeat right bottom;}.sub .irk{background:transparent url("../img/sprite.png?20081210") left -1256px no-repeat;}.sub .preview-img{background-image:none;}.rec{background:url("../img/rec-tr.png") no-repeat right top;border-left-color:#c1e1c1;}.rec .preview-img{background:transparent url("../img/rec-tl.png") left top no-repeat;}.rec .flag{color:#360;background:#f8f8f7 url("../img/rec-flag.png") no-repeat;}.rec .vex{background-image:url("../img/rec-br.png");}.rec .vex span{background-image:url("../img/rec-bl.png");}.exp{background:url("../img/exp-tr.png") no-repeat right top;border-left-color:#e3c1c1;}.exp .preview-img{background:transparent url("../img/exp-tl.png") left top no-repeat;}.exp .flag{color:#900;background:#f8f8f7 url("../img/exp-flag.png") no-repeat;}.exp .vex{background-image:url("../img/exp-br.png");}.exp .vex span{background-image:url("../img/exp-bl.png");}#addon-listing .more li{border-right:1px solid #666;}#addon-listing .more li:last-child{border:0;}.install-button a{color:#062445;background:#7cc11c url("../img/sprite.png?20081210") 100% -730px no-repeat;}.install-button a span{background:transparent url("../img/installbtn-edges.png") left bottom no-repeat;}.install-button a span span{background:transparent url("../img/installbtn-edges.png") right bottom no-repeat;}.install-button a span span span{background:transparent url("../img/installbtn-edges.png") left top no-repeat;}.install-button a span span span strong{background:transparent url("../img/installbtn-edges.png") right top no-repeat;}.install-button a:hover,.install-button a:focus,.install-button a:active{color:#0a3b73;background-color:#9dd34c;background-position:100% -860px;}.install-button a span,.install-button a span span,.install-button a span span span,.install-button a span span span strong{background-image:url("../img/installbtn-edges-list.png");}.exp .install-button a span,.exp .install-button a span span,.exp .install-button a span span span,.exp .install-button a span span span strong{background-image:url("../img/installbtn-edges-exp.png");}#addon-listing .rec .install-button a span,#addon-listing .rec .install-button a span span,#addon-listing .rec .install-button a span span span,#addon-listing .rec .install-button a span span span strong{background-image:url("../img/installbtn-edges-rec.png");}#content-main .exp-loggedout{border:1px solid #d8d8d8;background:#fff;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#content-main .exp-loggedout .install-button a{color:#aaa;background-color:#fff;background-position:100% -995px;}#content-main .exp-loggedout .install-button a span,#content-main .exp-loggedout .install-button a span span,#content-main .exp-loggedout .install-button a span span span,#content-main .exp-loggedout .install-button a span span span strong{background-image:url("../img/installbtn-edges-dis.png");}#content-main .exp-loggedout .install-button a:hover{background-color:#f3f3f3;background-position:100% -1125px;}#content-main .install-container .not-avail{padding:5px 10px;float:left;color:#666;border:1px solid #d8d8d8;background:#fff;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pitch{background-color:#f8f8f8;border:1px solid #e4f3fa;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pitch h3{color:#042253;}#recommended{background:#f2f8fd;border:1px solid #e9f1f8;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#recommended .addon{background:#fff url("../img/landrec-tr.png") no-repeat top right;}#recommended .addon .preview-img{background:url("../img/landrec-tl.png") no-repeat top left;}#recommended .addon .vex{background-image:url("../img/landrec-br.png");}#recommended .vex span{background-image:url("../img/landrec-bl.png");}#content.landing #secondaries .exp .irk{background-image:url("../img/exp-tl.png");}#content.landing #secondaries .sub .vex{background-image:url("../img/addon-br.png");}#content.landing #secondaries .exp .vex{background-image:url("../img/exp-br.png");}#content.landing #secondaries .exp .preview-img{background-image:none;}#content.landing .more-addons{border:1px solid #5d6c8c;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.browse-list a{background:#fafafa;border:1px solid #e8e6e6;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.browse-list a:hover{background-color:#f1f0f0;border-color:#e1dfdf;}#dictionaries{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#dictionaries th,#dictionaries td{border-bottom:1px solid #eee;}#dictionaries tbody tr.alt th,#dictionaries tbody tr.alt td{background-color:#fff;}.addon-cats li{border-left:1px solid #666;}.addon-cats li:first-child{border-left:0;}#addon-info,#addon-advanced{border:1px solid #d8dcdf;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.addon-images a img{border:1px solid #1d587f;}.addon-reviews li,.addon-versions li{border-top:1px solid #d8dcdf;}#addon-info .addon-reviews li{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#addon-advanced h5{border-top:1px solid #d8dcdf;}#latest-version{border:1px solid #5d6c8c;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div.oldversion{-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#form-review{background-color:#f8f8f8;border:1px solid #e4f3fa;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#recaptcha_image{border:1px solid #d8dcdf;}#rate-it legend span{color:#042758;}.more-addons h3 a.view{background:transparent url("../img/sprite.png?20081210") 100% -387px no-repeat;}.html-ltr .more-addons h3 a.view:hover{background-position:100% -437px;}.html-rtl .more-addons h3 a.view{background-position:100% -597px;}.html-rtl .more-addons h3 a.view:hover{background-position:100% -647px;}.pagination{background-color:#f7fafc;border:1px solid #eef1f3;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.pages a{border:1px solid #fff;}.pages a:hover{background-color:#ccf29b;border-color:#bbde92;}.pages .current strong{background-color:#ccf29b;border:1px solid #83c53f;}.pages .prev a{background:transparent url("../img/arr-prev.png") 0 50% no-repeat;}.pages .prev a:hover{background-color:#ccf29b;}.pages .next a{background:transparent url("../img/arr-next.png") 100% 50% no-repeat;}.pages .next a:hover{background-color:#ccf29b;}#form-listcontrol{background:#f2f8fd;border:1px solid #e9eff4;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#order-by button{color:#7598b5;background-color:#fff;border:1px solid #89a8c1;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#order-by button:hover{background-color:#e9eff4;color:#496377;}#order-by button.current,#order-by button.current:hover{background-color:#89a8c1;color:#fff;}#form-listcontrol #experimental label{background:#fff;border:1px solid #933;color:#933;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#thumb-subcategories ul{-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;border-color:#D8DCDF;border-style:solid;border-width:0 1px 1px;}#thumb-subcategories ul li{border-top:1px solid #E8E6E6;}#thumb-subcategories a:link{color:#4e4e4e;}#thumb-subcategories a:visited{color:#777;}#thumb-subcategories a:hover,#thumb-subcategories a:active,#thumb-subcategories a:focus{background:#F2F8Fd;}#thumb-subcategories li.selected a:link,#thumb-subcategories li.selected a:visited{background-color:#89A8C1;color:#FFF;}#thumb-browser .thumbs li.thumb{background:transparent url(../img/sprite.png?20081210) no-repeat scroll right -1256px;}#thumb-browser .thumbs li.thumb div.wrapper{background:transparent url(../img/sprite.png?20081210) no-repeat scroll left -1256px;}#thumb-browser .thumbs li.exp{background:transparent url(../img/exp-tr.png) no-repeat scroll right top;}#thumb-browser .thumbs li.exp div.wrapper{background:transparent url(../img/exp-tl.png) no-repeat scroll left top;}#thumb-browser .thumbs li.thumb .vex{background:transparent url(../img/sprite.png?20081210) no-repeat scroll right bottom;}#thumb-browser .thumbs li.thumb .vex span{background:transparent url(../img/sprite.png?20081210) no-repeat scroll left bottom;width:10px;height:10px;float:left;}#thumb-browser .thumbs li.exp .vex{background:transparent url(../img/exp-br.png) no-repeat scroll right bottom;}#thumb-browser .thumbs li.exp .vex span{background:transparent url(../img/exp-bl.png) no-repeat scroll left bottom;}@media screen,projection{html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,code,del,dfn,em,img,q,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;}table{border-collapse:separate;border-spacing:0;}body{min-width:770px;}ol,ul{margin-left:2em;}blockquote{margin:0 3em 1em;}dd{margin-left:2em;}td,th{padding:2px 6px;}a.view{padding-right:10px;}button,input[type="submit"]{cursor:pointer;}h2{margin-bottom:.5em;}div.error-notice{margin:0;min-height:48px;margin-bottom:1.5em;padding:10px 10px 0 70px;}.with-js .hide-with-js{display:none;}.show-with-js{display:none;}.with-js .show-with-js{display:block;}#site-notice{width:80%;padding:5px 10%;}#nav-access{position:absolute;top:-10em;margin:0 auto;width:100%;}#nav-access a:active,#nav-access a:focus{position:absolute;top:11em;width:18em;z-index:2;}.html-ltr #nav-access a:active,.html-ltr #nav-access a:focus{left:50%;margin-left:-8em;}.html-rtl #nav-access a:active,.html-rtl #nav-access a:focus{right:50%;margin-right:-8em;}#branding{position:relative;}h4#moz{position:absolute;top:10px;margin:0;z-index:1;}.html-rtl h4#moz{left:0;}.html-rtl h4#moz img{position:relative;left:-10px;}h4#moz a{display:block;height:44px;width:100px;padding-left:10px;}#page-title{height:13em;}#page-title div{max-width:900px;margin:0 auto;}.html-ltr #page-title div{padding:25px 105px 0;}.html-rtl #page-title div{position:relative;left:-70px;padding:25px 0 0 0;}#page-title h1{position:relative;}.html-ltr #page-title h1{padding:10px 0 5px 125px;}.html-rtl #page-title h1{padding:10px 320px 5px 0;}#page-title h1 img{position:absolute;top:0;}.html-ltr #page-title h1 img{left:0;}.html-rtl #page-title h1 img{right:200px;}#page-title h2{position:relative;}.html-ltr #page-title h2{margin:-5px 0 5px 175px;}.html-rtl #page-title h2{margin:-5px 370px 5px 0;}#page-title p.page-intro{margin-bottom:0;width:42em;max-width:650px;}.html-ltr #page-title p.page-intro{padding-left:125px;}.html-rtl #page-title p.page-intro{padding-right:320px;}#nav-user{max-width:900px;min-width:770px;}.html-ltr #nav-user{margin:-1.75em auto 0;padding:0 50px;}.html-rtl #nav-user{margin:0 auto 0;padding:0 0 0 50px;}#nav-user li{display:inline;}.html-ltr #nav-user li{padding-left:1em;margin-right:.5em;}.html-rtl #nav-user li{padding-right:1em;margin-left:.5em;}.html-ltr #nav-user li:first-child{border-left:0;padding-left:0;}.html-rtl #nav-user li:first-child{border-right:0;padding-right:0;}#other-apps{position:absolute;top:-9.65em;z-index:5;}.html-ltr #other-apps{right:50px;padding:6px 10px 0;}.html-rtl #other-apps{right:50px;padding:6px 10px 0;}#other-apps.js{width:12em;padding-bottom:6px;}#other-apps h3{float:left;margin-right:20px;}#other-apps.js h3{float:none;cursor:pointer;}.html-ltr #other-apps.js h3{margin:-6px -10px;padding:6px 15px 6px 20px;}.html-rtl #other-apps.js h3{margin:-6px -10px;padding:6px 15px 6px 20px;}#nav-apps{margin-top:.1em;}.html-ltr #nav-apps{margin-left:0;}.html-rtl #nav-apps{margin-right:0;}#nav-apps li{display:inline;}.html-ltr #nav-apps li{margin-right:10px;}.html-rtl #nav-apps li{margin-left:10px;}#other-apps.js #nav-apps{margin-top:1em;}#other-apps.js #nav-apps li{display:block;margin-right:0;}.html-ltr #other-apps.js #nav-apps li{margin-right:0;}.html-rtl #other-apps.js #nav-apps li{margin-left:0;}#other-apps.js #nav-apps a{display:block;line-height:35px;}.html-ltr #other-apps.js #nav-apps a{padding-left:40px;}.html-rtl #other-apps.js #nav-apps a{padding-right:40px;}#other-apps.collapsed #nav-apps{position:absolute;}.html-ltr #other-apps.collapsed #nav-apps{left:-999em;}.html-rtl #other-apps.collapsed #nav-apps{right:-999em;}#other-apps.collapsed #nav-apps a:active,#other-apps.collapsed #nav-apps a:focus{position:absolute;top:0;}.html-ltr #other-apps.collapsed #nav-apps a:active,.html-ltr #other-apps.collapsed #nav-apps a:focus{left:-999em;}.html-rtl #other-apps.collapsed #nav-apps a:active,.html-rtl #other-apps.collapsed #nav-apps a:focus{right:-999em;}#search-element{position:relative;width:80%;}.html-ltr #search-element{left:190px;}.html-rtl #search-element{left:0;}#search-bubble-inner{height:71px;margin:0;padding:0;width:6px;float:left;}.html-ltr #standard-search{padding:20px 4px 15px 14px;}.html-rtl #standard-search{padding:20px 20px 15px 4px;}#search-bubble-outer legend{display:none;}#search-form ol{margin:0;padding:0;}#search-form #search-query{width:55%;}#search-form #search-query label{display:none;}#search-form #search-query label{position:absolute;top:20px;}.html-ltr #search-form #search-query label{left:17px;padding:.2em 5px .2em 30px;}.html-rtl #search-form #search-query label{right:17px;padding:.2em 30px .2em 5px;}#search-form #query{width:42%;}.html-ltr #search-form #query{padding:.2em 5px .2em 24px;}.html-rtl #search-form #query{padding:.2em 24px .2em 5px;}#search-form #category{width:36%;padding:.3em 0 .2em 0;}#search-form #category option{min-width:14em;}#search-form #my-submit{width:37px;height:38px;border:0;margin-left:9px;}#advanced-search{margin:-2px 0 0 0;padding:.1in .25in 0 .25in;}form.asclosed{display:none;}#search-application{padding-bottom:.1in;}#advanced-search-toggle{position:relative;top:-2px;}.html-ltr #advanced-search-toggle{text-align:right;}.html-rtl #advanced-search-toggle{text-align:left;direction:ltr;}#advanced-search-toggle div{width:6px;height:6px;float:left;}#advanced-search-toggle #toggle-inner{padding-left:3px;}.html-ltr #advanced-search-toggle #toggle-outer{margin:0 .25in .1in 0;padding-right:4px;}.html-ltr #advanced-search-toggle a{padding-right:.15in;}.html-rtl #advanced-search-toggle #toggle-outer{margin:0 0 .1in .25in;padding-right:4px;}.html-rtl #advanced-search-toggle a{padding-left:.15in;}.html-ltr #search-application td{padding-right:.2in;}.html-rtl #search-application td{padding-left:.2in;}.html-rtl #advanced-search td{text-align:right;}.html-ltr #search-platform{float:left;margin-bottom:1.5em;margin-right:1in;}.html-rtl #search-platform{float:right;margin-bottom:1.5em;margin-left:1in;}#footer{position:relative;width:100%;clear:both;padding:1em 0;min-width:770px;}#footer-lang-form{position:relative;max-width:900px;min-width:770px;}.html-ltr #footer-lang-form{padding:0 50px;margin:0 auto;}.html-rtl #footer-lang-form{padding:0 0 0 50px;margin:0;}.html-ltr #footer-lang-form p{position:absolute;right:50px;}.html-rtl #footer-lang-form p{position:absolute;left:50px;}#footer-legal{max-width:900px;margin:0 auto;padding:0 50px;min-width:770px;}#copyright{margin-bottom:0;}#nav-legal li{display:inline;margin-right:.5em;}#footer-disclaimer{margin-top:1em;}#content{clear:both;position:relative;padding:1em 50px;max-width:950px;margin:0 auto 1em;min-width:770px;min-height:1000px;}#content-main{position:relative;margin-left:190px;min-height:50em;}#content.main-page #content-main,#content.detail-page #content-main,#content.reviews-page #content-main,#content.versions-page #content-main{width:60%;padding-right:20%;}#content-main.full{margin-left:0;}#content.detail-page #content-main.full,#content.reviews-page #content-main.full,#content.versions-page #content-main.full{width:75%;padding-right:25%;}#secondaries .sub{width:48%;}#secondaries #feature3{float:right;}#secondaries #feature2{float:left;}#content #sidebar{position:absolute;left:50px;top:1em;width:170px;}#content-extra{position:absolute;right:0;top:0;width:23%;}#content-extra .extra{margin-bottom:.1em;padding:5px 12px;}#content-extra h3{margin-bottom:.1em;}.html-ltr #content-extra ul{margin:0 0 0 10px;}.html-rtl #content-extra ul{margin:0 10px 0 0;}#content-extra ul li{margin:0;padding:0;}#content-extra ul li span{font-size:8pt;}#content-extra p.view-all{margin-bottom:.5em;}.html-rtl #content-extra p.view-all{margin-right:4px;}#categories{margin-bottom:1em;position:relative;z-index:5;}#categories h3{margin:0 -1px;padding-left:6px;}#categories.collapsed h3{padding-left:18px;}#categories h3 span{display:block;padding:8px 4px;}#categories,#categories.collapsed #cat-list{padding-bottom:6px;}#categories.collapsed h3 span{text-indent:4px;padding-left:0;}#cat-list{margin-left:0;}#cat-list li{padding-right:1px;}#cat-list a,#cat-list span{display:block;padding:.5em 10px;}#categories.collapsed h3{cursor:pointer;}#categories p{margin:0 -1px -6px;padding:.6em 10px;}#categories.collapsed #cat-list{position:absolute;left:-999em;top:-999em;}.html-rtl #categories.collapsed #cat-list{position:absolute;left:999em;top:-999em;}#categories.collapsed #cat-list.visible{margin:0 -1px;width:100%;left:0;top:3.35em;height:auto;overflow:visible;z-index:99;}#categories.collapsed #cat-list a:active,#categories.collapsed #cat-list a:focus{position:absolute;left:999em;top:1002.4em;width:85%;}#categories.collapsed #cat-list.visible a:active,#categories.collapsed #cat-list.visible a:focus{position:static;width:auto;}#content-main p,#content-main ul,#content-main ol{margin-bottom:1.25em;}#content-main li{margin-bottom:.5em;}#content-main li ul,#content-main li ol{margin-left:15px;}.addon{position:relative;min-height:160px;padding:18px 20px 10px;margin-bottom:1.6em;}.addon .vex{height:10px;width:100%;position:absolute;left:0;bottom:0;}.addon .vex span{display:block;height:10px;margin-left:-1px;width:10px;float:left;}.addon .name{padding-left:44px;position:relative;}.addon .name img{position:absolute;left:0;}.addon .author{margin:0 0 1.25em 44px;}.addon .preview-img{position:absolute;left:-1px;top:0;padding:18px 0 0 20px;width:200px;height:150px;overflow:hidden;}.addon .flag{position:absolute;left:-1px;top:0;padding:5px 10px 3px 10px;z-index:5;}.addon .baseline img.faq{margin:0 5px 0 0;float:left;}.rec,.exp{min-height:170px;}.rec .preview-img,.exp .preview-img{padding:2.5em 0 0 20px;}.updated{font-size:75%;color:#666;}.main{padding-left:240px;min-height:220px;}.main .rating{position:absolute;left:20px;top:180px;width:200px;}.main .stats{position:absolute;left:20px;top:180px;width:200px;margin-top:2em;}.sub{position:relative;padding:0;}.sub .irk{margin-left:-1px;padding:14px 20px 8px;margin-right:4px;}.sub .vex{padding:0;left:0;}.sub .name{margin-bottom:0;}.sub .preview-img{position:static;padding:0;}.sub .rating{position:static;width:40%;padding-right:10%;float:left;}.sub .rating img{display:block;}.sub .more-from{clear:both;}#content-main #addon-listing{margin-left:0;}#addon-listing .addon{padding:18px 240px 10px;margin-bottom:1em;}#addon-listing .preview-img{position:absolute;left:-1px;top:0;}#addon-listing .rating{display:inline;margin-right:2em;}#addon-listing .stats{display:inline;margin-right:2em;}#addon-listing .more{display:inline;margin:0;padding:0;}#addon-listing .more li{display:inline;margin:0 10px 0 0;padding:0 15px 0 0;}#addon-listing .desc{margin-top:.5em;}.install-button:after,.install-container:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}.install-button a{float:left;cursor:pointer;max-width:290px;}.install-button a *{display:block;float:left;position:relative;}.install-button a span{padding:0 0 0 6px;}.install-button a span span{padding:0 0 8px 0;}.install-button a span span span{left:-6px;padding:0 0 6px 0;}.install-button a span span span strong{right:-6px;padding:10px 45px 0 6px;}.install-button a span span span strong img{padding:0 6px 0 0;}#addon-listing .install-container{position:absolute;right:0;top:20px;max-width:180px;padding:0 15px;}#addon-listing .install-container .install-button{margin-bottom:.5em;float:right;}#addon-listing .addon p.updated{position:absolute;right:0;bottom:5px;max-width:180px;padding:0 15px;}#addon-listing .exp .exp-loggedout{float:right;}#addon-listing .exp .exp-loggedout .install-button{float:none;}.exp-loggedout{float:left;padding:5px 5px 3px 8px;}.exp-loggedout .install-button{margin-top:3px;margin-right:-3px;}#content-main .exp-loggedout p.install-button{margin-bottom:0;}.pitch{margin-bottom:1em;padding:10px;}.pitch h3,.pitch p{margin-bottom:1em;}.html-rtl .pitch ul{padding-right:15px;}.pitch h3 img{float:left;margin:-4px 10px 0 0;}#recommended{padding:0 1% 10px;width:98%;float:left;margin-bottom:1em;}#recommended .addon{float:none;}#content.wide #recommended .addon{width:20%;padding-left:26.5%;min-width:100px;margin-bottom:0;}#content.wide #recommended .addon .preview-img{width:45%;}#content.wide #recommended #feature1{float:left;}#content.wide #recommended #feature2{float:right;}#content.landing #secondaries{float:left;}#content.landing #secondaries .sub{float:left;width:30.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries .sub{float:left;width:31.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries #feature8{margin-right:0;}#content.landing #secondaries .sub .irk{padding-top:2.2em;}#content.landing #secondaries .sub .vex{padding-top:0;}#content.landing #secondaries .exp .preview-img{padding:0;}#content.landing #secondaries .addon .preview-img{padding:0;width:180px;}#content.landing-with-slider #secondaries .sub{float:left;width:31.5%;margin-right:2.5%;}#content.landing-with-slider #secondaries #feature8{margin-right:0;}#content.landing #secondaries{width:77%;}#content.landing #content-extra{width:23%;}#content.landing-with-slider #secondaries{width:100%;}#content.landing-with-slider #content-extra{width:25%;position:absolute;top:0;right:0;}#content.landing-with-slider #content-main{position:relative;}#content.landing-with-slider #recommended{float:none;position:relative;left:0;width:71%;}.html-rtl #content.landing-with-slider #recommended{float:left;}#content.landing-with-slider #recommended #slider .item_set .addon{float:left;width:308px;padding-left:240px;}#content.landing-with-slider #recommended #slider{background-color:#fff;margin-bottom:0;}#content.landing #content-extra{position:static;float:right;}#content.landing-with-slider #content-extra{position:absolute;float:none;}#content.landing.languages #content-extra{margin-right:0;}#content.landing .more-addons{margin:0 0 1em;padding:6px 10px 0;}#content.landing.browse #secondaries{width:50%;}#content.landing.browse #secondaries .sub{width:47%;}#content.landing.browse #secondaries #feature4{margin-right:0;}#content.landing.browse #content-extra{width:47%;}#content.browse .more-addons h3 a.view{display:inline;}.browse-list{list-style:none;margin:0;width:100%;overflow:auto;}.browse-list li{width:48%;margin:0 0 3px 1%;float:left;}.browse-list a{display:block;padding:3px 5px;}#content.landing.languages .sub{width:23.75%;margin-right:2%;float:left;}#content.landing.languages #feature3{margin-right:0;}#dictionaries{margin-top:1.5em;clear:both;padding:10px 15px;}#dictionaries table{width:100%;}#dictionaries th,#dictionaries td{padding:6px 12px;}#addon-summary{padding-left:240px;min-height:225px;}#addon-summary .name{margin-bottom:0;}#addon-summary .preview-img{position:absolute;left:-1px;top:0;padding:18px 0 0 20px;}#addon-summary.exp .preview-img,#addon-summary.rec .preview-img{padding-top:2.5em;}#addon-summary .rating img{display:block;}#addon-summary .rating{position:absolute;left:20px;top:180px;width:200px;}#addon-summary .stats{position:absolute;left:20px;top:180px;width:200px;margin-top:3.5em;}#addon-summary .link-sharing{position:absolute;left:105px;top:180px;font-size:.7em;}#addon-summary .link-sharing .badge .button{display:block;color:#062445;background:#7cc11c url("../img/sprite.png?20081210") -800px -730px no-repeat;}#addon-summary .link-sharing .badge .button a{display:block;padding:0 8px 8px 0;background:transparent url(../img/installbtn-edges.png) no-repeat scroll right bottom;}#addon-summary .link-sharing .badge .button a span{display:block;text-align:center;font-weight:bold;padding:2px 0 0 2px;background:transparent url(../img/installbtn-edges-list.png) no-repeat scroll left top;}#addon-summary .link-sharing .share-button{padding:0;margin:0;}#addon-summary .link-sharing .share-button:after,.install-container:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}#addon-summary .link-sharing .share-button a{float:left;cursor:pointer;max-width:290px;text-decoration:none;}#addon-summary .link-sharing .share-button a *{display:block;float:left;position:relative;}#addon-summary .link-sharing .share-button a span{padding:0 0 0 6px;}#addon-summary .link-sharing .share-button a span span{padding:0 0 8px 0;}#addon-summary .link-sharing .share-button a span span span{left:-6px;padding:0;}#addon-summary .link-sharing .share-button a span span span strong{width:90px;text-align:center;right:-6px;padding:0 18px 0 6px;}#addon-summary .link-sharing .share-button a span span span strong img{padding:0 6px 0 0;}#addon-summary .link-sharing .share-button a{color:#062445;background:#7cc11c url("../img/sprite.png?20081210") -800px -730px no-repeat;}#addon-summary .link-sharing .share-button a span{background:transparent url("../img/installbtn-edges.png") left bottom no-repeat;}#addon-summary .link-sharing .share-button a span span{background:transparent url("../img/installbtn-edges.png") right bottom no-repeat;}#addon-summary .link-sharing .share-button a span span span{background:transparent url("../img/installbtn-edges.png") left top no-repeat;}#addon-summary .link-sharing .share-button a span span span strong{background:transparent url("../img/installbtn-edges.png") right top no-repeat;}#addon-summary .link-sharing .share-button a:hover,.install-button a:focus,.install-button a:active{color:#0a3b73;background-color:#9dd34c;background-position:-800px -860px;}#addon-summary .link-sharing .badge .counter{display:block;position:relative;padding-right:4px;text-align:center;top:-4px;}#addon-summary .link-sharing .choices{display:none;position:absolute;z-index:999;left:-120px;top:12px;width:360px;background:transparent url(../img/box-pointer-top.png) center top no-repeat;padding-top:12px;}#addon-summary .link-sharing .choices div{margin:0;padding:1em;background-color:#f8f8f8;border:1px solid #657b86;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#addon-summary .link-sharing .choices ul{list-style:none;margin:0;}#addon-summary .link-sharing .choices ul li{width:50%;float:left;}#addon-summary .link-sharing .choices ul li p{padding:.25em;margin:0 .25em 0 0;}#addon-summary .link-sharing .choices ul li p a{font-weight:bold;display:block;height:20px;text-decoration:none;padding-left:22px;background:transparent url(../img/favicons/digg.gif) left top no-repeat;}#addon-summary .link-sharing .choices ul li.digg p a{background-image:url(../img/favicons/digg.gif);}#addon-summary .link-sharing .choices ul li.facebook p a{background-image:url(../img/favicons/facebook.gif);}#addon-summary .link-sharing .choices ul li.delicious p a{background-image:url(../img/favicons/delicious.gif);}#addon-summary .link-sharing .choices ul li.myspace p a{background-image:url(../img/favicons/myspace.gif);}#addon-summary .link-sharing .choices ul li.friendfeed p a{background-image:url(../img/favicons/friendfeed.gif);}#addon-summary .link-sharing .choices ul li.reddit p a{background-image:url(../img/favicons/reddit.gif);}.addon-cats{margin-left:0;}.addon-cats li{display:inline;padding-left:1em;margin-right:.5em;}.addon-cats li:first-child{padding-left:0;}#addon-info,#addon-advanced{padding:8px 15px;margin-bottom:1em;}.html-ltr #addon_app_compatibility{position:relative;top:.6em;padding-left:22em;font-weight:bold;}.html-rtl #addon_app_compatibility{position:relative;top:.6em;padding-right:22em;font-weight:bold;}.html-ltr #addon-info .app_compat{float:left;}.html-rtl #addon-info .app_compat{float:right;}#addon-info h4{font-size:147%;}.addon-images{margin:1em auto 1.5em;}.addon-images li{display:inline;margin-right:10px;}.addon-images a img{margin-bottom:10px;}#addon-advanced{position:relative;}#addon-advanced h5{margin-top:1em;}#content .addon-reviews{margin-left:0;}#content .addon-reviews blockquote{margin:0;}#content .addon-reviews li{padding:8px 10px;}#content .addon-reviews .cite{font-size:95%;margin-bottom:0;}#content-extra ul.nav-addon{list-style:none;margin-left:0;padding-left:0;}#content .review .others-by-user{font-style:italic;display:block;margin-top:.5em;font-size:.85em;}#content .review .others-by-user a{padding-left:22px;}#content .review .others-by-user a.loading{background:transparent url(../img/ajax_loading.gif) no-repeat 2px top;}#content .others-by-user-load{padding-left:3em;}#content .review-reply{margin-left:3em;}#content .review p.flag-thanks,#content .review-reply p.flag-thanks{font-weight:bold;}#content .review form.flag,#content .review-reply form.flag{display:block;padding-bottom:1em;}#content .review form.flag label,#content .review-reply form.flag label{display:block;font-weight:bold;}.with-js #content .review p.flag-thanks,.with-js #content .review-reply p.flag-thanks{display:inline;}.with-js #content .review form.flag,.with-js #content .review-reply form.flag{display:inline;}.with-js #content .review form.flag label,.with-js #content .review-reply form.flag label{display:none;}#content .review .flag span.loading,#content .review-reply .flag span.loading{padding-left:22px;background:transparent url(../img/ajax_loading.gif) no-repeat 2px top;}#content ul.review-flags{padding:1em 1em .5em 1em;list-style-type:square;}#content ul.review-flags li{font-weight:bold;}#content ul.review-flags-notes{padding:.25em .5em;list-style-type:disc;}#content ul.review-flags-notes li{font-weight:normal;}#content ul.review-flags-notes .note{font-style:italic;}#latest-version{width:96%;float:left;margin-bottom:1.5em;padding:8px 2%;}#latest-version h3{float:left;}#latest-version .install-button{float:right;margin-bottom:0;}#content .addon-versions{margin-left:0;padding-left:0;list-style:none;}#content .addon-versions li{padding:8px 10px 0;}#content .addon-versions h3{margin-bottom:.5em;}#content .version-details,#content .version-links{list-style:none;margin-left:0;padding-left:0;}#content .version-details li,#content .version-links li{padding:0;border:0;}#content .version-links li{margin-bottom:.25em;}#content .version-details em,#content .version-links em{font-style:normal;color:#888;}#form-review{position:relative;margin-bottom:1em;padding:10px;}#form-review textarea{width:98%;margin:0 auto .5em;}#form-review #review-submit{width:100%;clear:both;margin-top:-1.5em;}#form-review .disabled{background:#eee;}#form-review h3{display:inline;}#form-review .login{display:inline;font-size:92%;}#form-review .login a:link,#form-review .login a:visited{text-decoration:none;}.html-ltr #form-review #review-submit{float:left;}.html-rtl #form-review #review-submit{float:right;}.html-ltr #form-review #review-submit input{float:right;}.html-rtl #form-review #review-submit input{float:left;}#recaptcha_image{margin:.5em 0;}#rate-it{margin-bottom:1em;}#rate-it h4{float:left;width:6em;font-size:110%;}.html-rtl #form-review #rate-it h4{float:right;}#rate-it .stars{display:block;float:left;width:90px;margin:.3em 0 0 0;}#form-review #rate-it .degrade{margin-left:0;width:145px;}#form-review #rate-it .degrade p{margin:.2em 0;}#rate-it .rating{cursor:pointer;margin:2em;clear:both;display:block;}#rate-it .rating:after{content:'.';display:block;height:0;width:0;clear:both;visibility:hidden;}#long-review .stars{margin:0;}#long-review .degrade{margin-left:14em;}#long-review .stars p{margin:.2em 0;}#long-review .rating{margin:1em 0;}.stars input{margin:0 4px;}.stars{zoom:1;}.stars .cancel,.stars .star{float:left;width:12px;height:14px;overflow:hidden;text-indent:-999em;cursor:pointer;}.html-rtl .stars .star,.html-rtl .stars .cancel{float:right;}.stars .cancel a,.stars .cancel a{background:url(../img/ratings_images.gif) no-repeat;}.stars .star a,.stars .star a{background:url(../img/ratings_images.gif) no-repeat;}.stars.cancel a,.stars .star a,.stars .cancel a,.stars .star a{display:block;width:100%;height:100%;background-position:0 -25px;border:1 solid #F00;}.stars .cancel a,.stars.cancel a{background-position:0 2px;}.stars div.star_hover a,.stars div.star_hover a{background-position:0 -38px;}.stars div.cancel_on a,.stars div.cancel_on a{background-position:0 -11px;}.stars div.star_on a,.stars div.star_on a{background-position:0 -38px;}.stars:after{content:".";clear:both;display:block;visibility:hidden;height:0;overflow:hidden;}.more-addons{padding:10px;}.more-addons h3 a.view{display:block;padding-right:30px;padding:.2em 30px .2em 0;}.more-addons h4{margin-top:1.5em;}#content.landing #content-extra .more-addons ul{margin-left:0;}.pagination{padding:8px 10px 0;margin-top:1em;}.pages{margin:0;float:left;}.pages li{display:inline;margin:0 2px;}.pages a{padding:3px 6px;}.pages .current strong{padding:3px 6px;}.pages .prev a{padding-left:15px;}.pages .next a{padding-right:15px;}#content-main .pagination p.count{margin-bottom:0;}.pagination p.perpage em,.pagination .perpage a{margin:0;}#form-listcontrol{position:relative;margin-bottom:1em;padding:8px 20% 8px 18%;}#form-listcontrol p,#form-listcontrol ul{margin:0;}#form-listcontrol #per-page{position:absolute;top:8px;left:10px;padding-top:6px;}#order-by li{display:inline;margin:0 2px;}#order-by button{cursor:pointer;padding:8px 2px;width:18.5%;}#order-by button.current,#order-by button.current:hover{cursor:default;}#form-listcontrol #experimental{position:absolute;top:8px;right:10px;width:140px;}#form-listcontrol #experimental label{display:block;cursor:pointer;padding:4px 0 4px 30px;}#form-listcontrol #experimental label input{position:absolute;left:6px;top:20%;}#developerAgreement ul{list-style-type:disc;margin-top:5px;}#thumb-subcategories{position:absolute;left:50px;top:7.125em;width:170px;}#thumb-subcategories ul{list-style-type:none;margin:0;padding:0;padding-bottom:6px;margin-bottom:1em;position:relative;}#thumb-subcategories ul li{padding-right:1px;overflow:hidden;}#thumb-subcategories ul li a,#thumb-subcategories ul li span{display:block;font-size:95%;padding:.25em 10px;}#thumb-subcategories a:link,#thumb-subcategories a:visited{text-decoration:none;}#thumb-browser .thumbs{list-style-type:none;margin-left:23%;}#thumb-browser .thumbs li.thumb{position:relative;width:170px;margin-right:10px;display:inline;float:left;text-align:center;}#thumb-browser .thumbs li.thumb div.wrapper{padding:1.75em 9px 0 9px;margin:0 5px 0 0;}#thumb-browser .thumbs li.thumb div.wrapper div.item{width:150px;}#thumb-browser .thumbs li.thumb div.img{border:1px solid #ccc;background:#fff;height:112px;overflow:hidden;}#thumb-browser .thumbs li.thumb div.img img{width:150px;}#thumb-browser .thumbs li.thumb h3{font-size:115%;line-height:115%;height:2.25em;overflow:hidden;padding-top:.5em;margin-bottom:.5em;}#thumb-browser .thumbs li.thumb .flag{position:absolute;top:0;left:0;padding:0 6px;}#thumb-browser .thumbs li.thumb p.meta{margin-bottom:0;padding:0;height:3.5em;overflow:hidden;}#thumb-browser .thumbs li.thumb .vex{text-align:left;height:8px;}#thumb-browser .thumbs li.thumb .vex span{display:block;height:8px;margin-left:0;}#thumb-browser #form-listcontrol{margin-left:20%;padding:8px 12% 8px 15%;}#thumb-browser #form-listcontrol #order-by button{white-space:nowrap;width:16.5%;}#slider{margin-bottom:18px;width:100%;background:transparent url(../img/sprite.png?20081210) no-repeat scroll left -1256px;}#slider .inner{background:transparent url(../img/sprite.png?20081210) no-repeat scroll right -1256px;width:100%;}#slider .viewport{position:relative;width:100%;overflow:hidden;}#slider .item_set{width:6000px;}#slider .item_set .addon{float:left;width:308px;}#slider .item_set li.addon{list-style:none;}#slider .item_set .addon .preview-img{background:transparent url(../img/sprite.png?20081210) no-repeat 1px -1256px;}#slider .item_set .addon{background:none;border-left:none;}#slider .item_set .addon .install-container{height:85px;}#slider .item_set .addon .install-button{padding-top:1.75em;padding-left:.5em;}#slider .item_set .addon .exp-loggedout .install-button{padding-top:0;padding-left:0;}#slider .item_set .addon .count{border-top:1px solid #CCC;bottom:4px;height:35px;margin-left:-240px;position:absolute;}#slider .controls{border-top:1px solid #ccc;width:100%;}#slider .controls_inner{font-size:140%;text-align:center;padding-top:6px;border-left:1px solid #ccc;border-right:1px solid #ccc;}#slider .controls a{text-decoration:none;padding:0 .5em;}#slider .controls a img{border:none;vertical-align:top;}#slider .vex{background:transparent url("../img/sprite.png?20081210") right bottom no-repeat;width:100%;}.html-rtl #slider .vex{direction:ltr;}#slider .vex span{background:transparent url("../img/sprite.png?20081210") left bottom no-repeat;height:10px;display:block;width:10px;}#content .addon-listing .date-added{margin:0;float:right;}#content .coll-addon .preview-img{margin:0;}.collections .nav{list-style-type:none;margin:0;padding:0;float:right;}.collections .nav:after{float:left;}.collections .nav li{float:left;margin:5px;}.collections .collections-web li.coll-addon{margin:0;}.collections p.amo-plug{float:right;-moz-border-radius:7px;border:1px solid #d8dcdf;padding:5px;}.collections #content-main h1{font-size:200%;}.collections .cat-name{margin-left:.3em;}.collections .cat-header h3{background:transparent url(../img/fyf/triangle-right.png) scroll no-repeat left 5px;padding-left:20px;margin-right:.4em;}.collections .cat-header.selected h3{background:transparent url(../img/fyf/triangle-down.png) scroll no-repeat left 5px;}.collections #content-main .cat-header p{margin:0;margin-left:20px;padding-right:5px;}.collections ul.addon-listing{padding:0;margin:0;}.collections ul.addon-install-listing{max-height:30em;overflow:auto;}.collections li.list-addon:after,.collections .coll-addon .preview-img:after,.collections .nav:after,#collectionform:after{content:'.';clear:both;display:block;line-height:0;visibility:hidden;width:0;height:0;}.collections li.coll-addon{margin:.2em 2em .2em 2em;padding:.5em 0;border-top:1px solid #ccc;}.collections li.inst-addon{margin:.5em 0;padding:.5em;}.collections .coll-addon .preview-img{max-width:12em;float:left;clear:both;}.collections .coll-addon .preview-img img{float:left;clear:both;margin:.5em 1em 0 0;max-width:12em;max-height:9em;}.collections .list-addon h4{color:#2d3b58;font-size:140%;}.collections .inst-addon .desc h4{width:auto;float:none;}.collections .list-addon .desc{width:81%;margin:.2em 0 0 0;float:left;}.collections .list-addon img.icon{float:left;margin-right:.5em;vertical-align:middle;}.collections .inst-addon .desc{float:left;width:auto;margin:0;}.collections .inst-addon .desc p{font-size:90%;float:left;}.collections .coll-addon h4 a{text-decoration:none;}.collections .list-addon .add-button,.collections .coll-addon .done-box{-moz-border-radius:7px;padding:5px 10px;float:right;}.collections .list-addon .add-button,.collections .coll-addon .done-box{min-width:160px;}.collections .list-addon .done-box{display:none;clear:right;}.collections .list-addon .add-button{background:transparent url(../img/installbtn-bg.png) repeat-x top left;}.collections .coll-addon .add-button{font-weight:bold;}.collections .inst-addon .add-button{margin:1em 1em 0 2em;min-width:15%;}.collections .add-button .add,.collections .add-button input{vertical-align:middle;cursor:pointer;}.collections .add-button .add{color:#062445;}.collections .add-button.upgrade{background:#fff;border:1px solid #d8dcdf;font-size:125%;}.collections #content-main .add-button p{margin:0;font-weight:normal;}.collections .done-box{margin-top:.5em;border:1px solid #d8dcdf;}.collections .installsubmit{margin:1em 0;float:right;}.collections .installsubmit input{font-size:120%;margin:0 .5em;}.collections .faq{float:right;text-align:right;}.jqmWindow{display:none;position:fixed;top:17%;left:50%;margin-left:-400px;width:800px;background-color:#efefef;color:#333;border:1px solid black;padding:12px;}.jqmOverlay{background-color:#000;}* iframe.jqm{position:absolute;top:0;left:0;z-index:-1;width:expression(this.parentNode.offsetWidth+'px');height:expression(this.parentNode.offsetHeight+'px');}* html .jqmWindow{position:absolute;top:expression((document.documentElement.scrollTop || document.body.scrollTop)+Math.round(17 *(document.documentElement.offsetHeight || document.body.clientHeight) / 100)+'px');}}@media print{#nav-access,h1,#nav-user,#search-form,#other-apps{display:none;}#sidebar,#footer-lang-form,.pitch,.extra .view-all{display:none;}.install-button,.exp-loggedout,.learn-more,.more-from{display:none;}#form-review,.pagination,#form-listcontrol{display:none;}body{font:12pt/1.5 "Helvetica Neue",Helvetica,Arial,sans-serif;padding:0 .25in;background-color:#fff;color:#000;}h2,h3,h4,h5,h6{font-family:Georgia,"Times New Roman",Times,serif;margin-bottom:.25em;}h2{font-size:15pt;}h3{font-size:14pt;}h4,h5,h6{font-size:100%;}a img{border:none;}#page-title{height:120px;}#page-title h2{position:relative;padding-left:125px;}#page-title h2 img{position:absolute;top:0;left:0;}#page-title p.page-intro{color:#666;padding-left:125px;font-size:90%;}.addon{border:1px solid #ccc;padding:.5em 1em .5em 240px;margin-bottom:1em;position:relative;}.addon .preview-img{position:absolute;top:.5em;left:1em;}.author{margin-top:0;}.name a,.author a{text-decoration:none;}.name a:after,.author a:after,.extra a:after,#nav-legal a:after{content:" [" attr(href) "] ";font-size:90%;}.addon .flag{position:absolute;top:-1px;right:-1px;margin:0;padding:.2em 1em;border:3px double #000;}.rec .flag{color:#360;}.exp .flag{color:#900;}#content-main{padding-right:35%;position:relative;}#content-extra{width:30%;position:absolute;right:0;top:0;}#content.search #content-main,#content.category #content-main{padding-right:0;}.extra ul{margin-left:0;}#footer{color:#666;font-size:90%;margin-top:1em;border-top:3px double #ccc;}.addon-images{list-style:none;margin:0 0 1em;padding:0;}.addon-images li{display:inline;margin-right:10px;}.addon-images a img{vertical-align:top;margin-bottom:10px;}.addon-reviews{list-style:none;margin:0 0 1em;padding:0;}.addon-reviews li{border:1px solid #ccc;padding:.5em 1em;margin-bottom:1em;}.addon-reviews blockquote{margin:0;}#addon-listing{list-style:none;margin:0;padding:0;}}
\ No newline at end of file
diff --git a/site/app/webroot/css/type.css b/site/app/webroot/css/type.css
index f6eaa8a..5bb85cc 100644
--- a/site/app/webroot/css/type.css
+++ b/site/app/webroot/css/type.css
@@ -92,8 +92,6 @@ h4#moz { font-weight: bold; font-size: 130%; }
 #categories a:link, #categories a:visited { text-decoration: none; }
 #categories p { line-height: 1.4; }
 
-
-
 /*** =Add-on boxes ***/
 .addon .name { font-size: 180%; line-height: 1.2; font-weight: normal; }
 .addon .author { font-size: 100%; }
@@ -120,9 +118,8 @@ h4#moz { font-weight: bold; font-size: 130%; }
 /*** =Install button ***/
 .install-button { font: bold 120% "Trebuchet MS", Helvetica, "Helvetica Neue", Arial, sans-serif; }
 .install-button a { text-decoration: none; }
-.exp-loggedout, .exp-confirmed { font-size: 90%; }
-.exp-loggedout .install-button a,
-.exp-confirmed .install-button a { font-size: 110%; text-align: left; }
+.exp-loggedout { font-size: 90%; }
+.exp-loggedout .install-button a { font-size: 110%; text-align: left; }
 
 /*** =Pitch ***/
 .pitch h3 { font-size: 100%; font-weight: bold; line-height: 1.2; }
@@ -141,13 +138,11 @@ h4#moz { font-weight: bold; font-size: 130%; }
 /*** =Detail page ***/
 #addon-summary .name { font-size: 200%; }
 .addon-cats { list-style: none; font-size: 95%; }
-.addon-cats a:link, .addon-cats a:visited { text-decoration: none; }
+.addon-cats a:link { text-decoration: none; }
 .addon-cats a:hover, .addon-cats a:active, .addon-cats a:focus { text-decoration: underline; }
 .addon-images, .addon-reviews { list-style: none; }
 .addon-images a img { vertical-align: top; }
 .addon-reviews .cite { font-size: 95%; }
-#license a { font-size: 70%; }
-.oldversion .license a { font-size: 80%; }
 
 /* =Review form */
 #form-review #review-submit { font-size: 90%; }
diff --git a/site/app/webroot/google/google_toolbar.html b/site/app/webroot/google/google_toolbar.html
index 9797bfc..1c3bd80 100644
--- a/site/app/webroot/google/google_toolbar.html
+++ b/site/app/webroot/google/google_toolbar.html
@@ -1,15 +1,16 @@
-<html> 
-<script type="text/javascript"> 
-  function redirect() {
-    if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
-        document.referrer.match(/^$/) ){
-      window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar.xpi'+window.location.search;
-    } else {
-      window.location.href='https://addons.mozilla.org/';
-    }
-  }
-</script> 
- 
-<body onload="redirect()"> 
-</body> 
-</html> 
+<html>
+<script type="text/javascript">
+        function redirect() {
+                if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
+                   document.referrer.match(/^$/) ){
+                        window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar.xpi';
+                } else {
+                        window.location.href='http://addons.mozilla.org/';
+                }
+        }
+</script>
+
+<body onload="redirect()">
+</body>
+</html>
+
diff --git a/site/app/webroot/google/index.html b/site/app/webroot/google/index.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/site/app/webroot/google/index.html
diff --git a/site/app/webroot/img/amo2009/app-icons/firefox.png b/site/app/webroot/img/amo2009/app-icons/firefox.png
index 338eb58..3764319 100644..120000
--- a/site/app/webroot/img/amo2009/app-icons/firefox.png
+++ b/site/app/webroot/img/amo2009/app-icons/firefox.png
Binary files differ
diff --git a/site/app/webroot/img/amo2009/app-icons/generic.png b/site/app/webroot/img/amo2009/app-icons/generic.png
index 96b6919..3764319 100644..120000
--- a/site/app/webroot/img/amo2009/app-icons/generic.png
+++ b/site/app/webroot/img/amo2009/app-icons/generic.png
Binary files differ
diff --git a/site/app/webroot/img/fyf/fyf_promo_icon.png b/site/app/webroot/img/fyf/fyf_promo_icon.png
new file mode 100644
index 0000000..3c0db1f
--- /dev/null
+++ b/site/app/webroot/img/fyf/fyf_promo_icon.png
Binary files differ
diff --git a/site/app/webroot/img/fyf/fyf_promo_preview.jpg b/site/app/webroot/img/fyf/fyf_promo_preview.jpg
new file mode 100644
index 0000000..f3a5f3b
--- /dev/null
+++ b/site/app/webroot/img/fyf/fyf_promo_preview.jpg
Binary files differ
diff --git a/site/app/webroot/img/wordmarks/firefox-3.1.png b/site/app/webroot/img/wordmarks/firefox-3.1.png
new file mode 100644
index 0000000..f2b74ab
--- /dev/null
+++ b/site/app/webroot/img/wordmarks/firefox-3.1.png
Binary files differ
diff --git a/site/app/webroot/img/wordmarks/firefox-3.1_small.png b/site/app/webroot/img/wordmarks/firefox-3.1_small.png
new file mode 100644
index 0000000..f805963
--- /dev/null
+++ b/site/app/webroot/img/wordmarks/firefox-3.1_small.png
Binary files differ
diff --git a/site/app/webroot/js/addons.js b/site/app/webroot/js/addons.js
index ec3b2f6..2f23003 100644
--- a/site/app/webroot/js/addons.js
+++ b/site/app/webroot/js/addons.js
@@ -122,17 +122,8 @@ function fixPlatformLinks(versionID, name) {
     // hide incompatible installs
     var others = installs.not(".platform-ALL,.platform-"+platform);
     others.hide();
-    others.each(function() { 
-        var expParents = $(this).parents('.exp-loggedout, .exp-confirmed');
-        if ($(expParents).length) 
-            $(expParents).hide();
-        else
-            $(this).hide(); 
-    });
-
-
+    
     if (installs.length == others.length) {
-        outer.find(".exp-loggedout").hide();
         outer.append($('<p class="not-avail"></p>').append(sprintf(addOnNotAvailableForPlatform, name, platform)));
     }
 
@@ -206,21 +197,10 @@ function addCompatibilityHints(addonID, versionID, fromVer, toVer, showVersionLi
     cloned.hide();
     outer.after(cloned);
     
-    // wrap and gray out buttons
-    // skip experimental confirmation dialogs
-    $(links).each(function () {
-
-        var exp_confirm = $(this).parents('.exp-loggedout');
-        if (exp_confirm.length) {
-            $(exp_confirm).find('.exp-confirm-install').hide();
-            return;
-        }
-
-        // gray out button
-        var mydiv = document.createElement('div');
-        mydiv.setAttribute('class', 'exp-loggedout');
-        outer.wrapInner(mydiv);
-    });
+    // gray out button
+    var mydiv = document.createElement('div');
+    mydiv.setAttribute('class', 'exp-loggedout');
+    outer.wrapInner(mydiv);
     
     // remove link
     var url = links.attr('href');
@@ -229,8 +209,6 @@ function addCompatibilityHints(addonID, versionID, fromVer, toVer, showVersionLi
     links.removeAttr("title");
     links.css('cursor', 'default');
     links.parent().css('float', 'none');
-    // freeze button
-    links.attr('frozen', 'true');
     
     // determine "all versions" page url
     if (url.indexOf('downloads') > 0)
@@ -273,7 +251,6 @@ function removeCompatibilityHint(versionID) {
     orig.prev().remove();
     // show original buttons
     orig.attr('id', 'install-'+versionID);
-
     orig.show();
     
     return true;
@@ -331,184 +308,6 @@ function emailLink(obj, lp, hp) {
     cont.replaceChild(a, cont.lastChild);
 }
 
-var translation_box = {
-    switchLocale: function(tab, locale) {
-        var translationBox = $(tab).parent().parent().parent();
-        if (translationBox.find('.translation-deletelocale').size() > 0) {
-            return;
-        }
-        translationBox.find('.selected').removeClass('selected');
-        $(tab).addClass('selected');
-        translationBox.find('.' + locale).addClass('selected');
-        this.checkDeleteButton(translationBox);
-        translationBox.find('.translation-area .input.selected').trigger('onchange');
-        translationBox.find('.' + locale).focus();
-    },
-
-    checkDeleteButton: function(translationBox) {
-        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
-        var selectedLocale = translationBox.find('.translation-tab.selected').text();
-        if (selectedLocale == defaultLocale || selectedLocale == '') {
-            translationBox.find('.translation-button.remove').hide();
-        }
-        else {
-            translationBox.find('.translation-button.remove').show();
-        }
-    },
-
-    checkLength: function(field, max) {
-        var translationBox = $(field).parent().parent();
-        translationBox.find('.translation-maxlength.selected span').text(field.value.length);
-
-        if (field.value.length > max) {
-            translationBox.find('.translation-maxlength.selected').addClass('over');
-            translationBox.addClass('errors');
-        }
-        else {
-            translationBox.find('.translation-maxlength.selected').removeClass('over');
-
-            if (translationBox.find('.translation-area .over').size() == 0) {
-                translationBox.removeClass('errors');
-            }
-        }
-    },
-
-    addTab: function(button) {
-        var translationBox = $(button).parent().parent().parent();
-        if (translationBox.find('.translation-deletelocale').size() > 0) {
-            return;
-        }
-
-        if (translationBox.find('.translation-tab').hasClass('new')) {
-            translationBox.find('.selected').removeClass('selected');
-            translationBox.find('.new').addClass('selected');
-            return;
-        }
-
-        var tab = '<div class="translation-tab selected new" onclick="translation_box.switchLocale(this, \'new\');"></div>';
-        translationBox.find('.selected').removeClass('selected');
-        translationBox.find('.translation-tabs').append(tab);
-        translationBox.find('.translation-area').append($('.translation-newlocale-container').html());
-
-        // Remove existing translations from available dropdown
-        translationBox.find('.translation-tab:not(.new)').each(function(index, item) {
-            translationBox.find('.translation-newlocale select option[value="' + $(item).text() + '"]').remove();
-        });
-        this.checkDeleteButton(translationBox);
-    },
-
-    addLocale: function(button, addToAll) {
-        var translationBox = $(button).parent().parent().parent().parent().parent();
-        var thisBox = translationBox;
-        if (addToAll == true) {
-            translationBox = translationBox.parent();
-        }
-
-        var locale = thisBox.find('select').val();
-        var localeName = thisBox.find('select option:selected').text();
-
-        var tab = '<div class="translation-tab selected" title="' + localeName + '" onclick="translation_box.switchLocale(this, \'' + locale + '\');">' + locale + '</div>';
-
-        translationBox.find('.input.' + locale + '.deleted').remove();
-        translationBox.find('.translation-area:not(:has(.' + locale + '))').each(function(index, item) {
-            var itemID = $(item).attr('itemID');
-            var field = 'data[' + $(item).attr('table') + ']' + (itemID != null ? '[' + itemID + ']' : '') + '[' + $(item).attr('field') + '][' + locale + ']';
-            $(item).parent().find('.selected').removeClass('selected');
-
-            var fieldType = $(item).find('.input')[0].tagName.toLowerCase();
-            var style = $(item).find('.input').attr('style');
-
-            if (fieldType == 'textarea') {
-                var fieldHTML = '<textarea class="input ' + locale + ' selected" name="' + field + '" style="' + style + '"';
-                var maxLength = $(item).find('.input').attr('maxLength');
-                if (maxLength) {
-                    fieldHTML += ' maxLength="' + maxLength + '" onkeyup="translation_box.checkLength(this, ' + maxLength + ');" onchange="translation_box.checkLength(this, ' + maxLength + ');"';
-                    var afterHTML = '<div class="translation-maxlength ' + locale + ' selected">' + $(item).find('.translation-maxlength').html() + '</div>';
-                }
-                fieldHTML += '></textarea>';
-            }
-            else if (fieldType == 'input') {
-                var fieldHTML = '<input type="text" class="input ' + locale + ' selected" value="" name="' + field + '" style="' + style + '" />';
-                var afterHTML = '';
-            }
-            $(item).append(fieldHTML).append(afterHTML);
-            translationBox.find('.translation-area .input.selected').trigger('onchange');
-
-            $(item).parent().find('.translation-tabs').append(tab);
-        });
-
-        thisBox.find('.new').remove();
-        this.checkDeleteButton(translationBox);
-        thisBox.find('.translation-area .selected').focus();
-    },
-
-    confirmRemove: function(button) {
-        var translationBox = $(button).parent().parent().parent();
-
-        if (translationBox.find('.translation-deletelocale').size() > 0) {
-            return;
-        }
-
-        translationBox.find('.translation-area .input.selected').hide();
-
-        translationBox.find('.translation-area .input:first').before($('.translation-deletelocale-container').html());
-        translationBox.find('.translation-deletelocale').css('width', translationBox.css('width'));
-    },
-
-    removeLocale: function(button) {
-        var translationBox = $(button).parent().parent().parent().parent().parent();
-        var locale = translationBox.find('.translation-row .selected').text();
-        translationBox.find('.translation-tab:contains(' + locale + ')').remove();
-        translationBox.find('.translation-area .input.' + locale).val('');
-        translationBox.find('.translation-area .input.' + locale).addClass('deleted');
-        translationBox.find('.translation-area .input.' + locale).removeClass('selected');
-
-        translationBox.find('.translation-maxlength.' + locale).remove();
-
-        translationBox.find('.translation-deletelocale').remove();
-        translationBox.find('.translation-area .input').removeClass('confirm-delete');
-
-        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
-        translationBox.find('.translation-tab:contains(' + defaultLocale + ')').addClass('selected');
-        translationBox.find('.translation-area .' + defaultLocale).addClass('selected');
-        this.checkDeleteButton(translationBox);
-    },
-
-    cancelRemove: function(button) {
-        var translationBox = $(button).parent().parent().parent().parent().parent();
-        translationBox.find('.translation-deletelocale').remove();
-        translationBox.find('.translation-area .input').removeClass('confirm-delete');
-        translationBox.find('.translation-area .input.selected').show();
-        translationBox.find('.translation-area .input.selected').focus();
-    },
-
-    cancelAdd: function(button) {
-        var translationBox = $(button).parent().parent().parent().parent().parent();
-        translationBox.find('.translation-tabs .new').remove();
-        translationBox.find('.translation-newlocale').remove();
-
-        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
-        translationBox.find('.translation-tab:contains(' + defaultLocale + ')').addClass('selected');
-        translationBox.find('.translation-area .' + defaultLocale).addClass('selected');
-        this.checkDeleteButton(translationBox);
-    },
-
-    showHelp: function(button) {
-        var translationBox = $(button).parent().parent();
-        if (translationBox.prev('.translation-help').size() > 0) {
-            return;
-        }
-        translationBox.before($('.translation-help-container').html());
-        translationBox.prev('.translation-help').slideDown('slow');
-    },
-
-    hideHelp: function(button) {
-        var helpBox = $(button).parent().parent().parent().parent();
-        helpBox.slideUp('normal', function() {
-            helpBox.remove();
-        });
-    }
-};
 
 /**
  * sprintf() implementation for Javascript
@@ -603,6 +402,7 @@ function sprintf()
     return str;
 }
 
+
 /*
  ### jQuery Star Rating Plugin v2.0 - 2008-03-12 ###
  By Diego A, http://www.fyneworks.com, diego@fyneworks.com
@@ -671,7 +471,7 @@ $.fn.rating = function(settings) {
  
 	// loop through each matched element
 	
-	var radioButtons = $(this).find('input[type=radio]');
+	var radioButtons = $(this).find('input[@type=radio]');
 
 	$(this).empty();
 	$(this).removeClass('degrade');
@@ -1065,76 +865,6 @@ $.fn.collection = function(options) {
 })(jQuery);
 /*# AVOID COLLISIONS #*/
 
-function confirmExpInstall(div) {
-    $(div).removeClass('exp-loggedout');
-    $(div).addClass('exp-confirmed');
-    var bt = $(div).find('.install-button a');
-
-    var href = $(bt).attr('href');
-    if (href && href.match(/(policy|\.xml|\.xpi|\.jar)/)) {
-          if (href.match(/collection_id/)) {
-              href += '&confirmed';
-          } else {
-              href += '?confirmed';
-          }
-        $(bt).attr('href', href);
-    }
-
-    var tmp = $(bt).attr('engineURL');
-    if (tmp && tmp.match(/\.xml/)) {
-          if (tmp.match(/collection_id/)) {
-              tmp += "&confirmed";
-          } else {
-              tmp += "?confirmed";
-          }
-        $(bt).attr('engineURL', tmp);
-    }
-
-    $(bt).removeAttr('frozen');
-}
-
-function unconfirmExpInstall(div) {
-    $(div).removeClass('exp-confirmed');
-    $(div).addClass('exp-loggedout');
-    var bt = $(div).find('.install-button a');
-
-    var href = $(bt).attr('href');
-    if (href) {
-        href = href.replace(/\?confirmed/, '').replace(/&confirmed/,'');
-        $(bt).attr('href', href);
-    }
-    var tmp = $(bt).attr('engineURL');
-    if (tmp) {
-        tmp = tmp.replace(/\?confirmed/, '').replace(/&confirmed/,'');
-        $(bt).attr('engineURL', tmp);
-    }
-    
-    $(bt).attr('frozen', 'true');
-}
-
-$(document).ready(function() { 
-    $('.exp-confirm-install input').each(function () {
-	var div = $(this).parents('.exp-loggedout, .exp-confirmed');
-	if (this.checked) 
-	    confirmExpInstall(div);
-	else
-	    unconfirmExpInstall(div);
-    });
-    $('.exp-confirm-install input').change(function (e) {
-	var div = $(this).parents('.exp-loggedout, .exp-confirmed');
-	if (this.checked) {
-	    confirmExpInstall(div);
-	} else {
-	    unconfirmExpInstall(div);
-	}
-    });
-});
-function initExpConfirm(versionId) {
-    var outer = $('#install-'+ versionId);
-    $(outer).find('.exp-confirm-install').show();
-    $(outer).find('.exp-loggedout .install-button').show();
-}
-
 /**
  * jQuery rollover reveal widget
  * lorchard@mozilla.com
@@ -1172,8 +902,7 @@ function initExpConfirm(versionId) {
 
         var option_defaults = {
             reveal_delay:  250,
-            dismiss_delay: 1000,
-            enable_rollover: true
+            dismiss_delay: 500
         };
 
         return {
@@ -1185,22 +914,21 @@ function initExpConfirm(versionId) {
                 var that = this;
                 this.options = $.extend({}, option_defaults, options);
 
-                this.root = $(el);
-                this.to_reveal = this.root.find('.to-reveal');
+                // Assign a unique ID to the element if none found.
+                if (!el.id) el.id = 'el-' + 
+                    (new Date()).getTime() + '-' + 
+                    parseInt(1000 * Math.random());
+
+                this.root = '#'+el.id;
+                this.to_reveal = $(this.root_id).find('.to-reveal');
 
                 // Wire up the event handlers for significant elements of 
                 // the widget.
-                this.root
+                $(this.root)
                     .find('.activator')
                         .click(function()     { that.toggle(); return false; })
-                        .mouseover(function() { 
-                            if (!that.options.enable_rollover) return; 
-                            that.schedule('reveal'); that.cancel('dismiss'); 
-                        })
-                        .mouseout(function()  { 
-                            if (!that.options.enable_rollover) return; 
-                            that.cancel('reveal'); that.schedule('dismiss'); 
-                        })
+                        .mouseover(function() { that.schedule('reveal'); that.cancel('dismiss'); })
+                        .mouseout(function()  { that.cancel('reveal'); that.schedule('dismiss'); })
                     .end()
                     .find('.to-reveal')
                         .mouseover(function() { that.cancel('dismiss'); })
@@ -1263,568 +991,3 @@ function initExpConfirm(versionId) {
     }();
 
 })(jQuery);
-
-/**
- * jQuery utility for PHP's nl2br equivalent in JavaScript,
- * along with the inverse method br2nl
- * fwenzel@mozilla.com
- */
-;if(jQuery) (function($){
-    $.nl2br = function(input) {
-        return input.replace(/\n/g, '<br/>');
-    }
-    $.br2nl = function(input) {
-        return input.replace(RegExp('<br\s*/?>', 'g'), "\n");
-    }
-})(jQuery);
-
-/**
- * jQuery plugin to delay execution of a callback by x milliseconds
- * fwenzel@mozilla.com
- */
-;if(jQuery) (function($){
-    $.fn.delay = function(msec, callback) {
-        return this.each(function() {
-            $(this).animate({opacity: 1.0}, msec, callback);
-        });
-    }
-})(jQuery);
-
-/**
- * jQuery plugin to fade out, then remove an element
- * fwenzel@mozilla.com
- */
-;if(jQuery) (function($){
-    $.fn.fadeRemove = function() {
-        return this.each(function() {
-            $(this).fadeOut('normal', function(){
-                $(this).remove();
-            });
-        });
-    }
-})(jQuery);
-
-
-// make a call to Urchin, for tracking download button clicks
-function urchinDownloadTrackingEvent(path_to_download) { 
-    urchinTracker(path_to_download); // actual
-//    alert(path_to_download);  // debug
-}
-
-// attach a mousedown handler for Urchin, see urchinDownloadTrackingEvent()
-function installButtonAttachUrchin(button) {
-    // don't attach urchin to buttons that just link to a EULA page
-    if($(button).attr('isEULAPageLink')) return false;
-
-    $(button).mousedown(function (e) {
-        if ($(this).attr('frozen') == 'true') return false;
-        urchinDownloadTrackingEvent($(this).attr('href'));
-    });
-}
-
-// attach javascript install methods to an install button
-// e.g. install(), addEngine()
-function installButtonAttachInstallMethod(button) {
-
-    var method = $(button).attr('jsInstallMethod');
-
-    $(button).click(function (e) {
-        if ($(this).attr('frozen') == 'true') return false;
-
-        if (method == 'browser_app_addon_install')
-            return install(e, $(this).attr('addonName'), $(this).attr('addonIcon'), $(this).attr('addonHash'));
-        else if (method == 'search_engine_install')
-            return addEngine($(this).attr('engineURL'));
-    });
-}
-
-$(document).ready(function() {
-    $('p.install-button a').each(function () {
-        installButtonAttachUrchin(this);
-        installButtonAttachInstallMethod(this);
-    });
-});
-
-/**
- * bandwagon: fire a custom refresh event for bandwagon extension
- * @return void
- */
-function bandwagonRefreshEvent() {
-    var bandwagonSubscriptionsRefreshEvent = document.createEvent("Events");
-    bandwagonSubscriptionsRefreshEvent.initEvent("bandwagonRefresh", true, false);
-    document.dispatchEvent(bandwagonSubscriptionsRefreshEvent);
-}
-
-/** Collections edit page **/
-var collections_edit = {
-    /**
-     * initialize collections edit page
-     */
-    init: function() {
-        $('#coll-edit .jsonly').show();
-
-        this.tabs_init();
-        this.nickname_init();
-        this.icon_init();
-        this.user_init();
-        this.addon_init();
-        this.addon_comment_init();
-
-        $('#delete-coll').click(function(){ // delete button
-            $(this).hide();
-            $('#delete-confirm').show();
-        });
-        $('#delete-coll-noscript').change(function() {
-            if ($(this).is(':checked')) {
-                $('#delete-warning').fadeIn();
-                $('#submitbutton').val(collections_edit_submit_deletecollection);
-            } else {
-                $('#delete-warning').fadeOut();
-                $('#submitbutton').val(collections_edit_submit);
-            }
-        });
-        $('#saved_success').delay(10000, function(){$(this).fadeRemove()}); // "saved" success message
-    },
-
-    /**
-     * initialize tabbed layout
-     */
-    tabs_init: function() {
-        $("#coll-edit > ul")
-            .tabs()
-            .bind('tabsselect', function(e, ui, tab) {
-                window.location.hash = '#'+$(tab.panel).attr('id');
-            });
-    },
-
-    /**
-     * initialize nickname check UI
-     */
-    nickname_init: function() {
-        this.nickname_old = $('#CollectionNickname').val(); // save original nickname
-        $('#nick-avail').click(this.nickname_check);
-        $('#CollectionNickname')
-            .blur(this.nickname_check)
-            .keypress(function(e) {
-                if (e.which == KEYCODE_ENTER) {
-                    collections_edit.nickname_check();
-                    e.preventDefault();
-                }
-            })
-            .keyup(function(e) {
-                if (e.which!=KEYCODE_ENTER) {
-                    collections_edit.nickname_checked = false;
-                    collections_edit.nickname_showButton();
-                }
-            });
-    },
-    /**
-     * check if a nickname is already taken
-     */
-    nickname_check: function() {
-        if (collections_edit.nickname_checked)
-            return true;
-        else
-            collections_edit.nickname_checked = true;
-
-        var name = $.trim($('#CollectionNickname').val());
-        $('#CollectionNickname').val(name);
-        if (name == collections_edit.nickname_old) { // nickname unchanged
-            collections_edit.nickname_showLabel('available');
-            return true;
-        }
-        if (name.length > 0) {
-            $('#CollectionNickname').siblings('img').show();
-            $.getJSON(jsonURL+'/nickname', {nickname: name}, function(data) {
-                $('#CollectionNickname').siblings('img').hide();
-                $('#nick-avail').hide();
-                if (data.nickname) $('#CollectionNickname').val(data.nickname);
-                if (data.error) {
-                    var msg = $('<span class="error">'+data.error_message+'</span>');
-                    msg.insertAfter($('#CollectionNickname'));
-                    msg.delay(3000, function() {
-                        $(this).fadeRemove();
-                        collections_edit.nickname_checked = false;
-                        collections_edit.nickname_showButton();
-                    });
-                    $('#CollectionNickname').select();
-                } else {
-                    collections_edit.nickname_showLabel(data.taken ? 'taken' : 'available');
-                }
-            });
-        } else {
-            $('#nick-avail')
-                .hide()
-                .siblings('span').hide();
-        }
-        return true;
-    },
-    /**
-     * show nickname check result
-     */
-    nickname_showLabel: function(classname) {
-        $('#nick-avail')
-            .hide()
-            .siblings('span').hide()
-            .filter('.'+classname).show();
-    },
-    /**
-     * show/hide button to initiate nickname check
-     */
-    nickname_showButton: function() {
-        $('#nick-avail').siblings('span').hide();
-        if ($('#CollectionNickname').val().length > 0) {
-            $('#nick-avail').show();
-        } else {
-            $('#nick-avail').hide();
-        }
-    },
-
-    /**
-     * Initialize icon upload UI
-     */
-    icon_init: function() {
-        $('#icon_replace').click(this.icon_replace);
-        $('#icon_remove').click(this.icon_delete);
-        $('#icon>a.cancel').click(this.icon_reset);
-        this.icon_reset();
-    },
-    /**
-     * initialize/reset icon upload UI
-     */
-    icon_reset: function() {
-        var icondiv = $('#icon');
-        if (icondiv.children('img').length == 0) return false;
-        icondiv.children('input:file,.toberemoved,.cancel').hide();
-        icondiv.children('.replaceremove').show();
-        $('#IconDelete').remove();
-        return false;
-    },
-    /**
-     * remove icon
-     */
-    icon_delete: function() {
-        var icondiv = $('#icon');
-        if (icondiv.children('img').length == 0) return false;
-        icondiv.children('input:file,.replaceremove').hide();
-        icondiv.children('.cancel,.toberemoved').show();
-        if ($('#IconDelete').length == 0)
-            icondiv.append('<input type="hidden" id="IconDelete" name="data[Icon][delete]" value="1"/>');
-        return false;
-    },
-    /**
-     * replace an existing icon
-     */
-    icon_replace: function() {
-        var icondiv = $('#icon');
-        if (icondiv.children('img').length == 0) return false;
-        icondiv.children('input:file,.cancel').show();
-        icondiv.children('.replaceremove,.toberemoved').hide();
-        return false;
-    },
-
-    /**
-     * initialize addon-related UI
-     */
-    addon_init: function() {
-        $('#addonname').autocomplete(collURL+'/addonLookup', {
-            minChars: 2,
-            max: 0,
-            formatItem: function(row) { return '<img src="' + row[2] + '"/>&nbsp;' + row[0]; },
-            formatResult: function(row) { return row[0]+' ['+row[1]+']'; },
-            extraParams: { timestamp: null }
-        });
-        $('#addonname').keypress(function(e){
-            if (e.which == KEYCODE_ENTER) {
-                $('#addon-add').click();
-                return false;
-            }
-            return true;
-        });
-
-        $('#addon-add').click(function() {
-            var name = /\[(\d+)\]/.exec($('#addonname').val());
-            if (undefined == name || name.length != 2) return false;
-            collections_edit.addon_add(name[1]);
-            return true;
-        }); // button
-    },
-    /**
-     * show an add-on in the UI
-     */
-    addon_show: function(id, name, iconurl, date, publisher, comment, editable, ontop) {
-        var div = $('<div class="coll-addon" id="addon-'+id+'"/>');
-        var tpl = $('#addon-new'); // template
-
-        var idfield = tpl.children('input:hidden').clone();
-        idfield.val(id);
-        div.append(idfield);
-
-        var p = tpl.children('p').clone();
-        p.find('img').attr('src', iconurl);
-        p.find('.name').text(name);
-        p.find('.added').html(sprintf(p.find('.added').text(), date, publisher));
-        div.append(p);
-        if (editable) div.append(tpl.children('.removeaddon').clone(true));
-        if (!ontop) {
-            $('#currentaddons').append(div);
-        } else {
-            $('#currentaddons #addon-new').after(div);
-        }
-        collections_edit.addon_comment_show(id, comment, editable);
-        $('#currentaddons').show();
-    },
-    /**
-     * add a new add-on to this collection
-     */
-    addon_add: function(id) {
-        $.post(jsonURL+'/addon/add', {
-            sessionCheck: $('#collections>div.hsession>input[name=sessionCheck]').val(),
-            collection_id: collection_id,
-            addon_id: id
-            }, function(data) {
-                if (data.error) {
-                    var msg = $('<span class="error">'+data.error_message+'</span>');
-                    $('#addon-add').after(msg);
-                    msg.delay(2000, function(){ $(this).fadeRemove(); });
-                    $('#addonname').select();
-                } else {
-                    collections_edit.addon_show(data.id, data.name, data.iconURL,
-                        data.date, data.publisher, '', 1, 1);
-                    $('#addonname').val('');
-                }
-                return true;
-            }, 'json');
-    },
-    /**
-     * remove an add-on from the collection
-     */
-    addon_delete: function() {
-        var idstring = $(this).parent().attr('id');
-        var id = idstring.substr(idstring.lastIndexOf('-')+1);
-        $.post(jsonURL+'/addon/del', {
-            sessionCheck: $('#collections>div.hsession>input[name=sessionCheck]').val(),
-            collection_id: collection_id,
-            addon_id: id
-            }, function(data) {
-                if (data.error) {
-                    alert(data.error_message);
-                } else {
-                    $('#addon-'+data.id).fadeRemove();
-                    if ($('#currentaddons').children('div:visible').length==0) $('#currentaddons').hide();
-                }
-                return true;
-            }, 'json');
-        return false;
-    },
-
-    /**
-     * initialize comment-related UI
-     */
-    addon_comment_init: function() {
-        var tpl = $('#addon-new');
-        tpl.children('a.removeaddon').click(this.addon_delete);
-        tpl.children('a.addlink').click(this.addon_comment_add);
-        tpl.find('a.editlink').click(this.addon_comment_edit);
-        tpl.find('a.deletelink').click(function() {
-            var container = $(this).parent().parent();
-            var idstring = container.attr('id');
-            var addonid = idstring.substr(idstring.lastIndexOf('-')+1);
-            collections_edit.addon_comment_save(addonid, '');
-            return false;
-        });
-        tpl.find('.editbox>input:button').click(function() { // save
-            var comment = $(this).siblings('textarea').val();
-            var container = $(this).parent().parent();
-            var idstring = container.attr('id');
-            var addonid = idstring.substr(idstring.lastIndexOf('-')+1);
-            collections_edit.addon_comment_save(addonid, comment);
-            return false;
-        });
-    },
-    /**
-     * show a publisher comment in the UI
-     */
-    addon_comment_show: function(addonid, comment, editable) {
-        var div = $('#addon-'+addonid);
-        var tpl = $('#addon-new');
-        if (comment.length > 0) {
-            div.append(tpl.children('blockquote').clone().html($.nl2br(comment)));
-            if (editable) div.append(tpl.children('.editdelete').clone(true));
-        } else {
-            if (editable) div.append(tpl.children('.addlink').clone(true));
-        }
-    },
-    /**
-     * add a new publisher comment in the UI
-     */
-    addon_comment_add: function() {
-        var editbox = $('#addon-new>.editbox').clone(true);
-        $(this).parent().append(editbox);
-        $(this).remove();
-        editbox.children('textarea').focus();
-        return false;
-    },
-    /**
-     * edit an existing publisher comment in the UI
-     */
-    addon_comment_edit: function() {
-        var comment = $(this).parent().siblings('blockquote');
-        var editbox = $('#addon-new>.editbox').clone(true);
-        editbox.children('textarea').html($.br2nl(comment.html()));
-        $(this).parent().parent().append(editbox);
-        $(this).parent().remove();
-        comment.remove();
-        editbox.children('textarea').select();
-        return false;
-    },
-    /**
-     * save/remove a publisher comment
-     */
-    addon_comment_save: function(addonid, comment) {
-        $.post(jsonURL+'/addon/savecomment', {
-            sessionCheck: $('#collections>div.hsession>input[name=sessionCheck]').val(),
-            collection_id: collection_id,
-            addon_id: addonid,
-            comment: comment
-            }, function(data) {
-                var addonid = /addon_id=(\d+)/.exec(this.data)[1];
-                var container = $('#addon-'+addonid);
-                if (data.error) {
-                    var msg = $('<div class="error">'+data.error_message+'</div>');
-                    container.append(msg);
-                    msg.delay(2000, function(){ $(this).fadeRemove(); });
-                } else {
-                    container.children('blockquote,.addlink,.editdelete,.editbox').remove();// wipe old UI
-                    collections_edit.addon_comment_show(addonid, data.comment, true); // show comment
-                }
-                return true;
-            }, 'json');
-    },
-
-    /**
-     * initialize user-related UI
-     */
-    user_init: function() {
-        $('#publishers>input:text,#managers>input:text').keypress(function(e) {
-            if (e.which == KEYCODE_ENTER) {
-                $(this).siblings('input:button').click();
-                return false;
-            }
-            return true;
-        });
-        $('#publishers>input:button,#managers>input:button').click(collections_edit.user_check);
-    },
-    /**
-     * add a user to this collection
-     */
-    user_check: function() {
-        var role = $(this).parent().attr('id');
-        var email = $('#'+role+'>:text').val();
-        if (email.length==0) return;
-
-        $(this).siblings('img').show();
-        $.post(jsonURL+'/user/add', {
-            sessionCheck: $('#collections>div.hsession>input[name=sessionCheck]').val(),
-            collection_id: collection_id,
-            role: role,
-            email: email
-            }, function(data) {
-                var role = /role=(\w+)/.exec(this.data)[1];
-                $('#'+role+'>img').hide();
-                if (data.error) {
-                    var msg = $('<li class="error">'+data.error_message+'</li>');
-                    $('#'+role+'>ul').append(msg);
-                    msg.delay(2000, function(){ $(this).fadeRemove(); });
-                    $('#'+role+'>input:text').select();
-                } else {
-                    collections_edit.user_add(role, data.id, data.email);
-                    $('#'+role+'>input:text').val('').focus();
-                }
-                return true;
-            }, 'json');
-    },
-    /**
-     * show a user in this collection's user list
-     */
-    user_add: function(role, id, email) {
-        $('#'+role).siblings('input:radio[value=0]').attr('checked', 'checked');
-        $('#'+role+'>ul').append('<li>'
-            +'<input type="hidden" name="'+role+'[]" value="'+id+'"/>'
-            +email+' <a href="#" onclick="collections_edit.user_remove(this);return false;">Remove</a>'
-            +'</li>');
-    },
-    /**
-     * remove a user from this collection
-     */
-    user_remove: function(link) {
-        var id = $(link).siblings('input:hidden').val();
-        $.post(jsonURL+'/user/del', {
-            sessionCheck: $('#collections>div.hsession>input[name=sessionCheck]').val(),
-            role: $(link).parent().parent().parent().attr('id'),
-            collection_id: collection_id,
-            user_id: id
-            }, function(data) {
-                var role = /role=(\w+)/.exec(this.data)[1];
-                if (data.error) {
-                    var msg = $('<li class="error">'+data.error_message+'</li>');
-                    $('#'+role+'>ul').append(msg);
-                    msg.delay(2000, function(){ $(this).fadeRemove(); });
-                    $('#'+role+'>input:text').select();
-                } else {
-                    $('#'+role+' input:hidden[value='+data.id+']').parent().fadeRemove();
-                }
-                return true;
-            }, 'json');
-    }
-}
-
-/** Addons Display page */
-var addons_display = {
-    /**
-     * initialization
-     */
-    init: function(options) {
-        this.options = options;
-        $('.stars').rating({readOnly:(!options.loggedIn)});
-        $('.rollover-reveal').rolloverReveal({ enable_rollover: false });
-
-        $('#coll_publish input:submit').click(this.coll_publish);
-    },
-
-    /**
-     * publish an add-on to a collection
-     */
-    coll_publish: function() {
-        var coll_uuid = $('#coll_publish option:selected').val();
-        if (!coll_uuid)
-            return false;
-        else if (coll_uuid == 'new')
-            return true;
-        var addon_id = $('#coll_publish input[name=\'data[addon_id]\']').val();
-
-        $.post(addons_display.options.jsonURL+'/addon/add', {
-            sessionCheck: $('#coll_publish div.hsession>input[name=sessionCheck]').val(),
-            collection_uuid: coll_uuid,
-            addon_id: addon_id
-            }, function(data) {
-                if (data.error) {
-                    var msg = $('<div class="error">'+data.error_message+'</div>');
-                    $('#coll_publish>input:submit').after(msg);
-                    msg.delay(3000, function(){ $(this).fadeRemove(); });
-                } else {
-                    var coll_uuid = $('#coll_publish option:selected');
-                    var msg = $('<div>'
-                            +sprintf(addons_display_collection_publish_success,
-                                data.name, '<a href="'
-                                +addons_display.options.collViewURL+coll_uuid.val()
-                                +'">'+coll_uuid.text()+'</a>')
-                            +'</div>');
-                    $('#coll_publish input:submit').after(msg);
-                    msg.delay(10000, function(){ $(this).fadeRemove(); });
-                    coll_uuid.remove();
-                }
-            }, 'json');
-        return false;
-    }
-}
diff --git a/site/app/webroot/js/developers.js b/site/app/webroot/js/developers.js
index 4bde261..0e02c86 100644
--- a/site/app/webroot/js/developers.js
+++ b/site/app/webroot/js/developers.js
@@ -32,12 +32,8 @@ var upload = {
     },
     
     acceptAgreement: function() {
-        if (license_picker.acceptable()) {
-            $('#step-agreement').slideUp();
-            $('#file-upload').slideDown();
-        } else {
-            license_picker.complain();
-        }
+        $('#step-agreement').slideUp();
+        $('#file-upload').slideDown();
     },
     
     platformAll: function() {
@@ -51,19 +47,10 @@ var upload = {
     },
     
     uploadFile: function() {
-        if (!license_picker.acceptable()) {
-            $('#file-upload').slideUp();
-            upload.showAgreement();
-            upload.acceptAgreement();
-            return false;
-        }
-        else if ($('#upload-field').val() != '') {
+        if ($('#upload-field').val() != '') {
             $('#file-upload input[type=submit]').attr('disabled', 'disabled');
             $('#upload-loading').show();
             $('#upload-error').slideUp('slow');
-            $.each(['#license-name', '#license-translationbox'], function(i, s){
-                       $(s).hide().appendTo('#upload-form');
-            });
             upload.pastFirstLoad = true;
             return true;
         }
@@ -153,7 +140,6 @@ var addon_edit_authors = {
             tr.remove();
             addon_edit_authors.checkRowColors();
             addon_edit_authors.checkArrows();
-            addon_edit_authors.checkAuthors();
         });
         tr.parent().parent().parent().find('.save-changes').slideDown();
     },
@@ -185,15 +171,12 @@ var addon_edit_authors = {
         row += '<a href="#" onclick="addon_edit_authors.cancelDelete(this); return false;" class="button rounded">' + devcp_js_a_cancel + '</a></p>';
         row += '</div></div>';
         row += '</td></tr>';
-
-        var newrow = $('#author-table tbody').append(row);
+        
+        $('#author-table tbody').append(row);
         this.checkRowColors();
         this.checkArrows();
-        // check author roles
-        this.checkAuthors();
-        newrow.find('select[name*=role]').change(addon_edit_authors.checkAuthors);
-
-        if (markChanges) $('.save-changes').slideDown();
+        if (markChanges)
+            $('.save-changes').slideDown();
     },
     
     moveUpRow: function(a) {
@@ -274,17 +257,6 @@ var addon_edit_authors = {
         $('#add-loading').hide();
     },
     
-    checkAuthors: function() {
-        var empty_authors = (!$('#author-table select[name*=role]>option:selected[value='+author_roles['OWNER']+']').size());
-        // TODO: with jQuery 1.3+, just use toggle(empty_authors)
-        if (empty_authors) {
-            $('#submit').hide();
-            $('#empty-authors').fadeIn();
-        } else {
-            $('#empty-authors').fadeOut('normal', function(){$('#submit').show();});
-        }
-    },
-
     save: function() {
         $('#addon-edit-authors-form').submit();
     }
@@ -424,53 +396,7 @@ var versions_edit = {
     },
     
     save: function() {
-        if (!license_picker.acceptable(true)) {
-            license_picker.complain();
-        } else {
-            $('#versions-edit-form').submit();
-        }
-    }
-
-};
-
-var license_picker = {
-    // Called from document.ready.
-    // license_trans is a dict {"license picker vals": "transbox HTML"}
-    init: function(license_trans) {
-        // Turn the strings into DOM elements.
-        for (var k in license_trans) {
-            license_trans[k] = $(license_trans[k]);
-        }
-        $("#license-name").change(function() {
-            var val = $(this).val();
-            $("#license-translationbox").contents().remove();
-            if(val in license_trans) {
-                license_trans[val].appendTo($('#license-translationbox'));
-            }
-        });
-        $('#license-name').change();
-    },
-
-    acceptable: function(accept_null) {
-        var val = $("#license-name").val();
-        var trans = $.grep($("#license-translationbox textarea"),
-                           function(e) {
-                               return $(e).val() != "";
-                           });
-        var is_null = val == 'null';
-        var empty_custom = val == 'other' && trans.length < 1;
-        return !(!accept_null && is_null || empty_custom);
-    },
-
-    complain: function(accept_null) {
-        if (!license_picker.acceptable(accept_null)) {
-            if ($('#license-name').val() == 'other') {
-                // The text box must be empty.
-                alert(devcp_js_license_text);
-            } else {
-                alert(devcp_js_license_select);
-            }
-        }
+        $('#versions-edit-form').submit();
     }
 };
 
@@ -518,6 +444,185 @@ var addon_status = {
     }
 }
 
+var translation_box = {
+    switchLocale: function(tab, locale) {
+        var translationBox = $(tab).parent().parent().parent();
+        if (translationBox.find('.translation-deletelocale').size() > 0) {
+            return;
+        }
+        translationBox.find('.selected').removeClass('selected');
+        $(tab).addClass('selected');
+        translationBox.find('.' + locale).addClass('selected');
+        this.checkDeleteButton(translationBox);
+        translationBox.find('.translation-area .input.selected').trigger('onchange');
+        translationBox.find('.' + locale).focus();
+    },
+    
+    checkDeleteButton: function(translationBox) {
+        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
+        var selectedLocale = translationBox.find('.translation-tab.selected').text();
+        if (selectedLocale == defaultLocale || selectedLocale == '') {
+            translationBox.find('.translation-button.remove').hide();
+        }
+        else {
+            translationBox.find('.translation-button.remove').show();
+        }
+    },
+    
+    checkLength: function(field, max) {
+        var translationBox = $(field).parent().parent();
+        translationBox.find('.translation-maxlength.selected span').text(field.value.length);
+        
+        if (field.value.length > max) {
+            translationBox.find('.translation-maxlength.selected').addClass('over');
+            translationBox.addClass('errors');
+        }
+        else {
+            translationBox.find('.translation-maxlength.selected').removeClass('over');
+            
+            if (translationBox.find('.translation-area .over').size() == 0) {
+                translationBox.removeClass('errors');
+            }
+        }
+    },
+    
+    addTab: function(button) {
+        var translationBox = $(button).parent().parent().parent();
+        if (translationBox.find('.translation-deletelocale').size() > 0) {
+            return;
+        }
+        
+        if (translationBox.find('.translation-tab').hasClass('new')) {
+            translationBox.find('.selected').removeClass('selected');
+            translationBox.find('.new').addClass('selected');
+            return;
+        }
+        
+        var tab = '<div class="translation-tab selected new" onclick="translation_box.switchLocale(this, \'new\');"></div>';
+        translationBox.find('.selected').removeClass('selected');
+        translationBox.find('.translation-tabs').append(tab);
+        translationBox.find('.translation-area').append($('.translation-newlocale-container').html());
+        
+        // Remove existing translations from available dropdown
+        translationBox.find('.translation-tab:not(.new)').each(function(index, item) {
+            translationBox.find('.translation-newlocale select option[value="' + $(item).text() + '"]').remove();
+        });
+        this.checkDeleteButton(translationBox);
+    },
+    
+    addLocale: function(button, addToAll) {
+        var translationBox = $(button).parent().parent().parent().parent().parent();
+        var thisBox = translationBox;
+        if (addToAll == true) {
+            translationBox = translationBox.parent();
+        }
+        
+        var locale = thisBox.find('select').val();
+        var localeName = thisBox.find('select option:selected').text();
+        
+        var tab = '<div class="translation-tab selected" title="' + localeName + '" onclick="translation_box.switchLocale(this, \'' + locale + '\');">' + locale + '</div>';
+        
+        translationBox.find('.input.' + locale + '.deleted').remove();
+        translationBox.find('.translation-area:not(:has(.' + locale + '))').each(function(index, item) {
+            var itemID = $(item).attr('itemID');
+            var field = 'data[' + $(item).attr('table') + ']' + (itemID != null ? '[' + itemID + ']' : '') + '[' + $(item).attr('field') + '][' + locale + ']';
+            $(item).parent().find('.selected').removeClass('selected');
+            
+            var fieldType = $(item).find('.input')[0].tagName.toLowerCase();
+            var style = $(item).find('.input').attr('style');
+            
+            if (fieldType == 'textarea') {
+                var fieldHTML = '<textarea class="input ' + locale + ' selected" name="' + field + '" style="' + style + '"';
+                var maxLength = $(item).find('.input').attr('maxLength');
+                if (maxLength) {
+                    fieldHTML += ' maxLength="' + maxLength + '" onkeyup="translation_box.checkLength(this, ' + maxLength + ');" onchange="translation_box.checkLength(this, ' + maxLength + ');"';
+                    var afterHTML = '<div class="translation-maxlength ' + locale + ' selected">' + $(item).find('.translation-maxlength').html() + '</div>';
+                }
+                fieldHTML += '></textarea>';
+            }
+            else if (fieldType == 'input') {
+                var fieldHTML = '<input type="text" class="input ' + locale + ' selected" value="" name="' + field + '" style="' + style + '" />';
+                var afterHTML = '';
+            }
+            $(item).append(fieldHTML).append(afterHTML);
+            translationBox.find('.translation-area .input.selected').trigger('onchange');
+            
+            $(item).parent().find('.translation-tabs').append(tab);
+        });
+        
+        thisBox.find('.new').remove();
+        this.checkDeleteButton(translationBox);
+        thisBox.find('.translation-area .selected').focus();
+    },
+    
+    confirmRemove: function(button) {
+        var translationBox = $(button).parent().parent().parent();
+        
+        if (translationBox.find('.translation-deletelocale').size() > 0) {
+            return;
+        }
+        
+        translationBox.find('.translation-area .input.selected').hide();
+        
+        translationBox.find('.translation-area .input:first').before($('.translation-deletelocale-container').html());
+        translationBox.find('.translation-deletelocale').css('width', translationBox.css('width'));
+    },
+    
+    removeLocale: function(button) {
+        var translationBox = $(button).parent().parent().parent().parent().parent();
+        var locale = translationBox.find('.translation-row .selected').text();
+        translationBox.find('.translation-tab:contains(' + locale + ')').remove();
+        translationBox.find('.translation-area .input.' + locale).val('');
+        translationBox.find('.translation-area .input.' + locale).addClass('deleted');
+        translationBox.find('.translation-area .input.' + locale).removeClass('selected');
+        
+        translationBox.find('.translation-maxlength.' + locale).remove();
+        
+        translationBox.find('.translation-deletelocale').remove();
+        translationBox.find('.translation-area .input').removeClass('confirm-delete');
+        
+        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
+        translationBox.find('.translation-tab:contains(' + defaultLocale + ')').addClass('selected');
+        translationBox.find('.translation-area .' + defaultLocale).addClass('selected');
+        this.checkDeleteButton(translationBox);
+    },
+    
+    cancelRemove: function(button) {
+        var translationBox = $(button).parent().parent().parent().parent().parent();
+        translationBox.find('.translation-deletelocale').remove();
+        translationBox.find('.translation-area .input').removeClass('confirm-delete');
+        translationBox.find('.translation-area .input.selected').show();
+        translationBox.find('.translation-area .input.selected').focus();
+    },
+    
+    cancelAdd: function(button) {
+        var translationBox = $(button).parent().parent().parent().parent().parent();
+        translationBox.find('.translation-tabs .new').remove();
+        translationBox.find('.translation-newlocale').remove();
+        
+        var defaultLocale = translationBox.find('.translation-area').attr('defaultLocale');
+        translationBox.find('.translation-tab:contains(' + defaultLocale + ')').addClass('selected');
+        translationBox.find('.translation-area .' + defaultLocale).addClass('selected');
+        this.checkDeleteButton(translationBox);
+    },
+    
+    showHelp: function(button) {
+        var translationBox = $(button).parent().parent();
+        if (translationBox.prev('.translation-help').size() > 0) {
+            return;
+        }
+        translationBox.before($('.translation-help-container').html());
+        translationBox.prev('.translation-help').slideDown('slow');
+    },
+    
+    hideHelp: function(button) {
+        var helpBox = $(button).parent().parent().parent().parent();
+        helpBox.slideUp('normal', function() {
+            helpBox.remove();
+        });
+    }
+};
+
 /************************************************
 *             addontype constants               *
 ************************************************/
diff --git a/site/app/webroot/js/editors.js b/site/app/webroot/js/editors.js
index e79a91a..6a00292 100644
--- a/site/app/webroot/js/editors.js
+++ b/site/app/webroot/js/editors.js
@@ -11,54 +11,15 @@ function hideMenu() {
 /*************************************************
 *               editors/queue                  *
 *************************************************/
-var editors_queue = {
-    init: function() {
-        $('#filterHeader').click(this.toggleFilters);
-
-        $('input#FilterAddonOrAuthor').autocomplete(addonAutocompleteUrl, {
-            minChars: 4,
-            max: 40,
-            formatItem: function(row) {
-                // encode results using a temporary jquery element
-                return '<b>' + $('<div/>').text(row[0]).html() + '</b>';
-            },
-            formatResult: function(row) { return row[0]; },
-        });
-
-        $('select#FilterApplication').change(this.populateAppVersions);
-
-        if (! $('select#FilterApplication').val()) {
-            $('select#FilterMaxVersion').attr('disabled', 'disabled');
-        }
-    },
-
-    /**
-     * Expand/collapse the filter box
-     */
-    toggleFilters: function() {
-        var div = document.getElementById('filterTable');
-        if (div.style.display == 'none') {
-            div.style.display = '';
-        }
-        else {
-            div.style.display = 'none';
-        }
-    },
-
-    /**
-     * Fill the maxVersion select dropdown based on selected application
-     */
-    populateAppVersions: function() {
-        var appId = $('select#FilterApplication').val();
-        var selectNode = $('select#FilterMaxVersion');
-        if (appId) {
-            selectNode.attr('disabled', '');
-            selectNode.load(appversionLookupUrl+appId);
-        } else {
-            selectNode.html('');
-            selectNode.attr('disabled', 'disabled');
-        }
-    },
+//Expand/collapse the filter box
+function toggleFilters() {
+    var div = document.getElementById('filterTable');
+    if (div.style.display == 'none') {
+        div.style.display = '';
+    }
+    else {
+        div.style.display = 'none';
+    }
 }
 
 /*************************************************
@@ -210,15 +171,19 @@ function clearInput(input) {
     Most likely done on focus to reduce # of objects instantiated on page load
 */
 function prepAutocomplete(tagid) {
-    $('#new-addon-id-' + tagid).autocomplete(autocompleteurl,
-        {
-            minChars:4,
-            formatItem: function(row) { return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>'; },
-            formatResult: function(row) { return row[2]; }
-        });
+    $('#new-addon-id-' + tagid).autocomplete(autocompleteurl, {minChars:4, formatItem: formatResult, formatValue: formatData });
     $('#new-addon-id-' + tagid).focus();
 }
 
+//Formatting functions for autocomplete results returned from server
+function formatResult(row) {
+    return '<b>' + row[0] + '</b><br><i>' + row[1] + '</i>';
+}
+
+function formatData(row) {
+    return row[2];
+}
+
 /*
     Parses input for addon id and name, then sends to server
 */
@@ -370,66 +335,3 @@ function removeFeature(tagid, addonid) {
     });
     return false;
 }
-
-/*************************************************
-*               editors/performance              *
-*************************************************/
-var editors_performance = {
-    init: function() {
-        $('.performanceHeader.collapsible').click(function() {
-            var el = $(this).next();
-            if(! $(':animated', el).length) {
-                if ($(':visible', el).length) {
-                    el.slideUp('200', function(){});
-                    $(this).removeClass('expanded');
-                } else {
-                    el.slideDown('200', function(){});
-                    $(this).addClass('expanded');
-                }
-            }
-        });
-
-        $('select#performanceUser').change(this.switchUser);
-
-        $('#historyTable').tablesorter({cssHeader:'headerSort'}); 
-    },
-
-    switchUser: function() {
-        var qs = '?user='+encodeURIComponent($('select#performanceUser').val());
-        if (document.location.search.length > 0) {
-            var params = document.location.search.substr(1).split("&");
-            for (var i = 0; i < params.length; i++) {
-                if (params[i].substr(0, 5) != 'user=') {
-                    qs = qs + '&' + params[i];
-                }
-            }
-        }
-        window.location.search = qs;
-    },
-
-    showChartTooltip: function(x, y, contents) {
-        $('<div id="chartTip">' + contents + '</div>').css( {
-            position: 'absolute',
-            display: 'none',
-            top: y - 25,
-            left: x + 5,
-            border: '1px solid #fdd',
-            padding: '2px',
-            'background-color': '#fee',
-            opacity: 0.80
-        }).appendTo('body').fadeIn(100);
-    },
-
-    pieLegendEntry: function(color, text, value, total, id) {
-        var percent = 0;
-        if (total > 0) {
-            percent = 100 * value / total;
-        }
-        var precision = 0;
-        if (percent < 1 && percent > 0) {
-            precision = 2;
-        }
-        var label = text + ' ' + percent.toFixed(precision) + '%';
-        return $('<div id="' + id + '">' + label + '</div>').css('border-left','1.5em solid '+color);
-    }
-}
diff --git a/site/app/webroot/js/jquery-compressed.js b/site/app/webroot/js/jquery-compressed.js
index b1ae21d..74cdfee 100644
--- a/site/app/webroot/js/jquery-compressed.js
+++ b/site/app/webroot/js/jquery-compressed.js
@@ -1,19 +1,11 @@
 /*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
+ * jQuery 1.2.3 - New Wave Javascript
  *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
  *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
+ * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $
+ * $Rev: 4663 $
  */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(J(){7(1e.3N)L w=1e.3N;L E=1e.3N=J(a,b){K 1B E.2l.4T(a,b)};7(1e.$)L D=1e.$;1e.$=E;L u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/;L G=/^.[^:#\\[\\.]*$/;E.1n=E.2l={4T:J(d,b){d=d||T;7(d.15){6[0]=d;6.M=1;K 6}N 7(1o d=="25"){L c=u.2O(d);7(c&&(c[1]||!b)){7(c[1])d=E.4a([c[1]],b);N{L a=T.5J(c[3]);7(a)7(a.2w!=c[3])K E().2s(d);N{6[0]=a;6.M=1;K 6}N d=[]}}N K 1B E(b).2s(d)}N 7(E.1q(d))K 1B E(T)[E.1n.21?"21":"3U"](d);K 6.6E(d.1k==1M&&d||(d.5h||d.M&&d!=1e&&!d.15&&d[0]!=10&&d[0].15)&&E.2I(d)||[d])},5h:"1.2.3",87:J(){K 6.M},M:0,22:J(a){K a==10?E.2I(6):6[a]},2F:J(b){L a=E(b);a.54=6;K a},6E:J(a){6.M=0;1M.2l.1g.1i(6,a);K 6},R:J(a,b){K E.R(6,a,b)},4X:J(b){L a=-1;6.R(J(i){7(6==b)a=i});K a},1J:J(c,a,b){L d=c;7(c.1k==4e)7(a==10)K 6.M&&E[b||"1J"](6[0],c)||10;N{d={};d[c]=a}K 6.R(J(i){Q(c 1p d)E.1J(b?6.W:6,c,E.1l(6,d[c],b,i,c))})},1j:J(b,a){7((b==\'27\'||b==\'1R\')&&2M(a)<0)a=10;K 6.1J(b,a,"2o")},1u:J(b){7(1o b!="3V"&&b!=V)K 6.4x().3t((6[0]&&6[0].2i||T).5r(b));L a="";E.R(b||6,J(){E.R(6.3p,J(){7(6.15!=8)a+=6.15!=1?6.6K:E.1n.1u([6])})});K a},5m:J(b){7(6[0])E(b,6[0].2i).5k().3o(6[0]).2c(J(){L a=6;2b(a.1C)a=a.1C;K a}).3t(6);K 6},8w:J(a){K 6.R(J(){E(6).6z().5m(a)})},8p:J(a){K 6.R(J(){E(6).5m(a)})},3t:J(){K 6.3O(18,P,S,J(a){7(6.15==1)6.38(a)})},6q:J(){K 6.3O(18,P,P,J(a){7(6.15==1)6.3o(a,6.1C)})},6o:J(){K 6.3O(18,S,S,J(a){6.1a.3o(a,6)})},5a:J(){K 6.3O(18,S,P,J(a){6.1a.3o(a,6.2B)})},3h:J(){K 6.54||E([])},2s:J(b){L c=E.2c(6,J(a){K E.2s(b,a)});K 6.2F(/[^+>] [^+>]/.17(b)||b.1f("..")>-1?E.57(c):c)},5k:J(e){L f=6.2c(J(){7(E.14.1d&&!E.3E(6)){L a=6.69(P),4Y=T.3s("1x");4Y.38(a);K E.4a([4Y.3d])[0]}N K 6.69(P)});L d=f.2s("*").4R().R(J(){7(6[F]!=10)6[F]=V});7(e===P)6.2s("*").4R().R(J(i){7(6.15==3)K;L c=E.O(6,"2R");Q(L a 1p c)Q(L b 1p c[a])E.16.1b(d[i],a,c[a][b],c[a][b].O)});K f},1E:J(b){K 6.2F(E.1q(b)&&E.3y(6,J(a,i){K b.1P(a,i)})||E.3e(b,6))},56:J(b){7(b.1k==4e)7(G.17(b))K 6.2F(E.3e(b,6,P));N b=E.3e(b,6);L a=b.M&&b[b.M-1]!==10&&!b.15;K 6.1E(J(){K a?E.33(6,b)<0:6!=b})},1b:J(a){K!a?6:6.2F(E.37(6.22(),a.1k==4e?E(a).22():a.M!=10&&(!a.12||E.12(a,"3u"))?a:[a]))},3H:J(a){K a?E.3e(a,6).M>0:S},7j:J(a){K 6.3H("."+a)},5O:J(b){7(b==10){7(6.M){L c=6[0];7(E.12(c,"2k")){L e=c.3T,5I=[],11=c.11,2X=c.U=="2k-2X";7(e<0)K V;Q(L i=2X?e:0,2f=2X?e+1:11.M;i<2f;i++){L d=11[i];7(d.2p){b=E.14.1d&&!d.9J.1A.9y?d.1u:d.1A;7(2X)K b;5I.1g(b)}}K 5I}N K(6[0].1A||"").1r(/\\r/g,"")}K 10}K 6.R(J(){7(6.15!=1)K;7(b.1k==1M&&/5u|5t/.17(6.U))6.3k=(E.33(6.1A,b)>=0||E.33(6.31,b)>=0);N 7(E.12(6,"2k")){L a=b.1k==1M?b:[b];E("98",6).R(J(){6.2p=(E.33(6.1A,a)>=0||E.33(6.1u,a)>=0)});7(!a.M)6.3T=-1}N 6.1A=b})},3q:J(a){K a==10?(6.M?6[0].3d:V):6.4x().3t(a)},6S:J(a){K 6.5a(a).1V()},6Z:J(i){K 6.2K(i,i+1)},2K:J(){K 6.2F(1M.2l.2K.1i(6,18))},2c:J(b){K 6.2F(E.2c(6,J(a,i){K b.1P(a,i,a)}))},4R:J(){K 6.1b(6.54)},O:J(d,b){L a=d.23(".");a[1]=a[1]?"."+a[1]:"";7(b==V){L c=6.5n("8P"+a[1]+"!",[a[0]]);7(c==10&&6.M)c=E.O(6[0],d);K c==V&&a[1]?6.O(a[0]):c}N K 6.1N("8K"+a[1]+"!",[a[0],b]).R(J(){E.O(6,d,b)})},35:J(a){K 6.R(J(){E.35(6,a)})},3O:J(g,f,h,d){L e=6.M>1,3n;K 6.R(J(){7(!3n){3n=E.4a(g,6.2i);7(h)3n.8D()}L b=6;7(f&&E.12(6,"1O")&&E.12(3n[0],"4v"))b=6.3S("1U")[0]||6.38(6.2i.3s("1U"));L c=E([]);E.R(3n,J(){L a=e?E(6).5k(P)[0]:6;7(E.12(a,"1m")){c=c.1b(a)}N{7(a.15==1)c=c.1b(E("1m",a).1V());d.1P(b,a)}});c.R(6A)})}};E.2l.4T.2l=E.2l;J 6A(i,a){7(a.3Q)E.3P({1c:a.3Q,3l:S,1H:"1m"});N E.5g(a.1u||a.6x||a.3d||"");7(a.1a)a.1a.34(a)}E.1s=E.1n.1s=J(){L b=18[0]||{},i=1,M=18.M,5c=S,11;7(b.1k==8d){5c=b;b=18[1]||{};i=2}7(1o b!="3V"&&1o b!="J")b={};7(M==1){b=6;i=0}Q(;i<M;i++)7((11=18[i])!=V)Q(L a 1p 11){7(b===11[a])6w;7(5c&&11[a]&&1o 11[a]=="3V"&&b[a]&&!11[a].15)b[a]=E.1s(b[a],11[a]);N 7(11[a]!=10)b[a]=11[a]}K b};L F="3N"+(1B 3v()).3L(),6t=0,5b={};L H=/z-?4X|86-?84|1w|6k|7Z-?1R/i;E.1s({7Y:J(a){1e.$=D;7(a)1e.3N=w;K E},1q:J(a){K!!a&&1o a!="25"&&!a.12&&a.1k!=1M&&/J/i.17(a+"")},3E:J(a){K a.1F&&!a.1h||a.28&&a.2i&&!a.2i.1h},5g:J(a){a=E.3g(a);7(a){L b=T.3S("6f")[0]||T.1F,1m=T.3s("1m");1m.U="1u/4m";7(E.14.1d)1m.1u=a;N 1m.38(T.5r(a));b.38(1m);b.34(1m)}},12:J(b,a){K b.12&&b.12.2E()==a.2E()},1T:{},O:J(c,d,b){c=c==1e?5b:c;L a=c[F];7(!a)a=c[F]=++6t;7(d&&!E.1T[a])E.1T[a]={};7(b!=10)E.1T[a][d]=b;K d?E.1T[a][d]:a},35:J(c,b){c=c==1e?5b:c;L a=c[F];7(b){7(E.1T[a]){2V E.1T[a][b];b="";Q(b 1p E.1T[a])1Q;7(!b)E.35(c)}}N{1S{2V c[F]}1X(e){7(c.52)c.52(F)}2V E.1T[a]}},R:J(c,a,b){7(b){7(c.M==10){Q(L d 1p c)7(a.1i(c[d],b)===S)1Q}N Q(L i=0,M=c.M;i<M;i++)7(a.1i(c[i],b)===S)1Q}N{7(c.M==10){Q(L d 1p c)7(a.1P(c[d],d,c[d])===S)1Q}N Q(L i=0,M=c.M,1A=c[0];i<M&&a.1P(1A,i,1A)!==S;1A=c[++i]){}}K c},1l:J(b,a,c,i,d){7(E.1q(a))a=a.1P(b,i);K a&&a.1k==51&&c=="2o"&&!H.17(d)?a+"2S":a},1t:{1b:J(c,b){E.R((b||"").23(/\\s+/),J(i,a){7(c.15==1&&!E.1t.3Y(c.1t,a))c.1t+=(c.1t?" ":"")+a})},1V:J(c,b){7(c.15==1)c.1t=b!=10?E.3y(c.1t.23(/\\s+/),J(a){K!E.1t.3Y(b,a)}).6a(" "):""},3Y:J(b,a){K E.33(a,(b.1t||b).3X().23(/\\s+/))>-1}},68:J(b,c,a){L e={};Q(L d 1p c){e[d]=b.W[d];b.W[d]=c[d]}a.1P(b);Q(L d 1p c)b.W[d]=e[d]},1j:J(d,e,c){7(e=="27"||e=="1R"){L b,46={43:"4W",4U:"1Z",19:"3D"},3c=e=="27"?["7O","7M"]:["7J","7I"];J 5E(){b=e=="27"?d.7H:d.7F;L a=0,2N=0;E.R(3c,J(){a+=2M(E.2o(d,"7E"+6,P))||0;2N+=2M(E.2o(d,"2N"+6+"5X",P))||0});b-=24.7C(a+2N)}7(E(d).3H(":4d"))5E();N E.68(d,46,5E);K 24.2f(0,b)}K E.2o(d,e,c)},2o:J(e,k,j){L d;J 3x(b){7(!E.14.2d)K S;L a=T.4c.4K(b,V);K!a||a.4M("3x")==""}7(k=="1w"&&E.14.1d){d=E.1J(e.W,"1w");K d==""?"1":d}7(E.14.2z&&k=="19"){L c=e.W.50;e.W.50="0 7r 7o";e.W.50=c}7(k.1D(/4g/i))k=y;7(!j&&e.W&&e.W[k])d=e.W[k];N 7(T.4c&&T.4c.4K){7(k.1D(/4g/i))k="4g";k=k.1r(/([A-Z])/g,"-$1").2h();L h=T.4c.4K(e,V);7(h&&!3x(e))d=h.4M(k);N{L f=[],2C=[];Q(L a=e;a&&3x(a);a=a.1a)2C.4J(a);Q(L i=0;i<2C.M;i++)7(3x(2C[i])){f[i]=2C[i].W.19;2C[i].W.19="3D"}d=k=="19"&&f[2C.M-1]!=V?"2H":(h&&h.4M(k))||"";Q(L i=0;i<f.M;i++)7(f[i]!=V)2C[i].W.19=f[i]}7(k=="1w"&&d=="")d="1"}N 7(e.4n){L g=k.1r(/\\-(\\w)/g,J(a,b){K b.2E()});d=e.4n[k]||e.4n[g];7(!/^\\d+(2S)?$/i.17(d)&&/^\\d/.17(d)){L l=e.W.26,3K=e.3K.26;e.3K.26=e.4n.26;e.W.26=d||0;d=e.W.7f+"2S";e.W.26=l;e.3K.26=3K}}K d},4a:J(l,h){L k=[];h=h||T;7(1o h.3s==\'10\')h=h.2i||h[0]&&h[0].2i||T;E.R(l,J(i,d){7(!d)K;7(d.1k==51)d=d.3X();7(1o d=="25"){d=d.1r(/(<(\\w+)[^>]*?)\\/>/g,J(b,a,c){K c.1D(/^(aa|a6|7e|a5|4D|7a|a0|3m|9W|9U|9S)$/i)?b:a+"></"+c+">"});L f=E.3g(d).2h(),1x=h.3s("1x");L e=!f.1f("<9P")&&[1,"<2k 74=\'74\'>","</2k>"]||!f.1f("<9M")&&[1,"<73>","</73>"]||f.1D(/^<(9G|1U|9E|9B|9x)/)&&[1,"<1O>","</1O>"]||!f.1f("<4v")&&[2,"<1O><1U>","</1U></1O>"]||(!f.1f("<9w")||!f.1f("<9v"))&&[3,"<1O><1U><4v>","</4v></1U></1O>"]||!f.1f("<7e")&&[2,"<1O><1U></1U><6V>","</6V></1O>"]||E.14.1d&&[1,"1x<1x>","</1x>"]||[0,"",""];1x.3d=e[1]+d+e[2];2b(e[0]--)1x=1x.5o;7(E.14.1d){L g=!f.1f("<1O")&&f.1f("<1U")<0?1x.1C&&1x.1C.3p:e[1]=="<1O>"&&f.1f("<1U")<0?1x.3p:[];Q(L j=g.M-1;j>=0;--j)7(E.12(g[j],"1U")&&!g[j].3p.M)g[j].1a.34(g[j]);7(/^\\s/.17(d))1x.3o(h.5r(d.1D(/^\\s*/)[0]),1x.1C)}d=E.2I(1x.3p)}7(d.M===0&&(!E.12(d,"3u")&&!E.12(d,"2k")))K;7(d[0]==10||E.12(d,"3u")||d.11)k.1g(d);N k=E.37(k,d)});K k},1J:J(d,e,c){7(!d||d.15==3||d.15==8)K 10;L f=E.3E(d)?{}:E.46;7(e=="2p"&&E.14.2d)d.1a.3T;7(f[e]){7(c!=10)d[f[e]]=c;K d[f[e]]}N 7(E.14.1d&&e=="W")K E.1J(d.W,"9u",c);N 7(c==10&&E.14.1d&&E.12(d,"3u")&&(e=="9r"||e=="9o"))K d.9m(e).6K;N 7(d.28){7(c!=10){7(e=="U"&&E.12(d,"4D")&&d.1a)6Q"U 9i 9h\'t 9g 9e";d.9b(e,""+c)}7(E.14.1d&&/6O|3Q/.17(e)&&!E.3E(d))K d.4z(e,2);K d.4z(e)}N{7(e=="1w"&&E.14.1d){7(c!=10){d.6k=1;d.1E=(d.1E||"").1r(/6M\\([^)]*\\)/,"")+(2M(c).3X()=="96"?"":"6M(1w="+c*6L+")")}K d.1E&&d.1E.1f("1w=")>=0?(2M(d.1E.1D(/1w=([^)]*)/)[1])/6L).3X():""}e=e.1r(/-([a-z])/95,J(a,b){K b.2E()});7(c!=10)d[e]=c;K d[e]}},3g:J(a){K(a||"").1r(/^\\s+|\\s+$/g,"")},2I:J(b){L a=[];7(1o b!="93")Q(L i=0,M=b.M;i<M;i++)a.1g(b[i]);N a=b.2K(0);K a},33:J(b,a){Q(L i=0,M=a.M;i<M;i++)7(a[i]==b)K i;K-1},37:J(a,b){7(E.14.1d){Q(L i=0;b[i];i++)7(b[i].15!=8)a.1g(b[i])}N Q(L i=0;b[i];i++)a.1g(b[i]);K a},57:J(a){L c=[],2r={};1S{Q(L i=0,M=a.M;i<M;i++){L b=E.O(a[i]);7(!2r[b]){2r[b]=P;c.1g(a[i])}}}1X(e){c=a}K c},3y:J(c,a,d){L b=[];Q(L i=0,M=c.M;i<M;i++)7(!d&&a(c[i],i)||d&&!a(c[i],i))b.1g(c[i]);K b},2c:J(d,a){L c=[];Q(L i=0,M=d.M;i<M;i++){L b=a(d[i],i);7(b!==V&&b!=10){7(b.1k!=1M)b=[b];c=c.71(b)}}K c}});L v=8Y.8W.2h();E.14={5K:(v.1D(/.+(?:8T|8S|8R|8O)[\\/: ]([\\d.]+)/)||[])[1],2d:/77/.17(v),2z:/2z/.17(v),1d:/1d/.17(v)&&!/2z/.17(v),48:/48/.17(v)&&!/(8L|77)/.17(v)};L y=E.14.1d?"6H":"75";E.1s({8I:!E.14.1d||T.6F=="79",46:{"Q":"8F","8E":"1t","4g":y,75:y,6H:y,3d:"3d",1t:"1t",1A:"1A",2Y:"2Y",3k:"3k",8C:"8B",2p:"2p",8A:"8z",3T:"3T",6C:"6C",28:"28",12:"12"}});E.R({6B:J(a){K a.1a},8y:J(a){K E.4u(a,"1a")},8x:J(a){K E.2Z(a,2,"2B")},8v:J(a){K E.2Z(a,2,"4t")},8u:J(a){K E.4u(a,"2B")},8t:J(a){K E.4u(a,"4t")},8s:J(a){K E.5i(a.1a.1C,a)},8r:J(a){K E.5i(a.1C)},6z:J(a){K E.12(a,"8q")?a.8o||a.8n.T:E.2I(a.3p)}},J(c,d){E.1n[c]=J(b){L a=E.2c(6,d);7(b&&1o b=="25")a=E.3e(b,a);K 6.2F(E.57(a))}});E.R({6y:"3t",8m:"6q",3o:"6o",8l:"5a",8k:"6S"},J(c,b){E.1n[c]=J(){L a=18;K 6.R(J(){Q(L i=0,M=a.M;i<M;i++)E(a[i])[b](6)})}});E.R({8j:J(a){E.1J(6,a,"");7(6.15==1)6.52(a)},8i:J(a){E.1t.1b(6,a)},8h:J(a){E.1t.1V(6,a)},8g:J(a){E.1t[E.1t.3Y(6,a)?"1V":"1b"](6,a)},1V:J(a){7(!a||E.1E(a,[6]).r.M){E("*",6).1b(6).R(J(){E.16.1V(6);E.35(6)});7(6.1a)6.1a.34(6)}},4x:J(){E(">*",6).1V();2b(6.1C)6.34(6.1C)}},J(a,b){E.1n[a]=J(){K 6.R(b,18)}});E.R(["8f","5X"],J(i,c){L b=c.2h();E.1n[b]=J(a){K 6[0]==1e?E.14.2z&&T.1h["5e"+c]||E.14.2d&&1e["8e"+c]||T.6F=="79"&&T.1F["5e"+c]||T.1h["5e"+c]:6[0]==T?24.2f(24.2f(T.1h["5d"+c],T.1F["5d"+c]),24.2f(T.1h["5L"+c],T.1F["5L"+c])):a==10?(6.M?E.1j(6[0],b):V):6.1j(b,a.1k==4e?a:a+"2S")}});L C=E.14.2d&&4s(E.14.5K)<8c?"(?:[\\\\w*4r-]|\\\\\\\\.)":"(?:[\\\\w\\8b-\\8a*4r-]|\\\\\\\\.)",6v=1B 4q("^>\\\\s*("+C+"+)"),6u=1B 4q("^("+C+"+)(#)("+C+"+)"),6s=1B 4q("^([#.]?)("+C+"*)");E.1s({6r:{"":J(a,i,m){K m[2]=="*"||E.12(a,m[2])},"#":J(a,i,m){K a.4z("2w")==m[2]},":":{89:J(a,i,m){K i<m[3]-0},88:J(a,i,m){K i>m[3]-0},2Z:J(a,i,m){K m[3]-0==i},6Z:J(a,i,m){K m[3]-0==i},3j:J(a,i){K i==0},3J:J(a,i,m,r){K i==r.M-1},6n:J(a,i){K i%2==0},6l:J(a,i){K i%2},"3j-4p":J(a){K a.1a.3S("*")[0]==a},"3J-4p":J(a){K E.2Z(a.1a.5o,1,"4t")==a},"83-4p":J(a){K!E.2Z(a.1a.5o,2,"4t")},6B:J(a){K a.1C},4x:J(a){K!a.1C},82:J(a,i,m){K(a.6x||a.81||E(a).1u()||"").1f(m[3])>=0},4d:J(a){K"1Z"!=a.U&&E.1j(a,"19")!="2H"&&E.1j(a,"4U")!="1Z"},1Z:J(a){K"1Z"==a.U||E.1j(a,"19")=="2H"||E.1j(a,"4U")=="1Z"},80:J(a){K!a.2Y},2Y:J(a){K a.2Y},3k:J(a){K a.3k},2p:J(a){K a.2p||E.1J(a,"2p")},1u:J(a){K"1u"==a.U},5u:J(a){K"5u"==a.U},5t:J(a){K"5t"==a.U},59:J(a){K"59"==a.U},3I:J(a){K"3I"==a.U},58:J(a){K"58"==a.U},6j:J(a){K"6j"==a.U},6i:J(a){K"6i"==a.U},2G:J(a){K"2G"==a.U||E.12(a,"2G")},4D:J(a){K/4D|2k|6h|2G/i.17(a.12)},3Y:J(a,i,m){K E.2s(m[3],a).M},7X:J(a){K/h\\d/i.17(a.12)},7W:J(a){K E.3y(E.3G,J(b){K a==b.Y}).M}}},6g:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,1B 4q("^([:.#]*)("+C+"+)")],3e:J(a,c,b){L d,2m=[];2b(a&&a!=d){d=a;L f=E.1E(a,c,b);a=f.t.1r(/^\\s*,\\s*/,"");2m=b?c=f.r:E.37(2m,f.r)}K 2m},2s:J(t,p){7(1o t!="25")K[t];7(p&&p.15!=1&&p.15!=9)K[];p=p||T;L d=[p],2r=[],3J,12;2b(t&&3J!=t){L r=[];3J=t;t=E.3g(t);L o=S;L g=6v;L m=g.2O(t);7(m){12=m[1].2E();Q(L i=0;d[i];i++)Q(L c=d[i].1C;c;c=c.2B)7(c.15==1&&(12=="*"||c.12.2E()==12))r.1g(c);d=r;t=t.1r(g,"");7(t.1f(" ")==0)6w;o=P}N{g=/^([>+~])\\s*(\\w*)/i;7((m=g.2O(t))!=V){r=[];L l={};12=m[2].2E();m=m[1];Q(L j=0,3f=d.M;j<3f;j++){L n=m=="~"||m=="+"?d[j].2B:d[j].1C;Q(;n;n=n.2B)7(n.15==1){L h=E.O(n);7(m=="~"&&l[h])1Q;7(!12||n.12.2E()==12){7(m=="~")l[h]=P;r.1g(n)}7(m=="+")1Q}}d=r;t=E.3g(t.1r(g,""));o=P}}7(t&&!o){7(!t.1f(",")){7(p==d[0])d.4l();2r=E.37(2r,d);r=d=[p];t=" "+t.6e(1,t.M)}N{L k=6u;L m=k.2O(t);7(m){m=[0,m[2],m[3],m[1]]}N{k=6s;m=k.2O(t)}m[2]=m[2].1r(/\\\\/g,"");L f=d[d.M-1];7(m[1]=="#"&&f&&f.5J&&!E.3E(f)){L q=f.5J(m[2]);7((E.14.1d||E.14.2z)&&q&&1o q.2w=="25"&&q.2w!=m[2])q=E(\'[@2w="\'+m[2]+\'"]\',f)[0];d=r=q&&(!m[3]||E.12(q,m[3]))?[q]:[]}N{Q(L i=0;d[i];i++){L a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];7(a=="*"&&d[i].12.2h()=="3V")a="3m";r=E.37(r,d[i].3S(a))}7(m[1]==".")r=E.55(r,m[2]);7(m[1]=="#"){L e=[];Q(L i=0;r[i];i++)7(r[i].4z("2w")==m[2]){e=[r[i]];1Q}r=e}d=r}t=t.1r(k,"")}}7(t){L b=E.1E(t,r);d=r=b.r;t=E.3g(b.t)}}7(t)d=[];7(d&&p==d[0])d.4l();2r=E.37(2r,d);K 2r},55:J(r,m,a){m=" "+m+" ";L c=[];Q(L i=0;r[i];i++){L b=(" "+r[i].1t+" ").1f(m)>=0;7(!a&&b||a&&!b)c.1g(r[i])}K c},1E:J(t,r,h){L d;2b(t&&t!=d){d=t;L p=E.6g,m;Q(L i=0;p[i];i++){m=p[i].2O(t);7(m){t=t.7V(m[0].M);m[2]=m[2].1r(/\\\\/g,"");1Q}}7(!m)1Q;7(m[1]==":"&&m[2]=="56")r=G.17(m[3])?E.1E(m[3],r,P).r:E(r).56(m[3]);N 7(m[1]==".")r=E.55(r,m[2],h);N 7(m[1]=="["){L g=[],U=m[3];Q(L i=0,3f=r.M;i<3f;i++){L a=r[i],z=a[E.46[m[2]]||m[2]];7(z==V||/6O|3Q|2p/.17(m[2]))z=E.1J(a,m[2])||\'\';7((U==""&&!!z||U=="="&&z==m[5]||U=="!="&&z!=m[5]||U=="^="&&z&&!z.1f(m[5])||U=="$="&&z.6e(z.M-m[5].M)==m[5]||(U=="*="||U=="~=")&&z.1f(m[5])>=0)^h)g.1g(a)}r=g}N 7(m[1]==":"&&m[2]=="2Z-4p"){L e={},g=[],17=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2O(m[3]=="6n"&&"2n"||m[3]=="6l"&&"2n+1"||!/\\D/.17(m[3])&&"7U+"+m[3]||m[3]),3j=(17[1]+(17[2]||1))-0,d=17[3]-0;Q(L i=0,3f=r.M;i<3f;i++){L j=r[i],1a=j.1a,2w=E.O(1a);7(!e[2w]){L c=1;Q(L n=1a.1C;n;n=n.2B)7(n.15==1)n.4k=c++;e[2w]=P}L b=S;7(3j==0){7(j.4k==d)b=P}N 7((j.4k-d)%3j==0&&(j.4k-d)/3j>=0)b=P;7(b^h)g.1g(j)}r=g}N{L f=E.6r[m[1]];7(1o f=="3V")f=f[m[2]];7(1o f=="25")f=6c("S||J(a,i){K "+f+";}");r=E.3y(r,J(a,i){K f(a,i,m,r)},h)}}K{r:r,t:t}},4u:J(b,c){L d=[];L a=b[c];2b(a&&a!=T){7(a.15==1)d.1g(a);a=a[c]}K d},2Z:J(a,e,c,b){e=e||1;L d=0;Q(;a;a=a[c])7(a.15==1&&++d==e)1Q;K a},5i:J(n,a){L r=[];Q(;n;n=n.2B){7(n.15==1&&(!a||n!=a))r.1g(n)}K r}});E.16={1b:J(f,i,g,e){7(f.15==3||f.15==8)K;7(E.14.1d&&f.53!=10)f=1e;7(!g.2D)g.2D=6.2D++;7(e!=10){L h=g;g=J(){K h.1i(6,18)};g.O=e;g.2D=h.2D}L j=E.O(f,"2R")||E.O(f,"2R",{}),1v=E.O(f,"1v")||E.O(f,"1v",J(){L a;7(1o E=="10"||E.16.5f)K a;a=E.16.1v.1i(18.3R.Y,18);K a});1v.Y=f;E.R(i.23(/\\s+/),J(c,b){L a=b.23(".");b=a[0];g.U=a[1];L d=j[b];7(!d){d=j[b]={};7(!E.16.2y[b]||E.16.2y[b].4j.1P(f)===S){7(f.3F)f.3F(b,1v,S);N 7(f.6b)f.6b("4i"+b,1v)}}d[g.2D]=g;E.16.2a[b]=P});f=V},2D:1,2a:{},1V:J(e,h,f){7(e.15==3||e.15==8)K;L i=E.O(e,"2R"),29,4X;7(i){7(h==10||(1o h=="25"&&h.7T(0)=="."))Q(L g 1p i)6.1V(e,g+(h||""));N{7(h.U){f=h.2q;h=h.U}E.R(h.23(/\\s+/),J(b,a){L c=a.23(".");a=c[0];7(i[a]){7(f)2V i[a][f.2D];N Q(f 1p i[a])7(!c[1]||i[a][f].U==c[1])2V i[a][f];Q(29 1p i[a])1Q;7(!29){7(!E.16.2y[a]||E.16.2y[a].4h.1P(e)===S){7(e.67)e.67(a,E.O(e,"1v"),S);N 7(e.66)e.66("4i"+a,E.O(e,"1v"))}29=V;2V i[a]}}})}Q(29 1p i)1Q;7(!29){L d=E.O(e,"1v");7(d)d.Y=V;E.35(e,"2R");E.35(e,"1v")}}},1N:J(g,c,d,f,h){c=E.2I(c||[]);7(g.1f("!")>=0){g=g.2K(0,-1);L a=P}7(!d){7(6.2a[g])E("*").1b([1e,T]).1N(g,c)}N{7(d.15==3||d.15==8)K 10;L b,29,1n=E.1q(d[g]||V),16=!c[0]||!c[0].36;7(16)c.4J(6.4Z({U:g,2L:d}));c[0].U=g;7(a)c[0].65=P;7(E.1q(E.O(d,"1v")))b=E.O(d,"1v").1i(d,c);7(!1n&&d["4i"+g]&&d["4i"+g].1i(d,c)===S)b=S;7(16)c.4l();7(h&&E.1q(h)){29=h.1i(d,b==V?c:c.71(b));7(29!==10)b=29}7(1n&&f!==S&&b!==S&&!(E.12(d,\'a\')&&g=="4V")){6.5f=P;1S{d[g]()}1X(e){}}6.5f=S}K b},1v:J(c){L a;c=E.16.4Z(c||1e.16||{});L b=c.U.23(".");c.U=b[0];L f=E.O(6,"2R")&&E.O(6,"2R")[c.U],42=1M.2l.2K.1P(18,1);42.4J(c);Q(L j 1p f){L d=f[j];42[0].2q=d;42[0].O=d.O;7(!b[1]&&!c.65||d.U==b[1]){L e=d.1i(6,42);7(a!==S)a=e;7(e===S){c.36();c.44()}}}7(E.14.1d)c.2L=c.36=c.44=c.2q=c.O=V;K a},4Z:J(c){L a=c;c=E.1s({},a);c.36=J(){7(a.36)a.36();a.7S=S};c.44=J(){7(a.44)a.44();a.7R=P};7(!c.2L)c.2L=c.7Q||T;7(c.2L.15==3)c.2L=a.2L.1a;7(!c.4S&&c.5w)c.4S=c.5w==c.2L?c.7P:c.5w;7(c.64==V&&c.63!=V){L b=T.1F,1h=T.1h;c.64=c.63+(b&&b.2v||1h&&1h.2v||0)-(b.62||0);c.7N=c.7L+(b&&b.2x||1h&&1h.2x||0)-(b.60||0)}7(!c.3c&&((c.4f||c.4f===0)?c.4f:c.5Z))c.3c=c.4f||c.5Z;7(!c.7b&&c.5Y)c.7b=c.5Y;7(!c.3c&&c.2G)c.3c=(c.2G&1?1:(c.2G&2?3:(c.2G&4?2:0)));K c},2y:{21:{4j:J(){5M();K},4h:J(){K}},3C:{4j:J(){7(E.14.1d)K S;E(6).2j("4P",E.16.2y.3C.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4P",E.16.2y.3C.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3C";K E.16.1v.1i(6,18)}},3B:{4j:J(){7(E.14.1d)K S;E(6).2j("4O",E.16.2y.3B.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4O",E.16.2y.3B.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3B";K E.16.1v.1i(6,18)}}}};E.1n.1s({2j:J(c,a,b){K c=="4H"?6.2X(c,a,b):6.R(J(){E.16.1b(6,c,b||a,b&&a)})},2X:J(d,b,c){K 6.R(J(){E.16.1b(6,d,J(a){E(6).3w(a);K(c||b).1i(6,18)},c&&b)})},3w:J(a,b){K 6.R(J(){E.16.1V(6,a,b)})},1N:J(c,a,b){K 6.R(J(){E.16.1N(c,a,6,P,b)})},5n:J(c,a,b){7(6[0])K E.16.1N(c,a,6[0],S,b);K 10},2g:J(){L b=18;K 6.4V(J(a){6.4N=0==6.4N?1:0;a.36();K b[6.4N].1i(6,18)||S})},7D:J(a,b){K 6.2j(\'3C\',a).2j(\'3B\',b)},21:J(a){5M();7(E.2Q)a.1P(T,E);N E.3A.1g(J(){K a.1P(6,E)});K 6}});E.1s({2Q:S,3A:[],21:J(){7(!E.2Q){E.2Q=P;7(E.3A){E.R(E.3A,J(){6.1i(T)});E.3A=V}E(T).5n("21")}}});L x=S;J 5M(){7(x)K;x=P;7(T.3F&&!E.14.2z)T.3F("5W",E.21,S);7(E.14.1d&&1e==3b)(J(){7(E.2Q)K;1S{T.1F.7B("26")}1X(3a){3z(18.3R,0);K}E.21()})();7(E.14.2z)T.3F("5W",J(){7(E.2Q)K;Q(L i=0;i<T.4L.M;i++)7(T.4L[i].2Y){3z(18.3R,0);K}E.21()},S);7(E.14.2d){L a;(J(){7(E.2Q)K;7(T.39!="5V"&&T.39!="1y"){3z(18.3R,0);K}7(a===10)a=E("W, 7a[7A=7z]").M;7(T.4L.M!=a){3z(18.3R,0);K}E.21()})()}E.16.1b(1e,"3U",E.21)}E.R(("7y,7x,3U,7w,5d,4H,4V,7v,"+"7G,7u,7t,4P,4O,7s,2k,"+"58,7K,7q,7p,3a").23(","),J(i,b){E.1n[b]=J(a){K a?6.2j(b,a):6.1N(b)}});L I=J(a,c){L b=a.4S;2b(b&&b!=c)1S{b=b.1a}1X(3a){b=c}K b==c};E(1e).2j("4H",J(){E("*").1b(T).3w()});E.1n.1s({3U:J(g,d,c){7(E.1q(g))K 6.2j("3U",g);L e=g.1f(" ");7(e>=0){L i=g.2K(e,g.M);g=g.2K(0,e)}c=c||J(){};L f="4Q";7(d)7(E.1q(d)){c=d;d=V}N{d=E.3m(d);f="61"}L h=6;E.3P({1c:g,U:f,1H:"3q",O:d,1y:J(a,b){7(b=="1W"||b=="5U")h.3q(i?E("<1x/>").3t(a.4b.1r(/<1m(.|\\s)*?\\/1m>/g,"")).2s(i):a.4b);h.R(c,[a.4b,b,a])}});K 6},7n:J(){K E.3m(6.5T())},5T:J(){K 6.2c(J(){K E.12(6,"3u")?E.2I(6.7m):6}).1E(J(){K 6.31&&!6.2Y&&(6.3k||/2k|6h/i.17(6.12)||/1u|1Z|3I/i.17(6.U))}).2c(J(i,c){L b=E(6).5O();K b==V?V:b.1k==1M?E.2c(b,J(a,i){K{31:c.31,1A:a}}):{31:c.31,1A:b}}).22()}});E.R("5S,6d,5R,6D,5Q,6m".23(","),J(i,o){E.1n[o]=J(f){K 6.2j(o,f)}});L B=(1B 3v).3L();E.1s({22:J(d,b,a,c){7(E.1q(b)){a=b;b=V}K E.3P({U:"4Q",1c:d,O:b,1W:a,1H:c})},7l:J(b,a){K E.22(b,V,a,"1m")},7k:J(c,b,a){K E.22(c,b,a,"3i")},7i:J(d,b,a,c){7(E.1q(b)){a=b;b={}}K E.3P({U:"61",1c:d,O:b,1W:a,1H:c})},85:J(a){E.1s(E.4I,a)},4I:{2a:P,U:"4Q",2U:0,5P:"4o/x-7h-3u-7g",5N:P,3l:P,O:V,6p:V,3I:V,49:{3M:"4o/3M, 1u/3M",3q:"1u/3q",1m:"1u/4m, 4o/4m",3i:"4o/3i, 1u/4m",1u:"1u/a7",4G:"*/*"}},4F:{},3P:J(s){L f,2W=/=\\?(&|$)/g,1z,O;s=E.1s(P,s,E.1s(P,{},E.4I,s));7(s.O&&s.5N&&1o s.O!="25")s.O=E.3m(s.O);7(s.1H=="4E"){7(s.U.2h()=="22"){7(!s.1c.1D(2W))s.1c+=(s.1c.1D(/\\?/)?"&":"?")+(s.4E||"7d")+"=?"}N 7(!s.O||!s.O.1D(2W))s.O=(s.O?s.O+"&":"")+(s.4E||"7d")+"=?";s.1H="3i"}7(s.1H=="3i"&&(s.O&&s.O.1D(2W)||s.1c.1D(2W))){f="4E"+B++;7(s.O)s.O=(s.O+"").1r(2W,"="+f+"$1");s.1c=s.1c.1r(2W,"="+f+"$1");s.1H="1m";1e[f]=J(a){O=a;1W();1y();1e[f]=10;1S{2V 1e[f]}1X(e){}7(h)h.34(g)}}7(s.1H=="1m"&&s.1T==V)s.1T=S;7(s.1T===S&&s.U.2h()=="22"){L i=(1B 3v()).3L();L j=s.1c.1r(/(\\?|&)4r=.*?(&|$)/,"$a4="+i+"$2");s.1c=j+((j==s.1c)?(s.1c.1D(/\\?/)?"&":"?")+"4r="+i:"")}7(s.O&&s.U.2h()=="22"){s.1c+=(s.1c.1D(/\\?/)?"&":"?")+s.O;s.O=V}7(s.2a&&!E.5H++)E.16.1N("5S");7((!s.1c.1f("a3")||!s.1c.1f("//"))&&s.1H=="1m"&&s.U.2h()=="22"){L h=T.3S("6f")[0];L g=T.3s("1m");g.3Q=s.1c;7(s.7c)g.a2=s.7c;7(!f){L l=S;g.9Z=g.9Y=J(){7(!l&&(!6.39||6.39=="5V"||6.39=="1y")){l=P;1W();1y();h.34(g)}}}h.38(g);K 10}L m=S;L k=1e.78?1B 78("9X.9V"):1B 76();k.9T(s.U,s.1c,s.3l,s.6p,s.3I);1S{7(s.O)k.4C("9R-9Q",s.5P);7(s.5C)k.4C("9O-5A-9N",E.4F[s.1c]||"9L, 9K 9I 9H 5z:5z:5z 9F");k.4C("X-9C-9A","76");k.4C("9z",s.1H&&s.49[s.1H]?s.49[s.1H]+", */*":s.49.4G)}1X(e){}7(s.6Y)s.6Y(k);7(s.2a)E.16.1N("6m",[k,s]);L c=J(a){7(!m&&k&&(k.39==4||a=="2U")){m=P;7(d){6I(d);d=V}1z=a=="2U"&&"2U"||!E.6X(k)&&"3a"||s.5C&&E.6J(k,s.1c)&&"5U"||"1W";7(1z=="1W"){1S{O=E.6W(k,s.1H)}1X(e){1z="5x"}}7(1z=="1W"){L b;1S{b=k.5q("6U-5A")}1X(e){}7(s.5C&&b)E.4F[s.1c]=b;7(!f)1W()}N E.5v(s,k,1z);1y();7(s.3l)k=V}};7(s.3l){L d=53(c,13);7(s.2U>0)3z(J(){7(k){k.9t();7(!m)c("2U")}},s.2U)}1S{k.9s(s.O)}1X(e){E.5v(s,k,V,e)}7(!s.3l)c();J 1W(){7(s.1W)s.1W(O,1z);7(s.2a)E.16.1N("5Q",[k,s])}J 1y(){7(s.1y)s.1y(k,1z);7(s.2a)E.16.1N("5R",[k,s]);7(s.2a&&!--E.5H)E.16.1N("6d")}K k},5v:J(s,a,b,e){7(s.3a)s.3a(a,b,e);7(s.2a)E.16.1N("6D",[a,s,e])},5H:0,6X:J(r){1S{K!r.1z&&9q.9p=="59:"||(r.1z>=6T&&r.1z<9n)||r.1z==6R||r.1z==9l||E.14.2d&&r.1z==10}1X(e){}K S},6J:J(a,c){1S{L b=a.5q("6U-5A");K a.1z==6R||b==E.4F[c]||E.14.2d&&a.1z==10}1X(e){}K S},6W:J(r,b){L c=r.5q("9k-U");L d=b=="3M"||!b&&c&&c.1f("3M")>=0;L a=d?r.9j:r.4b;7(d&&a.1F.28=="5x")6Q"5x";7(b=="1m")E.5g(a);7(b=="3i")a=6c("("+a+")");K a},3m:J(a){L s=[];7(a.1k==1M||a.5h)E.R(a,J(){s.1g(3r(6.31)+"="+3r(6.1A))});N Q(L j 1p a)7(a[j]&&a[j].1k==1M)E.R(a[j],J(){s.1g(3r(j)+"="+3r(6))});N s.1g(3r(j)+"="+3r(a[j]));K s.6a("&").1r(/%20/g,"+")}});E.1n.1s({1G:J(c,b){K c?6.2e({1R:"1G",27:"1G",1w:"1G"},c,b):6.1E(":1Z").R(J(){6.W.19=6.5s||"";7(E.1j(6,"19")=="2H"){L a=E("<"+6.28+" />").6y("1h");6.W.19=a.1j("19");7(6.W.19=="2H")6.W.19="3D";a.1V()}}).3h()},1I:J(b,a){K b?6.2e({1R:"1I",27:"1I",1w:"1I"},b,a):6.1E(":4d").R(J(){6.5s=6.5s||E.1j(6,"19");6.W.19="2H"}).3h()},6N:E.1n.2g,2g:J(a,b){K E.1q(a)&&E.1q(b)?6.6N(a,b):a?6.2e({1R:"2g",27:"2g",1w:"2g"},a,b):6.R(J(){E(6)[E(6).3H(":1Z")?"1G":"1I"]()})},9f:J(b,a){K 6.2e({1R:"1G"},b,a)},9d:J(b,a){K 6.2e({1R:"1I"},b,a)},9c:J(b,a){K 6.2e({1R:"2g"},b,a)},9a:J(b,a){K 6.2e({1w:"1G"},b,a)},99:J(b,a){K 6.2e({1w:"1I"},b,a)},97:J(c,a,b){K 6.2e({1w:a},c,b)},2e:J(l,k,j,h){L i=E.6P(k,j,h);K 6[i.2P===S?"R":"2P"](J(){7(6.15!=1)K S;L g=E.1s({},i);L f=E(6).3H(":1Z"),4A=6;Q(L p 1p l){7(l[p]=="1I"&&f||l[p]=="1G"&&!f)K E.1q(g.1y)&&g.1y.1i(6);7(p=="1R"||p=="27"){g.19=E.1j(6,"19");g.32=6.W.32}}7(g.32!=V)6.W.32="1Z";g.40=E.1s({},l);E.R(l,J(c,a){L e=1B E.2t(4A,g,c);7(/2g|1G|1I/.17(a))e[a=="2g"?f?"1G":"1I":a](l);N{L b=a.3X().1D(/^([+-]=)?([\\d+-.]+)(.*)$/),1Y=e.2m(P)||0;7(b){L d=2M(b[2]),2A=b[3]||"2S";7(2A!="2S"){4A.W[c]=(d||1)+2A;1Y=((d||1)/e.2m(P))*1Y;4A.W[c]=1Y+2A}7(b[1])d=((b[1]=="-="?-1:1)*d)+1Y;e.45(1Y,d,2A)}N e.45(1Y,a,"")}});K P})},2P:J(a,b){7(E.1q(a)||(a&&a.1k==1M)){b=a;a="2t"}7(!a||(1o a=="25"&&!b))K A(6[0],a);K 6.R(J(){7(b.1k==1M)A(6,a,b);N{A(6,a).1g(b);7(A(6,a).M==1)b.1i(6)}})},94:J(b,c){L a=E.3G;7(b)6.2P([]);6.R(J(){Q(L i=a.M-1;i>=0;i--)7(a[i].Y==6){7(c)a[i](P);a.72(i,1)}});7(!c)6.5p();K 6}});L A=J(b,c,a){7(!b)K 10;c=c||"2t";L q=E.O(b,c+"2P");7(!q||a)q=E.O(b,c+"2P",a?E.2I(a):[]);K q};E.1n.5p=J(a){a=a||"2t";K 6.R(J(){L q=A(6,a);q.4l();7(q.M)q[0].1i(6)})};E.1s({6P:J(b,a,c){L d=b&&b.1k==92?b:{1y:c||!c&&a||E.1q(b)&&b,2u:b,3Z:c&&a||a&&a.1k!=91&&a};d.2u=(d.2u&&d.2u.1k==51?d.2u:{90:8Z,9D:6T}[d.2u])||8X;d.5y=d.1y;d.1y=J(){7(d.2P!==S)E(6).5p();7(E.1q(d.5y))d.5y.1i(6)};K d},3Z:{70:J(p,n,b,a){K b+a*p},5j:J(p,n,b,a){K((-24.8V(p*24.8U)/2)+0.5)*a+b}},3G:[],3W:V,2t:J(b,c,a){6.11=c;6.Y=b;6.1l=a;7(!c.47)c.47={}}});E.2t.2l={4y:J(){7(6.11.30)6.11.30.1i(6.Y,[6.2J,6]);(E.2t.30[6.1l]||E.2t.30.4G)(6);7(6.1l=="1R"||6.1l=="27")6.Y.W.19="3D"},2m:J(a){7(6.Y[6.1l]!=V&&6.Y.W[6.1l]==V)K 6.Y[6.1l];L r=2M(E.1j(6.Y,6.1l,a));K r&&r>-8Q?r:2M(E.2o(6.Y,6.1l))||0},45:J(c,b,d){6.5B=(1B 3v()).3L();6.1Y=c;6.3h=b;6.2A=d||6.2A||"2S";6.2J=6.1Y;6.4B=6.4w=0;6.4y();L e=6;J t(a){K e.30(a)}t.Y=6.Y;E.3G.1g(t);7(E.3W==V){E.3W=53(J(){L a=E.3G;Q(L i=0;i<a.M;i++)7(!a[i]())a.72(i--,1);7(!a.M){6I(E.3W);E.3W=V}},13)}},1G:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1G=P;6.45(0,6.2m());7(6.1l=="27"||6.1l=="1R")6.Y.W[6.1l]="8N";E(6.Y).1G()},1I:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1I=P;6.45(6.2m(),0)},30:J(a){L t=(1B 3v()).3L();7(a||t>6.11.2u+6.5B){6.2J=6.3h;6.4B=6.4w=1;6.4y();6.11.40[6.1l]=P;L b=P;Q(L i 1p 6.11.40)7(6.11.40[i]!==P)b=S;7(b){7(6.11.19!=V){6.Y.W.32=6.11.32;6.Y.W.19=6.11.19;7(E.1j(6.Y,"19")=="2H")6.Y.W.19="3D"}7(6.11.1I)6.Y.W.19="2H";7(6.11.1I||6.11.1G)Q(L p 1p 6.11.40)E.1J(6.Y.W,p,6.11.47[p])}7(b&&E.1q(6.11.1y))6.11.1y.1i(6.Y);K S}N{L n=t-6.5B;6.4w=n/6.11.2u;6.4B=E.3Z[6.11.3Z||(E.3Z.5j?"5j":"70")](6.4w,n,0,1,6.11.2u);6.2J=6.1Y+((6.3h-6.1Y)*6.4B);6.4y()}K P}};E.2t.30={2v:J(a){a.Y.2v=a.2J},2x:J(a){a.Y.2x=a.2J},1w:J(a){E.1J(a.Y.W,"1w",a.2J)},4G:J(a){a.Y.W[a.1l]=a.2J+a.2A}};E.1n.5L=J(){L b=0,3b=0,Y=6[0],5l;7(Y)8M(E.14){L d=Y.1a,41=Y,1K=Y.1K,1L=Y.2i,5D=2d&&4s(5K)<8J&&!/a1/i.17(v),2T=E.1j(Y,"43")=="2T";7(Y.6G){L c=Y.6G();1b(c.26+24.2f(1L.1F.2v,1L.1h.2v),c.3b+24.2f(1L.1F.2x,1L.1h.2x));1b(-1L.1F.62,-1L.1F.60)}N{1b(Y.5G,Y.5F);2b(1K){1b(1K.5G,1K.5F);7(48&&!/^t(8H|d|h)$/i.17(1K.28)||2d&&!5D)2N(1K);7(!2T&&E.1j(1K,"43")=="2T")2T=P;41=/^1h$/i.17(1K.28)?41:1K;1K=1K.1K}2b(d&&d.28&&!/^1h|3q$/i.17(d.28)){7(!/^8G|1O.*$/i.17(E.1j(d,"19")))1b(-d.2v,-d.2x);7(48&&E.1j(d,"32")!="4d")2N(d);d=d.1a}7((5D&&(2T||E.1j(41,"43")=="4W"))||(48&&E.1j(41,"43")!="4W"))1b(-1L.1h.5G,-1L.1h.5F);7(2T)1b(24.2f(1L.1F.2v,1L.1h.2v),24.2f(1L.1F.2x,1L.1h.2x))}5l={3b:3b,26:b}}J 2N(a){1b(E.2o(a,"a8",P),E.2o(a,"a9",P))}J 1b(l,t){b+=4s(l)||0;3b+=4s(t)||0}K 5l}})();',62,631,'||||||this|if||||||||||||||||||||||||||||||||||||||function|return|var|length|else|data|true|for|each|false|document|type|null|style||elem||undefined|options|nodeName||browser|nodeType|event|test|arguments|display|parentNode|add|url|msie|window|indexOf|push|body|apply|css|constructor|prop|script|fn|typeof|in|isFunction|replace|extend|className|text|handle|opacity|div|complete|status|value|new|firstChild|match|filter|documentElement|show|dataType|hide|attr|offsetParent|doc|Array|trigger|table|call|break|height|try|cache|tbody|remove|success|catch|start|hidden||ready|get|split|Math|string|left|width|tagName|ret|global|while|map|safari|animate|max|toggle|toLowerCase|ownerDocument|bind|select|prototype|cur||curCSS|selected|handler|done|find|fx|duration|scrollLeft|id|scrollTop|special|opera|unit|nextSibling|stack|guid|toUpperCase|pushStack|button|none|makeArray|now|slice|target|parseFloat|border|exec|queue|isReady|events|px|fixed|timeout|delete|jsre|one|disabled|nth|step|name|overflow|inArray|removeChild|removeData|preventDefault|merge|appendChild|readyState|error|top|which|innerHTML|multiFilter|rl|trim|end|json|first|checked|async|param|elems|insertBefore|childNodes|html|encodeURIComponent|createElement|append|form|Date|unbind|color|grep|setTimeout|readyList|mouseleave|mouseenter|block|isXMLDoc|addEventListener|timers|is|password|last|runtimeStyle|getTime|xml|jQuery|domManip|ajax|src|callee|getElementsByTagName|selectedIndex|load|object|timerId|toString|has|easing|curAnim|offsetChild|args|position|stopPropagation|custom|props|orig|mozilla|accepts|clean|responseText|defaultView|visible|String|charCode|float|teardown|on|setup|nodeIndex|shift|javascript|currentStyle|application|child|RegExp|_|parseInt|previousSibling|dir|tr|state|empty|update|getAttribute|self|pos|setRequestHeader|input|jsonp|lastModified|_default|unload|ajaxSettings|unshift|getComputedStyle|styleSheets|getPropertyValue|lastToggle|mouseout|mouseover|GET|andSelf|relatedTarget|init|visibility|click|absolute|index|container|fix|outline|Number|removeAttribute|setInterval|prevObject|classFilter|not|unique|submit|file|after|windowData|deep|scroll|client|triggered|globalEval|jquery|sibling|swing|clone|results|wrapAll|triggerHandler|lastChild|dequeue|getResponseHeader|createTextNode|oldblock|checkbox|radio|handleError|fromElement|parsererror|old|00|Modified|startTime|ifModified|safari2|getWH|offsetTop|offsetLeft|active|values|getElementById|version|offset|bindReady|processData|val|contentType|ajaxSuccess|ajaxComplete|ajaxStart|serializeArray|notmodified|loaded|DOMContentLoaded|Width|ctrlKey|keyCode|clientTop|POST|clientLeft|clientX|pageX|exclusive|detachEvent|removeEventListener|swap|cloneNode|join|attachEvent|eval|ajaxStop|substr|head|parse|textarea|reset|image|zoom|odd|ajaxSend|even|before|username|prepend|expr|quickClass|uuid|quickID|quickChild|continue|textContent|appendTo|contents|evalScript|parent|defaultValue|ajaxError|setArray|compatMode|getBoundingClientRect|styleFloat|clearInterval|httpNotModified|nodeValue|100|alpha|_toggle|href|speed|throw|304|replaceWith|200|Last|colgroup|httpData|httpSuccess|beforeSend|eq|linear|concat|splice|fieldset|multiple|cssFloat|XMLHttpRequest|webkit|ActiveXObject|CSS1Compat|link|metaKey|scriptCharset|callback|col|pixelLeft|urlencoded|www|post|hasClass|getJSON|getScript|elements|serialize|black|keyup|keypress|solid|change|mousemove|mouseup|dblclick|resize|focus|blur|stylesheet|rel|doScroll|round|hover|padding|offsetHeight|mousedown|offsetWidth|Bottom|Top|keydown|clientY|Right|pageY|Left|toElement|srcElement|cancelBubble|returnValue|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|ajaxSetup|font|size|gt|lt|uFFFF|u0128|417|Boolean|inner|Height|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|contentWindow|contentDocument|wrap|iframe|children|siblings|prevAll|nextAll|prev|wrapInner|next|parents|maxLength|maxlength|readOnly|readonly|reverse|class|htmlFor|inline|able|boxModel|522|setData|compatible|with|1px|ie|getData|10000|ra|it|rv|PI|cos|userAgent|400|navigator|600|slow|Function|Object|array|stop|ig|NaN|fadeTo|option|fadeOut|fadeIn|setAttribute|slideToggle|slideUp|changed|slideDown|be|can|property|responseXML|content|1223|getAttributeNode|300|method|protocol|location|action|send|abort|cssText|th|td|cap|specified|Accept|With|colg|Requested|fast|tfoot|GMT|thead|1970|Jan|attributes|01|Thu|leg|Since|If|opt|Type|Content|embed|open|area|XMLHTTP|hr|Microsoft|onreadystatechange|onload|meta|adobeair|charset|http|1_|img|br|plain|borderLeftWidth|borderTopWidth|abbr'.split('|'),0,{}))
\ No newline at end of file
diff --git a/site/app/webroot/js/jquery.addons.min.js b/site/app/webroot/js/jquery.addons.min.js
index 008964f..b1fafde 100644
--- a/site/app/webroot/js/jquery.addons.min.js
+++ b/site/app/webroot/js/jquery.addons.min.js
@@ -1 +1 @@
-(function(){var W=this,AB,F=W.jQuery,R=W.$,T=W.jQuery=W.$=function(B,A){return new T.fn.init(B,A)},L=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,AC=/^.[^:#\[\.,]*$/;T.fn=T.prototype={init:function(a,B){a=a||document;if(a.nodeType){this[0]=a;this.length=1;this.context=a;return this}if(typeof a==="string"){var C=L.exec(a);if(C&&(C[1]||!B)){if(C[1]){a=T.clean([C[1]],B)}else{var A=document.getElementById(C[3]);if(A&&A.id!=C[3]){return T().find(a)}var D=T(A||[]);D.context=document;D.selector=a;return D}}else{return T(B).find(a)}}else{if(T.isFunction(a)){return T(document).ready(a)}}if(a.selector&&a.context){this.selector=a.selector;this.context=a.context}return this.setArray(T.isArray(a)?a:T.makeArray(a))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(A){return A===AB?Array.prototype.slice.call(this):this[A]},pushStack:function(C,A,D){var B=T(C);B.prevObject=this;B.context=this.context;if(A==="find"){B.selector=this.selector+(this.selector?" ":"")+D}else{if(A){B.selector=this.selector+"."+A+"("+D+")"}}return B},setArray:function(A){this.length=0;Array.prototype.push.apply(this,A);return this},each:function(A,B){return T.each(this,A,B)},index:function(A){return T.inArray(A&&A.jquery?A[0]:A,this)},attr:function(C,A,B){var D=C;if(typeof C==="string"){if(A===AB){return this[0]&&T[B||"attr"](this[0],C)}else{D={};D[C]=A}}return this.each(function(a){for(C in D){T.attr(B?this.style:this,C,T.prop(this,D[C],B,a,C))}})},css:function(B,A){if((B=="width"||B=="height")&&parseFloat(A)<0){A=AB}return this.attr(B,A,"curCSS")},text:function(A){if(typeof A!=="object"&&A!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(A))}var B="";T.each(A||this,function(){T.each(this.childNodes,function(){if(this.nodeType!=8){B+=this.nodeType!=1?this.nodeValue:T.fn.text([this])}})});return B},wrapAll:function(B){if(this[0]){var A=T(B,this[0].ownerDocument).clone();if(this[0].parentNode){A.insertBefore(this[0])}A.map(function(){var C=this;while(C.firstChild){C=C.firstChild}return C}).append(this)}return this},wrapInner:function(A){return this.each(function(){T(this).contents().wrapAll(A)})},wrap:function(A){return this.each(function(){T(this).wrapAll(A)})},append:function(){return this.domManip(arguments,true,function(A){if(this.nodeType==1){this.appendChild(A)}})},prepend:function(){return this.domManip(arguments,true,function(A){if(this.nodeType==1){this.insertBefore(A,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(A){this.parentNode.insertBefore(A,this)})},after:function(){return this.domManip(arguments,false,function(A){this.parentNode.insertBefore(A,this.nextSibling)})},end:function(){return this.prevObject||T([])},push:[].push,sort:[].sort,splice:[].splice,find:function(B){if(this.length===1){var A=this.pushStack([],"find",B);A.length=0;T.find(B,this[0],A);return A}else{return this.pushStack(T.unique(T.map(this,function(C){return T.find(B,C)})),"find",B)}},clone:function(B){var D=this.map(function(){if(!T.support.noCloneEvent&&!T.isXMLDoc(this)){var c=this.outerHTML;if(!c){var a=this.ownerDocument.createElement("div");a.appendChild(this.cloneNode(true));c=a.innerHTML}return T.clean([c.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(B===true){var A=this.find("*").andSelf(),C=0;D.find("*").andSelf().each(function(){if(this.nodeName!==A[C].nodeName){return }var d=T.data(A[C],"events");for(var a in d){for(var c in d[a]){T.event.add(this,a,d[a][c],d[a][c].data)}}C++})}return D},filter:function(A){return this.pushStack(T.isFunction(A)&&T.grep(this,function(B,C){return A.call(B,C)})||T.multiFilter(A,T.grep(this,function(B){return B.nodeType===1})),"filter",A)},closest:function(C){var A=T.expr.match.POS.test(C)?T(C):null,B=0;return this.map(function(){var D=this;while(D&&D.ownerDocument){if(A?A.index(D)>-1:T(D).is(C)){T.data(D,"closest",B);return D}D=D.parentNode;B++}})},not:function(B){if(typeof B==="string"){if(AC.test(B)){return this.pushStack(T.multiFilter(B,this,true),"not",B)}else{B=T.multiFilter(B,this)}}var A=B.length&&B[B.length-1]!==AB&&!B.nodeType;return this.filter(function(){return A?T.inArray(this,B)<0:this!=B})},add:function(A){return this.pushStack(T.unique(T.merge(this.get(),typeof A==="string"?T(A):T.makeArray(A))))},is:function(A){return !!A&&T.multiFilter(A,this).length>0},hasClass:function(A){return !!A&&this.is("."+A)},val:function(C){if(C===AB){var f=this[0];if(f){if(T.nodeName(f,"option")){return(f.attributes.value||{}).specified?f.value:f.text}if(T.nodeName(f,"select")){var a=f.selectedIndex,B=[],A=f.options,c=f.type=="select-one";if(a<0){return null}for(var e=c?a:0,D=c?a+1:A.length;e<D;e++){var d=A[e];if(d.selected){C=T(d).val();if(c){return C}B.push(C)}}return B}return(f.value||"").replace(/\r/g,"")}return AB}if(typeof C==="number"){C+=""}return this.each(function(){if(this.nodeType!=1){return }if(T.isArray(C)&&/radio|checkbox/.test(this.type)){this.checked=(T.inArray(this.value,C)>=0||T.inArray(this.name,C)>=0)}else{if(T.nodeName(this,"select")){var g=T.makeArray(C);T("option",this).each(function(){this.selected=(T.inArray(this.value,g)>=0||T.inArray(this.text,g)>=0)});if(!g.length){this.selectedIndex=-1}}else{this.value=C}}})},html:function(A){return A===AB?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(A)},replaceWith:function(A){return this.after(A).remove()},eq:function(A){return this.slice(A,+A+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(A){return this.pushStack(T.map(this,function(B,C){return A.call(B,C,B)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(D,A,B){if(this[0]){var a=(this[0].ownerDocument||this[0]).createDocumentFragment(),e=T.clean(D,(this[0].ownerDocument||this[0]),a),c=a.firstChild;if(c){for(var d=0,f=this.length;d<f;d++){B.call(C(this[d],c),this.length>1||d>0?a.cloneNode(true):a)}}if(e){T.each(e,E)}}return this;function C(h,g){return A&&T.nodeName(h,"table")&&T.nodeName(g,"tr")?(h.getElementsByTagName("tbody")[0]||h.appendChild(h.ownerDocument.createElement("tbody"))):h}}};T.fn.init.prototype=T.fn;function E(B,A){if(A.src){T.ajax({url:A.src,async:false,dataType:"script"})}else{T.globalEval(A.text||A.textContent||A.innerHTML||"")}if(A.parentNode){A.parentNode.removeChild(A)}}function AD(){return +new Date}T.extend=T.fn.extend=function(){var C=arguments[0]||{},a=1,D=arguments.length,e=false,c;if(typeof C==="boolean"){e=C;C=arguments[1]||{};a=2}if(typeof C!=="object"&&!T.isFunction(C)){C={}}if(D==a){C=this;--a}for(;a<D;a++){if((c=arguments[a])!=null){for(var d in c){var B=C[d],A=c[d];if(C===A){continue}if(e&&A&&typeof A==="object"&&!A.nodeType){C[d]=T.extend(e,B||(A.length!=null?[]:{}),A)}else{if(A!==AB){C[d]=A}}}}}return C};var AG=/z-?index|font-?weight|opacity|zoom|line-?height/i,Q=document.defaultView||{},M=Object.prototype.toString;T.extend({noConflict:function(A){W.$=R;if(A){W.jQuery=F}return T},isFunction:function(A){return M.call(A)==="[object Function]"},isArray:function(A){return M.call(A)==="[object Array]"},isXMLDoc:function(A){return A.nodeType===9&&A.documentElement.nodeName!=="HTML"||!!A.ownerDocument&&T.isXMLDoc(A.ownerDocument)},globalEval:function(A){if(A&&/\S/.test(A)){var B=document.getElementsByTagName("head")[0]||document.documentElement,C=document.createElement("script");C.type="text/javascript";if(T.support.scriptEval){C.appendChild(document.createTextNode(A))}else{C.text=A}B.insertBefore(C,B.firstChild);B.removeChild(C)}},nodeName:function(A,B){return A.nodeName&&A.nodeName.toUpperCase()==B.toUpperCase()},each:function(a,A,c){var d,D=0,C=a.length;if(c){if(C===AB){for(d in a){if(A.apply(a[d],c)===false){break}}}else{for(;D<C;){if(A.apply(a[D++],c)===false){break}}}}else{if(C===AB){for(d in a){if(A.call(a[d],d,a[d])===false){break}}}else{for(var B=a[0];D<C&&A.call(B,D,B)!==false;B=a[++D]){}}}return a},prop:function(B,A,C,D,a){if(T.isFunction(A)){A=A.call(B,D)}return typeof A==="number"&&C=="curCSS"&&!AG.test(a)?A+"px":A},className:{add:function(B,A){T.each((A||"").split(/\s+/),function(D,C){if(B.nodeType==1&&!T.className.has(B.className,C)){B.className+=(B.className?" ":"")+C}})},remove:function(B,A){if(B.nodeType==1){B.className=A!==AB?T.grep(B.className.split(/\s+/),function(C){return !T.className.has(A,C)}).join(" "):""}},has:function(A,B){return A&&T.inArray(B,(A.className||A).toString().split(/\s+/))>-1}},swap:function(B,C,A){var a={};for(var D in C){a[D]=B.style[D];B.style[D]=C[D]}A.call(B);for(var D in C){B.style[D]=a[D]}},css:function(a,d,C,e){if(d=="width"||d=="height"){var A,c={position:"absolute",visibility:"hidden",display:"block"},B=d=="width"?["Left","Right"]:["Top","Bottom"];function D(){A=d=="width"?a.offsetWidth:a.offsetHeight;if(e==="border"){return }T.each(B,function(){if(!e){A-=parseFloat(T.curCSS(a,"padding"+this,true))||0}if(e==="margin"){A+=parseFloat(T.curCSS(a,"margin"+this,true))||0}else{A-=parseFloat(T.curCSS(a,"border"+this+"Width",true))||0}})}if(a.offsetWidth!==0){D()}else{T.swap(a,c,D)}return Math.max(0,Math.round(A))}return T.curCSS(a,d,C)},curCSS:function(a,e,d){var B,f=a.style;if(e=="opacity"&&!T.support.opacity){B=T.attr(f,"opacity");return B==""?"1":B}if(e.match(/float/i)){e=H}if(!d&&f&&f[e]){B=f[e]}else{if(Q.getComputedStyle){if(e.match(/float/i)){e="float"}e=e.replace(/([A-Z])/g,"-$1").toLowerCase();var A=Q.getComputedStyle(a,null);if(A){B=A.getPropertyValue(e)}if(e=="opacity"&&B==""){B="1"}}else{if(a.currentStyle){var D=e.replace(/\-(\w)/g,function(h,g){return g.toUpperCase()});B=a.currentStyle[e]||a.currentStyle[D];if(!/^\d+(px)?$/i.test(B)&&/^\d/.test(B)){var c=f.left,C=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;f.left=B||0;B=f.pixelLeft+"px";f.left=c;a.runtimeStyle.left=C}}}}return B},clean:function(d,B,D){B=B||document;if(typeof B.createElement==="undefined"){B=B.ownerDocument||B[0]&&B[0].ownerDocument||document}if(!D&&d.length===1&&typeof d[0]==="string"){var a=/^<(\w+)\s*\/?>$/.exec(d[0]);if(a){return[B.createElement(a[1])]}}var c=[],e=[],A=B.createElement("div");T.each(d,function(i,f){if(typeof f==="number"){f+=""}if(!f){return }if(typeof f==="string"){f=f.replace(/(<(\w+)[^>]*?)\/>/g,function(o,m,p){return p.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?o:m+"></"+p+">"});var j=f.replace(/^\s+/,"").substring(0,10).toLowerCase();var h=!j.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!j.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||j.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!j.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!j.indexOf("<td")||!j.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!j.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!T.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];A.innerHTML=h[1]+f+h[2];while(h[0]--){A=A.lastChild}if(!T.support.tbody){var g=/<tbody/i.test(f),k=!j.indexOf("<table")&&!g?A.firstChild&&A.firstChild.childNodes:h[1]=="<table>"&&!g?A.childNodes:[];for(var l=k.length-1;l>=0;--l){if(T.nodeName(k[l],"tbody")&&!k[l].childNodes.length){k[l].parentNode.removeChild(k[l])}}}if(!T.support.leadingWhitespace&&/^\s/.test(f)){A.insertBefore(B.createTextNode(f.match(/^\s*/)[0]),A.firstChild)}f=T.makeArray(A.childNodes)}if(f.nodeType){c.push(f)}else{c=T.merge(c,f)}});if(D){for(var C=0;c[C];C++){if(T.nodeName(c[C],"script")&&(!c[C].type||c[C].type.toLowerCase()==="text/javascript")){e.push(c[C].parentNode?c[C].parentNode.removeChild(c[C]):c[C])}else{if(c[C].nodeType===1){c.splice.apply(c,[C+1,0].concat(T.makeArray(c[C].getElementsByTagName("script"))))}D.appendChild(c[C])}}return e}return c},attr:function(C,c,B){if(!C||C.nodeType==3||C.nodeType==8){return AB}var a=!T.isXMLDoc(C),A=B!==AB;c=a&&T.props[c]||c;if(C.tagName){var d=/href|src|style/.test(c);if(c=="selected"&&C.parentNode){C.parentNode.selectedIndex}if(c in C&&a&&!d){if(A){if(c=="type"&&T.nodeName(C,"input")&&C.parentNode){throw"type property can't be changed"}C[c]=B}if(T.nodeName(C,"form")&&C.getAttributeNode(c)){return C.getAttributeNode(c).nodeValue}if(c=="tabIndex"){var D=C.getAttributeNode("tabIndex");return D&&D.specified?D.value:C.nodeName.match(/(button|input|object|select|textarea)/i)?0:C.nodeName.match(/^(a|area)$/i)&&C.href?0:AB}return C[c]}if(!T.support.style&&a&&c=="style"){return T.attr(C.style,"cssText",B)}if(A){C.setAttribute(c,""+B)}var e=!T.support.hrefNormalized&&a&&d?C.getAttribute(c,2):C.getAttribute(c);return e===null?AB:e}if(!T.support.opacity&&c=="opacity"){if(A){C.zoom=1;C.filter=(C.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(B)+""=="NaN"?"":"alpha(opacity="+B*100+")")}return C.filter&&C.filter.indexOf("opacity=")>=0?(parseFloat(C.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}c=c.replace(/-([a-z])/ig,function(g,f){return f.toUpperCase()});if(A){C[c]=B}return C[c]},trim:function(A){return(A||"").replace(/^\s+|\s+$/g,"")},makeArray:function(A){var C=[];if(A!=null){var B=A.length;if(B==null||typeof A==="string"||T.isFunction(A)||A.setInterval){C[0]=A}else{while(B){C[--B]=A[B]}}}return C},inArray:function(B,A){for(var D=0,C=A.length;D<C;D++){if(A[D]===B){return D}}return -1},merge:function(B,a){var D=0,C,A=B.length;if(!T.support.getAll){while((C=a[D++])!=null){if(C.nodeType!=8){B[A++]=C}}}else{while((C=a[D++])!=null){B[A++]=C}}return B},unique:function(A){var c=[],d={};try{for(var a=0,D=A.length;a<D;a++){var B=T.data(A[a]);if(!d[B]){d[B]=true;c.push(A[a])}}}catch(C){c=A}return c},grep:function(a,A,c){var D=[];for(var C=0,B=a.length;C<B;C++){if(!c!=!A(a[C],C)){D.push(a[C])}}return D},map:function(c,A){var a=[];for(var D=0,C=c.length;D<C;D++){var B=A(c[D],D);if(B!=null){a[a.length]=B}}return a.concat.apply([],a)}});var O=navigator.userAgent.toLowerCase();T.browser={version:(O.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(O),opera:/opera/.test(O),msie:/msie/.test(O)&&!/opera/.test(O),mozilla:/mozilla/.test(O)&&!/(compatible|webkit)/.test(O)};T.each({parent:function(A){return A.parentNode},parents:function(A){return T.dir(A,"parentNode")},next:function(A){return T.nth(A,2,"nextSibling")},prev:function(A){return T.nth(A,2,"previousSibling")},nextAll:function(A){return T.dir(A,"nextSibling")},prevAll:function(A){return T.dir(A,"previousSibling")},siblings:function(A){return T.sibling(A.parentNode.firstChild,A)},children:function(A){return T.sibling(A.firstChild)},contents:function(A){return T.nodeName(A,"iframe")?A.contentDocument||A.contentWindow.document:T.makeArray(A.childNodes)}},function(B,A){T.fn[B]=function(D){var C=T.map(this,A);if(D&&typeof D=="string"){C=T.multiFilter(D,C)}return this.pushStack(T.unique(C),B,D)}});T.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(B,A){T.fn[B]=function(e){var a=[],C=T(e);for(var D=0,d=C.length;D<d;D++){var c=(D>0?this.clone(true):this).get();T.fn[A].apply(T(C[D]),c);a=a.concat(c)}return this.pushStack(a,B,e)}});T.each({removeAttr:function(A){T.attr(this,A,"");if(this.nodeType==1){this.removeAttribute(A)}},addClass:function(A){T.className.add(this,A)},removeClass:function(A){T.className.remove(this,A)},toggleClass:function(A,B){if(typeof B!=="boolean"){B=!T.className.has(this,A)}T.className[B?"add":"remove"](this,A)},remove:function(A){if(!A||T.filter(A,[this]).length){T("*",this).add([this]).each(function(){T.event.remove(this);T.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){T(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(B,A){T.fn[B]=function(){return this.each(A,arguments)}});function Y(B,A){return B[0]&&parseInt(T.curCSS(B[0],A,true),10)||0}var AA="jQuery"+AD(),I=0,S={};T.extend({cache:{},data:function(C,D,B){C=C==W?S:C;var A=C[AA];if(!A){A=C[AA]=++I}if(D&&!T.cache[A]){T.cache[A]={}}if(B!==AB){T.cache[A][D]=B}return D?T.cache[A][D]:A},removeData:function(C,D){C=C==W?S:C;var A=C[AA];if(D){if(T.cache[A]){delete T.cache[A][D];D="";for(D in T.cache[A]){break}if(!D){T.removeData(C)}}}else{try{delete C[AA]}catch(B){if(C.removeAttribute){C.removeAttribute(AA)}}delete T.cache[A]}},queue:function(C,D,A){if(C){D=(D||"fx")+"queue";var B=T.data(C,D);if(!B||T.isArray(A)){B=T.data(C,D,T.makeArray(A))}else{if(A){B.push(A)}}}return B},dequeue:function(A,B){var D=T.queue(A,B),C=D.shift();if(!B||B==="fx"){C=D[0]}if(C!==AB){C.call(A)}}});T.fn.extend({data:function(D,B){var A=D.split(".");A[1]=A[1]?"."+A[1]:"";if(B===AB){var C=this.triggerHandler("getData"+A[1]+"!",[A[0]]);if(C===AB&&this.length){C=T.data(this[0],D)}return C===AB&&A[1]?this.data(A[0]):C}else{return this.trigger("setData"+A[1]+"!",[A[0],B]).each(function(){T.data(this,D,B)})}},removeData:function(A){return this.each(function(){T.removeData(this,A)})},queue:function(B,A){if(typeof B!=="string"){A=B;B="fx"}if(A===AB){return T.queue(this[0],B)}return this.each(function(){var C=T.queue(this,B,A);if(B=="fx"&&C.length==1){C[0].call(this)}})},dequeue:function(A){return this.each(function(){T.dequeue(this,A)})}});(function(){var B=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,e=0,i=Object.prototype.toString;var k=function(p,t,AK,AJ){AK=AK||[];t=t||document;if(t.nodeType!==1&&t.nodeType!==9){return[]}if(!p||typeof p!=="string"){return AK}var o=[],r,y,v,u,AI,s,q=true;B.lastIndex=0;while((r=B.exec(p))!==null){o.push(r[1]);if(r[2]){s=RegExp.rightContext;break}}if(o.length>1&&d.exec(p)){if(o.length===2&&h.relative[o[0]]){y=g(o[0]+o[1],t)}else{y=h.relative[o[0]]?[t]:k(o.shift(),t);while(o.length){p=o.shift();if(h.relative[p]){p+=o.shift()}y=g(p,y)}}}else{var z=AJ?{expr:o.pop(),set:l(AJ)}:k.find(o.pop(),o.length===1&&t.parentNode?t.parentNode:t,C(t));y=k.filter(z.expr,z.set);if(o.length>0){v=l(y)}else{q=false}while(o.length){var w=o.pop(),x=w;if(!h.relative[w]){w=""}else{x=o.pop()}if(x==null){x=t}h.relative[w](v,x,C(t))}}if(!v){v=y}if(!v){throw"Syntax error, unrecognized expression: "+(w||p)}if(i.call(v)==="[object Array]"){if(!q){AK.push.apply(AK,v)}else{if(t.nodeType===1){for(var m=0;v[m]!=null;m++){if(v[m]&&(v[m]===true||v[m].nodeType===1&&f(t,v[m]))){AK.push(y[m])}}}else{for(var m=0;v[m]!=null;m++){if(v[m]&&v[m].nodeType===1){AK.push(y[m])}}}}}else{l(v,AK)}if(s){k(s,t,AK,AJ);if(j){hasDuplicate=false;AK.sort(j);if(hasDuplicate){for(var m=1;m<AK.length;m++){if(AK[m]===AK[m-1]){AK.splice(m--,1)}}}}}return AK};k.matches=function(o,m){return k(o,null,null,m)};k.find=function(m,u,v){var o,q;if(!m){return[]}for(var r=0,s=h.order.length;r<s;r++){var p=h.order[r],q;if((q=h.match[p].exec(m))){var t=RegExp.leftContext;if(t.substr(t.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");o=h.find[p](q,u,v);if(o!=null){m=m.replace(h.match[p],"");break}}}}if(!o){o=u.getElementsByTagName("*")}return{set:o,expr:m}};k.filter=function(AI,AJ,x,r){var s=AI,v=[],m=AJ,p,u,o=AJ&&AJ[0]&&C(AJ[0]);while(AI&&AJ.length){for(var AK in h.filter){if((p=h.match[AK].exec(AI))!=null){var t=h.filter[AK],w,y;u=false;if(m==v){v=[]}if(h.preFilter[AK]){p=h.preFilter[AK](p,m,x,v,r,o);if(!p){u=w=true}else{if(p===true){continue}}}if(p){for(var q=0;(y=m[q])!=null;q++){if(y){w=t(y,p,q,m);var z=r^!!w;if(x&&w!=null){if(z){u=true}else{m[q]=false}}else{if(z){v.push(y);u=true}}}}}if(w!==AB){if(!x){m=v}AI=AI.replace(h.match[AK],"");if(!u){return[]}break}}}if(AI==s){if(u==null){throw"Syntax error, unrecognized expression: "+AI}else{break}}s=AI}return m};var h=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(m){return m.getAttribute("href")}},relative:{"+":function(m,u,o){var q=typeof u==="string",v=q&&!/\W/.test(u),p=q&&!v;if(v&&!o){u=u.toUpperCase()}for(var r=0,s=m.length,t;r<s;r++){if((t=m[r])){while((t=t.previousSibling)&&t.nodeType!==1){}m[r]=p||t&&t.nodeName===u?t||false:t===u}}if(p){k.filter(u,m,true)}},">":function(s,p,r){var u=typeof p==="string";if(u&&!/\W/.test(p)){p=r?p:p.toUpperCase();for(var o=0,q=s.length;o<q;o++){var t=s[o];if(t){var m=t.parentNode;s[o]=m.nodeName===p?m:false}}}else{for(var o=0,q=s.length;o<q;o++){var t=s[o];if(t){s[o]=u?t.parentNode:t.parentNode===p}}if(u){k.filter(p,s,true)}}},"":function(m,p,r){var o=e++,q=A;if(!p.match(/\W/)){var s=p=r?p:p.toUpperCase();q=D}q("parentNode",p,o,m,s,r)},"~":function(m,p,r){var o=e++,q=A;if(typeof p==="string"&&!p.match(/\W/)){var s=p=r?p:p.toUpperCase();q=D}q("previousSibling",p,o,m,s,r)}},find:{ID:function(p,o,m){if(typeof o.getElementById!=="undefined"&&!m){var q=o.getElementById(p[1]);return q?[q]:[]}},NAME:function(o,s,r){if(typeof s.getElementsByName!=="undefined"){var p=[],t=s.getElementsByName(o[1]);for(var m=0,q=t.length;m<q;m++){if(t[m].getAttribute("name")===o[1]){p.push(t[m])}}return p.length===0?null:p}},TAG:function(o,m){return m.getElementsByTagName(o[1])}},preFilter:{CLASS:function(m,p,o,q,s,r){m=" "+m[1].replace(/\\/g,"")+" ";if(r){return m}for(var u=0,t;(t=p[u])!=null;u++){if(t){if(s^(t.className&&(" "+t.className+" ").indexOf(m)>=0)){if(!o){q.push(t)}}else{if(o){p[u]=false}}}}return false},ID:function(m){return m[1].replace(/\\/g,"")},TAG:function(o,p){for(var m=0;p[m]===false;m++){}return p[m]&&C(p[m])?o[1]:o[1].toUpperCase()},CHILD:function(o){if(o[1]=="nth"){var m=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(o[2]=="even"&&"2n"||o[2]=="odd"&&"2n+1"||!/\D/.test(o[2])&&"0n+"+o[2]||o[2]);o[2]=(m[1]+(m[2]||1))-0;o[3]=m[3]-0}o[0]=e++;return o},ATTR:function(t,p,o,q,s,r){var m=t[1].replace(/\\/g,"");if(!r&&h.attrMap[m]){t[1]=h.attrMap[m]}if(t[2]==="~="){t[4]=" "+t[4]+" "}return t},PSEUDO:function(s,p,o,q,r){if(s[1]==="not"){if(s[3].match(B).length>1||/^\w/.test(s[3])){s[3]=k(s[3],null,null,p)}else{var m=k.filter(s[3],p,o,true^r);if(!o){q.push.apply(q,m)}return false}}else{if(h.match.POS.test(s[0])||h.match.CHILD.test(s[0])){return true}}return s},POS:function(m){m.unshift(true);return m}},filters:{enabled:function(m){return m.disabled===false&&m.type!=="hidden"},disabled:function(m){return m.disabled===true},checked:function(m){return m.checked===true},selected:function(m){m.parentNode.selectedIndex;return m.selected===true},parent:function(m){return !!m.firstChild},empty:function(m){return !m.firstChild},has:function(m,o,p){return !!k(p[3],m).length},header:function(m){return/h\d/i.test(m.nodeName)},text:function(m){return"text"===m.type},radio:function(m){return"radio"===m.type},checkbox:function(m){return"checkbox"===m.type},file:function(m){return"file"===m.type},password:function(m){return"password"===m.type},submit:function(m){return"submit"===m.type},image:function(m){return"image"===m.type},reset:function(m){return"reset"===m.type},button:function(m){return"button"===m.type||m.nodeName.toUpperCase()==="BUTTON"},input:function(m){return/input|select|textarea|button/i.test(m.nodeName)}},setFilters:{first:function(m,o){return o===0},last:function(o,p,q,m){return p===m.length-1},even:function(m,o){return o%2===0},odd:function(m,o){return o%2===1},lt:function(m,o,p){return o<p[3]-0},gt:function(m,o,p){return o>p[3]-0},nth:function(m,o,p){return p[3]-0==o},eq:function(m,o,p){return p[3]-0==o}},filter:{PSEUDO:function(s,o,m,r){var p=o[1],u=h.filters[p];if(u){return u(s,m,o,r)}else{if(p==="contains"){return(s.textContent||s.innerText||"").indexOf(o[3])>=0}else{if(p==="not"){var t=o[3];for(var m=0,q=t.length;m<q;m++){if(t[m]===s){return false}}return true}}}},CHILD:function(u,r){var o=r[1],t=u;switch(o){case"only":case"first":while(t=t.previousSibling){if(t.nodeType===1){return false}}if(o=="first"){return true}t=u;case"last":while(t=t.nextSibling){if(t.nodeType===1){return false}}return true;case"nth":var s=r[2],v=r[3];if(s==1&&v==0){return true}var p=r[0],w=u.parentNode;if(w&&(w.sizcache!==p||!u.nodeIndex)){var q=0;for(t=w.firstChild;t;t=t.nextSibling){if(t.nodeType===1){t.nodeIndex=++q}}w.sizcache=p}var m=u.nodeIndex-v;if(s==0){return m==0}else{return(m%s==0&&m/s>=0)}}},ID:function(m,o){return m.nodeType===1&&m.getAttribute("id")===o},TAG:function(m,o){return(o==="*"&&m.nodeType===1)||m.nodeName===o},CLASS:function(m,o){return(" "+(m.className||m.getAttribute("class"))+" ").indexOf(o)>-1},ATTR:function(s,m){var o=m[1],q=h.attrHandle[o]?h.attrHandle[o](s):s[o]!=null?s[o]:s.getAttribute(o),r=q+"",t=m[2],p=m[4];return q==null?t==="!=":t==="="?r===p:t==="*="?r.indexOf(p)>=0:t==="~="?(" "+r+" ").indexOf(p)>=0:!p?r&&q!==false:t==="!="?r!=p:t==="^="?r.indexOf(p)===0:t==="$="?r.substr(r.length-p.length)===p:t==="|="?r===p||r.substr(0,p.length+1)===p+"-":false},POS:function(s,p,o,r){var q=p[2],m=h.setFilters[q];if(m){return m(s,o,p,r)}}}};var d=h.match.POS;for(var a in h.match){h.match[a]=RegExp(h.match[a].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var l=function(m,o){m=Array.prototype.slice.call(m);if(o){o.push.apply(o,m);return o}return m};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(c){l=function(r,m){var p=m||[];if(i.call(r)==="[object Array]"){Array.prototype.push.apply(p,r)}else{if(typeof r.length==="number"){for(var o=0,q=r.length;o<q;o++){p.push(r[o])}}else{for(var o=0;r[o];o++){p.push(r[o])}}}return p}}var j;if(document.documentElement.compareDocumentPosition){j=function(o,p){var m=o.compareDocumentPosition(p)&4?-1:o===p?0:1;if(m===0){hasDuplicate=true}return m}}else{if("sourceIndex" in document.documentElement){j=function(o,p){var m=o.sourceIndex-p.sourceIndex;if(m===0){hasDuplicate=true}return m}}else{if(document.createRange){j=function(m,p){var o=m.ownerDocument.createRange(),q=p.ownerDocument.createRange();o.selectNode(m);o.collapse(true);q.selectNode(p);q.collapse(true);var r=o.compareBoundaryPoints(Range.START_TO_END,q);if(r===0){hasDuplicate=true}return r}}}}(function(){var o=document.createElement("form"),m="script"+(new Date).getTime();o.innerHTML="<input name='"+m+"'/>";var p=document.documentElement;p.insertBefore(o,p.firstChild);if(!!document.getElementById(m)){h.find.ID=function(t,s,r){if(typeof s.getElementById!=="undefined"&&!r){var q=s.getElementById(t[1]);return q?q.id===t[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===t[1]?[q]:AB:[]}};h.filter.ID=function(r,q){var s=typeof r.getAttributeNode!=="undefined"&&r.getAttributeNode("id");return r.nodeType===1&&s&&s.nodeValue===q}}p.removeChild(o)})();(function(){var m=document.createElement("div");m.appendChild(document.createComment(""));if(m.getElementsByTagName("*").length>0){h.find.TAG=function(q,r){var s=r.getElementsByTagName(q[1]);if(q[1]==="*"){var o=[];for(var p=0;s[p];p++){if(s[p].nodeType===1){o.push(s[p])}}s=o}return s}}m.innerHTML="<a href='#'></a>";if(m.firstChild&&typeof m.firstChild.getAttribute!=="undefined"&&m.firstChild.getAttribute("href")!=="#"){h.attrHandle.href=function(o){return o.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var o=k,m=document.createElement("div");m.innerHTML="<p class='TEST'></p>";if(m.querySelectorAll&&m.querySelectorAll(".TEST").length===0){return }k=function(s,t,q,p){t=t||document;if(!p&&t.nodeType===9&&!C(t)){try{return l(t.querySelectorAll(s),q)}catch(r){}}return o(s,t,q,p)};k.find=o.find;k.filter=o.filter;k.selectors=o.selectors;k.matches=o.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var m=document.createElement("div");m.innerHTML="<div class='test e'></div><div class='test'></div>";if(m.getElementsByClassName("e").length===0){return }m.lastChild.className="e";if(m.getElementsByClassName("e").length===1){return }h.order.splice(1,0,"CLASS");h.find.CLASS=function(q,p,o){if(typeof p.getElementsByClassName!=="undefined"&&!o){return p.getElementsByClassName(q[1])}}})()}function D(t,o,p,v,m,w){var x=t=="previousSibling"&&!w;for(var r=0,s=v.length;r<s;r++){var u=v[r];if(u){if(x&&u.nodeType===1){u.sizcache=p;u.sizset=r}u=u[t];var q=false;while(u){if(u.sizcache===p){q=v[u.sizset];break}if(u.nodeType===1&&!w){u.sizcache=p;u.sizset=r}if(u.nodeName===o){q=u;break}u=u[t]}v[r]=q}}}function A(t,o,p,v,m,w){var x=t=="previousSibling"&&!w;for(var r=0,s=v.length;r<s;r++){var u=v[r];if(u){if(x&&u.nodeType===1){u.sizcache=p;u.sizset=r}u=u[t];var q=false;while(u){if(u.sizcache===p){q=v[u.sizset];break}if(u.nodeType===1){if(!w){u.sizcache=p;u.sizset=r}if(typeof o!=="string"){if(u===o){q=true;break}}else{if(k.filter(o,[u]).length>0){q=u;break}}}u=u[t]}v[r]=q}}}var f=document.compareDocumentPosition?function(m,o){return m.compareDocumentPosition(o)&16}:function(m,o){return m!==o&&(m.contains?m.contains(o):true)};var C=function(m){return m.nodeType===9&&m.documentElement.nodeName!=="HTML"||!!m.ownerDocument&&C(m.ownerDocument)};var g=function(q,s){var m=[],u="",t,o=s.nodeType?[s]:s;while((t=h.match.PSEUDO.exec(q))){u+=t[0];q=q.replace(h.match.PSEUDO,"")}q=h.relative[q]?q+"*":q;for(var r=0,p=o.length;r<p;r++){k(q,o[r],m)}return k.filter(u,m)};T.find=k;T.filter=k.filter;T.expr=k.selectors;T.expr[":"]=T.expr.filters;k.selectors.filters.hidden=function(m){return m.offsetWidth===0||m.offsetHeight===0};k.selectors.filters.visible=function(m){return m.offsetWidth>0||m.offsetHeight>0};k.selectors.filters.animated=function(m){return T.grep(T.timers,function(o){return m===o.elem}).length};T.multiFilter=function(m,p,o){if(o){m=":not("+m+")"}return k.matches(m,p)};T.dir=function(o,p){var q=[],m=o[p];while(m&&m!=document){if(m.nodeType==1){q.push(m)}m=m[p]}return q};T.nth=function(r,q,o,m){q=q||1;var p=0;for(;r;r=r[o]){if(r.nodeType==1&&++p==q){break}}return r};T.sibling=function(m,o){var p=[];for(;m;m=m.nextSibling){if(m.nodeType==1&&m!=o){p.push(m)}}return p};return ;W.Sizzle=k})();T.event={add:function(C,c,D,A){if(C.nodeType==3||C.nodeType==8){return }if(C.setInterval&&C!=W){C=W}if(!D.guid){D.guid=this.guid++}if(A!==AB){var a=D;D=this.proxy(a);D.data=A}var d=T.data(C,"events")||T.data(C,"events",{}),B=T.data(C,"handle")||T.data(C,"handle",function(){return typeof T!=="undefined"&&!T.event.triggered?T.event.handle.apply(arguments.callee.elem,arguments):AB});B.elem=C;T.each(c.split(/\s+/),function(h,g){var f=g.split(".");g=f.shift();D.type=f.slice().sort().join(".");var e=d[g];if(T.event.specialAll[g]){T.event.specialAll[g].setup.call(C,A,f)}if(!e){e=d[g]={};if(!T.event.special[g]||T.event.special[g].setup.call(C,A,f)===false){if(C.addEventListener){C.addEventListener(g,B,false)}else{if(C.attachEvent){C.attachEvent("on"+g,B)}}}}e[D.guid]=D;T.event.global[g]=true});C=null},guid:1,global:{},remove:function(B,a,C){if(B.nodeType==3||B.nodeType==8){return }var c=T.data(B,"events"),d,e;if(c){if(a===AB||(typeof a==="string"&&a.charAt(0)==".")){for(var D in c){this.remove(B,D+(a||""))}}else{if(a.type){C=a.handler;a=a.type}T.each(a.split(/\s+/),function(j,h){var f=h.split(".");h=f.shift();var i=RegExp("(^|\\.)"+f.slice().sort().join(".*\\.")+"(\\.|$)");if(c[h]){if(C){delete c[h][C.guid]}else{for(var g in c[h]){if(i.test(c[h][g].type)){delete c[h][g]}}}if(T.event.specialAll[h]){T.event.specialAll[h].teardown.call(B,f)}for(d in c[h]){break}if(!d){if(!T.event.special[h]||T.event.special[h].teardown.call(B,f)===false){if(B.removeEventListener){B.removeEventListener(h,T.data(B,"handle"),false)}else{if(B.detachEvent){B.detachEvent("on"+h,T.data(B,"handle"))}}}d=null;delete c[h]}}})}for(d in c){break}if(!d){var A=T.data(B,"handle");if(A){A.elem=null}T.removeData(B,"events");T.removeData(B,"handle")}}},trigger:function(D,B,a,e){var c=D.type||D;if(!e){D=typeof D==="object"?D[AA]?D:T.extend(T.Event(c),D):T.Event(c);if(c.indexOf("!")>=0){D.type=c=c.slice(0,-1);D.exclusive=true}if(!a){D.stopPropagation();if(this.global[c]){T.each(T.cache,function(){if(this.events&&this.events[c]){T.event.trigger(D,B,this.handle.elem)}})}}if(!a||a.nodeType==3||a.nodeType==8){return AB}D.result=AB;D.target=a;B=T.makeArray(B);B.unshift(D)}D.currentTarget=a;var C=T.data(a,"handle");if(C){C.apply(a,B)}if((!a[c]||(T.nodeName(a,"a")&&c=="click"))&&a["on"+c]&&a["on"+c].apply(a,B)===false){D.result=false}if(!e&&a[c]&&!D.isDefaultPrevented()&&!(T.nodeName(a,"a")&&c=="click")){this.triggered=true;try{a[c]()}catch(A){}}this.triggered=false;if(!D.isPropagationStopped()){var d=a.parentNode||a.ownerDocument;if(d){T.event.trigger(D,B,d,true)}}},handle:function(B){var C,e;B=arguments[0]=T.event.fix(B||W.event);B.currentTarget=this;var A=B.type.split(".");B.type=A.shift();C=!A.length&&!B.exclusive;var D=RegExp("(^|\\.)"+A.slice().sort().join(".*\\.")+"(\\.|$)");e=(T.data(this,"events")||{})[B.type];for(var c in e){var a=e[c];if(C||D.test(a.type)){B.handler=a;B.data=a.data;var d=a.apply(this,arguments);if(d!==AB){B.result=d;if(d===false){B.preventDefault();B.stopPropagation()}}if(B.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(C){if(C[AA]){return C}var a=C;C=T.Event(a);for(var D=this.props.length,A;D;){A=this.props[--D];C[A]=a[A]}if(!C.target){C.target=C.srcElement||document}if(C.target.nodeType==3){C.target=C.target.parentNode}if(!C.relatedTarget&&C.fromElement){C.relatedTarget=C.fromElement==C.target?C.toElement:C.fromElement}if(C.pageX==null&&C.clientX!=null){var B=document.documentElement,c=document.body;C.pageX=C.clientX+(B&&B.scrollLeft||c&&c.scrollLeft||0)-(B.clientLeft||0);C.pageY=C.clientY+(B&&B.scrollTop||c&&c.scrollTop||0)-(B.clientTop||0)}if(!C.which&&((C.charCode||C.charCode===0)?C.charCode:C.keyCode)){C.which=C.charCode||C.keyCode}if(!C.metaKey&&C.ctrlKey){C.metaKey=C.ctrlKey}if(!C.which&&C.button){C.which=(C.button&1?1:(C.button&2?3:(C.button&4?2:0)))}return C},proxy:function(A,B){B=B||function(){return A.apply(this,arguments)};B.guid=A.guid=A.guid||B.guid||this.guid++;return B},special:{ready:{setup:P,teardown:function(){}}},specialAll:{live:{setup:function(B,A){T.event.add(this,A[0],AF)},teardown:function(A){if(A.length){var C=0,B=RegExp("(^|\\.)"+A[0]+"(\\.|$)");T.each((T.data(this,"events").live||{}),function(){if(B.test(this.type)){C++}});if(C<1){T.event.remove(this,A[0],AF)}}}}}};T.Event=function(A){if(!this.preventDefault){return new T.Event(A)}if(A&&A.type){this.originalEvent=A;this.type=A.type}else{this.type=A}this.timeStamp=AD();this[AA]=true};function X(){return false}function J(){return true}T.Event.prototype={preventDefault:function(){this.isDefaultPrevented=J;var A=this.originalEvent;if(!A){return }if(A.preventDefault){A.preventDefault()}A.returnValue=false},stopPropagation:function(){this.isPropagationStopped=J;var A=this.originalEvent;if(!A){return }if(A.stopPropagation){A.stopPropagation()}A.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=J;this.stopPropagation()},isDefaultPrevented:X,isPropagationStopped:X,isImmediatePropagationStopped:X};var AH=function(B){var C=B.relatedTarget;while(C&&C!=this){try{C=C.parentNode}catch(A){C=this}}if(C!=this){B.type=B.data;T.event.handle.apply(this,arguments)}};T.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(A,B){T.event.special[B]={setup:function(){T.event.add(this,A,AH,B)},teardown:function(){T.event.remove(this,A,AH)}}});T.fn.extend({bind:function(B,A,C){return B=="unload"?this.one(B,A,C):this.each(function(){T.event.add(this,B,C||A,C&&A)})},one:function(B,A,C){var D=T.event.proxy(C||A,function(a){T(this).unbind(a,D);return(C||A).apply(this,arguments)});return this.each(function(){T.event.add(this,B,D,C&&A)})},unbind:function(A,B){return this.each(function(){T.event.remove(this,A,B)})},trigger:function(B,A){return this.each(function(){T.event.trigger(B,A,this)})},triggerHandler:function(C,A){if(this[0]){var B=T.Event(C);B.preventDefault();B.stopPropagation();T.event.trigger(B,A,this[0]);return B.result}},toggle:function(A){var C=arguments,B=1;while(B<C.length){T.event.proxy(A,C[B++])}return this.click(T.event.proxy(A,function(D){this.lastToggle=(this.lastToggle||0)%B;D.preventDefault();return C[this.lastToggle++].apply(this,arguments)||false}))},hover:function(B,A){return this.mouseenter(B).mouseleave(A)},ready:function(A){P();if(T.isReady){A.call(document,T)}else{T.readyList.push(A)}return this},live:function(A,B){var C=T.event.proxy(B);C.guid+=this.selector+A;T(document).bind(Z(A,this.selector),this.selector,C);return this},die:function(A,B){T(document).unbind(Z(A,this.selector),B?{guid:B.guid+this.selector+A}:null);return this}});function AF(A){var D=RegExp("(^|\\.)"+A.type+"(\\.|$)"),B=true,C=[];T.each(T.data(this,"events").live||[],function(d,c){if(D.test(c.type)){var a=T(A.target).closest(c.data)[0];if(a){C.push({elem:a,fn:c})}}});C.sort(function(a,c){return T.data(a.elem,"closest")-T.data(c.elem,"closest")});T.each(C,function(){if(this.fn.call(this.elem,A,this.fn.data)===false){return(B=false)}});return B}function Z(A,B){return["live",A,B.replace(/\./g,"`").replace(/ /g,"|")].join(".")}T.extend({isReady:false,readyList:[],ready:function(){if(!T.isReady){T.isReady=true;if(T.readyList){T.each(T.readyList,function(){this.call(document,T)});T.readyList=null}T(document).triggerHandler("ready")}}});var G=false;function P(){if(G){return }G=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);T.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);T.ready()}});if(document.documentElement.doScroll&&W==W.top){(function(){if(T.isReady){return }try{document.documentElement.doScroll("left")}catch(A){setTimeout(arguments.callee,0);return }T.ready()})()}}}T.event.add(W,"load",T.ready)}T.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(A,B){T.fn[B]=function(C){return C?this.bind(B,C):this.trigger(B)}});T(W).bind("unload",function(){for(var A in T.cache){if(A!=1&&T.cache[A].handle){T.event.remove(T.cache[A].handle.elem)}}});(function(){T.support={};var c=document.documentElement,a=document.createElement("script"),A=document.createElement("div"),B="script"+(new Date).getTime();A.style.display="none";A.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var D=A.getElementsByTagName("*"),d=A.getElementsByTagName("a")[0];if(!D||!D.length||!d){return }T.support={leadingWhitespace:A.firstChild.nodeType==3,tbody:!A.getElementsByTagName("tbody").length,objectAll:!!A.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!A.getElementsByTagName("link").length,style:/red/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:d.style.opacity==="0.5",cssFloat:!!d.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};a.type="text/javascript";try{a.appendChild(document.createTextNode("window."+B+"=1;"))}catch(C){}c.insertBefore(a,c.firstChild);if(W[B]){T.support.scriptEval=true;delete W[B]}c.removeChild(a);if(A.attachEvent&&A.fireEvent){A.attachEvent("onclick",function(){T.support.noCloneEvent=false;A.detachEvent("onclick",arguments.callee)});A.cloneNode(true).fireEvent("onclick")}T(function(){var e=document.createElement("div");e.style.width=e.style.paddingLeft="1px";document.body.appendChild(e);T.boxModel=T.support.boxModel=e.offsetWidth===2;document.body.removeChild(e).style.display="none"})})();var H=T.support.cssFloat?"cssFloat":"styleFloat";T.props={"for":"htmlFor","class":"className","float":H,cssFloat:H,styleFloat:H,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};T.fn.extend({_load:T.fn.load,load:function(a,B,A){if(typeof a!=="string"){return this._load(a)}var C=a.indexOf(" ");if(C>=0){var d=a.slice(C,a.length);a=a.slice(0,C)}var D="GET";if(B){if(T.isFunction(B)){A=B;B=null}else{if(typeof B==="object"){B=T.param(B);D="POST"}}}var c=this;T.ajax({url:a,type:D,dataType:"html",data:B,complete:function(f,e){if(e=="success"||e=="notmodified"){c.html(d?T("<div/>").append(f.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(d):f.responseText)}if(A){c.each(A,[f.responseText,e,f])}}});return this},serialize:function(){return T.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?T.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(C,B){var A=T(this).val();return A==null?null:T.isArray(A)?T.map(A,function(D,a){return{name:B.name,value:D}}):{name:B.name,value:A}}).get()}});T.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(B,A){T.fn[A]=function(C){return this.bind(A,C)}});var N=AD();T.extend({get:function(D,B,A,C){if(T.isFunction(B)){A=B;B=null}return T.ajax({type:"GET",url:D,data:B,success:A,dataType:C})},getScript:function(B,A){return T.get(B,null,A,"script")},getJSON:function(C,B,A){return T.get(C,B,A,"json")},post:function(D,B,A,C){if(T.isFunction(B)){A=B;B={}}return T.ajax({type:"POST",url:D,data:B,success:A,dataType:C})},ajaxSetup:function(A){T.extend(T.ajaxSettings,A)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return W.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(h){h=T.extend(true,h,T.extend(true,{},T.ajaxSettings,h));var A,p=/=\?(&|$)/g,c,B,o=h.type.toUpperCase();if(h.data&&h.processData&&typeof h.data!=="string"){h.data=T.param(h.data)}if(h.dataType=="jsonp"){if(o=="GET"){if(!h.url.match(p)){h.url+=(h.url.match(/\?/)?"&":"?")+(h.jsonp||"callback")+"=?"}}else{if(!h.data||!h.data.match(p)){h.data=(h.data?h.data+"&":"")+(h.jsonp||"callback")+"=?"}}h.dataType="json"}if(h.dataType=="json"&&(h.data&&h.data.match(p)||h.url.match(p))){A="jsonp"+N++;if(h.data){h.data=(h.data+"").replace(p,"="+A+"$1")}h.url=h.url.replace(p,"="+A+"$1");h.dataType="script";W[A]=function(s){B=s;l();i();W[A]=AB;try{delete W[A]}catch(r){}if(m){m.removeChild(D)}}}if(h.dataType=="script"&&h.cache==null){h.cache=false}if(h.cache===false&&o=="GET"){var q=AD();var C=h.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+q+"$2");h.url=C+((C==h.url)?(h.url.match(/\?/)?"&":"?")+"_="+q:"")}if(h.data&&o=="GET"){h.url+=(h.url.match(/\?/)?"&":"?")+h.data;h.data=null}if(h.global&&!T.active++){T.event.trigger("ajaxStart")}var d=/^(\w+:)?\/\/([^\/?#]+)/.exec(h.url);if(h.dataType=="script"&&o=="GET"&&d&&(d[1]&&d[1]!=location.protocol||d[2]!=location.host)){var m=document.getElementsByTagName("head")[0];var D=document.createElement("script");D.src=h.url;if(h.scriptCharset){D.charset=h.scriptCharset}if(!A){var f=false;D.onload=D.onreadystatechange=function(){if(!f&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){f=true;l();i();D.onload=D.onreadystatechange=null;m.removeChild(D)}}}m.appendChild(D);return AB}var j=false;var k=h.xhr();if(h.username){k.open(o,h.url,h.async,h.username,h.password)}else{k.open(o,h.url,h.async)}try{if(h.data){k.setRequestHeader("Content-Type",h.contentType)}if(h.ifModified){k.setRequestHeader("If-Modified-Since",T.lastModified[h.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}k.setRequestHeader("X-Requested-With","XMLHttpRequest");k.setRequestHeader("Accept",h.dataType&&h.accepts[h.dataType]?h.accepts[h.dataType]+", */*":h.accepts._default)}catch(a){}if(h.beforeSend&&h.beforeSend(k,h)===false){if(h.global&&!--T.active){T.event.trigger("ajaxStop")}k.abort();return false}if(h.global){T.event.trigger("ajaxSend",[k,h])}var g=function(t){if(k.readyState==0){if(e){clearInterval(e);e=null;if(h.global&&!--T.active){T.event.trigger("ajaxStop")}}}else{if(!j&&k&&(k.readyState==4||t=="timeout")){j=true;if(e){clearInterval(e);e=null}c=t=="timeout"?"timeout":!T.httpSuccess(k)?"error":h.ifModified&&T.httpNotModified(k,h.url)?"notmodified":"success";if(c=="success"){try{B=T.httpData(k,h.dataType,h)}catch(r){c="parsererror"}}if(c=="success"){var s;try{s=k.getResponseHeader("Last-Modified")}catch(r){}if(h.ifModified&&s){T.lastModified[h.url]=s}if(!A){l()}}else{T.handleError(h,k,c)}i();if(t){k.abort()}if(h.async){k=null}}}};if(h.async){var e=setInterval(g,13);if(h.timeout>0){setTimeout(function(){if(k&&!j){g("timeout")}},h.timeout)}}try{k.send(h.data)}catch(a){T.handleError(h,k,null,a)}if(!h.async){g()}function l(){if(h.success){h.success(B,c)}if(h.global){T.event.trigger("ajaxSuccess",[k,h])}}function i(){if(h.complete){h.complete(k,c)}if(h.global){T.event.trigger("ajaxComplete",[k,h])}if(h.global&&!--T.active){T.event.trigger("ajaxStop")}}return k},handleError:function(C,A,D,B){if(C.error){C.error(A,D,B)}if(C.global){T.event.trigger("ajaxError",[A,C,B])}},active:0,httpSuccess:function(A){try{return !A.status&&location.protocol=="file:"||(A.status>=200&&A.status<300)||A.status==304||A.status==1223}catch(B){}return false},httpNotModified:function(B,D){try{var A=B.getResponseHeader("Last-Modified");return B.status==304||A==T.lastModified[D]}catch(C){}return false},httpData:function(A,C,D){var a=A.getResponseHeader("content-type"),c=C=="xml"||!C&&a&&a.indexOf("xml")>=0,B=c?A.responseXML:A.responseText;if(c&&B.documentElement.tagName=="parsererror"){throw"parsererror"}if(D&&D.dataFilter){B=D.dataFilter(B,C)}if(typeof B==="string"){if(C=="script"){T.globalEval(B)}if(C=="json"){B=W["eval"]("("+B+")")}}return B},param:function(D){var B=[];function A(c,a){B[B.length]=encodeURIComponent(c)+"="+encodeURIComponent(a)}if(T.isArray(D)||D.jquery){T.each(D,function(){A(this.name,this.value)})}else{for(var C in D){if(T.isArray(D[C])){T.each(D[C],function(){A(C,this)})}else{A(C,T.isFunction(D[C])?D[C]():D[C])}}}return B.join("&").replace(/%20/g,"+")}});var V={},U,AE=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function K(B,C){var A={};T.each(AE.concat.apply([],AE.slice(0,C)),function(){A[this]=B});return A}T.fn.extend({show:function(C,A){if(C){return this.animate(K("show",3),C,A)}else{for(var a=0,d=this.length;a<d;a++){var e=T.data(this[a],"olddisplay");this[a].style.display=e||"";if(T.css(this[a],"display")==="none"){var c=this[a].tagName,B;if(V[c]){B=V[c]}else{var D=T("<"+c+" />").appendTo("body");B=D.css("display");if(B==="none"){B="block"}D.remove();V[c]=B}T.data(this[a],"olddisplay",B)}}for(var a=0,d=this.length;a<d;a++){this[a].style.display=T.data(this[a],"olddisplay")||""}return this}},hide:function(B,A){if(B){return this.animate(K("hide",3),B,A)}else{for(var C=0,D=this.length;C<D;C++){var a=T.data(this[C],"olddisplay");if(!a&&a!=="none"){T.data(this[C],"olddisplay",T.css(this[C],"display"))}}for(var C=0,D=this.length;C<D;C++){this[C].style.display="none"}return this}},_toggle:T.fn.toggle,toggle:function(A,B){var C=typeof A==="boolean";return T.isFunction(A)&&T.isFunction(B)?this._toggle.apply(this,arguments):A==null||C?this.each(function(){var D=C?A:T(this).is(":hidden");T(this)[D?"show":"hide"]()}):this.animate(K("toggle",3),A,B)},fadeTo:function(C,A,B){return this.animate({opacity:A},C,B)},animate:function(A,D,B,C){var a=T.speed(D,B,C);return this[a.queue===false?"each":"queue"](function(){var d=T.extend({},a),f,c=this.nodeType==1&&T(this).is(":hidden"),e=this;for(f in A){if(A[f]=="hide"&&c||A[f]=="show"&&!c){return d.complete.call(this)}if((f=="height"||f=="width")&&this.style){d.display=T.css(this,"display");d.overflow=this.style.overflow}}if(d.overflow!=null){this.style.overflow="hidden"}d.curAnim=T.extend({},A);T.each(A,function(l,h){var i=new T.fx(e,d,l);if(/toggle|show|hide/.test(h)){i[h=="toggle"?c?"show":"hide":h](A)}else{var j=h.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),g=i.cur(true)||0;if(j){var m=parseFloat(j[2]),k=j[3]||"px";if(k!="px"){e.style[l]=(m||1)+k;g=((m||1)/i.cur(true))*g;e.style[l]=g+k}if(j[1]){m=((j[1]=="-="?-1:1)*m)+g}i.custom(g,m,k)}else{i.custom(g,h,"")}}});return true})},stop:function(B,C){var A=T.timers;if(B){this.queue([])}this.each(function(){for(var D=A.length-1;D>=0;D--){if(A[D].elem==this){if(C){A[D](true)}A.splice(D,1)}}});if(!C){this.dequeue()}return this}});T.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(B,A){T.fn[B]=function(D,C){return this.animate(A,D,C)}});T.extend({speed:function(B,A,C){var D=typeof B==="object"?B:{complete:C||!C&&A||T.isFunction(B)&&B,duration:B,easing:C&&A||A&&!T.isFunction(A)&&A};D.duration=T.fx.off?0:typeof D.duration==="number"?D.duration:T.fx.speeds[D.duration]||T.fx.speeds._default;D.old=D.complete;D.complete=function(){if(D.queue!==false){T(this).dequeue()}if(T.isFunction(D.old)){D.old.call(this)}};return D},easing:{linear:function(B,A,D,C){return D+C*B},swing:function(B,A,D,C){return((-Math.cos(B*Math.PI)/2)+0.5)*C+D}},timers:[],fx:function(B,C,A){this.options=C;this.elem=B;this.prop=A;if(!C.orig){C.orig={}}}});T.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(T.fx.step[this.prop]||T.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(A){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var B=parseFloat(T.css(this.elem,this.prop,A));return B&&B>-10000?B:parseFloat(T.curCSS(this.elem,this.prop))||0},custom:function(A,B,C){this.startTime=AD();this.start=A;this.end=B;this.unit=C||this.unit||"px";this.now=this.start;this.pos=this.state=0;var a=this;function D(c){return a.step(c)}D.elem=this.elem;if(D()&&T.timers.push(D)&&!U){U=setInterval(function(){var c=T.timers;for(var d=0;d<c.length;d++){if(!c[d]()){c.splice(d--,1)}}if(!c.length){clearInterval(U);U=AB}},13)}},show:function(){this.options.orig[this.prop]=T.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());T(this.elem).show()},hide:function(){this.options.orig[this.prop]=T.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(C){var D=AD();if(C||D>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var c=true;for(var a in this.options.curAnim){if(this.options.curAnim[a]!==true){c=false}}if(c){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(T.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){T(this.elem).hide()}if(this.options.hide||this.options.show){for(var B in this.options.curAnim){T.attr(this.elem.style,B,this.options.orig[B])}}this.options.complete.call(this.elem)}return false}else{var A=D-this.startTime;this.state=A/this.options.duration;this.pos=T.easing[this.options.easing||(T.easing.swing?"swing":"linear")](this.state,A,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};T.extend(T.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(A){T.attr(A.elem.style,"opacity",A.now)},_default:function(A){if(A.elem.style&&A.elem.style[A.prop]!=null){A.elem.style[A.prop]=A.now+A.unit}else{A.elem[A.prop]=A.now}}}});if(document.documentElement.getBoundingClientRect){T.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return T.offset.bodyOffset(this[0])}var c=this[0].getBoundingClientRect(),C=this[0].ownerDocument,d=C.body,e=C.documentElement,A=e.clientTop||d.clientTop||0,B=e.clientLeft||d.clientLeft||0,D=c.top+(self.pageYOffset||T.boxModel&&e.scrollTop||d.scrollTop)-A,a=c.left+(self.pageXOffset||T.boxModel&&e.scrollLeft||d.scrollLeft)-B;return{top:D,left:a}}}else{T.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return T.offset.bodyOffset(this[0])}T.offset.initialized||T.offset.initialize();var c=this[0],f=c.offsetParent,g=c,A=c.ownerDocument,C,e=A.documentElement,a=A.body,D=A.defaultView,h=D.getComputedStyle(c,null),B=c.offsetTop,d=c.offsetLeft;while((c=c.parentNode)&&c!==a&&c!==e){C=D.getComputedStyle(c,null);B-=c.scrollTop,d-=c.scrollLeft;if(c===f){B+=c.offsetTop,d+=c.offsetLeft;if(T.offset.doesNotAddBorder&&!(T.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(c.tagName))){B+=parseInt(C.borderTopWidth,10)||0,d+=parseInt(C.borderLeftWidth,10)||0}g=f,f=c.offsetParent}if(T.offset.subtractsBorderForOverflowNotVisible&&C.overflow!=="visible"){B+=parseInt(C.borderTopWidth,10)||0,d+=parseInt(C.borderLeftWidth,10)||0}h=C}if(h.position==="relative"||h.position==="static"){B+=a.offsetTop,d+=a.offsetLeft}if(h.position==="fixed"){B+=Math.max(e.scrollTop,a.scrollTop),d+=Math.max(e.scrollLeft,a.scrollLeft)}return{top:B,left:d}}}T.offset={initialize:function(){if(this.initialized){return }var C=document.body,f=document.createElement("div"),d,e,A,c,B,g,a=C.style.marginTop,D='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';B={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(g in B){f.style[g]=B[g]}f.innerHTML=D;C.insertBefore(f,C.firstChild);d=f.firstChild,e=d.firstChild,c=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(e.offsetTop!==5);this.doesAddBorderForTableAndCells=(c.offsetTop===5);d.style.overflow="hidden",d.style.position="relative";this.subtractsBorderForOverflowNotVisible=(e.offsetTop===-5);C.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(C.offsetTop===0);C.style.marginTop=a;C.removeChild(f);this.initialized=true},bodyOffset:function(C){T.offset.initialized||T.offset.initialize();var A=C.offsetTop,B=C.offsetLeft;if(T.offset.doesNotIncludeMarginInBodyOffset){A+=parseInt(T.curCSS(C,"marginTop",true),10)||0,B+=parseInt(T.curCSS(C,"marginLeft",true),10)||0}return{top:A,left:B}}};T.fn.extend({position:function(){var B=0,C=0,a;if(this[0]){var D=this.offsetParent(),A=this.offset(),c=/^body|html$/i.test(D[0].tagName)?{top:0,left:0}:D.offset();A.top-=Y(this,"marginTop");A.left-=Y(this,"marginLeft");c.top+=Y(D,"borderTopWidth");c.left+=Y(D,"borderLeftWidth");a={top:A.top-c.top,left:A.left-c.left}}return a},offsetParent:function(){var A=this[0].offsetParent||document.body;while(A&&(!/^body|html$/i.test(A.tagName)&&T.css(A,"position")=="static")){A=A.offsetParent}return T(A)}});T.each(["Left","Top"],function(B,C){var A="scroll"+C;T.fn[A]=function(D){if(!this[0]){return null}return D!==AB?this.each(function(){this==W||this==document?W.scrollTo(!B?D:T(W).scrollLeft(),B?D:T(W).scrollTop()):this[A]=D}):this[0]==W||this[0]==document?self[B?"pageYOffset":"pageXOffset"]||T.boxModel&&document.documentElement[A]||document.body[A]:this[0][A]}});T.each(["Height","Width"],function(B,D){var c=B?"Left":"Top",C=B?"Right":"Bottom",a=D.toLowerCase();T.fn["inner"+D]=function(){return this[0]?T.css(this[0],a,false,"padding"):null};T.fn["outer"+D]=function(d){return this[0]?T.css(this[0],a,false,d?"margin":"border"):null};var A=D.toLowerCase();T.fn[A]=function(d){return this[0]==W?document.compatMode=="CSS1Compat"&&document.documentElement["client"+D]||document.body["client"+D]:this[0]==document?Math.max(document.documentElement["client"+D],document.body["scroll"+D],document.documentElement["scroll"+D],document.body["offset"+D],document.documentElement["offset"+D]):d===AB?(this.length?T.css(this[0],A):null):this.css(A,typeof d==="string"?d:d+"px")}})})();var gPlatform=PLATFORM_WINDOWS;var gLatestVersionID=null;var gLatestAddonVersion=null;var gLatestAppVersion=null;var PLATFORM_OTHER=0;var PLATFORM_WINDOWS=1;var PLATFORM_LINUX=2;var PLATFORM_MACOSX=3;var PLATFORM_MAC=4;if(navigator.platform.indexOf("Win32")!=-1){gPlatform=PLATFORM_WINDOWS}else{if(navigator.platform.indexOf("Linux")!=-1){gPlatform=PLATFORM_LINUX}else{if(navigator.userAgent.indexOf("Mac OS X")!=-1){gPlatform=PLATFORM_MACOSX}else{if(navigator.userAgent.indexOf("MSIE 5.2")!=-1){gPlatform=PLATFORM_MACOSX}else{if(navigator.platform.indexOf("Mac")!=-1){gPlatform=PLATFORM_MAC}else{gPlatform=PLATFORM_OTHER}}}}}function getPlatformName(){if(gPlatform==PLATFORM_WINDOWS){return"Windows"}if(gPlatform==PLATFORM_LINUX){return"Linux"}if(gPlatform==PLATFORM_MACOSX){return"MacOSX"}return"Unknown"}function getInstallURL(A){var B=A.target;while(B&&!B.href){B=B.parentNode}return B&&B.href}function checkMatchUserAgentAppId(){var C=/(?:Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|Iceweasel)/;var B=navigator.userAgent;var A=C.exec(B);if(A!=null&&APP_ID==1){return true}C=/(SeaMonkey|Iceape)/;B=navigator.userAgent;A=C.exec(B);if(A!=null&&APP_ID==59){return true}return false}function install(B,A,E,D){if(B.altKey||!window.InstallTrigger||!checkMatchUserAgentAppId()){return true}var C=getInstallURL(B);if(C){var F=new Array();F[A]={URL:C,IconURL:E,toString:function(){return this.URL}};if(D){F[A].Hash=D}InstallTrigger.install(F);return false}return true}function addEngine(A){if(window.external&&("AddSearchProvider" in window.external)){window.external.AddSearchProvider(A);return false}else{alert(error_opensearch_unsupported);return true}}function fixPlatformLinks(F,D){if(gPlatform==PLATFORM_OTHER){return true}var A=getPlatformName();var E=$("#install-"+F);var B=E.find("p.install-button");var C=B.not(".platform-ALL,.platform-"+A);C.hide();C.each(function(){var G=$(this).parents(".exp-loggedout, .exp-confirmed");if($(G).length){$(G).hide()}else{$(this).hide()}});if(B.length==C.length){E.find(".exp-loggedout").hide();E.append($('<p class="not-avail"></p>').append(sprintf(addOnNotAvailableForPlatform,D,A)))}return true}function installVersusDownloadCheck(G,F,B){var D=F;var E=/Mozilla.*(Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|SeaMonkey|Iceweasel|Iceape)\/.*$/;var C=navigator.userAgent;var A=E.exec(C);if(!A||A.length<2||!checkMatchUserAgentAppId()){D=B}$("#"+G+" strong").text(D)}function addCompatibilityHints(D,K,Q,M,I,N){var A=/Mozilla.*(?:Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|Iceweasel)\/([^\s]*).*$/;var O=navigator.userAgent;var R=A.exec(O);if(!R||R.length<2){return true}var B=$("#install-"+K);var G=R[1];var C=new VersionCompare();if(C.compareVersions(G,Q)<0){var P=true}else{if(C.compareVersions(G,M)>0){var P=false}else{if(gLatestVersionID==null){var L=B.find("p.install-button");if(L.find(".platform-ALL")||L.find(".platform-"+gPlatform)){gLatestVersionID=K;var J=B.prev().prev().prev();gLatestAddonVersion=J.clone();gLatestApplicationVersion=G}}return true}}if(N){return true}var E=B.find("p:visible a");if(E.length==0){return true}var F=B.clone();F.attr("id","orig-"+K);F.hide();B.after(F);$(E).each(function(){var S=$(this).parents(".exp-loggedout");if(S.length){$(S).find(".exp-confirm-install").hide();return }var T=document.createElement("div");T.setAttribute("class","exp-loggedout");B.wrapInner(T)});var H=E.attr("href");E.removeAttr("href");E.removeAttr("onClick");E.removeAttr("title");E.css("cursor","default");E.parent().css("float","none");E.attr("frozen","true");if(H.indexOf("downloads")>0){H=H.substring(0,H.indexOf("downloads"))}else{if(H.indexOf("addons")>0){H=H.substring(0,H.indexOf("addons"))}}H=H+"addons/versions/"+D;if(P&&I){E.parent().after(sprintf(app_compat_older_version_or_ignore_check,H,"removeCompatibilityHint("+K+");return false;"))}else{if(!P&&I){E.parent().after('<br /><a href="#" onclick="removeCompatibilityHint(\''+K+"');return false;\">"+app_compat_ignore_check+"</a>");E.parent().after(app_compat_older_firefox_only)}else{if(!P){E.parent().after(app_compat_older_firefox_only)}else{E.parent().after(sprintf(app_compat_try_old_version,H))}}}if(P){if(C.compareVersions(Q,LATEST_FIREFOX_DEVEL_VERSION)>=0){E.parent().after(sprintf("<strong>"+app_compat_unreleased_version+"</strong><br />","http://www.mozilla.com/"+LANG+"/firefox/all-beta.html#"+LANG,LATEST_FIREFOX_DEVEL_VERSION))}else{if(C.compareVersions(Q,LATEST_FIREFOX_VERSION)<0){E.parent().after(sprintf("<strong>"+app_compat_update_firefox+"</strong><br />","http://www.mozilla.com/"+LANG+"/firefox/all.html#"+LANG,LATEST_FIREFOX_VERSION))}}}return true}function removeCompatibilityHint(A){var B=$("#orig-"+A);B.prev().remove();B.attr("id","install-"+A);B.show();return true}function createLatestVersionElement(C,D){var A=$("#latest-version-container");A.wrapInner("<p>"+sprintf(C,D,gLatestApplicationVersion)+"</p>");A.append(gLatestAddonVersion);var E=$("#install-"+gLatestVersionID);var B=E.clone();B.attr("id","install-0"+gLatestVersionID);A.append(B);A.attr("id","latest-version");fixPlatformLinks("0"+gLatestVersionID,"")}function replaceOptions(C,B,A){$(C+" > *").remove();for(opt in B){sel_text="";val=B[opt];opt_obj=document.createElement("option");if(val==A){opt_obj.selected="selected"}opt_obj.value=val;opt_obj.appendChild(document.createTextNode(opt));$(C).append(opt_obj)}}function emailLink(F,D,E){var A=document.getElementById(F);var C=D+"@"+E;var B=document.createElement("a");B.setAttribute("href","mailto:"+C);B.appendChild(document.createTextNode(C));A.replaceChild(B,A.lastChild)}var translation_box={switchLocale:function(A,C){var B=$(A).parent().parent().parent();if(B.find(".translation-deletelocale").size()>0){return }B.find(".selected").removeClass("selected");$(A).addClass("selected");B.find("."+C).addClass("selected");this.checkDeleteButton(B);B.find(".translation-area .input.selected").trigger("onchange");B.find("."+C).focus()},checkDeleteButton:function(B){var C=B.find(".translation-area").attr("defaultLocale");var A=B.find(".translation-tab.selected").text();if(A==C||A==""){B.find(".translation-button.remove").hide()}else{B.find(".translation-button.remove").show()}},checkLength:function(C,A){var B=$(C).parent().parent();B.find(".translation-maxlength.selected span").text(C.value.length);if(C.value.length>A){B.find(".translation-maxlength.selected").addClass("over");B.addClass("errors")}else{B.find(".translation-maxlength.selected").removeClass("over");if(B.find(".translation-area .over").size()==0){B.removeClass("errors")}}},addTab:function(A){var C=$(A).parent().parent().parent();if(C.find(".translation-deletelocale").size()>0){return }if(C.find(".translation-tab").hasClass("new")){C.find(".selected").removeClass("selected");C.find(".new").addClass("selected");return }var B='<div class="translation-tab selected new" onclick="translation_box.switchLocale(this, \'new\');"></div>';C.find(".selected").removeClass("selected");C.find(".translation-tabs").append(B);C.find(".translation-area").append($(".translation-newlocale-container").html());C.find(".translation-tab:not(.new)").each(function(D,E){C.find('.translation-newlocale select option[value="'+$(E).text()+'"]').remove()});this.checkDeleteButton(C)},addLocale:function(C,E){var G=$(C).parent().parent().parent().parent().parent();var A=G;if(E==true){G=G.parent()}var F=A.find("select").val();var B=A.find("select option:selected").text();var D='<div class="translation-tab selected" title="'+B+'" onclick="translation_box.switchLocale(this, \''+F+"');\">"+F+"</div>";G.find(".input."+F+".deleted").remove();G.find(".translation-area:not(:has(."+F+"))").each(function(K,P){var M=$(P).attr("itemID");var N="data["+$(P).attr("table")+"]"+(M!=null?"["+M+"]":"")+"["+$(P).attr("field")+"]["+F+"]";$(P).parent().find(".selected").removeClass("selected");var J=$(P).find(".input")[0].tagName.toLowerCase();var I=$(P).find(".input").attr("style");if(J=="textarea"){var O='<textarea class="input '+F+' selected" name="'+N+'" style="'+I+'"';var L=$(P).find(".input").attr("maxLength");if(L){O+=' maxLength="'+L+'" onkeyup="translation_box.checkLength(this, '+L+');" onchange="translation_box.checkLength(this, '+L+');"';var H='<div class="translation-maxlength '+F+' selected">'+$(P).find(".translation-maxlength").html()+"</div>"}O+="></textarea>"}else{if(J=="input"){var O='<input type="text" class="input '+F+' selected" value="" name="'+N+'" style="'+I+'" />';var H=""}}$(P).append(O).append(H);G.find(".translation-area .input.selected").trigger("onchange");$(P).parent().find(".translation-tabs").append(D)});A.find(".new").remove();this.checkDeleteButton(G);A.find(".translation-area .selected").focus()},confirmRemove:function(A){var B=$(A).parent().parent().parent();if(B.find(".translation-deletelocale").size()>0){return +eval(function(E,A,F,B,D,C){D=function(G){return(G<A?"":D(parseInt(G/A)))+((G=G%A)>35?String.fromCharCode(G+29):G.toString(36))};if(!"".replace(/^/,String)){while(F--){C[D(F)]=B[F]||D(F)}B=[function(G){return C[G]}];D=function(){return"\\w+"};F=1}while(F--){if(B[F]){E=E.replace(new RegExp("\\b"+D(F)+"\\b","g"),B[F])}}return E}('(J(){7(1e.3N)L w=1e.3N;L E=1e.3N=J(a,b){K 1B E.2l.4T(a,b)};7(1e.$)L D=1e.$;1e.$=E;L u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/;L G=/^.[^:#\\[\\.]*$/;E.1n=E.2l={4T:J(d,b){d=d||T;7(d.15){6[0]=d;6.M=1;K 6}N 7(1o d=="25"){L c=u.2O(d);7(c&&(c[1]||!b)){7(c[1])d=E.4a([c[1]],b);N{L a=T.5J(c[3]);7(a)7(a.2w!=c[3])K E().2s(d);N{6[0]=a;6.M=1;K 6}N d=[]}}N K 1B E(b).2s(d)}N 7(E.1q(d))K 1B E(T)[E.1n.21?"21":"3U"](d);K 6.6E(d.1k==1M&&d||(d.5h||d.M&&d!=1e&&!d.15&&d[0]!=10&&d[0].15)&&E.2I(d)||[d])},5h:"1.2.3",87:J(){K 6.M},M:0,22:J(a){K a==10?E.2I(6):6[a]},2F:J(b){L a=E(b);a.54=6;K a},6E:J(a){6.M=0;1M.2l.1g.1i(6,a);K 6},R:J(a,b){K E.R(6,a,b)},4X:J(b){L a=-1;6.R(J(i){7(6==b)a=i});K a},1J:J(c,a,b){L d=c;7(c.1k==4e)7(a==10)K 6.M&&E[b||"1J"](6[0],c)||10;N{d={};d[c]=a}K 6.R(J(i){Q(c 1p d)E.1J(b?6.W:6,c,E.1l(6,d[c],b,i,c))})},1j:J(b,a){7((b==\'27\'||b==\'1R\')&&2M(a)<0)a=10;K 6.1J(b,a,"2o")},1u:J(b){7(1o b!="3V"&&b!=V)K 6.4x().3t((6[0]&&6[0].2i||T).5r(b));L a="";E.R(b||6,J(){E.R(6.3p,J(){7(6.15!=8)a+=6.15!=1?6.6K:E.1n.1u([6])})});K a},5m:J(b){7(6[0])E(b,6[0].2i).5k().3o(6[0]).2c(J(){L a=6;2b(a.1C)a=a.1C;K a}).3t(6);K 6},8w:J(a){K 6.R(J(){E(6).6z().5m(a)})},8p:J(a){K 6.R(J(){E(6).5m(a)})},3t:J(){K 6.3O(18,P,S,J(a){7(6.15==1)6.38(a)})},6q:J(){K 6.3O(18,P,P,J(a){7(6.15==1)6.3o(a,6.1C)})},6o:J(){K 6.3O(18,S,S,J(a){6.1a.3o(a,6)})},5a:J(){K 6.3O(18,S,P,J(a){6.1a.3o(a,6.2B)})},3h:J(){K 6.54||E([])},2s:J(b){L c=E.2c(6,J(a){K E.2s(b,a)});K 6.2F(/[^+>] [^+>]/.17(b)||b.1f("..")>-1?E.57(c):c)},5k:J(e){L f=6.2c(J(){7(E.14.1d&&!E.3E(6)){L a=6.69(P),4Y=T.3s("1x");4Y.38(a);K E.4a([4Y.3d])[0]}N K 6.69(P)});L d=f.2s("*").4R().R(J(){7(6[F]!=10)6[F]=V});7(e===P)6.2s("*").4R().R(J(i){7(6.15==3)K;L c=E.O(6,"2R");Q(L a 1p c)Q(L b 1p c[a])E.16.1b(d[i],a,c[a][b],c[a][b].O)});K f},1E:J(b){K 6.2F(E.1q(b)&&E.3y(6,J(a,i){K b.1P(a,i)})||E.3e(b,6))},56:J(b){7(b.1k==4e)7(G.17(b))K 6.2F(E.3e(b,6,P));N b=E.3e(b,6);L a=b.M&&b[b.M-1]!==10&&!b.15;K 6.1E(J(){K a?E.33(6,b)<0:6!=b})},1b:J(a){K!a?6:6.2F(E.37(6.22(),a.1k==4e?E(a).22():a.M!=10&&(!a.12||E.12(a,"3u"))?a:[a]))},3H:J(a){K a?E.3e(a,6).M>0:S},7j:J(a){K 6.3H("."+a)},5O:J(b){7(b==10){7(6.M){L c=6[0];7(E.12(c,"2k")){L e=c.3T,5I=[],11=c.11,2X=c.U=="2k-2X";7(e<0)K V;Q(L i=2X?e:0,2f=2X?e+1:11.M;i<2f;i++){L d=11[i];7(d.2p){b=E.14.1d&&!d.9J.1A.9y?d.1u:d.1A;7(2X)K b;5I.1g(b)}}K 5I}N K(6[0].1A||"").1r(/\\r/g,"")}K 10}K 6.R(J(){7(6.15!=1)K;7(b.1k==1M&&/5u|5t/.17(6.U))6.3k=(E.33(6.1A,b)>=0||E.33(6.31,b)>=0);N 7(E.12(6,"2k")){L a=b.1k==1M?b:[b];E("98",6).R(J(){6.2p=(E.33(6.1A,a)>=0||E.33(6.1u,a)>=0)});7(!a.M)6.3T=-1}N 6.1A=b})},3q:J(a){K a==10?(6.M?6[0].3d:V):6.4x().3t(a)},6S:J(a){K 6.5a(a).1V()},6Z:J(i){K 6.2K(i,i+1)},2K:J(){K 6.2F(1M.2l.2K.1i(6,18))},2c:J(b){K 6.2F(E.2c(6,J(a,i){K b.1P(a,i,a)}))},4R:J(){K 6.1b(6.54)},O:J(d,b){L a=d.23(".");a[1]=a[1]?"."+a[1]:"";7(b==V){L c=6.5n("8P"+a[1]+"!",[a[0]]);7(c==10&&6.M)c=E.O(6[0],d);K c==V&&a[1]?6.O(a[0]):c}N K 6.1N("8K"+a[1]+"!",[a[0],b]).R(J(){E.O(6,d,b)})},35:J(a){K 6.R(J(){E.35(6,a)})},3O:J(g,f,h,d){L e=6.M>1,3n;K 6.R(J(){7(!3n){3n=E.4a(g,6.2i);7(h)3n.8D()}L b=6;7(f&&E.12(6,"1O")&&E.12(3n[0],"4v"))b=6.3S("1U")[0]||6.38(6.2i.3s("1U"));L c=E([]);E.R(3n,J(){L a=e?E(6).5k(P)[0]:6;7(E.12(a,"1m")){c=c.1b(a)}N{7(a.15==1)c=c.1b(E("1m",a).1V());d.1P(b,a)}});c.R(6A)})}};E.2l.4T.2l=E.2l;J 6A(i,a){7(a.3Q)E.3P({1c:a.3Q,3l:S,1H:"1m"});N E.5g(a.1u||a.6x||a.3d||"");7(a.1a)a.1a.34(a)}E.1s=E.1n.1s=J(){L b=18[0]||{},i=1,M=18.M,5c=S,11;7(b.1k==8d){5c=b;b=18[1]||{};i=2}7(1o b!="3V"&&1o b!="J")b={};7(M==1){b=6;i=0}Q(;i<M;i++)7((11=18[i])!=V)Q(L a 1p 11){7(b===11[a])6w;7(5c&&11[a]&&1o 11[a]=="3V"&&b[a]&&!11[a].15)b[a]=E.1s(b[a],11[a]);N 7(11[a]!=10)b[a]=11[a]}K b};L F="3N"+(1B 3v()).3L(),6t=0,5b={};L H=/z-?4X|86-?84|1w|6k|7Z-?1R/i;E.1s({7Y:J(a){1e.$=D;7(a)1e.3N=w;K E},1q:J(a){K!!a&&1o a!="25"&&!a.12&&a.1k!=1M&&/J/i.17(a+"")},3E:J(a){K a.1F&&!a.1h||a.28&&a.2i&&!a.2i.1h},5g:J(a){a=E.3g(a);7(a){L b=T.3S("6f")[0]||T.1F,1m=T.3s("1m");1m.U="1u/4m";7(E.14.1d)1m.1u=a;N 1m.38(T.5r(a));b.38(1m);b.34(1m)}},12:J(b,a){K b.12&&b.12.2E()==a.2E()},1T:{},O:J(c,d,b){c=c==1e?5b:c;L a=c[F];7(!a)a=c[F]=++6t;7(d&&!E.1T[a])E.1T[a]={};7(b!=10)E.1T[a][d]=b;K d?E.1T[a][d]:a},35:J(c,b){c=c==1e?5b:c;L a=c[F];7(b){7(E.1T[a]){2V E.1T[a][b];b="";Q(b 1p E.1T[a])1Q;7(!b)E.35(c)}}N{1S{2V c[F]}1X(e){7(c.52)c.52(F)}2V E.1T[a]}},R:J(c,a,b){7(b){7(c.M==10){Q(L d 1p c)7(a.1i(c[d],b)===S)1Q}N Q(L i=0,M=c.M;i<M;i++)7(a.1i(c[i],b)===S)1Q}N{7(c.M==10){Q(L d 1p c)7(a.1P(c[d],d,c[d])===S)1Q}N Q(L i=0,M=c.M,1A=c[0];i<M&&a.1P(1A,i,1A)!==S;1A=c[++i]){}}K c},1l:J(b,a,c,i,d){7(E.1q(a))a=a.1P(b,i);K a&&a.1k==51&&c=="2o"&&!H.17(d)?a+"2S":a},1t:{1b:J(c,b){E.R((b||"").23(/\\s+/),J(i,a){7(c.15==1&&!E.1t.3Y(c.1t,a))c.1t+=(c.1t?" ":"")+a})},1V:J(c,b){7(c.15==1)c.1t=b!=10?E.3y(c.1t.23(/\\s+/),J(a){K!E.1t.3Y(b,a)}).6a(" "):""},3Y:J(b,a){K E.33(a,(b.1t||b).3X().23(/\\s+/))>-1}},68:J(b,c,a){L e={};Q(L d 1p c){e[d]=b.W[d];b.W[d]=c[d]}a.1P(b);Q(L d 1p c)b.W[d]=e[d]},1j:J(d,e,c){7(e=="27"||e=="1R"){L b,46={43:"4W",4U:"1Z",19:"3D"},3c=e=="27"?["7O","7M"]:["7J","7I"];J 5E(){b=e=="27"?d.7H:d.7F;L a=0,2N=0;E.R(3c,J(){a+=2M(E.2o(d,"7E"+6,P))||0;2N+=2M(E.2o(d,"2N"+6+"5X",P))||0});b-=24.7C(a+2N)}7(E(d).3H(":4d"))5E();N E.68(d,46,5E);K 24.2f(0,b)}K E.2o(d,e,c)},2o:J(e,k,j){L d;J 3x(b){7(!E.14.2d)K S;L a=T.4c.4K(b,V);K!a||a.4M("3x")==""}7(k=="1w"&&E.14.1d){d=E.1J(e.W,"1w");K d==""?"1":d}7(E.14.2z&&k=="19"){L c=e.W.50;e.W.50="0 7r 7o";e.W.50=c}7(k.1D(/4g/i))k=y;7(!j&&e.W&&e.W[k])d=e.W[k];N 7(T.4c&&T.4c.4K){7(k.1D(/4g/i))k="4g";k=k.1r(/([A-Z])/g,"-$1").2h();L h=T.4c.4K(e,V);7(h&&!3x(e))d=h.4M(k);N{L f=[],2C=[];Q(L a=e;a&&3x(a);a=a.1a)2C.4J(a);Q(L i=0;i<2C.M;i++)7(3x(2C[i])){f[i]=2C[i].W.19;2C[i].W.19="3D"}d=k=="19"&&f[2C.M-1]!=V?"2H":(h&&h.4M(k))||"";Q(L i=0;i<f.M;i++)7(f[i]!=V)2C[i].W.19=f[i]}7(k=="1w"&&d=="")d="1"}N 7(e.4n){L g=k.1r(/\\-(\\w)/g,J(a,b){K b.2E()});d=e.4n[k]||e.4n[g];7(!/^\\d+(2S)?$/i.17(d)&&/^\\d/.17(d)){L l=e.W.26,3K=e.3K.26;e.3K.26=e.4n.26;e.W.26=d||0;d=e.W.7f+"2S";e.W.26=l;e.3K.26=3K}}K d},4a:J(l,h){L k=[];h=h||T;7(1o h.3s==\'10\')h=h.2i||h[0]&&h[0].2i||T;E.R(l,J(i,d){7(!d)K;7(d.1k==51)d=d.3X();7(1o d=="25"){d=d.1r(/(<(\\w+)[^>]*?)\\/>/g,J(b,a,c){K c.1D(/^(aa|a6|7e|a5|4D|7a|a0|3m|9W|9U|9S)$/i)?b:a+"></"+c+">"});L f=E.3g(d).2h(),1x=h.3s("1x");L e=!f.1f("<9P")&&[1,"<2k 74=\'74\'>","</2k>"]||!f.1f("<9M")&&[1,"<73>","</73>"]||f.1D(/^<(9G|1U|9E|9B|9x)/)&&[1,"<1O>","</1O>"]||!f.1f("<4v")&&[2,"<1O><1U>","</1U></1O>"]||(!f.1f("<9w")||!f.1f("<9v"))&&[3,"<1O><1U><4v>","</4v></1U></1O>"]||!f.1f("<7e")&&[2,"<1O><1U></1U><6V>","</6V></1O>"]||E.14.1d&&[1,"1x<1x>","</1x>"]||[0,"",""];1x.3d=e[1]+d+e[2];2b(e[0]--)1x=1x.5o;7(E.14.1d){L g=!f.1f("<1O")&&f.1f("<1U")<0?1x.1C&&1x.1C.3p:e[1]=="<1O>"&&f.1f("<1U")<0?1x.3p:[];Q(L j=g.M-1;j>=0;--j)7(E.12(g[j],"1U")&&!g[j].3p.M)g[j].1a.34(g[j]);7(/^\\s/.17(d))1x.3o(h.5r(d.1D(/^\\s*/)[0]),1x.1C)}d=E.2I(1x.3p)}7(d.M===0&&(!E.12(d,"3u")&&!E.12(d,"2k")))K;7(d[0]==10||E.12(d,"3u")||d.11)k.1g(d);N k=E.37(k,d)});K k},1J:J(d,e,c){7(!d||d.15==3||d.15==8)K 10;L f=E.3E(d)?{}:E.46;7(e=="2p"&&E.14.2d)d.1a.3T;7(f[e]){7(c!=10)d[f[e]]=c;K d[f[e]]}N 7(E.14.1d&&e=="W")K E.1J(d.W,"9u",c);N 7(c==10&&E.14.1d&&E.12(d,"3u")&&(e=="9r"||e=="9o"))K d.9m(e).6K;N 7(d.28){7(c!=10){7(e=="U"&&E.12(d,"4D")&&d.1a)6Q"U 9i 9h\'t 9g 9e";d.9b(e,""+c)}7(E.14.1d&&/6O|3Q/.17(e)&&!E.3E(d))K d.4z(e,2);K d.4z(e)}N{7(e=="1w"&&E.14.1d){7(c!=10){d.6k=1;d.1E=(d.1E||"").1r(/6M\\([^)]*\\)/,"")+(2M(c).3X()=="96"?"":"6M(1w="+c*6L+")")}K d.1E&&d.1E.1f("1w=")>=0?(2M(d.1E.1D(/1w=([^)]*)/)[1])/6L).3X():""}e=e.1r(/-([a-z])/95,J(a,b){K b.2E()});7(c!=10)d[e]=c;K d[e]}},3g:J(a){K(a||"").1r(/^\\s+|\\s+$/g,"")},2I:J(b){L a=[];7(1o b!="93")Q(L i=0,M=b.M;i<M;i++)a.1g(b[i]);N a=b.2K(0);K a},33:J(b,a){Q(L i=0,M=a.M;i<M;i++)7(a[i]==b)K i;K-1},37:J(a,b){7(E.14.1d){Q(L i=0;b[i];i++)7(b[i].15!=8)a.1g(b[i])}N Q(L i=0;b[i];i++)a.1g(b[i]);K a},57:J(a){L c=[],2r={};1S{Q(L i=0,M=a.M;i<M;i++){L b=E.O(a[i]);7(!2r[b]){2r[b]=P;c.1g(a[i])}}}1X(e){c=a}K c},3y:J(c,a,d){L b=[];Q(L i=0,M=c.M;i<M;i++)7(!d&&a(c[i],i)||d&&!a(c[i],i))b.1g(c[i]);K b},2c:J(d,a){L c=[];Q(L i=0,M=d.M;i<M;i++){L b=a(d[i],i);7(b!==V&&b!=10){7(b.1k!=1M)b=[b];c=c.71(b)}}K c}});L v=8Y.8W.2h();E.14={5K:(v.1D(/.+(?:8T|8S|8R|8O)[\\/: ]([\\d.]+)/)||[])[1],2d:/77/.17(v),2z:/2z/.17(v),1d:/1d/.17(v)&&!/2z/.17(v),48:/48/.17(v)&&!/(8L|77)/.17(v)};L y=E.14.1d?"6H":"75";E.1s({8I:!E.14.1d||T.6F=="79",46:{"Q":"8F","8E":"1t","4g":y,75:y,6H:y,3d:"3d",1t:"1t",1A:"1A",2Y:"2Y",3k:"3k",8C:"8B",2p:"2p",8A:"8z",3T:"3T",6C:"6C",28:"28",12:"12"}});E.R({6B:J(a){K a.1a},8y:J(a){K E.4u(a,"1a")},8x:J(a){K E.2Z(a,2,"2B")},8v:J(a){K E.2Z(a,2,"4t")},8u:J(a){K E.4u(a,"2B")},8t:J(a){K E.4u(a,"4t")},8s:J(a){K E.5i(a.1a.1C,a)},8r:J(a){K E.5i(a.1C)},6z:J(a){K E.12(a,"8q")?a.8o||a.8n.T:E.2I(a.3p)}},J(c,d){E.1n[c]=J(b){L a=E.2c(6,d);7(b&&1o b=="25")a=E.3e(b,a);K 6.2F(E.57(a))}});E.R({6y:"3t",8m:"6q",3o:"6o",8l:"5a",8k:"6S"},J(c,b){E.1n[c]=J(){L a=18;K 6.R(J(){Q(L i=0,M=a.M;i<M;i++)E(a[i])[b](6)})}});E.R({8j:J(a){E.1J(6,a,"");7(6.15==1)6.52(a)},8i:J(a){E.1t.1b(6,a)},8h:J(a){E.1t.1V(6,a)},8g:J(a){E.1t[E.1t.3Y(6,a)?"1V":"1b"](6,a)},1V:J(a){7(!a||E.1E(a,[6]).r.M){E("*",6).1b(6).R(J(){E.16.1V(6);E.35(6)});7(6.1a)6.1a.34(6)}},4x:J(){E(">*",6).1V();2b(6.1C)6.34(6.1C)}},J(a,b){E.1n[a]=J(){K 6.R(b,18)}});E.R(["8f","5X"],J(i,c){L b=c.2h();E.1n[b]=J(a){K 6[0]==1e?E.14.2z&&T.1h["5e"+c]||E.14.2d&&1e["8e"+c]||T.6F=="79"&&T.1F["5e"+c]||T.1h["5e"+c]:6[0]==T?24.2f(24.2f(T.1h["5d"+c],T.1F["5d"+c]),24.2f(T.1h["5L"+c],T.1F["5L"+c])):a==10?(6.M?E.1j(6[0],b):V):6.1j(b,a.1k==4e?a:a+"2S")}});L C=E.14.2d&&4s(E.14.5K)<8c?"(?:[\\\\w*4r-]|\\\\\\\\.)":"(?:[\\\\w\\8b-\\8a*4r-]|\\\\\\\\.)",6v=1B 4q("^>\\\\s*("+C+"+)"),6u=1B 4q("^("+C+"+)(#)("+C+"+)"),6s=1B 4q("^([#.]?)("+C+"*)");E.1s({6r:{"":J(a,i,m){K m[2]=="*"||E.12(a,m[2])},"#":J(a,i,m){K a.4z("2w")==m[2]},":":{89:J(a,i,m){K i<m[3]-0},88:J(a,i,m){K i>m[3]-0},2Z:J(a,i,m){K m[3]-0==i},6Z:J(a,i,m){K m[3]-0==i},3j:J(a,i){K i==0},3J:J(a,i,m,r){K i==r.M-1},6n:J(a,i){K i%2==0},6l:J(a,i){K i%2},"3j-4p":J(a){K a.1a.3S("*")[0]==a},"3J-4p":J(a){K E.2Z(a.1a.5o,1,"4t")==a},"83-4p":J(a){K!E.2Z(a.1a.5o,2,"4t")},6B:J(a){K a.1C},4x:J(a){K!a.1C},82:J(a,i,m){K(a.6x||a.81||E(a).1u()||"").1f(m[3])>=0},4d:J(a){K"1Z"!=a.U&&E.1j(a,"19")!="2H"&&E.1j(a,"4U")!="1Z"},1Z:J(a){K"1Z"==a.U||E.1j(a,"19")=="2H"||E.1j(a,"4U")=="1Z"},80:J(a){K!a.2Y},2Y:J(a){K a.2Y},3k:J(a){K a.3k},2p:J(a){K a.2p||E.1J(a,"2p")},1u:J(a){K"1u"==a.U},5u:J(a){K"5u"==a.U},5t:J(a){K"5t"==a.U},59:J(a){K"59"==a.U},3I:J(a){K"3I"==a.U},58:J(a){K"58"==a.U},6j:J(a){K"6j"==a.U},6i:J(a){K"6i"==a.U},2G:J(a){K"2G"==a.U||E.12(a,"2G")},4D:J(a){K/4D|2k|6h|2G/i.17(a.12)},3Y:J(a,i,m){K E.2s(m[3],a).M},7X:J(a){K/h\\d/i.17(a.12)},7W:J(a){K E.3y(E.3G,J(b){K a==b.Y}).M}}},6g:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,1B 4q("^([:.#]*)("+C+"+)")],3e:J(a,c,b){L d,2m=[];2b(a&&a!=d){d=a;L f=E.1E(a,c,b);a=f.t.1r(/^\\s*,\\s*/,"");2m=b?c=f.r:E.37(2m,f.r)}K 2m},2s:J(t,p){7(1o t!="25")K[t];7(p&&p.15!=1&&p.15!=9)K[];p=p||T;L d=[p],2r=[],3J,12;2b(t&&3J!=t){L r=[];3J=t;t=E.3g(t);L o=S;L g=6v;L m=g.2O(t);7(m){12=m[1].2E();Q(L i=0;d[i];i++)Q(L c=d[i].1C;c;c=c.2B)7(c.15==1&&(12=="*"||c.12.2E()==12))r.1g(c);d=r;t=t.1r(g,"");7(t.1f(" ")==0)6w;o=P}N{g=/^([>+~])\\s*(\\w*)/i;7((m=g.2O(t))!=V){r=[];L l={};12=m[2].2E();m=m[1];Q(L j=0,3f=d.M;j<3f;j++){L n=m=="~"||m=="+"?d[j].2B:d[j].1C;Q(;n;n=n.2B)7(n.15==1){L h=E.O(n);7(m=="~"&&l[h])1Q;7(!12||n.12.2E()==12){7(m=="~")l[h]=P;r.1g(n)}7(m=="+")1Q}}d=r;t=E.3g(t.1r(g,""));o=P}}7(t&&!o){7(!t.1f(",")){7(p==d[0])d.4l();2r=E.37(2r,d);r=d=[p];t=" "+t.6e(1,t.M)}N{L k=6u;L m=k.2O(t);7(m){m=[0,m[2],m[3],m[1]]}N{k=6s;m=k.2O(t)}m[2]=m[2].1r(/\\\\/g,"");L f=d[d.M-1];7(m[1]=="#"&&f&&f.5J&&!E.3E(f)){L q=f.5J(m[2]);7((E.14.1d||E.14.2z)&&q&&1o q.2w=="25"&&q.2w!=m[2])q=E(\'[@2w="\'+m[2]+\'"]\',f)[0];d=r=q&&(!m[3]||E.12(q,m[3]))?[q]:[]}N{Q(L i=0;d[i];i++){L a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];7(a=="*"&&d[i].12.2h()=="3V")a="3m";r=E.37(r,d[i].3S(a))}7(m[1]==".")r=E.55(r,m[2]);7(m[1]=="#"){L e=[];Q(L i=0;r[i];i++)7(r[i].4z("2w")==m[2]){e=[r[i]];1Q}r=e}d=r}t=t.1r(k,"")}}7(t){L b=E.1E(t,r);d=r=b.r;t=E.3g(b.t)}}7(t)d=[];7(d&&p==d[0])d.4l();2r=E.37(2r,d);K 2r},55:J(r,m,a){m=" "+m+" ";L c=[];Q(L i=0;r[i];i++){L b=(" "+r[i].1t+" ").1f(m)>=0;7(!a&&b||a&&!b)c.1g(r[i])}K c},1E:J(t,r,h){L d;2b(t&&t!=d){d=t;L p=E.6g,m;Q(L i=0;p[i];i++){m=p[i].2O(t);7(m){t=t.7V(m[0].M);m[2]=m[2].1r(/\\\\/g,"");1Q}}7(!m)1Q;7(m[1]==":"&&m[2]=="56")r=G.17(m[3])?E.1E(m[3],r,P).r:E(r).56(m[3]);N 7(m[1]==".")r=E.55(r,m[2],h);N 7(m[1]=="["){L g=[],U=m[3];Q(L i=0,3f=r.M;i<3f;i++){L a=r[i],z=a[E.46[m[2]]||m[2]];7(z==V||/6O|3Q|2p/.17(m[2]))z=E.1J(a,m[2])||\'\';7((U==""&&!!z||U=="="&&z==m[5]||U=="!="&&z!=m[5]||U=="^="&&z&&!z.1f(m[5])||U=="$="&&z.6e(z.M-m[5].M)==m[5]||(U=="*="||U=="~=")&&z.1f(m[5])>=0)^h)g.1g(a)}r=g}N 7(m[1]==":"&&m[2]=="2Z-4p"){L e={},g=[],17=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2O(m[3]=="6n"&&"2n"||m[3]=="6l"&&"2n+1"||!/\\D/.17(m[3])&&"7U+"+m[3]||m[3]),3j=(17[1]+(17[2]||1))-0,d=17[3]-0;Q(L i=0,3f=r.M;i<3f;i++){L j=r[i],1a=j.1a,2w=E.O(1a);7(!e[2w]){L c=1;Q(L n=1a.1C;n;n=n.2B)7(n.15==1)n.4k=c++;e[2w]=P}L b=S;7(3j==0){7(j.4k==d)b=P}N 7((j.4k-d)%3j==0&&(j.4k-d)/3j>=0)b=P;7(b^h)g.1g(j)}r=g}N{L f=E.6r[m[1]];7(1o f=="3V")f=f[m[2]];7(1o f=="25")f=6c("S||J(a,i){K "+f+";}");r=E.3y(r,J(a,i){K f(a,i,m,r)},h)}}K{r:r,t:t}},4u:J(b,c){L d=[];L a=b[c];2b(a&&a!=T){7(a.15==1)d.1g(a);a=a[c]}K d},2Z:J(a,e,c,b){e=e||1;L d=0;Q(;a;a=a[c])7(a.15==1&&++d==e)1Q;K a},5i:J(n,a){L r=[];Q(;n;n=n.2B){7(n.15==1&&(!a||n!=a))r.1g(n)}K r}});E.16={1b:J(f,i,g,e){7(f.15==3||f.15==8)K;7(E.14.1d&&f.53!=10)f=1e;7(!g.2D)g.2D=6.2D++;7(e!=10){L h=g;g=J(){K h.1i(6,18)};g.O=e;g.2D=h.2D}L j=E.O(f,"2R")||E.O(f,"2R",{}),1v=E.O(f,"1v")||E.O(f,"1v",J(){L a;7(1o E=="10"||E.16.5f)K a;a=E.16.1v.1i(18.3R.Y,18);K a});1v.Y=f;E.R(i.23(/\\s+/),J(c,b){L a=b.23(".");b=a[0];g.U=a[1];L d=j[b];7(!d){d=j[b]={};7(!E.16.2y[b]||E.16.2y[b].4j.1P(f)===S){7(f.3F)f.3F(b,1v,S);N 7(f.6b)f.6b("4i"+b,1v)}}d[g.2D]=g;E.16.2a[b]=P});f=V},2D:1,2a:{},1V:J(e,h,f){7(e.15==3||e.15==8)K;L i=E.O(e,"2R"),29,4X;7(i){7(h==10||(1o h=="25"&&h.7T(0)=="."))Q(L g 1p i)6.1V(e,g+(h||""));N{7(h.U){f=h.2q;h=h.U}E.R(h.23(/\\s+/),J(b,a){L c=a.23(".");a=c[0];7(i[a]){7(f)2V i[a][f.2D];N Q(f 1p i[a])7(!c[1]||i[a][f].U==c[1])2V i[a][f];Q(29 1p i[a])1Q;7(!29){7(!E.16.2y[a]||E.16.2y[a].4h.1P(e)===S){7(e.67)e.67(a,E.O(e,"1v"),S);N 7(e.66)e.66("4i"+a,E.O(e,"1v"))}29=V;2V i[a]}}})}Q(29 1p i)1Q;7(!29){L d=E.O(e,"1v");7(d)d.Y=V;E.35(e,"2R");E.35(e,"1v")}}},1N:J(g,c,d,f,h){c=E.2I(c||[]);7(g.1f("!")>=0){g=g.2K(0,-1);L a=P}7(!d){7(6.2a[g])E("*").1b([1e,T]).1N(g,c)}N{7(d.15==3||d.15==8)K 10;L b,29,1n=E.1q(d[g]||V),16=!c[0]||!c[0].36;7(16)c.4J(6.4Z({U:g,2L:d}));c[0].U=g;7(a)c[0].65=P;7(E.1q(E.O(d,"1v")))b=E.O(d,"1v").1i(d,c);7(!1n&&d["4i"+g]&&d["4i"+g].1i(d,c)===S)b=S;7(16)c.4l();7(h&&E.1q(h)){29=h.1i(d,b==V?c:c.71(b));7(29!==10)b=29}7(1n&&f!==S&&b!==S&&!(E.12(d,\'a\')&&g=="4V")){6.5f=P;1S{d[g]()}1X(e){}}6.5f=S}K b},1v:J(c){L a;c=E.16.4Z(c||1e.16||{});L b=c.U.23(".");c.U=b[0];L f=E.O(6,"2R")&&E.O(6,"2R")[c.U],42=1M.2l.2K.1P(18,1);42.4J(c);Q(L j 1p f){L d=f[j];42[0].2q=d;42[0].O=d.O;7(!b[1]&&!c.65||d.U==b[1]){L e=d.1i(6,42);7(a!==S)a=e;7(e===S){c.36();c.44()}}}7(E.14.1d)c.2L=c.36=c.44=c.2q=c.O=V;K a},4Z:J(c){L a=c;c=E.1s({},a);c.36=J(){7(a.36)a.36();a.7S=S};c.44=J(){7(a.44)a.44();a.7R=P};7(!c.2L)c.2L=c.7Q||T;7(c.2L.15==3)c.2L=a.2L.1a;7(!c.4S&&c.5w)c.4S=c.5w==c.2L?c.7P:c.5w;7(c.64==V&&c.63!=V){L b=T.1F,1h=T.1h;c.64=c.63+(b&&b.2v||1h&&1h.2v||0)-(b.62||0);c.7N=c.7L+(b&&b.2x||1h&&1h.2x||0)-(b.60||0)}7(!c.3c&&((c.4f||c.4f===0)?c.4f:c.5Z))c.3c=c.4f||c.5Z;7(!c.7b&&c.5Y)c.7b=c.5Y;7(!c.3c&&c.2G)c.3c=(c.2G&1?1:(c.2G&2?3:(c.2G&4?2:0)));K c},2y:{21:{4j:J(){5M();K},4h:J(){K}},3C:{4j:J(){7(E.14.1d)K S;E(6).2j("4P",E.16.2y.3C.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4P",E.16.2y.3C.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3C";K E.16.1v.1i(6,18)}},3B:{4j:J(){7(E.14.1d)K S;E(6).2j("4O",E.16.2y.3B.2q);K P},4h:J(){7(E.14.1d)K S;E(6).3w("4O",E.16.2y.3B.2q);K P},2q:J(a){7(I(a,6))K P;18[0].U="3B";K E.16.1v.1i(6,18)}}}};E.1n.1s({2j:J(c,a,b){K c=="4H"?6.2X(c,a,b):6.R(J(){E.16.1b(6,c,b||a,b&&a)})},2X:J(d,b,c){K 6.R(J(){E.16.1b(6,d,J(a){E(6).3w(a);K(c||b).1i(6,18)},c&&b)})},3w:J(a,b){K 6.R(J(){E.16.1V(6,a,b)})},1N:J(c,a,b){K 6.R(J(){E.16.1N(c,a,6,P,b)})},5n:J(c,a,b){7(6[0])K E.16.1N(c,a,6[0],S,b);K 10},2g:J(){L b=18;K 6.4V(J(a){6.4N=0==6.4N?1:0;a.36();K b[6.4N].1i(6,18)||S})},7D:J(a,b){K 6.2j(\'3C\',a).2j(\'3B\',b)},21:J(a){5M();7(E.2Q)a.1P(T,E);N E.3A.1g(J(){K a.1P(6,E)});K 6}});E.1s({2Q:S,3A:[],21:J(){7(!E.2Q){E.2Q=P;7(E.3A){E.R(E.3A,J(){6.1i(T)});E.3A=V}E(T).5n("21")}}});L x=S;J 5M(){7(x)K;x=P;7(T.3F&&!E.14.2z)T.3F("5W",E.21,S);7(E.14.1d&&1e==3b)(J(){7(E.2Q)K;1S{T.1F.7B("26")}1X(3a){3z(18.3R,0);K}E.21()})();7(E.14.2z)T.3F("5W",J(){7(E.2Q)K;Q(L i=0;i<T.4L.M;i++)7(T.4L[i].2Y){3z(18.3R,0);K}E.21()},S);7(E.14.2d){L a;(J(){7(E.2Q)K;7(T.39!="5V"&&T.39!="1y"){3z(18.3R,0);K}7(a===10)a=E("W, 7a[7A=7z]").M;7(T.4L.M!=a){3z(18.3R,0);K}E.21()})()}E.16.1b(1e,"3U",E.21)}E.R(("7y,7x,3U,7w,5d,4H,4V,7v,"+"7G,7u,7t,4P,4O,7s,2k,"+"58,7K,7q,7p,3a").23(","),J(i,b){E.1n[b]=J(a){K a?6.2j(b,a):6.1N(b)}});L I=J(a,c){L b=a.4S;2b(b&&b!=c)1S{b=b.1a}1X(3a){b=c}K b==c};E(1e).2j("4H",J(){E("*").1b(T).3w()});E.1n.1s({3U:J(g,d,c){7(E.1q(g))K 6.2j("3U",g);L e=g.1f(" ");7(e>=0){L i=g.2K(e,g.M);g=g.2K(0,e)}c=c||J(){};L f="4Q";7(d)7(E.1q(d)){c=d;d=V}N{d=E.3m(d);f="61"}L h=6;E.3P({1c:g,U:f,1H:"3q",O:d,1y:J(a,b){7(b=="1W"||b=="5U")h.3q(i?E("<1x/>").3t(a.4b.1r(/<1m(.|\\s)*?\\/1m>/g,"")).2s(i):a.4b);h.R(c,[a.4b,b,a])}});K 6},7n:J(){K E.3m(6.5T())},5T:J(){K 6.2c(J(){K E.12(6,"3u")?E.2I(6.7m):6}).1E(J(){K 6.31&&!6.2Y&&(6.3k||/2k|6h/i.17(6.12)||/1u|1Z|3I/i.17(6.U))}).2c(J(i,c){L b=E(6).5O();K b==V?V:b.1k==1M?E.2c(b,J(a,i){K{31:c.31,1A:a}}):{31:c.31,1A:b}}).22()}});E.R("5S,6d,5R,6D,5Q,6m".23(","),J(i,o){E.1n[o]=J(f){K 6.2j(o,f)}});L B=(1B 3v).3L();E.1s({22:J(d,b,a,c){7(E.1q(b)){a=b;b=V}K E.3P({U:"4Q",1c:d,O:b,1W:a,1H:c})},7l:J(b,a){K E.22(b,V,a,"1m")},7k:J(c,b,a){K E.22(c,b,a,"3i")},7i:J(d,b,a,c){7(E.1q(b)){a=b;b={}}K E.3P({U:"61",1c:d,O:b,1W:a,1H:c})},85:J(a){E.1s(E.4I,a)},4I:{2a:P,U:"4Q",2U:0,5P:"4o/x-7h-3u-7g",5N:P,3l:P,O:V,6p:V,3I:V,49:{3M:"4o/3M, 1u/3M",3q:"1u/3q",1m:"1u/4m, 4o/4m",3i:"4o/3i, 1u/4m",1u:"1u/a7",4G:"*/*"}},4F:{},3P:J(s){L f,2W=/=\\?(&|$)/g,1z,O;s=E.1s(P,s,E.1s(P,{},E.4I,s));7(s.O&&s.5N&&1o s.O!="25")s.O=E.3m(s.O);7(s.1H=="4E"){7(s.U.2h()=="22"){7(!s.1c.1D(2W))s.1c+=(s.1c.1D(/\\?/)?"&":"?")+(s.4E||"7d")+"=?"}N 7(!s.O||!s.O.1D(2W))s.O=(s.O?s.O+"&":"")+(s.4E||"7d")+"=?";s.1H="3i"}7(s.1H=="3i"&&(s.O&&s.O.1D(2W)||s.1c.1D(2W))){f="4E"+B++;7(s.O)s.O=(s.O+"").1r(2W,"="+f+"$1");s.1c=s.1c.1r(2W,"="+f+"$1");s.1H="1m";1e[f]=J(a){O=a;1W();1y();1e[f]=10;1S{2V 1e[f]}1X(e){}7(h)h.34(g)}}7(s.1H=="1m"&&s.1T==V)s.1T=S;7(s.1T===S&&s.U.2h()=="22"){L i=(1B 3v()).3L();L j=s.1c.1r(/(\\?|&)4r=.*?(&|$)/,"$a4="+i+"$2");s.1c=j+((j==s.1c)?(s.1c.1D(/\\?/)?"&":"?")+"4r="+i:"")}7(s.O&&s.U.2h()=="22"){s.1c+=(s.1c.1D(/\\?/)?"&":"?")+s.O;s.O=V}7(s.2a&&!E.5H++)E.16.1N("5S");7((!s.1c.1f("a3")||!s.1c.1f("//"))&&s.1H=="1m"&&s.U.2h()=="22"){L h=T.3S("6f")[0];L g=T.3s("1m");g.3Q=s.1c;7(s.7c)g.a2=s.7c;7(!f){L l=S;g.9Z=g.9Y=J(){7(!l&&(!6.39||6.39=="5V"||6.39=="1y")){l=P;1W();1y();h.34(g)}}}h.38(g);K 10}L m=S;L k=1e.78?1B 78("9X.9V"):1B 76();k.9T(s.U,s.1c,s.3l,s.6p,s.3I);1S{7(s.O)k.4C("9R-9Q",s.5P);7(s.5C)k.4C("9O-5A-9N",E.4F[s.1c]||"9L, 9K 9I 9H 5z:5z:5z 9F");k.4C("X-9C-9A","76");k.4C("9z",s.1H&&s.49[s.1H]?s.49[s.1H]+", */*":s.49.4G)}1X(e){}7(s.6Y)s.6Y(k);7(s.2a)E.16.1N("6m",[k,s]);L c=J(a){7(!m&&k&&(k.39==4||a=="2U")){m=P;7(d){6I(d);d=V}1z=a=="2U"&&"2U"||!E.6X(k)&&"3a"||s.5C&&E.6J(k,s.1c)&&"5U"||"1W";7(1z=="1W"){1S{O=E.6W(k,s.1H)}1X(e){1z="5x"}}7(1z=="1W"){L b;1S{b=k.5q("6U-5A")}1X(e){}7(s.5C&&b)E.4F[s.1c]=b;7(!f)1W()}N E.5v(s,k,1z);1y();7(s.3l)k=V}};7(s.3l){L d=53(c,13);7(s.2U>0)3z(J(){7(k){k.9t();7(!m)c("2U")}},s.2U)}1S{k.9s(s.O)}1X(e){E.5v(s,k,V,e)}7(!s.3l)c();J 1W(){7(s.1W)s.1W(O,1z);7(s.2a)E.16.1N("5Q",[k,s])}J 1y(){7(s.1y)s.1y(k,1z);7(s.2a)E.16.1N("5R",[k,s]);7(s.2a&&!--E.5H)E.16.1N("6d")}K k},5v:J(s,a,b,e){7(s.3a)s.3a(a,b,e);7(s.2a)E.16.1N("6D",[a,s,e])},5H:0,6X:J(r){1S{K!r.1z&&9q.9p=="59:"||(r.1z>=6T&&r.1z<9n)||r.1z==6R||r.1z==9l||E.14.2d&&r.1z==10}1X(e){}K S},6J:J(a,c){1S{L b=a.5q("6U-5A");K a.1z==6R||b==E.4F[c]||E.14.2d&&a.1z==10}1X(e){}K S},6W:J(r,b){L c=r.5q("9k-U");L d=b=="3M"||!b&&c&&c.1f("3M")>=0;L a=d?r.9j:r.4b;7(d&&a.1F.28=="5x")6Q"5x";7(b=="1m")E.5g(a);7(b=="3i")a=6c("("+a+")");K a},3m:J(a){L s=[];7(a.1k==1M||a.5h)E.R(a,J(){s.1g(3r(6.31)+"="+3r(6.1A))});N Q(L j 1p a)7(a[j]&&a[j].1k==1M)E.R(a[j],J(){s.1g(3r(j)+"="+3r(6))});N s.1g(3r(j)+"="+3r(a[j]));K s.6a("&").1r(/%20/g,"+")}});E.1n.1s({1G:J(c,b){K c?6.2e({1R:"1G",27:"1G",1w:"1G"},c,b):6.1E(":1Z").R(J(){6.W.19=6.5s||"";7(E.1j(6,"19")=="2H"){L a=E("<"+6.28+" />").6y("1h");6.W.19=a.1j("19");7(6.W.19=="2H")6.W.19="3D";a.1V()}}).3h()},1I:J(b,a){K b?6.2e({1R:"1I",27:"1I",1w:"1I"},b,a):6.1E(":4d").R(J(){6.5s=6.5s||E.1j(6,"19");6.W.19="2H"}).3h()},6N:E.1n.2g,2g:J(a,b){K E.1q(a)&&E.1q(b)?6.6N(a,b):a?6.2e({1R:"2g",27:"2g",1w:"2g"},a,b):6.R(J(){E(6)[E(6).3H(":1Z")?"1G":"1I"]()})},9f:J(b,a){K 6.2e({1R:"1G"},b,a)},9d:J(b,a){K 6.2e({1R:"1I"},b,a)},9c:J(b,a){K 6.2e({1R:"2g"},b,a)},9a:J(b,a){K 6.2e({1w:"1G"},b,a)},99:J(b,a){K 6.2e({1w:"1I"},b,a)},97:J(c,a,b){K 6.2e({1w:a},c,b)},2e:J(l,k,j,h){L i=E.6P(k,j,h);K 6[i.2P===S?"R":"2P"](J(){7(6.15!=1)K S;L g=E.1s({},i);L f=E(6).3H(":1Z"),4A=6;Q(L p 1p l){7(l[p]=="1I"&&f||l[p]=="1G"&&!f)K E.1q(g.1y)&&g.1y.1i(6);7(p=="1R"||p=="27"){g.19=E.1j(6,"19");g.32=6.W.32}}7(g.32!=V)6.W.32="1Z";g.40=E.1s({},l);E.R(l,J(c,a){L e=1B E.2t(4A,g,c);7(/2g|1G|1I/.17(a))e[a=="2g"?f?"1G":"1I":a](l);N{L b=a.3X().1D(/^([+-]=)?([\\d+-.]+)(.*)$/),1Y=e.2m(P)||0;7(b){L d=2M(b[2]),2A=b[3]||"2S";7(2A!="2S"){4A.W[c]=(d||1)+2A;1Y=((d||1)/e.2m(P))*1Y;4A.W[c]=1Y+2A}7(b[1])d=((b[1]=="-="?-1:1)*d)+1Y;e.45(1Y,d,2A)}N e.45(1Y,a,"")}});K P})},2P:J(a,b){7(E.1q(a)||(a&&a.1k==1M)){b=a;a="2t"}7(!a||(1o a=="25"&&!b))K A(6[0],a);K 6.R(J(){7(b.1k==1M)A(6,a,b);N{A(6,a).1g(b);7(A(6,a).M==1)b.1i(6)}})},94:J(b,c){L a=E.3G;7(b)6.2P([]);6.R(J(){Q(L i=a.M-1;i>=0;i--)7(a[i].Y==6){7(c)a[i](P);a.72(i,1)}});7(!c)6.5p();K 6}});L A=J(b,c,a){7(!b)K 10;c=c||"2t";L q=E.O(b,c+"2P");7(!q||a)q=E.O(b,c+"2P",a?E.2I(a):[]);K q};E.1n.5p=J(a){a=a||"2t";K 6.R(J(){L q=A(6,a);q.4l();7(q.M)q[0].1i(6)})};E.1s({6P:J(b,a,c){L d=b&&b.1k==92?b:{1y:c||!c&&a||E.1q(b)&&b,2u:b,3Z:c&&a||a&&a.1k!=91&&a};d.2u=(d.2u&&d.2u.1k==51?d.2u:{90:8Z,9D:6T}[d.2u])||8X;d.5y=d.1y;d.1y=J(){7(d.2P!==S)E(6).5p();7(E.1q(d.5y))d.5y.1i(6)};K d},3Z:{70:J(p,n,b,a){K b+a*p},5j:J(p,n,b,a){K((-24.8V(p*24.8U)/2)+0.5)*a+b}},3G:[],3W:V,2t:J(b,c,a){6.11=c;6.Y=b;6.1l=a;7(!c.47)c.47={}}});E.2t.2l={4y:J(){7(6.11.30)6.11.30.1i(6.Y,[6.2J,6]);(E.2t.30[6.1l]||E.2t.30.4G)(6);7(6.1l=="1R"||6.1l=="27")6.Y.W.19="3D"},2m:J(a){7(6.Y[6.1l]!=V&&6.Y.W[6.1l]==V)K 6.Y[6.1l];L r=2M(E.1j(6.Y,6.1l,a));K r&&r>-8Q?r:2M(E.2o(6.Y,6.1l))||0},45:J(c,b,d){6.5B=(1B 3v()).3L();6.1Y=c;6.3h=b;6.2A=d||6.2A||"2S";6.2J=6.1Y;6.4B=6.4w=0;6.4y();L e=6;J t(a){K e.30(a)}t.Y=6.Y;E.3G.1g(t);7(E.3W==V){E.3W=53(J(){L a=E.3G;Q(L i=0;i<a.M;i++)7(!a[i]())a.72(i--,1);7(!a.M){6I(E.3W);E.3W=V}},13)}},1G:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1G=P;6.45(0,6.2m());7(6.1l=="27"||6.1l=="1R")6.Y.W[6.1l]="8N";E(6.Y).1G()},1I:J(){6.11.47[6.1l]=E.1J(6.Y.W,6.1l);6.11.1I=P;6.45(6.2m(),0)},30:J(a){L t=(1B 3v()).3L();7(a||t>6.11.2u+6.5B){6.2J=6.3h;6.4B=6.4w=1;6.4y();6.11.40[6.1l]=P;L b=P;Q(L i 1p 6.11.40)7(6.11.40[i]!==P)b=S;7(b){7(6.11.19!=V){6.Y.W.32=6.11.32;6.Y.W.19=6.11.19;7(E.1j(6.Y,"19")=="2H")6.Y.W.19="3D"}7(6.11.1I)6.Y.W.19="2H";7(6.11.1I||6.11.1G)Q(L p 1p 6.11.40)E.1J(6.Y.W,p,6.11.47[p])}7(b&&E.1q(6.11.1y))6.11.1y.1i(6.Y);K S}N{L n=t-6.5B;6.4w=n/6.11.2u;6.4B=E.3Z[6.11.3Z||(E.3Z.5j?"5j":"70")](6.4w,n,0,1,6.11.2u);6.2J=6.1Y+((6.3h-6.1Y)*6.4B);6.4y()}K P}};E.2t.30={2v:J(a){a.Y.2v=a.2J},2x:J(a){a.Y.2x=a.2J},1w:J(a){E.1J(a.Y.W,"1w",a.2J)},4G:J(a){a.Y.W[a.1l]=a.2J+a.2A}};E.1n.5L=J(){L b=0,3b=0,Y=6[0],5l;7(Y)8M(E.14){L d=Y.1a,41=Y,1K=Y.1K,1L=Y.2i,5D=2d&&4s(5K)<8J&&!/a1/i.17(v),2T=E.1j(Y,"43")=="2T";7(Y.6G){L c=Y.6G();1b(c.26+24.2f(1L.1F.2v,1L.1h.2v),c.3b+24.2f(1L.1F.2x,1L.1h.2x));1b(-1L.1F.62,-1L.1F.60)}N{1b(Y.5G,Y.5F);2b(1K){1b(1K.5G,1K.5F);7(48&&!/^t(8H|d|h)$/i.17(1K.28)||2d&&!5D)2N(1K);7(!2T&&E.1j(1K,"43")=="2T")2T=P;41=/^1h$/i.17(1K.28)?41:1K;1K=1K.1K}2b(d&&d.28&&!/^1h|3q$/i.17(d.28)){7(!/^8G|1O.*$/i.17(E.1j(d,"19")))1b(-d.2v,-d.2x);7(48&&E.1j(d,"32")!="4d")2N(d);d=d.1a}7((5D&&(2T||E.1j(41,"43")=="4W"))||(48&&E.1j(41,"43")!="4W"))1b(-1L.1h.5G,-1L.1h.5F);7(2T)1b(24.2f(1L.1F.2v,1L.1h.2v),24.2f(1L.1F.2x,1L.1h.2x))}5l={3b:3b,26:b}}J 2N(a){1b(E.2o(a,"a8",P),E.2o(a,"a9",P))}J 1b(l,t){b+=4s(l)||0;3b+=4s(t)||0}K 5l}})();',62,631,"||||||this|if||||||||||||||||||||||||||||||||||||||function|return|var|length|else|data|true|for|each|false|document|type|null|style||elem||undefined|options|nodeName||browser|nodeType|event|test|arguments|display|parentNode|add|url|msie|window|indexOf|push|body|apply|css|constructor|prop|script|fn|typeof|in|isFunction|replace|extend|className|text|handle|opacity|div|complete|status|value|new|firstChild|match|filter|documentElement|show|dataType|hide|attr|offsetParent|doc|Array|trigger|table|call|break|height|try|cache|tbody|remove|success|catch|start|hidden||ready|get|split|Math|string|left|width|tagName|ret|global|while|map|safari|animate|max|toggle|toLowerCase|ownerDocument|bind|select|prototype|cur||curCSS|selected|handler|done|find|fx|duration|scrollLeft|id|scrollTop|special|opera|unit|nextSibling|stack|guid|toUpperCase|pushStack|button|none|makeArray|now|slice|target|parseFloat|border|exec|queue|isReady|events|px|fixed|timeout|delete|jsre|one|disabled|nth|step|name|overflow|inArray|removeChild|removeData|preventDefault|merge|appendChild|readyState|error|top|which|innerHTML|multiFilter|rl|trim|end|json|first|checked|async|param|elems|insertBefore|childNodes|html|encodeURIComponent|createElement|append|form|Date|unbind|color|grep|setTimeout|readyList|mouseleave|mouseenter|block|isXMLDoc|addEventListener|timers|is|password|last|runtimeStyle|getTime|xml|jQuery|domManip|ajax|src|callee|getElementsByTagName|selectedIndex|load|object|timerId|toString|has|easing|curAnim|offsetChild|args|position|stopPropagation|custom|props|orig|mozilla|accepts|clean|responseText|defaultView|visible|String|charCode|float|teardown|on|setup|nodeIndex|shift|javascript|currentStyle|application|child|RegExp|_|parseInt|previousSibling|dir|tr|state|empty|update|getAttribute|self|pos|setRequestHeader|input|jsonp|lastModified|_default|unload|ajaxSettings|unshift|getComputedStyle|styleSheets|getPropertyValue|lastToggle|mouseout|mouseover|GET|andSelf|relatedTarget|init|visibility|click|absolute|index|container|fix|outline|Number|removeAttribute|setInterval|prevObject|classFilter|not|unique|submit|file|after|windowData|deep|scroll|client|triggered|globalEval|jquery|sibling|swing|clone|results|wrapAll|triggerHandler|lastChild|dequeue|getResponseHeader|createTextNode|oldblock|checkbox|radio|handleError|fromElement|parsererror|old|00|Modified|startTime|ifModified|safari2|getWH|offsetTop|offsetLeft|active|values|getElementById|version|offset|bindReady|processData|val|contentType|ajaxSuccess|ajaxComplete|ajaxStart|serializeArray|notmodified|loaded|DOMContentLoaded|Width|ctrlKey|keyCode|clientTop|POST|clientLeft|clientX|pageX|exclusive|detachEvent|removeEventListener|swap|cloneNode|join|attachEvent|eval|ajaxStop|substr|head|parse|textarea|reset|image|zoom|odd|ajaxSend|even|before|username|prepend|expr|quickClass|uuid|quickID|quickChild|continue|textContent|appendTo|contents|evalScript|parent|defaultValue|ajaxError|setArray|compatMode|getBoundingClientRect|styleFloat|clearInterval|httpNotModified|nodeValue|100|alpha|_toggle|href|speed|throw|304|replaceWith|200|Last|colgroup|httpData|httpSuccess|beforeSend|eq|linear|concat|splice|fieldset|multiple|cssFloat|XMLHttpRequest|webkit|ActiveXObject|CSS1Compat|link|metaKey|scriptCharset|callback|col|pixelLeft|urlencoded|www|post|hasClass|getJSON|getScript|elements|serialize|black|keyup|keypress|solid|change|mousemove|mouseup|dblclick|resize|focus|blur|stylesheet|rel|doScroll|round|hover|padding|offsetHeight|mousedown|offsetWidth|Bottom|Top|keydown|clientY|Right|pageY|Left|toElement|srcElement|cancelBubble|returnValue|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|ajaxSetup|font|size|gt|lt|uFFFF|u0128|417|Boolean|inner|Height|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|contentWindow|contentDocument|wrap|iframe|children|siblings|prevAll|nextAll|prev|wrapInner|next|parents|maxLength|maxlength|readOnly|readonly|reverse|class|htmlFor|inline|able|boxModel|522|setData|compatible|with|1px|ie|getData|10000|ra|it|rv|PI|cos|userAgent|400|navigator|600|slow|Function|Object|array|stop|ig|NaN|fadeTo|option|fadeOut|fadeIn|setAttribute|slideToggle|slideUp|changed|slideDown|be|can|property|responseXML|content|1223|getAttributeNode|300|method|protocol|location|action|send|abort|cssText|th|td|cap|specified|Accept|With|colg|Requested|fast|tfoot|GMT|thead|1970|Jan|attributes|01|Thu|leg|Since|If|opt|Type|Content|embed|open|area|XMLHTTP|hr|Microsoft|onreadystatechange|onload|meta|adobeair|charset|http|1_|img|br|plain|borderLeftWidth|borderTopWidth|abbr".split("|"),0,{}));var gPlatform=PLATFORM_WINDOWS;var gLatestVersionID=null;var gLatestAddonVersion=null;var gLatestAppVersion=null;var PLATFORM_OTHER=0;var PLATFORM_WINDOWS=1;var PLATFORM_LINUX=2;var PLATFORM_MACOSX=3;var PLATFORM_MAC=4;if(navigator.platform.indexOf("Win32")!=-1){gPlatform=PLATFORM_WINDOWS}else{if(navigator.platform.indexOf("Linux")!=-1){gPlatform=PLATFORM_LINUX}else{if(navigator.userAgent.indexOf("Mac OS X")!=-1){gPlatform=PLATFORM_MACOSX}else{if(navigator.userAgent.indexOf("MSIE 5.2")!=-1){gPlatform=PLATFORM_MACOSX}else{if(navigator.platform.indexOf("Mac")!=-1){gPlatform=PLATFORM_MAC}else{gPlatform=PLATFORM_OTHER}}}}}function getPlatformName(){if(gPlatform==PLATFORM_WINDOWS){return"Windows"}if(gPlatform==PLATFORM_LINUX){return"Linux"}if(gPlatform==PLATFORM_MACOSX){return"MacOSX"}return"Unknown"}function getInstallURL(A){var B=A.target;while(B&&!B.href){B=B.parentNode}return B&&B.href}function checkMatchUserAgentAppId(){var C=/(?:Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|Iceweasel)/;var B=navigator.userAgent;var A=C.exec(B);if(A!=null&&APP_ID==1){return true}C=/(SeaMonkey|Iceape)/;B=navigator.userAgent;A=C.exec(B);if(A!=null&&APP_ID==59){return true}return false}function install(B,A,E,D){if(B.altKey||!window.InstallTrigger||!checkMatchUserAgentAppId()){return true}var C=getInstallURL(B);if(C){var F=new Array();F[A]={URL:C,IconURL:E,toString:function(){return this.URL}};if(D){F[A].Hash=D}InstallTrigger.install(F);return false}return true}function addEngine(A){if(window.external&&("AddSearchProvider" in window.external)){window.external.AddSearchProvider(A);return false}else{alert(error_opensearch_unsupported);return true}}function fixPlatformLinks(F,D){if(gPlatform==PLATFORM_OTHER){return true}var A=getPlatformName();var E=$("#install-"+F);var B=E.find("p.install-button");var C=B.not(".platform-ALL,.platform-"+A);C.hide();if(B.length==C.length){E.append($('<p class="not-avail"></p>').append(sprintf(addOnNotAvailableForPlatform,D,A)))}return true}function installVersusDownloadCheck(G,F,B){var D=F;var E=/Mozilla.*(Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|SeaMonkey|Iceweasel|Iceape)\/.*$/;var C=navigator.userAgent;var A=E.exec(C);if(!A||A.length<2||!checkMatchUserAgentAppId()){D=B}$("#"+G+" strong").text(D)}function addCompatibilityHints(D,K,R,M,I,N){var A=/Mozilla.*(?:Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|Iceweasel)\/([^\s]*).*$/;var O=navigator.userAgent;var S=A.exec(O);if(!S||S.length<2){return true}var B=$("#install-"+K);var G=S[1];var C=new VersionCompare();if(C.compareVersions(G,R)<0){var P=true}else{if(C.compareVersions(G,M)>0){var P=false}else{if(gLatestVersionID==null){var L=B.find("p.install-button");if(L.find(".platform-ALL")||L.find(".platform-"+gPlatform)){gLatestVersionID=K;var J=B.prev().prev().prev();gLatestAddonVersion=J.clone();gLatestApplicationVersion=G}}return true}}if(N){return true}var E=B.find("p:visible a");if(E.length==0){return true}var F=B.clone();F.attr("id","orig-"+K);F.hide();B.after(F);var Q=document.createElement("div");Q.setAttribute("class","exp-loggedout");B.wrapInner(Q);var H=E.attr("href");E.removeAttr("href");E.removeAttr("onClick");E.removeAttr("title");E.css("cursor","default");E.parent().css("float","none");if(H.indexOf("downloads")>0){H=H.substring(0,H.indexOf("downloads"))}else{if(H.indexOf("addons")>0){H=H.substring(0,H.indexOf("addons"))}}H=H+"addons/versions/"+D;if(P&&I){E.parent().after(sprintf(app_compat_older_version_or_ignore_check,H,"removeCompatibilityHint("+K+");return false;"))}else{if(!P&&I){E.parent().after('<br /><a href="#" onclick="removeCompatibilityHint(\''+K+"');return false;\">"+app_compat_ignore_check+"</a>");E.parent().after(app_compat_older_firefox_only)}else{if(!P){E.parent().after(app_compat_older_firefox_only)}else{E.parent().after(sprintf(app_compat_try_old_version,H))}}}if(P){if(C.compareVersions(R,LATEST_FIREFOX_DEVEL_VERSION)>=0){E.parent().after(sprintf("<strong>"+app_compat_unreleased_version+"</strong><br />","http://www.mozilla.com/"+LANG+"/firefox/all-beta.html#"+LANG,LATEST_FIREFOX_DEVEL_VERSION))}else{if(C.compareVersions(R,LATEST_FIREFOX_VERSION)<0){E.parent().after(sprintf("<strong>"+app_compat_update_firefox+"</strong><br />","http://www.mozilla.com/"+LANG+"/firefox/all.html#"+LANG,LATEST_FIREFOX_VERSION))}}}return true}function removeCompatibilityHint(A){var B=$("#orig-"+A);B.prev().remove();B.attr("id","install-"+A);B.show();return true}function createLatestVersionElement(C,D){var A=$("#latest-version-container");A.wrapInner("<p>"+sprintf(C,D,gLatestApplicationVersion)+"</p>");A.append(gLatestAddonVersion);var E=$("#install-"+gLatestVersionID);var B=E.clone();B.attr("id","install-0"+gLatestVersionID);A.append(B);A.attr("id","latest-version");fixPlatformLinks("0"+gLatestVersionID,"")}function replaceOptions(C,B,A){$(C+" > *").remove();for(opt in B){sel_text="";val=B[opt];opt_obj=document.createElement("option");if(val==A){opt_obj.selected="selected"}opt_obj.value=val;opt_obj.appendChild(document.createTextNode(opt));$(C).append(opt_obj)}}function emailLink(F,D,E){var A=document.getElementById(F);var C=D+"@"+E;var B=document.createElement("a");B.setAttribute("href","mailto:"+C);B.appendChild(document.createTextNode(C));A.replaceChild(B,A.lastChild)}function sprintf(){if(!arguments||arguments.length<1||!RegExp){return null}var M=arguments[0];var L=/([^%]*)%((\d+)\$)?('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X)(.*)/;var U=b=[],A=0,C=0;while((U=L.exec(M))){var K=U[1],F=U[3],R=U[4],I=U[5];var S=U[6],N=U[7],H=U[8];var D=U[9];C++;if(H=="%"){E="%"}else{if(F==""){A++;F=A}if(parseInt(F)>=arguments.length){alert("Error! Not enough function arguments ("+(arguments.length-1)+", excluding the string)\nfor the number of substitution parameters in string ("+A+" so far).")}var G=arguments[parseInt(F)];var T="";if(R&&R.substr(0,1)=="'"){T=K.substr(1,1)}else{if(R){T=R}}var P=true;if(I&&I==="-"){P=false}var J=-1;if(S){J=parseInt(S)}var O=-1;if(N&&H=="f"){O=parseInt(N.substring(1))}var E=G;switch(H){case"b":E=parseInt(G).toString(2);break;case"c":E=String.fromCharCode(parseInt(G));break;case"d":E=parseInt(G)?parseInt(G):0;break;case"u":E=Math.abs(G);break;case"f":E=(O>-1)?Math.round(parseFloat(G)*Math.pow(10,O))/Math.pow(10,O):parseFloat(G);break;case"o":E=parseInt(G).toString(8);break;case"s":E=G;break;case"x":E=(""+parseInt(G).toString(16)).toLowerCase();break;case"X":E=(""+parseInt(G).toString(16)).toUpperCase();break}var Q=J-E.toString().length;if(Q>0){var B=new Array(Q+1);var V=B.join(T?T:" ")}else{var V=""}}M=K+V+E+D}return M}if(jQuery){(function(A){A.fn.rating=function(C){C=A.extend({cancel:"",cancelValue:0,required:false,readOnly:false},C||{});var E=this;var F={};var D={fill:function(I,H,G){this.drain(I);A(H).prevAll(".star").andSelf().addClass(G||"star_hover")},drain:function(G){A(F[G].valueElem).siblings(".star").removeClass("star_on").removeClass("star_hover")},reset:function(G){if(!A(F[G].currentElem).is(".cancel")){A(F[G].currentElem).prevAll(".star").andSelf().addClass("star_on")}},click:function(I,G){F[I].currentElem=G;var H=A(G).children("a").text();A(F[I].valueElem).val(H);D.drain(I);D.reset(I);if(C.callback){C.callback.apply(F[I].valueElem,[H,G])}}};var B=A(this).find("input[@type=radio]");A(this).empty();A(this).removeClass("degrade");B.each(function(G){var H=this.name;if(!F[H]){F[H]={count:0}}G=F[H].count;F[H].count++;if(G==0){C.readOnly=A(this).attr("disabled")||C.readOnly;F[H].valueElem=A('<input type="hidden" name="'+H+'" value=""'+(C.readOnly?' disabled="disabled"':"")+">");A(E).append(F[H].valueElem);if(C.readOnly||C.required){}else{}}eStar=A('<div class="star"><a title="'+(this.title||this.value)+'">'+this.value+"</a></div>");A(E).append(eStar);if(C.readOnly){A(eStar).addClass("star_readonly")}else{A(eStar).mouseover(function(){D.drain(H);D.fill(H,this)}).mouseout(function(){D.drain(H);D.reset(H)}).click(function(){D.click(H,this)})}if(this.checked){F[H].currentElem=eStar}if(G+1==this.length){D.reset(H)}});for(n in F){if(F[n].currentElem){D.fill(n,F[n].currentElem,"star_on");A(F[n].valueElem).val(A(F[n].currentElem).children("a").text())}}return this}})(jQuery)}function VersionCompare(){this.compareVersions=function(B,A){var G=B.split(".");var H=A.split(".");for(var D=0;D<G.length||D<H.length;D++){var C=(D<G.length?G[D]:null);var F=(D<H.length?H[D]:null);var E=this.compareVersionParts(C,F);if(E!=0){return E}}return 0};this.compareVersionParts=function(A,D){var E=this.parseVersionPart(A);var C=this.parseVersionPart(D);var B=this.cmp(E.numA,C.numA);if(B){return B}B=this.strcmp(E.strB,C.strB);if(B){return B}B=this.cmp(E.numC,C.numC);if(B){return B}return this.strcmp(E.extraD,C.extraD)};this.parseVersionPart=function(D){if(D=="*"){return{numA:Number.MAX_VALUE,strB:"",numC:0,extraD:""}}var B=/^([-\d]*)([^-\d]*)([-\d]*)(.*)$/;var A=B.exec(D);var C={numA:parseInt(A[1]),strB:A[2],numC:parseInt(A[3]),extraD:A[4]};if(C.strB=="+"){C.numA++;C.strB="pre"}return C};this.cmp=function(A,B){if(isNaN(A)){A=0}if(isNaN(B)){B=0}if(A<B){return -1}if(A>B){return 1}return 0};this.strcmp=function(A,B){if(A==B){return 0}if(A==""){return 1}if(B==""){return -1}if(A<B){return -1}else{if(A>B){return 1}else{return 0}}}}if(jQuery){(function(A){A.fn.slider=function(B){var C=arguments.callee.support;new C(this[0].id,B);return this};A.fn.slider.support=function(B,C){this.init(B,C)};A.fn.slider.support.prototype=function(){return{init:function(B,C){this.options=A.extend({duration:250,prev_img_src:"/img/slider-prev.gif",prev_disabled_img_src:"/img/slider-prev-disabled.gif",next_img_src:"/img/slider-next.gif",next_disabled_img_src:"/img/slider-next-disabled.gif"},C||{});this.slider_id=B;this.slider_sel="#"+B;this._resize_timer=null;var D=this;A(window).unload(function(){return D.onUnload()});A(window).resize(function(){return D.onResize()});A(document).ready(function(){return D.onReady()})},onReady:function(){this.items=A(this.slider_sel+" .item");this.item_idx=0;var B=this;A(this.slider_sel+" .controls .prev").click(function(C){return B.onClickPrev(C)});A(this.slider_sel+" .controls .next").click(function(C){return B.onClickNext(C)});this.onResize()},onUnload:function(){delete this.items},onResize:function(){var B=this;if(this._resize_timer){clearTimeout(this._resize_timer)}this._resize_timer=window.setTimeout(function(){B._doResize()},50)},_doResize:function(){var C=A(this.slider_sel);var B=C.select(".viewport")[0];A(this.slider_sel+" .addon").width(B.offsetWidth-260);this.revealSelectedItem(15)},onClickPrev:function(B){if((this.item_idx-1)<0){return false}this.item_idx--;return this.changeSelectedItem()},onClickNext:function(B){if((this.item_idx+1)>=this.items.length){return false}this.item_idx++;return this.changeSelectedItem()},changeSelectedItem:function(){this.updateItemNumber();this.updateButtonStates();this.revealSelectedItem();return false},updateItemNumber:function(){A(this.slider_sel+" .controls .index").text(this.item_idx+1)},updateButtonStates:function(){var B=A(this.slider_sel+" .controls .prev img")[0];if(this.item_idx==0){B.src=this.options.prev_disabled_img_src}else{B.src=this.options.prev_img_src}var C=A(this.slider_sel+" .controls .next img")[0];if(this.item_idx==this.items.length-1){C.src=this.options.next_disabled_img_src}else{C.src=this.options.next_img_src}},revealSelectedItem:function(B){if(!B){B=this.options.slide_duration}A(this.slider_sel+" .viewport").animate({scrollLeft:this.items[this.item_idx].offsetLeft},B)},EOF:null}}()})(jQuery)}if(jQuery){(function(A){A.fn.collection=function(B){B=A.extend({shoppingCart:false},B||{});var D=B.installUrl;A("input.want").change(function(){A("#done-"+A(this).attr("value")).slideToggle("fast");A(".installsubmit input").attr("disabled",(A("input.want:checked").length==0))});A("input.want:checked").each(function(){A("#done-"+A(this).attr("value")).show()});A(".installsubmit input").attr("disabled",(A("input.want:checked").length==0));var C=function(){A.post(D,A("input.want:checked").serialize(),function(F,E){A("#installdialog").html(F).jqmAddClose("#installdialog .installsubmit input.cancel").show()})};A("#installdialog").jqm({onShow:C,trigger:"#collectionform .installsubmit input,a.installlink",overlay:80});A(document).keypress(function(E){if(E.keyCode==27){A("#installdialog").jqmHide()}})}})(jQuery)}if(jQuery){(function(A){A.fn.rolloverReveal=function(C){var B=arguments.callee.support;A.each(this,function(){new B(this,C)});return this};A.fn.rolloverReveal.support=function(C,B){this.init(C,B)};A.fn.rolloverReveal.support.prototype=function(){var B={reveal_delay:250,dismiss_delay:500};return{timers:{},init:function(D,C){var E=this;this.options=A.extend({},B,C);if(!D.id){D.id="el-"+(new Date()).getTime()+"-"+parseInt(1000*Math.random())}this.root="#"+D.id;this.to_reveal=A(this.root_id).find(".to-reveal");A(this.root).find(".activator").click(function(){E.toggle();return false}).mouseover(function(){E.schedule("reveal");E.cancel("dismiss")}).mouseout(function(){E.cancel("reveal");E.schedule("dismiss")}).end().find(".to-reveal").mouseover(function(){E.cancel("dismiss")}).mouseout(function(){E.schedule("dismiss")}).end().find(".to-reveal a").click(function(){E.dismiss();return true}).mouseover(function(){E.cancel("dismiss")}).mouseout(function(){E.schedule("dismiss")}).end()},reveal:function(){this.to_reveal.show().addClass("revealed")},revealStatus:function(){return this.to_reveal.hasClass("revealed")},dismiss:function(){this.to_reveal.hide().removeClass("revealed")},dismissStatus:function(){return !this.to_reveal.hasClass("revealed")},toggle:function(){return(this.revealStatus())?this.dismiss():this.reveal()},schedule:function(C){var D=this;if(this[C+"Status"]()){return }this.cancel(C);this.timers[C]=setTimeout(function(){D[C]()},this.options[C+"_delay"])},cancel:function(C){if(this.timers[C]){clearTimeout(this.timers[C])}},EOF:null}}()})(jQuery)};
\ No newline at end of file
diff --git a/site/app/webroot/js/jquery.autocomplete.js b/site/app/webroot/js/jquery.autocomplete.js
new file mode 100644
index 0000000..8c87397
--- /dev/null
+++ b/site/app/webroot/js/jquery.autocomplete.js
@@ -0,0 +1,551 @@
+jQuery.autocomplete = function(input, options) {
+	// Create a link to self
+	var me = this;
+
+	// Create jQuery object for input element
+	var $input = $(input).attr("autocomplete", "off");
+
+	// Apply inputClass if necessary
+	if (options.inputClass) {
+		$input.addClass(options.inputClass);
+	}
+
+	// Create results
+	var results = document.createElement("div");
+
+	// Create jQuery object for results
+	// var $results = $(results);
+	var $results = $(results).hide().addClass(options.resultsClass).css("position", "absolute");
+	if( options.width > 0 ) {
+		$results.css("width", options.width);
+	}
+
+	// Add to body element
+	$("body").append(results);
+
+	input.autocompleter = me;
+
+	var timeout = null;
+	var prev = "";
+	var active = -1;
+	var cache = {};
+	var keyb = false;
+	var hasFocus = false;
+	var lastKeyPressCode = null;
+	var mouseDownOnSelect = false;
+	var hidingResults = false;
+
+	// flush cache
+	function flushCache(){
+		cache = {};
+		cache.data = {};
+		cache.length = 0;
+	};
+
+	// flush cache
+	flushCache();
+
+	// if there is a data array supplied
+	if( options.data != null ){
+		var sFirstChar = "", stMatchSets = {}, row = [];
+
+		// no url was specified, we need to adjust the cache length to make sure it fits the local data store
+		if( typeof options.url != "string" ) {
+			options.cacheLength = 1;
+		}
+
+		// loop through the array and create a lookup structure
+		for( var i=0; i < options.data.length; i++ ){
+			// if row is a string, make an array otherwise just reference the array
+			row = ((typeof options.data[i] == "string") ? [options.data[i]] : options.data[i]);
+
+			// if the length is zero, don't add to list
+			if( row[0].length > 0 ){
+				// get the first character
+				sFirstChar = row[0].substring(0, 1).toLowerCase();
+				// if no lookup array for this character exists, look it up now
+				if( !stMatchSets[sFirstChar] ) stMatchSets[sFirstChar] = [];
+				// if the match is a string
+				stMatchSets[sFirstChar].push(row);
+			}
+		}
+
+		// add the data items to the cache
+		for( var k in stMatchSets ) {
+			// increase the cache size
+			options.cacheLength++;
+			// add to the cache
+			addToCache(k, stMatchSets[k]);
+		}
+	}
+
+	$input
+	.keydown(function(e) {
+		// track last key pressed
+		lastKeyPressCode = e.keyCode;
+		switch(e.keyCode) {
+			case 38: // up
+				e.preventDefault();
+				moveSelect(-1);
+				break;
+			case 40: // down
+				e.preventDefault();
+				moveSelect(1);
+				break;
+			case 9:  // tab
+				if( selectCurrent() ){
+					// make sure to blur off the current field
+					$input.get(0).blur();
+					e.preventDefault();
+				}
+				break;
+			case 13: // return
+				if( selectCurrent() ){
+					e.preventDefault();
+				}
+				break;
+			default:
+				active = -1;
+				if (timeout) clearTimeout(timeout);
+				timeout = setTimeout(function(){onChange();}, options.delay);
+				break;
+		}
+	})
+	.focus(function(){
+		// track whether the field has focus, we shouldn't process any results if the field no longer has focus
+		hasFocus = true;
+	})
+	.blur(function() {
+		// track whether the field has focus
+		hasFocus = false;
+		if (!mouseDownOnSelect) {
+			hideResults();
+		}
+	});
+    
+	hideResultsNow();
+
+	function onChange() {
+		// ignore if the following keys are pressed: [del] [shift] [capslock]
+		if( lastKeyPressCode == 46 || (lastKeyPressCode > 8 && lastKeyPressCode < 32) ) return $results.hide();
+		var v = $input.val();
+		if (v == prev) return;
+		prev = v;
+		if (v.length >= options.minChars) {
+			$input.addClass(options.loadingClass);
+			requestData(v);
+		} else {
+			$input.removeClass(options.loadingClass);
+			$results.hide();
+		}
+	};
+
+ 	function moveSelect(step) {
+
+		var lis = $("li", results);
+		if (!lis) return;
+
+		active += step;
+
+		if (active < 0) {
+			active = 0;
+		} else if (active >= lis.size()) {
+			active = lis.size() - 1;
+		}
+
+		lis.removeClass("ac_over");
+
+		$(lis[active]).addClass("ac_over");
+
+		// Weird behaviour in IE
+		// if (lis[active] && lis[active].scrollIntoView) {
+		// 	lis[active].scrollIntoView(false);
+		// }
+
+	};
+
+	function selectCurrent() {
+		var li = $("li.ac_over", results)[0];
+		if (!li) {
+			var $li = $("li", results);
+			if (options.selectOnly) {
+				if ($li.length == 1) li = $li[0];
+			} else if (options.selectFirst) {
+				li = $li[0];
+			}
+		}
+		if (li) {
+			selectItem(li);
+			return true;
+		} else {
+			return false;
+		}
+	};
+
+	function selectItem(li) {
+		if (!li) {
+			li = document.createElement("li");
+			li.extra = [];
+			li.selectValue = "";
+		}
+		var v = $.trim(li.selectValue ? li.selectValue : li.innerHTML);
+		input.lastSelected = v;
+		prev = v;
+		$results.html("");
+		$input.val(v);
+		hideResultsNow();
+		if (options.onItemSelect) {
+			setTimeout(function() { options.onItemSelect(li) }, 1);
+		}
+	};
+
+	// selects a portion of the input string
+	function createSelection(start, end){
+		// get a reference to the input element
+		var field = $input.get(0);
+		if( field.createTextRange ){
+			var selRange = field.createTextRange();
+			selRange.collapse(true);
+			selRange.moveStart("character", start);
+			selRange.moveEnd("character", end);
+			selRange.select();
+		} else if( field.setSelectionRange ){
+			field.setSelectionRange(start, end);
+		} else {
+			if( field.selectionStart ){
+				field.selectionStart = start;
+				field.selectionEnd = end;
+			}
+		}
+		field.focus();
+	};
+
+	// fills in the input box w/the first match (assumed to be the best match)
+	function autoFill(sValue){
+		// if the last user key pressed was backspace, don't autofill
+		if( lastKeyPressCode != 8 ){
+			// fill in the value (keep the case the user has typed)
+			$input.val($input.val() + sValue.substring(prev.length));
+			// select the portion of the value not typed by the user (so the next character will erase)
+			createSelection(prev.length, sValue.length);
+		}
+	};
+
+	function showResults() {
+		// get the position of the input field right now (in case the DOM is shifted)
+		var pos = findPos(input);
+		// either use the specified width, or autocalculate based on form element
+		var iWidth = (options.width > 0) ? options.width : $input.width();
+		// reposition
+		$results.css({
+			width: parseInt(iWidth) + "px",
+			top: (pos.y + input.offsetHeight) + "px",
+			left: pos.x + "px"
+		}).show();
+	};
+
+	function hideResults() {
+		if (timeout) clearTimeout(timeout);
+		timeout = setTimeout(hideResultsNow, 200);
+	};
+
+	function hideResultsNow() {
+		if (hidingResults) {
+			return;
+		}
+		hidingResults = true;
+	
+		if (timeout) {
+			clearTimeout(timeout);
+		}
+		
+		var v = $input.removeClass(options.loadingClass).val();
+		
+		if ($results.is(":visible")) {
+			$results.hide();
+		}
+		
+		if (options.mustMatch) {
+			if (!input.lastSelected || input.lastSelected != v) {
+				selectItem(null);
+			}
+		}
+
+		hidingResults = false;
+	};
+
+	function receiveData(q, data) {
+		if (data) {
+			$input.removeClass(options.loadingClass);
+			results.innerHTML = "";
+
+			// if the field no longer has focus or if there are no matches, do not display the drop down
+			if( !hasFocus || data.length == 0 ) return hideResultsNow();
+
+			if ($.browser.msie) {
+				// we put a styled iframe behind the calendar so HTML SELECT elements don't show through
+				$results.append(document.createElement('iframe'));
+			}
+			
+			results.appendChild(dataToDom(data));
+			// autofill in the complete box w/the first match as long as the user hasn't entered in more data
+			if( options.autoFill && ($input.val().toLowerCase() == q.toLowerCase()) ) autoFill(data[0][0]);
+			showResults();
+		} else {
+			hideResultsNow();
+		}
+	};
+
+	function parseData(data) {
+		if (!data) return null;
+		var parsed = [];
+		var rows = data.split(options.lineSeparator);
+		for (var i=0; i < rows.length; i++) {
+			var row = $.trim(rows[i]);
+			if (row) {
+				parsed[parsed.length] = row.split(options.cellSeparator);
+			}
+		}
+		return parsed;
+	};
+
+	function dataToDom(data) {
+		var ul = document.createElement("ul");
+		var num = data.length;
+
+		// limited results to a max number
+		if( (options.maxItemsToShow > 0) && (options.maxItemsToShow < num) ) num = options.maxItemsToShow;
+
+		for (var i=0; i < num; i++) {
+			var row = data[i];
+			if (!row) continue;
+			var li = document.createElement("li");
+			if (options.formatItem)
+				li.innerHTML = options.formatItem(row, i, num);
+			else
+				li.innerHTML = row[0];
+                        
+                        // AMO change
+                        if (options.formatValue)
+                            li.selectValue = options.formatValue(row, i, num);
+                        else
+                            li.selectValue = row[0];
+                        
+			var extra = null;
+			if (row.length > 1) {
+				extra = [];
+				for (var j=1; j < row.length; j++) {
+					extra[extra.length] = row[j];
+				}
+			}
+			li.extra = extra;
+			ul.appendChild(li);
+			
+			$(li).hover(
+				function() { $("li", ul).removeClass("ac_over"); $(this).addClass("ac_over"); active = $("li", ul).indexOf($(this).get(0)); },
+				function() { $(this).removeClass("ac_over"); }
+			).click(function(e) { 
+				e.preventDefault();
+				e.stopPropagation();
+				selectItem(this)
+				$input.get(0).focus();
+			});
+			
+		}
+		$(ul).mousedown(function() {
+			mouseDownOnSelect = true;
+		}).mouseup(function() {
+			mouseDownOnSelect = false;
+		});
+		return ul;
+	};
+
+	function requestData(q) {
+		if (!options.matchCase) q = q.toLowerCase();
+		var data = options.cacheLength ? loadFromCache(q) : null;
+		// recieve the cached data
+		if (data) {
+			receiveData(q, data);
+		// if an AJAX url has been supplied, try loading the data now
+		} else if( (typeof options.url == "string") && (options.url.length > 0) ){
+			$.get(makeUrl(q), function(data) {
+				data = parseData(data);
+				addToCache(q, data);
+				receiveData(q, data);
+			});
+		// if there's been no data found, remove the loading class
+		} else {
+			$input.removeClass(options.loadingClass);
+		}
+	};
+
+	function makeUrl(q) {
+		var sep = options.url.indexOf('?') == -1 ? '?' : '&'; 
+		var url = options.url + sep + "q=" + encodeURI(q);
+		for (var i in options.extraParams) {
+			url += "&" + i + "=" + encodeURI(options.extraParams[i]);
+		}
+		return url;
+	};
+
+	function loadFromCache(q) {
+		if (!q) return null;
+		if (cache.data[q]) return cache.data[q];
+		if (options.matchSubset) {
+			for (var i = q.length - 1; i >= options.minChars; i--) {
+				var qs = q.substr(0, i);
+				var c = cache.data[qs];
+				if (c) {
+					var csub = [];
+					for (var j = 0; j < c.length; j++) {
+						var x = c[j];
+						var x0 = x[0];
+						if (matchSubset(x0, q)) {
+							csub[csub.length] = x;
+						}
+					}
+					return csub;
+				}
+			}
+		}
+		return null;
+	};
+
+	function matchSubset(s, sub) {
+		if (!options.matchCase) s = s.toLowerCase();
+		var i = s.indexOf(sub);
+		if (i == -1) return false;
+		return i == 0 || options.matchContains;
+	};
+
+	this.flushCache = function() {
+		flushCache();
+	};
+
+	this.setExtraParams = function(p) {
+		options.extraParams = p;
+	};
+
+	this.findValue = function(){
+		var q = $input.val();
+
+		if (!options.matchCase) q = q.toLowerCase();
+		var data = options.cacheLength ? loadFromCache(q) : null;
+		if (data) {
+			findValueCallback(q, data);
+		} else if( (typeof options.url == "string") && (options.url.length > 0) ){
+			$.get(makeUrl(q), function(data) {
+				data = parseData(data)
+				addToCache(q, data);
+				findValueCallback(q, data);
+			});
+		} else {
+			// no matches
+			findValueCallback(q, null);
+		}
+	}
+
+	function findValueCallback(q, data){
+		if (data) $input.removeClass(options.loadingClass);
+
+		var num = (data) ? data.length : 0;
+		var li = null;
+
+		for (var i=0; i < num; i++) {
+			var row = data[i];
+
+			if( row[0].toLowerCase() == q.toLowerCase() ){
+				li = document.createElement("li");
+				if (options.formatItem) {
+					li.innerHTML = options.formatItem(row, i, num);
+					li.selectValue = row[0];
+				} else {
+					li.innerHTML = row[0];
+					li.selectValue = row[0];
+				}
+				var extra = null;
+				if( row.length > 1 ){
+					extra = [];
+					for (var j=1; j < row.length; j++) {
+						extra[extra.length] = row[j];
+					}
+				}
+				li.extra = extra;
+			}
+		}
+
+		if( options.onFindValue ) setTimeout(function() { options.onFindValue(li) }, 1);
+	}
+
+	function addToCache(q, data) {
+		if (!data || !q || !options.cacheLength) return;
+		if (!cache.length || cache.length > options.cacheLength) {
+			flushCache();
+			cache.length++;
+		} else if (!cache[q]) {
+			cache.length++;
+		}
+		cache.data[q] = data;
+	};
+
+	function findPos(obj) {
+		var curleft = obj.offsetLeft || 0;
+		var curtop = obj.offsetTop || 0;
+		while (obj = obj.offsetParent) {
+			curleft += obj.offsetLeft
+			curtop += obj.offsetTop
+		}
+		return {x:curleft,y:curtop};
+	}
+}
+
+jQuery.fn.autocomplete = function(url, options, data) {
+	// Make sure options exists
+	options = options || {};
+	// Set url as option
+	options.url = url;
+	// set some bulk local data
+	options.data = ((typeof data == "object") && (data.constructor == Array)) ? data : null;
+
+	// Set default values for required options
+	options = $.extend({
+		inputClass: "ac_input",
+		resultsClass: "ac_results",
+		lineSeparator: "\n",
+		cellSeparator: "|",
+		minChars: 1,
+		delay: 400,
+		matchCase: 0,
+		matchSubset: 1,
+		matchContains: 0,
+		cacheLength: 1,
+		mustMatch: 0,
+		extraParams: {},
+		loadingClass: "ac_loading",
+		selectFirst: false,
+		selectOnly: false,
+		maxItemsToShow: -1,
+		autoFill: false,
+		width: 0
+	}, options);
+	options.width = parseInt(options.width, 10);
+
+	this.each(function() {
+		var input = this;
+		new jQuery.autocomplete(input, options);
+	});
+
+	// Don't break the chain
+	return this;
+}
+
+jQuery.fn.autocompleteArray = function(data, options) {
+	return this.autocomplete(null, options, data);
+}
+
+jQuery.fn.indexOf = function(e){
+	for( var i=0; i<this.length; i++ ){
+		if( this[i] == e ) return i;
+	}
+	return -1;
+};
--
cgit v0.9.1